From 464b41d1c0098dde4738c0577c5e6f162b46b349 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期四, 31 三月 2022 10:38:17 +0800
Subject: [PATCH] .

---
 src/main/webapp/views/quality/waitMatoutQuery.html |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/views/quality/waitMatoutQuery.html b/src/main/webapp/views/quality/waitMatoutQuery.html
index 0fabe7f..dddd0cc 100644
--- a/src/main/webapp/views/quality/waitMatoutQuery.html
+++ b/src/main/webapp/views/quality/waitMatoutQuery.html
@@ -201,16 +201,18 @@
         var cols = [
             // {type: 'checkbox', fixed: 'left'},
             {field: 'billNo', title: '妫�楠屽崟鍙�', align: 'center', width: 175}
-            ,{field: 'seqNo', title: '琛屽彿', align: 'center'}
-            ,{field: 'orderNo', title: '鍏ュ簱鍗曞彿', align: 'center'}
+            ,{field: 'seqNo', title: '琛屽彿', align: 'center', width: 60}
+            ,{field: 'orderNo', title: '鍏ュ簱鍗曞彿', align: 'center', width: 175}
             ,{field: 'anfme', title: '鏁伴噺', align: 'center'}
-            ,{field: 'matnr', title: '鍟嗗搧缂栫爜', align: 'center'}
+            ,{field: 'matnr', title: '鍟嗗搧缂栫爜', align: 'center', width: 175}
             ,{field: 'maktx', title: '鍟嗗搧鍚嶇О', align: 'center'}
             ,{field: 'batch', title: '鎵瑰彿', align: 'center'}
             ,{field: 'prodDate$', title: '鐢熶骇鏃ユ湡', align: 'center'}
             ,{field: 'rejectQty', title: '涓嶅悎鏍兼暟閲�', align: 'center'}
             ,{field: 'rejectReason', title: '涓嶅悎鏍煎師鍥�', align: 'center'}
             ,{field: 'quaStatus$', title: '璐ㄦ鐘舵��', align: 'center'}
+            ,{field: 'quaUser$', title: '璐ㄦ浜哄憳', align: 'center'}
+            ,{field: 'quaDate$', title: '璐ㄦ鏃堕棿', align: 'center'}
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operateCheck', width:140}
             // ,{field: 'orderNo', title: '璁㈠崟鍙�', width:115, align: 'center'}
             // ,{field: 'specs', align: 'center',title: '灞炴��'}
@@ -300,11 +302,11 @@
                     form.on('submit(editSubmit)', function (data) {
                         if(data.field.rejectQty<0){
                             layer.msg("涓嶅悎鏍兼暟閲忎笉鍙皬浜�0")
-                            return;
+                            return false;
                         }
-                        if(data.field.rejectQty>data.field.anfme){
+                        if(Number(data.field.rejectQty)>Number(data.field.anfme)){
                             layer.msg("涓嶅悎鏍兼暟閲忎笉鍙ぇ浜庡叆搴撴暟閲�");
-                            return;
+                            return false;
                         }
                         var loadIndex = layer.load(2);
                         $.ajax({

--
Gitblit v1.9.1