1

src/pages-process/components/DynamicLink.vue

@@ -42,7 +42,7 @@
 	watch(() => props.path, (newVal) => {
 		if (newVal){
 			compName.value = newVal;
-			if(newVal.indexOf('index.vue')==-1){
+			if(newVal.indexOf('index')==-1){
 				compName.value = newVal+'/index'
 			}
 		} 

src/pages-process/components/myTask.vue

@@ -22,10 +22,10 @@
 						</wd-col>
 					</wd-row>
 					<view class="meta-info">
-						<wd-icon name="time" size="18px" color="#999"></wd-icon>
+						<wd-icon name="user" size="18px" color="#999" ></wd-icon>
-						<text class="meta-text">{{item.taskBeginTime?item.taskBeginTime.substring(0,10):''}}</text>
-						<wd-icon name="user" size="18px" color="#999" style="margin-left: auto;"></wd-icon>
 						<text class="meta-text">{{item.processApplyUserName}}</text>
+						<wd-icon name="time" size="18px" color="#999" style="margin-left: auto;"></wd-icon>
+						<text class="meta-text">{{item.taskBeginTime?item.taskBeginTime.substring(0,10):''}}</text>
 					</view>
 					<wd-row style="padding-top: 10px;">
 						<view v-if="item.taskAssigneeName&&item.taskAssigneeName!=''">

src/pages-process/components/taskDeal.vue

@@ -74,13 +74,18 @@
 					<label class="uni-list-cell uni-list-cell-pd uni-label-pointer">
 						<!-- 点击的文字 -->
 						<radio value="1" style="transform: scale(0.7);" :checked="true"></radio>
-						<view class="margin-left-sm text-sm">单分支模式</view>
+						<view class="margin-left-sm text-sm">同意</view>
 					</label>
-					<label class="uni-list-cell uni-list-cell-pd uni-label-pointer" v-if="resultObj.histListSize>0 ">
+					<label class="uni-list-cell uni-list-cell-pd uni-label-pointer" v-if="resultObj.histListSize>0">
 						<!-- 点击的文字 -->
 						<radio value="3" style="transform: scale(0.7);"></radio>
 						<view class="margin-left-sm text-sm">驳回</view>
 					</label>
+					<label class="uni-list-cell uni-list-cell-pd uni-label-pointer">
+						<!-- 点击的文字 -->
+						<radio value="4" style="transform: scale(0.7);"></radio>
+						<view class="margin-left-sm text-sm">不同意</view>
+					</label>
 					<label class="uni-list-cell uni-list-cell-pd uni-label-pointer" v-if="model.processModel=='3'">
 						<wd-picker :columns="rejectColumns" label="单列选项" v-model="model.rejectModelNode"
 							use-default-slot>
@@ -131,7 +136,6 @@
 			</wd-collapse>
 		</view>
 
-
 		<view class="margin-top-sm">
 			<wd-collapse style="width: 100%;" v-model="value3">
 				<wd-collapse-item name="item1">
@@ -260,13 +264,11 @@
 		() => props.formData,
 		(val) => {//监听formdata 加载数据
 			if (val) {
-				console.log(val)
 				model.value.taskId = val.taskId;
 				rejectColumns.value = []; //清空驳回信息
 				model.value.rejectModelNode = '';
 				let tempArr = [];
 				getProcessTaskTransInfo({ taskId: model.value.taskId }).then(res => {
-					console.log(res)
 					if (res.success) {
 						resultObj.value = res.result;
 						res.result.histListNode.forEach(item => {
@@ -275,8 +277,6 @@
 							}
 						})
 						rejectColumns.value = tempArr; //赋值驳回信息
-
-
 					}
 				})
 			}
@@ -292,10 +292,8 @@
 		}
 	}
 
-
 	const showSelectuser = (val : string) => { //选人组件
 		modelShow.value[val] = true;
-		console.log(props.formData)
 	}
 
 	const show1Change = (val, type) => {
@@ -354,7 +352,6 @@
 	}
 
 	const finishTask = (nextNode) => {//完成任务
-		console.log(nextNode)
 		if (nextNode) {
 			handleProcessComplete(nextNode)
 			return;
@@ -367,6 +364,17 @@
 	}
 
 	const handleProcessComplete = (nextNode) => {
+		console.log('-----', model.value)
+		if (model.value.processModel == 4) {  //4： 取回流程
+			message
+				.confirm({
+					msg: '确认取回流程吗？',
+					title: '提示',
+				})
+				.then(() => {
+					
+				})
+		} else {
 			if (!model.value.reason || model.value.reason.length == 0) {
 				toast.error("请填写处理意见!")
 				return
@@ -392,14 +400,12 @@
 				})
 				return;
 			}
-
 			message
 				.confirm({
 					msg: '确认提交审批吗？',
 					title: '提示',
 				})
 				.then(() => {
-				console.log(model.value)
 					model.fileList = JSON.stringify(fileListTemp.value)
 					processComplete(model.value).then(res => {
 						if (res.success) {//跳转页面或加载下一个任务
@@ -412,7 +418,7 @@
 						}
 					})
 				})
-
+		}
 	}
 
 	const handleManyProcessComplete = () => { //驳回任务提交
@@ -434,7 +440,6 @@
 		let yy = new Date().getFullYear();
 		let mm = new Date().getMonth() + 1;
 		usePath.value = yy + '-' + mm + '-' + '流程办理附件';
-		console.log(usePath)
 	})
 </script>
 

src/pages-process/myApplyProcess.vue

@@ -69,10 +69,11 @@
 		callBackProcessApi,
 	} from '@/api/process'
 	import {
-		useToast
+		useToast,
+		useMessage
 	} from 'wot-design-uni'
-	
 	const toast = useToast()
+	const message = useMessage()
 	let pageNo = 1
 	let pageSize = 10
 	const list = ref([])
@@ -92,6 +93,13 @@
 	
 	/**流程取回*/
 	const callBackProcess = (id) => {
+		console.log('----',id)
+		message
+			.confirm({
+				msg: '确认取回流程吗？',
+				title: '提示',
+			})
+			.then(() => {
 				callBackProcessApi({
 					processInstanceId: id
 				}).then((res) => {
@@ -103,6 +111,8 @@
 						toast.warning(res.message)
 					}
 				})
+			})
+		
 	}
 
 	onReachBottom(() => {