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

# Conflicts:
#	src/api/process/index.ts
#	src/pages-process/taskHandle.vue

src/api/process/index.ts

@@ -19,7 +19,7 @@ export function taskHistoryListApi(config : Object) {
 }
 
 /*签收*/
-export function claim(config : Object) { 
+export function claim(config : Object) {
 	return http({
 		url: '/act/task/claim',
 		method: 'PUT',
@@ -112,6 +112,14 @@ export function callBackProcessApi(config : object) { // 取回流程
 	})
 }
 
+export function getHisProcessTaskTransInfo(config : object) { // 历史流转
+	return http({
+		url: '/act/task/getHisProcessTaskTransInfo',
+		method: 'GET',
+		data: config
+	})
+}
+
 export function sendMessageApi(config : object) { // 短信通知
 	return http({
 		url: '/myAct/processInstance/sendMessage',

src/pages-process/components/DynamicLink.vue

@@ -46,7 +46,6 @@
 				compName.value = newVal+'/index'
 			}
 		} 
-		console.log(compName.value)
 		//动态加载页面
 		const comp = modules[`/src/pages-bpm/${compName.value}.vue`]
 		comp().then((myModule) => {

src/pages-process/components/historicalTasks.vue

@@ -92,7 +92,6 @@
 			pageNo,
 			pageSize
 		}).then((res) => {
-			console.log(res)
 			if (res.success) {
 				list.value = [...list.value,...res.result.records];
 			}
@@ -111,7 +110,6 @@
 	const goToPage = (item)=>{
 		//判断是否是签收项目，提示是否签收
 		if(item.taskAssigneeName&&item.taskAssigneeName!=''){
-			console.log(item)
 			//办理任务，直接进入办理页面
 			uni.navigateTo({
 				url:`/pages-process/taskHandle?data=history`,

src/pages-process/components/myTask.vue

@@ -83,7 +83,6 @@
 			pageNo,
 			pageSize
 		}).then((res) => {
-			console.log(res)
 			if (res.success) {
 				list.value = [...list.value, ...res.result.records];
 			}

src/pages-process/taskHandle.vue

@@ -68,6 +68,7 @@
 		getProcessNodeInfo,
 		getHisProcessNodeInfo,
 		getNodePositionInfo,
+		// getHisProcessTaskTransInfo,
 		getHisInfo
 	} from '@/api/process'
 	import {
@@ -81,7 +82,6 @@
 
 	const { proxy } = getCurrentInstance()
 	const type = ref('');
-
 	const formData = ref({})
 	const useData = ref({})
 	const nodePositionInfo = ref({})
@@ -91,6 +91,7 @@
 	const tab = ref(0)
 	const completedNum = ref(0);
 
+
 	const handleClickLeft = () => {
 		uni.navigateBack()
 	}
@@ -137,7 +138,6 @@
 							vars: res.result.records
 						}
 						formData.value = data;//流程信息
-						console.log(res)
 						let tempFormUrl = res.result.formUrlMobile;
 						path.value = tempFormUrl; //url路径
 					}
@@ -145,12 +145,13 @@
 				})
 			}
 
-			// getNodePositionInfo({processInstanceId:useData.value.processInstanceId}).then((res)=>{
+			// getNodePositionInfo({processInstanceId:useData.processInstanceId}).then((res)=>{
 			// 	if (res.success) {
 			// 	  nodePositionInfo.value = res.result
 			// 	}
 			// })
-
+			// getHisProcessTaskTransInfo({ procInstId: useData.value.processInstanceId }).then(res => {
+			// })
 			getHisInfo({ processInstanceId: useData.value.processInstanceId }).then((res) => {
 				if (res.success) {
 					dataSource.value = res.result.records