From 9e0e556bd76aa0bc856f3396e904842b637c79c3 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 04 十月 2023 20:28:01 +0800
Subject: [PATCH] 四项库工作明细档同步入库通知档数据

---
 src/main/webapp/static/js/wrkMast/wrkMast.js |   28 ++++++++++++++++++++++++----
 1 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index 692909a..e196bca 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -25,12 +25,13 @@
             ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
             ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'}
             ,{field: 'ioPri', align: 'center',title: '浼樺厛绾�'}
-            ,{field: 'crnNo$', align: 'center',title: '鍫嗗灈鏈�'}
+            // ,{field: 'crnNo$', align: 'center',title: '鍫嗗灈鏈�'}
             ,{field: 'sourceStaNo$', align: 'center',title: '婧愮珯'}
             ,{field: 'staNo$', align: 'center',title: '鐩爣绔�'}
             ,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�'}
             ,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'}
-            ,{field: 'steNo', align: 'center',title: '灏忚溅', width: 70}
+            ,{field: 'shuttleNo', align: 'center',title: '灏忚溅', width: 70}
+            ,{field: 'liftNo', align: 'center',title: '鎻愬崌鏈哄彿'}
             ,{field: 'barcode', align: 'center',title: '鏉$爜', hide: false}
             ,{field: 'preHave', align: 'center',title: '鍏堝叆鍝�', hide: true}
             ,{field: 'takeNone', align: 'center',title: '绌烘搷浣�', hide: true}
@@ -67,7 +68,7 @@
             //         return html;
             //     }}
 
-            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:250}
+            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:290}
         ]],
         request: {
             pageName: 'curr',
@@ -133,6 +134,7 @@
                 var list=[];
                 checkStatus.data.map(function (track) {
                     list.push({
+
                         wrkNo: track.wrkNo,
                         ioTime: track.ioTime,
                         ioPri: track.ioPri
@@ -198,7 +200,7 @@
                     content: 'wrkMast_detail.html',
                     success: function(layero, index){
                         layer.getChildFrame('#data-detail-submit-edit', index).hide();
-                    	clearFormVal(layer.getChildFrame('#detail', index));
+                        clearFormVal(layer.getChildFrame('#detail', index));
                         layer.getChildFrame('##dealDownLine', index).hide();layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
                     }
                 });
@@ -357,6 +359,24 @@
                     layer.closeAll();
                 });
                 break;
+            case 'priWrkMast':
+                layer.open({
+                    type: 2,
+                    title: '缁存姢宸ヤ綔妗�',
+                    maxmin: true,
+                    area: ['500px', top.detailHeight],
+                    shadeClose: false,
+                    content: 'wrkMast_detail.html',
+                    success: function(layero, index){
+                        layer.getChildFrame('#data-detail-submit-save', index).hide();
+                        setFormVal(layer.getChildFrame('#detail', index), data, false);
+                        top.convertDisabled(layer.getChildFrame('#locNo', index), true);
+                        layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+                        layero.find('iframe')[0].contentWindow.layui.form.render('select');
+                        layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+                    }
+                });
+                break;
         }
     });
 

--
Gitblit v1.9.1