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" > @@ -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 @@ 删除 审批详情 + v-show=" scope.row.status != 1 && scope.row.status !='' ">审批 @@ -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" >