From 9bc7fd4bc90948c7f855fb65819e4f4f84324eff Mon Sep 17 00:00:00 2001 From: binbin_pan Date: Mon, 17 Jun 2024 16:42:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96:=20=E9=A2=86=E6=96=99?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E7=BC=93?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../picking/apply/component/home.vue | 38 ++++++++++++++----- .../claimAndreturn/picking/apply/index.vue | 9 ++++- .../picking/auditing/component/home1.vue | 2 +- .../claimAndreturn/picking/outbound/index.vue | 4 ++ 4 files changed, 41 insertions(+), 12 deletions(-) diff --git a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue index b1f96231..e5cfa0ec 100644 --- a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue +++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue @@ -335,6 +335,14 @@ import { export default { // name: "ReceiveApply", dicts: ['sys_normal_disable'], + props: { + routerParams: { + type: Object, + default: () => { + return {} + }, + }, + }, data() { return { // 遮罩层 @@ -363,7 +371,7 @@ export default { time: null, //申请时间 unitId: null, //来往单位id - proId: null, //工程id + proId: undefined, //工程id types: 1, // 1申请列表 2审核列表 keyWord: '', @@ -374,6 +382,9 @@ export default { } }, created() { + if (this.routerParams.pageNum) { + this.queryParams = this.routerParams + } this.getList() this.GetUnitData() this.GetProData() @@ -407,8 +418,8 @@ export default { id: this.queryParams.proId, } const res = await getUnitData(params) + res.data = res.data.filter(item => item != null) this.unitList = res.data - console.log('GetUnitData ======================', res) }, // 获取 工程名称 列表数据 async GetProData() { @@ -416,8 +427,8 @@ export default { id: this.queryParams.unitId, } const res = await getProData(params) + res.data = res.data.filter(item => item != null) this.proList = res.data - console.log('GetProData ======================', res) }, // 表单重置 @@ -438,9 +449,18 @@ export default { }, /** 重置按钮操作 */ resetQuery() { - this.queryParams.time = [] - this.queryParams.unitId = '' - this.queryParams.proId = '' + this.queryParams = { + pageNum: 1, + pageSize: 10, + dictName: undefined, + dictType: undefined, + status: undefined, + time: null, //申请时间 + unitId: null, //来往单位id + proId: undefined, //工程id + types: 1, // 1申请列表 2审核列表 + keyWord: '', + } this.resetForm('queryForm') this.GetUnitData() this.GetProData() @@ -477,7 +497,7 @@ export default { // this.$tab.refreshPage() // }) - this.$emit('viewPicking', row.taskId) + this.$emit('viewPicking', row.taskId, this.queryParams) }, /** 修改按钮操作 */ handleUpdate(row) { @@ -488,7 +508,7 @@ export default { // isEdit: true, // }, // }) - this.$emit('editPicking', row.taskId) + this.$emit('editPicking', row.taskId, this.queryParams) }, /** 驳回按钮操作 */ handleUpdate2(row) { @@ -500,7 +520,7 @@ export default { // isBack: true, // }, // }) - this.$emit('editPicking', row.taskId, row.taskStatus) + this.$emit('editPicking', row.taskId, this.queryParams, row.taskStatus) }, /** 删除按钮操作 */ async handleDelete(row) { diff --git a/sgzb-ui/src/views/claimAndreturn/picking/apply/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/apply/index.vue index a2004877..801f9394 100644 --- a/sgzb-ui/src/views/claimAndreturn/picking/apply/index.vue +++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/index.vue @@ -12,6 +12,7 @@ :isView="isView" :isEdit="isEdit" :rejectTaskStatus="rejectTaskStatus" + :routerParams="routerParams" @addPicking="addPicking" @viewPicking="viewPicking" @editPicking="editPicking" @@ -38,6 +39,7 @@ export default { rejectTaskStatus: '', isView: false, isEdit: false, + routerParams: {}, } }, methods: { @@ -48,23 +50,26 @@ export default { this.isEdit = false this.pageContent = '新增领料任务' this.isShowComponent = 'AddPicking' + this.routerParams = {} }, /* 查看领料任务 */ - viewPicking(taskId) { + viewPicking(taskId, routerParams) { this.viewTaskId = taskId this.pageContent = '领料任务详情' this.isView = false this.isEdit = true this.isShowComponent = 'AddPicking' + this.routerParams = routerParams }, /* 编辑和驳回提交 */ - editPicking(taskId, taskStatus) { + editPicking(taskId, routerParams, taskStatus) { this.viewTaskId = taskId this.rejectTaskStatus = taskStatus || null this.isView = true this.isEdit = true this.pageContent = '领料任务编辑' this.isShowComponent = 'AddPicking' + this.routerParams = routerParams }, goBack() { this.isShowComponent = 'Home' diff --git a/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue b/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue index 5fddb658..ba71d5df 100644 --- a/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue +++ b/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue @@ -567,7 +567,7 @@ export default { { name: '待内部审核', id: 32 }, { name: '待出库', id: 33 }, { name: '出库进行中', id: 34 }, - { name: '已完成', id: 35 }, + { name: '完成', id: 35 }, ], } }, diff --git a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue index a359e353..f0706a93 100644 --- a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue +++ b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue @@ -23,6 +23,7 @@ v-model="queryParams.unitId" placeholder="请选择单位名称" clearable + filterable >