Merge branch 'dev-cq' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq

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

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

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 = []
     },

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"