JohnnyChan 5 月之前
父节点
当前提交
0dd86f0599

+ 0 - 1
JLHWEB/src/views/home/components/formula/index.vue

@@ -1 +0,0 @@
-<div>1231231</div>

+ 4 - 3
JLHWEB/src/views/quote/bednetQuote/detail.vue

@@ -271,10 +271,11 @@ const orderDefaultAction: detailAction[] = [
                 message: t("sys.api.sueccessToSave"),
                 type: "success"
               });
-              if (res.bednet.billid) {
-                router.replace(`/mattressQuote/detail?id=${res.bednet.billid}`);
+              if (res.bednet.bednetid) {
+                tabRemove(route.fullPath);
+                router.replace(`/bednetQuote/detail?id=${res.bednet.bednetid}`);
               } else {
-                router.replace("/mattressQuote");
+                router.replace("/bednetQuote");
               }
             })
             .catch(error => {

+ 23 - 22
JLHWEB/src/views/quote/bednetQuote/hooks/index.tsx

@@ -1598,32 +1598,33 @@ export const useHooks = (t?: any) => {
     let sum = Number(fullData[0].spring_qty_length);
     console.log("arr, totality  :>> ", arr, totality, sum);
 
-    let { fullData: springData } = state.vxeTableMxSpringRef.element.getTableData();
-    // fullData[0].if_part = Boolean(num);
-    let lengthValSum = 0;
-
-    springData.forEach((item, index) => {
-      let lengthVal = 0;
-      if (arr.length >= index + 1) {
-        console.log("index, arr.length  :>> ", index, arr.length);
-        if (index <= arr.length - 1) {
-          if (index == arr.length - 1) {
-            lengthVal = sum - lengthValSum;
+    if (state.vxeTableMxSpringRef) {
+      let { fullData: springData } = state.vxeTableMxSpringRef?.element.getTableData();
+      // fullData[0].if_part = Boolean(num);
+      let lengthValSum = 0;
+
+      springData.forEach((item, index) => {
+        let lengthVal = 0;
+        if (arr.length >= index + 1) {
+          console.log("index, arr.length  :>> ", index, arr.length);
+          if (index <= arr.length - 1) {
+            if (index == arr.length - 1) {
+              lengthVal = sum - lengthValSum;
+            } else {
+              lengthVal = (arr[index] / totality) * sum;
+              lengthValSum += lengthVal;
+            }
           } else {
-            lengthVal = (arr[index] / totality) * sum;
-            lengthValSum += lengthVal;
+            lengthVal = 0;
           }
-        } else {
-          lengthVal = 0;
+          console.log("lengthVal :>> ", lengthVal);
         }
-        console.log("lengthVal :>> ", lengthVal);
-      }
-      item.spring_qty_length = lengthVal;
-    });
-
-    console.log("state.vxeTableMxSpringRef.element :>> ", state.vxeTableMxSpringRef.element);
+        item.spring_qty_length = lengthVal;
+      });
+      console.log("state.vxeTableMxSpringRef.element :>> ", state.vxeTableMxSpringRef.element);
 
-    state.vxeTableMxSpringRef.element.updateFooter();
+      state.vxeTableMxSpringRef.element.updateFooter();
+    }
   };
 
   const columnsMx_default = ref<ColumnProps<any>[]>([

+ 0 - 0
JLHWEB/src/views/system/selector/formula/index.vue