bug修复

pull/1/head
zhangyanli 2024-02-06 09:15:44 +08:00
parent 91f0d30d74
commit 6dcd12b952
8 changed files with 50 additions and 23 deletions

View File

@ -1,6 +1,8 @@
<template> <template>
<div> <div>
<el-divider content-position="left">清单信息</el-divider> <el-divider content-position="left">{{
listType === "1" ? "风险管控清单信息" : "隐患排查清单信息"
}}</el-divider>
<el-descriptions border :column="2"> <el-descriptions border :column="2">
<el-descriptions-item label="清单名称"> <el-descriptions-item label="清单名称">
{{ info.LIST_NAME ? info.LIST_NAME : info.CUSTOM_NAME }} {{ info.LIST_NAME ? info.LIST_NAME : info.CUSTOM_NAME }}

View File

@ -183,7 +183,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="TYPENAME" label="清单类型" width="90" /> <el-table-column prop="TYPENAME" label="清单类型" width="90" />
<el-table-column <el-table-column
v-if="SPECIAL_ENTERPRISES.includes(CORPINFO_ID)" v-if="data.WHETHER_HAZARDS === 1"
label="是否包保责任人任务" label="是否包保责任人任务"
width="90" width="90"
> >
@ -234,20 +234,28 @@ import {
layoutFnGetInventoryType, layoutFnGetInventoryType,
layoutFnGetTroubleshootingCycle, layoutFnGetTroubleshootingCycle,
} from "@/assets/js/data_dictionary.js"; } from "@/assets/js/data_dictionary.js";
import { getRiskStandardStatusList } from "@/request/hazard_investigation.js"; import {
getCorpinfo,
getRiskStandardStatusList,
} from "@/request/hazard_investigation.js";
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
import { SPECIAL_ENTERPRISES } from "@/assets/js/constant.js";
import { useUserStore } from "@/pinia/user.js";
import dayjs from "dayjs"; import dayjs from "dayjs";
import { reactive } from "vue";
const data = reactive({
WHETHER_HAZARDS: "",
});
const router = useRouter(); const router = useRouter();
const userStore = useUserStore();
const CORPINFO_ID = userStore.getUserInfo.CORPINFO_ID;
const { list, pagination, searchForm, fnGetData, fnResetPagination } = const { list, pagination, searchForm, fnGetData, fnResetPagination } =
useListData(getRiskStandardStatusList); useListData(getRiskStandardStatusList);
const troubleshootingCycleList = await layoutFnGetTroubleshootingCycle(); const troubleshootingCycleList = await layoutFnGetTroubleshootingCycle();
const inventoryLevelList = await layoutFnGetInventoryLevel(); const inventoryLevelList = await layoutFnGetInventoryLevel();
const inventoryTypeList = await layoutFnGetInventoryType(); const inventoryTypeList = await layoutFnGetInventoryType();
const fnGetCorpinfo = async () => {
const resData = await getCorpinfo();
data.WHETHER_HAZARDS = resData.pd.WHETHER_HAZARDS;
};
fnGetCorpinfo();
const fnGetDataTransfer = () => { const fnGetDataTransfer = () => {
fnGetData({ fnGetData({
DEPTIDS: searchForm.value.DEPTIDS?.join(","), DEPTIDS: searchForm.value.DEPTIDS?.join(","),

View File

@ -122,7 +122,7 @@
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column <el-table-column
v-if="SPECIAL_ENTERPRISES.includes(CORPINFO_ID)" v-if="data.WHETHER_HAZARDS === 1"
prop="TASK_TYPE_NAME" prop="TASK_TYPE_NAME"
label="任务类型" label="任务类型"
width="100" width="100"
@ -141,11 +141,17 @@
name === 'risk' name === 'risk'
? router.push({ ? router.push({
path: '/hazard_investigation/delete_inventory_management/view', path: '/hazard_investigation/delete_inventory_management/view',
query: { LISTMANAGER_ID: row.LISTMANAGER_ID }, query: {
LISTMANAGER_ID: row.LISTMANAGER_ID,
WHETHER_HAZARDS: data.WHETHER_HAZARDS,
},
}) })
: router.push({ : router.push({
path: '/hazard_investigation/delete_inventory_management/view_custom', path: '/hazard_investigation/delete_inventory_management/view_custom',
query: { CUSTOM_ID: row.CUSTOM_ID }, query: {
CUSTOM_ID: row.CUSTOM_ID,
WHETHER_HAZARDS: data.WHETHER_HAZARDS,
},
}) })
" "
> >
@ -190,9 +196,8 @@ import {
layoutFnGetInventoryType, layoutFnGetInventoryType,
layoutFnGetTroubleshootingType, layoutFnGetTroubleshootingType,
} from "@/assets/js/data_dictionary.js"; } from "@/assets/js/data_dictionary.js";
import { SPECIAL_ENTERPRISES } from "@/assets/js/constant.js";
import { useUserStore } from "@/pinia/user.js";
import { import {
getCorpinfo,
getDeleteCustomList, getDeleteCustomList,
getDeleteInventoryManagementList, getDeleteInventoryManagementList,
setCustomBatchDelete, setCustomBatchDelete,
@ -201,6 +206,7 @@ import {
setInventoryManagementBatchDelete, setInventoryManagementBatchDelete,
} from "@/request/hazard_investigation.js"; } from "@/request/hazard_investigation.js";
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
import { reactive } from "vue";
const tabName = defineProps({ const tabName = defineProps({
name: { name: {
@ -209,19 +215,24 @@ const tabName = defineProps({
default: "", default: "",
}, },
}); });
const data = reactive({
WHETHER_HAZARDS: "",
});
const router = useRouter(); const router = useRouter();
const { list, pagination, searchForm, fnGetData, fnResetPagination, tableRef } = const { list, pagination, searchForm, fnGetData, fnResetPagination, tableRef } =
tabName.name === "risk" tabName.name === "risk"
? useListData(getDeleteInventoryManagementList) ? useListData(getDeleteInventoryManagementList)
: useListData(getDeleteCustomList); : useListData(getDeleteCustomList);
const userStore = useUserStore();
const CORPINFO_ID = userStore.getUserInfo.CORPINFO_ID;
const buttonJurisdiction = await useButtonJurisdiction("stoplistmanager"); const buttonJurisdiction = await useButtonJurisdiction("stoplistmanager");
const inventoryTypeList = await layoutFnGetInventoryType(); const inventoryTypeList = await layoutFnGetInventoryType();
const troubleshootingTypeList = await layoutFnGetTroubleshootingType(); const troubleshootingTypeList = await layoutFnGetTroubleshootingType();
const inventoryLevelList = await layoutFnGetInventoryLevel(); const inventoryLevelList = await layoutFnGetInventoryLevel();
const fnGetCorpinfo = async () => {
const resData = await getCorpinfo();
data.WHETHER_HAZARDS = resData.pd.WHETHER_HAZARDS;
};
fnGetCorpinfo();
const fnGetDataTransfer = () => { const fnGetDataTransfer = () => {
fnGetData({ fnGetData({
DEPTIDS: searchForm.value.DEPTIDS?.join(","), DEPTIDS: searchForm.value.DEPTIDS?.join(","),

View File

@ -5,7 +5,10 @@
<el-descriptions-item label="清单名称"> <el-descriptions-item label="清单名称">
{{ info.NAME }} {{ info.NAME }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="是否包保责任人任务"> <el-descriptions-item
label="是否包保责任人任务"
v-if="WHETHER_HAZARDS === '1'"
>
<span v-if="info.BAO_BAO_TYPE === '0'"></span> <span v-if="info.BAO_BAO_TYPE === '0'"></span>
<span v-if="info.BAO_BAO_TYPE === '1'"></span> <span v-if="info.BAO_BAO_TYPE === '1'"></span>
</el-descriptions-item> </el-descriptions-item>
@ -57,7 +60,7 @@ import { getInventoryManagementView } from "@/request/hazard_investigation.js";
import { ref } from "vue"; import { ref } from "vue";
const route = useRoute(); const route = useRoute();
const { LISTMANAGER_ID } = route.query; const { LISTMANAGER_ID, WHETHER_HAZARDS } = route.query;
const info = ref({}); const info = ref({});
const { list } = useListData(getInventoryManagementView, { const { list } = useListData(getInventoryManagementView, {
otherParams: { LISTMANAGER_ID }, otherParams: { LISTMANAGER_ID },

View File

@ -5,7 +5,10 @@
<el-descriptions-item label="清单名称"> <el-descriptions-item label="清单名称">
{{ info.NAME }} {{ info.NAME }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="是否包保责任人任务"> <el-descriptions-item
label="是否包保责任人任务"
v-if="WHETHER_HAZARDS === '1'"
>
<span v-if="info.BAO_BAO_TYPE === '0'"></span> <span v-if="info.BAO_BAO_TYPE === '0'"></span>
<span v-if="info.BAO_BAO_TYPE === '1'"></span> <span v-if="info.BAO_BAO_TYPE === '1'"></span>
</el-descriptions-item> </el-descriptions-item>
@ -72,7 +75,7 @@ import { getCustomStopView } from "@/request/hazard_investigation.js";
import { ref } from "vue"; import { ref } from "vue";
const route = useRoute(); const route = useRoute();
const { CUSTOM_ID } = route.query; const { CUSTOM_ID, WHETHER_HAZARDS } = route.query;
const info = ref({}); const info = ref({});
const { list } = useListData(getCustomStopView, { const { list } = useListData(getCustomStopView, {
otherParams: { CUSTOM_ID }, otherParams: { CUSTOM_ID },

View File

@ -7,7 +7,7 @@
<el-form ref="formRef" :rules="rules" :model="form" label-width="240px"> <el-form ref="formRef" :rules="rules" :model="form" label-width="240px">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="检查类别" prop="CHECK_CATEGORY"> <el-form-item label="检查类别" prop="CHECK_CATEGORY_NAME">
<layout-select-create <layout-select-create
v-if="type === 'add'" v-if="type === 'add'"
:list="categoryData" :list="categoryData"
@ -22,7 +22,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="检查项目" prop="CHECK_ITEM"> <el-form-item label="检查项目" prop="CHECK_ITEM_NAME">
<layout-select-create <layout-select-create
v-if="type === 'add'" v-if="type === 'add'"
:list="data.itemData" :list="data.itemData"

View File

@ -1,6 +1,6 @@
<template> <template>
<layout-card> <layout-card>
<el-divider content-position="left">清单信息</el-divider> <el-divider content-position="left">风险管控清单信息</el-divider>
<el-descriptions :column="2" border> <el-descriptions :column="2" border>
<el-descriptions-item label="清单名称"> <el-descriptions-item label="清单名称">
{{ info.NAME }} {{ info.NAME }}

View File

@ -1,6 +1,6 @@
<template> <template>
<layout-card> <layout-card>
<el-divider content-position="left">清单信息</el-divider> <el-divider content-position="left">隐患排查清单信息</el-divider>
<el-descriptions :column="2" border> <el-descriptions :column="2" border>
<el-descriptions-item label="清单名称"> <el-descriptions-item label="清单名称">
{{ info.NAME }} {{ info.NAME }}