Merge branch 'dev-xuzhao'

src/router/index.ts

@@ -78,7 +78,7 @@ export const constantRoutes: RouteRecordRaw[] = [
 		path: '',
 		component: Layout,
 		redirect: 'notificationInfoManage/addressBook',
-		children: []
+		children: [],
 	},
 	{
 		path: '/user',
@@ -101,15 +101,15 @@ export const constantRoutes: RouteRecordRaw[] = [
 		component: Layout,
 		children: [
 			{
-				path: 'addressBook',
-				component: () => import('@/views/notificationInfoManage/addressBook/index.vue'),
-				name: 'addressBook',
+				path: 'contactsmanage',
+				component: () => import('@/views/notificationInfoManage/contactsmanage/index.vue'),
+				name: 'contactsmanage',
 				meta: { title: '通报联络员管理', icon: 'user' },
 			},
 			{
-				path: 'notificationList',
-				component: () => import('@/views/notificationInfoManage/notificationListManage/index.vue'),
-				name: 'notificationList',
+				path: 'mattersmanage',
+				component: () => import('@/views/notificationInfoManage/mattersmanage/index.vue'),
+				name: 'mattersmanage',
 				meta: { title: '通报事项清单管理', icon: 'user' },
 			},
 			{

src/views/notificationInfoManage/addressBook/components/import.vue → src/views/notificationInfoManage/contactsmanage/components/import.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { importInfo } from '@/api/notificationInfoManage/addressBook';
+import { importInfo } from '@/api/notificationInfoManage/contactsmanage';
 
 const props = defineProps({
 	isVisible: {

src/views/notificationInfoManage/addressBook/index.vue → src/views/notificationInfoManage/contactsmanage/index.vue

@@ -84,7 +84,7 @@ import useSystemStore from '@/store/main';
 import TreeSelect from './components/treeSelect.vue';
 import { type TabsPaneContext } from 'element-plus';
 import { outTypeList } from '@/libs/commonMeth';
-import { changeInventoryStatus } from '@/api/notificationInfoManage/addressBook';
+import { changeInventoryStatus } from '@/api/notificationInfoManage/contactsmanage';
 
 const bj_msg_recipient = outTypeList('bj_msg_recipient'); //短信接收人
 const bj_ab_status: any = outTypeList('bj_ab_status'); //通讯录状态

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

@@ -144,7 +144,6 @@
 											v-model="formData[item.prop]"
 											:placeholder="item.placeholder"
 											filterable
-											multiple
 											style="width: 100%"
 											:disabled="dialogLook || item.disabled"
 										>

src/views/notificationInfoManage/notificationListManage/config/content.config.ts → src/views/notificationInfoManage/mattersmanage/config/content.config.ts

@@ -18,7 +18,7 @@ const contentConfig = {
 		{ type: 'normal', label: '通报事项', prop: 'notificationMatters', sortable: true, width: 140 },
 		{ type: 'normal', label: '通报标准或具体行为列举', prop: 'notificationStandards', width: 180 },
 		{ type: 'normal', label: '通报依据', prop: 'notificationBasis', width: 90 },
-		{ type: 'normal', label: '发出单位', prop: 'deliveryUnitStr', width: 220 },
+		{ type: 'custom', label: '发出单位', prop: 'deliveryUnit', slotName: 'deliveryUnit', width: 220 },
 		{ type: 'normal', label: '接收单位', prop: 'lonmMiddleStr', width: 220 },
 		{ type: 'custom', label: '发布状态', prop: 'releaseStatus', slotName: 'releaseStatus', width: 140 },
 		{ type: 'normal', label: '创建日期', prop: 'addDate', width: 140 },

src/views/notificationInfoManage/notificationListManage/index.vue → src/views/notificationInfoManage/mattersmanage/index.vue

@@ -17,6 +17,13 @@
 			<template #button>
 				<el-button type="primary" @click="handleAdd()">新增</el-button>
 			</template>
+
+			<!-- 发出单位 -->
+			<template #deliveryUnit="scope">
+				<template :index="index" v-for="(item, index) in bj_lssuing_unit">
+					<template :index="index" v-if="item.value == scope.row.deliveryUnit">{{ item.label }}</template>
+				</template>
+			</template>
 			<!-- 通报类型 -->
 			<template #notificationType="scope">
 				<template :index="index" v-for="(item, index) in bj_notification_type">
@@ -78,18 +85,17 @@ import searchConfig from './config/search.config';
 import pageSearch from '@/components/components/pageSearch.vue';
 import detailConfig from './config/detail.config';
 import pageDetail from './components/detail.vue';
-import { changeInventoryStatus } from '@/api/notificationInfoManage/notificationList';
+import { changeInventoryStatus } from '@/api/notificationInfoManage/mattersmanage';
 
 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'); //通报事项清单发布状态
-const bj_lssuing_unit = outTypeList('bj_lssuing_unit'); //发出单位
 
 // 使用pinia数据
 const systemStore = useSystemStore();