优化

src/components/showModel/showModel.vue

@@ -39,7 +39,7 @@
             @change="changeGroup($event)"
             style="margin-top:0.2rem;"
           ></cube-select>
-          <cube-switch v-model="isRadioUser" style="margin-top:0.2rem;" @input="changeRadioUser" v-if="isShowRadioUser">是否指派到人</cube-switch>
+          <cube-switch v-model="isRadioUser" style="margin-top:0.2rem;" @input="changeRadioUser">是否指派到人</cube-switch>
           <cube-select
             v-model="selectUserId"
             :options="selectDataUser"
@@ -441,13 +441,13 @@ export default {
       this.getZpBranch();
       // this.getZpGroup();
       // this.getZpUser();
-      if(this.dataObj.state.id == 1544){
-        this.isShowRadioUser = false;
-        this.isRadioUser = true;
-      }else{
-        this.isShowRadioUser = true;
-        this.isRadioUser = false;
-      }
+      // if(this.dataObj.state.id == 1544){
+      //   this.isShowRadioUser = false;
+      //   this.isRadioUser = true;
+      // }else{
+      //   this.isShowRadioUser = true;
+      //   this.isRadioUser = false;
+      // }
     }
     if (this.textName === "textarea") {
       this.getLogs();

src/views/IncidentNewList.vue

@@ -444,23 +444,68 @@ export default {
       });
       toast.show();
       let postData = {};
-      if(isRadioUser){
-        postData = {
-          assginee: selectUserId,
-          incId: this.modelsData.assignee ? this.modelsData.id : undefined,
-          handlerIncidentId: this.modelsData.state.value === 'handler' ? this.modelsData.id : undefined,
-          incidentId: this.modelsData.assignee ? undefined : this.modelsData.id,
-          taskType: this.modelsData.state.value == 'handler' ? 'handlerform' : (this.modelsData.state.value == 'pending' ? 'receiveform' : undefined)
-        };
-      }else{
-        postData = {
-          group: selectGroupId,
-          taskType: this.modelsData.state.value == 'handler' ? 'handlerform' : (this.modelsData.state.value == 'pending' ? 'receiveform' : undefined)
-        };
-        console.log(postData)
+      if(selectUserId){
+          // 派人
+          // 接单
+          if(this.modelsData.state.value == 'pending'){
+              postData = {
+                  type: 'receiveAssginee',
+                  userId: selectUserId,
+                  taskId: this.modelsData.taskId,
+                  incidentId: this.modelsData.id,
+              }
+          }
+          // 处理中
+          if(this.modelsData.state.value == 'handler'){
+              postData = {
+                  type: 'handlerAssginee',
+                  userId: selectUserId,
+                  taskId: this.modelsData.taskId,
+                  incidentId: this.modelsData.id,
+              }
+          }
+      } else if(selectGroupId){
+          // 派组
+          // 接单，派组
+          if(this.modelsData.state.value == 'pending'){
+              postData = {
+                  type: 'receiveGroup',
+                  groupId: selectGroupId,
+                  taskId: this.modelsData.taskId,
+                  activityId: 'usertask5',
+                  executionId: this.modelsData.processInstanceId,
+                  incidentId: this.modelsData.id,
+              }
+          }
+          // 处理中
+          if(this.modelsData.state.value == 'handler'){
+              postData = {
+                  type: 'handlerGroup',
+                  groupId: selectGroupId,
+                  taskId: this.modelsData.taskId,
+                  activityId: 'usertask5',
+                  executionId: this.modelsData.processInstanceId,
+                  incidentId: this.modelsData.id,
+              }
+          }
       }
+      // if(isRadioUser){
+      //   postData = {
+      //     assginee: selectUserId,
+      //     incId: this.modelsData.assignee ? this.modelsData.id : undefined,
+      //     handlerIncidentId: this.modelsData.state.value === 'handler' ? this.modelsData.id : undefined,
+      //     incidentId: this.modelsData.assignee ? undefined : this.modelsData.id,
+      //     taskType: this.modelsData.state.value == 'handler' ? 'handlerform' : (this.modelsData.state.value == 'pending' ? 'receiveform' : undefined)
+      //   };
+      // }else{
+      //   postData = {
+      //     group: selectGroupId,
+      //     taskType: this.modelsData.state.value == 'handler' ? 'handlerform' : (this.modelsData.state.value == 'pending' ? 'receiveform' : undefined)
+      //   };
+      //   console.log(postData)
+      // }
       this.$http
-        .post("service/bpm/bpm/delegateTask/" + this.modelsData.taskId, postData)
+        .post("service/bpm/bpm/delegateTask2", postData)
         .then(res => {
           toast.hide();
           this.models.disjunctor = false;

src/views/incidentList.vue

@@ -418,23 +418,68 @@ export default {
       });
       toast.show();
       let postData = {};
-      if(isRadioUser){
-        postData = {
-          assginee: selectUserId,
-          incId: this.modelsData.assignee ? this.modelsData.id : undefined,
-          handlerIncidentId: this.modelsData.state.value === 'handler' ? this.modelsData.id : undefined,
-          incidentId: this.modelsData.assignee ? undefined : this.modelsData.id,
-          taskType: this.modelsData.state.value == 'handler' ? 'handlerform' : (this.modelsData.state.value == 'pending' ? 'receiveform' : undefined)
-        };
-      }else{
-        postData = {
-          group: selectGroupId,
-          taskType: this.modelsData.state.value == 'handler' ? 'handlerform' : (this.modelsData.state.value == 'pending' ? 'receiveform' : undefined)
-        };
-        console.log(postData)
+      if(selectUserId){
+          // 派人
+          // 接单
+          if(this.modelsData.state.value == 'pending'){
+              postData = {
+                  type: 'receiveAssginee',
+                  userId: selectUserId,
+                  taskId: this.modelsData.taskId,
+                  incidentId: this.modelsData.id,
+              }
+          }
+          // 处理中
+          if(this.modelsData.state.value == 'handler'){
+              postData = {
+                  type: 'handlerAssginee',
+                  userId: selectUserId,
+                  taskId: this.modelsData.taskId,
+                  incidentId: this.modelsData.id,
+              }
+          }
+      } else if(selectGroupId){
+          // 派组
+          // 接单，派组
+          if(this.modelsData.state.value == 'pending'){
+              postData = {
+                  type: 'receiveGroup',
+                  groupId: selectGroupId,
+                  taskId: this.modelsData.taskId,
+                  activityId: 'usertask5',
+                  executionId: this.modelsData.processInstanceId,
+                  incidentId: this.modelsData.id,
+              }
+          }
+          // 处理中
+          if(this.modelsData.state.value == 'handler'){
+              postData = {
+                  type: 'handlerGroup',
+                  groupId: selectGroupId,
+                  taskId: this.modelsData.taskId,
+                  activityId: 'usertask5',
+                  executionId: this.modelsData.processInstanceId,
+                  incidentId: this.modelsData.id,
+              }
+          }
       }
+      // if(isRadioUser){
+      //   postData = {
+      //     assginee: selectUserId,
+      //     incId: this.modelsData.assignee ? this.modelsData.id : undefined,
+      //     handlerIncidentId: this.modelsData.state.value === 'handler' ? this.modelsData.id : undefined,
+      //     incidentId: this.modelsData.assignee ? undefined : this.modelsData.id,
+      //     taskType: this.modelsData.state.value == 'handler' ? 'handlerform' : (this.modelsData.state.value == 'pending' ? 'receiveform' : undefined)
+      //   };
+      // }else{
+      //   postData = {
+      //     group: selectGroupId,
+      //     taskType: this.modelsData.state.value == 'handler' ? 'handlerform' : (this.modelsData.state.value == 'pending' ? 'receiveform' : undefined)
+      //   };
+      //   console.log(postData)
+      // }
       this.$http
-        .post("service/bpm/bpm/delegateTask/" + this.modelsData.taskId, postData)
+        .post("service/bpm/bpm/delegateTask2", postData)
         .then(res => {
           toast.hide();
           this.models.disjunctor = false;