Explorar o código

reactor:特提调整;

zhangchong hai 1 ano
pai
achega
3b17788945

+ 1 - 1
src/components/LogicFlow/index.vue

@@ -344,7 +344,7 @@ const closePage = () => {
 	mittBus.emit('onCurrentContextmenuClick', Object.assign({}, { contextMenuClickId: 1, ...route }));
 	mittBus.emit('clearCache', 'systemWorkflow');
 	if (!router.hasRoute('systemWorkflow')) {
-		ElMessage.warning('未找到流程模板列表页面');
+		ElMessage.warning('当前用户未配置流程模板列表页面');
 		return;
 	}
 	router.push({

+ 1 - 1
src/layout/navBars/breadcrumb/userNews.vue

@@ -50,7 +50,7 @@ const getNumAndList = async () => {
 const router = useRouter();
 const linkNews = (v: any) => {
 	if (!router.hasRoute('auxiliaryNoticeRead')) {
-		ElMessage.warning('未找到通知详情页面');
+		ElMessage.warning('当前用户未配置通知详情页面');
 		return;
 	}
 	emit('hideNws');

+ 1 - 1
src/views/auxiliary/notice/detail.vue

@@ -187,7 +187,7 @@ const closePage = () => {
 		});
 	} else if (noticeType.value === '公告详情') {
 		if (!router.hasRoute('auxiliaryNotice')) {
-			ElMessage.warning('未找到公告详情页面');
+			ElMessage.warning('当前用户未配置公告详情页面');
 			return;
 		}
 		router.push({

+ 4 - 0
src/views/business/order/index.vue

@@ -595,6 +595,10 @@ const onCreateRepeatEvent = () => {
 };
 // 编辑工单
 const onOrderEdit = (row: any) => {
+	if (!router.hasRoute('orderAccept')) {
+		ElMessage.warning('当前用户未配置工单受理页面');
+		return;
+	}
 	router.push({
 		name: 'orderAccept',
 		params: {

+ 4 - 3
src/views/business/special/components/Special-audit.vue

@@ -126,7 +126,7 @@ import { useUserInfo } from '@/stores/userInfo';
 import { formatDate } from '@/utils/formatTime';
 import { specialApplyBase, specialApprove, specialDetail } from '@/api/business/special';
 import { transformFile } from '@/utils/tools';
-import {orderTimeConfig} from "@/api/business/order";
+import { orderTimeConfig } from '@/api/business/order';
 
 // 引入组件
 const AnnexList = defineAsyncComponent(() => import('@/components/AnnexList/index.vue'));
@@ -171,6 +171,7 @@ const openDialog = async (val: any) => {
 		state.ruleForm.nextStepName = detailRes.result.nextStepName;
 		selectTrace(detailRes.result.nextStepCode);
 		state.ruleForm.nextHandlers = detailRes.result.nextHandlers;
+    state.ruleForm.alterTime = detailRes.result.alterTime;
 	} catch (e) {
 		console.log(e);
 	} finally {
@@ -209,10 +210,10 @@ const selectTrace = (val: any) => {
 const queryHandleTime = () => {
 	if (state.ruleForm.alterTime) return;
 	state.loading = true;
-  orderTimeConfig({ acceptTypeCode: state.detail.order?.acceptTypeCode, FlowDirection: state.ruleForm.flowDirection })
+	orderTimeConfig({ acceptTypeCode: state.detail.order?.acceptTypeCode, FlowDirection: state.ruleForm.flowDirection })
 		.then((res) => {
 			state.ruleForm.timeLimit = res.result.count ?? 0; // 办理时限
-      state.ruleForm.timeLimitUnit = res.result.timeType ?? ''; // 办理时限单位
+			state.ruleForm.timeLimitUnit = res.result.timeType ?? ''; // 办理时限单位
 		})
 		.finally(() => {
 			state.loading = false;

+ 2 - 2
src/views/home/component/Notice.vue

@@ -73,7 +73,7 @@ const goLink = (item: any) => {
 	switch (activeName.value) {
 		case '0':
 			if (!router.hasRoute('knowledgePreview')) {
-				ElMessage.warning('未找到知识查看页面');
+				ElMessage.warning('当前用户未配置知识查看页面');
 				return;
 			}
 			router.push({
@@ -86,7 +86,7 @@ const goLink = (item: any) => {
 			break;
 		case '1':
 			if (!router.hasRoute('auxiliaryNoticeRead')) {
-				ElMessage.warning('未找到公告详情页面');
+				ElMessage.warning('当前用户未配置公告详情页面');
 				return;
 			}
 			router.push({

+ 1 - 1
src/views/home/component/ToDo.vue

@@ -190,7 +190,7 @@ const linkList = () => {
 // 编辑工单
 const onOrderEdit = (row: any) => {
 	if (!router.hasRoute('orderAccept')) {
-		ElMessage.warning('未找到工单受理页面');
+		ElMessage.warning('当前用户未配置工单受理页面');
 		return;
 	}
 	router.push({

+ 1 - 1
src/views/knowledge/index/edit.vue

@@ -377,7 +377,7 @@ const onPreview = () => {
 	}
 	Local.set('previewForm', state.ruleForm);
 	if (!router.hasRoute('knowledgePreview')) {
-		ElMessage.warning('未找到知识预览页面');
+		ElMessage.warning('当前用户未配置知识预览页面');
 		return;
 	}
 	router.push({

+ 3 - 3
src/views/knowledge/index/index.vue

@@ -443,7 +443,7 @@ const resetNode = () => {
 // 新增知识
 const onOpenAddUser = () => {
 	if (!router.hasRoute('knowledgeEdit')) {
-		ElMessage.warning('未找到新增知识页面');
+		ElMessage.warning('当前用户未配置新增知识页面');
 		return;
 	}
 	router.push({
@@ -456,7 +456,7 @@ const onOpenAddUser = () => {
 // 修改知识
 const onEdit = (row: any) => {
 	if (!router.hasRoute('knowledgeEdit')) {
-		ElMessage.warning('未找到知识编辑页面');
+		ElMessage.warning('当前用户未配置知识编辑页面');
 		return;
 	}
 	router.push({
@@ -470,7 +470,7 @@ const onEdit = (row: any) => {
 // 预览
 const onPreview = (row: any) => {
 	if (!router.hasRoute('knowledgePreview')) {
-		ElMessage.warning('未找到知识查看页面');
+		ElMessage.warning('当前用户未配置知识查看页面');
 		return;
 	}
 	router.push({

+ 1 - 1
src/views/knowledge/index/preview.vue

@@ -138,7 +138,7 @@ const onQuestion = () => {
 const router = useRouter();
 const onPreview = (row: any) => {
 	if (!router.hasRoute('knowledgePreview')) {
-		ElMessage.warning('未找到知识查看页面');
+		ElMessage.warning('当前用户未配置知识查看页面');
 		return;
 	}
 	router.push({

+ 2 - 2
src/views/knowledge/question/index.vue

@@ -145,7 +145,7 @@ const onReply = (row: any) => {
 const router = useRouter();
 const onPreview = (row: any) => {
 	if (!router.hasRoute('knowledgePreview')) {
-		ElMessage.warning('未找到知识详情页面');
+		ElMessage.warning('当前用户未配置知识详情页面');
 		return;
 	}
 	router.push({
@@ -159,7 +159,7 @@ const onPreview = (row: any) => {
 // 编辑
 const onEdit = (row: any) => {
 	if (!router.hasRoute('knowledgeEdit')) {
-		ElMessage.warning('未找到编辑知识页面');
+		ElMessage.warning('当前用户未配置编辑知识页面');
 		return;
 	}
 	router.push({

+ 1 - 1
src/views/knowledge/retrieval/index.vue

@@ -339,7 +339,7 @@ const handleNodeClick = (data: any) => {
 // 预览
 const onPreview = (row: any) => {
 	if (!router.hasRoute('knowledgePreview')) {
-		ElMessage.warning('未找到知识查看页面');
+		ElMessage.warning('当前用户未配置知识查看页面');
 		return;
 	}
 	router.push({

+ 2 - 2
src/views/system/config/workflow/index.vue

@@ -256,7 +256,7 @@ const handleClick = () => {
 // 新增模板
 const onAddTemp = () => {
 	if (!router.hasRoute('workflowAddEdit')) {
-		ElMessage.warning('未找到新增流程模板页面');
+		ElMessage.warning('当前用户未配置新增流程模板页面');
 		return;
 	}
 	router.push({
@@ -269,7 +269,7 @@ const onAddTemp = () => {
 // 修改模板
 const onEditTemp = (row: any) => {
 	if (!router.hasRoute('workflowAddEdit')) {
-		ElMessage.warning('未找到流程编辑页面');
+		ElMessage.warning('当前用户未配置流程编辑页面');
 		return;
 	}
 	router.push({

+ 16 - 5
src/views/system/roles/component/Role-permission.vue

@@ -1,5 +1,13 @@
 <template>
-	<el-dialog :title="`【${state.rowName}】权限配置`" v-model="state.dialogVisible" draggable @opened="opened" @close="close" append-to-body destroy-on-close>
+	<el-dialog
+		:title="`【${state.rowName}】权限配置`"
+		v-model="state.dialogVisible"
+		draggable
+		@opened="opened"
+		@close="close"
+		append-to-body
+		destroy-on-close
+	>
 		<div class="custom-tree-node-container" v-loading="state.loading">
 			<el-row :gutter="10">
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
@@ -30,14 +38,17 @@
 					ref="menuRef"
 					node-key="permissionCode"
 					check-on-click-node
-          check-strictly
+					check-strictly
 					:expand-on-click-node="false"
 					:props="{ label: 'pageName', children: 'children', class: customNodeClass }"
 					:filter-node-method="filterNode"
 				>
 					<template #default="{ data }">
-<!--						<span>{{ data.pageName }}-{{ data.permissionCode }}</span>-->
-            <span>{{ data.pageName }}</span>
+						<!--						<span>{{ data.pageName }}-{{ data.permissionCode }}</span>-->
+						<span>
+							{{ data.pageName }}
+							({{ data.menuType === 1 ? '目录' : data.menuType === 2 ? '菜单' : data.menuType === 3 ? '按钮' : ' ' }})
+						</span>
 					</template>
 				</el-tree>
 			</div>
@@ -181,7 +192,7 @@ const handleCheckedTreeNodeAll = (value: boolean) => {
 // 保存
 const onSubmit = () => {
 	let systemMenuArr = menuRef.value.getCheckedNodes(); // 获取选中
-  const halfCheck = [];
+	const halfCheck = [];
 	/*let halfCheck = menuRef.value.getHalfCheckedNodes(); // 获取半选节点
   halfCheck = halfCheck.map((v: any) => {
     return {

+ 8 - 8
src/views/todo/order/index.vue

@@ -15,12 +15,12 @@
 						<el-option label="否" value="false" />
 					</el-select>
 				</el-form-item>
-        <el-form-item label="是否会签" prop="IsCountersign">
-          <el-select v-model="state.queryParams.IsCountersign" placeholder="请选择是否会签">
-            <el-option label="是" value="true" />
-            <el-option label="否" value="false" />
-          </el-select>
-        </el-form-item>
+				<el-form-item label="是否会签" prop="IsCountersign">
+					<el-select v-model="state.queryParams.IsCountersign" placeholder="请选择是否会签">
+						<el-option label="是" value="true" />
+						<el-option label="否" value="false" />
+					</el-select>
+				</el-form-item>
 				<el-form-item>
 					<el-button type="primary" @click="queryList" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
 					<el-button @click="resetQuery(ruleFormRef)" v-waves class="default-button" :loading="state.loading">
@@ -93,7 +93,7 @@ const state = reactive({
 		IsHandled: 'false', // 工单状态
 		Keyword: null, // 关键字
 		IsProvince: null, // 是否省工单
-    IsCountersign: null, // 是否会签
+		IsCountersign: null, // 是否会签
 	},
 	tableData: [], //表单
 	loading: false, // 加载
@@ -111,7 +111,7 @@ const columns = ref<any[]>([
 	{ prop: 'actualHandleStepName', label: '办理节点', width: 150 },
 	{ prop: 'statusText', label: '工单状态', width: 100 },
 	{ prop: 'title', label: '工单标题', width: 300 },
-  { prop: 'counterSignTypeText', label: '是否会签', width: 100 },
+	{ prop: 'counterSignTypeText', label: '是否会签', width: 100 },
 	{
 		prop: 'creationTime',
 		label: '生成时间',

+ 1 - 1
src/views/todo/seats/accept/Knowledge.vue

@@ -135,7 +135,7 @@ const route = useRoute(); // 路由
 // 预览知识
 const onPreview = (row: any) => {
 	if (!router.hasRoute('knowledgePreview')) {
-		ElMessage.warning('未找到知识查看页面');
+		ElMessage.warning('当前用户未配置知识查看页面');
 		return;
 	}
 	router.push({

+ 2 - 2
src/views/todo/seats/index.vue

@@ -173,7 +173,7 @@ const resetQuery = throttle((formEl: FormInstance | undefined) => {
 // 新增工单
 const onAddOrder = () => {
 	if (!router.hasRoute('orderAccept')) {
-		ElMessage.warning('未找到工单受理页面');
+		ElMessage.warning('当前用户未配置工单受理页面');
 		return;
 	}
 	router.push({
@@ -190,7 +190,7 @@ const onExport = () => {
 // 编辑工单
 const onOrderEdit = (row: any) => {
 	if (!router.hasRoute('orderAccept')) {
-		ElMessage.warning('未找到工单受理页面');
+		ElMessage.warning('当前用户未配置工单受理页面');
 		return;
 	}
 	router.push({