Sfoglia il codice sorgente

变更添加清单bug

ellisran 11 mesi fa
parent
commit
83d03ecdf0

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

@@ -252,7 +252,7 @@ $(document).ready(() => {
                                 return item.gcl_id === select.gcl_id && (item.mx_id === undefined || item.mx_id === select.mx_id);
                             });
                             const newData = {
-                                lid: select.gcl_id,
+                                lid: gclInfo.leafXmjs[0].gcl_id || select.gcl_id,
                                 code: gclInfo.b_code,
                                 name: gclInfo.name,
                                 unit: gclInfo.unit,

+ 3 - 7
app/public/js/change_information_set.js

@@ -1020,13 +1020,9 @@ $(document).ready(() => {
                         return _.findIndex(gcl.leafXmjs, { gcl_id: item.gcl_id }) !== -1;
                     });
                     if (cl.length > 0) {
-                        if (gcl.leafXmjs.length === 1 && !gcl.leafXmjs[0].bwmx) {
-                            newChangeList.push(cl[0]);
-                        } else {
-                            for (const l of gcl.leafXmjs) {
-                                const c = _.find(cl, { mx_id: l.mx_id });
-                                if (c) newChangeList.push(c);
-                            }
+                        for (const l of gcl.leafXmjs) {
+                            const c = _.find(cl, { gcl_id: l.gcl_id, mx_id: l.mx_id || '' });
+                            if (c) newChangeList.push(c);
                         }
                     }
                 } else {

+ 4 - 2
app/public/js/change_revise.js

@@ -623,10 +623,12 @@ $(document).ready(() => {
                         const gclInfo = _.find(gclGatherData, function (item) {
                             return item.leafXmjs && _.find(item.leafXmjs, {gcl_id: select.id });
                         });
-                        const xmjInfo = gclInfo.leafXmjs[0];
+                        const xmjInfo = gclInfo.leafXmjs.find(function (item) {
+                            return item.gcl_id === select.id;
+                        });
                         const oldCInfo = _.find(oldChangeList, { gcl_id: select.id, mx_id: '' });
                         const data = {
-                            lid: select.id,
+                            lid: gclInfo.leafXmjs[0].gcl_id || select.id,
                             code: gclInfo.b_code,
                             name: gclInfo.name || '',
                             unit: gclInfo.unit || '',