reactor:·流程模板调整,工单延期和工单甄别调整

src/components/LogicFlow/PropertySetting/index.vue

@@ -7,7 +7,7 @@
 				:extendAttrConfig="props.extendAttrConfig || {}"
 				ref="ruleFormRef"
 				@countersignStartStepCodeChange="countersignStartStepCodeChange"
-        :baseData="baseDataResult"
+        :baseData="props.baseData"
 			/>
 			<template #footer>
 				<div style="flex: auto">
@@ -19,9 +19,9 @@
 	</div>
 </template>
 <script lang="ts" setup name="flowMain">
-import {reactive, ref, computed, defineAsyncComponent, unref, onMounted} from 'vue';
-import { NodeTypeEnum } from '../enums';
-import {baseData} from "/@/api/system/workflow";
+import {computed, defineAsyncComponent, reactive, ref, unref} from 'vue';
+import {NodeTypeEnum} from '../enums';
+
 const task = defineAsyncComponent(() => import('./task.vue'));
 const start = defineAsyncComponent(() => import('./start.vue'));
 const showDrawer = ref(false);  // 是否显示抽屉
@@ -44,6 +44,11 @@ const props = defineProps({
 		required: false,
 		default: () => {},
 	},
+  baseData:{
+    type: Object,
+    required: false,
+    default: () => {},
+  }
 });
 // 标题
 const title = computed(() => {
@@ -94,6 +99,8 @@ const propertyKeys:Array<string> = [
 	'name',
 	'code',
 	'id',
+  'flowType',
+  'description',
 	// 节点属性
 	'name',
 	'code',
@@ -144,12 +151,6 @@ const confirmClick = (formEl: any | undefined) => {
     showDrawer.value = false;
   });
 };
-const baseDataResult = ref<EmptyObjectType>({});
-onMounted(async () => {
-  // 获取页面基础数据
-  const {result} = await baseData();
-  baseDataResult.value = result;
-})
 // 导入属性及方法给外部调用
 defineExpose({
 	show,

src/components/LogicFlow/PropertySetting/start.vue

@@ -144,11 +144,11 @@
 	</div>
 </template>
 <script lang="ts" setup name="flowNodeStart">
-import {reactive, watch, onMounted, ref} from 'vue';
-import { getSelectList, queryUser } from '/@/api/system/workflow';
-import { getCanUseOrg } from '/@/api/system/user';
-import { removeDuplicate } from '/@/utils/arrayOperation';
-import { ElInput } from 'element-plus';
+import {onMounted, reactive, ref, watch} from 'vue';
+import {getSelectList, queryUser} from '/@/api/system/workflow';
+import {getCanUseOrg} from '/@/api/system/user';
+import {removeDuplicate} from '/@/utils/arrayOperation';
+import {ElInput} from 'element-plus';
 
 // 定义属性
 const props = defineProps({
@@ -178,7 +178,7 @@ const form = reactive<Record<string, any>>({
 	instancePolicy: null, // 动态策略
 	terminalDynamicMark: null, // 动态终止标识
 	tag: '', // 标识
-}) as any;
+});
 const emits = defineEmits(['update:modelValue']); // 定义事件
 const loading = ref(false); // 加载
 watch(
@@ -248,8 +248,7 @@ const getSelectValue = (query: any[]) => {
 const treeSelectRef = ref<RefType>();
 const selectOrg = () => {
 	const currentNode = treeSelectRef.value.getCheckedNodes();
-	let arr: EmptyArrayType = [];
-	arr = currentNode.map((item: any) => ({ key: item.id, value: item.name }));
+  let arr = currentNode.map((item: any) => ({ key: item.id, value: item.name }));
 	// 使用模板字符串
 	form.handlerTypeItems = `${JSON.stringify(arr)}`;
 };

src/components/LogicFlow/PropertySetting/task.vue

@@ -146,11 +146,12 @@
 	</div>
 </template>
 <script lang="ts" setup name="flowNode">
-import { reactive, watch, onMounted, ref } from 'vue';
-import { getSelectList, queryUser } from '/@/api/system/workflow';
-import { getCanUseOrg } from '/@/api/system/user';
-import { removeDuplicate } from '/@/utils/arrayOperation';
-import { ElInput } from 'element-plus';
+import {onMounted, reactive, ref, watch} from 'vue';
+import {getSelectList, queryUser} from '/@/api/system/workflow';
+import {getCanUseOrg} from '/@/api/system/user';
+import {removeDuplicate} from '/@/utils/arrayOperation';
+import {ElInput} from 'element-plus';
+
 const ruleFormRef = ref<RefType>();
 // 定义属性
 const props = defineProps({
@@ -248,8 +249,7 @@ const getSelectValue = (query: any[]) => {
 const treeSelectRef = ref<RefType>();
 const selectOrg = () => {
 	const currentNode = treeSelectRef.value.getCheckedNodes();
-	let arr: EmptyArrayType = [];
-	arr = currentNode.map((item: any) => ({ key: item.id, value: item.name }));
+  let arr = currentNode.map((item: any) => ({ key: item.id, value: item.name }));
 	// 使用模板字符串
 	form.handlerTypeItems = `${JSON.stringify(arr)}`;
 };

src/components/LogicFlow/index.vue

@@ -14,6 +14,13 @@
 							<el-input v-model="form.code" placeholder="请输入模板编码" clearable></el-input>
 						</el-form-item>
 					</el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="8">
+            <el-form-item label="模板类型" prop="flowType" :rules="[{ required: true, message: '请选择模板类型', trigger: 'change' }]">
+              <el-select v-model="form.flowType" class="w100" placeholder="请选择模板类型">
+                <el-option v-for="item in baseDataResult.flowTypeOptions" :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="8" :xl="8">
             <el-form-item label="模板描述" prop="description" :rules="[{ required: false, message: '请输入模板描述', trigger: 'blur' }]">
               <el-input v-model="form.description" placeholder="请输入模板描述" clearable></el-input>
@@ -26,23 +33,23 @@
 				<div class="w100 h100" ref="lfElRef" style="height: 100%"></div>
 			</div>
 			<!-- 节点内容弹窗 -->
-			<PropertySetting ref="propertySettingRef" v-model="formData" @change="handlePropertyChange" @changeOther="handlePropertyChangeOther" />
+			<PropertySetting ref="propertySettingRef" v-model="formData" @change="handlePropertyChange" @changeOther="handlePropertyChangeOther" :baseData="baseDataResult"/>
 		</div>
 	</div>
 </template>
 <script setup lang="ts" name="hotlineFlowDesigner">
-import { onMounted, ref, Ref, watch, unref, defineAsyncComponent, reactive, nextTick } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
-import LogicFlow, { EdgeType } from '@logicflow/core';
-import { DndPanel, SelectionSelect, Control, InsertNodeInPolyline, Menu, Group, Snapshot, MiniMap } from '@logicflow/extension';
+import {defineAsyncComponent, nextTick, onMounted, reactive, Ref, ref, unref, watch} from 'vue';
+import {useRoute, useRouter} from 'vue-router';
+import LogicFlow from '@logicflow/core';
+import {Control, DndPanel, Group, InsertNodeInPolyline, Menu, MiniMap, SelectionSelect, Snapshot} from '@logicflow/extension';
 import '@logicflow/core/dist/style/index.css';
 import '@logicflow/extension/lib/style/index.css';
-import { SnakerFlowElement, SnakerFlowAdapter } from './snakerflow/index';
-import { NodeTypeEnum } from './enums';
-import { workflowAdd, workflowUpdate, publish, baseData } from '/@/api/system/workflow';
+import {SnakerFlowAdapter, SnakerFlowElement} from './snakerflow/index';
+import {NodeTypeEnum} from './enums';
+import {baseData, workflowAdd, workflowUpdate} from '/@/api/system/workflow';
 import mittBus from '/@/utils/mitt';
-import { throttle } from '/@/utils/tools';
-import {ElMessage, ElMessageBox, FormInstance} from 'element-plus';
+import {throttle} from '/@/utils/tools';
+import {ElMessage, FormInstance} from 'element-plus';
 // 引入组件
 const PropertySetting = defineAsyncComponent(() => import('./PropertySetting/index.vue'));  // 节点属性设置
 
@@ -52,7 +59,7 @@ const emits = defineEmits(['update:modelValue', 'on-save']);  // 定义组件事
 // 提交表单数据
 let formData = reactive({} as any);
 // 外层表单
-let form = reactive<any>({});
+let form =  reactive<Record<string, any>>({});
 const ruleFormRef = ref<RefType>();
 // 定义组件接收的参数
 const props = defineProps({
@@ -379,6 +386,7 @@ const reRender = (data: any): void => {
 			// 最外层扩展属性赋值
 			form.name = lf.graphModel.name;
 			form.code = lf.graphModel.code;
+      form.flowType = lf.graphModel.flowType;
       form.description = lf.graphModel.description;
 			form.id = route.params.id;
 			form.name = lf.graphModel.name;
@@ -454,7 +462,14 @@ const refreshImport = () => {
 const importJson = (data: any) => {
 	reRender(data);
 };
-onMounted(init);
+const baseDataResult = ref<EmptyObjectType>({});
+onMounted( async()=>{
+  // 获取页面基础数据
+  const {result} = await baseData();
+  baseDataResult.value = result;
+  await init();
+});
+
 // 出提供给外部操作-$refs.xxx
 defineExpose({
 	getGraphData,

src/components/LogicFlow/snakerflow/index.ts

@@ -1,9 +1,8 @@
 import End from './end'
 import Start from './start'
 import Task from './task'
-import summary from './summary'
 import Transition from './transition'
-import { logicFlowJsonToSubmit,resDataToLogicFlow } from './tool'
+import {logicFlowJsonToSubmit, resDataToLogicFlow} from './tool'
 
 /**
  * snakerflow组件注册
@@ -14,7 +13,6 @@ class SnakerFlowElement {
     data.lf.register(End)
     data.lf.register(Start)
     data.lf.register(Task)
-    data.lf.register(summary)
     data.lf.register(Transition)
   }
 }
@@ -32,6 +30,7 @@ class SnakerFlowAdapter {
       // 将流程扩展属性绑定给lf图模型对象
       lf.graphModel.name = userData.name
       lf.graphModel.code = userData.code
+      lf.graphModel.flowType = userData.flowType
       lf.graphModel.description = userData.description
       lf.graphModel.id = userData.id
       return userData
@@ -40,6 +39,7 @@ class SnakerFlowAdapter {
       const graphData = {
         name: lf.graphModel.name,
         code: lf.graphModel.code,
+        flowType: lf.graphModel.flowType,
         description:lf.graphModel.description,
         id: lf.graphModel.id,
         ...logicFlowData

src/components/LogicFlow/snakerflow/tool.ts

@@ -1,4 +1,5 @@
-import { BaseEdgeModel, BaseNodeModel } from '@logicflow/core';
+import {BaseEdgeModel, BaseNodeModel} from '@logicflow/core';
+
 /**
  * 节点样式处理方法
  * @param _this
@@ -72,6 +73,7 @@ export const logicFlowJsonToSubmit = (data: any): object => {
   const processObj = <any>{
     name: data.name, // 流程定义名称
     code: data.code, // 流程定义code
+    flowType: data.flowType, // 模板类型
     description: data.description, // 流程定义描述
     id: data.id, // 流程id
     steps: [] // 所有步骤

src/components/ProcessAudit/index.vue

@@ -397,16 +397,6 @@
 							<el-checkbox v-model="state.ruleForm.isSms" label="短信通知" />
 						</el-form-item>
 					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" v-if="state.processType === '延期审批'">
-						<el-form-item label="是否省延期" prop="applyDelayProvince">
-							<el-checkbox v-model="state.ruleForm.applyDelayProvince" label="省延期申请" />
-						</el-form-item>
-					</el-col>
-          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" v-if="state.processType === '甄别审批'">
-            <el-form-item label="是否省甄别" prop="applyDelayProvince">
-              <el-checkbox v-model="state.ruleForm.applyDelayProvince" label="省甄别申请" />
-            </el-form-item>
-          </el-col>
 					<!--  办理流程展示期满时间  -->
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" v-if="handelArr.includes(state.processType)">
 						<el-form-item label="期满时间" prop="expiredTime" :rules="[{ required: true, message: '请选择期满时间', trigger: 'change' }]">
@@ -526,15 +516,14 @@ import {useUserInfo} from '/@/stores/userInfo';
 import {storeToRefs} from 'pinia';
 import {commonEnum} from '/@/utils/constants';
 import {orderFlowParams, orderStartFlow} from '/@/api/business/order';
-import {workflowNext, workflowNextSteps, workflowPrevious, workflowRecall, workflowRecallParams, workflowRedoParams,workflowReject} from '/@/api/system/workflow';
+import {workflowNext, workflowNextSteps, workflowPrevious, workflowRecall, workflowRecallParams, workflowRedoParams, workflowReject} from '/@/api/system/workflow';
 import {redoApply, redoBaseData} from '/@/api/business/redo';
-import {delayApply, delayCalcEndTime, workflowDelayParams ,delayBaseData} from '/@/api/business/delay';
+import {delayApply, delayBaseData, delayCalcEndTime, workflowDelayParams} from '/@/api/business/delay';
 import {discernApply, screenBaseData, workflowDiscernParams} from '/@/api/business/discern';
 import {debounce} from '/@/utils/tools';
 import {bulletinAdd, bulletinAddBaseData, circularAdd, circularAddBaseData, getAllUsers, workflowBulletinParams, workflowCircularParams} from '/@/api/auxiliary/notice';
 import {getCanUseOrg} from '/@/api/system/user';
-import {KnowledgeAdd, KnowledgeAddStartFlowParams, KnowledgeDeleteStartFlowParams, KnowledgeDel, KnowledgeUpdate, KnowledgeUpdateStartFlowParams} from "/@/api/knowledge";
-import * as process from "process";
+import {KnowledgeAdd, KnowledgeAddStartFlowParams, KnowledgeDel, KnowledgeDeleteStartFlowParams, KnowledgeUpdate, KnowledgeUpdateStartFlowParams} from "/@/api/knowledge";
 
 // 引入组件
 const CommonAdvice = defineAsyncComponent(() => import('/@/components/CommonAdvice/index.vue')); // 常用意见
@@ -953,11 +942,6 @@ const onSubmit = (formEl: FormInstance | undefined) => {
 						submitObj.nextMainHandler = submitObj.nextHandlers[0].key;
 					}
 				}
-        if(['延期审批','甄别审批'].includes(state.processType)){ // 如果特殊业务需要特殊字段
-          submitObj.external = {
-            isProvinceDelay: submitObj.applyDelayProvince,
-          }
-        }
         submitObj.stepExpiredTime = submitObj.expiredTime; //节点过期时间
 				switch (state.processType) {
 					case '工单发起':

src/views/business/delay/components/Delay-detail.vue

@@ -43,7 +43,7 @@
 			<span class="dialog-footer">
 				<el-button @click="closeDialog" class="default-button">关 闭</el-button>
 				<el-button type="primary" @click="processDetail">流程明细</el-button>
-				<el-button type="primary" @click="onAudit" v-auth="'business:delay:backlog:approve'">延期审批</el-button>
+				<el-button type="primary" @click="onAudit" v-if="state.ruleForm?.isCanHandle">延期审批</el-button>
 			</span>
 		</template>
 	</el-dialog>

src/views/business/discern/backlog/index.vue

@@ -91,7 +91,7 @@
 				<el-table-column prop="content" label="甄别申请原因" show-overflow-tooltip width="200"></el-table-column>
 				<el-table-column label="操作" width="100" fixed="right" align="center">
 					<template #default="{ row }">
-						<el-button link type="primary" @click="onAudit(row)" title="甄别审批" v-auth="'business:discern:backlog:audit'"> 甄别审批 </el-button>
+            <el-button link type="primary" @click="onDetail(row)" title="查看甄别详情" v-auth="'business:discern:detail'"> 甄别详情 </el-button>
 					</template>
 				</el-table-column>
 				<template #empty>
@@ -106,22 +106,22 @@
 				@pagination="queryList"
 			/>
 		</el-card>
-		<!-- 流程审批 -->
-		<process-audit ref="processAuditRef" @orderProcessSuccess="queryList" />
+    <!-- 甄别详情 -->
+    <discern-detail ref="discernDetailRef" />
 	</div>
 </template>
 <script setup lang="ts" name="orderDiscernBacklog">
-import { onMounted, reactive, ref, defineAsyncComponent } from 'vue';
-import { ElButton, ElMessage, FormInstance } from 'element-plus';
-import { auth } from '/@/utils/authFunction';
-import { throttle } from '/@/utils/tools';
-import { commonEnum, shortcuts } from '/@/utils/constants';
-import { formatDate } from '/@/utils/formatTime';
-import { screenList, screenBaseData } from '/@/api/business/discern';
+import {defineAsyncComponent, onMounted, reactive, ref} from 'vue';
+import {ElButton, ElMessage, FormInstance} from 'element-plus';
+import {auth} from '/@/utils/authFunction';
+import {throttle} from '/@/utils/tools';
+import {shortcuts} from '/@/utils/constants';
+import {formatDate} from '/@/utils/formatTime';
+import {screenBaseData, screenList} from '/@/api/business/discern';
 import other from '/@/utils/other';
 
 // 引入组件
-const ProcessAudit = defineAsyncComponent(() => import('/@/components/ProcessAudit/index.vue')); // 流程审批
+const DiscernDetail = defineAsyncComponent(() =>import('/@/views/business/discern/components/Discern-detail.vue'));  // 甄别详情
 // 定义变量内容
 const ruleFormRef = ref<RefType>(); // 表单ref
 const state = reactive(<any>{
@@ -146,8 +146,8 @@ const handleTimeChange = (val: string[], startKey: string, endKey: string) => {
 		state.queryParams[startKey] = val[0];
 		state.queryParams[endKey] = val[1];
 	} else {
-		state.queryParams[startKey] = '';
-		state.queryParams[endKey] = '';
+		state.queryParams[startKey] = null;
+		state.queryParams[endKey] = null;
 	}
 };
 // 受理时间
@@ -200,26 +200,10 @@ const handleSelectionChange = (val: any[]) => {
 const onExport = () => {
 	console.log('导出');
 };
-// 甄别审批
-const processAuditRef = ref<RefType>(); // 流程审批ref
-const onAudit = async (row: any) => {
-  try {
-    const params = {
-      id: row.workflowId,
-      commonEnum: commonEnum.Discriminate,
-      processType: '甄别审批',
-      orderDetail: row.order,
-      extra: {
-        dialogTitle: '甄别审批',
-        inputPlaceholder: '审批意见',
-        annexName: '甄别附件',
-        classify:'甄别上传'
-      },
-    };
-    processAuditRef.value.openDialog(params);
-  }catch (error) {
-    console.log(error);
-  }
+// 查看详情
+const discernDetailRef = ref<RefType>(); // 甄别详情ref
+const onDetail = async (row: any) => {
+  discernDetailRef.value.openDialog(row);
 };
 onMounted(async () => {
 	await getBaseData();

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

@@ -17,9 +17,9 @@
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 					<el-form-item label="申请时间">{{ formatDate(state.ruleForm?.creationTime, 'YYYY-mm-dd HH:MM:SS') }} </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?.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>
@@ -35,29 +35,34 @@
 		</el-form>
 		<template #footer>
 			<span class="dialog-footer">
-				<el-button @click="closeDialog" class="default-button">取 消</el-button>
+				<el-button @click="closeDialog" class="default-button">关 闭</el-button>
 				<el-button type="primary" @click="processDetail">流程明细</el-button>
+				<el-button type="primary" @click="onAudit" v-if="[0,1,3].includes(state.ruleForm.status) && state.ruleForm.isCanHandle">甄别审批</el-button>
 			</span>
 		</template>
 	</el-dialog>
 	<!-- 审核记录 -->
 	<audit-record ref="auditRecordRef" />
+	<!--  流程审批  -->
+	<process-audit ref="processAuditRef" @orderProcessSuccess="closeDialog"></process-audit>
 </template>
 <script setup lang="ts" name="discernDetail">
-import { defineAsyncComponent, reactive, ref } from 'vue';
-import { formatDate } from '/@/utils/formatTime';
-import { screenDetail } from '/@/api/business/discern';
+import {defineAsyncComponent, reactive, ref} from 'vue';
+import {formatDate} from '/@/utils/formatTime';
+import {screenDetail} from '/@/api/business/discern';
+import {commonEnum} from "/@/utils/constants";
 
 const AuditRecord = defineAsyncComponent(() => import('/@/components/AuditRecord/index.vue')); // 流程明细
 const AnnexList = defineAsyncComponent(() => import('/@/components/AnnexList/index.vue')); // 附件列表
+const ProcessAudit = defineAsyncComponent(() => import('/@/components/ProcessAudit/index.vue')); // 流程审批
 
+const emit = defineEmits(['updateList']); // 定义事件
 // 定义变量内容
 const state = reactive<any>({
 	dialogVisible: false, // 是否显示弹窗
 	loading: false, // 是否显示加载
 	ruleForm: {},
 });
-
 /*
  * @params row 工单详情
  * @description 打开弹窗
@@ -77,6 +82,7 @@ const openDialog = async (row: any) => {
 // 关闭弹窗
 const closeDialog = () => {
 	state.dialogVisible = false;
+	emit('updateList');
 };
 // 流程明细
 const auditRecordRef = ref<RefType>(); // 审核记录ref
@@ -87,6 +93,70 @@ const processDetail = () => {
 	};
 	auditRecordRef.value.openDialog(params);
 };
+// 甄别审批
+const processAuditRef = ref<RefType>();
+const onAudit = () => {
+  try {
+    const orderDetail = {
+      visitId:state.ruleForm?.visitId,
+      ...state.ruleForm?.visit?.order
+    }
+    let params = <EmptyObjectType>{};
+    switch (state.ruleForm.status) {
+      case 0: // 待办 申请甄别
+        params = {
+          id: state.ruleForm.workflowId,
+          commonEnum:commonEnum.Discriminate,
+          processType: '甄别审批',
+          orderDetail,
+          extra: {
+            dialogTitle: '甄别审批',
+            inputPlaceholder: '审批意见',
+            annexName:'甄别附件',
+            classify:'甄别上传'
+          },
+        };
+        processAuditRef.value.openDialog(params);
+        break;
+      case 1: // 审批中 甄别审批
+        params = {
+          id: state.ruleForm.workflowId,
+          commonEnum:commonEnum.Discriminate,
+          processType: '甄别审批',
+          orderDetail,
+          extra: {
+            dialogTitle: '甄别审批',
+            inputPlaceholder: '审批意见',
+            annexName:'甄别附件',
+            classify:'甄别上传'
+          },
+        };
+        processAuditRef.value.openDialog(params);
+        break;
+      case 2: // 审批完成
+
+        break;
+      case 3:// 审批拒绝 重新申请
+        params = {
+          id: state.ruleForm.workflowId,
+          commonEnum:commonEnum.Discriminate,
+          processType: '甄别申请',
+          orderDetail,
+          extra: {
+            dialogTitle: '甄别申请',
+            inputPlaceholder: '请输入甄别意见',
+            annexName:'甄别附件',
+            classify:'甄别上传'
+          },
+        };
+        processAuditRef.value.openDialog(params);
+        break;
+      default:
+    }
+  } catch (error) {
+    console.log(error);
+  }
+};
 defineExpose({
 	openDialog,
 	closeDialog,

src/views/business/discern/index.vue

@@ -136,46 +136,6 @@
 				@pagination="queryList"
 			/>
 		</el-card>
-
-		<!-- 流程审批 -->
-    <process-audit ref="processAuditRef" @orderProcessSuccess="queryList" >
-      <template #header>
-        <el-form label-width="110px" class="show-info-form">
-          <el-row :gutter="10">
-            <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-              <el-form-item label="工单编号"> {{ state.currentRow.no }} </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-              <el-form-item label="工单标题"> {{ state.currentRow?.order?.title }} </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-              <el-form-item label="申请人">{{ state.currentRow.creatorName }} </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-              <el-form-item label="申请部门">{{ state.currentRow?.creatorOrgName }} </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-              <el-form-item label="申请时间">{{ formatDate(state.currentRow?.creationTime, 'YYYY-mm-dd HH:MM:SS') }} </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-              <el-form-item label="申请类型"> {{ state.currentRow?.typeDicName}} </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-              <el-form-item label="是否省甄别">{{ state.currentRow?.isProDelay ? '是' : '否' }} </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-              <el-form-item label="申请理由">{{ state.currentRow?.content }} </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-              <el-form-item label="附件">
-                <annex-list name="查看附件" readonly :businessId="state.currentRow.id" classify="查看附件" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <el-divider style="margin: 15px 0"/>
-      </template>
-    </process-audit>
     <!-- 甄别详情 -->
     <discern-detail ref="discernDetailRef" />
 	</div>
@@ -185,13 +145,12 @@ import {defineAsyncComponent, onMounted, reactive, ref} from 'vue';
 import {ElButton, ElMessage, FormInstance} from 'element-plus';
 import {auth} from '/@/utils/authFunction';
 import {throttle} from '/@/utils/tools';
-import {commonEnum, shortcuts} from '/@/utils/constants';
 import {formatDate} from '/@/utils/formatTime';
+import {shortcuts} from '/@/utils/constants';
 import {screenBaseData, screenList} from '/@/api/business/discern';
 import other from '/@/utils/other';
 
 // 引入组件
-const ProcessAudit = defineAsyncComponent(() => import('/@/components/ProcessAudit/index.vue')); // 流程审批
 const DiscernDetail = defineAsyncComponent(() =>import('/@/views/business/discern/components/Discern-detail.vue'));  // 甄别详情
 const AnnexList = defineAsyncComponent(() => import('/@/components/AnnexList/index.vue')); // 附件列表
 
@@ -212,7 +171,6 @@ const state = reactive(<any>{
 	total: 0, // 总数
 	screenStatus: [], // 甄别状态
 	screenType: [], // 甄别类型
-  currentRow:{}, // 当前行
 });
 const handleTimeChange = (val: string[], startKey: string, endKey: string) => {
 	if (val) {
@@ -272,70 +230,9 @@ const onExport = () => {
 	console.log('导出');
 };
 // 查看详情
-const processAuditRef = ref<RefType>(); // 流程审批ref
 const discernDetailRef = ref<RefType>(); // 甄别详情ref
 const onDetail = async (row: any) => {
-  state.currentRow = row;
-  try {
-    const orderDetail = {
-      visitId:row.visit.id,
-      ...row.order
-    }
-    let params = <EmptyObjectType>{};
-    switch (row.status) {
-      case 0: // 待办 申请甄别
-        params = {
-          id: row.workflowId,
-          commonEnum:commonEnum.Discriminate,
-          processType: '甄别审批',
-          orderDetail,
-          extra: {
-            dialogTitle: '甄别审批',
-            inputPlaceholder: '审批意见',
-            annexName:'甄别附件',
-            classify:'甄别上传'
-          },
-        };
-        processAuditRef.value.openDialog(params);
-        break;
-      case 1: // 审批中 甄别审批
-        params = {
-          id: row.workflowId,
-          commonEnum:commonEnum.Discriminate,
-          processType: '甄别审批',
-          orderDetail,
-          extra: {
-            dialogTitle: '甄别审批',
-            inputPlaceholder: '审批意见',
-            annexName:'甄别附件',
-            classify:'甄别上传'
-          },
-        };
-        processAuditRef.value.openDialog(params);
-        break;
-      case 2: // 审批完成
-        discernDetailRef.value.openDialog(row);
-        break;
-      case 3:// 审批拒绝 重新申请
-        params = {
-          id: row.workflowId,
-          commonEnum:commonEnum.Discriminate,
-          processType: '甄别申请',
-          orderDetail,
-          extra: {
-            dialogTitle: '甄别申请',
-            inputPlaceholder: '请输入甄别意见',
-            annexName:'甄别附件',
-            classify:'甄别上传'
-          },
-        };
-        processAuditRef.value.openDialog(params);
-        break;
-      default:
-    }
-  } catch (error) {
-    console.log(error);
-  }
+  discernDetailRef.value.openDialog(row);
 };
 onMounted(async () => {
 	await getBaseData();

src/views/system/config/workflow/component/workflowEdit.vue

@@ -4,11 +4,12 @@
 	</div>
 </template>
 <script setup lang="ts" name="workflowAddEdit">
-import { defineAsyncComponent, ref, onMounted } from 'vue';
-import { ElMessage } from 'element-plus';
-import { useRoute } from 'vue-router';
-import { getWorkFlowDetail } from '/@/api/system/workflow';
-import { auth } from '/@/utils/authFunction';
+import {defineAsyncComponent, onMounted, ref} from 'vue';
+import {ElMessage} from 'element-plus';
+import {useRoute} from 'vue-router';
+import {getWorkFlowDetail} from '/@/api/system/workflow';
+import {auth} from '/@/utils/authFunction';
+
 const LogicFlow = defineAsyncComponent(() => import('/@/components/LogicFlow/index.vue'));  // 流程设计器
 const designerRef = ref(null as any);
 let flowData = ref({
@@ -58,8 +59,8 @@ onMounted(async () => {
 		try {
 			if (!auth('system:workflow:detail')) ElMessage.error('抱歉，您没有权限获取流程详情！');
 			else {
-				const res: any = await getWorkFlowDetail(route.params.id);
-				flowData.value = res.result;
+				const {result} = await getWorkFlowDetail(route.params.id);
+				flowData.value = result;
 				loading.value = false;
 			}
 		} catch (error) {

src/views/tels/evaluationKey/index.vue

@@ -9,7 +9,6 @@
         <el-form-item label="评价值" prop="satisVal">
           <el-input v-model="state.queryParams.satisVal" placeholder="评价值" clearable @keyup.enter="handleQuery" />
         </el-form-item>
-
         <el-form-item>
           <el-button type="primary" @click="handleQuery" :loading="state.loading" v-waves> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
           <el-button @click="resetQuery(ruleFormRef)" v-waves class="default-button" :loading="state.loading">