From 36343b85b0c883ebfdf3c17b173f263fd2bfcb93 Mon Sep 17 00:00:00 2001
From: 陈勇 <chenyong@hnkhzn.com>
Date: 星期二, 19 十一月 2024 10:25:53 +0800
Subject: [PATCH] 合并

---
 Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_LocationInfo.vue |   28 +++++++++++-----------------
 1 files changed, 11 insertions(+), 17 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 53091df..9c96efd 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
@@ -11,28 +11,22 @@
     </view-grid>
 </template>
 <script>
-import extend from "@/extension/widesea_wms/basicinfo/Dt_LocationInfo.js";
+import extend from "@/extension/widesea_wms/basicinfo/Dt_LocationInfo.jsx";
 import { ref, defineComponent } from "vue";
 export default defineComponent({
     setup() {
         const table = ref({
-            key: 'locationID',
+            key: 'id',
             footer: "Foots",
             cnName: '璐т綅淇℃伅',
             name: 'basicinfo/Dt_LocationInfo',
             url: "/LocationInfo/",
-            sortName: "LocationID"
+            sortName: "id"
         });
-        const editFormFields = ref({ "status": "", "scNo": "", "roadWayNO": "", "locationCode": "", "wareAreaCode": "" });
+        const editFormFields = ref({ "locationStatus": "" });
         const editFormOptions = ref([
             [
-                { "title": "璐т綅缂栧彿", "field": "locationCode", type: "text" },
-                { "title": "璐т綅鐘舵��", "field": "status", "type": "select", dataKey: "LocationState", data: [] },
-                { "title": "瀵瑰簲鍫嗗灈鏈哄彿", "field": "scNo", type: "text" },
-                { "title": "宸烽亾缂栧彿", "field": "roadWayNO", type: "text" },
-
-            ], [
-                { "title": "搴撳尯缂栧彿", "field": "wareAreaCode", type: "text" },
+                { "title": "璐т綅鐘舵��", "field": "locationStatus", "type": "select", dataKey: "LocationState", data: [] },
             ]
         ]);
         const searchFormFields = ref({ "LocationID": "" });
@@ -47,16 +41,16 @@
         const columns = ref([{ field: 'locationID', title: '璐т綅ID', type: 'int', width: 110, hidden: true, readonly: true, require: true, align: 'left' },
         { field: 'locationCode', title: '璐т綅缂栧彿', type: 'string', width: 110, require: true, align: 'left' },
         { field: 'locationName', title: '璐т綅鍚嶇О', type: 'string', width: 120, align: 'left' },
-        { field: 'roadWayNO', title: '宸烽亾鍙�', type: 'string', width: 110, require: true, align: 'left', sort: true },
+        { field: 'roadwayNo', title: '宸烽亾鍙�', type: 'string', width: 110, require: true, align: 'left', sort: true },
         { 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: 'scNo', title: '瀵瑰簲鍫嗗灈鏈哄彿', type: 'string', width: 110, align: 'left' },
-        { field: 'locationType', title: '璐т綅绫诲瀷', type: 'int', 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: 'locationStatus', title: '璐т綅鐘舵��', type: 'int', width: 110, align: 'left', bind: { key: "LocationState", data: [] } },
-        { field: 'isLocked', title: '鏄惁閿佸畾', type: 'bool', width: 110, align: 'left' , bind: { key: "IsLocked", data: [] } },
-        { field: 'locationDesc', title: '璐т綅鎻忚堪', type: 'string', width: 110, align: 'left' },
+        { 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 },

--
Gitblit v1.9.3