跳转方式更换

src/views/InformationAudit/enterWarehouseAudit/detail.vue

@@ -84,9 +84,12 @@
         </el-row>
       </el-form>
       <div style="text-align: center; padding: 50px 0 20px">
-        <button class="bottom-btn" v-if="!isShow" style="background-color: #676fe8" @click="handleAgree">通 过</button>
+        <!-- <button class="bottom-btn" v-if="!isShow" style="background-color: #676fe8" @click="handleAgree">通 过</button>
         <button class="bottom-btn" v-if="!isShow" style="background-color: #e13434" @click="handleReturn">退 回</button>
-        <button class="bottom-btn" style="background-color: #89aac4" @click="handleBack">返 回</button>
+        <button class="bottom-btn" style="background-color: #89aac4" @click="handleBack">返 回</button> -->
+        <el-button type="success" v-if="!isShow" @click="handleAgree" style="background-color: #676fe8;border:none">通过</el-button>
+        <el-button type="primary" v-if="!isShow" @click="handleReturn" style="background-color: #e13434;border:none">退回</el-button>
+        <el-button @click="handleBack">返回</el-button>
       </div>
     </div>
   </basic-container>
@@ -103,9 +106,12 @@ import { useDict } from "@/hooks/dict";
 // import { closeTagAndOpenLastTag } from '@/router/Routermethods';
 import store from "@/store";
 import { useGetters } from "@/hooks/storeHooks";
-const { access_token } = useGetters(["access_token"])
+import { getQuery } from "@/hooks/detailQuery/index";
 
+const { access_token } = useGetters(["access_token"])
 const { indound_type, is_available } = useDict("indound_type", "is_available");
+const queryData = getQuery("enterWarehouseAuditDetail");
+
 const router = useRouter();
 const route = useRoute();
 const data = reactive({
@@ -134,12 +140,12 @@ let { tableData, auditData, isShow, fileUrl, myHeader } = toRefs(data);
 
 // 获取列表
 const getList = () => {
-  if (route.query.type == "show") {
+  if (queryData.type == "show") {
     isShow.value = true;
   } else {
     isShow.value = false;
   }
-  getInAuditDetail(route.query.id).then((res: any) => {
+  getInAuditDetail(queryData.id).then((res: any) => {
     if (res.code === 0) {
       tableData.value = res.data.inboundMaterial;
       auditData.value = res.data.inboundStatus;
@@ -159,7 +165,7 @@ const handleAgree = () => {
     type: "warning"
   })
     .then(() => {
-      let data = { ...formData, audi: "0", inboundId: route.query.id };
+      let data = { ...formData, audi: "0", inboundId: queryData.id };
       audit(data).then((res: any) => {
         if (res.code === 0) {
           ElMessage({
@@ -185,7 +191,7 @@ const handleReturn = () => {
     type: "warning"
   })
     .then(() => {
-      let data = { ...formData, audi: "1", inboundId: route.query.id };
+      let data = { ...formData, audi: "1", inboundId: queryData.id };
       audit(data).then((res: any) => {
         if (res.code === 0) {
           ElMessage({

src/views/InformationAudit/enterWarehouseAudit/index.vue

@@ -101,6 +101,7 @@ import { Search, RefreshRight } from "@element-plus/icons-vue";
 import { useRouter } from "vue-router";
 import { useDict } from "@/hooks/dict";
 import { useGetters } from "@/hooks/storeHooks";
+import { setQuery } from "@/hooks/detailQuery/index";
 
 const { indound_type, auditing_status } = useDict("indound_type", "auditing_status");
 const { userInfo } = useGetters(["userInfo"]);
@@ -162,23 +163,25 @@ const handleReSearch = () => {
 };
 // 审核
 const handleProcess = (row: any) => {
-  router.push({
-    path: "enterWarehouseAuditDetail",
-    query: {
-      id: row.inboundId,
-      type: "audit"
-    }
-  });
+  // router.push({
+  //   path: "enterWarehouseAuditDetail",
+  //   query: {
+  //     id: row.inboundId,
+  //     type: "audit"
+  //   }
+  // });
+  setQuery("enterWarehouseAuditDetail", { id: row.inboundId, type: "audit" });
 };
 // 查看
 const handleShow = (row: any) => {
-  router.push({
-    path: "enterWarehouseAuditDetail",
-    query: {
-      id: row.inboundId,
-      type: "show"
-    }
-  });
+  // router.push({
+  //   path: "enterWarehouseAuditDetail",
+  //   query: {
+  //     id: row.inboundId,
+  //     type: "show"
+  //   }
+  // });
+  setQuery("enterWarehouseAuditDetail", { id: row.inboundId, type: "show" });
 };
 
 onMounted(() => {

src/views/InformationAudit/outWarehouseAudit/detail.vue

@@ -89,9 +89,12 @@
         </el-row>
       </el-form>
       <div style="text-align: center; padding: 50px 0 20px">
-        <button class="bottom-btn" v-if="!isShow" style="background-color: #676fe8" @click="handleAgree">通 过</button>
+        <!-- <button class="bottom-btn" v-if="!isShow" style="background-color: #676fe8" @click="handleAgree">通 过</button>
         <button class="bottom-btn" v-if="!isShow" style="background-color: #e13434" @click="handleReturn">退 回</button>
-        <button class="bottom-btn" style="background-color: #89aac4" @click="handleBack">返 回</button>
+        <button class="bottom-btn" style="background-color: #89aac4" @click="handleBack">返 回</button> -->
+        <el-button type="success" v-if="!isShow" @click="handleAgree" style="background-color: #676fe8;border:none">通过</el-button>
+        <el-button type="primary" v-if="!isShow" @click="handleReturn" style="background-color: #e13434;border:none">退回</el-button>
+        <el-button @click="handleBack">返回</el-button>
       </div>
     </div>
   </basic-container>
@@ -105,12 +108,14 @@ import { Search } from "@element-plus/icons-vue";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { useRouter, useRoute } from "vue-router";
 import { useDict } from "@/hooks/dict";
-import { closeTagAndOpenLastTag } from "@/router/Routermethods";
+// import { closeTagAndOpenLastTag } from "@/router/Routermethods";
 import store from "@/store";
 import { useGetters } from "@/hooks/storeHooks";
-const { access_token } = useGetters(["access_token"])
+import { getQuery } from "@/hooks/detailQuery/index";
 
+const { access_token } = useGetters(["access_token"]);
 const { outdound_type, is_available, province_ch } = useDict("outdound_type", "is_available", "province_ch");
+const queryData = getQuery("outWarehouseAuditDetail");
 
 const router = useRouter();
 const route = useRoute();
@@ -140,12 +145,12 @@ let { tableData, auditData, isShow, fileUrl, myHeader } = toRefs(data);
 
 // 获取列表
 const getList = () => {
-  if (route.query.type == "show") {
+  if (queryData.type == "show") {
     isShow.value = true;
   } else {
     isShow.value = false;
   }
-  getInAuditDetail(route.query.id).then((res: any) => {
+  getInAuditDetail(queryData.id).then((res: any) => {
     if (res.code === 0) {
       tableData.value = res.data.outboundMaterial;
       auditData.value = res.data.outboundStatus;
@@ -165,7 +170,7 @@ const handleAgree = () => {
     type: "warning"
   })
     .then(() => {
-      let data = { ...formData, audi: "0", outboundId: route.query.id };
+      let data = { ...formData, audi: "0", outboundId: queryData.id };
       audit(data).then((res: any) => {
         if (res.code === 0) {
           ElMessage({
@@ -191,7 +196,7 @@ const handleReturn = () => {
     type: "warning"
   })
     .then(() => {
-      let data = { ...formData, audi: "1", outboundId: route.query.id };
+      let data = { ...formData, audi: "1", outboundId: queryData.id };
       audit(data).then((res: any) => {
         if (res.code === 0) {
           ElMessage({
@@ -211,9 +216,9 @@ const handleReturn = () => {
 };
 // 返回
 const handleBack = () => {
-  // store.commit("DEL_TAG", store.getters.tag);
-  // router.push("/InformationAudit/outWarehouseAudit");
-  closeTagAndOpenLastTag();
+  store.commit("DEL_TAG", store.getters.tag);
+  router.push("/InformationAudit/outWarehouseAudit");
+  // closeTagAndOpenLastTag();
 };
 
 // 附件相关
@@ -281,6 +286,7 @@ onMounted(() => {
   border: none;
   border-radius: 15px;
 }
+
 .bottom-btn + .bottom-btn {
   margin-left: 20px;
 }

src/views/InformationAudit/outWarehouseAudit/index.vue

@@ -99,6 +99,7 @@ import { Search, RefreshRight } from "@element-plus/icons-vue";
 import { useRouter } from "vue-router";
 import { useDict } from "@/hooks/dict";
 import { useGetters } from "@/hooks/storeHooks";
+import { setQuery } from "@/hooks/detailQuery/index";
 
 const { outdound_type, is_available, province_ch, auditing_status } = useDict(
   "outdound_type",
@@ -164,23 +165,25 @@ const handleReSearch = () => {
 };
 // 审核
 const handleProcess = (row: any) => {
-  router.push({
-    path: "outWarehouseAuditDetail",
-    query: {
-      id: row.outboundId,
-      type: "audit"
-    }
-  });
+  // router.push({
+  //   path: "outWarehouseAuditDetail",
+  //   query: {
+  //     id: row.outboundId,
+  //     type: "audit"
+  //   }
+  // });
+  setQuery("outWarehouseAuditDetail", { id: row.outboundId, type: "audit" });
 };
 // 查看
 const handleShow = (row: any) => {
-  router.push({
-    path: "outWarehouseAuditDetail",
-    query: {
-      id: row.outboundId,
-      type: "show"
-    }
-  });
+  // router.push({
+  //   path: "outWarehouseAuditDetail",
+  //   query: {
+  //     id: row.outboundId,
+  //     type: "show"
+  //   }
+  // });
+  setQuery("outWarehouseAuditDetail", { id: row.outboundId, type: "show" });
 };
 
 onMounted(() => {