Merge remote-tracking branch 'origin/master'

pages/maintain-detail/maintain-detail.vue

@@ -12,7 +12,8 @@
       <equipment-line title="维护等级" :content="getMapText(levelMap, modelStandard.level)" />
       <equipment-line title="标准工时" :content="modelStandard.standardHours" />
       <equipment-line title="动作类型" :content="getMapText(actionTypeMap, modelStandard.actionType)" />
-      <equipment-line title="部位" :content="modelStandard.partName" />
+      <!-- 与 PC 端 Detail 任务4保持一致：保养隐藏部位，改显示执行人/班组(checkDeptName 优先，其次 checkUserName) -->
+      <equipment-line title="执行人/班组" :content="infoData.checkDeptName || infoData.checkUserName || '-'" />
       <equipment-line title="要求" :content="modelStandard.requirement" />
       <equipment-line title="备注" :content="modelStandard.remark" />
     </view>

pages/maintain/maintain-ignore.vue

@@ -15,9 +15,10 @@
               item.requirement
             }}</view>
           </view>
+          <!-- 与 PC 端 CheckJob 任务4保持一致：隐藏设备部位，改显示执行人/班组(checkDeptName 优先，其次 checkUserName) -->
           <view class="f-size-26 text-color-6 f-weight-4 mt-2">{{
             item.startTime
-          }} ({{ item.period + periodMap[item.periodType] }}) : {{ item.partName == null ? '无' : item.partName }}
+          }} ({{ item.period + periodMap[item.periodType] }}) : {{ item.checkDeptName || item.checkUserName || '-' }}
           </view>
           <view class="d-flex j-end edit-box">
             <view class="text-color-3 f-size-32 edit" v-if="(item.status === 1) && !startFlag">

pages/maintain/maintain.vue

@@ -23,8 +23,9 @@
             item.actualStartTime
           }}
           </view>
-          <view class="f-size-26 text-color-6 f-weight-4 mt-2">设备部位:{{
-            item.partName
+          <!-- 与 PC 端 CheckJob 任务4保持一致：隐藏设备部位，改显示执行人/班组(checkDeptName 优先，其次 checkUserName) -->
+          <view class="f-size-26 text-color-6 f-weight-4 mt-2">执行人/班组:{{
+            item.checkDeptName || item.checkUserName || '-'
           }}
           </view>
           <view class="d-flex j-end edit-box">

pages/middle/middle.vue

@@ -98,7 +98,7 @@
                         type="select" />
                     <u-select v-model="levelState" :list="levelList" @confirm="levelSubmit"></u-select>
                 </u-form-item>
-                <u-form-item label="故障类型" prop="repairErrorTypeId" :label-width="150">
+                <u-form-item label="故障类型" required prop="repairErrorTypeId" :label-width="150">
                     <u-input v-model="form.badType" disabled @click="errorTypeState = true" placeholder="请选择故障类型"
                         type="select" />
                     <u-select v-model="errorTypeState" :list="errorTypeList" @confirm="errorTypeSubmit"></u-select>
@@ -241,6 +241,13 @@ export default {
                         message: '请输入问题描述',
                         trigger: ['blur', 'change']
                     }
+                ],
+                repairErrorTypeId: [
+                    {
+                        required: true,
+                        message: '请选择故障类型',
+                        trigger: ['blur', 'change']
+                    }
                 ]
             },
             // #ifdef MP-WEIXIN

pages/repair-add/repair-add.vue

@@ -99,7 +99,7 @@
                         type="select" />
                     <u-select v-model="levelState" :list="levelList" @confirm="levelSubmit"></u-select>
                 </u-form-item>
-                <u-form-item label="故障类型" prop="repairErrorTypeId" :label-width="150">
+                <u-form-item label="故障类型" required prop="repairErrorTypeId" :label-width="150">
                     <u-input v-model="form.badType" disabled @click="errorTypeState = true" placeholder="请选择故障类型"
                         type="select" />
                     <u-select v-model="errorTypeState" :list="errorTypeList" @confirm="errorTypeSubmit"></u-select>
@@ -251,6 +251,13 @@ export default {
                         message: '请输入问题描述',
                         trigger: ['blur', 'change']
                     }
+                ],
+                repairErrorTypeId: [
+                    {
+                        required: true,
+                        message: '请选择故障类型',
+                        trigger: ['blur', 'change']
+                    }
                 ]
             },
             // #ifdef MP-WEIXIN