Merge branch 'release' into dev

src/api/dataShare/index.ts

@@ -334,6 +334,7 @@ export const getDataConvergence = (params: object) => {
     baseURL:import.meta.env.VITE_DATASHARE_API_YRL,
     url: `/api/v1/HotlineWeb/get_data_aggregation_situation`,
     method: 'get',
+    timeout:1000 * 180, // 请求限时三分钟
     params
   });
 };

src/components/AnnexList/index.vue

@@ -22,14 +22,16 @@
 				<el-button> <SvgIcon name="ele-Upload" /> {{ props.name }} </el-button>
 			</template>
 			<template v-else>
-				<el-button v-if="fileList && fileList.length" disabled :loading="uploadLoading"> {{ uploadLoading ? '上传中，请稍等...' : props.name }} </el-button>
+				<el-button v-if="fileList && fileList.length" disabled :loading="uploadLoading">
+					{{ uploadLoading ? '上传中，请稍等...' : props.name }}
+				</el-button>
 				<el-button v-else disabled> 暂无附件 </el-button>
 			</template>
 			<slot> </slot>
 			<template #file="{ file }">
 				<el-skeleton :loading="uploadLoading" animated>
 					<template #template>
-						<el-skeleton-item variant="image"/>
+						<el-skeleton-item variant="image" />
 					</template>
 					<template #default>
 						<div class="el-upload-list__item-info" v-loading="uploadLoading">
@@ -172,6 +174,10 @@ const formatData = (data: any) => {
 //文件限制
 const handleExceed = (files: any, uploadFiles: UploadUserFile[]) => {
 	ElMessage.warning(`当前限制最多上传 ${props.fileLimit} 个文件,已经上传了${uploadFiles.length}个文件，本次选择了 ${files.length} 个文件。`);
+	setTimeout(() => {
+		uploadLoading.value = false; // 模拟上传过程
+		uploadingDisabled.value = false;
+	}, 100);
 };
 //限制文件大小
 const handleChangeFile = (file: any, fileList: any) => {
@@ -185,6 +191,10 @@ const handleChangeFile = (file: any, fileList: any) => {
 		const currIdx = fileList.indexOf(file);
 		fileList.splice(currIdx, 1);
 		ElMessage.warning(`文件超过了最大限度 ${props.fileSize} MB!`);
+		setTimeout(() => {
+			uploadLoading.value = false; // 模拟上传过程
+			uploadingDisabled.value = false;
+		}, 100);
 		return false;
 	}
 };
@@ -198,6 +208,8 @@ const handRemove = () => {
 const onUploadError = (error: Error) => {
 	setTimeout(() => {
 		updateData();
+		uploadLoading.value = false; // 模拟上传过程
+		uploadingDisabled.value = false;
 	}, 100);
 	try {
 		const errMessage = JSON.parse(error.message)?.message ?? '上传失败';

src/components/OrderDetail/index.vue

@@ -429,13 +429,13 @@
 							{{ formatDate(state.ruleForm?.orderVisits[state.ruleForm?.orderVisits.length - 1]?.visitTime, 'YYYY-mm-dd HH:MM:SS') }}
 						</el-form-item>
 					</el-col>
-					<el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
+<!--					<el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
 						<el-form-item label="回访标签">
 							<span v-if="state.ruleForm?.orderVisits[0]?.isPutThrough !== null">{{
 								state.ruleForm?.orderVisits[state.ruleForm?.orderVisits.length - 1]?.isPutThrough ? '已接通' : '未接通'
 							}}</span>
 						</el-form-item>
-					</el-col>
+					</el-col>-->
 				</el-row>
 				<el-row v-for="item in state.ruleForm?.orderVisits[state.ruleForm?.orderVisits.length - 1]?.orderVisitDetails" :key="item.id" :gutter="10">
 					<!-- 务员评价 -->

src/views/business/order/index.vue

@@ -255,11 +255,13 @@
 				<!--					<el-button class="default-button" @click="onChangeTotal">展示总数</el-button>-->
 				<span v-loading="totalLoading" class="mr10">共 {{ totalCount }} 条</span>
 				<el-pagination
-					layout="prev, pager, next"
+					layout="sizes,prev, pager, next"
 					:total="state.total"
 					@current-change="handleCurrentChange"
 					:page-size="state.queryParams.PageSize"
 					:current-page="state.queryParams.PageIndex"
+					@size-change="handleSizeChange"
+					:disabled="state.loading"
 				/>
 			</div>
 		</div>
@@ -821,6 +823,16 @@ const handleCurrentChange = (val: number) => {
 		state.tableData = getNeedArr(totalTable.value, state.queryParams.PageSize)[state.queryParams.PageIndex - 1]; //当前页的表格数据
 	}
 };
+// 改变每页条数
+const handleSizeChange = (val:any)=>{
+	state.queryParams.PageSize = val;
+	// 判断当前页是否是数据的最后一页
+	if (val === Math.ceil(state.total / state.queryParams.PageSize)) {
+		queryList();
+	} else {
+		state.tableData = getNeedArr(totalTable.value, state.queryParams.PageSize)[state.queryParams.PageIndex - 1]; //当前页的表格数据
+	}
+}
 const requestParams = ref<EmptyObjectType>({});
 const totalCount = ref(0);
 const totalLoading = ref(false);

src/views/business/publish/todo.vue

@@ -177,7 +177,7 @@
 </template>
 <script setup lang="tsx" name="businessPublishTodo">
 import { defineAsyncComponent, onMounted, reactive, ref } from 'vue';
-import { ElMessage, ElMessageBox, FormInstance } from 'element-plus';
+import { ElMessage, ElMessageBox, ElNotification, FormInstance } from 'element-plus';
 import { formatDate } from '@/utils/formatTime';
 import { batchPublishOrder, publishBaseInfo, publishList } from '@/api/todo/publish';
 import { defaultTimeStartEnd, shortcuts } from '@/utils/constants';
@@ -324,7 +324,12 @@ const publishMultiple = () => {
 		.then(() => {
 			batchPublishOrder({ ids }).then(() => {
 				ElMessage.success('操作成功');
-				queryList();
+				/*ElNotification({
+					dangerouslyUseHTMLString: true,
+					message: `<p style="word-break: break-all;max-height: 500px;overflow: auto">${res.result}</p>`,
+					type: 'info',
+				})*/
+				handleQuery();
 			});
 		})
 		.catch(() => {});

src/views/knowledge/error/index.vue

@@ -157,7 +157,7 @@ const onPreview = (row: any) => {
 		name: 'knowledgePreview',
 		params: {
 			id: row.knowledge.id,
-			tagsViewName: '知识详情',
+			tagsViewName: row.knowledge.title,
 		},
 	});
 };

src/views/knowledge/index/index.vue

@@ -772,7 +772,7 @@ const onPreview = (row: any) => {
 		name: 'knowledgePreview',
 		params: {
 			id: row.id,
-			tagsViewName: '知识查看',
+			tagsViewName: row.title,
 		},
 	});
 };

src/views/knowledge/question/index.vue

@@ -153,7 +153,7 @@ const onPreview = (row: any) => {
 		name: 'knowledgePreview',
 		params: {
 			id: row.knowledge.id,
-			tagsViewName: '知识详情',
+			tagsViewName: row.knowledge.title,
 		},
 	});
 };

src/views/knowledge/retrieval/YBRetrieval.vue

@@ -415,7 +415,7 @@ const onPreview = (row: any) => {
 		params: {
 			id: row.id,
 			isAddPv: 'isAddPv',
-			tagsViewName: '知识查看',
+			tagsViewName: row.title,
 		},
 	});
 };

src/views/knowledge/retrieval/ZGRetrieval.vue

@@ -406,7 +406,7 @@ const onPreview = (row: any) => {
 		params: {
 			id: row.id,
 			isAddPv: 'isAddPv',
-			tagsViewName: '知识查看',
+			tagsViewName: row.title,
 		},
 	});
 };