Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-ma...

spring

4 天以前 bfdcc3338716ca9ae50d4e694151fe9874d8fd17

 src/views/safeProduction/dangerInvestigation/index.vue

@@ -215,7 +215,7 @@
                          prop="createUser">
              <el-select v-model="form.createUser"
                         placeholder="请选择"
                         @change="handleChange"
                         disabled
                         clearable>
                <el-option v-for="item in userList"
                           :key="item.userId"
@@ -228,14 +228,13 @@
            <el-form-item label="上报时间："
                          prop="createTime">
              <el-date-picker style="width: 100%"
                              readonly
                              disabled
                              v-model="form.createTime"
                              value-format="YYYY-MM-DD"
                              format="YYYY-MM-DD"
                              type="date"
                              placeholder="请选择"
                              clearable
                              :disabled="operationType === 'view'" />
                              clearable />
            </el-form-item>
          </el-col>
        </el-row>
@@ -263,8 +262,7 @@
                              format="YYYY-MM-DD"
                              type="date"
                              placeholder="请选择"
                              clearable
                              :disabled="operationType === 'view'" />
                              clearable />
            </el-form-item>
          </el-col>
        </el-row>
@@ -288,7 +286,9 @@
          <span class="detail-title">{{ form.type }}</span>
        </el-descriptions-item>
        <el-descriptions-item label="隐患风险等级">
          <span class="detail-title">{{ form.riskLevel }}</span>
          <el-tag :type="getTypeTagType(form.riskLevel)">
            {{ form.riskLevel }}
          </el-tag>
        </el-descriptions-item>
        <el-descriptions-item label="上报人">
          <span class="detail-title">{{ form.createUserName }}</span>
@@ -343,8 +343,7 @@
                              format="YYYY-MM-DD"
                              type="date"
                              placeholder="请选择"
                              clearable
                              :disabled="operationType === 'view'" />
                              clearable />
            </el-form-item>
          </el-col>
        </el-row>
@@ -466,6 +465,16 @@
      return "验收页面";
    }
  };
  // 获取类型标签类型
  const getTypeTagType = type => {
    const typeMap = {
      较大风险: "warning",
      低风险: "info",
      一般风险: "info",
      重大风险: "danger",
    };
    return typeMap[type] || "info";
  };
  // 用户信息表单弹框数据
  const operationType = ref("");
  const dialogFormVisible = ref(false);
@@ -574,12 +583,6 @@
    customer: "",
  });

  const handleChange = userId => {
    const selectedUser = userList.value.find(user => user.userId === userId);
    if (selectedUser) {
      form.value.createUserName = selectedUser.nickName;
    }
  };
  const handleChange2 = userId => {
    const selectedUser = userList.value.find(user => user.userId === userId);
    if (selectedUser) {
@@ -710,8 +713,8 @@
        hiddenCode: "", // 隐患编号
        location: "", // 隐患位置
        hiddenDesc: "", // 隐患描述
        createUser: "", // 上报人
        createUserName: "",
        createUser: Number(currentUserId.value), // 上报人
        createUserName: currentUserName.value,
        createTime: dayjs().format("YYYY-MM-DD HH:mm:ss"), // 上报时间
        rectifyUserId: "", // 整改责任人
        rectifyUserName: "",
@@ -940,9 +943,11 @@
    });
  };
  const currentUserId = ref("");
  const currentUserName = ref("");
  const getCurrentFactoryName = async () => {
    let res = await userStore.getInfo();
    currentUserId.value = res.user.userId;
    currentUserName.value = res.user.nickName;
  };

  /**