From 3e3d19682673ce2d92162d1758816348a333e4ff Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 24 二月 2021 14:36:41 +0800
Subject: [PATCH] #

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

diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index f83699a..db7ffa7 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -55,8 +55,8 @@
             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: 'matnr', align: 'center', title: '鐗╂枡缂栫爜'},
+                {field: 'maktx', align: 'center', title: '鐗╂枡鍚嶇О'}
             ]],
             done: function (res, curr, count) {
             }
@@ -93,13 +93,13 @@
     // 娣诲姞琛ㄦ牸鏁版嵁
     var matData = [];
     function addTableData(data) {
-        if (isEmpty(data.matName)){
+        if (isEmpty(data.maktx)){
             tips("鎻愬彇澶辫触", true);
             return;
         }
         let toPush = true;
         for (var j=0;j<matData.length;j++){
-            if (data.matNo === matData[j].matNo) {
+            if (data.matnr === matData[j].matnr) {
                 matData[j].count = Number(matData[j].count) + Number(data.count);
                 toPush  = false;
             }

--
Gitblit v1.9.1