From ec444c3a240a5679fc83ec12fa0d7cf41826e932 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期三, 07 四月 2021 14:25:32 +0800
Subject: [PATCH] 1.0.6 pda调整优化

---
 src/main/webapp/views/pda/locNormalIn.html |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/views/pda/locNormalIn.html b/src/main/webapp/views/pda/locNormalIn.html
index 6de0418..4b50791 100644
--- a/src/main/webapp/views/pda/locNormalIn.html
+++ b/src/main/webapp/views/pda/locNormalIn.html
@@ -54,7 +54,7 @@
     <div class="layui-btn-container">
         <button type="button" id="reset-btn" class="layui-btn layui-btn-primary" onclick="reset()">閲嶇疆</button>
         <button type="button" id="comb-btn" class="layui-btn layui-btn-normal " onclick="comb()"
-                style="margin-left: 20px">缁勬墭
+                style="margin-left: 20px">鍏ュ簱
         </button>
         <button type="button" id="retrun-btn" class="layui-btn layui-btn-primary " onclick="back()"
                 style="margin-left: 20px">杩斿洖
@@ -76,12 +76,15 @@
         tableIns = table.render({
             elem: '#chooseData',
             data: [],
+            width: 320,
             limit: 500,
             cellMinWidth: 50,
             cols: [[
-                {fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style: 'color: blue', width: 50},
                 {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
-                {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
+                {field: 'mnemonic', align: 'center', title: '鐢熶骇鍗曞彿'},
+                { field: 'count', align: 'center', title: '鏁伴噺', style: 'color: blue', width: 50},
+                {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'},
+
             ]],
             done: function (res, curr, count) {
             }
@@ -123,7 +126,7 @@
             type: 2,
             title: '鎻愬彇鐗╂枡',
             shade: [0.3, '#000'],
-            area: ['90%', '80%'],
+            area: ['90%', '90%'],
             content: 'matQuery.html',
             success: function (layero, index) {
                 $('.layui-layer-title').css('font-size', '16px');
@@ -217,6 +220,9 @@
         if (isEmpty(billNo)) {
             return;
         }
+        if (billNo.indexOf('=') > -1) {
+            billNo = billNo.split(",")[0].split("=")[1];
+        }
         // 璧嬪�煎墠娓呯┖琛ㄦ牸
         matData = [];
         tableIns.reload({data: matData});

--
Gitblit v1.9.1