From 048754581793509a57481dfcb7c51f838cb7f576 Mon Sep 17 00:00:00 2001
From: houshuai <17802598606@163.com>
Date: 星期一, 07 七月 2025 20:49:33 +0800
Subject: [PATCH] 生产管控模块 基本搭建2

---
 src/views/mes/MesMaterialLoadingList.vue |   50 ++++++++++++++++++++++++++++++++++----------------
 1 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/src/views/mes/MesMaterialLoadingList.vue b/src/views/mes/MesMaterialLoadingList.vue
index 06cd945..3a27577 100644
--- a/src/views/mes/MesMaterialLoadingList.vue
+++ b/src/views/mes/MesMaterialLoadingList.vue
@@ -127,9 +127,24 @@
             dataIndex: 'delFlag'
           },
           {
-            title:'鐢宠鍗旾D',
+            title:'宸ュ崟ID',
             align:"center",
-            dataIndex: 'requestId'
+            dataIndex: 'workOrderId'
+          },
+          {
+            title:'璁惧ID',
+            align:"center",
+            dataIndex: 'equipmentId'
+          },
+          {
+            title:'宸ュ簭缂栫爜',
+            align:"center",
+            dataIndex: 'processCode'
+          },
+          {
+            title:'宸ュ簭鍚嶇О',
+            align:"center",
+            dataIndex: 'processName'
           },
           {
             title:'鐗╂枡缂栫爜',
@@ -142,17 +157,17 @@
             dataIndex: 'materialName'
           },
           {
-            title:'鐞嗚鎷夊姩鏁伴噺',
+            title:'鎵规鍙�',
             align:"center",
-            dataIndex: 'specifiedQuantity'
+            dataIndex: 'batchNumber'
           },
           {
-            title:'瀹為檯鎷夊姩鏁伴噺',
+            title:'鏁伴噺',
             align:"center",
-            dataIndex: 'actualQuantity'
+            dataIndex: 'quantity'
           },
           {
-            title:'杞﹂棿鍓╀綑鏁伴噺',
+            title:'鍓╀綑鏁伴噺',
             align:"center",
             dataIndex: 'remainingQuantity'
           },
@@ -166,11 +181,11 @@
           }
         ],
         url: {
-          list: "/mesmaterialloading/mesMaterialLoading/list",
-          delete: "/mesmaterialloading/mesMaterialLoading/delete",
-          deleteBatch: "/mesmaterialloading/mesMaterialLoading/deleteBatch",
-          exportXlsUrl: "/mesmaterialloading/mesMaterialLoading/exportXls",
-          importExcelUrl: "mesmaterialloading/mesMaterialLoading/importExcel",
+          list: "/mes/mesMaterialLoading/list",
+          delete: "/mes/mesMaterialLoading/delete",
+          deleteBatch: "/mes/mesMaterialLoading/deleteBatch",
+          exportXlsUrl: "/mes/mesMaterialLoading/exportXls",
+          importExcelUrl: "mes/mesMaterialLoading/importExcel",
           
         },
         dictOptions:{},
@@ -191,12 +206,15 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'int',value:'delFlag',text:'鍒犻櫎鏍囪',dictCode:''})
-        fieldList.push({type:'string',value:'requestId',text:'鐢宠鍗旾D',dictCode:''})
+        fieldList.push({type:'string',value:'workOrderId',text:'宸ュ崟ID',dictCode:''})
+        fieldList.push({type:'string',value:'equipmentId',text:'璁惧ID',dictCode:''})
+        fieldList.push({type:'string',value:'processCode',text:'宸ュ簭缂栫爜',dictCode:''})
+        fieldList.push({type:'string',value:'processName',text:'宸ュ簭鍚嶇О',dictCode:''})
         fieldList.push({type:'string',value:'materialNumber',text:'鐗╂枡缂栫爜',dictCode:''})
         fieldList.push({type:'string',value:'materialName',text:'鐗╂枡鍚嶇О',dictCode:''})
-        fieldList.push({type:'double',value:'specifiedQuantity',text:'鐞嗚鎷夊姩鏁伴噺',dictCode:''})
-        fieldList.push({type:'double',value:'actualQuantity',text:'瀹為檯鎷夊姩鏁伴噺',dictCode:''})
-        fieldList.push({type:'double',value:'remainingQuantity',text:'杞﹂棿鍓╀綑鏁伴噺',dictCode:''})
+        fieldList.push({type:'string',value:'batchNumber',text:'鎵规鍙�',dictCode:''})
+        fieldList.push({type:'double',value:'quantity',text:'鏁伴噺',dictCode:''})
+        fieldList.push({type:'double',value:'remainingQuantity',text:'鍓╀綑鏁伴噺',dictCode:''})
         this.superFieldList = fieldList
       }
     }

--
Gitblit v1.9.3