From 2e59c9e2c6be414962169e790bb22c539101b738 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Thu, 13 Jun 2024 15:50:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=A5=E5=BA=93=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E4=BF=AE=E8=AF=95=E5=85=A5=E5=BA=93=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../claimAndreturn/return/apply/component/addReturn1.vue     | 5 +++++
 sgzb-ui/src/views/claimAndreturn/return/apply/index.vue      | 4 ++++
 .../src/views/warehouseManage/warehousing/repair/index.vue   | 3 ++-
 3 files changed, 11 insertions(+), 1 deletion(-)

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 684f513d..381f0def 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn1.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn1.vue
@@ -17,6 +17,7 @@
                         @change="GetProData"
                         style="width: 240px"
                         placeholder="请选择"
+                        :disabled="isEdit"
                     >
                         <el-option
                             v-for="item in unitList"
@@ -35,6 +36,7 @@
                         @change="GetUnitData"
                         style="width: 240px"
                         placeholder="请选择"
+                        :disabled="isEdit"
                     >
                         <el-option
                             v-for="item in proList"
@@ -277,6 +279,9 @@ export default {
         agreementId: {
             type: [String, Number],
         },
+        isEdit: {
+            type: Boolean,
+        },
     },
     data() {
         const validatePhone = (rule, value, callback) => {
diff --git a/sgzb-ui/src/views/claimAndreturn/return/apply/index.vue b/sgzb-ui/src/views/claimAndreturn/return/apply/index.vue
index 69f7622c..0058d7e8 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/apply/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/apply/index.vue
@@ -10,6 +10,7 @@
             :is="isShowComponent"
             :rejectId="rejectId"
             :agreementId="agreementId"
+            :isEdit="isEdit"
             @returnApply="returnApply"
             @rejectSubmit="rejectSubmit"
             @goBackPage="goBack"
@@ -36,6 +37,7 @@ export default {
             rejectId: '',
             agreementId: '',
             isView: false,
+            isEdit: false,
         }
     },
     methods: {
@@ -44,11 +46,13 @@ export default {
             this.rejectId = ''
             this.pageContent = '新建退料任务'
             this.isShowComponent = 'AddReturn'
+            this.isEdit = false
         },
         // 驳回提交
         rejectSubmit({id, agreementId}) {
             this.rejectId = id
             this.agreementId = agreementId
+            this.isEdit = true
             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 e289ce4b..56b8c691 100644
--- a/sgzb-ui/src/views/warehouseManage/warehousing/repair/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/warehousing/repair/index.vue
@@ -342,7 +342,8 @@
                 @selection-change="handleSelectionChange"
                 height="400"
             >
-                <el-table-column type="selection" width="55" align="center" />
+                <el-table-column type="selection" width="55" align="center" :selectable="
+                    (row, index) => row.status == '进行中' && row.userIds.includes(userId)" />
                 <el-table-column
                     label="序号"
                     align="center"

From f8202a87e5e5600808f931ed5faa4d97bff27837 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Thu, 13 Jun 2024 16:21:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E7=BB=B4=E4=BF=AE=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?-=E7=BB=B4=E4=BF=AE-=E9=A2=84=E6=8A=A5=E5=BA=9F=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86=E6=97=A0=E6=B3=95=E5=85=B3=E9=97=AD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue b/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue
index c4fe9b9d..1da560cc 100644
--- a/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue
+++ b/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue
@@ -363,7 +363,7 @@ export default {
     },
     // 取消按钮
     cancel() {
-      this.$refs.dynamicValidateFormTwo.clearValidate()
+      // this.$refs.dynamicValidateFormTwo.clearValidate()
       this.dialogShowFlag = false
       this.fileList = []
     },