chencc há 1 ano atrás
pai
commit
53b87f99c4

+ 2 - 0
src/views/bpm/handleTask/components/outsourcedWarehousing/submit.vue

@@ -81,6 +81,7 @@
       },
 
       async _approveTaskThorVariables(status) {
+
         if (status == 1) {
           outsourceAssign({
             businessId: this.businessId,
@@ -95,6 +96,7 @@
           });
         } else if (status == 0) {
           outsourceNotPass({
+            businessId: this.businessId,
             id: this.taskId,
             reason: this.form.reason,
             pass: false

+ 5 - 0
src/views/bpm/handleTask/formParser/formParserDialog.vue

@@ -75,6 +75,9 @@ export default {
   name: 'formParserDialog',
   components: {Parser},
   props: {
+    businessId: {
+      default: ''
+    },
     formParserDialogFlag: {
       type: Boolean,
       default: false
@@ -110,9 +113,11 @@ export default {
         pass: !!status
       };
       let API = !!status ? approveTaskWithVariables : rejectTask
+
       API({
         id: this.form.id,
         reason: this.form.reason,
+        businessId: this.businessId,
         variables
       }).then((res) => {
         if (res.data.code != '-1') {

+ 3 - 2
src/views/bpm/handleTask/index.vue

@@ -127,6 +127,8 @@
             </div>
           </el-col> -->
         </el-card>
+
+        
         <!-- 审批记录 -->
         <el-card
           class="box-card"
@@ -462,8 +464,7 @@
             return;
           }
           // 设置流程信息
-          console.log('==', response);
-          console.log('==++++++++++++++++', this.listData.pcViewRouter);
+
           this.processInstance = response;
           // //将业务表单,注册为动态组件
           // let formCustomCreatePath = JSON.parse(

+ 3 - 3
src/views/bpm/todo/index.vue

@@ -117,6 +117,7 @@
       </ele-pro-table>
     </el-card>
     <handleTask ref="handleTaskRef" @reload="reload"></handleTask>
+
     <handleFormParserTask
       v-if="formParserDialogFlag"
       @reload="reload"
@@ -272,8 +273,6 @@
       /** 处理审批按钮 */
 
       handleAudit(type, row) {
-
-        console.log(type, row,'-------');
         // return
 
         if (type == 'audit') {
@@ -287,6 +286,7 @@
                 // taskDefinitionKey: row.taskDefinitionKey,
                 // formJson:row.formJson,
                 // valueJsom:row.formJson,
+                businessId: row.businessId,
                 ...row
               });
             });
@@ -302,7 +302,7 @@
             });
           }
         } else {
-          console.log(1111);
+
           this.$refs.detailRef.open(row.processInstance.id);
         }
       }

+ 0 - 1
vue.config.js

@@ -33,7 +33,6 @@ module.exports = {
       '/api': {
         // target: 'http://124.71.68.31:50001', // 测试环境
         // target: 'http://124.71.68.31:50001',
-
         target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18186',
         changeOrigin: true, // 只有这个值为true的情况下 s才表示开启跨域