修复驳回到发起人；审批意见加默认值‘同意’

src/api/platform/bpmn/bpmTask.js

@@ -1,16 +1,16 @@
-import request from '@/utils/request'
-import ActionUtil from '@/utils/action'
-import { BPMN_URL } from '@/api/baseUrl'
+import request from "@/utils/request";
+import ActionUtil from "@/utils/action";
+import { BPMN_URL } from "@/api/baseUrl";
 /**
  * 查询列表数据
  * @param {*} params
  */
 export function queryPageList(params) {
   return request({
-    url: BPMN_URL() + '/bpm/task/query',
-    method: 'post',
+    url: BPMN_URL() + "/bpm/task/query",
+    method: "post",
     data: params
-  })
+  });
 }
 
 /**
@@ -19,11 +19,11 @@ export function queryPageList(params) {
  */
 export function remove(params) {
   return request({
-    url: BPMN_URL() + '/bpm/task/remove',
-    method: 'post',
+    url: BPMN_URL() + "/bpm/task/remove",
+    method: "post",
     isLoading: true,
     params: params
-  })
+  });
 }
 
 /**
@@ -32,10 +32,10 @@ export function remove(params) {
  */
 export function get(params) {
   return request({
-    url: BPMN_URL() + '/bpm/task/get',
-    method: 'get',
+    url: BPMN_URL() + "/bpm/task/get",
+    method: "get",
     params: params
-  })
+  });
 }
 
 /**
@@ -44,11 +44,11 @@ export function get(params) {
  */
 export function lock(params) {
   return request({
-    url: BPMN_URL() + '/bpm/task/lock',
-    method: 'post',
+    url: BPMN_URL() + "/bpm/task/lock",
+    method: "post",
     isLoading: true,
     params: params
-  })
+  });
 }
 
 /**
@@ -57,11 +57,11 @@ export function lock(params) {
  */
 export function unlock(params) {
   return request({
-    url: BPMN_URL() + '/bpm/task/unlock',
-    method: 'post',
+    url: BPMN_URL() + "/bpm/task/unlock",
+    method: "post",
     isLoading: true,
     params: params
-  })
+  });
 }
 
 /**
@@ -71,11 +71,11 @@ export function unlock(params) {
  */
 export function complete(params) {
   return request({
-    url: BPMN_URL() + '/bpm/task/complete',
-    method: 'post',
+    url: BPMN_URL() + "/bpm/task/complete",
+    method: "post",
     isLoading: true,
     data: ActionUtil.formatParams(params)
-  })
+  });
 }
 
 /**
@@ -84,11 +84,11 @@ export function complete(params) {
  */
 export function doEndProcess(params) {
   return request({
-    url: BPMN_URL() + '/bpm/task/doEndProcess',
-    method: 'post',
+    url: BPMN_URL() + "/bpm/task/doEndProcess",
+    method: "post",
     isLoading: true,
     params: params
-  })
+  });
 }
 
 /**
@@ -97,11 +97,11 @@ export function doEndProcess(params) {
  */
 export function suspendProcess(params) {
   return request({
-    url: BPMN_URL() + '/bpm/task/suspendProcess',
-    method: 'post',
+    url: BPMN_URL() + "/bpm/task/suspendProcess",
+    method: "post",
     isLoading: true,
     params: params
-  })
+  });
 }
 
 /**
@@ -110,11 +110,11 @@ export function suspendProcess(params) {
  */
 export function recoverProcess(params) {
   return request({
-    url: BPMN_URL() + '/bpm/task/recoverProcess',
-    method: 'post',
+    url: BPMN_URL() + "/bpm/task/recoverProcess",
+    method: "post",
     isLoading: true,
     params: params
-  })
+  });
 }
 
 /**
@@ -123,11 +123,11 @@ export function recoverProcess(params) {
  */
 export function doAddSignTask(data) {
   return request({
-    url: BPMN_URL() + '/bpm/task/doAddSignTask',
-    method: 'post',
+    url: BPMN_URL() + "/bpm/task/doAddSignTask",
+    method: "post",
     isLoading: true,
     data: data
-  })
+  });
 }
 
 /**
@@ -136,11 +136,11 @@ export function doAddSignTask(data) {
  */
 export function saveTaskChange(data) {
   return request({
-    url: BPMN_URL() + '/bpm/task/chage/save',
-    method: 'post',
+    url: BPMN_URL() + "/bpm/task/chage/save",
+    method: "post",
     isLoading: true,
     data: data
-  })
+  });
 }
 
 /**
@@ -149,10 +149,10 @@ export function saveTaskChange(data) {
  */
 export function getNodeApproval(params) {
   return request({
-    url: BPMN_URL() + '/bpm/task/nodeApproval',
-    method: 'get',
+    url: BPMN_URL() + "/bpm/task/nodeApproval",
+    method: "get",
     params: params
-  })
+  });
 }
 
 /**
@@ -162,11 +162,11 @@ export function getNodeApproval(params) {
  */
 export function completeBatch(params) {
   return request({
-    url: BPMN_URL() + '/bpm/task/completeBatch',
-    method: 'post',
+    url: BPMN_URL() + "/bpm/task/completeBatch",
+    method: "post",
     isLoading: true,
     data: ActionUtil.formatParams(params)
-  })
+  });
 }
 
 /**
@@ -175,11 +175,11 @@ export function completeBatch(params) {
  */
 export function batchSuspendProcess(params) {
   return request({
-    url: BPMN_URL() + '/bpm/task/batchSuspendProcess',
-    method: 'post',
+    url: BPMN_URL() + "/bpm/task/batchSuspendProcess",
+    method: "post",
     isLoading: true,
     params: params
-  })
+  });
 }
 
 /**
@@ -188,11 +188,11 @@ export function batchSuspendProcess(params) {
  */
 export function batchRecoverProcess(params) {
   return request({
-    url: BPMN_URL() + '/bpm/task/batchRecoverProcess',
-    method: 'post',
+    url: BPMN_URL() + "/bpm/task/batchRecoverProcess",
+    method: "post",
     isLoading: true,
     params: params
-  })
+  });
 }
 
 /**
@@ -201,11 +201,11 @@ export function batchRecoverProcess(params) {
  */
 export function save(params) {
   return request({
-    url: BPMN_URL() + '/bpm/task/save',
-    method: 'post',
+    url: BPMN_URL() + "/bpm/task/save",
+    method: "post",
     isLoading: true,
     data: params
-  })
+  });
 }
 
 /**
@@ -214,11 +214,11 @@ export function save(params) {
  */
 export function assignee(params) {
   return request({
-    url: BPMN_URL() + '/bpm/task/assignee',
-    method: 'post',
+    url: BPMN_URL() + "/bpm/task/assignee",
+    method: "post",
     isLoading: true,
     params: params
-  })
+  });
 }
 
 /**
@@ -227,10 +227,10 @@ export function assignee(params) {
  */
 export function getTaskFormData(params) {
   return request({
-    url: BPMN_URL() + '/bpm/task/getFormData',
-    method: 'get',
+    url: BPMN_URL() + "/bpm/task/getFormData",
+    method: "get",
     params: params
-  })
+  });
 }
 
 /**
@@ -239,10 +239,10 @@ export function getTaskFormData(params) {
  */
 export function agreeData(data) {
   return request({
-    url: BPMN_URL() + '/bpm/task/agreeData/vo',
-    method: 'post',
+    url: BPMN_URL() + "/bpm/task/agreeData/vo",
+    method: "post",
     data: data
-  })
+  });
 }
 
 /**
@@ -251,10 +251,10 @@ export function agreeData(data) {
  */
 export function toAgree(params) {
   return request({
-    url: BPMN_URL() + '/bpm/task/toAgree',
-    method: 'get',
+    url: BPMN_URL() + "/bpm/task/toAgree",
+    method: "get",
     params: params
-  })
+  });
 }
 
 /**
@@ -263,10 +263,10 @@ export function toAgree(params) {
  */
 export function toAddSignTask(params) {
   return request({
-    url: BPMN_URL() + '/bpm/task/toAddSignTask',
-    method: 'get',
+    url: BPMN_URL() + "/bpm/task/toAddSignTask",
+    method: "get",
     params: params
-  })
+  });
 }
 
 /**
@@ -275,10 +275,10 @@ export function toAddSignTask(params) {
  */
 export function toReject(params) {
   return request({
-    url: BPMN_URL() + '/bpm/task/toReject',
-    method: 'get',
+    url: BPMN_URL() + "/bpm/task/toReject",
+    method: "get",
     params: params
-  })
+  });
 }
 
 /**
@@ -287,10 +287,10 @@ export function toReject(params) {
  */
 export function toRejectToPrevious(params) {
   return request({
-    url: BPMN_URL() + '/bpm/task/toRejectToPrevious',
-    method: 'get',
+    url: BPMN_URL() + "/bpm/task/toRejectToPrevious",
+    method: "get",
     params: params
-  })
+  });
 }
 
 /**
@@ -299,10 +299,10 @@ export function toRejectToPrevious(params) {
  */
 export function toRejectToStart(params) {
   return request({
-    url: BPMN_URL() + '/bpm/task/toRejectToPrevious',
-    method: 'get',
+    url: BPMN_URL() + "/bpm/task/toRejectStarter",
+    method: "get",
     params: params
-  })
+  });
 }
 
 /**
@@ -311,11 +311,11 @@ export function toRejectToStart(params) {
  */
 export function agree(params) {
   return request({
-    url: BPMN_URL() + '/bpm/task/agree',
-    method: 'post',
+    url: BPMN_URL() + "/bpm/task/agree",
+    method: "post",
     isLoading: true,
     data: params
-  })
+  });
 }
 
 /**
@@ -324,11 +324,11 @@ export function agree(params) {
  */
 export function agreeBatch(params) {
   return request({
-    url: BPMN_URL() + '/bpm/task/agree/batch',
-    method: 'post',
+    url: BPMN_URL() + "/bpm/task/agree/batch",
+    method: "post",
     isLoading: true,
     data: params
-  })
+  });
 }
 
 /**
@@ -337,11 +337,11 @@ export function agreeBatch(params) {
  */
 export function oppose(params) {
   return request({
-    url: BPMN_URL() + '/bpm/task/oppose',
-    method: 'post',
+    url: BPMN_URL() + "/bpm/task/oppose",
+    method: "post",
     isLoading: true,
     data: params
-  })
+  });
 }
 
 /**
@@ -350,10 +350,10 @@ export function oppose(params) {
  */
 export function reject(params) {
   return request({
-    url: BPMN_URL() + '/bpm/task/reject',
-    method: 'post',
+    url: BPMN_URL() + "/bpm/task/reject",
+    method: "post",
     data: params
-  })
+  });
 }
 
 /**
@@ -362,11 +362,11 @@ export function reject(params) {
  */
 export function rejectToStarter(params) {
   return request({
-    url: BPMN_URL() + '/bpm/task/reject/starter',
-    method: 'post',
+    url: BPMN_URL() + "/bpm/task/reject/starter",
+    method: "post",
     isLoading: true,
     data: params
-  })
+  });
 }
 
 /**
@@ -375,11 +375,11 @@ export function rejectToStarter(params) {
  */
 export function rejectToPrevious(params) {
   return request({
-    url: BPMN_URL() + '/bpm/task/reject/previous',
-    method: 'post',
+    url: BPMN_URL() + "/bpm/task/reject/previous",
+    method: "post",
     isLoading: true,
     data: params
-  })
+  });
 }
 
 /**
@@ -388,11 +388,11 @@ export function rejectToPrevious(params) {
  */
 export function revoke(params) {
   return request({
-    url: BPMN_URL() + '/bpm/task/revoke',
-    method: 'post',
+    url: BPMN_URL() + "/bpm/task/revoke",
+    method: "post",
     isLoading: true,
     data: params
-  })
+  });
 }
 
 /**
@@ -401,11 +401,11 @@ export function revoke(params) {
  */
 export function abandon(params) {
   return request({
-    url: BPMN_URL() + '/bpm/task/abandon',
-    method: 'post',
+    url: BPMN_URL() + "/bpm/task/abandon",
+    method: "post",
     isLoading: true,
     data: params
-  })
+  });
 }
 
 /**
@@ -414,9 +414,9 @@ export function abandon(params) {
  */
 export function bpmTaskSave(params) {
   return request({
-    url: BPMN_URL() + '/bpm/task/save/task',
-    method: 'post',
+    url: BPMN_URL() + "/bpm/task/save/task",
+    method: "post",
     isLoading: true,
     data: params
-  })
+  });
 }

src/business/platform/bpmn/components/approval-opinion/index.vue

@@ -119,6 +119,13 @@ export default {
     inputAlign: {
       type: String,
       default: 'left'
+    },
+    value: {
+      type: String
+    },
+    unCompleteOpinion: {
+      type: String,
+      // default: '退回修改'
     }
   },
   data() {
@@ -139,6 +146,11 @@ export default {
       }
     }
   },
+  created () {
+    setTimeout(() => {
+      this.inputValue = this.unCompleteOpinion || this.value || '同意'
+    }, 500)
+  },
   methods: {
     onCommonStatment() {
       this.commonStatmentPopup = true