JLHWEB:1、修复部分已知问题

JLHWEB/src/layouts/components/Tabs/index.vue

@@ -186,7 +186,6 @@ const tabRemove = (fullPath: TabPaneName) => {
   // keepAliveStore.setKeepAliveList(arr);
 
   tabStore.removeTabs(fullPath as string, fullPath == route.fullPath);
-  router.go(-1);
 };
 
 // get Path param

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

@@ -488,6 +488,21 @@ const orderDefaultAction = [
       clickFunc: item => {
         RefreshMattressInterfaceList(LjDetailRef.value?._mainData.mattressid, 0, LjDetailRef.value?._mainData.erp_configcodetype);
       }
+    }),
+    buttonDefault({
+      label: "覆盖配置到副规格产品",
+      limited: () => {
+        return !orderStatus.value || editType.value != 1;
+      },
+      disabledTextCallBack: (data: any) => {
+        if (data.child_count == 0) {
+          return "没有副规格产品，无法操作";
+        }
+        return "";
+      },
+      clickFunc: item => {
+        alert("功能维护中!");
+      }
     })
   ],
   [

JLHWEB/src/views/erpapi/mattressInterface/hooks/index.tsx

@@ -411,7 +411,27 @@ export const useHooks = (t?: any) => {
     },
     {
       field: "mattressname",
-      title: "核价名称"
+      title: "核价名称",
+      treeNode: true,
+      render: scope => {
+        return !scope.row?.child_count && !scope.row?.parentid ? (
+          scope.row?.mattressname
+        ) : scope.row?.parentid ? (
+          <>
+            <el-tag type="warning" effect="light" disable-transitions size="small" class="mr-4">
+              副
+            </el-tag>
+            {scope.row?.mattressname}
+          </>
+        ) : (
+          <>
+            <el-tag type="primary" effect="light" disable-transitions size="small" class="mr-4">
+              主
+            </el-tag>
+            {scope.row?.mattressname}
+          </>
+        );
+      }
     },
     {
       field: "mattresstypeid",

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

@@ -111,6 +111,15 @@ const tableProps = {
   height: "auto",
   editConfig: { trigger: "click", mode: "cell" },
   rowClassName: rowClsNameFunc,
+  treeConfig: {
+    expandAll: true,
+    transform: true,
+    rowField: "mattressid",
+    parentField: "parentid"
+  },
+  checkboxConfig: {
+    range: false
+  },
   exportConfig: {
     filename: t("menu.rpMsttake") + formatToDate(new Date(), "YYYY-MM-DD HH:mm:ss")
   }

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

@@ -57,7 +57,7 @@
           <LjVxeTable
             ref="vxeTableMxSpringRef"
             row-key="bednetmx_partid"
-            table-cls="overflow-hidden"
+            table-cls="overflow-hidden h-full"
             :columns="columnsMxSpring"
             :init-param="initParamsMxSpring"
             :request-api="getDataMxSpring"

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

@@ -2961,7 +2961,7 @@ const cmpMoneyrate = computed(() => {
   return LjDetailRef.value?._mainData.moneyrate ?? 0;
 });
 const cmpIfMoneyrate = computed(() => {
-  return LjDetailRef.value._mainData.if_moneyrate ?? 0;
+  return LjDetailRef.value?._mainData.if_moneyrate ?? 0;
 });
 </script>
 

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

@@ -1422,8 +1422,8 @@ export const useHooks = (t?: any) => {
       if (data.formulakind == 5) {
         //默认4个拉手
         _qty = 4;
-      } else if ([7, 8, 9, 202, 203].includes(data.formulakind)) {
-        // 拉手刺绣及其他工艺，大侧压压布、拉链等自动带出数量=周长
+      } else if ([7, 8, 9, 30, 202, 203].includes(data.formulakind)) {
+        // 拉手刺绣及其他工艺，大侧压压布7、大侧压边带8、大侧压织带9、防火线30、拉链202、内布套围边边带203，自动带出数量=周长
         let mattress_width = state.LjDetailRef._mainData.mattress_width ?? 0;
         let mattress_length = state.LjDetailRef._mainData.mattress_length ?? 0;
         _qty = (mattress_width / 100 + mattress_length / 100) * 2;
@@ -2913,17 +2913,17 @@ export const useHooks = (t?: any) => {
       render: scope => {
         return !scope.row?.child_count && !scope.row?.parentid ? (
           scope.row?.mattressname
-        ) : scope.row?.parentid == 0 ? (
+        ) : scope.row?.parentid ? (
           <>
-            <el-tag type="primary" effect="light" disable-transitions size="small" class="mr-4">
-              主
+            <el-tag type="warning" effect="light" disable-transitions size="small" class="mr-4">
+              副
             </el-tag>
             {scope.row?.mattressname}
           </>
         ) : (
           <>
-            <el-tag type="warning" effect="light" disable-transitions size="small" class="mr-4">
-              副
+            <el-tag type="primary" effect="light" disable-transitions size="small" class="mr-4">
+              主
             </el-tag>
             {scope.row?.mattressname}
           </>

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

@@ -430,21 +430,21 @@ const action: detailAction[] = [
     label: t("common.viewHistoricalQuotes"),
     power: 72,
     clickFunc: item => {
-      router.push(`/mattressQuote/new?id=0`);
+      alert("功能维护中!");
     }
   }),
   buttonDefault({
     label: t("common.showQuoteList"),
     power: 72,
     clickFunc: item => {
-      router.push(`/mattressQuote/new?id=0`);
+      alert("功能维护中!");
     }
   }),
   buttonDefault({
     label: t("common.dataTransmission"),
     power: 72,
     clickFunc: item => {
-      router.push(`/mattressQuote/new?id=0`);
+      alert("功能维护中!");
     }
   }),
   buttonDefault({