From 14aa8a9a4369fe0dc23ea8abfaab10caea78c9e7 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 31 八月 2023 15:03:49 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/order/order.js |   62 +++++++++++++++++++++++++++---
 1 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 3a7bc90..232a262 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -146,6 +146,7 @@
         })
     }
 
+
     // 宸ュ叿鏉$偣鍑讳簨浠�
     table.on('tool(order)', function (obj) {
         var data = obj.data;
@@ -191,9 +192,10 @@
                             {type: 'numbers'},
                             {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
                             {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
-                            {field: 'batch', title: '鎵瑰彿'},
+
+                            // {field: 'batch', title: '鎵瑰彿'},
                             {field: 'anfme', title: '鏁伴噺'},
-                            // {field: 'workQty', title: '浣滀笟鏁伴噺'},
+                            {field: 'workQty', title: '浣滀笟鏁伴噺'},
                             {field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
                             // {field: 'unit', title: '鍗曚綅'},
                             // {
@@ -203,8 +205,8 @@
                             // },
                             // {field: 'inQty', title: '宸插叆搴撻噺'},
                             // {field: 'color', title: '棰滆壊'},
-                            {field: 'specs', title: '瑙勬牸'},
-                            {field: 'weight', title: '閲嶉噺'}
+                            // {field: 'specs', title: '瑙勬牸'},
+                             {field: 'weight', title: '閲嶉噺'}
                         ]],
                         request: {
                             pageName: 'curr',
@@ -228,6 +230,9 @@
                     });
                 }
             });
+        }
+        else if (layEvent === 'printExcel'){
+            printExcel(data);
         }
     });
 
@@ -254,6 +259,7 @@
                         return false;
                     }
                     let nList = admin.util.deepClone(xxDataList);
+                    console.log(nList);
                     for (let xi = 0; xi < nList.length; xi++) {
                         if (nList[xi].anfme <= 0){
                             layer.msg('鏄庣粏淇敼鏁伴噺涓嶅悎娉�', {icon: 2});
@@ -264,6 +270,7 @@
                             return false;
                         }
                     }
+
                     layer.load(2);
                     $.ajax({
                         url: baseUrl+"/order/form/" + (isExpAdd?"add":"modify") + "/auth",
@@ -304,19 +311,43 @@
                         {type: 'numbers', title: '#'},
                         {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
                         {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
-                        {field: 'batch', title: '鎵瑰彿', edit: true},
                         {field: 'specs', title: '瑙勬牸'},
+                        {field: 'weight', title: '閲嶉噺', edit: true},
                         {field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
+
+                        // {field: 'payment', title: '璐х墿鐘舵��',align: 'center', templet: '#payment'},
                         {field: 'qty', title: '浣滀笟鏁伴噺',  minWidth: 100, width: 100},
                         // {field: 'unit', title: '鍗曚綅', width: 80},
                         {field: 'memo', title: '澶囨敞' , edit: true},
                         {align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
                     ]],
-                    done: function (res) {
+                    done: function (res, curr, count) {
                         $(layero).find('.layui-table-view').css('margin', '0');
+                        var options = this;
+
+                        // 鑾峰彇褰撳墠琛屾暟鎹�
+                        table.getRowData = function(elem){
+                            var index = $(elem).closest('tr').data('index');
+                            return table.cache[options.id][index] || {};
+                        };
+
+                        $('.select-primary').on('change', function(){
+                            var value = this.value; // 鑾峰彇閫変腑椤� value
+                            var data = table.getRowData(this);
+                            console.log(value);
+                            xxDataList.forEach(res => {
+                                if (data.id === res.id){
+                                    console.log(res)
+                                    res.payment = value;
+                                }
+                            })
+
+
+                        });
                     },
                     size: ''
                 };
+
                 if (!isExpAdd) {
                     $.ajax({
                         url: baseUrl+"/order/detl/all/auth?orderId=" + expTpe.id,
@@ -387,7 +418,7 @@
                         }
                     }
                     data[obj.field] = obj.value;
-                    insTbSSXM.reload({data: xxDataList});
+                   insTbSSXM.reloadData({data: xxDataList,scrollPos: true});
                 });
 
                 $('#matAddBtnComment').click(function () {
@@ -469,7 +500,11 @@
 
             }
         });
+
+
     }
+
+
 
     // 鍒犻櫎鍗曟嵁
     function doDel(orderId) {
@@ -548,4 +583,17 @@
         ,type: 'datetime'
         ,range: true
     });
+
+    function printExcel(data){
+        layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+            layer.closeAll();
+            layer.load(1, {shade: [0.1,'#fff']});
+            // location.href = "http://192.168.4.121:8082/stwms/orderCheck/printExport/auth?orderNo="+data.orderNo;
+            location.href = "http://10.114.97.100:8080/stwms/order/printExport/auth?orderNo="+data.orderNo;
+            layer.closeAll('loading');
+        });
+    }
+
+
+
 });

--
Gitblit v1.9.1