Merge branch 'release' into dev

# Conflicts:
#	src/views/business/visit/components/Visit-detail.vue

src/components/ProcessAudit/index.vue

@@ -34,7 +34,7 @@
 						<el-form-item label="申请部门"> {{ userInfos.orgName }} </el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="申请时间"> {{ formatDate(Date(), 'YYYY-mm-dd HH:MM:SS') }} </el-form-item>
+						<el-form-item label="申请时间"> {{ formatDate(new Date(), 'YYYY-mm-dd HH:MM:SS') }} </el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 						<el-form-item label="当前期满时间"> {{ formatDate(state.orderDetail.expiredTime, 'YYYY-mm-dd HH:MM:SS') }} </el-form-item>
@@ -110,7 +110,7 @@
 						<el-form-item label="申请部门"> {{ userInfos.orgName }} </el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="申请时间"> {{ formatDate(Date(),'YYYY-MM-DD HH:mm:ss') }} </el-form-item>
+						<el-form-item label="申请时间"> {{ formatDate(Date(),'YYYY-mm-dd HH:MM:SS') }} </el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 						<el-form-item label="申请类型" prop="type" :rules="[{ required: true, message: '请选择申请类型', trigger: 'change' }]">
@@ -950,7 +950,7 @@ const computeTimeNext = debounce(() => {
 	state.loading = true;
 	delayCalcEndTime(request)
 		.then((res: any) => {
-			state.ruleForm.endTime = formatDate(res.result.endTime,'YYYY-MM-DD HH:mm:ss');
+			state.ruleForm.endTime = formatDate(res.result.endTime,'YYYY-mm-dd HH:MM:SS');
 			state.loading = false;
 		})
 		.catch(() => {

src/layout/navBars/breadcrumb/userNews.vue

@@ -11,7 +11,7 @@
 					<div class="content-box-msg">
 						<div class="text-ellipsis2" v-html="v.content"></div>
 					</div>
-					<div class="content-box-time">{{ formatDate(v.circularTime, 'YYYY-MM-DD HH:mm:ss') }}</div>
+					<div class="content-box-time">{{ formatDate(v.circularTime, 'YYYY-mm-dd HH:MM:SS') }}</div>
 				</div>
 			</template>
 			<el-empty description="暂无通知" v-else :image-size="120"></el-empty>

src/views/auxiliary/businessTag/index.vue

@@ -87,7 +87,7 @@ const columns = ref<any[]>([
 		label: '创建时间',
 		minWidth: 160,
 		render: (scope: any) => {
-			return <span>{formatDate(scope.row.creationTime,'YYYY-MM-DD HH:mm:ss')}</span>;
+			return <span>{formatDate(scope.row.creationTime,'YYYY-mm-dd HH:MM:SS')}</span>;
 		},
 	},
 	{ prop: 'creatorName', label: '创建人', minWidth: 120 },

src/views/auxiliary/message/index.vue

@@ -104,7 +104,7 @@ const columns = ref<any[]>([
 		label: '添加时间',
 		minWidth: 160,
 		render: (scope: any) => {
-			return formatDate(scope.row.creationTime, 'YYYY-MM-DD HH:mm:ss');
+			return formatDate(scope.row.creationTime, 'YYYY-mm-dd HH:MM:SS');
 		},
 	},
 	{
@@ -112,7 +112,7 @@ const columns = ref<any[]>([
 		label: '发送时间',
 		minWidth: 160,
 		render: (scope: any) => {
-			return scope.row.sendTime ? formatDate(scope.row.sendTime, 'YYYY-MM-DD HH:mm:ss') : '';
+			return scope.row.sendTime ? formatDate(scope.row.sendTime, 'YYYY-mm-dd HH:MM:SS') : '';
 		},
 	},
 	{ prop: 'orderNo', label: '关联工单编号', minWidth: 140 },

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

@@ -32,7 +32,7 @@
 						<el-form-item label="申请部门"> {{ state.orderDetail.creatorOrgName }} </el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="申请时间"> {{ formatDate(state.orderDetail.creationTime, 'YYYY-MM-DD HH:mm:ss') }} </el-form-item>
+						<el-form-item label="申请时间"> {{ formatDate(state.orderDetail.creationTime, 'YYYY-mm-dd HH:MM:SS') }} </el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 						<el-form-item label="当前期满时间"> {{ formatDate(state.orderDetail.beforeDelay, 'YYYY-mm-dd HH:MM:SS') }} </el-form-item>
@@ -243,7 +243,7 @@ const openDialog = async (val: any) => {
 		state.delayForm.content = result.delayReason ?? {};
 		state.delayForm.timeLimitCount = result.delayNum ?? null;
 		state.delayForm.timeLimitUnit = result.delayUnit ?? 2;
-		state.delayForm.endTime = formatDate(result.afterDelay, 'YYYY-MM-DD HH:mm:ss');
+		state.delayForm.endTime = formatDate(result.afterDelay, 'YYYY-mm-dd HH:MM:SS');
 		state.orderDetail = result;
 		state.ruleForm.files = transformFile(result.files);
 

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

@@ -31,7 +31,7 @@
 						<el-form-item label="申请部门"> {{ state.orderDetail.creatorOrgName }} </el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="申请时间"> {{ formatDate(state.orderDetail.creationTime, 'YYYY-MM-DD HH:mm:ss') }} </el-form-item>
+						<el-form-item label="申请时间"> {{ formatDate(state.orderDetail.creationTime, 'YYYY-mm-dd HH:MM:SS') }} </el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 						<el-form-item label="申请类型" prop="type" :rules="[{ required: true, message: '请选择申请类型', trigger: 'change' }]">

src/views/business/overdue/index.vue

@@ -76,6 +76,7 @@
 							{{ formatDate(row.filedTime, 'YYYY-mm-dd HH:MM:SS') }}
 						</template>
 					</vxe-column>
+					<vxe-column field="actualHandleOrgName" title="接办部门" width="140"></vxe-column>
 					<vxe-column field="orgLevelOneName" title="一级部门" width="140"></vxe-column>
 					<vxe-column field="acceptType" title="受理类型" width="100"></vxe-column>
 					<vxe-column field="counterSignTypeText" title="是否会签" width="90"></vxe-column>
@@ -139,7 +140,7 @@ const state = reactive<any>({
 		SortField: null,
 		SortRule: null,
 	},
-	tableData: [{}], //表单
+	tableData: [], //表单
 	loading: false, // 加载
 	total: 0, // 总数
 });

src/views/business/overdue/soon.vue

@@ -71,11 +71,7 @@
 							{{ formatDate(row.expiredTime, 'YYYY-mm-dd HH:MM:SS') }}
 						</template>
 					</vxe-column>
-					<vxe-column field="filedTime" title="办结时间" sortable width="160">
-						<template #default="{ row }">
-							{{ formatDate(row.filedTime, 'YYYY-mm-dd HH:MM:SS') }}
-						</template>
-					</vxe-column>
+					<vxe-column field="actualHandleOrgName" title="接办部门" width="140"></vxe-column>
 					<vxe-column field="orgLevelOneName" title="一级部门" width="140"></vxe-column>
 					<vxe-column field="acceptType" title="受理类型" width="100"></vxe-column>
 					<vxe-column field="counterSignTypeText" title="是否会签" width="90"></vxe-column>
@@ -143,7 +139,7 @@ const state = reactive<any>({
 		SortField: null,
 		SortRule: null,
 	},
-	tableData: [{}], //表单
+	tableData: [], //表单
 	loading: false, // 加载
 	total: 0, // 总数
 });
@@ -180,7 +176,8 @@ const queryList = (isQuery: boolean = false) => {
 	state.loading = true;
 	totalLoading.value = true;
 	requestParams.value = Other.deepClone(state.queryParams);
-	overdueSoonListFixed(state.queryParams)
+	requestParams.value.QueryIndex = queryIndex.value; // 数据批次
+	overdueSoonListFixed(requestParams.value)
 		.then((res) => {
 			if (isQuery) {
 				// 如果是查询
@@ -211,6 +208,7 @@ const queryList = (isQuery: boolean = false) => {
 		.catch((err) => {
 			console.log(err);
 			state.loading = false;
+			totalLoading.value = false;
 		});
 };
 // 交办单导出

src/views/business/publish/todo.vue

@@ -310,11 +310,13 @@ const queryList = () => {
 				state.tableData = res.result?.items ?? [];
 				state.total = res.result?.total ?? 0;
 				state.loading = false;
+				resolve(res);
 			})
 			.catch(() => {
 				state.loading = false;
+				reject();
 			});
-	})
+	});
 };
 /** 重置按钮操作 */
 const drawerRuleFormRef = ref();
@@ -406,9 +408,9 @@ const isChecked = computed(() => {
 });
 const toolbarRef = ref<RefType>();
 onMounted(() => {
-	queryList().then(()=>{
+	queryList().then(() => {
 		getBaseInfo();
-	})
+	});
 	if (tableRef.value && toolbarRef.value) {
 		tableRef.value.connect(toolbarRef.value);
 	}

src/views/business/return/components/Return-detail.vue

@@ -42,7 +42,7 @@
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 					<el-form-item label="审核时间">
-						{{ formatDate(state.ruleForm.auditTime, 'YYYY-MM-DD HH:mm:ss') }}
+						{{ formatDate(state.ruleForm.auditTime, 'YYYY-mm-dd HH:MM:SS') }}
 					</el-form-item>
 				</el-col>
 				<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">

src/views/dataShare/orderNoCallLog.vue

@@ -158,6 +158,7 @@ const queryList = (isQuery: boolean = false) => {
 	request.StartTime = state.queryParams.crTime === null ? null : state.queryParams.crTime[0];
 	request.EndTime = state.queryParams.crTime === null ? null : state.queryParams.crTime[1];
 	Reflect.deleteProperty(request, 'crTime');
+	request.QueryIndex = queryIndex.value; // 数据批次
 	getNoCallListNewFixed(request)
 		.then((res: any) => {
 			if (isQuery) {
@@ -187,6 +188,7 @@ const queryList = (isQuery: boolean = false) => {
 				});
 		})
 		.catch(() => {
+			totalLoading.value = false;
 			state.loading = false;
 		});
 };

src/views/home/components/Entrance.vue

@@ -36,7 +36,6 @@
 					<div class="entrance-list-box" v-show="state.entranceList.length">
 						<div class="entrance-list-box-item" :title="item.pageName" v-for="item in state.entranceList" :key="item.id" :data-id="item.id">
 							<SvgIcon :name="item.icon" class="my-handle" size="28px" />
-							{{ item.permissionCode }}
 							<p class="entrance-list-box-item-name text-no-wrap">{{ item.pageName }}</p>
 							<SvgIcon name="ele-RemoveFilled" class="plus-icon location" color="#ccc" size="20px" @click="removeOne(item)" />
 						</div>

src/views/todo/edit/index.vue

@@ -459,6 +459,7 @@ const queryList = (isQuery: boolean = false) => {
 			})
 			.catch(() => {
 				state.loading = false;
+				totalLoading.value = false;
 				reject();
 			});
 	});