feat: 0517优化

src/components/ApprovalFlow/deviceChangeOrderDestroy.vue

@@ -22,9 +22,14 @@
                   '待审核' : activity.approvalStatus == 3 ? '通过' : activity.approvalStatus == 4 ? '拒绝' : '审核中'
               }}
             </el-button>
+            <el-row style="width: 100%">
               <div style="margin-bottom: 8px" v-if="activity.approvalStatus != 2">
                 审批意见：<span>{{ activity.approvalOpinion }}</span>
               </div>
+              <div style="margin-bottom: 8px;margin-left: 85%" v-if="activity.approvalStatus == 2">
+                <el-button type="primary" @click=approvalFlowUpdate(activity) >审核</el-button>
+              </div>
+            </el-row>
 
 
             <el-dialog title="编辑审批" :visible.sync="approvalFlowUpdateShow">

src/components/ApprovalFlow/index.vue

@@ -22,9 +22,14 @@
                   '待审核' : activity.approvalStatus == 3 ? '通过' : activity.approvalStatus == 4 ? '拒绝' : '审核中'
               }}
             </el-button>
+            <el-row style="width: 100%">
               <div style="margin-bottom: 8px" v-if="activity.approvalStatus != 2">
                 审批意见：<span>{{ activity.approvalOpinion }}</span>
               </div>
+              <div style="margin-bottom: 8px;margin-left: 85%" v-if="activity.approvalStatus == 2">
+                <el-button type="primary" @click=approvalFlowUpdate(activity) >审核</el-button>
+              </div>
+            </el-row>
 
 
             <el-dialog title="编辑审批" :visible.sync="approvalFlowUpdateShow">

src/views/dev/deviceRepairApplyHall.vue

@@ -221,23 +221,21 @@
               </el-form-item>
             </el-descriptions-item>
             <el-descriptions-item v-if="diagnosisData.repairFlag" label="维修人姓名" :span="3">
-
+              <el-form-item label=" " prop="repairUserId" style="margin-bottom: 10px">
-              <el-form-item label=" " prop="repairUserName" style="margin-bottom: 10px">
                 <el-select
-                  v-model="diagnosisData.repairUserName"
+                  v-model="diagnosisData.repairUserId"
+                  @change="handleEmployeeSelect"
                 >
                   <el-option
                     v-for="(item, index) in userlist"
                     :key="index"
                     :label="item.employeeName"
-                    :value="item.employeeName"
+                    :value="item.userId"
                   />
                 </el-select>
               </el-form-item>
-
-
-
             </el-descriptions-item>
+
             <el-descriptions-item v-if="diagnosisData.repairFlag" label="维修人电话" :span="3">
               <el-form-item label=" " prop="repairUserPhone" style="margin-bottom: 10px">
                 <el-input v-model.trim="diagnosisData.repairUserPhone" placeholder="请输入维修人电话"/>

src/views/dev/js/deviceRepairApplyHall.js

@@ -30,6 +30,7 @@ let diagnosisData = {
   repairFlag: true,
   innerFlag: true,
   repairDeptCode: null,
+  repairUserId: '',
   repairUserName: '',
   repairUserPhone: '',
   diagnosisInfo: '',
@@ -87,7 +88,7 @@ export default {
           message: "维修部门不能为空",
           trigger: ["change", "blur"]
         }],
-        repairUserName: [{
+        repairUserId: [{
           required: true,
           validator: this.repairUserNameValid,
           message: "维修人姓名不能为空",
@@ -129,6 +130,9 @@ export default {
     repairInfo(row) {
       this.repairId = row.repairId
     },
+    handleEmployeeSelect(value){
+        this.diagnosisData.repairUserName = this.userlist.find(user => user.userId == value).employeeName;
+    },
     commitFunc() {
       this.$refs.saveForm.validate(b => {
         if (!b) {
@@ -156,7 +160,7 @@ export default {
     },
     repairUserNameValid(rule, value, callback) {
       if (this.diagnosisData?.repairFlag) {
-        if (!this.diagnosisData.repairUserName) {
+        if (!this.diagnosisData.repairUserId) {
           callback(new Error("维修人姓名不能为空"))
         }
       }