From ca2f8ec80605b35350c21a0534b8f72fb74e7378 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Mon, 13 May 2024 16:54:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96-0513-=E7=94=B3=E8=B4=AD=E3=80=81=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E3=80=81=E5=90=88=E5=90=8C=E3=80=81=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6=E5=88=B0=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/purchase/purApply/purApply.vue            | 11 +++++++----
 src/views/purchase/purApply/purApplyEditDiaolog.vue |  6 ++++++
 src/views/purchase/purApply/pureApplyAudit.vue      | 11 ++++++-----
 src/views/purchase/purApply/pureApplyMySearch.vue   |  7 ++++---
 src/views/purchase/purApply/pureApplySearch.vue     |  7 ++++---
 .../purchase/purApply/pureApplySearchDetails.vue    |  7 ++++---
 src/views/purchase/purContract/purContract.vue      | 13 ++++++++-----
 .../purContract/purContractDetailDialog.vue         |  6 ++++++
 .../purchase/purContract/purContractEditDialog.vue  |  6 ++++++
 .../purchase/purContract/purContractFinish.vue      | 11 ++++++-----
 .../purchase/purContract/purContractReviewed.vue    | 10 +++++++---
 .../purchase/purContract/purContractSelectPlan.vue  |  5 +++++
 .../purchase/purContract/selectPurContract.vue      |  5 +++++
 src/views/purchase/purOrder/purOrder.vue            | 10 ++++++----
 src/views/purchase/purOrder/purOrderAudit.vue       |  7 ++++---
 .../purchase/purOrder/purOrderDetailDialog.vue      |  6 ++++++
 src/views/purchase/purOrder/purOrderEditDialog.vue  |  6 ++++++
 src/views/purchase/purOrder/purOrderSearch.vue      |  4 ++++
 .../purchase/purOrder/purOrderSearchDetails.vue     |  4 ++++
 src/views/purchase/purPlan/purPlan.vue              | 12 +++++++-----
 src/views/purchase/purPlan/purPlanAudit.vue         |  8 ++++++--
 src/views/purchase/purPlan/purPlanDetailDialog.vue  |  6 ++++++
 src/views/purchase/purPlan/purPlanEditDialog.vue    |  6 ++++++
 src/views/purchase/purPlan/purPlanSearch.vue        |  7 ++++---
 src/views/purchase/purPlan/purPlanSearchDetails.vue |  7 ++++---
 src/views/purchase/purPlan/selectPlanListDialog.vue | 10 ++++++----
 26 files changed, 143 insertions(+), 55 deletions(-)

diff --git a/src/views/purchase/purApply/purApply.vue b/src/views/purchase/purApply/purApply.vue
index 810d4cf3..58018b85 100644
--- a/src/views/purchase/purApply/purApply.vue
+++ b/src/views/purchase/purApply/purApply.vue
@@ -404,6 +404,7 @@
       :before-close="handleClose"
     >
       <pureApplyEdit
+        :pageType = "pageType"
         :closeDialog="closeDialog"
         :idQuery="idQuery"
         v-on:cancelDialog="getId"
@@ -425,6 +426,7 @@ import {
 export default {
   data() {
     return {
+      pageType:null,
       defaultSort: {prop: 'createTime', order: 'desc'},
       showSearch: true,
       pId: null,
@@ -441,7 +443,8 @@ export default {
         emergency: '',
         invCode: this.$store.getters.locInvCode,
         targetDeptCode: '',
-        targetInvCode: null
+        targetInvCode: null,
+        pageType: this.$route.query.pageType
       },
       isChang: false,
       formName: null,
@@ -524,9 +527,6 @@ export default {
 
   methods: {
     onReset() {
-      this.$router.push({
-        path: "",
-      });
       let deptCode = this.filterQuery.targetDeptCode
       this.filterQuery = {
         billNo: "",
@@ -543,6 +543,7 @@ export default {
         targetDeptCode: this.invCodebe,
         targetInvCode: null,
         invCode: this.$store.getters.locInvCode,
+        pageType: this.pageType
       };
       this.initActDateRange()
       if (deptCode != this.invCodebe) {
@@ -797,6 +798,8 @@ export default {
     this.initActDateRange()
     this.getCurInvList(this);
     this.getDeptList(this);
+
+    this.pageType = this.$route.query.pageType;
   }
   ,
 }
diff --git a/src/views/purchase/purApply/purApplyEditDiaolog.vue b/src/views/purchase/purApply/purApplyEditDiaolog.vue
index 0001c350..2062f42d 100644
--- a/src/views/purchase/purApply/purApplyEditDiaolog.vue
+++ b/src/views/purchase/purApply/purApplyEditDiaolog.vue
@@ -230,6 +230,10 @@ export default {
       type: Object,
       required: true,
     },
+    pageType: {
+      type: Object,
+      required: true,
+    },
     changId: {
       type: Boolean,
       required: true,
@@ -262,6 +266,7 @@ export default {
         invCode: null,
         targetInvCode: null,
         targetDeptCode: null,
+        pageType: null,
       },
       pId: null,
       formRules: {},
@@ -369,6 +374,7 @@ export default {
       this.formData.id = this.pId;
       this.formData.invCode = this.$store.getters.locInvCode
       this.formData.deptCode = this.$store.getters.locDeptCode
+      this.formData.pageType = this.pageType
       let tQuery = {
         type: 1,
         editStatus: status,
diff --git a/src/views/purchase/purApply/pureApplyAudit.vue b/src/views/purchase/purApply/pureApplyAudit.vue
index 44736757..d7101562 100644
--- a/src/views/purchase/purApply/pureApplyAudit.vue
+++ b/src/views/purchase/purApply/pureApplyAudit.vue
@@ -421,6 +421,7 @@ import {
 export default {
   data() {
     return {
+      pageType:null,
       defaultSort: {prop: 'createTime', order: 'desc'},
       showSearch: true,
       filterQuery: {
@@ -438,7 +439,8 @@ export default {
         targetInvCode: null,
         deptCode: null,
         invCode: null,
-        parentId: null
+        parentId: null,
+        pageType: this.$route.query.pageType
       },
       formName: null,
       formMap: {
@@ -519,9 +521,6 @@ export default {
 
   methods: {
     onReset() {
-      this.$router.push({
-        path: "",
-      });
       let deptCode = this.filterQuery.targetDeptCode
       this.filterQuery = {
         billNo: "",
@@ -536,7 +535,8 @@ export default {
         type: 1,
         editStatus: 1,
         targetDeptCode: this.invCodebe,
-        targetInvCode: null
+        targetInvCode: null,
+        pageType: this.$route.query.pageType
       };
       if (deptCode != this.invCodebe) {
         this.getInvList(this)
@@ -753,6 +753,7 @@ export default {
     this.actDateRange = [start, end];
     this.getCurInvList(this);
     this.getDeptList(this);
+    this.pageType = this.$route.query.pageType;
   }
   ,
 }
diff --git a/src/views/purchase/purApply/pureApplyMySearch.vue b/src/views/purchase/purApply/pureApplyMySearch.vue
index 95d7b129..1bf535aa 100644
--- a/src/views/purchase/purApply/pureApplyMySearch.vue
+++ b/src/views/purchase/purApply/pureApplyMySearch.vue
@@ -485,6 +485,7 @@ import {
 export default {
   data() {
     return {
+      pageType:null,
       defaultSort: {prop: 'createTime', order: 'desc'},
       showSearch: true,
       filterQuery: {
@@ -500,6 +501,7 @@ export default {
         emergency: '',
         deptCode: '',
         invCode: this.$store.getters.locInvCode,
+        pageType: this.$route.query.pageType
       },
       formName: null,
       formMap: {
@@ -624,9 +626,6 @@ export default {
       _this.approvalFlowDetailVisible = true;
     },
     onReset() {
-      this.$router.push({
-        path: "",
-      });
       let targetDeptCode = this.filterQuery.targetDeptCode
       this.filterQuery = {
         billNo: "",
@@ -642,6 +641,7 @@ export default {
         editStatus: 1,
         invCode: this.$store.getters.locInvCode,
         targetDeptCode: this.invCodebe,
+        pageType: this.$route.query.pageType
       };
       if (targetDeptCode != this.invCodebe) {
         this.getInvList(this)
@@ -902,6 +902,7 @@ export default {
     });
     this.getCurInvList(this);
     this.getDeptList(this);
+    this.pageType = this.$route.query.pageType;
   }
   ,
 }
diff --git a/src/views/purchase/purApply/pureApplySearch.vue b/src/views/purchase/purApply/pureApplySearch.vue
index 64aacff4..d0ce381b 100644
--- a/src/views/purchase/purApply/pureApplySearch.vue
+++ b/src/views/purchase/purApply/pureApplySearch.vue
@@ -467,6 +467,7 @@ import {executeFuc, getHead} from "@/utils/customConfig";
 export default {
   data() {
     return {
+      pageType:null,
       defaultSort: {prop: 'createTime', order: 'desc'},
       showSearch: true,
       filterQuery: {
@@ -482,6 +483,7 @@ export default {
         emergency: '',
         deptCode: '',
         invCode: null,
+        pageType: this.$route.query.pageType
       },
       formName: null,
       formMap: {
@@ -604,9 +606,6 @@ export default {
       _this.approvalFlowDetailVisible = true;
     },
     onReset() {
-      this.$router.push({
-        path: "",
-      });
       let deptCode = this.filterQuery.deptCode
       this.filterQuery = {
         billNo: "",
@@ -621,6 +620,7 @@ export default {
         type: 1,
         editStatus: 1,
         deptCode: this.invCodebe,
+        pageType: this.$route.query.pageType
       };
       if (deptCode != this.invCodebe) {
         this.getInvList(this)
@@ -858,6 +858,7 @@ export default {
     });
     this.getCurInvList(this);
     this.getDeptList(this);
+    this.pageType = this.$route.query.pageType;
 
   }
   ,
diff --git a/src/views/purchase/purApply/pureApplySearchDetails.vue b/src/views/purchase/purApply/pureApplySearchDetails.vue
index 14a658fa..f66a4416 100644
--- a/src/views/purchase/purApply/pureApplySearchDetails.vue
+++ b/src/views/purchase/purApply/pureApplySearchDetails.vue
@@ -104,6 +104,7 @@ import {getDetailList} from "@/api/purchase/purApply";
 export default {
   data() {
     return {
+      pageType:null,
       showSearch: true,
       filterQuery: {
         billNo: null,
@@ -116,6 +117,7 @@ export default {
         endDate: null,
         page: 1,
         limit: 10,
+        pageType: this.$route.query.pageType
       },
       total: 0,
       list: [],
@@ -189,9 +191,6 @@ export default {
 
   methods: {
     onReset() {
-      this.$router.push({
-        path: "",
-      });
       this.filterQuery = {
         billNo: null,
         productId: null,
@@ -203,6 +202,7 @@ export default {
         endDate: null,
         page: 1,
         limit: 10,
+        pageType: this.$route.query.pageType
       };
       this.actDateRange = [];
       this.getList();
@@ -259,6 +259,7 @@ export default {
   },
   created() {
     this.getList();
+    this.pageType = this.$route.query.pageType;
   },
 }
 ;
diff --git a/src/views/purchase/purContract/purContract.vue b/src/views/purchase/purContract/purContract.vue
index f3ca7c89..ca93f88d 100644
--- a/src/views/purchase/purContract/purContract.vue
+++ b/src/views/purchase/purContract/purContract.vue
@@ -145,6 +145,7 @@
       :before-close="handleClose"
     >
       <purContractEdit
+        :pageType="pageType"
         :isChang="isChang"
         :closeDialog="closeDialog"
         v-on:cancelDialog="getId"
@@ -161,6 +162,7 @@
       :close-on-press-escape="false"
     >
       <purContractSelectPlan
+        :pageType="pageType"
         :invList = "this.invList"
         :closeDialog="closeDialogSp"
       ></purContractSelectPlan>
@@ -200,6 +202,7 @@ export default {
   name: "purContract",
   data() {
     return {
+      pageType:null,
       defaultSort: {prop: 'createTime', order: 'desc'},
       showSearch: true,
       pId: null,
@@ -217,7 +220,8 @@ export default {
         editStatus: 1,
         emergency: '',
         deptCode: '',
-        invCode: null
+        invCode: null,
+        pageType: this.$route.query.pageType
       },
       invCodebe: null,
       formName: null,
@@ -359,9 +363,6 @@ export default {
       return obj
     },
     onReset() {
-      this.$router.push({
-        path: "",
-      });
       this.filterQuery = {
         billNo: "",
         thirdSysFk: "",
@@ -376,7 +377,8 @@ export default {
         status: 11,
         editStatus: 1,
         deptCode: this.invCodebe,
-        invCode: null
+        invCode: null,
+        pageType: this.pageType
       };
       this.actDateRange = [];
       this.getInvList()
@@ -601,6 +603,7 @@ export default {
   created() {
     this.getList();
     this.getInvList();
+    this.pageType = this.$route.query.pageType;
   }
   ,
 }
diff --git a/src/views/purchase/purContract/purContractDetailDialog.vue b/src/views/purchase/purContract/purContractDetailDialog.vue
index 3ea3f46c..8f5762bf 100644
--- a/src/views/purchase/purContract/purContractDetailDialog.vue
+++ b/src/views/purchase/purContract/purContractDetailDialog.vue
@@ -170,6 +170,10 @@ import {auditOrder, delApplyDetail, listApplyDetail} from "@/api/purchase/purCon
 export default {
   name: "idQuery",
   props: {
+    pageType: {
+      type: Object,
+      required: true,
+    },
     closeDialog: {
       type: Function,
       required: true,
@@ -204,6 +208,7 @@ export default {
         targetInv: 1000,
         targetSubInv: null,
         targetBillAction: null,
+        pageType: null,
       },
       formRules: {},
       codeArray: [],
@@ -264,6 +269,7 @@ export default {
     submitFunction(status) {
       let tMessage = status === '1' ? '保存' : '提交';
       this.loading = true;
+      this.formData.pageType = this.pageType
       let tQuery = {
         autoPurchase: this.formData.autoPurchase,
         targetSubInv: this.formData.targetSubInv,
diff --git a/src/views/purchase/purContract/purContractEditDialog.vue b/src/views/purchase/purContract/purContractEditDialog.vue
index a811e7d7..c0fa5000 100644
--- a/src/views/purchase/purContract/purContractEditDialog.vue
+++ b/src/views/purchase/purContract/purContractEditDialog.vue
@@ -301,6 +301,10 @@ import {findInvByUser} from "@/api/system/invSubWarehouse";
 export default {
   name: "idQuery",
   props: {
+    pageType: {
+      type: Object,
+      required: true,
+    },
     closeDialog: {
       type: Function,
       required: true,
@@ -354,6 +358,7 @@ export default {
         payAmount: null,
         payType: null,
         payDate: null,
+        pageType: null,
       },
       pId: null,
       formRules: {},
@@ -492,6 +497,7 @@ submitFunction(status)
   let tMessage = status === '1' ? '保存' : '提交';
   this.loading = true;
   this.formData.id = this.pId;
+  this.formData.pageType = this.pageType
   let tQuery = {
     editStatus: status,
     purContractEntity: this.formData,
diff --git a/src/views/purchase/purContract/purContractFinish.vue b/src/views/purchase/purContract/purContractFinish.vue
index e78aedc9..4ff90933 100644
--- a/src/views/purchase/purContract/purContractFinish.vue
+++ b/src/views/purchase/purContract/purContractFinish.vue
@@ -200,6 +200,7 @@ export default {
   name: "purContract",
   data() {
     return {
+      pageType:null,
       defaultSort: {prop: 'createTime', order: 'desc'},
       showSearch: true,
       pId: null,
@@ -217,7 +218,8 @@ export default {
         editStatus: 1,
         emergency: '',
         deptCode: '',
-        invCode: null
+        invCode: null,
+        pageType: this.$route.query.pageType
       },
       invCodebe: null,
       formName: null,
@@ -359,9 +361,6 @@ export default {
       return obj
     },
     onReset() {
-      this.$router.push({
-        path: "",
-      });
       this.filterQuery = {
         billNo: "",
         thirdSysFk: "",
@@ -376,7 +375,8 @@ export default {
         status: 12,
         editStatus: 1,
         deptCode: this.invCodebe,
-        invCode: null
+        invCode: null,
+        pageType: this.pageType
       };
       this.actDateRange = [];
       this.getInvList()
@@ -601,6 +601,7 @@ export default {
   created() {
     this.getList();
     this.getInvList();
+    this.pageType = this.$route.query.pageType;
   }
   ,
 }
diff --git a/src/views/purchase/purContract/purContractReviewed.vue b/src/views/purchase/purContract/purContractReviewed.vue
index b4c1adad..e0f90a3f 100644
--- a/src/views/purchase/purContract/purContractReviewed.vue
+++ b/src/views/purchase/purContract/purContractReviewed.vue
@@ -94,7 +94,7 @@
             <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)" v-show="(scope.row.status=='' || scope.row.status==1) " >删除</el-button>
 
             <el-button type="text" size="small" @click.native.stop="showApprovalFlowDetail(scope.row)"
-                       v-show=" scope.row.status != 1 && scope.row.status !=''  ">审批详情
+                       v-show=" scope.row.status != 1 && scope.row.status !=''  ">审批
             </el-button>
 
           </template>
@@ -200,6 +200,7 @@ export default {
   name: "purContract",
   data() {
     return {
+      pageType:null,
       defaultSort: {prop: 'createTime', order: 'desc'},
       showSearch: true,
       pId: null,
@@ -217,7 +218,8 @@ export default {
         editStatus: 1,
         emergency: '',
         deptCode: '',
-        invCode: null
+        invCode: null,
+        pageType: this.$route.query.pageType
       },
       invCodebe: null,
       formName: null,
@@ -376,7 +378,8 @@ export default {
         status: 10,
         editStatus: 1,
         deptCode: this.invCodebe,
-        invCode: null
+        invCode: null,
+        pageType: this.pageType
       };
       this.actDateRange = [];
       this.getInvList()
@@ -601,6 +604,7 @@ export default {
   created() {
     this.getList();
     this.getInvList();
+    this.pageType = this.$route.query.pageType;
   }
   ,
 }
diff --git a/src/views/purchase/purContract/purContractSelectPlan.vue b/src/views/purchase/purContract/purContractSelectPlan.vue
index 7b8aca9c..15659d5d 100644
--- a/src/views/purchase/purContract/purContractSelectPlan.vue
+++ b/src/views/purchase/purContract/purContractSelectPlan.vue
@@ -123,6 +123,10 @@ import {importPlan} from "@/api/purchase/purContract";
 export default {
   name: "purContractSelectPlan",
   props: {
+    pageType: {
+      type: Object,
+      required: true,
+    },
     closeDialog: {
       type: Function,
       required: true,
@@ -166,6 +170,7 @@ export default {
         total:0,
         page: 1,
         limit: 10,
+        pageType: this.pageType,
       }
     }
   },
diff --git a/src/views/purchase/purContract/selectPurContract.vue b/src/views/purchase/purContract/selectPurContract.vue
index 0932b2bb..127bef93 100644
--- a/src/views/purchase/purContract/selectPurContract.vue
+++ b/src/views/purchase/purContract/selectPurContract.vue
@@ -121,6 +121,10 @@ import {listPlan, listApplyDetail} from "@/api/purchase/purContract";
 export default {
   name: "purContractSelectPlan",
   props: {
+    pageType: {
+      type: Object,
+      required: true,
+    },
     closeDialog: {
       type: Function,
       required: true,
@@ -174,6 +178,7 @@ export default {
         total:0,
         page: 1,
         limit: 10,
+        pageType: this.pageType,
       },
       detailquery:
         {
diff --git a/src/views/purchase/purOrder/purOrder.vue b/src/views/purchase/purOrder/purOrder.vue
index 31e26f38..28818a7c 100644
--- a/src/views/purchase/purOrder/purOrder.vue
+++ b/src/views/purchase/purOrder/purOrder.vue
@@ -389,6 +389,7 @@
       :before-close="handleClose"
     >
       <purPlanEdit
+        :pageType="pageType"
         :isChang="isChang"
         :closeDialog="closeDialog"
         v-on:cancelDialog="getId"
@@ -411,6 +412,7 @@ import {
 export default {
   data() {
     return {
+      pageType:null,
       defaultSort: {prop: 'createTime', order: 'desc'},
       showSearch: true,
       pId: null,
@@ -427,7 +429,8 @@ export default {
         editStatus: 1,
         emergency: '',
         deptCode: '',
-        invCode: ''
+        invCode: '',
+        pageType: this.$route.query.pageType
       },
       formName: null,
       invCodebe: null,
@@ -505,9 +508,6 @@ export default {
 
   methods: {
     onReset() {
-      this.$router.push({
-        path: "",
-      });
       this.filterQuery = {
         billNo: "",
         thirdSysFk: "",
@@ -521,6 +521,7 @@ export default {
         type: 1,
         editStatus: 1,
         deptCode: this.invCodebe,
+        pageType: this.pageType
       };
       this.actDateRange = [];
       this.getInvList(this);
@@ -752,6 +753,7 @@ export default {
       this.queryList2 = re.data.queryList;
       this.fromList2 = re.data.fromList;
     });
+    this.pageType = this.$route.query.pageType;
   }
   ,
 }
diff --git a/src/views/purchase/purOrder/purOrderAudit.vue b/src/views/purchase/purOrder/purOrderAudit.vue
index 8e82fa84..96f19017 100644
--- a/src/views/purchase/purOrder/purOrderAudit.vue
+++ b/src/views/purchase/purOrder/purOrderAudit.vue
@@ -321,6 +321,7 @@ import {
 export default {
   data() {
     return {
+      pageType:null,
       defaultSort: {prop: 'createTime', order: 'desc'},
       showSearch: true,
       filterQuery: {
@@ -335,6 +336,7 @@ export default {
         editStatus: 1,
         emergency: '',
         deptCode: '',
+        pageType: this.$route.query.pageType
       },
       formName: null,
       invCodebe: null,
@@ -413,9 +415,6 @@ export default {
 
   methods: {
     onReset() {
-      this.$router.push({
-        path: "",
-      });
       this.filterQuery = {
         billNo: "",
         thirdSysFk: "",
@@ -429,6 +428,7 @@ export default {
         type: 1,
         editStatus: 1,
         deptCode: this.invCodebe,
+        pageType: this.pageType
       };
       this.actDateRange = [];
       this.getInvList(this);
@@ -602,6 +602,7 @@ export default {
       this.queryList2 = re.data.queryList;
       this.fromList2 = re.data.fromList;
     });
+    this.pageType = this.$route.query.pageType;
   }
   ,
 }
diff --git a/src/views/purchase/purOrder/purOrderDetailDialog.vue b/src/views/purchase/purOrder/purOrderDetailDialog.vue
index 84e3a58e..e4537c4d 100644
--- a/src/views/purchase/purOrder/purOrderDetailDialog.vue
+++ b/src/views/purchase/purOrder/purOrderDetailDialog.vue
@@ -224,6 +224,10 @@ import {parseTime} from "@/utils/coTools";
 export default {
   name: "idQuery",
   props: {
+    pageType: {
+      type: Object,
+      required: true,
+    },
     closeDialog: {
       type: Function,
       required: true,
@@ -258,6 +262,7 @@ export default {
         targetInv: 1000,
         targetSubInv: null,
         targetBillAction: null,
+        pageType: null,
       },
       formRules: {},
       codeArray: [],
@@ -337,6 +342,7 @@ export default {
     submitFunction(status) {
       let tMessage = status === '1' ? '保存' : '提交';
       this.loading = true;
+      this.formData.pageType = this.pageType
       let tQuery = {
         autoPurchase: this.formData.autoPurchase,
         targetSubInv: this.formData.targetSubInv,
diff --git a/src/views/purchase/purOrder/purOrderEditDialog.vue b/src/views/purchase/purOrder/purOrderEditDialog.vue
index 35eeb3cb..0792598a 100644
--- a/src/views/purchase/purOrder/purOrderEditDialog.vue
+++ b/src/views/purchase/purOrder/purOrderEditDialog.vue
@@ -265,6 +265,10 @@ import selectWarlockBag from "@/views/basic/destiny/warlockBagModel";
 export default {
   name: "idQuery",
   props: {
+    pageType: {
+      type: Object,
+      required: true,
+    },
     closeDialog: {
       type: Function,
       required: true,
@@ -296,6 +300,7 @@ export default {
         locStorageCode: null,
         invWarehouseCode: null,
         supId: null,
+        pageType: null,
       },
       pId: null,
       formRules: {},
@@ -423,6 +428,7 @@ export default {
       let tMessage = status === '1' ? '保存' : '提交';
       this.loading = true;
       this.formData.id = this.pId;
+      this.formData.pageType = this.pageType
       let tQuery = {
         editStatus: status,
         purOrderEntity: this.formData,
diff --git a/src/views/purchase/purOrder/purOrderSearch.vue b/src/views/purchase/purOrder/purOrderSearch.vue
index 88315da7..49019a90 100644
--- a/src/views/purchase/purOrder/purOrderSearch.vue
+++ b/src/views/purchase/purOrder/purOrderSearch.vue
@@ -468,6 +468,7 @@ import {
 export default {
   data() {
     return {
+      pageType:null,
       defaultSort: {prop: 'createTime', order: 'desc'},
       BASE_URL: process.env.VUE_APP_BASE_API,
       filterQuery: {
@@ -482,6 +483,7 @@ export default {
         editStatus: 1,
         emergency: '',
         deptCode: '',
+        pageType: this.$route.query.pageType
       },
       Menustatus: null,
       filePath: "",
@@ -619,6 +621,7 @@ export default {
         type: 1,
         editStatus: 1,
         deptCode: this.invCodebe,
+        pageType: this.$route.query.pageType
       };
       this.actAuditDateRange = [];
       this.actDateRange = [];
@@ -837,6 +840,7 @@ export default {
       this.queryList2 = re.data.queryList;
       this.fromList2 = re.data.fromList;
     });
+    this.pageType = this.$route.query.pageType;
   }
   ,
 }
diff --git a/src/views/purchase/purOrder/purOrderSearchDetails.vue b/src/views/purchase/purOrder/purOrderSearchDetails.vue
index 7e03fdf9..cf27fcc8 100644
--- a/src/views/purchase/purOrder/purOrderSearchDetails.vue
+++ b/src/views/purchase/purOrder/purOrderSearchDetails.vue
@@ -261,6 +261,7 @@ import {
 export default {
   data() {
     return {
+      pageType:null,
       showSearch: true,
       filterQuery: {
         billNo: null,
@@ -273,6 +274,7 @@ export default {
         endDate: null,
         page: 1,
         limit: 10,
+        pageType: this.$route.query.pageType
       },
       total: 0,
       tableHeader:[],
@@ -363,6 +365,7 @@ export default {
         endDate: null,
         page: 1,
         limit: 10,
+        pageType: this.pageType
       };
       this.actDateRange = [];
       this.getList();
@@ -435,6 +438,7 @@ export default {
       this.fromList = re.data.fromList;
       this.getList();
     });
+    this.pageType = this.$route.query.pageType;
   },
 }
 ;
diff --git a/src/views/purchase/purPlan/purPlan.vue b/src/views/purchase/purPlan/purPlan.vue
index a1fbc589..0bb0272e 100644
--- a/src/views/purchase/purPlan/purPlan.vue
+++ b/src/views/purchase/purPlan/purPlan.vue
@@ -405,6 +405,7 @@
       :before-close="handleClose"
     >
       <purPlanEdit
+        :pageType="pageType"
         :isChang="isChang"
         :closeDialog="closeDialog"
         v-on:cancelDialog="getId"
@@ -427,6 +428,7 @@ import {
 export default {
   data() {
     return {
+      pageType:null,
       defaultSort: {prop: 'createTime', order: 'desc'},
       showSearch: true,
       pId: null,
@@ -443,7 +445,8 @@ export default {
         editStatus: 1,
         emergency: '',
         deptCode: '',
-        invCode: null
+        invCode: null,
+        pageType: this.$route.query.pageType
       },
       invCodebe: null,
       formName: null,
@@ -521,9 +524,6 @@ export default {
 
   methods: {
     onReset() {
-      this.$router.push({
-        path: "",
-      });
       this.filterQuery = {
         billNo: "",
         thirdSysFk: "",
@@ -537,7 +537,8 @@ export default {
         type: 1,
         editStatus: 1,
         deptCode: this.invCodebe,
-        invCode: null
+        invCode: null,
+        pageType: this.pageType
       };
       this.actDateRange = [];
       this.getInvList(this)
@@ -772,6 +773,7 @@ export default {
       this.queryList2 = re.data.queryList;
       this.fromList2 = re.data.fromList;
     });
+    this.pageType = this.$route.query.pageType;
   }
   ,
 }
diff --git a/src/views/purchase/purPlan/purPlanAudit.vue b/src/views/purchase/purPlan/purPlanAudit.vue
index 5e3db9d9..96f4f98f 100644
--- a/src/views/purchase/purPlan/purPlanAudit.vue
+++ b/src/views/purchase/purPlan/purPlanAudit.vue
@@ -404,6 +404,7 @@ import {
 export default {
   data() {
     return {
+      pageType:null,
       defaultSort: {prop: 'createTime', order: 'desc'},
       showSearch: true,
       filterQuery: {
@@ -418,7 +419,8 @@ export default {
         editStatus: 1,
         emergency:'',
         deptCode:'',
-        invCode:null
+        invCode:null,
+        pageType: this.$route.query.pageType
       },
       formName: null,
       formMap: {
@@ -513,7 +515,8 @@ export default {
         type: 1,
         editStatus: 1,
         deptCode: this.invCodebe,
-        invCode:null
+        invCode:null,
+        pageType: this.pageType
       };
       this.getInvList(this)
       this.actDateRange = [];
@@ -691,6 +694,7 @@ export default {
       this.queryList2 = re.data.queryList;
       this.fromList2 = re.data.fromList;
     });
+    this.pageType = this.$route.query.pageType;
   }
   ,
 }
diff --git a/src/views/purchase/purPlan/purPlanDetailDialog.vue b/src/views/purchase/purPlan/purPlanDetailDialog.vue
index 13ffdc21..56e718f8 100644
--- a/src/views/purchase/purPlan/purPlanDetailDialog.vue
+++ b/src/views/purchase/purPlan/purPlanDetailDialog.vue
@@ -210,6 +210,10 @@ import {getLocalJoinByUser} from "@/api/basic/busType";
 export default {
     name: "idQuery",
     props: {
+      pageType: {
+        type: Object,
+        required: true,
+      },
         closeDialog: {
             type: Function,
             required: true,
@@ -244,6 +248,7 @@ export default {
                 targetInv: 1000,
                 targetSubInv: null,
                 targetBillAction: null,
+              pageType: null,
             },
           sysApprovalFlowConfig: false,
           approvalFlowDetailVisible: false,
@@ -325,6 +330,7 @@ export default {
         submitFunction(status) {
             let tMessage = status === '1' ? '保存' : '提交';
             this.loading = true;
+            this.formData.pageType = this.pageType
             let tQuery = {
                 autoPurchase:this.formData.autoPurchase,
                 targetSubInv:this.formData.targetSubInv,
diff --git a/src/views/purchase/purPlan/purPlanEditDialog.vue b/src/views/purchase/purPlan/purPlanEditDialog.vue
index d20b2bcb..ae8a2b59 100644
--- a/src/views/purchase/purPlan/purPlanEditDialog.vue
+++ b/src/views/purchase/purPlan/purPlanEditDialog.vue
@@ -214,6 +214,10 @@ import selectWarlockBag from "@/views/basic/destiny/warlockBagModel";
 export default {
   name: "idQuery",
   props: {
+    pageType: {
+      type: Object,
+      required: true,
+    },
     closeDialog: {
       type: Function,
       required: true,
@@ -245,6 +249,7 @@ export default {
         deptCode: null,
         locStorageCode: null,
         invWarehouseCode: null,
+        pageType: null,
       },
       pId: null,
       formRules: {},
@@ -370,6 +375,7 @@ export default {
       let tMessage = status === '1' ? '保存' : '提交';
       this.loading = true;
       this.formData.id = this.pId;
+      this.formData.pageType = this.pageType
       let tQuery = {
         editStatus: status,
         purPlanEntity: this.formData,
diff --git a/src/views/purchase/purPlan/purPlanSearch.vue b/src/views/purchase/purPlan/purPlanSearch.vue
index 33e3fc4c..6d9b7e15 100644
--- a/src/views/purchase/purPlan/purPlanSearch.vue
+++ b/src/views/purchase/purPlan/purPlanSearch.vue
@@ -454,6 +454,7 @@ import {
 export default {
   data() {
     return {
+      pageType:null,
       defaultSort: {prop: 'createTime', order: 'desc'},
       filterQuery: {
         billAction: null,
@@ -467,6 +468,7 @@ export default {
         editStatus: 1,
         emergency:'',
         deptCode:'',
+        pageType: this.$route.query.pageType
       },
       formName: null,
       formMap: {
@@ -586,9 +588,6 @@ export default {
       _this.approvalFlowDetailVisible = true;
     },
     onReset() {
-      this.$router.push({
-        path: "",
-      });
       this.filterQuery = {
         billNo: "",
         thirdSysFk: "",
@@ -602,6 +601,7 @@ export default {
         type: 1,
         editStatus: 1,
         deptCode: this.invCodebe,
+        pageType: this.pageType
       };
       this.getInvList(this);
       this.actDateRange = [];
@@ -788,6 +788,7 @@ export default {
       this.queryList2 = re.data.queryList;
       this.fromList2 = re.data.fromList;
     });
+    this.pageType = this.$route.query.pageType;
   }
   ,
 }
diff --git a/src/views/purchase/purPlan/purPlanSearchDetails.vue b/src/views/purchase/purPlan/purPlanSearchDetails.vue
index 67af5a22..4ae85e5d 100644
--- a/src/views/purchase/purPlan/purPlanSearchDetails.vue
+++ b/src/views/purchase/purPlan/purPlanSearchDetails.vue
@@ -259,6 +259,7 @@ import {
 export default {
   data() {
     return {
+      pageType: null,
       showSearch: true,
       filterQuery: {
         billNo: null,
@@ -271,6 +272,7 @@ export default {
         endDate: null,
         page: 1,
         limit: 10,
+        pageType: this.pageType
       },
       total: 0,
       tableHeader:[],
@@ -347,9 +349,6 @@ export default {
 
   methods: {
     onReset() {
-      this.$router.push({
-        path: "",
-      });
       this.filterQuery = {
         billNo: null,
         productId: null,
@@ -361,6 +360,7 @@ export default {
         endDate: null,
         page: 1,
         limit: 10,
+        pageType: this.pageType
       };
       this.actDateRange = [];
       this.getList();
@@ -432,6 +432,7 @@ export default {
       this.queryList = re.data.queryList;
       this.fromList = re.data.fromList;
       this.getList();
+      this.pageType = this.$route.query.pageType;
     });
   },
 }
diff --git a/src/views/purchase/purPlan/selectPlanListDialog.vue b/src/views/purchase/purPlan/selectPlanListDialog.vue
index 3b0a6cca..818e4a89 100644
--- a/src/views/purchase/purPlan/selectPlanListDialog.vue
+++ b/src/views/purchase/purPlan/selectPlanListDialog.vue
@@ -85,6 +85,10 @@ import {delOrder, addPlanDetailAndOrder,listOrderDetail} from "@/api/purchase/pu
 export default {
   name: "selectPlanListDialog",
   props: {
+    pageType: {
+      type: Object,
+      required: true,
+    },
     data: {
       type: Object,
       required: true,
@@ -103,12 +107,12 @@ export default {
     return {
       showSearch: true,
       filterQuery: {
-
         billAction: null,
         billNo: "",
         originType: null,
         page: 1,
         limit: 10,
+        pageType: this.pageType,
       },
       formName: null,
       statusMap: {
@@ -167,9 +171,6 @@ export default {
   },
   methods: {
     onReset() {
-      this.$router.push({
-        path: "",
-      });
       this.filterQuery = {
         billNo: "",
         thirdSysFk: "",
@@ -182,6 +183,7 @@ export default {
         corpName: null,
         type: 1,
         editStatus: 1,
+        pageType: this.pageType,
       };
       this.actDateRange = [];
       this.getList();