优化指派

config/index.js

@@ -14,6 +14,14 @@ module.exports = {
     proxyTable: {
       '/service': {//自定义名字，代表的是以下target中的内容
         // target: host.host+'/service/',//微信
+        target: 'http://192.168.4.240',//微信
+        changeOrigin: true,//是否允许跨域
+        // pathRewrite: {
+        //   '^/service': ''
+        // }
+      },
+      '/file': {//自定义名字，代表的是以下target中的内容
+        // target: host.host+'/service/',//微信
         target: 'http://192.168.3.111',//微信
         changeOrigin: true,//是否允许跨域
         // pathRewrite: {

src/App.vue

@@ -13,6 +13,10 @@ export default {
 </script>
 
 <style lang='less'>
+.cube-switch .cube-switch-input:checked + .cube-switch-ui{
+  border-color: #005395!important;
+  background-color: #005395!important;
+}
 .cube-picker-wheel-item{
   font-size: 12px!important;
 }

src/components/showModel/showModel.vue

@@ -39,11 +39,12 @@
             @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-select
             v-model="selectUserId"
             :options="selectDataUser"
             placeholder="请选择指派对象"
-            style="margin-top:0.2rem;"
+            style="margin-top:0.2rem;" v-if="isRadioUser"
           ></cube-select>
         </div>
         <div v-if="textName === 'textarea'">
@@ -124,6 +125,8 @@
 export default {
   data() {
     return {
+      isShowRadioUser: false,
+      isRadioUser: false,
       consumablesNum: this.data ? (this.data.consumablesNum ? this.data.consumablesNum : 1) : 1,
       workHourNum2: this.data ? (this.data.workHourNum2 ? this.data.workHourNum2 : 1) : 1,
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
@@ -218,6 +221,11 @@ export default {
       type: String,
       default: ""
     },
+    // 下拉框(user)
+    dataObj: {
+      type: Object,
+      default: () => {}
+    },
     // 文本块(维修记录)
     textName: {
       type: String,
@@ -234,6 +242,9 @@ export default {
     }
   },
   methods: {
+    changeRadioUser(){
+      this.selectUserId = undefined;
+    },
     copyTo(value){
       this.textareaData += value;
     },
@@ -389,7 +400,7 @@ export default {
     // 确定
     ok() {
       if (this.selectName === "user") {
-        this.$emit("ok", this.selectUserId);
+        this.$emit("ok", {selectUserId: this.selectUserId, isRadioUser: this.isRadioUser, selectGroupId: this.selectGroupId});
       } else if (this.selectName === "hc_add" || this.selectName === "hc_edit") {
         this.$emit("ok", {hc: this.data.hc, consumablesNum:this.consumablesNum});
       } else if (this.selectName === "gs_edit") {
@@ -429,6 +440,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.textName === "textarea") {
       this.getLogs();

src/views/IncidentNewList.vue

@@ -180,6 +180,7 @@
       @cancel="cancel"
       :operate="models.operate"
       selectName="user"
+      :dataObj="modelsData"
     ></showModel>
     <!-- 新增维修记录弹窗 -->
     <showModel
@@ -418,9 +419,10 @@ export default {
       this.audioMask=false;
     },
     //确定
-    ok(selectUserId) {
-      console.log(selectUserId);
-      if (!selectUserId) {
+    ok(data) {
+      let {selectUserId, isRadioUser, selectGroupId} = data;
+      console.log(data);
+      if (isRadioUser && !selectUserId) {
         this.$createDialog({
           type: "alert",
           title: "请选择指派对象",
@@ -428,19 +430,37 @@ export default {
         }).show();
         return;
       }
+      if (!isRadioUser && !selectGroupId) {
+        this.$createDialog({
+          type: "alert",
+          title: "请选择工作组",
+          icon: "cubeic-warn"
+        }).show();
+        return;
+      }
       const toast = this.$createToast({
         txt: "Loading...",
         mask: true
       });
       toast.show();
-      this.$http
-        .post("service/bpm/bpm/delegateTask/" + this.modelsData.taskId, {
+      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)
+      }
+      this.$http
+        .post("service/bpm/bpm/delegateTask/" + this.modelsData.taskId, postData)
         .then(res => {
           toast.hide();
           this.models.disjunctor = false;
@@ -477,6 +497,7 @@ export default {
     },
     // 指派
     assign(item) {
+      console.log(item)
       this.modelsData = item;
       this.models = {
         disjunctor: true,

src/views/incidentList.vue

@@ -191,6 +191,7 @@
       @cancel="cancel"
       :operate="models.operate"
       selectName="user"
+      :dataObj="modelsData"
     ></showModel>
     <!-- 新增维修记录弹窗 -->
     <showModel
@@ -392,9 +393,10 @@ export default {
       this.audioMask=false;
     },
     //确定
-    ok(selectUserId) {
-      console.log(selectUserId);
-      if (!selectUserId) {
+    ok(data) {
+      let {selectUserId, isRadioUser, selectGroupId} = data;
+      console.log(data);
+      if (isRadioUser && !selectUserId) {
         this.$createDialog({
           type: "alert",
           title: "请选择指派对象",
@@ -402,19 +404,37 @@ export default {
         }).show();
         return;
       }
+      if (!isRadioUser && !selectGroupId) {
+        this.$createDialog({
+          type: "alert",
+          title: "请选择工作组",
+          icon: "cubeic-warn"
+        }).show();
+        return;
+      }
       const toast = this.$createToast({
         txt: "Loading...",
         mask: true
       });
       toast.show();
-      this.$http
-        .post("service/bpm/bpm/delegateTask/" + this.modelsData.taskId, {
+      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)
+      }
+      this.$http
+        .post("service/bpm/bpm/delegateTask/" + this.modelsData.taskId, postData)
         .then(res => {
           toast.hide();
           this.models.disjunctor = false;