From be26d5065b4a07123638c220c0792e9250a458e6 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期四, 11 一月 2024 09:41:27 +0800
Subject: [PATCH] 批次上料

---
 guns-vip-main/src/main/webapp/assets/modular/om/productionOrderBatchInfo/productionOrderBatchInfo.js |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/guns-vip-main/src/main/webapp/assets/modular/om/productionOrderBatchInfo/productionOrderBatchInfo.js b/guns-vip-main/src/main/webapp/assets/modular/om/productionOrderBatchInfo/productionOrderBatchInfo.js
index 948a267..241c742 100644
--- a/guns-vip-main/src/main/webapp/assets/modular/om/productionOrderBatchInfo/productionOrderBatchInfo.js
+++ b/guns-vip-main/src/main/webapp/assets/modular/om/productionOrderBatchInfo/productionOrderBatchInfo.js
@@ -24,12 +24,15 @@
             {field: 'locationCode', sort: true, title: '宸ヤ綅缂栧彿', width: 105},
             //{field: 'loadingCode', sort: true, title: '鎵爜宸ヤ綅缂栧彿', width: 105},
             {field: 'materialCode', sort: true, title: '鐗╂枡缂栫爜'},
-            {field: 'spareField1', sort: true, title: '鍓╀綑鏁伴噺'},
-            {field: 'loadingCode', sort: true, title: '鐗╂枡鎵规'},
-            {field: 'state', sort: true, title: '鏄惁鎵爜', width: 105,templet: '#stateTpl'},
+            {field: 'batch', sort: true, title: '鐗╂枡鎵规'},
+            {field: 'quantity', sort: true, title: '涓婃枡鏁伴噺'},
+            {field: 'residueQuantity', sort: true, title: '鍓╀綑鏁伴噺'},
+            {field: 'unit', sort: true, title: '鍗曚綅'},
+
+            {field: 'status', sort: true, title: '鏄惁涓婃枡', width: 105,templet: '#stateTpl'},
             {field: 'createTime', sort: true, title: '鍒涘缓鏃堕棿',minWidth:160},
             // {field: 'updateTime', sort: true, title: '淇敼鏃堕棿',minWidth:160},
-            {align: 'center', toolbar: '#tableBar', title: '鎿嶄綔'}
+            //{align: 'center', toolbar: '#tableBar', title: '鎿嶄綔'}
         ]];
     };
 
@@ -39,8 +42,9 @@
     ProductionOrderBatchInfo.search = function () {
         var queryData = {};
         queryData['workOrderNo'] = $("#workOrderNo").val();
-        queryData['productionLine'] = $("#productionLine").val();
         queryData['locationCode'] = $("#locationCode").val();
+        queryData['loadingCode'] = $("#loadingCode").val();
+        queryData['status'] = $("#status").val();
 
         table.reload(ProductionOrderBatchInfo.tableId, {
             where: queryData, page: {curr: 1}

--
Gitblit v1.9.3