From d60535be2fada9eb09e25d789ef94d01922b9afd Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Tue, 24 Dec 2024 17:26:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E4=BA=8C=E7=BA=A7=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/material/purchase/goodsAccept/detail.vue | 4 ++-- .../purchase/goodsArrived/component/addTools.vue | 2 +- .../purchase/goodsArrived/component/queryTools.vue | 2 +- .../purchase/goodsBind/component/bindQrTools.vue | 1 + .../material/purchase/goodsBind/component/bindTools.vue | 9 +++++---- src/views/material/purchase/goodsEntry/detail.vue | 1 + 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/views/material/purchase/goodsAccept/detail.vue b/src/views/material/purchase/goodsAccept/detail.vue index 27681deb..44aa40c6 100644 --- a/src/views/material/purchase/goodsAccept/detail.vue +++ b/src/views/material/purchase/goodsAccept/detail.vue @@ -450,8 +450,8 @@ export default { getList() { this.loading = true; this.queryParams.id = this.Id; - this.queryParams.taskId = this.taskId; - // this.queryParams.taskStatus = 2; + this.queryParams.taskId = this.taskId; + this.queryParams.taskStage = 2; this.queryParams.statusList = [2, 12]; getPurchaseDetailsList(this.queryParams).then((response) => { this.tableList = response.data.purchaseCheckDetailsList; diff --git a/src/views/material/purchase/goodsArrived/component/addTools.vue b/src/views/material/purchase/goodsArrived/component/addTools.vue index e3129f23..cb97dc97 100644 --- a/src/views/material/purchase/goodsArrived/component/addTools.vue +++ b/src/views/material/purchase/goodsArrived/component/addTools.vue @@ -594,7 +594,7 @@ export default { //获取任务详情--- 编辑回显数据 async getTaskInfo() { // this.loading = true; - await getPurchaseCheckInfo({taskId:this.taskId,id:this.id,statusList:[1]}).then((response) => { + await getPurchaseCheckInfo({taskId:this.taskId,id:this.id,statusList:[1],taskStage: 1}).then((response) => { this.maForm = response.data.purchaseCheckInfo this.maForm.id = response.data.purchaseCheckInfo.id this.maForm.taskId = response.data.purchaseCheckInfo.taskId diff --git a/src/views/material/purchase/goodsArrived/component/queryTools.vue b/src/views/material/purchase/goodsArrived/component/queryTools.vue index 20ede2f3..63b6fb1f 100644 --- a/src/views/material/purchase/goodsArrived/component/queryTools.vue +++ b/src/views/material/purchase/goodsArrived/component/queryTools.vue @@ -203,7 +203,7 @@ export default { //获取任务详情-列表数据 getTaskInfo() { this.loading = true - getPurchaseCheckInfo({taskId:this.taskId,id:this.id,statusList:[1]}).then((response) => { + getPurchaseCheckInfo({taskId:this.taskId,id:this.id,statusList:[1],taskStage: 1}).then((response) => { this.taskInfo = response.data this.equipmentList = response.data.purchaseCheckDetailsList this.equipmentList.forEach((item) => { diff --git a/src/views/material/purchase/goodsBind/component/bindQrTools.vue b/src/views/material/purchase/goodsBind/component/bindQrTools.vue index 65be6e62..2a61a9d4 100644 --- a/src/views/material/purchase/goodsBind/component/bindQrTools.vue +++ b/src/views/material/purchase/goodsBind/component/bindQrTools.vue @@ -717,6 +717,7 @@ export default { getList(){ this.loading = true; this.maForm.statusList=[3,13] + this.maForm.taskStage=3 getListDetail(this.maForm).then((response) => { this.equipmentList = response.rows; this.total = response.total; diff --git a/src/views/material/purchase/goodsBind/component/bindTools.vue b/src/views/material/purchase/goodsBind/component/bindTools.vue index eb63f20a..fc8943b6 100644 --- a/src/views/material/purchase/goodsBind/component/bindTools.vue +++ b/src/views/material/purchase/goodsBind/component/bindTools.vue @@ -157,7 +157,7 @@ > 查看 - + 绑定 @@ -166,7 +166,7 @@ type="danger" icon="el-icon-close" @click="handleReject(row)" - v-if="!isView&&row.status==3" + v-if="!isView&&row.manageType==0&&(row.status==3||row.status==14)" > 驳回 @@ -174,7 +174,7 @@ @@ -496,7 +496,7 @@ export default { taskId: "", keyWord: "", productDate: "", - // taskStatus: 3, + taskStage: 3, }, taskId: "", // 是否显示弹出层 @@ -536,6 +536,7 @@ export default { this.maForm.taskId = this.queryTaskId; this.maForm.id = this.queryId; this.maForm.statusList = [3, 13]; + this.maForm.taskStage = 3; const { data: res } = await getNewBuyBindListDetailsApi(this.maForm); this.loading = false; // this.total = res.total diff --git a/src/views/material/purchase/goodsEntry/detail.vue b/src/views/material/purchase/goodsEntry/detail.vue index 2a6c22f1..0fc1ff7e 100644 --- a/src/views/material/purchase/goodsEntry/detail.vue +++ b/src/views/material/purchase/goodsEntry/detail.vue @@ -332,6 +332,7 @@ export default { this.loading = true; this.queryParams.id=this.Id this.queryParams.taskId=this.taskId + this.queryParams.taskStage=4 this.queryParams.statusList=[3,13,4,14,19] getPurchaseDetailsList(this.queryParams).then(response => { this.tableList = response.data.purchaseCheckDetailsList;