Merge remote-tracking branch 'remotes/origin/master'

src/api/process/index.ts

@@ -35,3 +35,19 @@ export function startMutilProcessApi(config : Object) { // 发起流程
 		data: config
 	})
 }
+export function getProcessNodeInfo(config : Object) { // 获取节点信息
+	return http({
+		url: '/process/extActProcessNode/getProcessNodeInfo',
+		method: 'GET',
+		data: config
+	})
+}
+
+export function getHisProcessNodeInfo(config : Object) { // 获取历史节点信息
+	return http({
+		url: '/process/extActProcessNode/getHisProcessNodeInfo',
+		method: 'GET',
+		data: config
+	})
+}
+

src/pages/process/approvalTabbar.vue

@@ -8,19 +8,22 @@
 	}
 </route>
 <template>
-	<PageLayout navTitle="流程审批导航">
+	<PageLayout nav-title="运行流程" >
 		<wd-tabs v-model="tab" swipeable color="#39b54a" autoLineWidth>
-			<wd-tab title="我的任务">
+		    <wd-tab  title="我的任务">
-				<myTask></myTask>
+		      <myTask></myTask>
-			</wd-tab>
+		    </wd-tab>
 			<wd-tab title="历史任务">
-				<view class="content">内容1</view>
+			  <view class="content">内容1</view>
 			</wd-tab>
 		</wd-tabs>
 	</PageLayout>
 </template>
 
 <script setup lang="ts">
+	import {
+		useAppStore
+	} from '@/store'
 	import {
 		ref
 	} from 'vue'
@@ -29,11 +32,14 @@
 		onShow 
 	} from '@dcloudio/uni-app';
 	import myTask from './components/myTask.vue'
+	const appStore = useAppStore();
 	const tab = ref(0)
+	
+	
 </script>
 
 <style scoped lang="scss">
-	::v-deep .wd-tabs__line {
+	::v-deep .wd-tabs__line{
 		background: #39b54a;
 	}
 </style>

src/pages/process/taskHandle.vue

@@ -8,15 +8,15 @@
 	}
 </route>
 <template>
-	<PageLayout navTitle="任务处理">
+	<PageLayout nav-title="流程办理">
 		<wd-tabs v-model="tab" swipeable color="#39b54a" autoLineWidth>
-			<wd-tab title="单据">
+		    <wd-tab  title="单据">
-			</wd-tab>
+		    </wd-tab>
 			<wd-tab title="任务处理">
-				<view class="content">内容2</view>
+			  <view class="content">内容2</view>
 			</wd-tab>
 			<wd-tab title="流程图">
-				<view class="content">内容3</view>
+				<img :src="imgPath" style="border:2px;cursor:hand;" alt="流程图" usemap="#planetmap">
 			</wd-tab>
 		</wd-tabs>
 	</PageLayout>
@@ -27,17 +27,72 @@
 		ref
 	} from 'vue'
 	import {
-		onLoad
+		onLoad,
+		onShow,
+		onReachBottom,
+		onPullDownRefresh
 	} from '@dcloudio/uni-app';
+	import { useToast, useMessage } from 'wot-design-uni'
+	import {
+		useAppStore
+	} from '@/store'
+	import {
+		getProcessNodeInfo,
+		getHisProcessNodeInfo
+	} from '@/api/process'
+	import {
+		getEnvBaseUrl
+	} from '@/utils/index'
+	import { json } from 'stream/consumers';
+	
+	const formData = ref({})
+	const path = ref('') //url路径
+	const appStore = useAppStore();
 	const tab = ref(0)
 	
+
+	const handleClickLeft = () => {
+		uni.navigateBack()
+	}
+	
+
 	onLoad((options) => {
-		console.log(JSON.parse(options.data))
+		let useData = JSON.parse(options.data);
+		console.log(123)
+		getProcessNodeInfo({taskId:useData.id}).then(res=>{
+			console.log(res)
+			if(res.success){
+				let data = {
+				  dataId:res.result.dataId,
+				  taskId:useData.id,
+				  taskDefKey:useData.taskId,
+				  procInsId:useData.processInstanceId,
+				  tableName:res.result.tableName,
+				  permissionList:res.result.permissionList,
+				  vars:res.result.records
+				}
+				formData.value = data;//流程信息
+				
+				let tempFormUrl = res.result.formUrlMobile;
+				
+				path.value = tempFormUrl; //url路径
+			}
+		})
 	})
+	
+	const imgPath =   () => {
+	  var params = JSON.stringify({
+	    'processInstanceId': formData.procInsId
+	  })
+	  let url = `${getEnvBaseUrl()}/act/task/traceImage?${params}`;
+	  console.log(url)
+	  return url;
+	}
+
 </script>
 
 <style lang="scss" scoped>
-	::v-deep .wd-tabs__line {
+	::v-deep .wd-tabs__line{
 		background: #39b54a;
 	}
 </style>