Merge remote-tracking branch 'origin/master'

src/views/modules/flowable/task/TaskForm.vue

@@ -58,7 +58,7 @@
       </el-form-item>
     </el-col>
     <el-col :span="16">
-      <el-form-item>
+      <el-form-item v-if="isShow === 'true'">
         <el-checkbox v-model="isAssign">指定下一步处理者(不设置就使用默认处理人)</el-checkbox>
       </el-form-item>
     </el-col>
@@ -218,6 +218,11 @@
         this.auditForm.assignee = null
         this.auditForm.userIds = null
         this.auditForm.message = ''
+        if (this.$route.query.isShow === undefined || this.$route.query.isShow === '') {
+          this.isShow = 'true'
+        } else {
+          this.isShow = this.$route.query.isShow
+        }
       },
       cc (procInsId) {
         if (this.isCC && this.auditForm.userIds) {
@@ -250,10 +255,11 @@
       // 启动流程
       start (vars) {
         if (this.formType === '2') { // 外置表单
-          if (this.status === 'startAndHold') {
+          if (this.status === 'startAndHold' || this.status === 'startAndClose') {
             this.$refs.form.saveForm((businessTable, businessId, inputForm) => {
               vars = {...vars, ...inputForm}
               this.taskService.start({
+                procDefId: this.procDefId,
                 procDefKey: this.procDefKey,
                 businessTable: businessTable,
                 businessId: businessId,
@@ -425,7 +431,7 @@
       },
       // 关闭
       close () {
-        if (this.status === 'startAndHold') {
+        if (this.status === 'startAndHold' || this.status === 'startAndClose') {
           this.businessId = 'false'
           this.$store.dispatch('tagsView/delView', {fullPath: this.$route.fullPath})
           this.$router.push('../../../sys/workContract/WorkContractList')