Quellcode durchsuchen

reactor:377 【坐席话务统计分析】修改部分字段计算方式等

zhangchong vor 1 Monat
Ursprung
Commit
dacfa7433a
2 geänderte Dateien mit 32 neuen und 19 gelöschten Zeilen
  1. 8 9
      src/views/auxiliary/notice/detail.vue
  2. 24 10
      src/views/public/notice/index.vue

+ 8 - 9
src/views/auxiliary/notice/detail.vue

@@ -20,12 +20,12 @@
 							</el-form-item>
 						</el-col>
 						<el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-							<el-form-item label="通知对象">
+							<el-form-item label="通知对象">
 								{{ state.ruleForm.circularTypeText }}
 							</el-form-item>
 						</el-col>
 						<el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-							<el-form-item label="已阅读数量">
+							<el-form-item label="已阅读数量">
 								<el-popover :width="450" trigger="click" popper-class="notice-container">
 									<template #reference>
 										<el-button placement="right" link type="primary">{{ state.ruleForm?.readedNum + '/' + state.ruleForm?.needReadNum }}</el-button>
@@ -67,32 +67,32 @@
 				<template v-if="['公告详情'].includes(noticeType)">
 					<el-row :gutter="10">
 						<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-							<el-form-item label="公告类型">
+							<el-form-item label="公告类型">
 								{{ state.ruleForm.bulletinTypeName }}
 							</el-form-item>
 						</el-col>
 						<el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-							<el-form-item label="公告标题">
+							<el-form-item label="公告标题">
 								{{ state.ruleForm.title }}
 							</el-form-item>
 						</el-col>
 						<el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-							<el-form-item label="来源单位">
+							<el-form-item label="来源单位">
 								{{ state.ruleForm.sourceOrgName }}
 							</el-form-item>
 						</el-col>
 						<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-							<el-form-item label="公告范围">
+							<el-form-item label="公告范围">
 								{{ state.ruleForm.pushRangesText }}
 							</el-form-item>
 						</el-col>
 						<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="editor-content-view">
-							<el-form-item label="公告内容">
+							<el-form-item label="公告内容">
 								<div v-html="state.ruleForm.content"></div>
 							</el-form-item>
 						</el-col>
 						<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-							<el-form-item label="附件">
+							<el-form-item label="附件">
 								<annex-list name="公告附件" readonly :businessId="state.ruleForm.id" classify="查看附件" v-model="state.ruleForm.files" />
 							</el-form-item>
 						</el-col>
@@ -130,7 +130,6 @@
 <script setup lang="ts" name="auxiliaryNoticeDetail">
 import { reactive, onMounted, ref, defineAsyncComponent } from 'vue';
 import { useRoute } from 'vue-router';
-import { formatDate } from '@/utils/formatTime';
 import { bulletinAudit, bulletinDetail, circularAudit, circularDetail, circularRead } from '@/api/auxiliary/notice';
 import mittBus from '@/utils/mitt';
 import { FormInstance } from 'element-plus';

+ 24 - 10
src/views/public/notice/index.vue

@@ -20,12 +20,12 @@
 							</el-form-item>
 						</el-col>
 						<el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-							<el-form-item label="通知对象">
+							<el-form-item label="通知对象">
 								{{ state.ruleForm.circularTypeText }}
 							</el-form-item>
 						</el-col>
 						<el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-							<el-form-item label="已阅读数量">
+							<el-form-item label="已阅读数量">
                 <el-popover :width="450" trigger="click" popper-class="notice-container">
                   <template #reference>
                     <el-button  placement="right" link type="primary">{{ state.ruleForm?.readedNum + '/' + state.ruleForm?.needReadNum }}</el-button>
@@ -50,39 +50,49 @@
 							</el-form-item>
 						</el-col>
 						<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-							<el-form-item label="文档内容:">
+							<el-form-item label="通知内容">
 								<div v-html="state.ruleForm.content"></div>
 							</el-form-item>
 						</el-col>
+						<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+							<el-form-item label="附件">
+								<annex-list name="通知附件" readonly :businessId="state.ruleForm.id" classify="查看附件" v-model="state.ruleForm.files" />
+							</el-form-item>
+						</el-col>
 					</el-row>
 				</template>
 				<template v-if="['公告详情'].includes(noticeType)">
 					<el-row :gutter="10">
 						<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-							<el-form-item label="公告类型">
+							<el-form-item label="公告类型">
 								{{ state.ruleForm.bulletinTypeName }}
 							</el-form-item>
 						</el-col>
 						<el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-							<el-form-item label="公告标题">
+							<el-form-item label="公告标题">
 								{{ state.ruleForm.title }}
 							</el-form-item>
 						</el-col>
 						<el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-							<el-form-item label="来源单位">
+							<el-form-item label="来源单位">
 								{{ state.ruleForm.sourceOrgName }}
 							</el-form-item>
 						</el-col>
 						<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-							<el-form-item label="公告范围">
+							<el-form-item label="公告范围">
 								{{ state.ruleForm.pushRangesText }}
 							</el-form-item>
 						</el-col>
 						<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="editor-content-view">
-							<el-form-item label="文档内容:">
+							<el-form-item label="公告内容">
 								<div v-html="state.ruleForm.content"></div>
 							</el-form-item>
 						</el-col>
+						<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+							<el-form-item label="附件">
+								<annex-list name="公告附件" readonly :businessId="state.ruleForm.id" classify="查看附件" v-model="state.ruleForm.files" />
+							</el-form-item>
+						</el-col>
 					</el-row>
 				</template>
 			</el-form>
@@ -90,11 +100,13 @@
 	</div>
 </template>
 <script setup lang="ts" name="auxiliaryNoticeRead">
-import { reactive, onMounted, ref} from 'vue';
+import { reactive, onMounted, ref, defineAsyncComponent } from 'vue';
 import { useRoute } from 'vue-router';
-import { formatDate } from '@/utils/formatTime';
 import { bulletinDetail,circularRead } from '@/api/auxiliary/notice';
+import { transformFile } from '@/utils/tools';
+
 
+const AnnexList = defineAsyncComponent(() => import('@/components/AnnexList/index.vue')); // 附件列表
 // 定义变量内容
 const state = reactive<any>({
 	dialogVisible: false,
@@ -111,10 +123,12 @@ const getDetail = async (id: string | string[]) => {
         // 阅读
         const readCircularRes = await circularRead(id);
         state.ruleForm = readCircularRes.result;
+				state.ruleForm.files = transformFile(readCircularRes.result.files);
 				break;
 			case '公告详情':
 				const bulletinRes = await bulletinDetail(id);
 				state.ruleForm = bulletinRes.result;
+				state.ruleForm.files = transformFile(bulletinRes.result.files);
 				break;
 			default:
 				break;