feat: 设备巡检修改

gongchunyi

7 天以前 a7a9f53ef126659f664f5cbfe4eb10bebdfc4a6a

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

@@ -23,6 +23,13 @@
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="巡检验收人" prop="inspectionAcceptor">
              <el-select v-model="form.inspectionAcceptor" 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-row>
        <el-row>
          <el-col :span="12">
@@ -129,6 +136,8 @@
    taskName: undefined,
    inspector: '',
    inspectorIds: '',
    inspectionAcceptor: undefined,
    inspectionAcceptorId: undefined,
    remarks: '',
    frequencyType: '',
    frequencyDetail: '',
@@ -139,6 +148,7 @@
   rules: {
      taskId: [{ required: true, message: "请选择设备", trigger: "change" },],
      inspector: [{ required: true, message: "请输入巡检人", trigger: "blur" },],
      inspectionAcceptor: [{ required: true, message: "请选择巡检验收人", trigger: "change" },],
      dateStr: [{ required: true, message: "请选择登记时间", trigger: "change" }],
      frequencyType: [{ required: true, message: "请选择任务频率", trigger: "change" }],
      frequencyDetail: [
@@ -239,6 +249,10 @@
    } else {
      form.value.inspector = []
    }
    // 确保验收入ID和姓名正确回显
    if (form.value.inspectionAcceptorId) {
      form.value.inspectionAcceptor = form.value.inspectionAcceptorId
    }
    // 确保 isActive 有值，默认启用
    if (form.value.isActive === undefined || form.value.isActive === null) {
      form.value.isActive = 1
@@ -283,6 +297,8 @@
    taskName: undefined,
    inspector: '',
    inspectorIds: '',
    inspectionAcceptor: undefined,
    inspectionAcceptorId: undefined,
    remarks: '',
    frequencyType: '',
    frequencyDetail: '',
@@ -303,6 +319,15 @@
          delete form.value.inspector
        }
        
        // 处理验收入
        if (form.value.inspectionAcceptor) {
          const selectedUser = userList.value.find(u => u.userId === form.value.inspectionAcceptor)
          if (selectedUser) {
            form.value.inspectionAcceptorId = form.value.inspectionAcceptor
            form.value.inspectionAcceptor = selectedUser.nickName
          }
        }

        if (form.value.frequencyType === 'WEEKLY') {
          let frequencyDetail = ''
          frequencyDetail = form.value.week + ',' + form.value.time