From cb7339c12d6cd3f4d1668d27d34dbb4b515cc6c1 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 26 五月 2023 09:50:20 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/order/order.js |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 79809b9..133061c 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -48,6 +48,7 @@
             {field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
             {field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl',  minWidth: 160, width: 160},
             {field: 'memo', align: 'center',title: '澶囨敞', hide: true},
+            {field: 'createBy$', align: 'center', title: '鎿嶄綔鍛�',  minWidth: 160, width: 160},
             {align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 260}
         ]],
         request: {
@@ -124,7 +125,7 @@
     }
     function addPakOut(expTpe) {
         $.ajax({
-            url: baseUrl+"/ManPakOut/add/auth",
+            url: baseUrl+"/pakout/add/auth",
             headers: {'token': localStorage.getItem('token')},
             data: JSON.stringify({
                 docType: Number(20),
@@ -190,9 +191,11 @@
                             {type: 'numbers'},
                             {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
                             {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
-                            {field: 'batch', title: '鎵瑰彿'},
+                            {field: 'owner$', title: '璐т富', width: 160},
+                            {field: 'payment$', title: '璐х墿鐗瑰緛', width: 160},
+                            // {field: 'batch', title: '鎵瑰彿'},
                             {field: 'anfme', title: '鏁伴噺'},
-                            // {field: 'workQty', title: '浣滀笟鏁伴噺'},
+                            {field: 'workQty', title: '浣滀笟鏁伴噺'},
                             {field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
                             // {field: 'unit', title: '鍗曚綅'},
                             // {
@@ -202,7 +205,8 @@
                             // },
                             // {field: 'inQty', title: '宸插叆搴撻噺'},
                             // {field: 'color', title: '棰滆壊'},
-                            {field: 'specs', title: '瑙勬牸'}
+                            // {field: 'specs', title: '瑙勬牸'},
+                            // {field: 'weight', title: '閲嶉噺'}
                         ]],
                         request: {
                             pageName: 'curr',
@@ -262,6 +266,12 @@
                             return false;
                         }
                     }
+                    for (let xi = 0; xi < nList.length; xi++) {
+                        if (nList[xi].owner <= 0){
+                            layer.msg('璐т富缂栧彿璇锋煡鐪嬭揣涓绘。妗�', {icon: 2});
+                            return false;
+                        }
+                    }
                     layer.load(2);
                     $.ajax({
                         url: baseUrl+"/order/form/" + (isExpAdd?"add":"modify") + "/auth",
@@ -305,6 +315,7 @@
                         {field: 'batch', title: '鎵瑰彿', edit: true},
                         {field: 'specs', title: '瑙勬牸'},
                         {field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
+                        {field: 'owner', title: '璐т富缂栧彿', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
                         {field: 'qty', title: '浣滀笟鏁伴噺',  minWidth: 100, width: 100},
                         // {field: 'unit', title: '鍗曚綅', width: 80},
                         {field: 'memo', title: '澶囨敞' , edit: true},

--
Gitblit v1.9.1