JLHWEB: 1、床网修改长宽可触发获取弹簧排列数

JLHWEB/src/views/erpapi/mattressInterface/detail.vue

@@ -771,120 +771,120 @@ const orderDefaultAction = [
       }
     }
   }),
-  [
-    buttonDefault({
-      label: "刷新带出配置",
-      limited: () => {
-        return !orderStatus.value || editType.value == 3;
-      },
-      clickFunc: item => {
-        RefreshMattressInterfaceList(LjDetailRef.value?._mainData.mattressid, 0, LjDetailRef.value?._mainData.erp_configcodetype);
-      }
-    }),
-    buttonDefault({
-      label: "复制配置",
-      limited: () => {
-        return !orderStatus.value || editType.value == 3;
-      },
-      clickFunc: item => {
-        fModelChoseMattress().then((res: any) => {
-          RefreshMattressInterfaceList(res.mattressid, 1);
-        });
-      }
-    }),
-    buttonDefault({
-      label: "重新生成配置项目",
-      limited: () => {
-        return !orderStatus.value || editType.value != 1;
-      },
-      disabledTextCallBack: (data: any) => {
-        if (data.yw_flag == 1) {
-          return "已业务补充审核，无法操作";
-        }
-        return "";
-      },
-      clickFunc: item => {
-        RefreshMattressInterfaceList(LjDetailRef.value?._mainData.mattressid, 2, LjDetailRef.value?._mainData.erp_configcodetype);
-      }
-    })
-  ],
-  [
-    buttonDefault({
-      label: "刷新清单",
-      limited: () => {
-        return !orderStatus.value;
-      },
-      clickFunc: item => {
-        RefreshMattressInterfaceQdList(LjDetailRef.value?._mainData.mattressid, 0);
-      }
-    }),
-    buttonDefault({
-      label: "复制清单",
-      limited: () => {
-        return !orderStatus.value;
-      },
-      clickFunc: item => {
-        fModelChoseMattress().then((res: any) => {
-          RefreshMattressInterfaceQdList(res.mattressid, 1, 0);
-        });
-      }
-    }),
-    buttonDefault({
-      label: "重新生成清单",
-      limited: () => {
-        return !orderStatus.value;
-      },
-      clickFunc: item => {
-        RefreshMattressInterfaceQdList(LjDetailRef.value?._mainData.mattressid, 2);
+  // [
+  buttonDefault({
+    label: "刷新带出配置",
+    limited: () => {
+      return !orderStatus.value || editType.value == 3;
+    },
+    clickFunc: item => {
+      RefreshMattressInterfaceList(LjDetailRef.value?._mainData.mattressid, 0, LjDetailRef.value?._mainData.erp_configcodetype);
+    }
+  }),
+  buttonDefault({
+    label: "复制配置",
+    limited: () => {
+      return !orderStatus.value || editType.value == 3;
+    },
+    clickFunc: item => {
+      fModelChoseMattress().then((res: any) => {
+        RefreshMattressInterfaceList(res.mattressid, 1);
+      });
+    }
+  }),
+  buttonDefault({
+    label: "重新生成配置项目",
+    limited: () => {
+      return !orderStatus.value || editType.value != 1;
+    },
+    disabledTextCallBack: (data: any) => {
+      if (data.yw_flag == 1) {
+        return "已业务补充审核，无法操作";
       }
-    })
-  ],
-  [
-    buttonDefault({
-      label: "增行",
-      limited: () => {
-        return !orderStatus.value;
-      },
-      clickFunc: item => {}
-    }),
-    buttonDefault({
-      label: "插行",
-      limited: () => {
-        return !orderStatus.value;
-      },
-      clickFunc: item => {},
-      divider: true
-    }),
-    buttonDefault({
-      label: "上移",
-      limited: () => {
-        return !orderStatus.value;
-      },
-      clickFunc: item => {}
-    }),
-    buttonDefault({
-      label: "下移",
-      limited: () => {
-        return !orderStatus.value;
-      },
-      clickFunc: item => {},
-      divider: true
-    }),
-    buttonDefault({
-      label: "清单增加默认项目",
-      limited: () => {
-        return !orderStatus.value;
-      },
-      clickFunc: () => funcAddRowQd()
-    }),
-    buttonDefault({
-      label: "辅助计算生产尺寸",
-      limited: () => {
-        return !orderStatus.value;
-      },
-      clickFunc: () => funcCmpCC()
-    })
-  ],
+      return "";
+    },
+    clickFunc: item => {
+      RefreshMattressInterfaceList(LjDetailRef.value?._mainData.mattressid, 2, LjDetailRef.value?._mainData.erp_configcodetype);
+    }
+  }),
+  // ],
+  // [
+  buttonDefault({
+    label: "刷新清单",
+    limited: () => {
+      return !orderStatus.value;
+    },
+    clickFunc: item => {
+      RefreshMattressInterfaceQdList(LjDetailRef.value?._mainData.mattressid, 0);
+    }
+  }),
+  buttonDefault({
+    label: "复制清单",
+    limited: () => {
+      return !orderStatus.value;
+    },
+    clickFunc: item => {
+      fModelChoseMattress().then((res: any) => {
+        RefreshMattressInterfaceQdList(res.mattressid, 1, 0);
+      });
+    }
+  }),
+  buttonDefault({
+    label: "重新生成清单",
+    limited: () => {
+      return !orderStatus.value;
+    },
+    clickFunc: item => {
+      RefreshMattressInterfaceQdList(LjDetailRef.value?._mainData.mattressid, 2);
+    }
+  }),
+  // ],
+  // [
+  buttonDefault({
+    label: "增行",
+    limited: () => {
+      return !orderStatus.value;
+    },
+    clickFunc: item => {}
+  }),
+  buttonDefault({
+    label: "插行",
+    limited: () => {
+      return !orderStatus.value;
+    },
+    clickFunc: item => {},
+    divider: true
+  }),
+  buttonDefault({
+    label: "上移",
+    limited: () => {
+      return !orderStatus.value;
+    },
+    clickFunc: item => {}
+  }),
+  buttonDefault({
+    label: "下移",
+    limited: () => {
+      return !orderStatus.value;
+    },
+    clickFunc: item => {},
+    divider: true
+  }),
+  buttonDefault({
+    label: "清单增加默认项目",
+    limited: () => {
+      return !orderStatus.value;
+    },
+    clickFunc: () => funcAddRowQd()
+  }),
+  buttonDefault({
+    label: "辅助计算生产尺寸",
+    limited: () => {
+      return !orderStatus.value;
+    },
+    clickFunc: () => funcCmpCC()
+  }),
+  // ],
   buttonDefault({
     label: "重置半成品归属列数据",
     limited: () => {
@@ -912,144 +912,144 @@ const orderDefaultAction = [
       }
     }
   }),
-  [
-    buttonDefault({
-      label: "业务补充",
-      power: 79,
-      limited: () => {
-        return !!orderStatus.value || LjDetailRef.value?._mainData.xd_flag == 1;
-      },
-      disabledTextCallBack: (data: any) => {
-        if (data.yw_flag == 1) {
-          return "已业务补充审核，无法修改";
-        }
-        return "";
-      },
-      clickFunc: item => {
-        routeToEdit(1);
+  // [
+  buttonDefault({
+    label: "业务补充",
+    power: 79,
+    limited: () => {
+      return !!orderStatus.value || LjDetailRef.value?._mainData.xd_flag == 1;
+    },
+    disabledTextCallBack: (data: any) => {
+      if (data.yw_flag == 1) {
+        return "已业务补充审核，无法修改";
       }
-    }),
-    buttonDefault({
-      label: "业务审核",
-      power: 80,
-      limited: () => {
-        return !!orderStatus.value;
-      },
-      clickFunc: item => {
-        const curRecords = [LjDetailRef.value?._mainData];
+      return "";
+    },
+    clickFunc: item => {
+      routeToEdit(1);
+    }
+  }),
+  buttonDefault({
+    label: "业务审核",
+    power: 80,
+    limited: () => {
+      return !!orderStatus.value;
+    },
+    clickFunc: item => {
+      const curRecords = [LjDetailRef.value?._mainData];
 
-        YWAudit(1, curRecords, () => {
-          LjDetailRef.value.refresh();
-        });
-      }
-    }),
-    buttonDefault({
-      label: "业务撤审",
-      power: 81,
-      limited: () => {
-        return !!orderStatus.value;
-      },
-      clickFunc: item => {
-        const curRecords = [LjDetailRef.value?._mainData];
+      YWAudit(1, curRecords, () => {
+        LjDetailRef.value.refresh();
+      });
+    }
+  }),
+  buttonDefault({
+    label: "业务撤审",
+    power: 81,
+    limited: () => {
+      return !!orderStatus.value;
+    },
+    clickFunc: item => {
+      const curRecords = [LjDetailRef.value?._mainData];
 
-        YWAudit(0, curRecords, () => {
-          LjDetailRef.value.refresh();
-        });
-      }
-    })
-  ],
-  [
-    buttonDefault({
-      label: "产品补充",
-      power: 82,
-      limited: () => {
-        return !!orderStatus.value;
-      },
-      disabledTextCallBack: (data: any) => {
-        if (data.js1_flag == 1) {
-          return "已产品补充审核，无法修改";
-        }
-        return "";
-      },
-      clickFunc: item => {
-        routeToEdit(2);
+      YWAudit(0, curRecords, () => {
+        LjDetailRef.value.refresh();
+      });
+    }
+  }),
+  // ],
+  // [
+  buttonDefault({
+    label: "产品补充",
+    power: 82,
+    limited: () => {
+      return !!orderStatus.value;
+    },
+    disabledTextCallBack: (data: any) => {
+      if (data.js1_flag == 1) {
+        return "已产品补充审核，无法修改";
       }
-    }),
-    buttonDefault({
-      label: "产品补充审核",
-      power: 83,
-      limited: () => {
-        return !!orderStatus.value;
-      },
-      clickFunc: item => {
-        const curRecords = [LjDetailRef.value?._mainData];
+      return "";
+    },
+    clickFunc: item => {
+      routeToEdit(2);
+    }
+  }),
+  buttonDefault({
+    label: "产品补充审核",
+    power: 83,
+    limited: () => {
+      return !!orderStatus.value;
+    },
+    clickFunc: item => {
+      const curRecords = [LjDetailRef.value?._mainData];
 
-        JSAudit(1, curRecords, () => {
-          LjDetailRef.value.refresh();
-        });
-      }
-    }),
-    buttonDefault({
-      label: "产品补充撤审",
-      power: 84,
-      limited: () => {
-        return !!orderStatus.value;
-      },
-      clickFunc: item => {
-        const curRecords = [LjDetailRef.value?._mainData];
+      JSAudit(1, curRecords, () => {
+        LjDetailRef.value.refresh();
+      });
+    }
+  }),
+  buttonDefault({
+    label: "产品补充撤审",
+    power: 84,
+    limited: () => {
+      return !!orderStatus.value;
+    },
+    clickFunc: item => {
+      const curRecords = [LjDetailRef.value?._mainData];
 
-        JSAudit(0, curRecords, () => {
-          LjDetailRef.value.refresh();
-        });
-      }
-    })
-  ],
-  [
-    buttonDefault({
-      label: "清单补充",
-      power: 85,
-      limited: () => {
-        return !!orderStatus.value;
-      },
-      disabledTextCallBack: (data: any) => {
-        if (data.js2_flag == 1) {
-          return "已清单补充审核，无法修改";
-        }
-        return "";
-      },
-      clickFunc: item => {
-        routeToEdit(3);
+      JSAudit(0, curRecords, () => {
+        LjDetailRef.value.refresh();
+      });
+    }
+  }),
+  // ],
+  // [
+  buttonDefault({
+    label: "清单补充",
+    power: 85,
+    limited: () => {
+      return !!orderStatus.value;
+    },
+    disabledTextCallBack: (data: any) => {
+      if (data.js2_flag == 1) {
+        return "已清单补充审核，无法修改";
       }
-    }),
-    buttonDefault({
-      label: "清单补充审核",
-      power: 86,
-      limited: () => {
-        return !!orderStatus.value;
-      },
-      clickFunc: item => {
-        const curRecords = [LjDetailRef.value?._mainData];
+      return "";
+    },
+    clickFunc: item => {
+      routeToEdit(3);
+    }
+  }),
+  buttonDefault({
+    label: "清单补充审核",
+    power: 86,
+    limited: () => {
+      return !!orderStatus.value;
+    },
+    clickFunc: item => {
+      const curRecords = [LjDetailRef.value?._mainData];
 
-        JS2Audit(1, curRecords, () => {
-          LjDetailRef.value.refresh();
-        });
-      }
-    }),
-    buttonDefault({
-      label: "清单补充撤审",
-      power: 87,
-      limited: () => {
-        return !!orderStatus.value;
-      },
-      clickFunc: item => {
-        const curRecords = [LjDetailRef.value?._mainData];
+      JS2Audit(1, curRecords, () => {
+        LjDetailRef.value.refresh();
+      });
+    }
+  }),
+  buttonDefault({
+    label: "清单补充撤审",
+    power: 87,
+    limited: () => {
+      return !!orderStatus.value;
+    },
+    clickFunc: item => {
+      const curRecords = [LjDetailRef.value?._mainData];
 
-        JS2Audit(0, curRecords, () => {
-          LjDetailRef.value.refresh();
-        });
-      }
-    })
-  ],
+      JS2Audit(0, curRecords, () => {
+        LjDetailRef.value.refresh();
+      });
+    }
+  }),
+  // ],
   buttonDefault({
     label: "覆盖配置到副规格产品",
     limited: () => {

JLHWEB/src/views/erpapi/mattressInterface/index.vue

@@ -153,150 +153,150 @@ const action: detailAction[] = [
       handleDBlClickTable({ row: curRecords[0] });
     }
   }),
-  [
-    buttonDefault({
-      label: "业务补充",
-      power: 79,
-      clickFunc: item => {
-        routeToEdit(1);
-      }
-    }),
-    buttonDefault({
-      label: "业务审核",
-      power: 80,
-      clickFunc: item => {
-        const { curRecords } = getCurrentRecords(vxeTableRef.value);
-        YWAudit(1, curRecords, () => {
-          vxeTableRef.value.refresh();
-        });
-      }
-    }),
-    buttonDefault({
-      label: "业务撤审",
-      power: 81,
-      clickFunc: item => {
-        const { curRecords } = getCurrentRecords(vxeTableRef.value);
+  // [
+  buttonDefault({
+    label: "业务补充",
+    power: 79,
+    clickFunc: item => {
+      routeToEdit(1);
+    }
+  }),
+  buttonDefault({
+    label: "业务审核",
+    power: 80,
+    clickFunc: item => {
+      const { curRecords } = getCurrentRecords(vxeTableRef.value);
+      YWAudit(1, curRecords, () => {
+        vxeTableRef.value.refresh();
+      });
+    }
+  }),
+  buttonDefault({
+    label: "业务撤审",
+    power: 81,
+    clickFunc: item => {
+      const { curRecords } = getCurrentRecords(vxeTableRef.value);
 
-        YWAudit(0, curRecords, () => {
-          vxeTableRef.value.refresh();
-        });
-      }
-    })
-  ],
-  [
-    buttonDefault({
-      label: "产品补充",
-      power: 82,
-      clickFunc: item => {
-        routeToEdit(2);
-      }
-    }),
-    buttonDefault({
-      label: "产品补充审核",
-      power: 83,
-      clickFunc: item => {
-        const { curRecords } = getCurrentRecords(vxeTableRef.value);
+      YWAudit(0, curRecords, () => {
+        vxeTableRef.value.refresh();
+      });
+    }
+  }),
+  // ],
+  // [
+  buttonDefault({
+    label: "产品补充",
+    power: 82,
+    clickFunc: item => {
+      routeToEdit(2);
+    }
+  }),
+  buttonDefault({
+    label: "产品补充审核",
+    power: 83,
+    clickFunc: item => {
+      const { curRecords } = getCurrentRecords(vxeTableRef.value);
 
-        JSAudit(1, curRecords, () => {
-          vxeTableRef.value.refresh();
-        });
-      }
-    }),
-    buttonDefault({
-      label: "产品补充撤审",
-      power: 84,
-      clickFunc: item => {
-        const { curRecords } = getCurrentRecords(vxeTableRef.value);
+      JSAudit(1, curRecords, () => {
+        vxeTableRef.value.refresh();
+      });
+    }
+  }),
+  buttonDefault({
+    label: "产品补充撤审",
+    power: 84,
+    clickFunc: item => {
+      const { curRecords } = getCurrentRecords(vxeTableRef.value);
 
-        JSAudit(0, curRecords, () => {
-          ElNotification({
-            title: t("sys.api.operationSuccess"),
-            message: "产品补充审核后，需重新生成L1物料",
-            type: "warning"
-          });
-          vxeTableRef.value.refresh();
+      JSAudit(0, curRecords, () => {
+        ElNotification({
+          title: t("sys.api.operationSuccess"),
+          message: "产品补充审核后，需重新生成L1物料",
+          type: "warning"
         });
-      }
-    })
-  ],
-  [
-    buttonDefault({
-      label: "清单补充",
-      power: 85,
-      clickFunc: item => {
-        routeToEdit(3);
-      }
-    }),
-    buttonDefault({
-      label: "清单补充审核",
-      power: 86,
-      clickFunc: item => {
-        const { curRecords } = getCurrentRecords(vxeTableRef.value);
+        vxeTableRef.value.refresh();
+      });
+    }
+  }),
+  // ],
+  // [
+  buttonDefault({
+    label: "清单补充",
+    power: 85,
+    clickFunc: item => {
+      routeToEdit(3);
+    }
+  }),
+  buttonDefault({
+    label: "清单补充审核",
+    power: 86,
+    clickFunc: item => {
+      const { curRecords } = getCurrentRecords(vxeTableRef.value);
 
-        JS2Audit(1, curRecords, () => {
-          vxeTableRef.value.refresh();
-        });
-      }
-    }),
-    buttonDefault({
-      label: "清单补充撤审",
-      power: 87,
-      clickFunc: item => {
-        const { curRecords } = getCurrentRecords(vxeTableRef.value);
+      JS2Audit(1, curRecords, () => {
+        vxeTableRef.value.refresh();
+      });
+    }
+  }),
+  buttonDefault({
+    label: "清单补充撤审",
+    power: 87,
+    clickFunc: item => {
+      const { curRecords } = getCurrentRecords(vxeTableRef.value);
 
-        JS2Audit(0, curRecords, () => {
-          vxeTableRef.value.refresh();
-        });
-      }
-    })
-  ],
-  [
-    buttonDefault({
-      label: "生成/更新物料",
-      power: 88,
-      clickFunc: item => {
-        const { curRecords } = getCurrentRecords(vxeTableRef.value);
+      JS2Audit(0, curRecords, () => {
+        vxeTableRef.value.refresh();
+      });
+    }
+  }),
+  // ],
+  // [
+  buttonDefault({
+    label: "生成/更新物料",
+    power: 88,
+    clickFunc: item => {
+      const { curRecords } = getCurrentRecords(vxeTableRef.value);
 
-        if (!curRecords.length) {
-          ElMessage.warning(t("business.tips.mattress.records"));
-          return;
-        }
-        let list = curRecords.map(item => item.mattressid);
-        toCreateMtrl(1, list);
+      if (!curRecords.length) {
+        ElMessage.warning(t("business.tips.mattress.records"));
+        return;
       }
-    })
-  ],
-  [
-    buttonDefault({
-      label: "生成金蝶清单",
-      power: 90,
-      clickFunc: item => {
-        const { curRecords } = getCurrentRecords(vxeTableRef.value);
-
-        if (!curRecords.length) {
-          ElMessage.warning(t("business.tips.mattress.records"));
-          return;
-        }
+      let list = curRecords.map(item => item.mattressid);
+      toCreateMtrl(1, list);
+    }
+  }),
+  // ],
+  // [
+  buttonDefault({
+    label: "生成金蝶清单",
+    power: 90,
+    clickFunc: item => {
+      const { curRecords } = getCurrentRecords(vxeTableRef.value);
 
-        let list = curRecords.map(item => item.mattressid);
-        toCreateORDelMtrlPf(1, list);
+      if (!curRecords.length) {
+        ElMessage.warning(t("business.tips.mattress.records"));
+        return;
       }
-    })
-    // buttonDefault({
-    //   label: "删除金蝶清单",
-    //   power: 91,
-    //   clickFunc: item => {
-    //     const { curRecords } = getCurrentRecords(vxeTableRef.value);
 
-    //     if (!curRecords.length) {
-    //       ElMessage.warning(t("business.tips.mattress.records"));
-    //       return;
-    //     }
+      let list = curRecords.map(item => item.mattressid);
+      toCreateORDelMtrlPf(1, list);
+    }
+  })
+  // buttonDefault({
+  //   label: "删除金蝶清单",
+  //   power: 91,
+  //   clickFunc: item => {
+  //     const { curRecords } = getCurrentRecords(vxeTableRef.value);
+
+  //     if (!curRecords.length) {
+  //       ElMessage.warning(t("business.tips.mattress.records"));
+  //       return;
+  //     }
 
-    //     toCreateORDelMtrlPf(0, curRecords[curRecords.length - 1].mattressid);
-    //   }
-    // })
-  ]
+  //     toCreateORDelMtrlPf(0, curRecords[curRecords.length - 1].mattressid);
+  //   }
+  // })
+  // ]
 ];
 
 const dataCallback = (data: any) => {

JLHWEB/src/views/quote/bednetQuote/detail.vue

@@ -13,7 +13,7 @@
     :default-columns-value="defaultColumnsValue"
   >
     <template #rightBtn>
-      <el-select v-model="dannum_type" placeholder="大小单" style="width: 80px">
+      <el-select disabled v-model="dannum_type" placeholder="大小单" style="width: 80px">
         <el-option label="散单" :value="1" />
         <el-option label="小单" :value="4" />
         <el-option label="标准" :value="2" />
@@ -192,7 +192,8 @@ const {
   dataCallback,
   wf_cmp_cb,
   setMxSpringLength,
-  gotoSummy
+  gotoSummy,
+  handelChangeDuoqv
 } = useHooks(t, props);
 
 const { CheckPower, CheckOption, buttonNew, buttonDefault } = useAuthButtons(t);
@@ -443,7 +444,7 @@ const orderDefaultAction: detailAction[] = [
         let _param_mf = {
           bednet,
           bednetMx,
-          spring
+          spring: spring.filter(o => o.springid)
         };
         try {
           console.log("综合 _param_mf :>> ", _param_mf);
@@ -762,6 +763,10 @@ const funcAfterMound = async (data: any) => {
       console.log("reload_dw2 22result :>> ", params);
       bednetMxData.value = mx.list;
       bednetMxSpringData.value = spring.list;
+
+      const { enumMap } = LjDetailRef.value;
+
+      orderStatus.value == "edit" && handelChangeDuoqv(data.duo_qv_str, enumMap.get("duo_qv_str"), false);
     });
 
     nextTick(() => {

JLHWEB/src/views/quote/bednetQuote/hooks/index.tsx

@@ -855,6 +855,12 @@ export const useHooks = (t?: any, props?: any) => {
       field: "mattress_width",
       basicinfo: {
         el: "input",
+        props: {
+          onChange: () => {
+            let { visibleData } = state.vxeTableMxRef.element.getTableData();
+            setMxSpringQtyWidthAndLength(visibleData[0]);
+          }
+        },
         editable: (scope: any) => {
           if (ALLOW_EDIT_STATE.includes(scope.status)) {
             return true;
@@ -869,6 +875,13 @@ export const useHooks = (t?: any, props?: any) => {
       field: "mattress_length",
       basicinfo: {
         el: "input",
+        props: {
+          onChange: () => {
+            let { visibleData } = state.vxeTableMxRef.element.getTableData();
+            console.log("onChange visibleData :>> ", visibleData);
+            setMxSpringQtyWidthAndLength(visibleData[0]);
+          }
+        },
         editable: (scope: any) => {
           if (ALLOW_EDIT_STATE.includes(scope.status)) {
             return true;
@@ -1641,8 +1654,8 @@ export const useHooks = (t?: any, props?: any) => {
    * @description 多区select，控制多区明细条数
    * @param val
    */
-  const handelChangeDuoqv = (val: any, enumArr: any) => {
-    console.log("duo_qv_str val :>> ", val);
+  const handelChangeDuoqv = (val: any, enumArr: any, ifsetLength: boolean = true) => {
+    console.log("duo_qv_str val :>> ", val, enumArr);
     const { _mainData } = state.LjDetailRef;
 
     let item = enumArr.find((item: any) => item.value + "" == val);
@@ -1702,7 +1715,7 @@ export const useHooks = (t?: any, props?: any) => {
               await $table.remove(arrs);
             }
 
-            setMxSpringLength();
+            ifsetLength && setMxSpringLength();
           }
         }, 200);
       });
@@ -1734,42 +1747,45 @@ export const useHooks = (t?: any, props?: any) => {
   };
 
   /**
-   * @description 设置床网高度，自动计算宽度，长度
+   * @description 设置床网高度，自动计算弹簧排列宽、长
    */
   const setMxSpringQtyWidthAndLength = async row => {
-    if (row?.springid && Number(row.springid) > 0) {
-      const { _mainData, enumMap } = state.LjDetailRef;
-      let _pricelistid = getPriceid();
-      let bednet = cloneDeep(_mainData);
-      bednet.if_doublenet = Number(bednet.if_doublenet);
-      bednet.if_doublespring = Number(bednet.if_doublespring);
-      bednet.if_side_iron = Number(bednet.if_side_iron);
-      bednet.if_rsorwa = Number(bednet.if_rsorwa);
-      bednet.if_sponge_drilling = Number(bednet.if_sponge_drilling);
-      bednet.iffork = Number(bednet.iffork);
-      bednet.ifsaleout = Number(bednet.ifsaleout);
-      bednet.if_jb = Number(bednet.if_jb);
-      bednet.flag = Number(bednet.flag);
-      bednet.pricelistid = _pricelistid;
-
-      let _bednetMx = state.vxeTableMxRef?.element.getTableData().fullData ?? [];
-      _bednetMx.forEach(itm => {
-        itm.if_part = Number(itm.if_part);
-      });
+    // if (row?.springid && Number(row.springid) > 0) {
+    const { _mainData, enumMap } = state.LjDetailRef;
+    let _pricelistid = getPriceid();
+    let bednet = cloneDeep(_mainData);
+    bednet.if_doublenet = Number(bednet.if_doublenet);
+    bednet.if_doublespring = Number(bednet.if_doublespring);
+    bednet.if_side_iron = Number(bednet.if_side_iron);
+    bednet.if_rsorwa = Number(bednet.if_rsorwa);
+    bednet.if_sponge_drilling = Number(bednet.if_sponge_drilling);
+    bednet.iffork = Number(bednet.iffork);
+    bednet.ifsaleout = Number(bednet.ifsaleout);
+    bednet.if_jb = Number(bednet.if_jb);
+    bednet.flag = Number(bednet.flag);
+    bednet.pricelistid = _pricelistid;
 
-      let _params: any = {
-        bednet: bednet,
-        bednetMx: _bednetMx,
-        spring: state.vxeTableMxSpringRef?.element.getTableData().fullData ?? []
-      };
-      let res = await GetComputeSpring(_params);
+    let _bednetMx = state.vxeTableMxRef?.element.getTableData().fullData ?? [];
+    _bednetMx.forEach(itm => {
+      itm.if_part = Number(itm.if_part);
+    });
 
-      console.log("setMxSpringQtyWidthAndLength res :>> ", res);
-      if (!res?.message) {
-        row.spring_qty_width = res.bednetMx[0].spring_qty_width;
-        row.spring_qty_length = res.bednetMx[0].spring_qty_length;
-      }
+    let _params: any = {
+      bednet: bednet,
+      bednetMx: _bednetMx,
+      spring: state.vxeTableMxSpringRef?.element.getTableData().fullData ?? []
+    };
+    let res = await GetComputeSpring(_params);
+
+    console.log("setMxSpringQtyWidthAndLength res :>> ", res);
+    if (!res?.message) {
+      row.spring_qty_width = res.bednetMx[0].spring_qty_width;
+      row.spring_qty_length = res.bednetMx[0].spring_qty_length;
+
+      setMxSpringWidth(row);
+      setMxSpringLength();
     }
+    // }
   };
   /**
    * @description 设置多区弹簧宽度
@@ -1805,7 +1821,16 @@ export const useHooks = (t?: any, props?: any) => {
     let duoEnum = enumMap.get("duo_qv_str");
     let item = {};
     if (duoEnum) {
-      item = duoEnum.find(t => t.value == _mainData.duo_qv_str);
+      let _areaid = _mainData.duo_qv_str;
+      if (["三", "三区"].includes(_areaid)) {
+        _areaid = 3;
+      } else if (["五", "五区"].includes(_areaid)) {
+        _areaid = 5;
+      } else if (["七", "七区"].includes(_areaid)) {
+        _areaid = 7;
+      }
+
+      item = duoEnum.find(t => t.value == _areaid);
     }
     console.log("setMxSpringLength item :>> ", item);
 
@@ -1815,16 +1840,16 @@ export const useHooks = (t?: any, props?: any) => {
     }
     let arr = getDuoquVal(item, attrKey);
 
-    let totality = arr.reduce((a, b) => a + b, 0);
-
     let { fullData } = state.vxeTableMxRef.element.getTableData();
     let sum = Number(fullData[0].spring_qty_length);
-    console.log("arr, totality  :>> ", arr, totality, sum);
 
     if (state.vxeTableMxSpringRef) {
       let { fullData: springData } = state.vxeTableMxSpringRef?.element.getTableData();
       let lengthValSum = 0;
 
+      arr.length = springData.filter(o => o.springid).length;
+      let totality = arr.reduce((a, b) => a + b, 0);
+
       springData.forEach((item, index) => {
         let lengthVal = 0;
         if (arr.length >= index + 1) {
@@ -2482,10 +2507,15 @@ export const useHooks = (t?: any, props?: any) => {
       bednet.deptid = state.initParams.deptid;
     }
 
+    let bednetMx = state.vxeTableMxRef?.element.getTableData().fullData ?? [];
+    bednetMx.forEach((item: any) => {
+      item.if_part = Number(item.if_part);
+    });
+
     let _params: any = {
       dannum_type: state.dannum_type,
       bednet: bednet,
-      bednetMx: state.vxeTableMxRef?.element.getTableData().fullData ?? [],
+      bednetMx,
       spring: state.vxeTableMxSpringRef?.element.getTableData().fullData ?? []
     };
     let res = await GetComputeBednet(_params);
@@ -2565,6 +2595,7 @@ export const useHooks = (t?: any, props?: any) => {
     dataCallback,
     wf_cmp_cb,
     setMxSpringLength,
-    gotoSummy
+    gotoSummy,
+    handelChangeDuoqv
   };
 };

JLHWEB/src/views/quote/mattressQuote/detail.vue

@@ -21,7 +21,7 @@
           size="small"
           @change="showOriginFormulaMattress"
         />
-        <el-select v-model="scope.data.dannum_type" placeholder="大小单" style="width: 80px">
+        <el-select disabled v-model="scope.data.dannum_type" placeholder="大小单" style="width: 80px">
           <el-option label="散单" :value="1" />
           <el-option label="小单" :value="4" />
           <el-option label="标准" :value="2" />

JLHWEB/src/views/quote/mattressQuote/hooks/index.tsx

@@ -3526,63 +3526,51 @@ export const useHooks = (t?: any) => {
     {
       field: "dannum_cost1",
       render: (scope: any) => {
-        if (scope.row.dannum_cost1) {
-          if (scope.row.moneyrate > 1) {
-            return (
-              <div>
-                <span class="text-f-s" style="color: var(--lj-color-gray-7)">
-                  $
-                </span>
-                {formatAmount3({ val: floatDiv(scope.row.dannum_cost1, scope.row.moneyrate) })}
-              </div>
-            );
-          } else {
-            return formatAmount3({ val: scope.row.dannum_cost1 });
-          }
+        if (scope.row?.moneyrate > 1) {
+          return (
+            <div>
+              <span class="text-f-s" style="color: var(--lj-color-gray-7)">
+                $
+              </span>
+              {formatAmount3({ val: floatDiv(scope.row?.dannum_cost1 ?? 0, scope.row.moneyrate) })}
+            </div>
+          );
         } else {
-          return scope.row.dannum_cost1;
+          return formatAmount3({ val: scope.row?.dannum_cost1 ?? 0 });
         }
       }
     },
     {
       field: "dannum_cost2",
       render: (scope: any) => {
-        if (scope.row.dannum_cost2) {
-          if (scope.row.moneyrate > 1) {
-            return (
-              <div>
-                <span class="text-f-s" style="color: var(--lj-color-gray-7)">
-                  $
-                </span>
-                {formatAmount3({ val: floatDiv(scope.row.dannum_cost2, scope.row.moneyrate) })}
-              </div>
-            );
-          } else {
-            return formatAmount3({ val: scope.row.dannum_cost2 });
-          }
+        if (scope.row?.moneyrate > 1) {
+          return (
+            <div>
+              <span class="text-f-s" style="color: var(--lj-color-gray-7)">
+                $
+              </span>
+              {formatAmount3({ val: floatDiv(scope.row?.dannum_cost2 ?? 0, scope.row.moneyrate) })}
+            </div>
+          );
         } else {
-          return scope.row.dannum_cost2;
+          return formatAmount3({ val: scope.row?.dannum_cost2 ?? 0 });
         }
       }
     },
     {
       field: "dannum_cost3",
       render: (scope: any) => {
-        if (scope.row.dannum_cost3) {
-          if (scope.row.moneyrate > 1) {
-            return (
-              <div>
-                <span class="text-f-s" style="color: var(--lj-color-gray-7)">
-                  $
-                </span>
-                {formatAmount3({ val: floatDiv(scope.row.dannum_cost3, scope.row.moneyrate) })}
-              </div>
-            );
-          } else {
-            return formatAmount3({ val: scope.row.dannum_cost3 });
-          }
+        if (scope.row?.moneyrate > 1) {
+          return (
+            <div>
+              <span class="text-f-s" style="color: var(--lj-color-gray-7)">
+                $
+              </span>
+              {formatAmount3({ val: floatDiv(scope.row?.dannum_cost3 ?? 0, scope.row.moneyrate) })}
+            </div>
+          );
         } else {
-          return scope.row.dannum_cost3;
+          return formatAmount3({ val: scope.row?.dannum_cost3 ?? 0 });
         }
       }
     },
@@ -3590,21 +3578,17 @@ export const useHooks = (t?: any) => {
       field: "dannum_cost4",
       render: (scope: any) => {
         console.log("scope.row.moneyrate :>> ", scope);
-        if (scope.row.dannum_cost4) {
-          if (scope.row.moneyrate > 1) {
-            return (
-              <div>
-                <span class="text-f-s" style="color: var(--lj-color-gray-7)">
-                  $
-                </span>
-                {formatAmount3({ val: floatDiv(scope.row.dannum_cost4, scope.row.moneyrate) })}
-              </div>
-            );
-          } else {
-            return formatAmount3({ val: scope.row.dannum_cost4 });
-          }
+        if (scope.row?.moneyrate > 1) {
+          return (
+            <div>
+              <span class="text-f-s" style="color: var(--lj-color-gray-7)">
+                $
+              </span>
+              {formatAmount3({ val: floatDiv(scope.row?.dannum_cost4 ?? 0, scope.row.moneyrate) })}
+            </div>
+          );
         } else {
-          return scope.row.dannum_cost4;
+          return formatAmount3({ val: scope.row?.dannum_cost4 ?? 0 });
         }
       }
     }