From 6f01b51fc0770fda7787076caf0314be7a7f6656 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 27 六月 2025 10:58:21 +0800
Subject: [PATCH] #

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

diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index e9d8a02..d5f9d4d 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -44,10 +44,11 @@
             {type: 'numbers'},
             {field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
             {field: 'docType$', align: 'center', title: '绫诲瀷',  minWidth: 160, width: 160},
+            {field: 'cstmrName', align: 'center', title: '瀹㈡埛'},
             {align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
             {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: 'remark', align: 'center',title: '澶囨敞'},
             {align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 180}
         ]],
         request: {
@@ -77,6 +78,13 @@
     // 鎼滅储
     form.on('submit(tbSearch)', function (data) {
         insTb.reload({where: data.field, page: {curr: 1}});
+    });
+
+    // 閲嶇疆
+    form.on('submit(reset)', function (data) {
+        pageCurr = 1;
+        clearFormVal($('#search-box'));
+        tableReload(false);
     });
 
     // 娣诲姞
@@ -126,6 +134,7 @@
                             {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
                             {field: 'specs', title: '瑙勬牸'},
                             {field: 'batch', title: '鎵瑰彿'},
+                            {field: 'weight', title: '杈呮暟閲�'},
                             {field: 'anfme', title: '寰呭畬缁撴暟閲�'},
                             {field: 'qty', title: '寰呬笂鎶ユ暟閲�', style: 'font-weight: bold'},
                             {field: 'workQty', title: '宸蹭笂鎶ユ暟閲�'},
@@ -206,6 +215,8 @@
                             orderNo: data.field.orderNo,
                             itemId: Number(data.field.itemId),
                             itemName: data.field.itemName,
+                            defNumber: Number(data.field.defNumber),
+                            cstmr: data.field.cstmr,
                             orderDetlList: nList
                         }),
                         contentType:'application/json;charset=UTF-8',
@@ -546,3 +557,14 @@
         ,range: true
     });
 });
+
+function tableReload(child) {
+    var searchData = {};
+    $.each($('#search-box [name]').serializeArray(), function() {
+        searchData[this.name] = this.value;
+    });
+    insTb.reload({
+        where: searchData,
+        page: {curr: pageCurr}
+    });
+}

--
Gitblit v1.9.1