1、修复床网报价点击修改没反应问题

2、修复床网报价点击取消/返回出现404问题

JLHWEB/src/stores/modules/keepAlive.ts

@@ -352,7 +352,7 @@ export const useKeepAliveStore = defineStore({
       if ((!from || fromNameIncludes(from, "/index")) && toNameIncludes(to, "/detail") && toBillCode) {
         const editTabIndex = findTabIndex("edit");
         if (editTabIndex > -1) {
-          await unlockBill(tabsMenuList[editTabIndex]);
+          // await unlockBill(tabsMenuList[editTabIndex]);
           replaceTab(editTabIndex);
         }
       }
@@ -377,7 +377,7 @@ export const useKeepAliveStore = defineStore({
       ) {
         const editTabIndex = findTabIndex("edit");
         if (editTabIndex > -1) {
-          await unlockBill(from); // 保证顺序
+          // await unlockBill(from); // 保证顺序
           replaceTab(editTabIndex);
         }
       }

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

@@ -706,7 +706,7 @@ const orderDefaultAction = [
   buttonDefault({
     label: t("common.back"),
     clickFunc: item => {
-      router.push(`/erpapi/mattressInterface`);
+      router.push(`/erpapi/mattressInterface/index`);
     }
   })
 ];

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

@@ -1293,7 +1293,7 @@ const orderDefaultAction = [
   buttonDefault({
     label: t("common.back"),
     clickFunc: item => {
-      router.push(`/erpapi/mattressInterface`);
+      router.push(`/erpapi/mattressInterface/index`);
     }
   })
 ];

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

@@ -360,25 +360,25 @@ const orderDefaultAction: detailAction[] = [
       if (typeof props.bednetid != "undefined") {
         emit("aftercancel");
       } else {
-        tabRemove(route.fullPath);
-        if (route.path.indexOf("/new") > -1) {
-          router.replace("/bednetQuote");
-        } else {
-          // router.replace(
-          //   `/bednetQuote/detail?id=${LjDetailRef.value._mainData.bednetid}&code=${LjDetailRef.value._mainData.bednetcode}`
-          // );
-          pageRefresh({
-            name: "bednetQuoteEdit",
-            params: {
-              id: LjDetailRef.value._mainData.bednetid,
-              code: LjDetailRef.value._mainData.bednetcode
-            },
-            query: {
-              id: LjDetailRef.value._mainData.bednetid,
-              code: LjDetailRef.value._mainData.bednetcode
-            }
-          });
-        }
+        // if (route.path.indexOf("/new") > -1) {
+        // tabRemove(route.fullPath);
+        // router.replace("/bednetQuote");
+        // } else {
+        // router.replace(
+        //   `/bednetQuote/detail?id=${LjDetailRef.value._mainData.bednetid}&code=${LjDetailRef.value._mainData.bednetcode}`
+        // );
+        pageRefresh({
+          name: "bednetQuoteDetail",
+          params: {
+            id: LjDetailRef.value._mainData.bednetid,
+            code: LjDetailRef.value._mainData.bednetcode
+          },
+          query: {
+            id: LjDetailRef.value._mainData.bednetid,
+            code: LjDetailRef.value._mainData.bednetcode
+          }
+        });
+        // }
       }
     }
   }),
@@ -683,7 +683,7 @@ const orderDefaultAction: detailAction[] = [
       return typeof props?.bednetid != "undefined";
     },
     clickFunc: item => {
-      router.push("/bednetQuote");
+      router.push("/bednetQuote/index");
     }
   })
 ];

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

@@ -120,7 +120,7 @@ const {
   dataCallback
 } = useHooks();
 const { CheckPower, CheckOption, buttonNew, buttonDefault } = useAuthButtons(t);
-const { pageLockRefresh, pageLockOpen } = usePageRouter();
+const { pageOpen } = usePageRouter();
 
 const dialogVisible = ref(false);
 // const vxeTableRef = ref();
@@ -263,14 +263,17 @@ const action: detailAction[] = [
         return;
       }
 
-      pageLockOpen(
-        `/bednetQuote/edit?id=${_cur.bednetid}&code=${_cur.bednetcode}`,
-        "BedNetQuote",
-        _cur.bednetid,
-        _cur.bednetcode
-      );
-      // router.push(`/bednetQuote/edit?id=${_cur.bednetid}&code=${_cur.bednetcode}`);
-      // }
+      pageOpen({
+        name: "bednetQuoteEdit",
+        params: {
+          id: _cur.bednetid,
+          code: _cur.bednetcode
+        },
+        query: {
+          id: _cur.bednetid,
+          code: _cur.bednetcode
+        }
+      });
     }
   }),
   buttonDefault({

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

@@ -2107,25 +2107,25 @@ const orderDefaultAction = [
       return !orderStatus.value;
     },
     clickFunc: item => {
-      if (route.path.indexOf("/new") > -1) {
-        tabRemove(route.fullPath);
-        router.replace("/mattressQuote");
-      } else {
-        // router.replace(
-        //   `/mattressQuote/detail?id=${LjDetailRef.value._mainData.mattressid}&code=${LjDetailRef.value._mainData.mattresscode}`
-        // );
-        pageRefresh({
-          name: "mattressQuoteDetail",
-          params: {
-            id: LjDetailRef.value._mainData.mattressid,
-            code: LjDetailRef.value._mainData.mattresscode
-          },
-          query: {
-            id: LjDetailRef.value._mainData.mattressid,
-            code: LjDetailRef.value._mainData.mattresscode
-          }
-        });
-      }
+      // if (route.path.indexOf("/new") > -1) {
+      //   tabRemove(route.fullPath);
+      //   router.replace("/mattressQuote");
+      // } else {
+      // router.replace(
+      //   `/mattressQuote/detail?id=${LjDetailRef.value._mainData.mattressid}&code=${LjDetailRef.value._mainData.mattresscode}`
+      // );
+      pageRefresh({
+        name: "mattressQuoteDetail",
+        params: {
+          id: LjDetailRef.value._mainData.mattressid,
+          code: LjDetailRef.value._mainData.mattresscode
+        },
+        query: {
+          id: LjDetailRef.value._mainData.mattressid,
+          code: LjDetailRef.value._mainData.mattresscode
+        }
+      });
+      // }
     }
   }),
   buttonNew({
@@ -2479,7 +2479,7 @@ const orderDefaultAction = [
   buttonDefault({
     label: t("common.back"),
     clickFunc: item => {
-      router.push("/mattressQuote");
+      router.push("/mattressQuote/index");
     }
   })
 ];

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

@@ -488,7 +488,7 @@ const orderDefaultAction = [
   buttonDefault({
     label: t("common.back"),
     clickFunc: item => {
-      router.push("/softbedQuote");
+      router.push("/softbedQuote/index");
     }
   })
 ];