From 82c794aa1691821120ca4c6c8fda54a18cbb95f0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 16 七月 2020 11:01:32 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into xtyasrs

---
 src/main/webapp/static/js/pakStore/pakStore.js |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index 1510b4a..d40dd18 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -1,6 +1,14 @@
 
 var initCountVal = 0;
 var matCodeData = [];
+function getCol() {
+    var cols = [
+        {fixed: 'left', field: 'count', title: '鏁伴噺(蹇呭~)', align: 'center', edit:'text', width: 120,  style:'color: blue;font-weight: bold'}
+    ];
+    cols.push.apply(cols, matCols);
+    cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
+    return cols;
+}
 
 layui.use(['table','laydate', 'form'], function() {
     var table = layui.table;
@@ -16,15 +24,7 @@
         limit: 500,
         cellMinWidth: 50,
         toolbar: '#toolbar',
-        cols: [[
-            {fixed: 'left', field: 'count', title: '鏁伴噺(蹇呭~)', align: 'center', edit:'text', width: 120,  style:'color: blue;font-weight: bold'},
-            {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
-            {field: 'barcode', align: 'center', title: '鏉$爜'},
-            {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'},
-            {field: 'str1', align: 'center', title: '鐗╂枡鍗曚綅'},
-            {field: 'str2', align: 'center', title: '鐗╂枡瑙勬牸'},
-            {fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80}
-        ]],
+        cols: [getCol()],
         done: function (res, curr, count) {
             $('td[data-field=count] div').html(initCountVal);
             setMatCodeData(res.data);

--
Gitblit v1.9.1