Merge branch 'release' into dev

src/views/business/discern/ZGApply.vue

@@ -63,7 +63,7 @@
 					<vxe-column type="checkbox" width="50" align="center"></vxe-column>
 					<vxe-column field="screenByEndTime" title="截止申请日期" width="160">
 						<template #default="{ row }">
-							{{ formatDate(row.order?.screenByEndTime, 'YYYY-mm-dd HH:MM:SS') }}
+							{{ formatDate(row.screenByEndTime, 'YYYY-mm-dd HH:MM:SS') }}
 						</template>
 					</vxe-column>
 					<vxe-column field="screenSendBackText" title="甄别退回" width="90"></vxe-column>

src/views/business/visit/dpSatisfied.vue

@@ -153,6 +153,9 @@
 				<el-form-item label="热点分类" prop="Hotspot">
 					<el-input v-model="state.queryParams.Hotspot" placeholder="热点分类名称" clearable @keyup.enter="handleQuery" />
 				</el-form-item>
+				<el-form-item label="一级部门" prop="LevelOneOrg">
+					<el-input v-model="state.queryParams.LevelOneOrg" placeholder="一级部门" clearable @keyup.enter="handleQuery" />
+				</el-form-item>
 				<el-form-item label="回访部门" prop="OrgId">
 					<el-cascader
 						:options="state.orgsOptions"
@@ -237,6 +240,7 @@ const state = reactive<any>({
 		TypeCode: 0,
 		SortField: null,
 		SortRule: null,
+		LevelOneOrg:null,
 	},
 	tableData: [], //表单
 	loading: false, // 加载