From 75cae9364092ef4fd82295f83483a7d74b938a9a Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Fri, 5 May 2023 13:35:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workSys/addFormNotice.vue |  7 +++++--
 src/views/modules/workSys/noticeList.vue    | 22 +++++++++++++--------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/views/modules/workSys/addFormNotice.vue b/src/views/modules/workSys/addFormNotice.vue
index 2f4c40105..19fb0988e 100644
--- a/src/views/modules/workSys/addFormNotice.vue
+++ b/src/views/modules/workSys/addFormNotice.vue
@@ -39,6 +39,7 @@
 									maxlength="500"
 									style="width:570px;"
 									clearable
+									show-word-limit
 									placeholder="请输入"
 								></el-input>
 							</el-form-item>
@@ -58,6 +59,8 @@
 
 						<el-col :span="24">
 							<el-form-item label="发布内容" prop="content">{{ formData.content }}</el-form-item>
+						</el-col><el-col :span="24">
+							<el-form-item label="发布时间" prop="content">{{ formData.publishTime }}</el-form-item>
 						</el-col>
 					</el-row>
 				</el-form>
@@ -139,7 +142,7 @@ export default {
 				label: 'agencyName',
 				children: 'subAgencyList',
 				emitPath: false,
-				checkStrictly: true
+				checkStrictly: false
 			},
 			formData: {
 				publishDitch: '',
@@ -321,7 +324,7 @@ export default {
 /deep/.dialog-h-content2 {
 	// max-height: calc(83vh - 90px);
 	box-sizing: border-box;
-	padding: 0 10px;
+	padding: 0 30px;
 	overflow: auto;
 }
 </style>
diff --git a/src/views/modules/workSys/noticeList.vue b/src/views/modules/workSys/noticeList.vue
index 0dbc81084..8d89695d9 100644
--- a/src/views/modules/workSys/noticeList.vue
+++ b/src/views/modules/workSys/noticeList.vue
@@ -4,7 +4,7 @@
 			<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'110px'">
 				<div>
 					<el-form-item label="发布渠道" prop="publishDitch">
-						<el-select v-model="formData.publishDitch" placeholder="请选择">
+						<el-select v-model="formData.publishDitch" placeholder="请选择" clearable>
 							<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
 						</el-select>
 					</el-form-item>
@@ -16,6 +16,7 @@
 							v-model="formData.orgId"
 							:options="orgOptions"
 							filterable
+							clearable
 							:props="orgOptionProps"
 							:show-all-levels="false"
 							@change="handleChangeAgency"
@@ -25,9 +26,10 @@
 						<el-date-picker
 							v-model="timeRange"
 							size="small"
-							type="datetimerange"
+							clearable
+							type="daterange"
 							@change="handleTimeChange"
-							format="yyyy-MM-dd HH:mm"
+							format="yyyy-MM-dd"
 							value-format="yyyy-MM-dd HH:mm"
 							range-separator="至"
 							start-placeholder="开始时间"
@@ -55,10 +57,14 @@
 				>
 					<el-table-column label="序号" header-align="center" align="center" type="index" width="50"></el-table-column>
 
-					<el-table-column prop="content" header-align="center" align="center" label="发布内容" min-width="100"></el-table-column>
-					<el-table-column prop="publishDitch" header-align="center" align="center" label="发布渠道" min-width="110"></el-table-column>
-					<el-table-column prop="publishRangeName" header-align="center" align="center" label="发布范围" min-width="110"></el-table-column>
-					<el-table-column prop="publishTime" header-align="center" align="center" label="发布时间" min-width="110"></el-table-column>
+					<el-table-column prop="content"   header-align="center" align="center" label="发布内容" show-overflow-tooltip="true" ></el-table-column>
+					<el-table-column prop="publishDitch" header-align="center" align="center" label="发布渠道" width="110">
+						<template slot-scope="scope">
+							<span v-if="scope.row.publishDitch == 0">专属APP</span>
+						</template>
+					</el-table-column>
+					<el-table-column prop="publishRangeName" header-align="center" align="center" label="发布范围"  show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="publishTime" header-align="center" align="center" label="发布时间" width="160"></el-table-column>
 					<el-table-column prop="count" align="center" width="110" label="操作" :show-overflow-tooltip="true">
 						<template slot-scope="scope">
 							<el-button size="small" type="text" @click="show(scope.row)">查看</el-button>
@@ -254,7 +260,7 @@ export default {
 			};
 			this.timeRange = [];
 			this.pageNo = 0;
-			this.loadTable()
+			this.loadTable();
 		},
 
 		handleSizeChange(val) {