src/views/equipmentManagement/inspectionManagement/components/formDia.vue
@@ -5,15 +5,8 @@
      <el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
        <el-row>
          <el-col :span="12">
            <el-form-item label="设备名称" prop="taskId">
              <el-select v-model="form.taskId" @change="setDeviceModel">
                <el-option
                  v-for="(item, index) in deviceOptions"
                  :key="index"
                  :label="item.deviceName"
                  :value="item.id"
                ></el-option>
              </el-select>
            <el-form-item label="巡检任务" prop="taskName">
                     <el-input v-model="form.taskName" placeholder="请输入巡检任务" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
@@ -30,6 +23,18 @@
          <el-col :span="12">
            <el-form-item label="备注" prop="remarks">
              <el-input v-model="form.remarks" placeholder="请输入备注" type="textarea" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="登记时间" prop="dateStr">
              <el-date-picker
                v-model="form.dateStr"
                type="date"
                placeholder="选择登记日期"
                format="YYYY-MM-DD"
                value-format="YYYY-MM-DD"
                style="width: 100%"
              />
            </el-form-item>
          </el-col>
        </el-row>
@@ -116,7 +121,7 @@
const deviceOptions = ref([]);
const data = reactive({
  form: {
    taskId: undefined,
      taskName: undefined,
    taskName: undefined,
    inspector: '',
    inspectorIds: '',
@@ -124,11 +129,13 @@
    frequencyType: '',
    frequencyDetail: '',
    week: '',
    time: ''
    time: '',
      dateStr: ''
  },
  rules: {
    taskId: [{ required: true, message: "请选择设备", trigger: "change" },],
      taskName: [{ required: true, message: "请选择设备", trigger: "blur" },],
    inspector: [{ required: true, message: "请输入巡检人", trigger: "blur" },],
      dateStr: [{ required: true, message: "请选择登记时间", trigger: "change" }]
  }
})
const { form, rules } = toRefs(data)
@@ -165,11 +172,6 @@
  if (type === 'edit' && row) {
    form.value = {...row}
    form.value.inspector = form.value.inspectorIds.split(',').map(Number)
    // 如果有设备ID,自动设置设备信息
    if (form.value.taskId) {
      setDeviceModel(form.value.taskId);
    }
  }
}
@@ -187,15 +189,15 @@
  }
  // 重置表单数据确保设备信息正确重置
  form.value = {
    taskId: undefined,
    taskName: undefined,
      taskName: '',
    inspector: '',
    inspectorIds: '',
    remarks: '',
    frequencyType: '',
    frequencyDetail: '',
    week: '',
    time: ''
    time: '',
      dateStr: ''
  }
}
@@ -204,19 +206,27 @@
  proxy.$refs["formRef"].validate(async valid => {
    if (valid) {
      try {
        form.value.inspectorIds = form.value.inspector.join(',')
        delete form.value.inspector
        // 创建提交数据的副本
        const submitData = {...form.value}
        
        if (form.value.frequencyType === 'WEEKLY') {
        submitData.inspectorIds = submitData.inspector.join(',')
        delete submitData.inspector
        // 编辑模式下不传递登记时间
        if (operationType.value === 'edit') {
          delete submitData.createTime
        }
        if (submitData.frequencyType === 'WEEKLY') {
          let frequencyDetail = ''
          frequencyDetail = form.value.week + ',' + form.value.time
          form.value.frequencyDetail = frequencyDetail
          frequencyDetail = submitData.week + ',' + submitData.time
          submitData.frequencyDetail = frequencyDetail
        }
        
        let res = await userStore.getInfo()
        form.value.registrantId = res.user.userId
        submitData.registrantId = res.user.userId
        
        await addOrEditTimingTask(form.value)
        await addOrEditTimingTask(submitData)
        cancel()
        proxy.$modal.msgSuccess('提交成功')
      } catch (error) {