From b381a91b41726de9c0dccfb382eda4a3aecfd80f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 13 九月 2023 16:14:52 +0800
Subject: [PATCH] #盘点完成

---
 src/main/webapp/static/js/orderCheck/orderCheck.js |   40 +++++++++-------------------------------
 1 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/src/main/webapp/static/js/orderCheck/orderCheck.js b/src/main/webapp/static/js/orderCheck/orderCheck.js
index 9974fc3..ae2a8e0 100644
--- a/src/main/webapp/static/js/orderCheck/orderCheck.js
+++ b/src/main/webapp/static/js/orderCheck/orderCheck.js
@@ -138,8 +138,8 @@
                             {field: 'anfme', title: '鏁伴噺'},
                             {field: 'realAnfme', title: '鐪熷疄鏁伴噺',style: 'color: blue;font-weight: bold', edit: true},
                             {field: 'diffAnfme', title: '宸紓鏁伴噺', style: 'font-weight: bold'},
-                            {field: 'type$', title: '鐘舵��'},
-                            {align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar3', minWidth: 80, width: 80, fixed: 'right'}
+                            {field: 'type$', title: '鐘舵��'}
+
                         ]],
                         request: {
                             pageName: 'curr',
@@ -268,9 +268,9 @@
                         {field: 'anfme', title: '搴撳瓨鏁伴噺'},
                         {field: 'realAnfme', title: '鐪熷疄鏁伴噺'},
                         {field: 'diffAnfme', title: '宸紓鏁伴噺', style: 'font-weight: bold'},
-                        {field: 'type$', title: '鐘舵��'},
+                        {field: 'type$', title: '鐘舵��'}
 
-                        {align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBarr', minWidth: 80, width: 80, fixed: 'right'}
+
                     ]],
                     done: function (res) {
                         $(layero).find('.layui-table-view').css('margin', '0');
@@ -782,49 +782,28 @@
     function examine(expTpe) {
         admin.open({
             type: 1,
-            title: (expTpe ? '淇敼' : '娣诲姞') + '鐩樼偣鍗�',
+            title: '瀹℃牳鐩樼偣鍗�',
             content: $('#editDialog2').html(),
             area: '1300px',
             success: function (layero, dIndex) {
                 $(layero).children('.layui-layer-content').css('overflow', 'visible');
                 var isExpAdd = !expTpe;
                 // 鍥炴樉鏁版嵁
-                form.val('editForm', expTpe);
+                form.val('editForm2', expTpe);
                 if (expTpe) {
                     $('#orderNo').attr("disabled", "disabled");
                 }
                 // 琛ㄥ崟鎻愪氦浜嬩欢
-                form.on('submit(orderEditSubmit)', function (data) {
-                    // 缁勮鏁版嵁
-                    if (xxDataList.length <= 0) {
-                        layer.tips('璇锋坊鍔犲崟鎹槑缁�', '#matAddBtnComment', {tips: [1, '#ff4c4c']});
-                        return false;
-                    }
-                    if (data.field.orderNo == "" || data.field.orderNo == null) {
-                        layer.tips('璇疯緭鍏ョ洏鐐瑰崟缂栧彿', '#orderNo', {tips: [1, '#ff4c4c']});
-                        return false;
-                    }
+                form.on('submit(examine)', function (data) {
                     let nList = admin.util.deepClone(xxDataList);
-                    // for (let xi = 0; xi < nList.length; xi++) {
-                    //     if (nList[xi].anfme <= 0){
-                    //         layer.msg('鏄庣粏淇敼鏁伴噺涓嶅悎娉�', {icon: 2});
-                    //         return false;
-                    //     }
-                    //     if (nList[xi].anfme < nList[xi].workQty){
-                    //         layer.msg('鏁伴噺涓嶈兘灏忎簬宸蹭綔涓氭暟閲�', {icon: 2});
-                    //         return false;
-                    //     }
-                    // }
                     layer.load(2);
                     console.log(data);
                     $.ajax({
-                        url: baseUrl + "/orderCheck/form/" + (isExpAdd ? "add" : "modify") + "/auth",
+                        url: baseUrl + "/orderCheck/examine",
                         headers: {'token': localStorage.getItem('token')},
                         data: JSON.stringify({
-                            orderId: Number(data.field.id),
-                            docType: Number(data.field.docType),
                             orderNo: data.field.orderNo,
-                            orderDetlList: nList
+                            list: nList
                         }),
                         contentType: 'application/json;charset=UTF-8',
                         method: 'POST',
@@ -862,7 +841,6 @@
                         {field: 'realAnfme', title: '鐪熷疄鏁伴噺'},
                         {field: 'diffAnfme', title: '宸紓鏁伴噺', style: 'font-weight: bold'},
                         {field: 'type$', title: '鐘舵��'}
-
 
                     ]],
                     done: function (res) {

--
Gitblit v1.9.1