Merge branch 'release' into dev

src/components/OrderDetail/index.vue

@@ -304,7 +304,7 @@
 								<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-form-item label="事件重办"> <span class="color-danger">不满意重办：经12345回访，要求该工单进行重办</span></el-form-item>
+								<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">
 								<el-form-item label="退回不通过原因" label-width="120px" class="formatted-text">

src/views/business/delay/components/Delay-apply.vue

@@ -285,6 +285,7 @@ const restForm = (formEl: FormInstance | undefined) => {
 	if (!formEl) return;
 	formEl.resetFields();
 	formEl.clearValidate();
+	state.delayForm.files = [];
 };
 // 选择常用意见 填入填写框 延期
 const chooseAdviceDelay = (item: any) => {

src/views/business/discern/components/Discern-apply.vue

@@ -256,6 +256,7 @@ const restForm = (formEl: FormInstance | undefined) => {
 	if (!formEl) return;
 	formEl.resetFields();
 	formEl.clearValidate();
+	state.discernForm.files = [];
 };
 // 选择常用意见 填入填写框 甄别
 const chooseAdviceDiscern = (item: any) => {

src/views/business/discern/components/Discern-edit.vue

@@ -265,6 +265,7 @@ const restForm = (formEl: FormInstance | undefined) => {
 	if (!formEl) return;
 	formEl.resetFields();
 	formEl.clearValidate();
+	state.discernForm.files = [];
 };
 // 选择常用意见 填入填写框 甄别
 const chooseAdviceDiscern = (item: any) => {

src/views/business/discern/components/Discern-return.vue

@@ -169,6 +169,7 @@ const closeDialog = () => {
 const close = () => {
 	ruleFormRef.value?.resetFields();
 	ruleFormRef.value?.resetFields();
+	state.ruleForm.files = [];
 };
 // 提交
 const afterSubmit = (emitType?: 'updateList', showMessage?: boolean, message?: string) => {

src/views/business/repeatEvent/components/Repeat-event-edit.vue

@@ -176,7 +176,7 @@ import { formatDate } from '@/utils/formatTime';
 import dayjs from 'dayjs';
 import { ElMessage, ElMessageBox, FormInstance } from 'element-plus';
 import { removeDuplicate } from '@/utils/arrayOperation';
-import { orderList } from '@/api/business/order';
+import { orderList, orderListCount } from '@/api/business/order';
 import { repeatEventAdd, repeatEventDetail, repeatEventUpdate } from '@/api/business/repeatEvent';
 import { throttle } from '@/utils/tools';
 
@@ -294,21 +294,31 @@ const getDetail = async (row: any) => {
 };
 // 打开所有工单列表选择重复工单
 const onAddRepeatTable = () => {
-	queryListAll();
 	state.dialogVisibleAllTable = true;
+	queryListAll();
 };
 // 手动查询，将页码设置为1
 const handleQuery = () => {
 	state.queryParamsAll.PageIndex = 1;
 	queryListAll();
 };
+// 查询总数
+const getTotal = () => {
+	orderListCount(state.queryParamsAll)
+		.then((res) => {
+			state.totalAll = res.result ?? 0;
+		})
+		.catch(() => {
+		});
+};
 // 获取所有工单列表
 const queryListAll = async () => {
+	state.loading = true;
 	try {
-		state.loading = true;
 		const res = await orderList(state.queryParamsAll);
-		state.allTable = res.result.items ?? [];
-		state.totalAll = res.result.total ?? 0;
+		state.allTable = res.result ?? [];
+		console.log('allTable', state.allTable)
+		getTotal();
 		state.loading = false;
 	} catch (e) {
 		console.log(e);

src/views/business/terminate/components/Terminate-apply.vue

@@ -217,6 +217,7 @@ const restForm = (formEl: FormInstance | undefined) => {
 	if (!formEl) return;
 	formEl.resetFields();
 	formEl.clearValidate();
+	state.terminateForm.files = [];
 };
 // 选择常用意见 填入填写框 终止
 const chooseAdviceTerminate = (item: any) => {

src/views/business/terminate/components/Terminate-return.vue

@@ -159,6 +159,7 @@ const closeDialog = () => {
 const close = () => {
 	ruleFormRef.value?.resetFields();
 	ruleFormRef.value?.resetFields();
+	state.ruleForm.files = [];
 };
 // 提交
 const afterSubmit = (emitType?: 'updateList', showMessage?: boolean, message?: string) => {

src/views/business/visit/dpSatisfied.vue

@@ -322,7 +322,7 @@ const getBaseData = async () => {
 };
 // 交办单导出
 const onJbExport = () => {
-	const ids = checkTable.value.map((item: any) => item.id);
+	const ids = checkTable.value.map((item: any) => item.orderId);
 	exportAssignment(ids);
 };
 const tableRef = ref<RefType>();

src/views/dataShare/editExpire.vue

@@ -127,7 +127,7 @@
 import { defineAsyncComponent, onMounted, reactive, ref } from 'vue';
 import type { FormInstance } from 'element-plus';
 import { formatDate } from '@/utils/formatTime';
-import { orderList } from '@/api/business/order';
+import { orderList, orderListCount } from '@/api/business/order';
 import { ElMessage } from 'element-plus';
 import { editExpireTime } from '@/api/dataShare';
 
@@ -153,25 +153,35 @@ const ruleFormRef = ref<RefType>(); // 表单ref
 const handleQuery = () => {
 	state.queryParams.PageIndex = 1;
 	queryList();
+	getTotal();
 };
 /** 获取列表 */
 const queryList = () => {
 	state.loading = true;
 	orderList(state.queryParams)
 		.then((response: any) => {
-			state.tableData = response?.result.items ?? [];
-			state.total = response?.result.total;
+			state.tableData = response?.result ?? [];
 			state.loading = false;
 		})
 		.catch(() => {
 			state.loading = false;
 		});
 };
+// 查询总数
+const getTotal = () => {
+	orderListCount(state.queryParams)
+		.then((res) => {
+			state.total = res.result ?? 0;
+		})
+		.catch(() => {
+		});
+};
 /** 重置按钮操作 */
 const resetQuery = (formEl: FormInstance | undefined) => {
 	if (!formEl) return;
 	formEl.resetFields();
 	queryList();
+	getTotal();
 };
 // 修改期满时间
 const onEdit = (row: any) => {
@@ -209,6 +219,7 @@ const toolbarRef = ref<RefType>();
 const tableRef = ref<RefType>();
 onMounted(() => {
 	queryList();
+	getTotal();
 	if (tableRef.value && toolbarRef.value) {
 		tableRef.value.connect(toolbarRef.value);
 	}

src/views/statistics/department/detailSatisfied.vue

@@ -224,7 +224,7 @@ const visitDetail = (row: any) => {
 };
 // 交办单导出
 const onJbExport = () => {
-	const ids = checkTable.value.map((item: any) => item.id);
+	const ids = checkTable.value.map((item: any) => item.orderId);
 	exportAssignment(ids);
 };
 const checkTable = ref<EmptyArrayType>([]);

src/views/statistics/department/detailSatisfiedList.vue

@@ -327,7 +327,7 @@ const getBaseData = async () => {
 };
 // 交办单导出
 const onJbExport = () => {
-	const ids = checkTable.value.map((item: any) => item.id);
+	const ids = checkTable.value.map((item: any) => item.orderId);
 	exportAssignment(ids);
 };
 const checkTable = ref<EmptyArrayType>([]);

src/views/todo/edit/components/Edit-order.vue

@@ -42,7 +42,7 @@
 							class="ml8"
 							@click="recordFile(state.ruleForm)"
 							v-if="
-								['ZiGong','LuZhou'].includes(themeConfig.appScope)
+								['ZiGong', 'LuZhou'].includes(themeConfig.appScope)
 									? state.ruleForm?.recordingAbsolutePath && userInfos.isCenter
 									: state.ruleForm?.recordingAbsolutePath
 							"
@@ -478,7 +478,7 @@ const storesThemeConfig = useThemeConfig();
 const { themeConfig } = storeToRefs(storesThemeConfig);
 const storesUserInfo = useUserInfo();
 const { userInfos } = storeToRefs(storesUserInfo); // 用户信息
-const isProvinceOrder = ref(true); // 是否需要排除掉人社热点 默认是（宜宾）
+const isProvinceOrder = ref(false); // 是否需要排除掉人社热点 默认否（宜宾）
 // 查看工单详情
 const getOrderDetail = async (id: string) => {
 	state.loading = true;

src/views/todo/edit/index.vue

@@ -217,9 +217,8 @@
 import { defineAsyncComponent, onMounted, reactive, ref, onActivated, onBeforeUnmount } from 'vue';
 import type { FormInstance } from 'element-plus';
 import { defaultTimeStartEnd, shortcuts } from '@/utils/constants';
-import { exportOrder, listBaseData, orderList, orderListCount, orderListFixed } from '@/api/business/order';
+import { exportOrder, listBaseData, orderList, orderListCount } from '@/api/business/order';
 import { treeArea } from '@/api/auxiliary/area';
-import { getNeedArr } from '@/utils/tools';
 import Other from '@/utils/other';
 import mittBus from '@/utils/mitt';
 import { useRouter } from 'vue-router';

src/views/todo/order/index.vue

@@ -12,35 +12,40 @@
 							<el-form-item label="快捷查询办理" prop="IsCounterSign" v-auth="'todo:order:fastSearchHandle'">
 								<el-segmented :options="fastSearchHandle" v-model="state.queryParams.IsCounterSign" @change="handleQuery" :disabled="state.loading" />
 							</el-form-item>
-							<template	v-auth="'todo:order:fastSearch'">
-								<el-form-item
-									label="快捷查询"
-									prop="QueryType"
-									v-if="['ZiGong', 'LuZhou'].includes(themeConfig.appScope) && state.queryParams.IsHandled === 'false'"
-								>
-									<el-segmented
-										:options="[
-							{
-								value: 1,
-								label: '中心办理件',
-							},
-							{
-								value: 2,
-								label: '转单件',
-							},
-							{
-								value: 3,
-								label: '二次派发',
-							},
-						]"
-										v-model="state.queryParams.QueryType"
-										@change="handleQuery"
-										:disabled="state.loading"
-									/>
-								</el-form-item>
-							</template>
+							<el-form-item
+								label="快捷查询"
+								prop="QueryType"
+								v-auth="'todo:order:fastSearch'"
+								v-if="['ZiGong', 'LuZhou'].includes(themeConfig.appScope) && state.queryParams.IsHandled === 'false'"
+							>
+								<el-segmented
+									:options="[
+										{
+											value: 1,
+											label: '中心办理件',
+										},
+										{
+											value: 2,
+											label: '转单件',
+										},
+										{
+											value: 3,
+											label: '二次派发',
+										},
+									]"
+									v-model="state.queryParams.QueryType"
+									@change="handleQuery"
+									:disabled="state.loading"
+								/>
+							</el-form-item>
 							<el-form-item label="工单标题" prop="Keyword">
-								<el-input v-model.trim="state.queryParams.Keyword" placeholder="工单标题" clearable @keyup.enter="handleQuery" class="keyword-input" />
+								<el-input
+									v-model.trim="state.queryParams.Keyword"
+									placeholder="工单标题"
+									clearable
+									@keyup.enter="handleQuery"
+									class="keyword-input"
+								/>
 							</el-form-item>
 							<el-form-item label="工单编码" prop="No">
 								<el-input v-model.trim="state.queryParams.No" placeholder="工单编码" clearable @keyup.enter="handleQuery" class="keyword-input" />
@@ -53,7 +58,7 @@
 					</template>
 					<template #toolbar_buttons>
 						<el-button type="primary" @click="onJbExport" :disabled="isChecked" :loading="state.loading" v-auth="'todo:order:jbdExport'"
-						><SvgIcon name="iconfont icon-daochu" class="mr5" />交办单导出<span v-if="checkTable.length">({{ checkTable.length }})</span>
+							><SvgIcon name="iconfont icon-daochu" class="mr5" />交办单导出<span v-if="checkTable.length">({{ checkTable.length }})</span>
 						</el-button>
 						<el-button
 							type="primary"
@@ -61,10 +66,10 @@
 							:disabled="isChecked"
 							:loading="state.loading"
 							v-auth-all="['todo:order:fastSearch', 'todo:order:toEnd:multiple']"
-						><SvgIcon name="ele-List" class="mr5" />批量归档<span v-if="checkTable.length">({{ checkTable.length }})</span>
+							><SvgIcon name="ele-List" class="mr5" />批量归档<span v-if="checkTable.length">({{ checkTable.length }})</span>
 						</el-button>
 						<el-button type="primary" @click="onAssignOrders" :loading="state.loading" v-auth="'todo:order:assignOrders'"
-						><SvgIcon name="ele-List" class="mr5" />分配工单
+							><SvgIcon name="ele-List" class="mr5" />分配工单
 						</el-button>
 					</template>
 					<template #statusText="{ row }">
@@ -187,8 +192,8 @@ const state = reactive<any>({
 		AreaCode: null,
 		SortField: null,
 		SortRule: null,
-		CurrentStepCode:null,
-		Status:null,
+		CurrentStepCode: null,
+		Status: null,
 	},
 	tableData: [], //表单
 	loading: false, // 加载
@@ -349,8 +354,7 @@ const getTotal = () => {
 		.then((res) => {
 			state.total = res.result ?? 0;
 		})
-		.catch(() => {
-		});
+		.catch(() => {});
 };
 /** 重置按钮操作 */
 const drawerRuleFormRef = ref();

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

@@ -10,7 +10,7 @@
 			</el-button>
 		</el-form-item>
 	</el-form>
-<!--	<vxe-toolbar
+	<!--	<vxe-toolbar
 		ref="toolbarRef"
 		:loading="state.loading"
 		custom
@@ -58,11 +58,11 @@
 	/>
 </template>
 <script setup lang="ts" name="orderAcceptHistory">
-import { reactive, ref, watch, defineAsyncComponent, onMounted } from 'vue';
-import { ElTable, FormInstance } from 'element-plus';
+import { reactive, ref, defineAsyncComponent, onMounted } from 'vue';
+import { FormInstance } from 'element-plus';
 import { throttle } from '@/utils/tools';
 import { historyOrder } from '@/api/business/order';
-import { formatDate } from '@/utils/formatTime';
+import { useRoute } from 'vue-router';
 
 const pagination = defineAsyncComponent(() => import('@/components/ProTable/components/Pagination.vue')); // 分页
 const OrderDetail = defineAsyncComponent(() => import('@/components/OrderDetail/index.vue')); // 工单详情
@@ -137,6 +137,12 @@ onMounted(() => {
 		tableRef.value.connect(toolbarRef.value);
 	}
 });*/
+const route = useRoute();
+onMounted(() => {
+	if (route.query.createBy || route.query.createBy === 'tel' || route.query.createBy === 'transfer') {
+		searchHistory();
+	}
+});
 defineExpose({
 	multipleSelection,
 	searchHistory,

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

@@ -515,7 +515,7 @@
 </template>
 
 <script setup lang="ts" name="orderAccept">
-import { computed, defineAsyncComponent, onMounted, onUnmounted, reactive, ref, watch } from 'vue';
+import { computed, defineAsyncComponent, nextTick, onMounted, onUnmounted, reactive, ref, watch } from 'vue';
 import type { FormInstance } from 'element-plus';
 import { ElMessage, ElMessageBox, ElNotification } from 'element-plus';
 import { storeToRefs } from 'pinia';
@@ -1370,6 +1370,7 @@ 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);

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

@@ -80,7 +80,7 @@
 								</el-col>
 								<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
 									<el-form-item label="来电人姓名" prop="fromName" :rules="[{ required: true, message: '请填写来电人姓名', trigger: 'blur' }]">
-												<el-input v-model="state.ruleForm.fromName" placeholder="请填写来电人姓名" clearable @input="inputName"> </el-input>
+										<el-input v-model="state.ruleForm.fromName" placeholder="请填写来电人姓名" clearable @input="inputName"> </el-input>
 									</el-form-item>
 								</el-col>
 								<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
@@ -104,9 +104,9 @@
 												label="联系电话"
 												prop="contact"
 												:rules="[
-											{ required: true, message: '请填写联系电话', trigger: 'blur' },
-											{ required: true, pattern: '[^ \x20]+', trigger: 'blur', message: '联系电话不能为空' },
-										]"
+													{ required: true, message: '请填写联系电话', trigger: 'blur' },
+													{ required: true, pattern: '[^ \x20]+', trigger: 'blur', message: '联系电话不能为空' },
+												]"
 											>
 												<el-input v-model.trim="state.ruleForm.contact" placeholder="请填写联系电话" @blur="searchHistory" clearable> </el-input>
 											</el-form-item>
@@ -234,7 +234,7 @@
 												<el-col :xs="24" :sm="24" :md="24" :lg="16" :xl="16">
 													<el-input v-model="state.ruleForm.street" placeholder="请填写详细地址" clearable> </el-input>
 												</el-col>
-<!--												<el-col :xs="24" :sm="24" :md="24" :lg="7" :xl="7" :offset="1">
+												<!--												<el-col :xs="24" :sm="24" :md="24" :lg="7" :xl="7" :offset="1">
 													<el-button type="primary" link @click="selectLocation"><SvgIcon name="ele-Location" size="16px" /> 地图定位</el-button>
 												</el-col>-->
 											</el-form-item>
@@ -396,7 +396,7 @@
 					<el-card shadow="never">
 						<el-tabs v-model="rightBottomActive" @tab-change="handleRightBottom" stretch>
 							<el-tab-pane label="知识库" name="knowledge">
-								<Knowledge ref="knowledgeRef" :formData="state.ruleForm"/>
+								<Knowledge ref="knowledgeRef" :formData="state.ruleForm" />
 							</el-tab-pane>
 							<el-tab-pane label="预案库" name="aa"> </el-tab-pane>
 						</el-tabs>
@@ -413,9 +413,9 @@
 		<!-- 重复工单选择 -->
 		<order-repeat-select ref="orderRepeatSelectRef" @orderRepeatSuccess="orderRepeatSuccess" />
 		<!--  自贡流程办理  -->
-		<z-g-process ref="zgProcessRef" @orderProcessSuccess="onCancel"/>
+		<z-g-process ref="zgProcessRef" @orderProcessSuccess="onCancel" />
 		<!--  泸州流程办理  -->
-		<l-z-process ref="lzProcessRef" @orderProcessSuccess="onCancel"/>
+		<l-z-process ref="lzProcessRef" @orderProcessSuccess="onCancel" />
 	</div>
 </template>
 
@@ -507,10 +507,11 @@ const state = reactive<any>({
 		orderPushTypes: [], // 推送分类多选
 		acceptType: '咨询', // 受理类型
 		acceptTypeCode: '10', // 受理类型code
-		acceptTypeObj:{ // 默认咨询
+		acceptTypeObj: {
+			// 默认咨询
 			dicDataValue: '10',
-			dicDataName:'咨询',
-		}
+			dicDataName: '咨询',
+		},
 	},
 	formLoading: false, // 表单加载状态
 	hotspotExternal: [], // 热点分类外部数据
@@ -808,9 +809,9 @@ const saveExpandForm = (val: any) => {
 	state.ruleForm.orderExtension = val;
 };
 // 受理内容失去焦点查询知识库
-const blurContent = ()=>{
+const blurContent = () => {
 	knowledgeRef.value.knowledgeRetrievalPaged();
-}
+};
 // 选择重点关注事项
 const changeFocusEvent = (val: string[]) => {
 	state.ruleForm.isUrgent = val.includes('0'); // 是否紧急工单
@@ -820,9 +821,12 @@ const changeFocusEvent = (val: string[]) => {
 	state.ruleForm.is24HoursComplete = val.includes('4'); // 24小时紧急工单
 	state.ruleForm.acceptSms = val.includes('5'); // 受理短信
 	state.ruleForm.isThreePartyConference = val.includes('6'); // 三方通话
-	state.ruleForm.isSecret =  val.includes('99'); // 是否保密
-	state.ruleForm.focusOnEvents = val.join(',');  // 获取值
-	state.ruleForm.focusOnEventsName  = state.focusOnEvents.filter((item: any) => val.includes(item.dicDataValue)).map((item: any) => item.dicDataName).join(',');
+	state.ruleForm.isSecret = val.includes('99'); // 是否保密
+	state.ruleForm.focusOnEvents = val.join(','); // 获取值
+	state.ruleForm.focusOnEventsName = state.focusOnEvents
+		.filter((item: any) => val.includes(item.dicDataValue))
+		.map((item: any) => item.dicDataName)
+		.join(',');
 	console.log(
 		`是否紧急工单:${val.includes('0')},是否行政执法类类工单:${val.includes('2')},是否形式主义工单:${val.includes('1')},是否敏感类工单:${val.includes(
 			'3'
@@ -925,7 +929,7 @@ const zgProcessRef = ref<RefType>();
 const lzProcessRef = ref<RefType>();
 const processOrder = (orderDetail: any, isAgent = false) => {
 	buttonLoading.value = false;
-	if(['ZiGong'].includes(themeConfig.value.appScope)){
+	if (['ZiGong'].includes(themeConfig.value.appScope)) {
 		if (isAgent) {
 			// 代办
 			const params = {
@@ -970,7 +974,7 @@ const processOrder = (orderDetail: any, isAgent = false) => {
 				zgProcessRef.value.openDialog(params);
 			}
 		}
-	}else if(['LuZhou'].includes(themeConfig.value.appScope)){
+	} else if (['LuZhou'].includes(themeConfig.value.appScope)) {
 		if (isAgent) {
 			// 代办
 			const params = {
@@ -1016,7 +1020,6 @@ const processOrder = (orderDetail: any, isAgent = false) => {
 			}
 		}
 	}
-
 };
 const handleForm = (orderDetail: any, isAgent = false) => {
 	if (orderDetail.orderExtension?.orderTypeCode) {
@@ -1094,7 +1097,7 @@ const loadBaseData = async () => {
 		state.licenceTypeOptions = result?.licenceTypeOptions ?? [];
 		state.transpondCity = result?.transpondCity ?? [];
 		state.focusOnEvents = result?.focusOnEvents ?? [];
-		state.focusOnEvents.unshift({dicDataName: '保密', dicDataValue: '99'})
+		state.focusOnEvents.unshift({ dicDataName: '保密', dicDataValue: '99' });
 		state.orderTags = result?.orderTags ?? [];
 		state.pushTypeOptions = state.pushTypeOptions.map((item: any) => {
 			return {
@@ -1130,7 +1133,7 @@ const loadForm = async () => {
 				const isNumberIdentityType = parseInt(<string>route.query.identityType);
 				if ([1, 2].includes(isNumberIdentityType)) {
 					// 按键接收（2：市民 1：企业） 默认市民
-					if(isNumberIdentityType == 2) state.ruleForm.identityType = 1;
+					if (isNumberIdentityType == 2) state.ruleForm.identityType = 1;
 					else state.ruleForm.identityType = 2;
 				} else {
 					state.ruleForm.identityType = 1;
@@ -1281,9 +1284,9 @@ onUnmounted(() => {
 });
 </script>
 <style lang="scss" scoped>
-.check-group{
-	:deep(.el-checkbox){
+.check-group {
+	:deep(.el-checkbox) {
 		margin-right: 10px;
 	}
 }
-</style>
+</style>