From 7439c1bf82ba1232d28245b93dc9ae563775891b Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Tue, 23 Sep 2025 15:59:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E6=96=99=E7=AB=99=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/index.js | 8 +++- src/store/modules/clzApply.js | 33 +++++++++++++++ src/store/modules/clzBack.js | 40 +++++++++++++++++++ src/store/modules/clzOutBound.js | 33 +++++++++++++++ .../direct-rotation-apply/index.vue | 2 +- .../toolsBack/back/component/home.vue | 30 ++++++++++++-- .../materialsStation/toolsBack/back/index.vue | 3 ++ .../toolsLease/apply/component/homeApply.vue | 24 +++++++++-- .../toolsLease/apply/index.vue | 2 + .../outBound/component/homeApply.vue | 25 ++++++++++-- .../toolsLease/outBound/index.vue | 4 ++ 11 files changed, 191 insertions(+), 13 deletions(-) create mode 100644 src/store/modules/clzApply.js create mode 100644 src/store/modules/clzBack.js create mode 100644 src/store/modules/clzOutBound.js diff --git a/src/store/index.js b/src/store/index.js index d652e2a7..e2c3bdb0 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -7,6 +7,9 @@ import tagsView from './modules/tagsView' import permission from './modules/permission' import settings from './modules/settings' import getters from './getters' +import clzOutBound from './modules/clzOutBound' +import clzApply from './modules/clzApply' +import clzBack from './modules/clzBack' Vue.use(Vuex) const store = new Vuex.Store({ @@ -16,7 +19,10 @@ const store = new Vuex.Store({ user, tagsView, permission, - settings + settings, + clzOutBound, + clzApply, + clzBack }, getters }) diff --git a/src/store/modules/clzApply.js b/src/store/modules/clzApply.js new file mode 100644 index 00000000..bc6709d3 --- /dev/null +++ b/src/store/modules/clzApply.js @@ -0,0 +1,33 @@ +const state = { + clzApplyQueryParams: { + pageNum: 1, + pageSize: 10, + time: [], //申请时间 + keyWord: '', + taskStatus: null, //申请时间 + impUnitName:'',//分公司 + departName:'',//项目部 + subUnitName:'',//分包单位 + proName:'',//领料工程 + teamName:'',//领料班组 + maTypeNames:''//领料工器具类型 + } +} + +const mutations = { + setClzApplyQueryParams(state, queryParams) { + state.clzApplyQueryParams = queryParams + } +} + +const actions = {} + +const getters = {} + +export default { + namespaced: true, + state, + mutations, + actions, + getters +} \ No newline at end of file diff --git a/src/store/modules/clzBack.js b/src/store/modules/clzBack.js new file mode 100644 index 00000000..2949c80e --- /dev/null +++ b/src/store/modules/clzBack.js @@ -0,0 +1,40 @@ +const state = { + clzBackQueryParams: { + pageNum: 1, + pageSize: 10, + keyWord: '', //关键字 + teamId: '', //班组id + lotId: '', //工程id + status: '', //状态 + typeId: '', //工机具类型 + time: '', + agreementCode: '', //协议 + startTime: '', + endTime: '', + proId: null, + impUnitName:'',//分公司 + departName:'',//项目部 + subUnitName:'',//分包单位 + teamName:'',//班组 + proName:'',//工程 + typeName:''//工器具类型 + } +} + +const mutations = { + setClzBackQueryParamsQueryParams(state, queryParams) { + state.clzBackQueryParams = queryParams + } +} + +const actions = {} + +const getters = {} + +export default { + namespaced: true, + state, + mutations, + actions, + getters +} \ No newline at end of file diff --git a/src/store/modules/clzOutBound.js b/src/store/modules/clzOutBound.js new file mode 100644 index 00000000..676272ec --- /dev/null +++ b/src/store/modules/clzOutBound.js @@ -0,0 +1,33 @@ +const state = { + clzOutBoundQueryParams: { + pageNum: 1, + pageSize: 10, + time: [], //申请时间 + keyWord: '', + taskStatus: null, //申请时间 + impUnitName:'',//分公司 + departName:'',//项目部 + proName:'',//领料工程 + subUnitName:'',//分包单位 + teamName:'',//领料班组 + maTypeNames:''//领料工器具类型 + } +} + +const mutations = { + setClzOutBoundQueryParamsQueryParams(state, queryParams) { + state.clzOutBoundQueryParams = queryParams + } +} + +const actions = {} + +const getters = {} + +export default { + namespaced: true, + state, + mutations, + actions, + getters +} \ No newline at end of file diff --git a/src/views/business-examine/direct-rotation-apply/index.vue b/src/views/business-examine/direct-rotation-apply/index.vue index fcff6b4c..72483d76 100644 --- a/src/views/business-examine/direct-rotation-apply/index.vue +++ b/src/views/business-examine/direct-rotation-apply/index.vue @@ -65,7 +65,7 @@ 待审核 审核中 已通过 - 已驳回 + 已驳回 diff --git a/src/views/materialsStation/toolsBack/back/component/home.vue b/src/views/materialsStation/toolsBack/back/component/home.vue index 0dc30d6c..728468ca 100644 --- a/src/views/materialsStation/toolsBack/back/component/home.vue +++ b/src/views/materialsStation/toolsBack/back/component/home.vue @@ -409,6 +409,11 @@ export default { this.getList() this.initSelectData() }, + + beforeDestroy() { + this.$store.commit('clzBack/setClzBackQueryParams', this.queryParams) + }, + methods: { format(date) { const y = date.getFullYear() @@ -650,11 +655,28 @@ export default { let start = new Date() start.setMonth(start.getMonth() - 1) this.queryParams.time = [this.format(start), this.format(end)] - // this.resetForm("queryForm"); - this.queryParams.teamId = '' this.projectId = null - this.queryParams.proId = '' - this.$refs.queryForm.resetFields() + this.queryParams = { + pageNum: 1, + pageSize: 10, + keyWord: '', //关键字 + teamId: '', //班组id + lotId: '', //工程id + status: '', //状态 + typeId: '', //工机具类型 + time: '', + agreementCode: '', //协议 + startTime: '', + endTime: '', + proId: null, + impUnitName:'',//分公司 + departName:'',//项目部 + subUnitName:'',//分包单位 + teamName:'',//班组 + proName:'',//工程 + typeName:''//工器具类型 + } + this.$store.commit('clzBack/clzBackQueryParams', this.queryParams) this.getImpUnitOptions() this.handleImpUnitChange() this.handleDepartChange() diff --git a/src/views/materialsStation/toolsBack/back/index.vue b/src/views/materialsStation/toolsBack/back/index.vue index 49f1c7d9..12723789 100644 --- a/src/views/materialsStation/toolsBack/back/index.vue +++ b/src/views/materialsStation/toolsBack/back/index.vue @@ -2,6 +2,8 @@
+ + +
diff --git a/src/views/materialsStation/toolsLease/apply/component/homeApply.vue b/src/views/materialsStation/toolsLease/apply/component/homeApply.vue index e0a4ba79..a3473ee4 100644 --- a/src/views/materialsStation/toolsLease/apply/component/homeApply.vue +++ b/src/views/materialsStation/toolsLease/apply/component/homeApply.vue @@ -403,10 +403,10 @@ export default { // 日期范围 dateRange: [], // 查询参数 - queryParams: { + queryParams: this.$store.state.clzApply.clzApplyQueryParams || { pageNum: 1, pageSize: 10, - time: null, //申请时间 + time: [], //申请时间 keyWord: '', taskStatus: null, //申请时间 impUnitName:'',//分公司 @@ -452,6 +452,11 @@ export default { this.getDeviceType() this.getList() }, + + beforeDestroy() { + this.$store.commit('clzApply/setClzApplyQueryParams', this.queryParams) + }, + methods: { format(date) { const y = date.getFullYear() @@ -498,7 +503,20 @@ export default { start.setMonth(start.getMonth() - 1) this.queryParams.time = [this.format(start), this.format(end)] this.resetForm('queryForm') - this.queryParams.keyWord = '' + this.queryParams = { + pageNum: 1, + pageSize: 10, + time: [], //申请时间 + keyWord: '', + taskStatus: null, //申请时间 + impUnitName:'',//分公司 + departName:'',//项目部 + subUnitName:'',//分包单位 + proName:'',//领料工程 + teamName:'',//领料班组 + maTypeNames:''//领料工器具类型 + } + this.$store.commit('clzApply/clzApplyQueryParams', this.queryParams) this.getImpUnitOptions() this.handleImpUnitChange() this.handleDepartChange() diff --git a/src/views/materialsStation/toolsLease/apply/index.vue b/src/views/materialsStation/toolsLease/apply/index.vue index 523207a6..c295bac0 100644 --- a/src/views/materialsStation/toolsLease/apply/index.vue +++ b/src/views/materialsStation/toolsLease/apply/index.vue @@ -2,6 +2,7 @@
+ +
diff --git a/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue b/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue index 5f4b09ac..7433a39e 100644 --- a/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue +++ b/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue @@ -391,10 +391,10 @@ export default { // 日期范围 dateRange: [], // 查询参数 - queryParams: { + queryParams: this.$store.state.clzOutBound.clzOutBoundQueryParams || { pageNum: 1, pageSize: 10, - time: null, //申请时间 + time: [], //申请时间 keyWord: '', taskStatus: null, //申请时间 impUnitName:'',//分公司 @@ -438,6 +438,11 @@ export default { this.getDeviceType() this.getList() }, + + beforeDestroy() { + this.$store.commit('clzOutBound/setClzOutBoundQueryParams', this.queryParams) + }, + methods: { handleShow(row) { // createTime 距离当前时间 3天内 可以删除 @@ -492,8 +497,20 @@ export default { let start = new Date() start.setMonth(start.getMonth() - 1) this.queryParams.time = [this.format(start), this.format(end)] - this.resetForm('queryForm') - this.queryParams.keyWord = '' + this.queryParams = { + pageNum: 1, + pageSize: 10, + time: [], //申请时间 + keyWord: '', + taskStatus: null, //申请时间 + impUnitName:'',//分公司 + departName:'',//项目部 + proName:'',//领料工程 + subUnitName:'',//分包单位 + teamName:'',//领料班组 + maTypeNames:''//领料工器具类型 + } + this.$store.commit('clzOutBoubnd/clzOutBoundQueryParams', this.queryParams) this.getImpUnitOptions() this.handleImpUnitChange() this.handleDepartChange() diff --git a/src/views/materialsStation/toolsLease/outBound/index.vue b/src/views/materialsStation/toolsLease/outBound/index.vue index 615834fe..5a7afa82 100644 --- a/src/views/materialsStation/toolsLease/outBound/index.vue +++ b/src/views/materialsStation/toolsLease/outBound/index.vue @@ -2,6 +2,8 @@
+ + + +