reactor:用户展示所属部门展示全称;

src/components/ProTable/components/ColSetting.vue

@@ -2,7 +2,7 @@
 	<!-- 列设置 -->
 	<el-drawer v-model="drawerVisible" title="列设置" append-to-body destroy-on-close>
 		<el-table :data="colSetting" row-key="prop" default-expand-all border :tree-props="{ children: '_children' }" v-horizontal-scroll="'always'">
-			<el-table-column prop="label" align="center" label="列名" width="80"/>
+			<el-table-column prop="label" align="center" label="列名"/>
 			<el-table-column v-slot="scope" prop="isShow" align="center" label="显示" width="70">
 				<el-checkbox v-model="scope.row.isShow" @change="update"></el-checkbox>
 			</el-table-column>

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

@@ -20,6 +20,9 @@
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 					<el-form-item label="申请类型"> {{ state.ruleForm?.typeDicName }} </el-form-item>
 				</el-col>
+        <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+          <el-form-item label="发起甄别耗时"> {{ state.ruleForm?.typeDicName }} </el-form-item>
+        </el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 					<el-form-item label="是否省甄别">{{ state.ruleForm?.isProDelay ? '是' : '否' }} </el-form-item>
 				</el-col>

src/views/business/discern/todo.vue

@@ -86,7 +86,7 @@ const ruleFormRef = ref<RefType>(); // 表单ref
 const proTableRef = ref<RefType>(); // 表格ref
 // 表格配置项
 const columns = ref<any[]>([
-	{ prop: 'expiredStatus', label: '超期状态', align: 'center',fixed: 'left',width: 80 },
+	{ prop: 'expiredStatus', label: '超期状态', align: 'center', fixed: 'left', width: 80 },
 	{ prop: 'order.no', label: '工单编码', width: 150 },
 	{ prop: 'isProvince', label: '省/市工单', width: 100 },
 	{ prop: 'title', label: '工单标题', width: 300 },
@@ -130,6 +130,7 @@ const columns = ref<any[]>([
 	{ prop: 'creatorName', label: '甄别申请人', width: 120 },
 	{ prop: 'creatorOrgName', label: '甄别申请部门', width: 150 },
 	{ prop: 'typeDicName', label: '甄别申请类型', width: 120 },
+	{ prop: 'typeDicName', label: '发起甄别耗时', width: 120 },
 	{ prop: 'content', label: '甄别申请原因', width: 200 },
 	{ prop: 'operation', label: '操作', fixed: 'right', width: 160, align: 'center' },
 ]);
@@ -159,7 +160,7 @@ const handleTimeChange = (val: string[], startKey: string, endKey: string) => {
 		state.queryParams[startKey] = null;
 		state.queryParams[endKey] = null;
 	}
-  handleQuery();
+	handleQuery();
 };
 // 受理时间
 const timeStartChangeCr = (val: string[]) => {
@@ -173,8 +174,8 @@ const getBaseData = async () => {
 };
 // 手动查询，将页码设置为1
 const handleQuery = () => {
-  state.queryParams.PageIndex = 1;
-  queryList();
+	state.queryParams.PageIndex = 1;
+	queryList();
 };
 /** 获取列表 */
 const queryList = () => {
@@ -208,7 +209,7 @@ const queryList = () => {
 		.catch(() => {
 			state.loading = false;
 		});
-}
+};
 /** 重置按钮操作 */
 const resetQuery = (formEl: FormInstance | undefined) => {
 	if (!formEl) return;
@@ -216,7 +217,7 @@ const resetQuery = (formEl: FormInstance | undefined) => {
 	state.queryParams.CreationTimeStart = null;
 	state.queryParams.CreationTimeEnd = null;
 	queryList();
-}
+};
 // 导出
 const onExport = () => {
 	console.log('导出');

src/views/business/order/index.vue

@@ -715,7 +715,7 @@ const onProvinceReturn = () => {
 		cancelButtonText: '取消',
 		draggable: true,
 		autofocus: false,
-		inputPlaceholder: '请填写退回原因，不超过50字符',
+		inputPlaceholder: '请填写退回原因，不超过50个字符',
 		inputErrorMessage: '请填写退回原因',
 		inputType: 'textarea',
 		inputValidator: (value) => {

src/views/knowledge/retrieval/index.vue

@@ -206,9 +206,10 @@
                 <template v-if="topList.length">
                   <el-scrollbar>
                     <div class="flex-center-between top10-items" v-for="(item, index) in topList" :key="item.id">
-                      <p class="flex-center-align top10-items-title" @click="onPreview(item)" :title="item.title">
-                        {{ index + 1 }}.<el-text class="text-no-wrap color-primary cursor-pointer" @click="onPreview(item)" :title="item.title">
-                        {{ item.title }}
+                      <p class="flex-center-align top10-items-title" @click="onPreview(item)">
+                        {{ index + 1 }}.
+                        <el-text class="text-no-wrap color-primary cursor-pointer" @click="onPreview(item)">
+                          <TextTooltip :content="item.title" placement="top" effect="dark"/>
                       </el-text>
                       </p>
                       <span class="top10-items-num">{{ item.searchNum }}</span>
@@ -242,6 +243,7 @@ import 'splitpanes/dist/splitpanes.css';
 
 
 const pagination = defineAsyncComponent(() => import('@/components/ProTable/components/Pagination.vue')); // 分页
+const TextTooltip = defineAsyncComponent(() => import('@/components/TextTooltip/index.vue'));
 const state = reactive<any>({
 	queryParams: {
 		// 查询条件

src/views/statistics/call/seatsRecord.vue

@@ -55,7 +55,6 @@ import { onMounted, reactive, ref } from 'vue';
 import { FormInstance } from 'element-plus';
 import { callTransfer } from '@/api/statistics/call';
 import { defaultDate, shortcuts } from '@/utils/constants';
-import { formatDate } from '@/utils/formatTime';
 
 const proTableRef = ref<RefType>(); // 表格ref
 // 表格配置项

src/views/statistics/department/handle.vue

@@ -145,7 +145,6 @@ const columns = reactive<any[]>([
 					);
 				},
 			},
-			// { prop: 'b', label: '会签延期次数', align: 'center', minWidth: 120 },
 			{
 				prop: 'orderDelayRate',
 				label: '延期率',
@@ -336,14 +335,14 @@ const columns = reactive<any[]>([
 				},
 			},
 			{
-				prop: 'satisfactionCount',
+				prop: 'publishedNoOpen',
 				label: '不公开件',
 				align: 'center',
 				minWidth: 90,
 				render: (scope) => {
 					return (
 						<el-button type="primary" link onClick={() => linkDetail(scope, '14')}>
-							{scope.row.satisfactionCount}
+							{scope.row.publishedNoOpen}
 						</el-button>
 					);
 				},
@@ -535,8 +534,8 @@ const getSummaries = (param: any) => {
 			case 'publishedOpen': // 公开件
 				sums[index] = state.totalCount?.publishedOpen;
 				break;
-			case 'satisfactionCount': // 不公开件
-				sums[index] = state.totalCount?.satisfactionCount;
+			case 'publishedNoOpen': // 不公开件
+				sums[index] = state.totalCount?.publishedNoOpen;
 				break;
 			case 'screenCount': // 甄别申请总量
 				sums[index] = state.totalCount?.screenCount;
@@ -562,7 +561,7 @@ const getSummaries = (param: any) => {
 };
 // 查看详情
 const router = useRouter();
-const linkDetail = (scope, key: string) => {
+const linkDetail = (scope, key?: string) => {
 	let StartDate = null;
 	let EndDate = null;
 	if (state.queryParams?.crTime) {

src/views/system/user/component/User-add.vue

@@ -153,6 +153,7 @@ const state = reactive<any>({
 		userType: 0, // 用户类型
 		defaultTelNo: null, //默认分机
 		email: '', //邮箱
+    fullOrgName:null, // 部门全称
 		roleIds: <EmptyArrayType>[], // 角色
 	},
 });
@@ -175,6 +176,7 @@ const cascadeRef = ref<RefType>();
 const getKnowledgeList = () => {
 	let currentNode = cascadeRef.value.getCheckedNodes();
 	state.ruleForm.orgCode = currentNode[0]?.data.id ?? '';
+  state.ruleForm.fullOrgName = currentNode[0]?.text ?? '';
 };
 
 // 新增

src/views/system/user/component/User-edit.vue

@@ -57,7 +57,7 @@
 								label: 'telNo',
 								value: 'telNo',
 							}"
-              clearable
+							clearable
 						/>
 					</el-form-item>
 				</el-col>
@@ -71,13 +71,13 @@
 						<el-input v-model="state.ruleForm.staffNo" placeholder="请输入工号" clearable></el-input>
 					</el-form-item>
 				</el-col>
-        <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-          <el-form-item label="用户类型" prop="userType" :rules="[{ required: true, message: '请选择用户类型', trigger: 'change' }]">
-            <el-select v-model="state.ruleForm.userType" placeholder="请选择用户类型" class="w100">
-              <el-option v-for="item in props.baseData.userTypeOptions" :key="item.key" :label="item.value" :value="item.key" />
-            </el-select>
-          </el-form-item>
-        </el-col>
+				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+					<el-form-item label="用户类型" prop="userType" :rules="[{ required: true, message: '请选择用户类型', trigger: 'change' }]">
+						<el-select v-model="state.ruleForm.userType" placeholder="请选择用户类型" class="w100">
+							<el-option v-for="item in props.baseData.userTypeOptions" :key="item.key" :label="item.value" :value="item.key" />
+						</el-select>
+					</el-form-item>
+				</el-col>
 				<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 					<el-divider content-position="left">
 						<el-text tag="b" size="large"> 角色配置 </el-text>
@@ -123,22 +123,26 @@ import other from '@/utils/other';
 // 定义子组件向父组件传值/事件
 const emit = defineEmits(['updateList']);
 const props = defineProps<{
-  roles:{ // 角色
-    type:Array<any>,
-    default:()=>[]
-  },
-  baseOrg:{ // 组织
-    type:Array<any>,
-    default:()=>[]
-  },
-  baseData:{ // 基础数据
-    type:Array<any>,
-    default:()=>[]
-  },
-  telsList:{ // 分机
-    type:Array<any>,
-    default:()=>[]
-  },
+	roles: {
+		// 角色
+		type: Array<any>;
+		default: () => [];
+	};
+	baseOrg: {
+		// 组织
+		type: Array<any>;
+		default: () => [];
+	};
+	baseData: {
+		// 基础数据
+		type: Array<any>;
+		default: () => [];
+	};
+	telsList: {
+		// 分机
+		type: Array<any>;
+		default: () => [];
+	};
 }>();
 // 定义变量内容
 const state = reactive<any>({
@@ -151,9 +155,10 @@ const state = reactive<any>({
 		orgId: '', // 组织id
 		orgCode: '', //组织code
 		staffNo: '', //工号
-    userType:0, // 用户类型
+		userType: 0, // 用户类型
 		defaultTelNo: null, //默认分机
 		email: '', //邮箱
+		fullOrgName: null, // 部门全称
 		roleIds: <EmptyArrayType>[], // 角色
 	},
 });
@@ -174,15 +179,16 @@ const openDialog = (row: any) => {
 const closeDialog = () => {
 	state.dialogVisible = false;
 };
-const close = ()=>{
-  ruleFormRef.value?.clearValidate();
-  ruleFormRef.value?.resetFields();
-}
+const close = () => {
+	ruleFormRef.value?.clearValidate();
+	ruleFormRef.value?.resetFields();
+};
 const cascadeRef = ref<RefType>();
 // 获取选择组织name值
 const getKnowledgeList = () => {
 	let currentNode = cascadeRef.value.getCheckedNodes();
 	state.ruleForm.orgCode = currentNode[0]?.data.id ?? '';
+	state.ruleForm.fullOrgName = currentNode[0]?.text ?? '';
 };
 // 保存
 const onSubmit = throttle((formEl: FormInstance | undefined) => {

src/views/system/user/index.vue

@@ -120,7 +120,7 @@ import { computed, defineAsyncComponent, nextTick, onBeforeUnmount, onMounted, r
 import type { FormInstance } from 'element-plus';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { formatDate } from '@/utils/formatTime';
-import { delUser, getBaseData, getCanUseOrgByUser, getRoles, getUserListPaged, restPwd } from "@/api/system/user";
+import { delUser, getBaseData, getCanUseOrgByUser, getRoles, getUserListPaged, restPwd } from '@/api/system/user';
 import { getTelList } from '@/api/public/wex';
 import { Splitpanes, Pane } from 'splitpanes';
 import 'splitpanes/dist/splitpanes.css';
@@ -134,7 +134,7 @@ const proTableRef = ref<RefType>(); // 表格ref
 const columns = ref<any[]>([
 	{ prop: 'name', label: '姓名', width: 170 },
 	{ prop: 'userName', label: '账号', width: 170 },
-	{ prop: 'organization.name', label: '所属部门', width: 190 },
+	{ prop: 'fullOrgName', label: '所属部门', width: 190 },
 	{ prop: 'organization.orgTypeText', label: '部门类别', width: 190 },
 	{ prop: 'roleNames', label: '角色', width: 300 },
 	{ prop: 'phoneNo', label: '电话号码', width: 130 },
@@ -197,7 +197,7 @@ const handleQuery = () => {
 // 获取所有组织结构
 const getOrgListApi = () => {
 	state.loading = true;
-  getCanUseOrgByUser()
+	getCanUseOrgByUser()
 		.then((res: any) => {
 			state.orgData = res?.result ?? [];
 			state.loading = false;