From 82e59ac310375463d69aeccd0c417dc46cbf9920 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Thu, 13 Jun 2024 14:54:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=202059=20=E9=80=80=E6=96=99=E9=A9=B3?=
 =?UTF-8?q?=E5=9B=9E=E5=90=8E=EF=BC=8C=E9=87=8D=E6=96=B0=E9=A9=B3=E5=9B=9E?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=BB=BA=E8=AE=AE=E4=BB=A3=E5=85=A5=E9=A9=B3?=
 =?UTF-8?q?=E5=9B=9E=E5=89=8D=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=8C=E4=BE=BF?=
 =?UTF-8?q?=E4=BA=8E=E9=A9=B3=E5=9B=9E=E5=90=8E=E9=87=8D=E6=96=B0=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../claimAndreturn/return/apply/component/addReturn1.vue | 9 ++++++---
 .../claimAndreturn/return/apply/component/home1.vue      | 2 +-
 sgzb-ui/src/views/claimAndreturn/return/apply/index.vue  | 5 ++++-
 .../views/warehouseManage/warehousing/repair/index.vue   | 4 +++-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn1.vue b/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn1.vue
index 1e5aaebb..684f513d 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn1.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn1.vue
@@ -274,6 +274,9 @@ export default {
         rejectId: {
             type: [String, Number],
         },
+        agreementId: {
+            type: [String, Number],
+        },
     },
     data() {
         const validatePhone = (rule, value, callback) => {
@@ -485,7 +488,7 @@ export default {
         // }
         if (this.rejectId) {
             this.rowId = this.rejectId
-            this.returnNoteByApply(this.rejectId)
+            this.GetViewByApply({ id: this.rejectId, agreementId: this.agreementId})
         }
         getInfo().then((res) => {
             this.companyId = res.user.companyId
@@ -550,8 +553,8 @@ export default {
         },
 
         // 获取 任务详情数据
-        async GetViewByApply(Id) {
-            const res = await materialReturnNoteByApply({ id: Id })
+        async GetViewByApply(params) {
+            const res = await materialReturnNoteByApply({ id: params.id, agreementId: params.agreementId})
             const data = res.data[0]
             // console.log(data)
             // this.queryParams.taskId = data.taskId
diff --git a/sgzb-ui/src/views/claimAndreturn/return/apply/component/home1.vue b/sgzb-ui/src/views/claimAndreturn/return/apply/component/home1.vue
index 3ef34a29..7d97a5b8 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/apply/component/home1.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/apply/component/home1.vue
@@ -782,7 +782,7 @@ export default {
             //         isEdit: true,
             //     },
             // })
-            this.$emit('rejectSubmit', row.id)
+            this.$emit('rejectSubmit', { id: row.id, agreementId: row.agreementId })
         },
         // 退料单
         handleUpdateOrder() {
diff --git a/sgzb-ui/src/views/claimAndreturn/return/apply/index.vue b/sgzb-ui/src/views/claimAndreturn/return/apply/index.vue
index 2b6dd9b0..69f7622c 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/apply/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/apply/index.vue
@@ -9,6 +9,7 @@
         <component
             :is="isShowComponent"
             :rejectId="rejectId"
+            :agreementId="agreementId"
             @returnApply="returnApply"
             @rejectSubmit="rejectSubmit"
             @goBackPage="goBack"
@@ -33,6 +34,7 @@ export default {
             isShowComponent: 'Home',
             pageContent: '',
             rejectId: '',
+            agreementId: '',
             isView: false,
         }
     },
@@ -44,8 +46,9 @@ export default {
             this.isShowComponent = 'AddReturn'
         },
         // 驳回提交
-        rejectSubmit(id) {
+        rejectSubmit({id, agreementId}) {
             this.rejectId = id
+            this.agreementId = agreementId
             this.pageContent = '编辑退料任务'
             this.isShowComponent = 'AddReturn'
         },
diff --git a/sgzb-ui/src/views/warehouseManage/warehousing/repair/index.vue b/sgzb-ui/src/views/warehouseManage/warehousing/repair/index.vue
index c54d7dea..e289ce4b 100644
--- a/sgzb-ui/src/views/warehouseManage/warehousing/repair/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/warehousing/repair/index.vue
@@ -310,6 +310,7 @@
                         size="mini"
                         :disabled="multiple"
                         @click="passAll"
+                        v-if="showHandle"
                         >批量通过</el-button
                     >
                 </el-col>
@@ -320,6 +321,7 @@
                         size="mini"
                         @click="refusedAll"
                         :disabled="multiple"
+                        v-if="showHandle"
                         >批量不通过</el-button
                     >
                 </el-col>
@@ -512,7 +514,7 @@ export default {
                 pageNum: 1,
                 pageSize: 10,
                 keyWord: '',
-                typeId: '',
+                typeId: undefined,
             },
             // 表单参数
             form: {},