From 1baeb88125f264fa1949a17a83a2c83182f79499 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期一, 30 五月 2022 13:01:07 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/salesOrder/salsesOrder.js |   63 ++++++++++++++++++++++++-------
 1 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/src/main/webapp/static/js/salesOrder/salsesOrder.js b/src/main/webapp/static/js/salesOrder/salsesOrder.js
index bdc5f19..2508d00 100644
--- a/src/main/webapp/static/js/salesOrder/salsesOrder.js
+++ b/src/main/webapp/static/js/salesOrder/salsesOrder.js
@@ -17,7 +17,10 @@
         , {field: 'inQty', align: 'center', title: '鍏ュ簱鏁伴噺', width: 110}
         , {field: 'disQty', align: 'center', title: '閫氱煡鍗�', width: 110}
         , {field: 'outQty', align: 'center', title: '鍑哄簱鏁伴噺', width: 110}
-
+        , {field: 'invoiceQty', align: 'center', title: '寮�绁ㄦ暟閲�'}
+        , {field: 'unInvoiceQty', align: 'center', title: '鏈紑绁ㄦ暟閲�'}
+        , {field: 'deliveryDate', align: 'center', title: '浜よ揣鏃ユ湡'}
+        , {field: 'personName', align: 'center', title: '涓氬姟鍛�'}
     );
     return cols;
 }
@@ -94,18 +97,13 @@
 /* 琛ㄦ牸鏁版嵁閲嶈浇 */
 function tableReload(child) {
     var searchData = {};
-    $.each($('#search-box [name]').serializeArray(), function () {
-        if (this.name == 'orderCode') {
-            searchData.orderCode = this.value;
-        }
+    $.each($('#search-box [name]').serializeArray(), function() {
+        searchData[this.name] = this.value;
         if (this.name == 'orderTime') {
             searchData.startTime = this.value.substring(0, 10);
             searchData.endTime = this.value.substring(13, this.value.length);
         }
     });
-
-    console.log(searchData);
-
     (child ? parent.tableIns : tableIns).reload({
         where: searchData,
         page: {
@@ -113,24 +111,61 @@
         },
         done: function (res, curr, count) {
             if (res.code === 403) {
-                top.location.href = baseUrl + "/";
+                top.location.href = baseUrl+"/";
             }
-            pageCurr = curr;
+            pageCurr=curr;
             if (res.data.length === 0 && count !== 0) {
                 tableIns.reload({
                     where: searchData,
                     page: {
-                        curr: pageCurr - 1
+                        curr: pageCurr-1
                     }
                 });
                 pageCurr -= 1;
             }
-            limit(child);
-            // 褰撳墠鍒嗛〉鏁版嵁瀛樺偍
-            locNormalList = res.data;
+            // limit(child);
         }
     });
 }
+// function tableReload(child) {
+//     var searchData = {};
+//     $.each($('#search-box [name]').serializeArray(), function () {
+//         if (this.name == 'orderCode') {
+//             searchData.orderCode = this.value;
+//         }
+//         if (this.name == 'orderTime') {
+//             searchData.startTime = this.value.substring(0, 10);
+//             searchData.endTime = this.value.substring(13, this.value.length);
+//         }
+//     });
+//
+//     console.log(searchData);
+//
+//     (child ? parent.tableIns : tableIns).reload({
+//         where: searchData,
+//         page: {
+//             curr: pageCurr
+//         },
+//         done: function (res, curr, count) {
+//             if (res.code === 403) {
+//                 top.location.href = baseUrl + "/";
+//             }
+//             pageCurr = curr;
+//             if (res.data.length === 0 && count !== 0) {
+//                 tableIns.reload({
+//                     where: searchData,
+//                     page: {
+//                         curr: pageCurr - 1
+//                     }
+//                 });
+//                 pageCurr -= 1;
+//             }
+//             // limit(child);
+//             // 褰撳墠鍒嗛〉鏁版嵁瀛樺偍
+//             locNormalList = res.data;
+//         }
+//     });
+// }
 
 /* 鐩戝惉鍥炶溅浜嬩欢 */
 $('body').keydown(function () {

--
Gitblit v1.9.1