reactor:27 派单员角色的工单待办新增选项卡;32 针对外地号码外呼时自动加0

src/components/ProTable/index.vue

@@ -1,7 +1,7 @@
 <!-- 📚📚📚 Pro-Table 文档: https://juejin.cn/post/7166068828202336263 -->
 <template>
 	<!-- 表格主体 -->
-	<div class="pro-table-main">
+	<div class="pro-table-main" :class="[$attrs.class, customClass]">
 		<!-- 搜索区域  -->
 		<div class="table-search-content">
 			<slot name="table-search" />
@@ -141,6 +141,10 @@ import { useResizeObserver, useWindowSize } from '@vueuse/core';
 
 // 接受父组件参数，配置默认值
 const props = defineProps({
+	customClass: {
+		type: String,
+		default: '',
+	},
 	columns: {
 		// 列配置项  ==> 必传
 		type: Array as PropType<ColumnProps[]>,
@@ -542,7 +546,7 @@ const exportAll = () => {
 const changeRow = ({ oldIndex, newIndex }) => {
 	// 改变表头的顺序
 	const draggedItem = tableColumns.value.splice(oldIndex, 1)[0];
-	if(draggedItem) tableColumns.value.splice(newIndex, 0, draggedItem);
+	if (draggedItem) tableColumns.value.splice(newIndex, 0, draggedItem);
 };
 watch(
 	// 监听table数据改变后重置选择

src/components/ProcessAudit/ZGProcess.vue

@@ -18,7 +18,7 @@
 		<el-form :model="state.ruleForm" label-width="110px" ref="ruleFormRef" v-loading="state.loading">
 			<slot name="header"></slot>
 			<el-row :gutter="10">
-				<el-col>
+<!--				<el-col>
 					<el-form-item label="当前选择的流程">
 						{{ seatTopaidan ? '话务部到派单组' : '' }}
 						{{ seatToOrgOne ? '话务部到一级部门' : '' }}
@@ -29,10 +29,10 @@
 						{{ orgToOrgSummary ? '部门到汇总节点' : '' }}
 						{{ orgToOrgLeader ? '部门到部门领导' : '' }}
 					</el-form-item>
-				</el-col>
-				<!-- 退回流程  v-if="isSmsSelectShow"  -->
+				</el-col>-->
+				<!-- 退回流程  -->
 				<template v-if="returnArr.includes(state.processType)">
-					<el-col :span="24">
+					<el-col v-if="isSmsSelectShow">
 						<el-form-item prop="isSms">
 							<el-checkbox v-model="state.ruleForm.isSms" label="短信通知" />
 						</el-form-item>
@@ -259,30 +259,6 @@
 										</el-form-item>
 									</el-col>
 								</template>
-
-								<!--								<el-col :span="12">
-									<el-form-item label-width="0" prop="crossOrgIdsArr" :rules="[{ required: true, message: '请选择下级部门', trigger: 'change' }]">
-										<el-cascader
-											:options="secondaryHandlers"
-											:props="{
-												multiple: true,
-												label: 'name',
-												value: 'id',
-											}"
-											collapse-tags
-											collapse-tags-tooltip
-											:max-collapse-tags="2"
-											clearable
-											placeholder="请选择下级部门"
-											v-model="state.ruleForm.crossOrgIdsArr"
-											class="w100"
-											@change="secondaryHandlersChange"
-											ref="cascaderRef"
-										>
-											<template #empty> 暂无下级部门 </template>
-										</el-cascader>
-									</el-form-item>
-								</el-col>-->
 							</el-row>
 						</el-col>
 						<el-col :span="24" v-if="state.ruleForm.orderAssignMode === 2">
@@ -534,7 +510,6 @@ import {
 } from '@/api/business/order';
 import { orderPrevious, workflowNextSteps, workflowNextStepsByOrder, workflowNextStepsByOrderInstead } from '@/api/system/workflow';
 import { useAppConfig } from '@/stores/appConfig';
-import { removeDuplicate } from '@/utils/arrayOperation';
 
 // 引入组件
 const CommonAdvice = defineAsyncComponent(() => import('@/components/CommonAdvice/index.vue')); // 常用意见
@@ -572,8 +547,6 @@ const state = reactive<any>({
 		transpondCityId: null, // 市州转办信息id
 		transpondCityValue: null, // 市州转办信息
 		orderAssignMode: 0, // 派单类型默认逐级派单
-		crossOrgIds: [], // // 跨级转派得下级办理对象/主协办得协办对象
-		crossOrgIdsArr: [], // 跨级转派得下级办理对象/主协办得协办对象
 		copyToHandlers: [], // 抄送对象
 	},
 	nextStepOptions: [], // 下一节点
@@ -727,7 +700,7 @@ const orgOneToEnd = computed(() => {
 });
 // 部门流转到部门
 const orgToOrg = computed(() => {
-	return currentParams.value.currentStepBusinessType === 2 && selectNext.value.businessType === 2;
+	return currentParams.value.currentStepBusinessType === 2 && selectNext.value.businessType === 2 && selectNext.value.stepType !== 3;
 });
 // 部门到部门汇总
 const orgToOrgSummary = computed(() => {
@@ -769,8 +742,6 @@ const restFormData = () => {
 	state.ruleForm.transpondCityName = null;
 	state.ruleForm.transpondCityId = null;
 	state.ruleForm.orderAssignMode = 0;
-	state.ruleForm.crossOrgIdsArr = [];
-	state.ruleForm.crossOrgIds = [];
 	state.ruleForm.copyToHandlers = [];
 	showOrgLevelTwo.value = false;
 	state.ruleForm.levelTwoStep = null;
@@ -858,8 +829,6 @@ const selectDispatchType = () => {
 	state.ruleForm.nextHandlers = [];
 	state.ruleForm.nextHandler = null;
 	state.ruleForm.isStartCountersign = false;
-	state.ruleForm.crossOrgIdsArr = [];
-	state.ruleForm.crossOrgIds = [];
 	showOrgLevelTwo.value = false;
 	state.ruleForm.levelTwoStep = null;
 	levelTwoStepOptions.value = [];
@@ -921,14 +890,6 @@ const getNextOrgList = async (orgCode?: string | any) => {
 		console.log(e);
 	}
 };
-// 选择下级部门
-const cascaderRef = ref<RefType>(null);
-const secondaryHandlersChange = (val: any) => {
-	// const arr = cascaderRef.value.getCheckedNodes();
-	state.ruleForm.crossOrgIds = removeDuplicate(val.flat());
-};
-// 跨级指派查询下一步可选节点及办理参数
-const getNextStepParams = async (nextStepCode: string) => {};
 // 选择办理对象
 const showOrgLevelTwo = ref(false); // 是否展示二级部门选择
 const levelTwoStepOptions = ref<EmptyArrayType>([]); // 二级部门节点
@@ -1055,6 +1016,9 @@ const selectOrgLevelTwoHandler = (val: any) => {
 			}
 		});
 	}else{
+		state.ruleForm.levelThreeHandlers = [];
+		levelThreeStepOptions.value = [];
+		levelThreeHandleOptions.value = [];
 		showOrgLevelThree.value = false;
 	}
 	/*const request = {
@@ -1098,7 +1062,7 @@ const selectOrgLevelThree = (val: any)=>{
 		levelThreeHandleOptions.value = [];
 	}
 }
-const selectOrgLevelThreeHandler = (val: any)=>{}
+const selectOrgLevelThreeHandler = ()=>{}
 // 办理对象是否必填
 const nextHandlersRequired = ref<Boolean>(false);
 /*watch(

src/views/system/config/workflow/index.vue

@@ -16,6 +16,7 @@
 				:loading="state.loading"
 				v-if="state.activeName === '0'"
 				:pagination="false"
+				class="pro-table-main-business"
 			>
 				<template #operation="{ row }">
 					<el-button link type="primary" @click="onConfig(row)" title="配置模板" v-auth="'system:workflow:template:config'"> 配置模板</el-button>
@@ -368,4 +369,8 @@ onMounted(async () => {
 	queryList();
 });
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss">
+.pro-table-main-business{
+	height: calc(100% - 45px) !important;
+}
+</style>