Merge branch 'release' into dev

# Conflicts:
#	src/layout/components/main.vue
#	src/views/business/order/index.vue

src/App.vue

@@ -22,7 +22,6 @@ import setIntroduction from '@/utils/setIconfont';
 import { loginPageInfo } from '@/api/login';
 import { getImageUrl } from '@/utils/tools';
 import { useKeepALiveNames } from '@/stores/keepAliveNames';
-import { useFavicon,useDark } from '@vueuse/core';
 // 引入组件
 const LockScreen = defineAsyncComponent(() => import('@/layout/lockScreen/index.vue'));
 const SetTings = defineAsyncComponent(() => import('@/layout/navBars/breadcrumb/setings.vue'));
@@ -143,11 +142,6 @@ onMounted(() => {
 			mittBus.on('clearCache', (view: any) => {
 				clearCacheTagsView(view);
 			});
-			// 动态修改icon
-			const icon = useFavicon();
-			icon.value = themeConfig.value.faviconImage; // 更改当前左上角角标
-			const isDark = useDark();
-			isDark.value = themeConfig.value.isIsDark; // 更改暗黑模式
 			// 解决火狐拖动打开新窗口
 			document.body.ondrop = (event) => {
 				event.preventDefault();

src/components/OrderDetail/index.vue

@@ -255,6 +255,12 @@
 							<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" v-if="state.ruleForm.fileOpinion">
 								<el-form-item label="承办意见" class="formatted-text"> {{ state.ruleForm.fileOpinion }} </el-form-item>
 							</el-col>
+							<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" v-if="state.ruleForm.provinceSendBackString">
+								<el-form-item label="省件退回" class="formatted-text color-danger"> {{ state.ruleForm.provinceSendBackString }} </el-form-item>
+							</el-col>
+							<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" v-if="state.ruleForm.provinceRevokeString">
+								<el-form-item label="省件撤单" class="formatted-text  color-danger"> {{ state.ruleForm.provinceRevokeString }} </el-form-item>
+							</el-col>
 							<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>

src/views/auxiliary/eventClass/components/Event-add.vue

@@ -1,5 +1,5 @@
 <template>
-	<el-dialog title="新增事件" v-model="state.dialogVisible" width="700px" draggable @close="close">
+	<el-dialog title="新增事件" v-model="state.dialogVisible" width="700px" draggable @close="close" destroy-on-close>
 		<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="80px">
 			<el-row :gutter="10">
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">

src/views/auxiliary/eventClass/components/Event-edit.vue

@@ -1,5 +1,5 @@
 <template>
-	<el-dialog title="修改事件" v-model="state.dialogVisible" width="700px" draggable @close="close">
+	<el-dialog title="修改事件" v-model="state.dialogVisible" width="700px" draggable @close="close" destroy-on-close>
 		<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="80px" v-loading="state.loading">
 			<el-row :gutter="10">
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">

src/views/business/order/copy-index.vue

@@ -105,8 +105,8 @@
 						type="danger"
 						@click="onReturn(row)"
 						title="省工单退回"
-						v-auth="'business:order:return'"
-						v-if="row.source > 1 && row.status <= 1 && row.canSign"
+						v-auth="'business:order:return:province'"
+						v-if="row.isProvince && (row.actualHandleOrgCode === '001' || row.actualHandleOrgCode !== null || row.actualHandleOrgCode !==  '' || row.status === 0) && row.status < 300 && row.status !== 9"
 					>
 						退回</el-button
 					>

src/views/business/order/index.vue

@@ -97,8 +97,13 @@
 							type="danger"
 							@click="onReturn(row)"
 							title="省工单退回"
-							v-auth="'business:order:return'"
-							v-if="row.source > 1 && row.status <= 1 && row.canSign"
+							v-auth="'business:order:return:province'"
+							v-if="
+								row.isProvince &&
+								(row.actualHandleOrgCode === '001' || row.actualHandleOrgCode !== null || row.actualHandleOrgCode !== '' || row.status === 0) &&
+								row.status < 300 &&
+								row.status !== 9
+							"
 						>
 							退回</el-button
 						>
@@ -149,9 +154,9 @@
 											<el-checkbox value="IsSensitiveWord" border>敏感类工单</el-checkbox>
 										</el-checkbox-group>
 									</el-form-item>
-									<el-form-item>
+									<!--									<el-form-item>
 										<el-button @click="contentRetrieval"><SvgIcon name="ele-DocumentCopy" class="mr5" />内容检索</el-button>
-									</el-form-item>
+									</el-form-item>-->
 								</el-col>
 							</el-row>
 							<el-form-item label="工单标题" prop="Keyword">
@@ -200,22 +205,27 @@
 					<template #title="{ row }">
 						<order-detail :order="row" @updateList="queryList(true)">{{ row.title }}</order-detail>
 					</template>
-					<!-- 表格操作 -->
 					<template #operation="{ row }">
+						<!-- 省工单退回条件 是省工单（工单未归档且当前节点处于热线中心办理节点时）工单状态为办理中（归档之前） 9代表有退回申请 -->
 						<el-button
 							link
 							type="danger"
 							@click="onReturn(row)"
 							title="省工单退回"
-							v-auth="'business:order:return'"
-							v-if="row.source > 1 && row.status <= 1 && row.canSign"
+							v-auth="'business:order:return:province'"
+							v-if="
+								row.isProvince &&
+								(row.actualHandleOrgCode === '001' || row.actualHandleOrgCode !== null || row.actualHandleOrgCode !== '' || row.status === 0) &&
+								row.status < 300 &&
+								row.status !== 9
+							"
 						>
 							退回</el-button
 						>
 						<order-detail :order="row" @updateList="queryList(true)" />
 					</template>
 				</ProTable>
-				<div class="flex-end mt10" style="align-items: center">
+				<div class="flex-end mt20" style="align-items: center">
 					<!--					<el-button class="default-button" @click="onChangeTotal">展示总数</el-button>-->
 					<span v-loading="totalLoading" class="mr10">共 {{ totalCount }} 条</span>
 					<el-pagination
@@ -696,7 +706,6 @@ const queryList = (isQuery: boolean = false) => {
 			})
 			.catch(() => {
 				state.loading = false;
-				totalLoading.value = false;
 			});
 	}
 };
@@ -805,7 +814,7 @@ const onSearch = (formEl: FormInstance | undefined) => {
 	if (!formEl) return;
 	formEl.validate((valid: boolean) => {
 		if (!valid) return;
-		handleQuery();
+		queryList(true);
 		state.dialogVisible = false;
 	});
 };

src/views/province/order.vue

@@ -62,7 +62,7 @@
 						@click="onReturn(row)"
 						title="省工单退回"
 						v-auth="'province:order:return'"
-						v-if="row.source > 1 && row.status <= 1 && row.canSign"
+						v-if="row.isProvince && (row.actualHandleOrgCode === '001' || row.actualHandleOrgCode !== null || row.actualHandleOrgCode !==  '' || row.status === 0) && row.status < 300 && row.status !== 9"
 					>
 						退回</el-button
 					>