维修管理，维修审核客户提出的问题整改

src/views/repairTest/repair/dialogOneForm.vue

@@ -603,6 +603,8 @@ export default {
             taskId: '',
             isRequired: false,
             totalPrice: 0, // 总金额
+
+            currentUserId: '' //当前登录人
         }
     },
     mounted() {
@@ -715,29 +717,33 @@ export default {
         },
        init() {
           console.log('this.rowObj', this.rowObj)
-
+            getInfo()
-          getUserSelectApi({ roleIds: [133] }).then((response) => {
+            .then((res) => {
-                this.userSelectList = response.data;
+                    this.companyId = res.user.companyId
+                    this.currentUserId = res.user.userId
+                    // 返回 getUserSelectApi 的 Promise
+                    return getUserSelectApi({ roleIds: [133] })
+                })
+            .then((response) => {
+                    this.userSelectList = response.data
                     if (this.rowObj.manageType == 0) {
-                    this.dynamicValidateForm.premiumList = [];
+                        this.dynamicValidateForm.premiumList = []
-                    this.dynamicValidateFormTwo.premiumListTwo = [];
+                        this.dynamicValidateFormTwo.premiumListTwo = []
-                    this.addDomainOne();
+                        this.addDomainOne()
                     } else {
-                    this.dynamicValidateForm.premiumList = [];
+                        this.dynamicValidateForm.premiumList = []
-                    this.dynamicValidateFormTwo.premiumListTwo = [];
+                        this.dynamicValidateFormTwo.premiumListTwo = []
-                    this.addDomainTwo();
+                        this.addDomainTwo()
                     }
                     this.dynamicValidateForm.premiumList.forEach((item) => {
-                    item.repairRemark = this.rowObj.repairRemark;
+                        item.repairRemark = this.rowObj.repairRemark
-
+                    })
-                });
                     this.dynamicValidateFormTwo.premiumListTwo.forEach((item) => {
-                    item.repairRemark = this.rowObj.repairRemark;
+                        item.repairRemark = this.rowObj.repairRemark
-
+                    })
-                });
+                })
-            });
+            .catch((error) => {
-            getInfo().then((res) => {
+                    console.error('初始化出错:', error)
-                this.companyId = res.user.companyId
                 })
                 },
         // 取消按钮
@@ -754,7 +760,8 @@ export default {
                 const day = String(date.getDate()).padStart(2, '0');
                 return `${year}-${month}-${day}`;
             };
-
+            // 检查 currentUserId 是否在 userSelectList 的 userId 中
+            const isUserIdInList = this.userSelectList.some(user => user.userId === this.currentUserId);
             // 选择配件 partId
             // 是否收费 partType
             // 配件数量 partNum
@@ -764,7 +771,7 @@ export default {
             const newDomain = {
                 selected: 'N',
                 // partId: '',
-                repairer: this.userSelectList.length > 0 ? this.userSelectList[0].userId : '', // 默认选择第一条数据
+                repairer: this.userSelectList.length > 0 && isUserIdInList ? this.currentUserId : '',  // 默认选择第一条数据
                 partType: 0,
                 partNum: '',
                 partCost: '',
@@ -797,10 +804,14 @@ export default {
                 const day = String(date.getDate()).padStart(2, '0');
                 return `${year}-${month}-${day}`;
             };
+
+            // 检查 currentUserId 是否在 userSelectList 的 userId 中
+            const isUserIdInList = this.userSelectList.some(user => user.userId === this.currentUserId);
+
             const newDomain = {
                 selected: 'N',
                 // partId: '',
-                repairer: this.userSelectList.length > 0 ? this.userSelectList[0].userId : '', // 默认选择第一条数据
+                repairer: this.userSelectList.length > 0 && isUserIdInList ? this.currentUserId : '', // 默认选择第一条数据
                 partType: 0,
                 partNum: '',
                 partCost: '',

src/views/repairTest/repair/dialogTwoForm.vue

@@ -117,6 +117,17 @@
                                 style="width: 350px"
                             ></el-input>
                         </el-form-item>
+                        <el-form-item :prop="'premiumList.' + index + '.repairContent'" label="维修内容：">
+                            <el-input
+                                v-model="domain.repairContent"
+                                maxlength="100"
+                                placeholder="请输入"
+                                show-word-limit
+                                size="small"
+                                style="width: 350px"
+                                type="textarea"
+                            ></el-input>
+                        </el-form-item>
                         <!-- <el-form-item :prop="'premiumList.' + index + '.repairContent'" label="维修内容：">
                             <el-input
                                 v-model="domain.repairContent"
@@ -305,7 +316,17 @@
                                 style="width: 350px"
                             ></el-input>
                         </el-form-item>
-
+                        <el-form-item :prop="'premiumListTwo.' + index + '.repairContent'" label="维修内容：">
+                            <el-input
+                                v-model="domain.repairContent"
+                                maxlength="100"
+                                placeholder="请输入"
+                                show-word-limit
+                                size="small"
+                                style="width: 350px"
+                                type="textarea"
+                            ></el-input>
+                        </el-form-item>
                         <!-- <el-form-item label="维修内容：">
                             <el-input
                                 v-model="domain.repairContent"
@@ -462,6 +483,7 @@ export default {
                         xiayoufeiyonge_unit: '',
                         fileList: [],
                         repairRemark: '', // 技术鉴定
+                        repairContent: '',
                     },
                 ],
             },
@@ -480,6 +502,7 @@ export default {
                         xiayoufeiyonge_unit: '',
                         fileList: [],
                         repairRemark: '', // 技术鉴定
+                        repairContent: '',
                     },
                 ],
             },

src/views/repairTest/repair/index.vue

@@ -545,6 +545,12 @@
                     type="index"
                 >
                 </el-table-column>
+                <el-table-column
+                    label="配件名称"
+                    align="center"
+                    prop="partName"
+                    :show-overflow-tooltip="true"
+                />
                 <el-table-column
                     label="配件数量"
                     align="center"

src/views/repairTest/testExamine/index.vue

@@ -184,6 +184,12 @@
                     type="index"
                 >
                 </el-table-column>
+                <el-table-column
+                    label="配件名称"
+                    align="center"
+                    prop="partName"
+                    :show-overflow-tooltip="true"
+                />
                 <el-table-column
                     label="配件数量"
                     align="center"