From 1d044540ee1b7041c7e89bdfe6d1339c99e80a4e Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期三, 08 一月 2025 14:41:16 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/HuaYiZhongHeng/BaiBuLiKu
---
Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_LocationInfo.vue | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_LocationInfo.vue b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_LocationInfo.vue
index 3b04ada..4cfc7f8 100644
--- a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_LocationInfo.vue
+++ b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_LocationInfo.vue
@@ -26,15 +26,16 @@
const editFormFields = ref({ "locationStatus": "" });
const editFormOptions = ref([
[
- { "title": "璐т綅鐘舵��", "field": "locationStatus", "type": "select", dataKey: "LocationState", data: [] },
+ { "title": "璐т綅鐘舵��", "field": "locationStatus", "type": "select", dataKey: "LocationState", data: [] },
+ { "title": "鏄惁绂佺敤", "field": "enalbeStatus", "type": "select", dataKey: "EnalbeStatus", data: [] },
]
]);
- const searchFormFields = ref({ "LocationID": "" });
+ const searchFormFields = ref({ "LocationID": "",roadWayNO:"" });
const searchFormOptions = ref([
[
{ "title": "璐т綅缂栧彿", "field": "locationCode", type: "text" },
{ "title": "璐т綅鐘舵��", "field": "locationStatus", "type": "select", dataKey: "LocationState", data: [] },
- { "title": "瀵瑰簲鍫嗗灈鏈哄彿", "field": "sCNo", type: "text" },
+ // { "title": "瀵瑰簲鍫嗗灈鏈哄彿", "field": "sCNo", type: "text" },
{ "title": "宸烽亾缂栧彿", "field": "roadWayNO", type: "text" },
]
]);
@@ -45,28 +46,19 @@
{ field: 'row', title: '琛�', type: 'string', width: 70, align: 'left' },
{ field: 'column', title: '鍒�', type: 'string', width: 70, align: 'left' },
{ field: 'layer', title: '灞�', type: 'string', width: 110, align: 'left' },
- { field: 'depth', title: '娣卞害', type: 'string', width: 110, align: 'left' },
+ { field: 'depth', title: '娣卞害', type: 'string', width: 110, align: 'left', hidden: true },
{ field: 'scNo', title: '瀵瑰簲鍫嗗灈鏈哄彿', type: 'string', width: 110, align: 'left', hidden: true },
- { field: 'locationType', title: '璐т綅绫诲瀷', type: 'int', width: 110, align: 'left', bind: { key: "locationType", data: [] } },
+ { field: 'locationType', title: '璐т綅绫诲瀷', type: 'int', width: 110, align: 'left',bind: { key: "LocationType", data: [] } },
{ field: 'locationStatus', title: '璐т綅鐘舵��', type: 'int', width: 110, align: 'left', bind: { key: "LocationState", data: [] } },
- { field: 'isLocked', title: '鏄惁閿佸畾', type: 'bool', width: 110, align: 'left', hidden: true, bind: { key: "IsLocked", data: [] } },
+ { field: 'enalbeStatus', title: '鏄惁绂佺敤', type: 'int', width: 75, align: 'left', bind: { key: "EnalbeStatus", data: [] }},
+ // { field: 'isLocked', title: '鏄惁閿佸畾', type: 'bool', width: 110, align: 'left', bind: { key: "IsLocked", data: [] } },
{ field: 'locationDesc', title: '璐т綅鎻忚堪', type: 'string', width: 110, align: 'left', hidden: true },
- { field: 'remark', title: '澶囨敞', type: 'string', width: 110, align: 'left' },
- { field: 'wareAreaCode', title: '搴撳尯缂栧彿', type: 'string', width: 110, align: 'left', hidden: true },
- { field: 'roadway', title: '宸烽亾', type: 'string', width: 110, align: 'left', hidden: true },
- { field: 'sClocationID', title: '鍫嗗灈鏈哄搴旇揣浣嶇珯鍙板彿', type: 'string', width: 110, align: 'left', hidden: true },
- { field: 'isDelete', title: '鏄惁鍒犻櫎', type: 'bool', width: 110, align: 'left', hidden: true },
- { field: 'createID', title: '鍒涘缓ID', type: 'int', sort: true, width: 100, hidden: true, align: 'left' },
+ { field: 'remark', title: '妫�娴嬫煖鍏佽', type: 'string', width: 110, align: 'left' ,bind: { key: "AllowStatus", data: [] }},
{ field: 'creater', title: '鍒涘缓浜�', type: 'string', sort: true, width: 110, align: 'left' },
{ field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
- { field: 'modifyID', title: '淇敼浜篒D', type: 'int', sort: true, width: 100, hidden: true, align: 'left' },
{ field: 'modifier', title: '淇敼浜�', type: 'string', sort: true, width: 100, align: 'left' },
{ field: 'modifyDate', title: '淇敼鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
- { field: 'spare1', title: 'Spare1', type: 'string', sort: true, width: 110, hidden: true, align: 'left' },
- { field: 'spare2', title: 'Spare2', type: 'string', sort: true, width: 110, hidden: true, align: 'left' },
- { field: 'spare3', title: 'Spare3', type: 'string', sort: true, width: 110, hidden: true, align: 'left' },
- { field: 'spare4', title: 'Spare4', type: 'string', sort: true, width: 110, hidden: true, align: 'left' },
- { field: 'spare5', title: 'Spare5', type: 'string', sort: true, width: 110, hidden: true, align: 'left' }]);
+ ]);
const detail = ref({
cnName: "#detailCnName",
table: "#detailTable",
--
Gitblit v1.9.3