Forráskód Böngészése

reactor:班长特提带出上一次办理用户;

zhangchong 1 éve
szülő
commit
b6dcfa3043

+ 5 - 1
src/components/TextTooltip/index.vue

@@ -9,7 +9,7 @@
 			<!-- 此处的默认值先看tooltipContent有没有,没有就给默认content -->
 			<slot name="tooltipContent">{{ props.tooltipContent ? props.tooltipContent : props.content }}</slot>
 		</template>
-		<div class="content" @mouseover="isShowTooltip">
+		<div class="content" @mouseover="isShowTooltip"  :class="props.className">
 			<span ref="contentRef">
 				<!-- 给一个没有写插槽的默认值,兼容纯文本的情况 -->
 				<slot name="content">{{ props.content }}</slot>
@@ -37,6 +37,10 @@ const props = defineProps({
 		type: String,
 		default: 'right',
 	},
+  className: {
+    type: String,
+    default: ''
+  }
 });
 // 使用isShow来控制tooltip是否显示
 let isShow = ref<boolean>(true);

+ 11 - 8
src/stores/userInfo.ts

@@ -24,6 +24,7 @@ export const useUserInfo = defineStore('userInfo', {
 			orgName:'', // 组织名称
 			roles: [], // 角色
 			isCenter: false, // 当前本部门是否是中心
+			monitor: false, // 是否是班长
 		},
 	}),
 	actions: {
@@ -38,17 +39,18 @@ export const useUserInfo = defineStore('userInfo', {
 			try {
 				// 个人信息
 				let userInfo: any = await getUserInfo();
-				this.userInfos.name = userInfo.result.name ?? '暂无名称';
-				this.userInfos.account = userInfo.result.account ?? '';
-				this.userInfos.phoneNo = userInfo.result.phoneNo ?? '';
-				this.userInfos.staffNo = userInfo.result.staffNo ?? '';
+				this.userInfos.name = userInfo.result?.user.name ?? '暂无名称';
+				this.userInfos.account = userInfo.result?.user.account ?? '';
+				this.userInfos.phoneNo = userInfo.result?.user.phoneNo ?? '';
+				this.userInfos.staffNo = userInfo.result?.user.staffNo ?? '';
 				this.userInfos.defaultTelNo = userInfo.result.defaultTelNo ?? '';
-				this.userInfos.id = userInfo.result.id ?? '';
-				this.userInfos.roles = userInfo.result.roles ?? [];
+				this.userInfos.id = userInfo.result?.user.id ?? '';
+				this.userInfos.roles = userInfo.result?.user.roles ?? [];
 				this.userInfos.token = Cookie.get('token') ?? '';
 				this.userInfos.photo = "";
-				this.userInfos.orgName = userInfo.result.organization?.name ?? '';
-				this.userInfos.isCenter = userInfo.result.organization?.isCenter ?? false;
+				this.userInfos.orgName = userInfo.result?.user.organization?.name ?? '';
+				this.userInfos.isCenter = userInfo.result?.user.organization?.isCenter ?? false;
+				this.userInfos.monitor = userInfo.result?.monitor ?? false;
 				//授权按钮
 				this.userInfos.showTelControl = buttons.includes('public:seat:panel'); // 查询是否有展示面板权限
 				this.userInfos.authBtnList = buttons;
@@ -77,6 +79,7 @@ export const useUserInfo = defineStore('userInfo', {
 					orgName:'', // 组织名称
 					roles: [], // 角色
 					isCenter: false, // 当前部门是否是中心
+					monitor: false, // 是否是班长
 				}
 				Session.set('userInfo', this.userInfos);
 				return this.userInfos;

+ 1 - 0
src/types/pinia.d.ts

@@ -18,6 +18,7 @@ declare interface UserInfosState {
 	roles: string[];
 	account: string;
 	isCenter: boolean;
+	monitor: boolean;
 }
 declare interface UserInfosStates {
 	userInfos: UserInfosState;

+ 5 - 1
src/views/business/special/components/Special-apply-order.vue

@@ -182,7 +182,11 @@ const selectTrace = (val: any, choose?) => {
 		}
 	}
 	state.ruleForm.flowDirection = step?.flowDirection;
-	console.log(step.handler);
+	const isBanzhang = userInfos.value?.monitor; // 判断当前用户是否是班长
+	const withHandler = stepsItems.value.find((item) => item.value.key === step.handler?.key); // 判断当前节点是否有之前选择的用户
+	if (isBanzhang && withHandler) {
+		state.ruleForm.nextHandlers = [step.handler];
+	}
 	queryHandleTime();
 };
 // 查询办理时限

+ 4 - 4
src/views/judicial/order/index.vue

@@ -361,6 +361,9 @@
 				<template #title="{ row }">
 					<order-detail :order="row" @updateList="queryList">{{ row.title }}</order-detail>
 				</template>
+        <template #isTheClueTrue="{row}">
+          <span>{{ row.isTheClueTrue !== null ? (row.isTheClueTrue ? '是' : '否') : '' }}</span>
+        </template>
 				<template #employeeName="{ row }">
 					<span
 						>{{ row.acceptorName }} <span v-if="row.acceptorStaffNo">[{{ row.acceptorStaffNo }}]</span>
@@ -535,10 +538,7 @@ const columns = ref<any[]>([
 	{
 		prop: 'isTheClueTrue',
 		label: '线索是否属实',
-		width: 120,
-		render: (scope) => {
-			return <span>{scope.row.isTheClueTrue ? '属实' : '不属实'}</span>;
-		},
+		width: 120
 	},
 	{ prop: 'eventTypeName', label: '事项类型', width: 200 },
 	{ prop: 'operation', label: '操作', fixed: 'right', width: 180, align: 'center' },

+ 4 - 4
src/views/judicial/statistics/detailArea.vue

@@ -21,6 +21,9 @@
 				<template #title="{ row }">
 					<order-detail :order="row" @updateList="queryList">{{ row.title }}</order-detail>
 				</template>
+        <template #isTheClueTrue="{row}">
+          <span>{{ row.isTheClueTrue !== null ? (row.isTheClueTrue ? '是' : '否') : '' }}</span>
+        </template>
 				<template #employeeName="{ row }">
 					<span
 						>{{ row.acceptorName }} <span v-if="row.acceptorStaffNo">[{{ row.acceptorStaffNo }}]</span>
@@ -105,10 +108,7 @@ const columns = ref<any[]>([
 	{
 		prop: 'isTheClueTrue',
 		label: '线索是否属实',
-		width: 120,
-		render: (scope) => {
-			return <span>{scope.row.isTheClueTrue ? '属实' : '不属实'}</span>;
-		},
+		width: 120
 	},
 	{ prop: 'eventTypeName', label: '事项类型', width: 200 },
 ]);

+ 4 - 4
src/views/judicial/statistics/detailDepartment.vue

@@ -18,6 +18,9 @@
 				<template #isProvince="{ row }">
 					<span>{{ row.isProvince ? '省工单' : '市工单' }}</span>
 				</template>
+        <template #isTheClueTrue="{row}">
+          <span>{{ row.isTheClueTrue !== null ? (row.isTheClueTrue ? '是' : '否') : '' }}</span>
+        </template>
 				<template #title="{ row }">
 					<order-detail :order="row" @updateList="queryList">{{ row.title }}</order-detail>
 				</template>
@@ -105,10 +108,7 @@ const columns = ref<any[]>([
 	{
 		prop: 'isTheClueTrue',
 		label: '线索是否属实',
-		width: 120,
-		render: (scope) => {
-			return <span>{scope.row.isTheClueTrue ? '属实' : '不属实'}</span>;
-		},
+		width: 120
 	},
 	{ prop: 'eventTypeName', label: '事项类型', width: 200 },
 ]);

+ 4 - 4
src/views/judicial/statistics/detailEventClass.vue

@@ -21,6 +21,9 @@
 				<template #title="{ row }">
 					<order-detail :order="row" @updateList="queryList">{{ row.title }}</order-detail>
 				</template>
+        <template #isTheClueTrue="{row}">
+          <span>{{ row.isTheClueTrue !== null ? (row.isTheClueTrue ? '是' : '否') : '' }}</span>
+        </template>
 				<template #employeeName="{ row }">
 					<span
 						>{{ row.acceptorName }} <span v-if="row.acceptorStaffNo">[{{ row.acceptorStaffNo }}]</span>
@@ -105,10 +108,7 @@ const columns = ref<any[]>([
 	{
 		prop: 'isTheClueTrue',
 		label: '线索是否属实',
-		width: 120,
-		render: (scope) => {
-			return <span>{scope.row.isTheClueTrue ? '属实' : '不属实'}</span>;
-		},
+		width: 120
 	},
 	{ prop: 'eventTypeName', label: '事项类型', width: 200 }
 ]);

+ 4 - 4
src/views/judicial/statistics/detailSatisfied.vue

@@ -22,6 +22,9 @@
 						>{{ row.acceptorName }} <span v-if="row.acceptorStaffNo">[{{ row.acceptorStaffNo }}]</span>
 					</span>
 				</template>
+        <template #isTheClueTrue="{row}">
+          <span>{{ row.isTheClueTrue !== null ? (row.isTheClueTrue ? '是' : '否') : '' }}</span>
+        </template>
 				<template #isProvince="{ row }">
 					<span>{{ row.isProvince ? '省工单' : '市工单' }}</span>
 				</template>
@@ -97,10 +100,7 @@ const columns = ref<any[]>([
 	{
 		prop: 'isTheClueTrue',
 		label: '线索是否属实',
-		width: 120,
-		render: (scope) => {
-			return <span>{scope.row.isTheClueTrue ? '属实' : '不属实'}</span>;
-		},
+		width: 120
 	},
 	{ prop: 'eventTypeName', label: '事项类型', width: 200 },
 	{ prop: 'operation', label: '操作', fixed: 'right', width: 170, align: 'center' },