Sfoglia il codice sorgente

reactor:工单受理调整到工单作息待办内

zhangchong 1 anno fa
parent
commit
33239c9e0e

+ 12 - 5
src/views/auxiliary/notice/detail.vue

@@ -99,11 +99,21 @@
 			<el-button
 				type="primary"
 				@click="onAudit"
-				title="审批通知公告"
-				v-if="(state.ruleForm?.circularState == 1 || state.ruleForm?.bulletinState == 1) && isAudit"
+				title="通知审批"
+				v-if="state.ruleForm?.circularState == 1 && ['通知审批'].includes(noticeType.value)"
+        v-auth="'auxiliary:notice:audit'"
 			>
 				审批
 			</el-button>
+      <el-button
+          type="primary"
+          @click="onAudit"
+          title="公告审批"
+          v-if="state.ruleForm?.bulletinState == 1 && ['公告审批'].includes(noticeType.value)"
+          v-auth="'auxiliary:bulletin:audit'"
+      >
+        审批
+      </el-button>
 		</el-card>
 		<el-dialog v-model="state.dialogVisible" width="500px" draggable :title="noticeType" @close="close">
 			<el-form :model="state.examineForm" label-width="110px" ref="examineFormRef">
@@ -178,9 +188,6 @@ const getDetail = async (id: string | string[]) => {
 		console.log(error);
 	}
 };
-const isAudit = computed(() => {
-	return ['通知审批', '公告审批'].includes(noticeType.value);
-});
 const route = useRoute();
 const onAudit = () => {
 	state.dialogVisible = true;

+ 4 - 4
src/views/auxiliary/notice/index.vue

@@ -148,10 +148,10 @@
 				<el-table-column label="操作" width="200" fixed="right" align="center">
 					<template #default="{ row }">
 						<template v-if="listType === '0'">
-							<el-button link type="primary" @click="onEdit(row, '0')" v-if="[0, 3].includes(row.circularState)" v-auth="'auxiliary:notice:edit'">
+							<el-button link type="primary" @click="onEdit(row, '0')" v-if="[0, 3].includes(row.circularState)" v-auth="'auxiliary:bulletin:edit'">
 								编辑
 							</el-button>
-							<el-button link type="danger" @click="onDelete(row, '0')" v-if="[0].includes(row.circularState)" v-auth="'auxiliary:notice:delete'">
+							<el-button link type="danger" @click="onDelete(row, '0')" v-if="[0].includes(row.circularState)" v-auth="'auxiliary:bulletin:delete'">
 								删除
 							</el-button>
 							<el-button
@@ -160,11 +160,11 @@
 								@click="onCommit(row, '0')"
 								v-if="[0, 3].includes(row.circularState)"
 								title="提交审批"
-								v-auth="'auxiliary:notice:commit'"
+								v-auth="'auxiliary:bulletin:commit'"
 							>
 								提交
 							</el-button>
-							<el-button link type="primary" @click="onDetail(row, '0')" v-auth="'auxiliary:notice:detail'" v-if="[1, 2].includes(row.circularState)">
+							<el-button link type="primary" @click="onDetail(row, '0')" v-auth="'auxiliary:bulletin:detail'" v-if="[1, 2].includes(row.circularState)">
 								查看详情
 							</el-button>
 						</template>

+ 0 - 0
src/views/todo/order/accept/Citizen-portrait.vue → src/views/todo/seats/accept/Citizen-portrait.vue


+ 0 - 0
src/views/todo/order/accept/Company-search.vue → src/views/todo/seats/accept/Company-search.vue


+ 0 - 0
src/views/todo/order/accept/Expand-form.vue → src/views/todo/seats/accept/Expand-form.vue


+ 0 - 0
src/views/todo/order/accept/History.vue → src/views/todo/seats/accept/History.vue


+ 0 - 0
src/views/todo/order/accept/Knowledge.vue → src/views/todo/seats/accept/Knowledge.vue


+ 0 - 0
src/views/todo/order/accept/Map-Dialog.vue → src/views/todo/seats/accept/Map-Dialog.vue


+ 0 - 0
src/views/todo/order/accept/Map-select.vue → src/views/todo/seats/accept/Map-select.vue


+ 0 - 0
src/views/todo/order/accept/Repeat-event.vue → src/views/todo/seats/accept/Repeat-event.vue


+ 0 - 0
src/views/todo/order/accept/Voice-assistant.vue → src/views/todo/seats/accept/Voice-assistant.vue


+ 8 - 8
src/views/todo/order/accept/index.vue → src/views/todo/seats/accept/index.vue

@@ -514,18 +514,18 @@ import { orderRepeatEvent } from '/@/api/business/repeatEvent';
 import { removeDuplicate } from '/@/utils/arrayOperation';
 
 // 引入组件
-const Knowledge = defineAsyncComponent(() => import('/@/views/todo/order/accept/Knowledge.vue')); // 知识库
-const HistoryOrder = defineAsyncComponent(() => import('/@/views/todo/order/accept/History.vue')); // 历史工单
-const RepeatEvent = defineAsyncComponent(() => import('/@/views/todo/order/accept/Repeat-event.vue')); // 重复事件
-const VoiceAssistant = defineAsyncComponent(() => import('/@/views/todo/order/accept/Voice-assistant.vue')); // 重复事件
-const CitizenPortrait = defineAsyncComponent(() => import('/@/views/todo/order/accept/Citizen-portrait.vue')); // 市民坏画像
-const ExpandForm = defineAsyncComponent(() => import('/@/views/todo/order/accept/Expand-form.vue')); // 拓展表单
+const Knowledge = defineAsyncComponent(() => import('/@/views/todo/seats/accept/Knowledge.vue')); // 知识库
+const HistoryOrder = defineAsyncComponent(() => import('/@/views/todo/seats/accept/History.vue')); // 历史工单
+const RepeatEvent = defineAsyncComponent(() => import('/@/views/todo/seats/accept/Repeat-event.vue')); // 重复事件
+const VoiceAssistant = defineAsyncComponent(() => import('/@/views/todo/seats/accept/Voice-assistant.vue')); // 重复事件
+const CitizenPortrait = defineAsyncComponent(() => import('/@/views/todo/seats/accept/Citizen-portrait.vue')); // 市民坏画像
+const ExpandForm = defineAsyncComponent(() => import('/@/views/todo/seats/accept/Expand-form.vue')); // 拓展表单
 const OrderHistory = defineAsyncComponent(() => import('/@/views/business/order/components/Order-history.vue')); // 历史工单弹窗列表
 const CommonAdvice = defineAsyncComponent(() => import('/@/components/CommonAdvice/index.vue')); // 常用意见
 const AnnexList = defineAsyncComponent(() => import('/@/components/AnnexList/index.vue')); // 附件列表
 const ProcessAudit = defineAsyncComponent(() => import('/@/components/ProcessAudit/index.vue')); // 流程审批
-const MapDialog = defineAsyncComponent(() => import('/@/views/todo/order/accept/Map-Dialog.vue')); // 地图定位
-const CompanySearch = defineAsyncComponent(() => import('/@/views/todo/order/accept/Company-search.vue')); // 企业搜索
+const MapDialog = defineAsyncComponent(() => import('/@/views/todo/seats/accept/Map-Dialog.vue')); // 地图定位
+const CompanySearch = defineAsyncComponent(() => import('/@/views/todo/seats/accept/Company-search.vue')); // 企业搜索
 // 定义变量内容
 const state = reactive<any>({
 	createBy: 'manual', // 工单创建方式 默认手动创建  tel:来电弹单  letter:互联网来信 默认表示手动创建