From 68ad4cf704c0a7c575936455d07e3e2f53fefbc4 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期五, 26 三月 2021 14:29:26 +0800
Subject: [PATCH] 1.0.5 1.小太阳需求改动

---
 src/main/webapp/static/js/salesOrder/salsesOrder.js |   34 ++++++++++++++++++++++++----------
 1 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/main/webapp/static/js/salesOrder/salsesOrder.js b/src/main/webapp/static/js/salesOrder/salsesOrder.js
index ffa4cfd..df18260 100644
--- a/src/main/webapp/static/js/salesOrder/salsesOrder.js
+++ b/src/main/webapp/static/js/salesOrder/salsesOrder.js
@@ -3,11 +3,18 @@
 function getCol() {
     var cols = [];
     cols.push(
-        {field: 'orderNo', align: 'center', title: '璁㈠崟缂栧彿'}
-        , {field: 'col1', align: 'center', title: '璁㈠崟鍚嶇О'}
-        , {field: 'col2', align: 'center', title: '璁㈠崟璇︽儏'}
-        , {field: 'col3', align: 'center', title: '璁㈠崟瀹㈡埛'}
-        , {field: 'col4', align: 'center', title: '璁㈠崟鐘舵��'}
+        {field: 'orderCode', align: 'center', title: '璁㈠崟缂栧彿'}
+        , {field: 'orderDate', align: 'center', title: '璁㈠崟鏃ユ湡'}
+        , {field: 'invCode', align: 'center', title: '鐗╂枡缂栫爜'}
+        , {field: 'invName', align: 'center', title: '鐗╂枡鍚嶇О'}
+        , {field: 'invStd', align: 'center', title: '瑙勬牸鍨嬪彿'}
+        , {field: 'invUnit', align: 'center', title: '鍗曚綅'}
+        , {field: 'orderQty', align: 'center', title: '璁㈠崟鏁伴噺'}
+        , {field: 'izMrp', align: 'center', title: '鏄惁mrp璁$畻', hide: true}
+        , {field: 'productQty', align: 'center', title: '鐢熶骇浠诲姟鍗曟暟閲�'}
+        , {field: 'izReceive', align: 'center', title: '鏄惁鏀舵枡', hide: true}
+        , {field: 'inQty', align: 'center', title: '浜ф垚鍝佸叆搴撴暟閲�'}
+        , {field: 'outQty', align: 'center', title: '鍙戣揣鏁伴噺'}
         , {fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 80}
     );
     return cols;
@@ -28,11 +35,18 @@
         // url: baseUrl+'/matCode/list/auth',
         data: [
             {
-                "orderNo": 20210315000001,
-                "col1": "瑗跨彮鐗檟x 210315鍙�",
-                "col2": "鍏板崥鍩哄凹绔ヨ溅 5000鍙�",
-                "col3": "瑗跨彮鐗檟x鍎跨鐜╁叿鍏徃",
-                "col4": "鐢熶骇涓�",
+                "orderCode": 20210315000001,
+                "orderDate": "2021-03-26 13:40",
+                "invCode": "CPXXX00123",
+                "invName": "鍏板崥鍩哄凹鎺堟潈鍎跨杞�",
+                "invStd": "21脳25",
+                "invUnit": "杈�",
+                "orderQty": 300,
+                "izMrp": "鍚�",
+                "productQty": 150,
+                "izReceive": "鏄�",
+                "inQty": 50,
+                "outQty": 0,
             }
         ],
         page: true,

--
Gitblit v1.9.1