From 2c45d7ff2ae596c50996a59d1faf51388a3898d7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 23 三月 2022 10:15:29 +0800
Subject: [PATCH] #杰克缝纫机立库 【优化单据管理】

---
 src/main/webapp/static/js/order/order.js |   45 ++++++++++++++++++++++++---------------------
 1 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 48e11b9..a06f4a9 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -12,17 +12,19 @@
 
     // 娓叉煋琛ㄦ牸
     var insTb = table.render({
-        elem: '#waitMatin',
-        url: baseUrl+'/waitMatin/head/page/auth',
+        elem: '#order',
+        url: baseUrl+'/order/head/page/auth',
         headers: {token: localStorage.getItem('token')},
         page: true,
         cellMinWidth: 100,
         cols: [[
             {type: 'numbers'},
-            {field: 'billNo', title: '鍗曟嵁缂栧彿', sort: true},
-            {field: 'billType$', align: 'center', title: '绫诲瀷',  minWidth: 160, width: 160},
+            {field: 'orderNo', title: '鍗曟嵁缂栧彿', sort: true},
+            {field: 'docType$', align: 'center', title: '绫诲瀷',  minWidth: 160, width: 160},
             {align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
-            {field: 'appeTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
+            {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},
             {align: 'center', title: '鎿嶄綔', toolbar: '#operate', minWidth: 130, width: 130}
         ]],
         request: {
@@ -48,17 +50,17 @@
     });
 
     // 鎼滅储
-    form.on('submit(waitMatinSearch)', function (data) {
+    form.on('submit(tbSearch)', function (data) {
         insTb.reload({where: data.field, page: {curr: 1}});
     });
 
     // 娣诲姞
-    $("#waitMatinAddBtn").click(function () {
+    $("#orderAddBtn").click(function () {
         showEditModel();
     });
 
     // 宸ュ叿鏉$偣鍑讳簨浠�
-    table.on('tool(waitMatin)', function (obj) {
+    table.on('tool(order)', function (obj) {
         var data = obj.data;
         var layEvent = obj.event;
         if (layEvent === 'edit') {
@@ -73,7 +75,7 @@
             layer.open({
                 type: 1,
                 title: false,
-                area: '800px',
+                area: '700px',
                 offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
                 shade: .01,
                 shadeClose: true,
@@ -83,24 +85,25 @@
                     table.render({
                         elem: '#lookSSXMTable',
                         headers: {token: localStorage.getItem('token')},
-                        url: baseUrl+'/waitMatin/list/auth',
+                        url: baseUrl+'/orderDetl/list/auth',
                         where: {
-                            bill_no: data.billNo
+                            order_id: data.id
                         },
                         page: true,
                         cellMinWidth: 100,
                         cols: [[
                             {type: 'numbers'},
-                            {field: 'matNo', title: '鐗╂枡缂栫爜'},
-                            {field: 'matName', title: '鐗╂枡鍚嶇О', width: 160},
-                            {field: 'qty', title: '鏁伴噺'},
-                            {
-                                field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
-                                    return util.toDateString(d.createTime);
-                                },  width: 180
-                            },
-                            {field: 'inQty', title: '宸插叆搴撻噺'},
-                            {field: 'color', title: '棰滆壊'},
+                            {field: 'matnr', title: '鍟嗗搧缂栫爜'},
+                            {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
+                            {field: 'batch', title: '鎵瑰彿'},
+                            {field: 'count', title: '鏁伴噺'},
+                            // {
+                            //     field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
+                            //         return util.toDateString(d.createTime);
+                            //     },  width: 180
+                            // },
+                            // {field: 'inQty', title: '宸插叆搴撻噺'},
+                            // {field: 'color', title: '棰滆壊'},
                             {field: 'specs', title: '瑙勬牸'}
                         ]],
                         request: {

--
Gitblit v1.9.1