MaiXinRong 1 anno fa
parent
commit
e9cc35908a
1 ha cambiato i file con 9 aggiunte e 4 eliminazioni
  1. 9 4
      app/public/js/change_information_set.js

+ 9 - 4
app/public/js/change_information_set.js

@@ -639,8 +639,11 @@ $(document).ready(() => {
             gclGatherData[ggd].code = gclGatherData[ggd].b_code;
             let hadcid = 0;
             for (const xmj of gclGatherData[ggd].leafXmjs) {
-                if (_.findIndex(changeLedgerList, { id: xmj.gcl_id }) !== -1 || _.findIndex(changePosList, { id: xmj.mx_id, lid: xmj.gcl_id }) !== -1) {
+                const changeLedger = _.find(changeLedgerList, { id: xmj.gcl_id });
+                const changePos = _.find(changePosList, { id: xmj.mx_id, lid: xmj.gcl_id });
+                if (changeLedger || changePos) {
                     xmj.cid = 1;
+                    xmj.ccid = changeLedger ? changeLedger.ccid : changePos.ccid;
                     hadcid = 1;
                 }
             }
@@ -1456,17 +1459,19 @@ $(document).ready(() => {
                     if (info.length < 8) return true;
 
                     const leaf = gcl.leafXmjs.find(lx => { return lx.mx_id === info[6]});
-                    return !leaf || !leaf.cid;
+                    return !leaf || !leaf.cid || leaf.ccid !== window.location.pathname.split('/')[4];
                 });
             }
+            let hasNew = false;
             for (const [index, leaf] of gcl.leafXmjs.entries()) {
-                if (!leaf.cid || leaf.cid !== window.location.pathname.split('/')[4]) continue;
+                if (!leaf.cid || leaf.ccid !== window.location.pathname.split('/')[4]) continue;
 
                 const bwmx = [leaf.code, leaf.jldy || '', leaf.dwgc || '', leaf.fbgc || '', leaf.fxgc || '', leaf.gcl_id, leaf.mx_id, leaf.jldy || ''];
                 const de_qu = bwmx.join(infoSpr) + qtySpr + (leaf.quantity || 0);
                 if (data_bwmx.indexOf(de_qu) < 0) data_bwmx.push(de_qu);
+                hasNew = true;
             }
-            $(tr).attr('data-bwmx', data_bwmx.join(recSpr)).addClass('table-success');
+            if (hasNew) $(tr).attr('data-bwmx', data_bwmx.join(recSpr)).addClass('table-success');
         }
 
         // 触发点击当前清单,重载当前全部部位