Ver código fonte

1、床网报价左右分区排列不同步修改总排列
2、复制配置增加复制生产信息

MY 4 dias atrás
pai
commit
97562b9b6b

+ 9 - 4
JLHWEB/src/views/erpapi/mattressInterface/hooks/index.tsx

@@ -1930,20 +1930,25 @@ export const useHooks = (t?: any) => {
         return mx;
       });
     } else if (isPz === 1) {
-      // 复制配置 FEAT:只复制录入和选择类型的配置,生产信息覆盖
+      // 复制配置 FEAT:只复制录入和选择类型的配置,生产信息改成覆盖
       res.mxList.forEach(mx => copyMap.set(`${mx.erp_pzid}`, mx));
 
       state.mattressYWList = visibleData.map(mx => {
         const key = `${mx.erp_pzid}`;
         if (copyMap.has(key) && (mx.bj_inputtype === 1 || mx.bj_inputtype === 0 || mx.bj_pzname.includes("床网"))) {
           matchQty++;
+          const mx2 = copyMap.get(key);
           if (mx.bj_inputtype === 2) {
-            mx.bj_namemx = copyMap.get(key).bj_namemx;
+            mx.bj_namemx = mx2.bj_namemx;
           } else {
-            mx.bj_inputtype = copyMap.get(key).bj_inputtype;
-            mx.bj_namemx = copyMap.get(key).bj_namemx;
+            mx.bj_inputtype = mx2.bj_inputtype;
+            mx.bj_namemx = mx2.bj_namemx;
           }
 
+          SPECIAL_PRESERVED_PROPS.forEach(prop => {
+            mx[prop] = mx2[prop];
+          });
+
           mx.haschange = 1;
         } else {
           mx.haschange = 0;

+ 8 - 13
JLHWEB/src/views/quote/bednetQuote/hooks/index.tsx

@@ -2323,25 +2323,17 @@ export const useHooks = (t?: any, props?: any) => {
   const handleChangeSpringWidth = (val: any, scope: any) => {
     const { row, data, $table } = scope;
     const { _mainData } = state.LjDetailRef;
-
-    // $table.reloadData(data);
+    // 左右分区不需要同步修改总排列
+    if (+_mainData.duo_qv_str === 2) return;
 
     const $tableMx = state.vxeTableMxRef.element;
     let { visibleData } = $tableMx.getTableData();
 
     let _val = Number(val);
 
-    if (+_mainData.duo_qv_str === 2) {
-      let sumWidth = data.reduce((pre, cur) => {
-        return pre + Number(cur.spring_qty_width);
-      }, 0);
-
-      _val = Number(sumWidth);
-    } else {
-      data.forEach(item => {
-        item.spring_qty_width = val;
-      });
-    }
+    data.forEach(item => {
+      item.spring_qty_width = val;
+    });
 
     if (Number(visibleData[0].if_hard_around) > 0 && Number(visibleData[0].hard_around_row) > 0) {
       _val = _val + Number(visibleData[0].hard_around_row) * 2;
@@ -2353,6 +2345,9 @@ export const useHooks = (t?: any, props?: any) => {
 
   const handleChangeSpringLength = (val: any, scope: any) => {
     const { row, data } = scope;
+    const { _mainData } = state.LjDetailRef;
+
+    if (+_mainData.duo_qv_str === 2) return;
 
     let sumLength = data.reduce((pre, cur) => {
       return pre + Number(cur.spring_qty_length);