Merge branch 'v3'

src/api/DesignForm/requestapi.ts

@@ -211,3 +211,11 @@ export function gainRunTaskFlow(data?:customerFormLogo){
 		data: data
 	});
 }
+//提交审批结果
+export function submitApprovalResults(data?:customerFormLogo){
+	return request({
+		url: '/systemapi/task_flow/submitApprovalResults',
+		method: 'post',
+		data: data
+	});
+}

src/views/taskplatform/taskmanagement/completedmatters.vue

@@ -170,7 +170,7 @@ const lookFlowInfo = (val:any,types:number) =>	{
 			</el-card>
 
 
-			<LookAndOperateLogInfo v-if="darwOpenOrClose" v-model:isshow="darwOpenOrClose" :flow-log-info="flowLogInfo" :drawer-with="drawerMyWith" @getmytodolist="getMyToDoList" />
+			<LookAndOperateLogInfo v-if="darwOpenOrClose" v-model:isshow="darwOpenOrClose" :flow-log-info="flowLogInfo" :drawer-with="drawerMyWith" @getmytodolist="getToDoList" />
 
 
 

src/views/taskplatform/taskmanagement/flowStep.vue

@@ -148,13 +148,13 @@ const updateNode = (val:any) =>{
 											<ul>
 												<li v-for="(logItem,logIndex) in items.log" :key="logIndex" class="logLi">
 													<el-text v-if="logItem.state==2" type="success">
-														<span v-if="logItem.cause">logItem.cause</span><span v-else>已同意</span>
+														<span v-if="logItem.cause">{{logItem.cause}}</span><span v-else>已同意</span>
 													</el-text>
 													<el-text v-else-if="logItem.state==3" type="danger">
-														<span v-if="logItem.cause">logItem.cause</span><span v-else>已驳回</span>
+														<span v-if="logItem.cause">{{logItem.cause}}</span><span v-else>已驳回</span>
 													</el-text>
 													<el-text v-else>
-														<span v-if="logItem.cause">logItem.cause</span><span v-else>未操作</span>
+														<span v-if="logItem.cause">{{logItem.cause}}</span><span v-else>未操作</span>
 													</el-text> · {{ logItem.time }}
 												</li>
 											</ul>

src/views/taskplatform/taskmanagement/lookAndOperateLogInfo.vue

@@ -36,6 +36,14 @@ const isOpen =   computed({
 		emits("update:isshow", val);
 	},
 });
+
+// watch(()=>props.isshow,(val:any)=>{
+// 	console.log("监听打开关闭",val)
+// 	if(!val){
+// 		emits("getmytodolist")
+// 	}
+// })
+
 const loadingData = ref(false)			//加载表单数据
 const flowLoading = ref(false)			//加载流程数据
 const versiontitle = ref<any>("1")
@@ -72,7 +80,12 @@ const formType = computed(() => {
 
 const formEl = ref()
 
-
+const drawerBeforeClose = () => {
+	console.log("监听打开关闭",false)
+	emits("getmytodolist")
+	emits("update:isshow", false);
+	
+}
 
 
 onMounted(()=>{
@@ -92,7 +105,7 @@ onMounted(()=>{
 })
 </script>
 <template>
-	<el-drawer  v-model="isOpen" v-loading="loadingData" element-loading-my-text="Loading..." :title="versiontitle"  :close-on-click-modal="false" :close-on-press-escape="false" :destroy-on-close="true" :size="props.drawerWith" class="drawerClass" >
+	<el-drawer  v-model="isOpen" v-loading="loadingData" element-loading-my-text="Loading..." :title="versiontitle"  :close-on-click-modal="false" :close-on-press-escape="false" :destroy-on-close="true" :size="props.drawerWith" class="drawerClass" :before-close="drawerBeforeClose">
 		<table border="0" class="tableFlowBox">
 			<tr>
 				<td valign="top">

src/views/taskplatform/taskmanagement/runFlowStep.vue

@@ -9,7 +9,7 @@ import OrgUserPage from "@/views/public/orguser/orguser.vue"
 import OrgAllUserPage from "@/views/public/orguser/orgalluser.vue"
 
 // import { nodeFlow,conditionInfo,nodelPeoples } from '@/api/taskapi/types'
-import { gainRunTaskFlow } from '@/api/DesignForm/requestapi'
+import { gainRunTaskFlow,submitApprovalResults } from '@/api/DesignForm/requestapi'
 //引入图标
 import squareUrlOne from "@/assets/images/1.png"
 import squareUrlTwo from "@/assets/images/2.png"
@@ -37,6 +37,7 @@ const openclosebox = ref(false)		//开启全部人员选择
 const presetPersonnel = ref<any>([]);    //预设选择人
 const selectedPeople = ref<any>([]);    //已选择人
 const flowOpinion = ref(false) //是否可以写评论
+const currentStep = ref<number>(props.currentProgress)
 
 const flowMaps = ref<any[]>();
 
@@ -48,9 +49,10 @@ const gainRunFlowTask = () =>{
 	}
 	gainRunTaskFlow(sendInfo)
 		.then((data:any) =>{
-			// console.log("获取流程----->",data)
+			console.log("获取流程----->",data)
 			flowMaps.value = data.data.flowList
 			flowOpinion.value = data.data.operational
+			currentStep.value = data.data.current_step
 		})
 		.finally(()=>{
 			flowLoading.value = false
@@ -96,6 +98,22 @@ const sendFlowInfo = ref<string>() //审批意见
 //提交审批
 const yesOrNo = (val:string,agreeOrRefuse:number) =>{
 	console.log("提交审批----1111->",val,agreeOrRefuse,sendFlowInfo.value)
+	let sendInfo = {
+		id:props.flowKey,
+		agreeOrRefuse:agreeOrRefuse,
+		suggest:sendFlowInfo.value,
+		flowlist:flowMaps.value
+	}
+	submitApprovalResults(sendInfo)
+		.then((data:any)=>{
+
+			console.log("提交审批----22222->",data)
+
+		})
+		.finally(()=>{
+			gainRunFlowTask()
+		})
+		
 }
 </script>
 <template>
@@ -105,7 +123,7 @@ const yesOrNo = (val:string,agreeOrRefuse:number) =>{
 				<el-text size="large">审批流程</el-text>
 			</el-affix>
 
-			<el-steps v-loading="flowLoading" element-loading-text="Loading..." direction="vertical" :active="props.currentProgress">
+			<el-steps v-loading="flowLoading" element-loading-text="Loading..." direction="vertical" :active="currentStep">
 				<el-step v-for="item in flowMaps" :key="item.step">
 					<template #title>
 						{{ item.nodeName }}
@@ -129,13 +147,13 @@ const yesOrNo = (val:string,agreeOrRefuse:number) =>{
 											<ul>
 												<li v-for="(logItem,logIndex) in items.log" :key="logIndex" class="logLi">
 													<el-text v-if="logItem.state==2" type="success">
-														<span v-if="logItem.cause">logItem.cause</span><span v-else>已同意</span>
+														<span v-if="logItem.cause">{{logItem.cause}}</span><span v-else>已同意</span>
 													</el-text>
 													<el-text v-else-if="logItem.state==3" type="danger">
-														<span v-if="logItem.cause">logItem.cause</span><span v-else>已驳回</span>
+														<span v-if="logItem.cause">{{logItem.cause}}</span><span v-else>已驳回</span>
 													</el-text>
 													<el-text v-else>
-														<span v-if="logItem.cause">logItem.cause</span><span v-else>未操作</span>
+														<span v-if="logItem.cause">{{logItem.cause}}</span><span v-else>未操作</span>
 													</el-text> · {{ logItem.time }}
 												</li>
 											</ul>

src/views/taskplatform/taskmanagement/taskcustomerformnew.vue

@@ -146,15 +146,18 @@ const getTaskFormData = () =>{
 							}
 						}
 					})
-			//获取工作流不进图
+
-			gainFlowChart.id=data.flowkeystr
+			nextTick(() => {
-			generateFlow(gainFlowChart)
+					//获取工作流不进图
-				.then((data:any) =>{
+				gainFlowChart.id=data.flowkeystr
-					console.log("获取工作流不进图",data.data)
+				generateFlow(gainFlowChart)
-					flowMap.value = data.data.flowList
+					.then((data:any) =>{
-					console.log("获取工作流不进图--->",flowMap.value)
+						console.log("获取工作流不进图",data.data)
-					formLoading.value = false
+						flowMap.value = data.data.flowList
-				})
+						console.log("获取工作流不进图--->",flowMap.value)
+						formLoading.value = false
+					})
+			})
 		})
 		.finally(()=>{
 			loadingData.value = false;

src/views/taskplatform/taskmanagement/todolist.vue

@@ -170,7 +170,7 @@ const lookFlowInfo = (val:any,types:number) =>	{
 			</el-card>
 
 
-			<LookAndOperateLogInfo v-if="darwOpenOrClose" v-model:isshow="darwOpenOrClose" :flow-log-info="flowLogInfo" :drawer-with="drawerMyWith" @getmytodolist="getMyToDoList" />
+			<LookAndOperateLogInfo v-if="darwOpenOrClose" v-model:isshow="darwOpenOrClose" :flow-log-info="flowLogInfo" :drawer-with="drawerMyWith" @getmytodolist="getToDoListTd" />