style：设备维修-添加保修人员字段

src/api/mes/dvrepair/index.ts

@@ -25,6 +25,7 @@ export interface DvRepairVO {
   replacementParts?: string // 更换配件
   repairContent?: string // 维修内容
   repairedImages?: string // 维修后图片，逗号分隔
+  repairReporter?: string // 报修人员
   acceptedBy: string // 维修人员
   confirmBy: string // 验收人员
   faultLevel?: string // 故障等级

src/locales/en.ts

@@ -2236,6 +2236,7 @@ export default {
       machineryTypeId: 'Device Type',
       device: 'Device',
       component: 'Key Component',
+      repairReporter: 'Repair Reporter',
       acceptedBy: 'Repairer',
       confirmBy: 'Inspector',
       faultLevel: 'Failure Level',
@@ -2284,6 +2285,7 @@ export default {
       placeholderRepairCode: 'Please input repair order no',
       placeholderRepairName: 'Please input repair order name',
       placeholderMachineryName: 'Please input device name',
+      placeholderRepairReporter: 'Please select repair reporter',
       placeholderAcceptedBy: 'Please input repairer',
       placeholderConfirmBy: 'Please input inspector',
       placeholderStatus: 'Please select order status',

src/locales/zh-CN.ts

@@ -2229,6 +2229,7 @@ export default {
       machineryTypeId: '设备类型',
       device: '设备',
       component: '关键件',
+      repairReporter: '报修人员',
       acceptedBy: '维修人员',
       confirmBy: '验收人员',
       faultLevel: '故障等级',
@@ -2277,6 +2278,7 @@ export default {
       placeholderRepairCode: '请输入维修单编号',
       placeholderRepairName: '请输入维修单名称',
       placeholderMachineryName: '请输入设备名称',
+      placeholderRepairReporter: '请选择报修人员',
       placeholderAcceptedBy: '请输入维修人员',
       placeholderConfirmBy: '请输入验收人员',
       placeholderStatus: '请选择单据状态',

src/views/mes/dvrepair/DvRepairForm.vue

@@ -57,6 +57,20 @@
             </el-col>
           </el-row>
           <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item :label="t('EquipmentManagement.DvRepair.repairReporter')" prop="repairReporter">
+                <el-select
+                  v-model="formData.repairReporter"
+                  filterable
+                  clearable
+                  :placeholder="t('EquipmentManagement.DvRepair.placeholderRepairReporter')"
+                  class="!w-full"
+                  :disabled="isRepairMetaReadonly"
+                >
+                  <el-option v-for="item in users" :key="String(item.id)" :label="item.nickname" :value="String(item.id)" />
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item :label="t('EquipmentManagement.DvRepair.acceptedBy')" prop="acceptedBy">
                 <el-select
@@ -383,6 +397,7 @@ import { DeviceLedgerApi, DeviceLedgerVO } from '@/api/mes/deviceledger'
 import { RepairItemsApi } from '@/api/mes/repairItems'
 import { getSimpleUserList, UserVO } from '@/api/system/user'
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { useUserStore } from '@/store/modules/user'
 
 /** 设备维修记录 表单 */
 defineOptions({ name: 'DvRepairForm' })
@@ -409,6 +424,7 @@ interface DvRepairFormData extends Partial<DvRepairVO> {
 
 const { t } = useI18n()
 const message = useMessage()
+const userStore = useUserStore()
 
 const createDefaultFormData = (): DvRepairFormData => ({
   id: undefined,
@@ -436,6 +452,7 @@ const createDefaultFormData = (): DvRepairFormData => ({
   replacementParts: undefined,
   repairContent: undefined,
   repairedImages: '',
+  repairReporter: undefined,
   acceptedBy: undefined,
   confirmBy: undefined,
   faultLevel: undefined,
@@ -855,6 +872,7 @@ const open = async (type: string, id?: number) => {
         repairedImages: normalizeImageString(detail?.repairedImages),
         acceptedBy: normalizeUserId(detail?.acceptedBy),
         confirmBy: normalizeUserId(detail?.confirmBy),
+        repairReporter: normalizeUserId(detail?.repairReporter),
         faultLevel: detail?.faultLevel === undefined || detail?.faultLevel === null ? undefined : String(detail?.faultLevel)
       }
 
@@ -889,6 +907,17 @@ const open = async (type: string, id?: number) => {
       formLoading.value = false
     }
   } else {
+    if (formType.value === 'create') {
+      if (!userStore.getIsSetUser) {
+        try {
+          await userStore.setUserInfoAction()
+        } catch (e) {}
+      }
+      const currentUserId = userStore.getUser?.id
+      if (currentUserId !== undefined && currentUserId !== null && Number(currentUserId) > 0) {
+        formData.value.repairReporter = String(currentUserId)
+      }
+    }
     await nextTick()
     formRef.value?.clearValidate?.()
   }
@@ -921,6 +950,7 @@ const submitForm = async () => {
     const data = { ...(formData.value as DvRepairFormData) } as DvRepairFormData & Record<string, any>
     data.acceptedBy = normalizeUserId(data.acceptedBy)
     data.confirmBy = normalizeUserId(data.confirmBy)
+    data.repairReporter = normalizeUserId(data.repairReporter)
     data.faultLevel = data.faultLevel === undefined || data.faultLevel === null || String(data.faultLevel).trim() === '' ? undefined : String(data.faultLevel)
     data.faultImages = normalizeImageString(data.faultImages)
     data.repairedImages = normalizeImageString(data.repairedImages)

src/views/mes/dvrepair/index.vue

@@ -174,6 +174,7 @@
         prop="confirmDate"
         :formatter="dateFormatter2"
         width="110px"  sortable />
+      <el-table-column :label="t('EquipmentManagement.DvRepair.repairReporter')" align="center" prop="repairReporter" minWidth="150px"/>
       <el-table-column :label="t('EquipmentManagement.DvRepair.acceptedBy')" align="center" prop="acceptedBy" minWidth="150px"/>
       <el-table-column :label="t('EquipmentManagement.DvRepair.confirmBy')" align="center" prop="confirmBy" minWidth="150px"/>
       <!-- <el-table-column label="备注" align="center" prop="remark" /> -->