feat: 设备巡检新增巡检验收人

gongchunyi

7 天以前 a2c14224bb79a9dbf0fae117853f3869c726fe6e

feat: 设备巡检新增巡检验收人

 src/views/equipmentManagement/inspectionManagement/components/formDia.vue

@@ -26,19 +26,15 @@
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item label="备注" prop="remarks">
              <el-input v-model="form.remarks" placeholder="请输入备注" type="textarea" />
            <el-form-item label="巡检验收人" prop="acceptanceInspector">
              <el-select v-model="form.acceptanceInspector" placeholder="请选择" clearable>
                <el-option v-for="item in userList" :label="item.nickName" :value="item.userId" :key="item.userId"/>
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="任务状态" prop="isActive">
              <el-switch
                v-model="form.isActive"
                :active-value="1"
                :inactive-value="0"
                active-text="启用"
                inactive-text="停用"
              />
            <el-form-item label="备注" prop="remarks">
              <el-input v-model="form.remarks" placeholder="请输入备注" type="textarea" />
            </el-form-item>
          </el-col>
        </el-row>
@@ -127,8 +123,10 @@
  form: {
    taskId: undefined,
    taskName: undefined,
    inspector: '',
    inspector: [],
    inspectorIds: '',
    acceptanceInspector: undefined,
    acceptanceInspectorIds: '',
    remarks: '',
    frequencyType: '',
    frequencyDetail: '',
@@ -138,7 +136,8 @@
  },
    rules: {
        taskId: [{ required: true, message: "请选择设备", trigger: "change" },],
        inspector: [{ required: true, message: "请输入巡检人", trigger: "blur" },],
        inspector: [{ required: true, message: "请选择巡检人", trigger: "change" },],
        acceptanceInspector: [{ required: true, message: "请选择巡检验收人", trigger: "change" },],
        dateStr: [{ required: true, message: "请选择登记时间", trigger: "change" }],
        frequencyType: [{ required: true, message: "请选择任务频率", trigger: "change" }],
        frequencyDetail: [
@@ -239,6 +238,12 @@
    } else {
      form.value.inspector = []
    }
    // 确保 acceptanceInspectorIds 存在才赋值
    if (form.value.acceptanceInspectorIds) {
      form.value.acceptanceInspector = Number(form.value.acceptanceInspectorIds)
    } else {
      form.value.acceptanceInspector = undefined
    }
    // 确保 isActive 有值，默认启用
    if (form.value.isActive === undefined || form.value.isActive === null) {
      form.value.isActive = 1
@@ -281,8 +286,10 @@
  form.value = {
    taskId: undefined,
    taskName: undefined,
    inspector: '',
    inspector: [],
    inspectorIds: '',
    acceptanceInspector: undefined,
    acceptanceInspectorIds: '',
    remarks: '',
    frequencyType: '',
    frequencyDetail: '',
@@ -302,6 +309,11 @@
          form.value.inspectorIds = form.value.inspector.join(',')
          delete form.value.inspector
        }
        // 确保 acceptanceInspectorIds 赋值
        if (form.value.acceptanceInspector) {
          form.value.acceptanceInspectorIds = String(form.value.acceptanceInspector)
          delete form.value.acceptanceInspector
        }
        
        if (form.value.frequencyType === 'WEEKLY') {
          let frequencyDetail = ''

 src/views/equipmentManagement/inspectionManagement/index.vue

@@ -132,6 +132,7 @@
    { prop: "taskName", label: "巡检任务名称", minWidth: 160 },
    { prop: "remarks", label: "备注", minWidth: 150 },
    { prop: "inspector", label: "执行巡检人", minWidth: 150, slot: "inspector" },
    { prop: "acceptanceInspector", label: "巡检验收人", minWidth: 150 },
    {
      prop: "frequencyType",
      label: "频次",