Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

yuan

2026-06-12 7726b6cdab80596d2e2f7dd3fe1ec3dfbdeee155

 src/views/equipmentManagement/upkeep/Form/formDia.vue

@@ -67,6 +67,28 @@
         </el-row>
         <el-row>
            <el-col :span="12">
               <el-form-item label="保养项目" prop="machineryCategory">
                  <el-input
                     v-model.trim="form.machineryCategory"
                     placeholder="请输入保养项目"
                     maxlength="100"
                     clearable
                  />
               </el-form-item>
            </el-col>
            <el-col :span="12">
               <el-form-item label="保养人" prop="maintenancePerson">
                  <el-input
                     v-model.trim="form.maintenancePerson"
                     placeholder="请输入保养人姓名"
                     maxlength="100"
                     clearable
                  />
               </el-form-item>
            </el-col>
         </el-row>
         <el-row>
            <el-col :span="12">
               <el-form-item label="任务频率" prop="frequencyType">
                  <el-select v-model="form.frequencyType" placeholder="请选择" clearable>
                     <el-option label="每日" value="DAILY"/>
@@ -79,7 +101,7 @@
            <el-col :span="12" v-if="form.frequencyType === 'DAILY' && form.frequencyType">
               <el-form-item label="日期" prop="frequencyDetail">
                  <el-time-picker v-model="form.frequencyDetail" placeholder="选择时间" format="HH:mm"
                                          value-format="HH:mm" />
                                       value-format="HH:mm" />
               </el-form-item>
            </el-col>
            <el-col :span="12" v-if="form.frequencyType === 'WEEKLY' && form.frequencyType">
@@ -94,7 +116,7 @@
                     <el-option label="周日" value="SUN"/>
                  </el-select>
                  <el-time-picker v-model="form.time" placeholder="选择时间" format="HH:mm"
                                          value-format="HH:mm"  style="width: 50%"/>
                                       value-format="HH:mm"  style="width: 50%"/>
               </el-form-item>
            </el-col>
            <el-col :span="12" v-if="form.frequencyType === 'MONTHLY' && form.frequencyType">
@@ -119,6 +141,23 @@
                     format="MM,DD,HH:mm"
                     value-format="MM,DD,HH:mm"
                  />
               </el-form-item>
            </el-col>
         </el-row>
         <el-row>
            <el-col :span="24">
               <el-form-item label="定时任务">
                  <el-switch
                     v-model="form.isActive"
                     :active-value="1"
                     :inactive-value="0"
                     active-text="开启"
                     inactive-text="关闭"
                     inline-prompt
                  />
                  <span style="margin-left: 12px; color: #909399; font-size: 12px;">
                     {{ form.isActive === 1 ? '任务将按计划执行' : '任务暂停执行' }}
                  </span>
               </el-form-item>
            </el-col>
         </el-row>
@@ -154,18 +193,22 @@
      taskName: undefined,
      // 录入人：单选一个用户 id
      inspector: undefined,
      machineryCategory: "",
      remarks: '',
      frequencyType: '',
      frequencyDetail: '',
      week: '',
      time: '',
      deviceModel: undefined, // 规格型号
      registrationDate: ''
      registrationDate: '',
      maintenancePerson: '', // 保养人
      isActive: 0 // 定时任务开关：0=关闭，1=开启
   },
   rules: {
      taskId: [{ required: true, message: "请选择设备", trigger: "change" },],
      inspector: [{ required: true, message: "请选择录入人", trigger: "blur" },],
      registrationDate: [{ required: true, message: "请选择登记时间", trigger: "change" }]
      registrationDate: [{ required: true, message: "请选择登记时间", trigger: "change" }],
      machineryCategory: [{ required: true, message: "请输入保养项目", trigger: "blur" }]
   }
})
const { form, rules } = toRefs(data)
@@ -238,14 +281,16 @@
      taskId: undefined,
      taskName: undefined,
      inspector: undefined,
      inspector: undefined,
      machineryCategory: "",
      remarks: '',
      frequencyType: '',
      frequencyDetail: '',
      week: '',
      time: '',
      deviceModel: undefined,
      registrationDate: ''
      registrationDate: '',
      maintenancePerson: '',
      isActive: 0
   }
}

@@ -268,21 +313,21 @@
            }
            delete payload.inspector
            delete payload.inspectorIds
				
            delete payload.active

            if (payload.frequencyType === 'WEEKLY') {
               let frequencyDetail = ''
               frequencyDetail = payload.week + ',' + payload.time
               payload.frequencyDetail = frequencyDetail
            }
				

            // 录入日期：直接使用表单里的 registrationDate 字段
            // 一些默认状态字段
            if (payload.status === undefined || payload.status === null || payload.status === '') {
               payload.status = '0' // 默认状态，可按实际枚举调整
            }
            payload.active = true
            payload.deleted = 0
				

            if (operationType.value === 'edit') {
               await deviceMaintenanceTaskEdit(payload)
            } else {