Merge remote-tracking branch 'origin/dev' into dev

src/components/hidden_view/index.vue

@@ -28,19 +28,19 @@
       </template>
       <template v-if="data.info.SOURCE === '2' && listType === '2'">
         <el-descriptions-item label="检查类别">
-          {{ data.info.BR_CHECK_CATEGORY_NAME }}
+          {{ data.info.CHECK_CATEGORY_NAME }}
         </el-descriptions-item>
         <el-descriptions-item label="检查项目">
-          {{ data.info.BR_CHECK_ITEM_NAME }}
+          {{ data.info.CHECK_ITEM_NAME }}
         </el-descriptions-item>
         <el-descriptions-item label="检查内容">
-          {{ data.info.BR_CHECK_CONTENT }}
+          {{ data.info.CHECK_CONTENT }}
         </el-descriptions-item>
         <el-descriptions-item label="检查标准">
-          {{ data.info.BR_CHECK_STANDARD }}
+          {{ data.info.CHECK_STANDARD }}
         </el-descriptions-item>
         <el-descriptions-item label="参考依据">
-          {{ data.info.BR_REFERENCE_BASIS }}
+          {{ data.info.REFERENCE_BASIS }}
         </el-descriptions-item>
       </template>
       <el-descriptions-item label="隐患级别">

src/views/hazard_investigation/checklist_inspection_status/components/inspection_record_view.vue

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

src/views/hazard_investigation/checklist_inspection_status/index.vue

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

src/views/hazard_investigation/delete_inventory_management/components/list.vue

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

src/views/hazard_investigation/delete_inventory_management/view.vue

@@ -5,7 +5,10 @@
       <el-descriptions-item label="清单名称">
         {{ info.NAME }}
       </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 === '1'">是</span>
       </el-descriptions-item>
@@ -57,7 +60,7 @@ import { getInventoryManagementView } from "@/request/hazard_investigation.js";
 import { ref } from "vue";
 
 const route = useRoute();
-const { LISTMANAGER_ID } = route.query;
+const { LISTMANAGER_ID, WHETHER_HAZARDS } = route.query;
 const info = ref({});
 const { list } = useListData(getInventoryManagementView, {
   otherParams: { LISTMANAGER_ID },

src/views/hazard_investigation/delete_inventory_management/view_custom.vue

@@ -5,7 +5,10 @@
       <el-descriptions-item label="清单名称">
         {{ info.NAME }}
       </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 === '1'">是</span>
       </el-descriptions-item>
@@ -72,7 +75,7 @@ import { getCustomStopView } from "@/request/hazard_investigation.js";
 import { ref } from "vue";
 
 const route = useRoute();
-const { CUSTOM_ID } = route.query;
+const { CUSTOM_ID, WHETHER_HAZARDS } = route.query;
 const info = ref({});
 const { list } = useListData(getCustomStopView, {
   otherParams: { CUSTOM_ID },

src/views/hazard_investigation/inventory_management/components/checkstandard_add.vue

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

src/views/hazard_investigation/inventory_troubleshooting/components/un_qualified.vue

@@ -124,7 +124,12 @@ const fnSubmit = debounce(
         RECORDITEM_ID: props.info.RECORDITEM_ID,
         RISKITEM_ID: props.info.LISTCHECKITEM_ID,
         LONGITUDE: props.longitude,
-        LATITUDE: props.latitude,
+        CHECK_CATEGORY: props.info.CHECK_CATEGORY,
+        CHECK_CATEGORY_NAME: props.info.CHECK_CATEGORY_NAME,
+        CHECK_ITEM: props.info.CHECK_ITEM,
+        CHECK_ITEM_NAME: props.info.CHECK_ITEM_NAME,
+        CHECK_STANDARD: props.info.CHECK_STANDARD,
+        REFERENCE_BASIS: props.info.REFERENCE_BASIS,
       };
       const resData =
         props.listType === 1

src/views/hazard_investigation/inventory_troubleshooting/inspect.vue

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

src/views/hazard_investigation/inventory_troubleshooting/inspect_custom.vue

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