Browse Source

修复清单模式不选中问题

ellisran 10 months ago
parent
commit
9f2d3862f1

+ 4 - 3
app/public/js/change_information_add_list.js

@@ -144,6 +144,7 @@ $(document).ready(() => {
                     });
                 }
             }
+            console.log(xmjs, changeList);
             SpreadJsObj.loadSheetData(xmjSpreadSheet, SpreadJsObj.DataType.Data, xmjs);
             checkSelectAll(data);
         },
@@ -265,7 +266,7 @@ $(document).ready(() => {
                                 xmj_fbgc: xmjInfo.fbgc || '',
                                 xmj_fxgc: xmjInfo.fxgc || '',
                                 gcl_id: select.gcl_id,
-                                mx_id: select.mx_id,
+                                mx_id: select.mx_id || '',
                             }
                             _.assign(data, newData);
                         }
@@ -596,7 +597,7 @@ $(document).ready(() => {
                             xmj_fbgc: leaf.fbgc || '',
                             xmj_fxgc: leaf.fxgc || '',
                             gcl_id: leaf.gcl_id,
-                            mx_id: leaf.mx_id,
+                            mx_id: leaf.mx_id || '',
                         });
                     }
                 }
@@ -625,7 +626,7 @@ $(document).ready(() => {
             let hadContinue = false;
             for (const c of cList) {
                 const cInfo = c.deal_id ? _.find(changeList, { lid: c.deal_id }) : _.find(changeList, function (item) {
-                   return item.gcl_id === c.gcl_id && item.mx_id === c.mx_id;
+                   return item.gcl_id === c.gcl_id && item.mx_id === (c.mx_id || '');
                 });
                 if (_.find(changeUsedData, {cbid: cInfo.id})) {
                     hadContinue = true;

+ 1 - 1
app/public/js/change_information_set.js

@@ -2334,7 +2334,7 @@ function makeWhiteList(clinfo) {
     clinfo.xmj_fbgc = null;
     clinfo.xmj_fxgc = null;
     clinfo.gcl_id = '';
-    clinfo.mx_id = null;
+    clinfo.mx_id = '';
     return clinfo;
 }
 

+ 2 - 0
app/service/change_audit_list.js

@@ -107,6 +107,7 @@ module.exports = app => {
                     xmj_fbgc: null,
                     xmj_fxgc: null,
                     gcl_id: '',
+                    mx_id: '',
                     order,
                     is_valuation: 1,
                     delimit,
@@ -219,6 +220,7 @@ module.exports = app => {
                         xmj_fbgc: null,
                         xmj_fxgc: null,
                         gcl_id: '',
+                        mx_id: '',
                         order: order ? order + i : null,
                         is_valuation: 1,
                         delimit,