事件列表修改

config/index.js

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

src/router/index.js

@@ -52,7 +52,7 @@ export default new Router({
       },
     },
     {
-      path: '/main/incidentList/:type',
+      path: '/main/incidentList/:type/:isToday?',
       name: 'IncidentList',
       component: IncidentList,
       meta: {

src/views/Main.vue

@@ -1,14 +1,14 @@
 <template>
     <div class="fle bgColor">
         <transition name="fade" mode="out-in">
-            <router-view class="fleHeight"></router-view>
+            <router-view class="fleHeight" :key="$route.fullPath"></router-view>
         </transition>
         <div class="section2">
             <router-link to="/main/indes" class="link" active-class="active">
                 <i class="iconfont icon-shouyexian"></i>
                 <span>首页</span>
             </router-link>
-            <router-link to="/main/incidentList/all" class="link" active-class="active">
+            <router-link to="/main/incidentList/todo/" class="link" active-class="active">
                 <i class="iconfont icon-baoxiuxian"></i>
                 <span>事件</span>
             </router-link>

src/views/incidentList.vue

@@ -3,12 +3,20 @@
     <div slot="content" class="scroll-wrapper">
       <div class="demo">
         <div class="header">事件列表</div>
-        <cube-select
-          class="stateSearch"
-          v-model="searchType"
-          :options="searchsType"
-          @change="stateChange()"
-        ></cube-select>
+        <div class="stateSearchWrap">
+          <cube-select
+            class="stateSearch"
+            v-model="searchType"
+            :options="searchsType"
+            @change="typeChange()"
+          ></cube-select>
+          <cube-select
+            class="stateSearch"
+            v-model="searchState"
+            :options="searchsState"
+            @change="typeChange()"
+          ></cube-select>
+        </div>
         <div class="scroll-list-wrap">
           <cube-scroll
             ref="scroll"
@@ -188,6 +196,7 @@ export default {
         disjunctor: false
       },
       isAssign: false, //是否有权限指派
+      isAll: false, //是否显示全部事件
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
       valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
       items: [],
@@ -203,15 +212,11 @@ export default {
       candidateGroups: "",
       searchsType: [
         {
-          text: "全部",
-          value: "userAll"
-        },
-        {
-          text: "待处理",
+          text: "待我处理",
           value: "todo"
         },
         {
-          text: "处理过",
+          text: "与我关联",
           value: "done"
         }
         // {
@@ -219,8 +224,11 @@ export default {
         //   value: "create"
         // }
       ],
-      searchType: "userAll",
+      searchsState:[],//状态列表
+      searchType: "all",
+      searchState: 0,
       type: "all",
+      isToday: "",
       sum: 10,
       idx: 0,
       stateClass: "",
@@ -405,22 +413,22 @@ export default {
     getParamsState() {
       if (this.$route.params.type) {
         this.type = this.$route.params.type;
+        this.isToday = this.$route.params.isToday;
         if (this.type === "todo") {
           this.searchType = "todo";
         } else if (this.type === "done") {
           this.searchType = "done";
         } else {
-          this.searchType = "userAll";
+          this.searchType = "all";
         }
       }
     },
-    stateChange() {
-      var that = this;
+    typeChange() {
       this.loadShow = true;
-      that.items = [];
-      that.idx = 0;
-      that.sum = 10;
-      that.getData();
+      this.items = [];
+      this.idx = 0;
+      this.sum = 10;
+      this.getData();
     },
     toIncidentDetails(data) {
       console.log(1111111);
@@ -452,25 +460,53 @@ export default {
     },
 
     getData() {
-      var that = this;
       let postData = {
-        assignee: that.loginUser.id,
-        candidateGroups: that.candidateGroups,
-        searchType: that.searchType,
-        idx: that.idx,
-        sum: that.sum,
-        incident: { temporary: true }
+        assignee: this.loginUser.id,
+        candidateGroups: this.candidateGroups,
+        searchType: this.searchType,
+        idx: this.idx,
+        sum: this.sum,
+        incident: { temporary: true,statusId:this.searchState?this.searchState:undefined }
       };
-      if (this.type === "today") {
+      if (this.isToday == "today") {
         postData.incident.acceptDate =
           formatDate(new Date(), "yyyy-MM-dd") + " 00:00:00";
         postData.incident.acceptDateEnd =
           formatDate(new Date(), "yyyy-MM-dd") + " 23:59:59";
       }
-
-      that.$http
+      if(this.searchType === 'all'){
+        // 全部事件
+        if(this.loginUser.duty){
+            // 当前的所属责任科室
+            postData.incident.duty = this.loginUser.duty;
+        }else if(this.loginUser.branch){
+            // 当前的所属院区
+            postData.incident.branch = this.loginUser.branch.id;
+        }
+        this.$http
+        .post("service/user/data/fetchDataList/incident", postData)
+        .then((res) => {
+          if (res.data.list.length > 0) {
+            for (var i = 0; i < res.data.list.length; i++) {
+              res.data.list[i].createTime = formatDate(
+                new Date(res.data.list[i].createTime),
+                "yyyy-MM-dd hh:mm"
+              );
+            }
+            if (this.idx) {
+              this.items = this.items.concat(res.data.list);
+            } else {
+              this.items = res.data.list;
+            }
+          } else {
+            this.pullUpLoad = false;
+          }
+          this.loadShow = false;
+        });
+      }else{
+        this.$http
         .post("service/bpm/bpm/fetchTask/bpm_incident", postData)
-        .then(function(res) {
+        .then((res) => {
           if (res.data.data.length > 0) {
             for (var i = 0; i < res.data.data.length; i++) {
               res.data.data[i].createTime = formatDate(
@@ -478,16 +514,17 @@ export default {
                 "yyyy-MM-dd hh:mm"
               );
             }
-            if (that.idx) {
-              that.items = that.items.concat(res.data.data);
+            if (this.idx) {
+              this.items = this.items.concat(res.data.data);
             } else {
-              that.items = res.data.data;
+              this.items = res.data.data;
             }
           } else {
-            that.pullUpLoad = false;
+            this.pullUpLoad = false;
           }
-          that.loadShow = false;
+          this.loadShow = false;
         });
+      }
     },
     onPullingDown() {
       var that = this;
@@ -531,6 +568,14 @@ export default {
         this.$refs.scroll.destroy();
         this.$refs.scroll.initScroll();
       });
+    },
+    // 获取事件状态
+    getStateList(){
+      this.$http
+        .post("service/common/common/getDictionary", {"type":"list","key":"incident_status"})
+        .then((res) => {
+          this.searchsState = [{text:'全部',value:0},...res.data.map(v=>({text:v.name,value:v.id}))]
+        });
     }
   },
   created() {
@@ -538,6 +583,13 @@ export default {
     let menu = JSON.parse(localStorage.getItem("menu"));
     if (menu) {
       this.isAssign = menu.some(v => v.link == "shijianliebiao_assign");
+      this.isAll = menu.some(v => v.link == "shijianliebiao_all");
+      if(this.isAll){
+        this.searchsType.unshift({
+          text: "全部事件",
+          value: "all"
+        })
+      }
     }
     that.loginUser.group.forEach(element => {
       that.candidateGroups += element.id + ",";
@@ -549,6 +601,7 @@ export default {
     this.getParamsState();
     this.loadShow = true;
     this.getData();
+    this.getStateList();
 
     localStorage.removeItem("modelData");
     // localStorage.removeItem("category");
@@ -698,11 +751,15 @@ export default {
   top: 0;
   z-index: 6;
 }
-.stateSearch {
+.stateSearchWrap{
   width: 100%;
   position: fixed;
   top: 0.88rem;
   z-index: 6;
+  display: flex;
+  .stateSearch {
+    flex: 1;
+  }
 }
 .bgColor {
   background-color: white;

src/views/indes.vue

@@ -42,22 +42,20 @@
         v-if="!newStatisticsLoading && isShowNewStatistics"
       >
         <div class="buildOrder">
-          <router-link
-            class="buildOrderItem"
-            :to="{ path: '/main/incidentList/today' }"
-            tag="div"
+          <div
+            class="buildOrderItem" 
+            @click="goTo('/main/incidentList/all/today')"
           >
             <div class="s_num">{{ newStatistics.createOrders }}</div>
             <div>今日建单</div>
-          </router-link>
-          <router-link
-            class="buildOrderItem"
-            :to="{ path: '/main/incidentList/todo' }"
-            tag="div"
+          </div>
+          <div
+            class="buildOrderItem" 
+            @click="goTo('/main/incidentList/todo/')"
           >
             <div class="s_num">{{ newStatistics.todoOrders }}</div>
             <div>待处理</div>
-          </router-link>
+          </div>
         </div>
         <div class="attendance" v-if="ifWorking == 1">
           <router-link
@@ -246,6 +244,7 @@ import { SM } from "./../http/http";
 export default {
   data() {
     return {
+      isAll:false,//是否显示全部事件权限
       wxClQuestions: localStorage.getItem("wxClQuestions"),
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
       incidentWithConsumable: localStorage.getItem("incidentWithConsumable"), //是否绑定耗材
@@ -272,6 +271,11 @@ export default {
     };
   },
   methods: {
+    goTo(url){
+      if(this.isAll){
+        this.$router.push(url);
+      }
+    },
     scan() {
       // this.$router.push({name:'ScanResult',params:{data:'[{"name":"资产名称","value":"哈哈哈"},{"name":"数量","value":"12"}]'}});
       SM(this).then(ress1 => {
@@ -353,7 +357,7 @@ export default {
       this.$router.push({ path: "/noticeList" });
     },
     toIncidentList(searchType) {
-      this.$router.push({ path: "/main/incidentList/" + searchType });
+      this.$router.push({ path: "/main/incidentList/" + searchType + '/' });
     },
     // toKnowList() {
     //   this.$router.push({ path: "/knowList" });
@@ -392,6 +396,11 @@ export default {
     }
   },
   created() {
+    // 判断全部事件是否显示权限
+    let menu = JSON.parse(localStorage.getItem("menu"));
+    if (menu) {
+      this.isAll = menu.some(v => v.link == "shijianliebiao_all");
+    }
     this.isShowNewStatistics = this.loginUser.role.some(
       v =>
         v.rolecode == "incident-category-manager" ||

src/views/my.vue

@@ -125,6 +125,7 @@ import "./../../static/css/iconfont.js";
 export default {
   data() {
     return {
+      isAll:false,//是否显示全部事件权限
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
       valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
       ifWorking: localStorage.getItem("ifWorking"), //是否开通上下班
@@ -284,7 +285,9 @@ export default {
     },
     // 跳转到事件列表
     toIncidentList(searchType) {
-      this.$router.push({ path: "/main/incidentList/" + searchType });
+      if(!(searchType === 'all' && !this.isAll)){
+        this.$router.push({ path: "/main/incidentList/" + searchType + '/' });
+      }
     },
     // 巡检列表
     toinspectionList(state) {
@@ -334,6 +337,11 @@ export default {
     },
   },
   created() {
+    // 判断全部事件是否显示权限
+    let menu = JSON.parse(localStorage.getItem("menu"));
+    if (menu) {
+      this.isAll = menu.some(v => v.link == "shijianliebiao_all");
+    }
     this.getGroups();
     this.getIncidentData();
     if(this.ifWorking == 1){

src/views/newIncident.vue

@@ -27,6 +27,10 @@
     >
       <cube-form-group>
         <cube-form-item
+          :field="fields[24]"
+          class="btn_plcaeholde"
+        ></cube-form-item>
+        <cube-form-item
           :field="fields[20]"
           v-if="valConfig == 2"
           class="btn_plcaeholde btn_local"
@@ -365,6 +369,7 @@ export default {
         assetId: "", //资产
         category: [],
         source: "", //事件来源
+        branch: "", //院区
         title: "", //事件主题
         priority: "", //优先级
         emergency: "", //紧急度
@@ -377,7 +382,7 @@ export default {
         candidateGroups: "", //处理组
         solutionType: [], //知识库类型
         handleUserOrGroup: false, //处理人or处理组
-        room: "" //房间号
+        room: "", //房间号
       },
       selectedCategoryTxt: "", //事件分类选中展示
       selectedPlaceTxt: "", //区域地点选中展示
@@ -385,6 +390,7 @@ export default {
       promptingConent: "",
       promptingStatus: "",
       order: 1, //处理方式  1：直接处理，2:派单
+      branchArr: [], //院区数组
       sourceArr: [], //事件来源数组
       priorityArr: [], //优先级数组
       emergencyArr: [], //紧急度数组
@@ -736,7 +742,20 @@ export default {
           rules: {
             required: false
           }
-        }
+        },
+        {
+          type: "select",
+          modelKey: "branch",
+          label: "院区:",
+          props: {
+            options: this.branchArr,
+            title: "请选择院区",
+            placeholder: "请选择院区"
+          },
+          rules: {
+            required: true
+          }
+        },
       ]
     };
   },
@@ -825,6 +844,27 @@ export default {
           that.fields[5].props.options = that.sourceArr;
         });
     },
+    // 获取院区
+    getBranch() {
+      this.$http
+        .post("service/user/data/fetchDataList/branch", {"idx":0,"sum":100})
+        .then((res) => {
+          if(res.data.status == 200){
+            res.data.list.forEach((v) => {
+              this.branchArr.push({
+                text: v.hosName,
+                value: v.id
+              });
+            });
+            this.fields[24].props.options = this.branchArr;
+            if(this.loginUser.duty){
+              this.model.branch = this.loginUser.duty.branch;
+            }else if(this.loginUser.branch){
+              this.model.branch = this.loginUser.branch.id;
+            }
+          }
+        });
+    },
     // 获取优先级
     getPriority() {
       var that = this;
@@ -1854,6 +1894,8 @@ export default {
   },
   created() {
     console.log(this.$route.params.data);
+    //获取院区
+    this.getBranch();
     //获取事件来源
     this.getSource();
     // 优先级