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

zhangwencui

4 天以前 7f53e60aa7ecd861cddd329d178d3a4ee58c105f

 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,16 +262,16 @@
                              format="YYYY-MM-DD"
                              type="date"
                              placeholder="请选择"
                              clearable
                              :disabled="operationType === 'view'" />
                              clearable />
            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
      <div v-if="operationType === 'edit2' || operationType === 'edit3'"
           class="classtitle">隐患详情</div>
      <el-descriptions :column="2"
                       style="margin-bottom: 20px;"
                       v-if="operationType === 'edit2' || operationType === 'edit3'"
                       title="隐患详情"
                       border>
        <el-descriptions-item label="隐患编号">
          <span class="detail-title">{{ form.hiddenCode }}</span>
@@ -285,7 +284,7 @@
          <span class="detail-title">{{ form.hiddenDesc }}</span>
        </el-descriptions-item>
        <el-descriptions-item label="隐患类型">
          <span class="detail-title">{{ form.type }}</span>
          <span class="detail-title">{{ TypeLabel(form.type) }}</span>
        </el-descriptions-item>
        <el-descriptions-item label="隐患风险等级">
          <el-tag :type="getTypeTagType(form.riskLevel)">
@@ -308,10 +307,12 @@
          <span class="detail-title">{{ form.rectifyTime }}</span>
        </el-descriptions-item>
      </el-descriptions>
      <div class="classtitle"
           v-if="operationType === 'edit3'"
           style="margin-top: 40px;">整改详情</div>
      <el-descriptions :column="2"
                       style="margin-bottom: 20px;"
                       v-if="operationType === 'edit3'"
                       title="整改详情"
                       border>
        <el-descriptions-item label="整改具体措施"
                              :span="2">
@@ -321,6 +322,9 @@
          <span class="detail-title">{{ form2.rectifyActualTime }}</span>
        </el-descriptions-item>
      </el-descriptions>
      <div class="classtitle"
           v-if="operationType === 'edit2' || operationType === 'edit3'"
           style="margin-top: 40px;margin-bottom: 30px;">验收情况</div>
      <el-form :model="form2"
               v-if="operationType === 'edit2'"
               label-width="140px"
@@ -345,8 +349,7 @@
                              format="YYYY-MM-DD"
                              type="date"
                              placeholder="请选择"
                              clearable
                              :disabled="operationType === 'view'" />
                              clearable />
            </el-form-item>
          </el-col>
        </el-row>
@@ -425,7 +428,7 @@
<script setup>
  import { getToken } from "@/utils/auth";
  import pagination from "@/components/PIMTable/Pagination.vue";
  import { onMounted, ref, getCurrentInstance } from "vue";
  import { onMounted, ref, getCurrentInstance, computed } from "vue";
  import { ElMessageBox, ElMessage } from "element-plus";
  import useUserStore from "@/store/modules/user";
  import { userListNoPage } from "@/api/system/user.js";
@@ -520,28 +523,12 @@
    verifyResult: [{ required: true, message: "请选择", trigger: "change" }],
    acceptDesc: [{ required: true, message: "请输入", trigger: "blur" }],
  };
  const typeList = ref([
    {
      value: "设备安全",
      label: "设备安全",
    },
    {
      value: "人员操作",
      label: "人员操作",
    },
    {
      value: "环境风险",
      label: "环境风险",
    },
    {
      value: "物料管控",
      label: "物料管控",
    },
    {
      value: "其他",
      label: "其他",
    },
  ]);
  const { hidden_danger_type } = proxy.useDict("hidden_danger_type");
  const typeList = computed(() => hidden_danger_type?.value || []);
  const TypeLabel = val => {
    const item = typeList.value.find(i => String(i.value) === String(val));
    return item ? item.label : val;
  };
  const form2 = ref({
    rectifyActualTime: "", // 实际整改完成时间
    rectifyMeasures: "", // 整改具体措施
@@ -572,8 +559,6 @@
      label: "低风险",
    },
  ]);
  // 隐患类型选项
  const { type_qualification } = proxy.useDict("type_qualification");
  const { form, rules } = toRefs(data);
  const { form: searchForm } = useFormData(data.searchForm);
  // 产品表单弹框数据
@@ -586,12 +571,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) {
@@ -722,8 +701,8 @@
        hiddenCode: "", // 隐患编号
        location: "", // 隐患位置
        hiddenDesc: "", // 隐患描述
        createUser: "", // 上报人
        createUserName: "",
        createUser: Number(currentUserId.value), // 上报人
        createUserName: currentUserName.value,
        createTime: dayjs().format("YYYY-MM-DD HH:mm:ss"), // 上报时间
        rectifyUserId: "", // 整改责任人
        rectifyUserName: "",
@@ -952,9 +931,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;
  };

  /**
@@ -1297,4 +1278,12 @@
      page-break-after: avoid;
    }
  }
  .classtitle {
    font-size: 16px;
    font-weight: 600;
    color: #303133;
    border-left: 4px solid #409eff;
    padding-left: 12px;
    margin-bottom: 12px;
  }
</style>