Merge remote-tracking branch 'origin/master'

src/api/pms/maintenance/index.ts

@@ -34,6 +34,11 @@ export const IotMaintenancePlanApi = {
     return await request.put({ url: `/rq/iot-maintenance-plan/update`, data })
   },
 
+  // 修改保养计划 主表+明细
+  updatePlan: async (data: any) => {
+    return await request.post({ url: `/rq/iot-maintenance-plan/updatePlan`, data })
+  },
+
   // 删除保养计划
   deleteIotMaintenancePlan: async (id: number) => {
     return await request.delete({ url: `/rq/iot-maintenance-plan/delete?id=` + id })

src/views/pms/device/ConfigDeviceAllot.vue

@@ -47,6 +47,16 @@
 
     <!-- 暂存关联列表 -->
     <div class="submit-area">
+      <div class="card">
+        <el-input
+          v-model="formData.reason"
+          placeholder="请输入调拨原因"
+          class="reason-input"
+          type="textarea"
+          :rows="3"
+          @input="updateTempRelations"
+        />
+      </div>
       <el-button
         type="primary"
         size="large"
@@ -61,6 +71,7 @@
           <el-table-column prop="deviceNames" label="设备" width="200" />
           <el-table-column prop="deptName" label="部门" />
           <el-table-column prop="deptId" label="部门id" v-if="false"/>
+          <el-table-column prop="reason" label="调拨原因" />
           <el-table-column label="操作" width="120">
             <template #default="{ row }">
               <el-button
@@ -119,6 +130,7 @@ const tempRelationsMap = ref(new Map<number, {
   deviceNames: string
   deptId: number
   deptName: string
+  reason: string
 }>())
 
 // 计算属性转换 Map 为数组
@@ -155,7 +167,8 @@ const updateTempRelations = () => {
         deviceId,
         deviceNames: `${device.deviceCode} (${device.deviceName})`,
         deptId: selectedDeptId.value as number,
-        deptName
+        deptName,
+        reason: formData.value.reason
       })
     }
   })

src/views/pms/maintenance/IotMaintenancePlan.vue

@@ -21,7 +21,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="责任人" prop="responsiblePerson">
+            <el-form-item label="设备责任人" prop="devicePersons">
+              <el-input type="text" v-model="formData.devicePersons"  disabled/>
+            </el-form-item>
+          </el-col>
+          <!--
+          <el-col :span="8" >
+            <el-form-item label="责任人" prop="responsiblePerson" >
               <el-select v-model="formData.responsiblePerson" filterable clearable style="width: 100%">
                 <el-option
                   v-for="item in deptUsers"
@@ -32,16 +38,12 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="16">
+          -->
+          <el-col :span="24">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备责任人" prop="devicePersons">
-              <el-input type="text" v-model="formData.devicePersons"  disabled/>
-            </el-form-item>
-          </el-col>
         </el-row>
       </div>
     </el-form>
@@ -611,7 +613,7 @@ const submitForm = async () => {
       message.success(t('common.createSuccess'))
       close()
     } else {
-      await IotMaintainApi.updateIotMaintain(data)
+      await IotMaintenancePlanApi.updatePlan(data)
       message.success(t('common.updateSuccess'))
       close()
     }
@@ -765,7 +767,7 @@ onMounted(async () => {
   dept.value = await DeptApi.getDept(deptId)
   // 根据当前登录人部门信息生成生成 保养计划 名称
   formData.value.name = dept.value.name + ' - 保养计划'
-  deptUsers.value = await UserApi.getDeptUsersByDeptId(deptId)
+  // deptUsers.value = await UserApi.getDeptUsersByDeptId(deptId)
   formData.value.deptId = deptId
   if (id){
     formType.value = 'update'
@@ -773,10 +775,10 @@ onMounted(async () => {
     deviceLabel.value = plan.deviceName
     formData.value = plan
     // 查询保养责任人
-    const personId = formData.value.responsiblePerson ? Number(formData.value.responsiblePerson) : 0;
+    /* const personId = formData.value.responsiblePerson ? Number(formData.value.responsiblePerson) : 0;
     UserApi.getUser(personId).then((res) => {
       formData.value.responsiblePerson = res.nickname;
-    })
+    }) */
     // 查询保养计划明细
     const data = await IotMaintenanceBomApi.getMainPlanBOMs(queryParams);
     list.value = []
@@ -786,6 +788,8 @@ onMounted(async () => {
         // 这里可以添加必要的字段转换（如果有日期等需要格式化的字段）
         lastNaturalDate: item.lastNaturalDate ? dayjs(item.lastNaturalDate).format('YYYY-MM-DD') : null
       }))
+      // 同时查询所有设备的责任人
+      await getDevicePersons();
     }
   } else {
     formType.value = 'create';