Merge branch 'release' into dev

src/components/AnnexList/index.vue

@@ -205,18 +205,22 @@ const handRemove = () => {
 	}, 100);
 };
 // 上传失败
-const onUploadError = (error: Error) => {
+const onUploadError = (error: Error,uploadFile: UploadFile, uploadFiles: UploadFiles) => {
+	try {
+		const errMessage = JSON.parse(error.message)?.message ?? `文件 ${uploadFile.name} 上传失败`;
+		// 从文件列表中移除失败的文件
+		fileList.value = fileList.value.filter(item => item.response);
+		console.error(`文件 ${uploadFile.name} 上传失败`);
+		console.log(fileList.value,'111')
+		ElMessage.error(errMessage);
+	} catch (e) {
+		ElMessage.error(`文件 ${uploadFile.name} 上传失败`);
+	}
 	setTimeout(() => {
 		updateData();
 		uploadLoading.value = false; // 模拟上传过程
 		uploadingDisabled.value = false;
 	}, 100);
-	try {
-		const errMessage = JSON.parse(error.message)?.message ?? '上传失败';
-		ElMessage.error(errMessage);
-	} catch (e) {
-		ElMessage.error('上传失败');
-	}
 };
 // 删除
 const handleRemove = (uploadFile: any) => {

src/components/Hotspot/index.vue

@@ -177,7 +177,11 @@ const handleQuery = async () => {
 	state.loading = true;
 	try {
 		const { result } = await hotSpotSearch(state.queryParams.name);
-		tableData.value = result;
+		let resultHotspot = result;
+		if(props.isYB){
+			resultHotspot = resultHotspot.filter((item:any)=>item.id !== '20')
+		}
+		tableData.value = resultHotspot;
 		state.loading = false;
 	} catch (e) {
 		console.log(e);

src/components/OrderDetail/index.vue

@@ -303,7 +303,7 @@
 							<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" v-if="state.ruleForm.sendBackOpinion">
 								<el-form-item label="退回意见" class="formatted-text"> {{ state.ruleForm.sendBackOpinion }} </el-form-item>
 							</el-col>
-							<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" v-if="state.ruleForm.reTransactNum">
+							<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" v-if="state.ruleForm.isReTransact && ['ZiGong','LuZhou'].includes(themeConfig.appScope)">
 								<el-form-item label="市件重办"> <span class="color-danger">不满意重办：经12345回访，要求该工单进行重办</span></el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" v-if="state.ruleForm.sendBackRefuseOpinion">

src/views/todo/seats/accept/ybAccept.vue

@@ -1370,7 +1370,6 @@ const handleBeforeUnload = (event: any) => {
 	event.returnValue = ''; // 对于某些浏览器，设置 returnValue
 };
 onMounted(async () => {
-	console.log(state.ruleForm,voiceAssistantRef.value, '查询历史工单')
 	await loadForm();
 	state.tagsViewList = await Session.get('tagsViewList');
 	window.addEventListener('beforeunload', handleBeforeUnload);