Merge branch 'dev-xuzhao'

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

@@ -134,7 +134,7 @@
 			<template #footer>
 				<span class="dialog-footer">
 					<el-button type="primary" v-show="dialogLook == false" @click="handleConfirmClick(ruleFormRef)"
-						>保持</el-button
+						>保存</el-button
 					>
 					<el-button @click="handleExcel(ruleFormRef)">返回</el-button>
 

src/views/notificationInfoManage/addressBook/config/search.config.ts

@@ -14,12 +14,14 @@ const searchConfig = {
 			label: '姓名',
 			prop: 'contactName',
 			type: 'input',
+			span: 8,
 			placeholder: '请输入联络员姓名',
 		},
 		{
 			label: '部门',
 			prop: 'belongsDept',
 			type: 'input',
+			span: 8,
 			placeholder: '请输入联络员部门',
 		},
 		{
@@ -31,6 +33,7 @@ const searchConfig = {
 		{
 			label: '短信接收人',
 			prop: 'msgRecipient',
+			span: 8,
 			type: 'select',
 			options: [] as Array<Inew>,
 			multiple: false,
@@ -40,6 +43,7 @@ const searchConfig = {
 			label: '通讯录状态',
 			prop: 'abStatus',
 			type: 'select',
+			span: 8,
 			options: [] as Array<Inew>,
 			multiple: false,
 			placeholder: '请选择通讯录状态',

src/views/notificationInfoManage/addressBook/config/search.nonIndustry.config.ts

@@ -14,18 +14,21 @@ const searchConfig = {
 			label: '姓名',
 			prop: 'contactName',
 			type: 'input',
+			span: 8,
 			placeholder: '请输入联络员姓名',
 		},
 		{
 			label: '部门',
 			prop: 'belongsDept',
 			type: 'input',
+			span: 8,
 			placeholder: '请输入联络员部门',
 		},
 		{
 			label: '联系电话',
 			prop: 'contactNumber',
 			type: 'input',
+			span: 8,
 			placeholder: '请输入联系电话',
 		},
 		{
@@ -34,6 +37,7 @@ const searchConfig = {
 			type: 'select',
 			options: [] as Array<Inew>,
 			multiple: false,
+			span: 8,
 			placeholder: '请选择通讯录状态',
 		},
 	],

src/views/notificationInfoManage/addressBook/index.vue

@@ -196,7 +196,7 @@ const onExport = () => {};
 
 // 删除按钮
 function onDelete(row: any) {
-	ElMessageBox.confirm(`确定删除联络人“${row.contactName}”条条目信息吗？`, '删除提示', {
+	ElMessageBox.confirm(`确定删除联络人“${row.contactName}”条目信息吗？`, '删除提示', {
 		confirmButtonText: '确定',
 		cancelButtonText: '取消',
 		type: 'warning',
@@ -216,7 +216,7 @@ function onDelete(row: any) {
 
 // 状态按钮
 function handleStatus(row: any, status: string, str: string) {
-	ElMessageBox.confirm(`是否${str}联络人“${row.contactName}”条条目信息吗？`, '状态提示', {
+	ElMessageBox.confirm(`是否${str}联络人“${row.contactName}”条目信息吗？`, '状态提示', {
 		confirmButtonText: '确定',
 		cancelButtonText: '取消',
 		type: 'warning',

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

@@ -84,6 +84,21 @@
 											:disabled="item.disabled"
 										/>
 									</template>
+
+									<!-- 发布单位 -->
+									<template v-if="item.type === 'publishingUnit'">
+										<el-tree-select
+											v-model="formData[item.prop]"
+											:data="treeData"
+											:render-after-expand="false"
+											:disabled="item.disabled"
+											node-key="id"
+											filterable
+											:placeholder="item.placeholder"
+											style="width: 100%"
+										/>
+									</template>
+
 									<!-- 发布状态 -->
 									<template v-if="item.type === 'releaseStatus'">
 										<el-select
@@ -143,10 +158,10 @@
 			</div>
 			<template #footer>
 				<span class="dialog-footer">
-					<el-button type="primary" v-show="dialogLook == false" @click="handleConfirmClick(ruleFormRef, '3')"
+					<el-button type="primary" v-show="dialogLook == false" @click="handleConfirmClick(ruleFormRef, '1')"
 						>保存</el-button
 					>
-					<el-button type="primary" v-show="dialogLook == false" @click="handleConfirmClick(ruleFormRef, '1')"
+					<el-button type="primary" v-show="dialogLook == false" @click="handleConfirmClick(ruleFormRef, '2')"
 						>提交</el-button
 					>
 					<el-button @click="handleExcel(ruleFormRef)">返回</el-button>
@@ -231,11 +246,14 @@ async function setDialogVisible(isNew: boolean = true, check: boolean = false) {
 				initialForm[m.prop] = '张浩楠';
 			}
 			if (m.prop === 'publishingUnit') {
-				initialForm[m.prop] = '交通运输部海事局';
+				initialForm[m.prop] = '100';
 			}
 			if (m.prop === 'addDate') {
 				initialForm[m.prop] = nowStr;
 			}
+			if (m.prop === 'releaseStatus') {
+				initialForm[m.prop] = '1';
+			}
 		});
 		formData.value = JSON.parse(JSON.stringify(initialForm));
 		await nextTick();
@@ -252,7 +270,7 @@ function handleConfirmClick(formEl: FormInstance | undefined, status: string) {
 		if (valid) {
 			dialogVisible.value = false;
 			// 可用状态 编辑始终 都是可用
-			if (formData.value.releaseStatus != 1) {
+			if (formData.value.releaseStatus != '2') {
 				formData.value.releaseStatus == status;
 			}
 

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

@@ -5,7 +5,7 @@ const contentConfig = {
 	},
 	propsList: [
 		{ type: 'index', label: '事项编号' },
-		{ type: 'normal', label: '发布单位', prop: 'publishingUnitStr' },
+		{ type: 'normal', label: '发布单位', prop: 'publishingUnitStr', width: 140 },
 		{
 			type: 'custom',
 			label: '通报类型',

src/views/notificationInfoManage/notificationListManage/config/detail.config.ts

@@ -3,7 +3,7 @@ const modalConfig = {
 	addTitle: '违法信息通报事项清单信息',
 	editTitle: '违法信息通报事项清单信息',
 	detailTitle: '违法信息通报事项清单信息',
-	labelWidth: '140px',
+	labelWidth: '110px',
 	dialogWidth: '70%',
 	formRules: {
 		notificationType: [{ required: true, message: '请选择通报类型', trigger: 'select' }],
@@ -16,7 +16,7 @@ const modalConfig = {
 		{
 			label: '发布单位',
 			prop: 'publishingUnit',
-			type: 'input',
+			type: 'publishingUnit',
 			disabled: true,
 			span: 6,
 			placeholder: '请输入发布单位',

src/views/notificationInfoManage/notificationListManage/config/search.config.ts

@@ -18,7 +18,7 @@ const searchConfig = {
 			label: '通报类型',
 			prop: 'notificationType',
 			type: 'select',
-			multiple: true,
+			multiple: false,
 			options: [] as Array<Inew>,
 			placeholder: '请选择通报类型',
 		},
@@ -26,7 +26,7 @@ const searchConfig = {
 			label: '通报事项类别',
 			prop: 'conm',
 			type: 'select',
-			multiple: true,
+			multiple: false,
 			options: [] as Array<Inew>,
 			placeholder: '请选择通报事项类别',
 		},
@@ -61,7 +61,7 @@ const searchConfig = {
 			label: '发布状态',
 			prop: 'releaseStatus',
 			type: 'select',
-			multiple: true,
+			multiple: false,
 			options: [] as Array<Inew>,
 			placeholder: '请选择接收单位',
 		},

src/views/notificationInfoManage/notificationListManage/index.vue

@@ -58,20 +58,20 @@
 			<template #operate="scope">
 				<el-button type="primary" link @click="handleCheck(scope.row.notifiedMattersId)"> 查看 </el-button>
 				<!-- 待提交 -->
-				<template v-if="scope.row.releaseStatus == '3'">
+				<template v-if="scope.row.releaseStatus == '1'">
 					<el-button type="primary" link @click="handleEdit(scope.row.notifiedMattersId)"> 编辑 </el-button>
 					<el-button type="danger" link @click="handleDelete(scope.row.notifiedMattersId)"> 删除 </el-button>
 				</template>
 				<!-- 可用 -->
-				<template v-if="scope.row.releaseStatus == '1'">
+				<template v-if="scope.row.releaseStatus == '2'">
 					<el-button type="primary" link @click="handleEdit(scope.row.notifiedMattersId)"> 编辑 </el-button>
-					<el-button type="warning" link @click="handleStatus(scope.row.notifiedMattersId, '2', '废止')">
+					<el-button type="warning" link @click="handleStatus(scope.row.notifiedMattersId, '3', '废止')">
 						废止
 					</el-button>
 				</template>
 				<!-- 废止 -->
-				<template v-if="scope.row.releaseStatus == '2'">
-					<el-button type="success" link @click="handleStatus(scope.row.notifiedMattersId, '1', '启用')">
+				<template v-if="scope.row.releaseStatus == '3'">
+					<el-button type="success" link @click="handleStatus(scope.row.notifiedMattersId, '2', '启用')">
 						启用
 					</el-button>
 				</template>