Merge branch 'dev-xuzhao'

src/views/notificationInfoManage/noticeInfoInquiry/index.vue

@@ -1,24 +1,12 @@
 <template>
 	<div class="sensitive-words">
-		<pageSearch ref="searchTableRef" :searchConfig="searchConfig">
-			<template #publishingUnit="scope">
-				<el-tree-select
-					v-model="scope.value"
-					:data="treeData"
-					node-key="id"
-					filterable
-					@change="newVal => onMessageChange(scope, newVal)"
-					placeholder="请选择发布单位"
-				/>
-			</template>
-		</pageSearch>
+		<pageSearch ref="searchTableRef" :searchConfig="searchConfig"> </pageSearch>
 		<pageContent ref="tableListRef" :total="total" :contentConfig="contentConfig" :pageList="tableData">
 			<template #button>
-				<el-button type="primary" @click="handleAdd()">导出</el-button>
+				<el-button type="primary" @click="onExport()">导出</el-button>
 			</template>
 			<template #operate="scope">
 				<el-button type="primary" link @click="handleDetails(scope.row.rentalCompanyId)"> 查看 </el-button>
-				<el-button type="primary" link @click="handleDelete(scope.row.rentalCompanyId)"> 处理 </el-button>
 			</template>
 		</pageContent>
 	</div>
@@ -32,19 +20,14 @@ 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 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 takeMeasures = outTypeList('bj_take_measures'); // 采取措施
 const bj_lssuing_unit = outTypeList('bj_lssuing_unit'); //发出单位
 
 const systemStore = useSystemStore();
@@ -67,12 +50,10 @@ const handleDetails = async (id: string) => {
 	});
 };
 
-// 新增按钮
-const handleAdd = () => {
-	router.push({
-		name: 'addPublish',
-		query: { type: 'add' },
-	});
+// 导出
+const onExport = () => {
+	ElMessage.success('小编在努力开发中。。。');
+	return;
 };
 const searchTableRef = ref();
 const onClickDeleta = async (row: any) => {

src/views/notificationInfoManage/superiorLeadersReview/index.vue

@@ -1,25 +1,13 @@
 <template>
 	<div class="sensitive-words">
-		<pageSearch ref="searchTableRef" :searchConfig="searchConfig">
-			<template #publishingUnit="scope">
-				<el-tree-select
-					v-model="scope.value"
-					:data="treeData"
-					node-key="id"
-					filterable
-					@change="newVal => onMessageChange(scope, newVal)"
-					placeholder="请选择发布单位"
-				/>
-			</template>
-		</pageSearch>
+		<pageSearch ref="searchTableRef" :searchConfig="searchConfig"></pageSearch>
 		<pageContent ref="tableListRef" :total="total" :contentConfig="contentConfig" :pageList="tableData">
 			<template #button>
-				<el-button type="primary" @click="handleAdd()">批量查阅</el-button>
-				<el-button type="primary" @click="handleAdd()">导出</el-button>
+				<el-button type="primary" @click="handleCheck()">批量查看</el-button>
+				<el-button type="primary" @click="onExport()">导出</el-button>
 			</template>
 			<template #operate="scope">
 				<el-button type="primary" link @click="handleDetails(scope.row.rentalCompanyId)"> 查看 </el-button>
-				<el-button type="primary" link @click="handleDelete(scope.row.rentalCompanyId)"> 处理 </el-button>
 			</template>
 		</pageContent>
 	</div>
@@ -33,19 +21,14 @@ 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 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 takeMeasures = outTypeList('bj_take_measures'); // 采取措施
 const bj_lssuing_unit = outTypeList('bj_lssuing_unit'); //发出单位
 
 const systemStore = useSystemStore();
@@ -68,13 +51,17 @@ const handleDetails = async (id: string) => {
 	});
 };
 
-// 新增按钮
-const handleAdd = () => {
-	router.push({
-		name: 'addPublish',
-		query: { type: 'add' },
-	});
+// 导出
+const onExport = () => {
+	ElMessage.success('小编在努力开发中。。。');
+	return;
+};
+
+const handleCheck = () => {
+	ElMessage.success('小编在努力开发中。。。');
+	return;
 };
+
 const searchTableRef = ref();
 const onClickDeleta = async (row: any) => {
 	ElMessageBox.confirm('确认删除此条数据吗？', '删除', {

src/views/notificationInfoManage/viewHistoricalData/index.vue

@@ -1,24 +1,13 @@
 <template>
 	<div class="sensitive-words">
-		<pageSearch ref="searchTableRef" :searchConfig="searchConfig">
-			<template #publishingUnit="scope">
-				<el-tree-select
-					v-model="scope.value"
-					:data="treeData"
-					node-key="id"
-					filterable
-					@change="newVal => onMessageChange(scope, newVal)"
-					placeholder="请选择发布单位"
-				/>
-			</template>
-		</pageSearch>
+		<pageSearch ref="searchTableRef" :searchConfig="searchConfig"> </pageSearch>
 		<pageContent ref="tableListRef" :total="total" :contentConfig="contentConfig" :pageList="tableData">
 			<template #button>
-				<el-button type="primary" @click="handleAdd()">导出</el-button>
+				<el-button type="primary" @click="onExport()">导出</el-button>
 			</template>
 			<template #operate="scope">
 				<el-button type="primary" link @click="handleDetails(scope.row.rentalCompanyId)"> 查看 </el-button>
-				<el-button type="primary" link @click="handleDelete(scope.row.rentalCompanyId)"> 处理 </el-button>
+				<!-- <el-button type="primary" link @click="handleDelete(scope.row.rentalCompanyId)"> 处理 </el-button> -->
 			</template>
 		</pageContent>
 	</div>
@@ -67,40 +56,13 @@ const handleDetails = async (id: string) => {
 	});
 };
 
-// 新增按钮
-const handleAdd = () => {
-	router.push({
-		name: 'addPublish',
-		query: { type: 'add' },
-	});
+// 导出
+const onExport = () => {
+	ElMessage.success('小编在努力开发中。。。');
+	return;
 };
+
 const searchTableRef = ref();
-const onClickDeleta = async (row: any) => {
-	ElMessageBox.confirm('确认删除此条数据吗？', '删除', {
-		confirmButtonText: '确认',
-		cancelButtonText: '取消',
-		type: 'warning',
-	}).then(() => {
-		// 删除后的回调
-	});
-};
-// 删除按钮
-function handleDelete(value: any) {
-	ElMessageBox.confirm('是否删除这条数据？', '删除提示', {
-		confirmButtonText: '确定',
-		cancelButtonText: '取消',
-		type: 'warning',
-	})
-		.then(() => {
-			systemStore.deletePageDataAction(contentConfig.pageName, value);
-		})
-		.catch(() => {
-			ElMessage({
-				type: 'info',
-				message: '取消删除',
-			});
-		});
-}
 
 // 筛选-状态赋值
 async function searchItem() {