Merge branch 'dev-xuzhao'

src/views/notificationInfoInquiry/administrativePenalty/index.vue

@@ -60,14 +60,21 @@ import pageSearch from '@/components/components/pageSearch.vue';
 import useSystemStore from '@/store/main';
 import { outTypeList } from '@/libs/commonMeth';
 const systemStore = useSystemStore();
+import {
+	categoryOnm,
+	notificationStatus,
+	isFeedback,
+	overdueStatus,
+	takeMeasures,
+	bj_notification_type,
+	bj_ship_delayed,
+	bj_hand_opinion,
+	bj_lssuing_unit,
+	bj_initial_review_mark,
+} from '@/plugins/dictData';
 
-const bj_notification_type = outTypeList('bj_notification_type'); //通报类型
-const categoryOnm = outTypeList('bj_category_onm'); // 通报事项类别
-const bj_initial_review_mark = outTypeList('bj_initial_review_mark'); // 初复查标志
 const bj_ship_port_registration = outTypeList('bj_ship_port_registration'); // 船港籍
-const bj_ship_delayed = outTypeList('bj_ship_delayed'); // 船舶是否滞留
-const bj_hand_opinion = outTypeList('bj_hand_opinion'); // 处理意见
-const bj_reason_deregistration = outTypeList('bj_reason_deregistration'); // 注销原因
+const bj_ship_type = outTypeList('bj_ship_type'); // 船舶种类
 
 const total = ref(0);
 const pageSize = ref([10, 20, 30]);

src/views/notificationInfoInquiry/securityCheck/index.vue

@@ -61,12 +61,20 @@ import useSystemStore from '@/store/main';
 import { outTypeList } from '@/libs/commonMeth';
 const systemStore = useSystemStore();
 
-const bj_notification_type = outTypeList('bj_notification_type'); //通报类型
-const categoryOnm = outTypeList('bj_category_onm'); // 通报事项类别
-const bj_initial_review_mark = outTypeList('bj_initial_review_mark'); // 初复查标志
+import {
+	categoryOnm,
+	notificationStatus,
+	isFeedback,
+	overdueStatus,
+	takeMeasures,
+	bj_notification_type,
+	bj_ship_delayed,
+	bj_hand_opinion,
+	bj_lssuing_unit,
+	bj_initial_review_mark,
+} from '@/plugins/dictData';
+
 const bj_ship_port_registration = outTypeList('bj_ship_port_registration'); // 船港籍
-const bj_ship_delayed = outTypeList('bj_ship_delayed'); // 船舶是否滞留
-const bj_hand_opinion = outTypeList('bj_hand_opinion'); // 处理意见
 const bj_ship_type = outTypeList('bj_ship_type'); // 船舶种类
 
 const total = ref(0);

src/views/notificationInfoInquiry/shipRegistration/index.vue

@@ -61,13 +61,21 @@ import useSystemStore from '@/store/main';
 import { outTypeList } from '@/libs/commonMeth';
 const systemStore = useSystemStore();
 
-const bj_notification_type = outTypeList('bj_notification_type'); //通报类型
-const categoryOnm = outTypeList('bj_category_onm'); // 通报事项类别
-const bj_initial_review_mark = outTypeList('bj_initial_review_mark'); // 初复查标志
+import {
+	categoryOnm,
+	notificationStatus,
+	isFeedback,
+	overdueStatus,
+	takeMeasures,
+	bj_notification_type,
+	bj_ship_delayed,
+	bj_hand_opinion,
+	bj_lssuing_unit,
+	bj_initial_review_mark,
+} from '@/plugins/dictData';
+
 const bj_ship_port_registration = outTypeList('bj_ship_port_registration'); // 船港籍
-const bj_ship_delayed = outTypeList('bj_ship_delayed'); // 船舶是否滞留
-const bj_hand_opinion = outTypeList('bj_hand_opinion'); // 处理意见
-const bj_reason_deregistration = outTypeList('bj_reason_deregistration'); // 注销原因
+const bj_ship_type = outTypeList('bj_ship_type'); // 船舶种类
 
 const total = ref(0);
 const pageSize = ref([10, 20, 30]);

src/views/notificationInfoManage/mattersmanage/components/detail.vue

@@ -133,7 +133,7 @@
 											style="width: 100%"
 											:disabled="dialogLook || item.disabled"
 										>
-											<template v-for="(val, index) in bj_category_onm" :key="index">
+											<template v-for="(val, index) in categoryOnm" :key="index">
 												<el-option :value="val.value" :label="val.label" />
 											</template>
 										</el-select>
@@ -182,10 +182,8 @@ import useSystemStore from '@/store/main';
 import { TreeOptions } from '@/types/global';
 import dayjs from 'dayjs';
 import { outTypeList, outDeptTree } from '@/libs/commonMeth';
-const bj_notification_type = outTypeList('bj_notification_type'); //通报类型
-const bj_category_onm = outTypeList('bj_category_onm'); //通报事项类别
+import { categoryOnm, bj_notification_type, bj_lssuing_unit } from '@/plugins/dictData';
 const bj_nl_released_status = outTypeList('bj_nl_released_status'); //通报事项清单发布状态
-const bj_lssuing_unit = outTypeList('bj_lssuing_unit'); //发出单位
 
 // 定义props
 interface IProps {

src/views/notificationInfoManage/mattersmanage/index.vue

@@ -86,15 +86,12 @@ import pageSearch from '@/components/components/pageSearch.vue';
 import detailConfig from './config/detail.config';
 import pageDetail from './components/detail.vue';
 import { changeInventoryStatus } from '@/api/notificationInfoManage/mattersmanage';
+import { categoryOnm, bj_notification_type, bj_lssuing_unit } from '@/plugins/dictData';
 
 import useSystemStore from '@/store/main';
 import { outTypeList, outDeptTree } from '@/libs/commonMeth';
 import { TreeOptions } from '@/types/global';
 
-// 通报事项类别	bj_category_onm
-const bj_lssuing_unit = outTypeList('bj_lssuing_unit'); //发出单位
-const bj_notification_type = outTypeList('bj_notification_type'); //通报类型
-const bj_category_onm = outTypeList('bj_category_onm'); //通报事项类别
 const bj_nl_released_status = outTypeList('bj_nl_released_status'); //通报事项清单发布状态
 
 // 使用pinia数据
@@ -186,7 +183,7 @@ async function searchItem() {
 			item.options = bj_notification_type;
 		}
 		if (item.prop === 'conm') {
-			item.options = bj_category_onm;
+			item.options = categoryOnm;
 		}
 		if (item.prop === 'releaseStatus') {
 			item.options = bj_nl_released_status;

src/views/notificationInfoManage/noticeInfoInquiry/index.vue

@@ -19,16 +19,15 @@ import pageContent from '@/components/components/pageContent.vue';
 import searchConfig from './config/search.config';
 import pageSearch from '@/components/components/pageSearch.vue';
 import useSystemStore from '@/store/main';
-import { outTypeList } from '@/libs/commonMeth';
-
-const allNotificationStatus = outTypeList('bj_notify_os'); // 通报整体状态
-const bj_notification_type = outTypeList('bj_notification_type'); //通报类型
-const categoryOnm = outTypeList('bj_category_onm'); // 通报事项类别
-const notificationStatus = outTypeList('bj_notification_status'); // 通报状态
-const isFeedback = outTypeList('bj_is_feedback'); // 是否需要反馈
-const overdueStatus = outTypeList('bj_overdue_status'); // 超期状态
-const takeMeasures = outTypeList('bj_take_measures'); // 采取措施
-const bj_lssuing_unit = outTypeList('bj_lssuing_unit'); //发出单位
+import {
+	categoryOnm,
+	notificationStatus,
+	isFeedback,
+	overdueStatus,
+	takeMeasures,
+	bj_notification_type,
+	bj_lssuing_unit,
+} from '@/plugins/dictData';
 
 const systemStore = useSystemStore();
 

src/views/notificationInfoManage/superiorLeadersReview/index.vue

@@ -20,16 +20,16 @@ import pageContent from '@/components/components/pageContent.vue';
 import searchConfig from './config/search.config';
 import pageSearch from '@/components/components/pageSearch.vue';
 import useSystemStore from '@/store/main';
-import { outTypeList } from '@/libs/commonMeth';
 
-const allNotificationStatus = outTypeList('bj_notify_os'); // 通报整体状态
-const bj_notification_type = outTypeList('bj_notification_type'); //通报类型
-const categoryOnm = outTypeList('bj_category_onm'); // 通报事项类别
-const notificationStatus = outTypeList('bj_notification_status'); // 通报状态
-const isFeedback = outTypeList('bj_is_feedback'); // 是否需要反馈
-const overdueStatus = outTypeList('bj_overdue_status'); // 超期状态
-const takeMeasures = outTypeList('bj_take_measures'); // 采取措施
-const bj_lssuing_unit = outTypeList('bj_lssuing_unit'); //发出单位
+import {
+	categoryOnm,
+	notificationStatus,
+	isFeedback,
+	overdueStatus,
+	takeMeasures,
+	bj_notification_type,
+	bj_lssuing_unit,
+} from '@/plugins/dictData';
 
 const systemStore = useSystemStore();