diff --git a/src/pages-process/components/DynamicLink.vue b/src/pages-process/components/DynamicLink.vue
index 0131918..5d179b6 100644
--- a/src/pages-process/components/DynamicLink.vue
+++ b/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'
}
}
diff --git a/src/pages-process/components/myTask.vue b/src/pages-process/components/myTask.vue
index 3a0ee90..8664ae2 100644
--- a/src/pages-process/components/myTask.vue
+++ b/src/pages-process/components/myTask.vue
@@ -22,10 +22,10 @@
-
- {{item.taskBeginTime?item.taskBeginTime.substring(0,10):''}}
-
+
{{item.processApplyUserName}}
+
+ {{item.taskBeginTime?item.taskBeginTime.substring(0,10):''}}
diff --git a/src/pages-process/components/taskDeal.vue b/src/pages-process/components/taskDeal.vue
index 95cf175..220d245 100644
--- a/src/pages-process/components/taskDeal.vue
+++ b/src/pages-process/components/taskDeal.vue
@@ -74,13 +74,18 @@
-
-
@@ -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,42 +364,32 @@
}
const handleProcessComplete = (nextNode) => {
- if (!model.value.reason || model.value.reason.length == 0) {
- toast.error("请填写处理意见!")
- return
- }
- if (nextNode) { // true
- model.value.nextnode = 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
+ }
+ if (nextNode) { // true
+ model.value.nextnode = nextNode;
+ }
- if (model.value.entrust) { //如果有委托，不办理流程
- var params = {
- taskId: model.value.taskId,
- taskAssignee: model.value.entrust
- };//查询条件
- taskEntrust(params).then(res => {
- if (res.success) {
- toast.success(res.message)
- setTimeout(() => { //延迟0.5s
- uni.navigateBack()
- }, 1000)
- } else {
- toast.error(res.message)
- }
- })
- return;
- }
-
- message
- .confirm({
- msg: '确认提交审批吗？',
- title: '提示',
- })
- .then(() => {
- console.log(model.value)
- model.fileList = JSON.stringify(fileListTemp.value)
- processComplete(model.value).then(res => {
- if (res.success) {//跳转页面或加载下一个任务
+ if (model.value.entrust) { //如果有委托，不办理流程
+ var params = {
+ taskId: model.value.taskId,
+ taskAssignee: model.value.entrust
+ };//查询条件
+ taskEntrust(params).then(res => {
+ if (res.success) {
toast.success(res.message)
setTimeout(() => { //延迟0.5s
uni.navigateBack()
@@ -411,8 +398,27 @@
toast.error(res.message)
}
})
- })
-
+ return;
+ }
+ message
+ .confirm({
+ msg: '确认提交审批吗？',
+ title: '提示',
+ })
+ .then(() => {
+ model.fileList = JSON.stringify(fileListTemp.value)
+ processComplete(model.value).then(res => {
+ if (res.success) {//跳转页面或加载下一个任务
+ toast.success(res.message)
+ setTimeout(() => { //延迟0.5s
+ uni.navigateBack()
+ }, 1000)
+ } else {
+ toast.error(res.message)
+ }
+ })
+ })
+ }
}
const handleManyProcessComplete = () => { //驳回任务提交
@@ -434,7 +440,6 @@
let yy = new Date().getFullYear();
let mm = new Date().getMonth() + 1;
usePath.value = yy + '-' + mm + '-' + '流程办理附件';
- console.log(usePath)
})
diff --git a/src/pages-process/myApplyProcess.vue b/src/pages-process/myApplyProcess.vue
index 6775a4a..a087a3e 100644
--- a/src/pages-process/myApplyProcess.vue
+++ b/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,17 +93,26 @@
/**流程取回*/
const callBackProcess = (id) => {
- callBackProcessApi({
- processInstanceId: id
- }).then((res) => {
- if (res.success) {
- list.value = []
- getList()
- toast.success(res.message)
- }else{
- toast.warning(res.message)
- }
- })
+ console.log('----',id)
+ message
+ .confirm({
+ msg: '确认取回流程吗？',
+ title: '提示',
+ })
+ .then(() => {
+ callBackProcessApi({
+ processInstanceId: id
+ }).then((res) => {
+ if (res.success) {
+ list.value = []
+ getList()
+ toast.success(res.message)
+ }else{
+ toast.warning(res.message)
+ }
+ })
+ })
+
}
onReachBottom(() => {