优化

src/router/index.js

@@ -46,8 +46,27 @@ export default new Router({
     component: Main,
     name: '',
     hidden: true,
+    beforeEnter:(to, from, next)=>{
+      console.log(from.fullPath);
+      console.log(to.fullPath);
+      if(to.fullPath == '/main'){
+        let loginUser = JSON.parse(localStorage.getItem('loginUser'));
+        if(loginUser){
+          if(loginUser.role.some(v => v.rolecode == 'first-line support' || v.rolecode == 'second-line support')){
+            next('/main/incidentList/todo/0');
+          }else{
+            next('/main/indes');
+          }
+        }else{
+          next();
+        }
+      }else{
+        next();
+      }
+    },
     children: [{
       path: '/',
+      // redirect: '/main/incidentList/todo/0'
       redirect: '/main/indes'
     },
     {

src/views/grabSheet.vue

@@ -90,7 +90,7 @@
               }}</span>
             </p>
           </div>
-          <cube-form-group class="sub">
+          <cube-form-group class="sub" v-if="model.incident.state.value != 1546 && !model.incident.handlerUser && jurisdiction && qiangdan">
             <cube-button type="submit" @click="subVali()">抢单</cube-button>
           </cube-form-group>
         </div>
@@ -106,8 +106,10 @@ import EventInformation from './../components/EventInformation/index.vue'
 export default {
   data() {
     return {
+      qiangdan: false,
       id: "",
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
+      menu: JSON.parse(localStorage.getItem("menu")),
       selected: 1,
       options: [
         {
@@ -245,33 +247,57 @@ export default {
     subVali() {
       //数据提交
       var that = this;
-      that.$http
-        .post(
-          "service/bpm/bpm/claimAndCompletedTask/" + that.model.incident.taskId,
-          { receive_code: "handler", userId: that.loginUser.id }
-        )
-        .then(function (res) {
-          console.log(res.data);
-          if (res.data.status == 200) {
-            $("#fade").fadeIn();
-            that.promptingConent = "恭喜您,抢单成功!";
-            that.promptingStatus = true;
-            that.dialog = that
-              .$createDialog({
+      this.$createDialog({
+        type: 'confirm',
+        icon: 'cubeic-alert',
+        title: '提示',
+        content: '是否抢单？',
+        confirmBtn: {
+          text: '确定',
+          active: true,
+          disabled: false,
+          href: 'javascript:;'
+        },
+        cancelBtn: {
+          text: '取消',
+          active: false,
+          disabled: false,
+          href: 'javascript:;'
+        },
+        onConfirm: () => {
+          that.$http
+          .post(
+            "service/bpm/bpm/claimAndCompletedTask/" + that.model.incident.taskId,
+            { receive_code: "handler", userId: that.loginUser.id }
+          )
+          .then(function (res) {
+            console.log(res.data);
+            if (res.data.status == 200) {
+              that
+                .$createDialog({
+                  type: "alert",
+                  title: "抢单成功",
+                  content: "点击返回首页",
+                  icon: "cubeic-right",
+                  onConfirm: (e, promptValue) => {
+                    that.$router.push({ path: "/main" });
+                  },
+                })
+                .show();
+            }else{
+              this.$createDialog({
                 type: "alert",
-                title: "抢单成功",
-                content: "点击返回首页",
-                icon: "cubeic-right",
-                onConfirm: (e, promptValue) => {
-                  that.$router.push({ path: "/main" });
-                },
-              })
-              .show();
-            setTimeout(function () {
-              $("#fade").fadeOut();
-            }, 2000);
-          }
-        });
+                title: "系统错误,请稍后再试!",
+                icon: "cubeic-wrong",
+              }).show();
+            }
+          });
+        },
+        onCancel: () => {
+
+        }
+      }).show()
+
     },
     // 快速定位
     toInfo(id) {
@@ -292,6 +318,9 @@ export default {
     EventInformation,
   },
   created() {
+    if(this.menu){
+      this.qiangdan = this.menu.some(v => v.link == 'shijianliebiao_qiangdan');
+    }
     // seimin
     this.processInstanceId = this.$route.params.data
       ? this.$route.params.data.processInstanceId

src/views/incidentList.vue

@@ -117,7 +117,15 @@
                     v-show="item.state.id === 1544"
                   >
                     <cube-button @click.stop="addHandlerLog(item)"
-                      >新增维修记录</cube-button
+                      >维修进度</cube-button
+                    >
+                  </cube-form-group>
+                  <cube-form-group
+                    class="sub-btn"
+                     v-if="item.state.value != 1546 && !item.handlerUser && jurisdiction(item) && qiangdan(item)"
+                  >
+                    <cube-button @click.stop="subVali(item)"
+                      >抢单</cube-button
                     >
                   </cube-form-group>
                 </div>
@@ -189,7 +197,6 @@
   </div>
 </template>
 <script>
-import Vue from "vue";
 import showModel from "../components/showModel/showModel.vue";
 import CubePage from "../components/cube-page.vue";
 import SwitchOption from "../components/switch-option";
@@ -214,6 +221,7 @@ export default {
       isAssign: false, //是否有权限指派
       isAll: false, //是否显示全部事件
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
+      menu: JSON.parse(localStorage.getItem("menu")),
       valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
       items: [],
       pullDownRefresh: true,
@@ -235,17 +243,13 @@ export default {
           text: "与我关联",
           value: "done"
         }
-        // {
-        //   text: "我创建",
-        //   value: "create"
-        // }
       ],
       searchsState:[],//状态列表
       searchType: "all",
       searchState: 0,
       type: "all",
       isToday: "",
-      sum: 20,
+      sum: 10,
       idx: 0,
       stateClass: "",
       loadShow: true
@@ -288,6 +292,68 @@ export default {
     }
   },
   methods: {
+    qiangdan(incident){
+      return this.menu.some(v => v.link == 'shijianliebiao_qiangdan');
+    },
+    jurisdiction(incident){
+      return this.loginUser.group.some(v => v.id == incident.candidateGroups);
+    },
+    // 抢单
+    subVali(incident) {
+      //数据提交
+      var that = this;
+      this.$createDialog({
+        type: 'confirm',
+        icon: 'cubeic-alert',
+        title: '提示',
+        content: '是否抢单？',
+        confirmBtn: {
+          text: '确定',
+          active: true,
+          disabled: false,
+          href: 'javascript:;'
+        },
+        cancelBtn: {
+          text: '取消',
+          active: false,
+          disabled: false,
+          href: 'javascript:;'
+        },
+        onConfirm: () => {
+          that.$http
+          .post(
+            "service/bpm/bpm/claimAndCompletedTask/" + incident.taskId,
+            { receive_code: "handler", userId: that.loginUser.id }
+          )
+          .then(function (res) {
+            console.log(res.data);
+            if (res.data.status == 200) {
+              that
+                .$createDialog({
+                  type: "alert",
+                  title: "抢单成功",
+                  content: "点击返回首页",
+                  icon: "cubeic-right",
+                  onConfirm: (e, promptValue) => {
+                    that.$router.push({ path: "/main" });
+                  },
+                })
+                .show();
+            }else{
+              this.$createDialog({
+                type: "alert",
+                title: "系统错误,请稍后再试!",
+                icon: "cubeic-wrong",
+              }).show();
+            }
+          });
+        },
+        onCancel: () => {
+
+        }
+      }).show()
+
+    },
     // 播放音频
     showAudio(callID){
       const toast = this.$createToast({
@@ -488,7 +554,7 @@ export default {
       this.loadShow = true;
       this.items = [];
       this.idx = 0;
-      this.sum = 20;
+      this.sum = 10;
       this.getData();
     },
     toIncidentDetails(data) {
@@ -556,6 +622,15 @@ export default {
         .then((res) => {
           if (res.data.list.length > 0) {
             for (var i = 0; i < res.data.list.length; i++) {
+              delete res.data.list[i].handlingPersonnelUser;
+              delete res.data.list[i].sendBackUser;
+              delete res.data.list[i].colourInfo;
+              if(res.data.list[i].acceptUser){
+                res.data.list[i].acceptUser = {
+                  id: res.data.list[i].acceptUser.id,
+                  name: res.data.list[i].acceptUser.name,
+                };
+              }
               res.data.list[i].createTime = formatDate(
                 new Date(res.data.list[i].createTime),
                 "yyyy-MM-dd hh:mm"
@@ -578,6 +653,15 @@ export default {
         .then((res) => {
           if (res.data.data.length > 0) {
             for (var i = 0; i < res.data.data.length; i++) {
+              delete res.data.data[i].handlingPersonnelUser;
+              delete res.data.data[i].sendBackUser;
+              delete res.data.data[i].colourInfo;
+              if(res.data.data[i].acceptUser){
+                res.data.data[i].acceptUser = {
+                  id: res.data.data[i].acceptUser.id,
+                  name: res.data.data[i].acceptUser.name,
+                };
+              }
               res.data.data[i].createTime = formatDate(
                 new Date(res.data.data[i].createTime),
                 "yyyy-MM-dd hh:mm"
@@ -598,7 +682,7 @@ export default {
     },
     onPullingDown() {
       this.idx = 0;
-      this.sum = 20;
+      this.sum = 10;
       this.getData();
     },
     onPullingUp() {