fix: 2059 退料驳回后，重新驳回提交建议代入驳回前的数据，便于驳回后重新提交

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) {
+        async GetViewByApply(params) {
-            const res = await materialReturnNoteByApply({ id: Id })
+            const res = await materialReturnNoteByApply({ id: params.id, agreementId: params.agreementId})
             const data = res.data[0]
             // console.log(data)
             // this.queryParams.taskId = data.taskId

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() {

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'
         },

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: {},