计量单元更新

app/public/js/change_information_set.js

@@ -2159,12 +2159,12 @@ function tableDataRemake(changeListData) {
 function makePushBwmx(clinfo, listinfo, removeList, updateList, lidIsNumber) {
     let info = '';
     const checkKey = ['name', 'code', 'unit', 'unit_price'];
-    const checkLeafKey = ['oamount', 'code', 'dwgc', 'fbgc', 'fxgc', 'jldy'];
+    const checkLeafKey = ['oamount', 'bwmx', 'code', 'dwgc', 'fbgc', 'fxgc', 'jldy'];
     let pushbwmx = '0*;*0';
     if (listinfo.leafXmjs !== undefined) {
         const leafInfo = listinfo.leafXmjs.find(function (item) {
             // const flag = (item.bwmx === undefined || item.bwmx === clinfo.bwmx || item.jldy === clinfo.bwmx) && item.gcl_id === clinfo.gcl_id && (!clinfo.mx_id || (item.mx_id && clinfo.mx_id && item.mx_id === clinfo.mx_id)) && (item.quantity !== null ? item.quantity === parseFloat(clinfo.oamount) : 0 === parseFloat(clinfo.oamount));
-            const flag = (item.bwmx === undefined || item.bwmx === clinfo.bwmx || item.jldy === clinfo.bwmx) && item.gcl_id === clinfo.gcl_id && (!clinfo.mx_id || (item.mx_id && clinfo.mx_id && item.mx_id === clinfo.mx_id));
+            const flag = item.gcl_id === clinfo.gcl_id && (!clinfo.mx_id || (item.mx_id && clinfo.mx_id && item.mx_id === clinfo.mx_id));
             if (flag && item.code === clinfo.xmj_code) {
                 return flag && item.code === clinfo.xmj_code;
             }
@@ -2206,6 +2206,16 @@ function makePushBwmx(clinfo, listinfo, removeList, updateList, lidIsNumber) {
                         clinfo[key] = leafInfo.quantity;
                         needUpdate = true;
                     }
+                } else if (key === 'bwmx') {
+                    if (leafInfo[key] !== undefined && leafInfo[key] !== clinfo[key]) {
+                        oneUpdate[key] = leafInfo[key];
+                        clinfo[key] = leafInfo[key];
+                        needUpdate = true;
+                    } else if (leafInfo[key] === undefined && leafInfo.jldy !== clinfo[key]) {
+                        oneUpdate[key] = leafInfo.jldy;
+                        clinfo[key] = leafInfo.jldy;
+                        needUpdate = true;
+                    }
                 } else {
                     if (leafInfo[key] !== clinfo['xmj_' + key]) {
                         oneUpdate['xmj_' + key] = leafInfo[key];