浏览代码

事件列表增加【我处理的】筛选条件

seimin 1 年之前
父节点
当前提交
7604f86d2a
共有 2 个文件被更改,包括 64 次插入20 次删除
  1. 22 0
      src/custom/seiminDrawer.vue
  2. 42 20
      src/views/IncidentNewList.vue

+ 22 - 0
src/custom/seiminDrawer.vue

@@ -37,6 +37,13 @@
37 37
               </div>
38 38
             </li>
39 39
           </ul>
40
+          <ul class="tags_selection_custom">
41
+            <li class="J_ping">
42
+              <cube-checkbox v-model="selectData.belongtoMe">
43
+                我处理的
44
+              </cube-checkbox>
45
+            </li>
46
+          </ul>
40 47
           <div id="filterClearBtn" class="J_ping s_btn" @click="clear">
41 48
             清除选项
42 49
           </div>
@@ -80,6 +87,7 @@ export default {
80 87
         area: {id: 0, area: '全部'},
81 88
         category: {id: 0, category: '全部'},
82 89
         selected: 'todo',
90
+        belongtoMe: false,
83 91
       },
84 92
       flag: false,
85 93
       isSelectArea: false,
@@ -95,6 +103,7 @@ export default {
95 103
       this.selectData.area = {id: 0, area: '全部'};
96 104
       this.selectData.category = {id: 0, category: '全部'};
97 105
       this.selectData.selected = 'todo';
106
+      this.selectData.belongtoMe = false;
98 107
     },
99 108
     // 确定
100 109
     confirm(){
@@ -757,6 +766,19 @@ export default {
757 766
     display: none;
758 767
   }
759 768
 
769
+  .tags_selection_custom {
770
+    margin: 15px 0;
771
+    font-size: 14px;
772
+    text-align: center;
773
+    background-color: #fff
774
+  }
775
+  .tags_selection_custom .cube-checkbox{
776
+    padding: 0 10px;
777
+  }
778
+  .tags_selection_custom /deep/ .cube-checkbox_checked .cube-checkbox-ui i{
779
+    color: #005395;
780
+  }
781
+
760 782
   .tags_selection {
761 783
     margin: 15px 0;
762 784
     padding: 10px 0 0 10px;

+ 42 - 20
src/views/IncidentNewList.vue

@@ -8,12 +8,6 @@
8 8
           </div>
9 9
           <div class="header_right"><div class="filter" @click="showDrawer()"><img src="../assets/icon/filter.png" alt=""></div></div>
10 10
         </div>
11
-        <!-- <div class="stateSearchWrap">
12
-          <div class="stateSearch" @click="typeChange(tab)" v-for="tab in tabTypes" :key="tab.id" :class="{active: tabTypeIdActive == tab.id}">
13
-            {{ tab.text }}({{ tab.num }})
14
-            <div class="filter" v-if="tab.id == 2" @click.stop="showDrawer()" :class="{active: tabTypeIdActive == tab.id}"><i class="dash dash-shaixuan"></i></div>
15
-          </div>
16
-        </div> -->
17 11
         <div class="scroll-list-wrap">
18 12
           <cube-scroll
19 13
             ref="scroll"
@@ -241,15 +235,20 @@ export default {
241 235
       wxIncidentId: '',
242 236
       evt: null,
243 237
       isShowDrawer: false,
244
-      tabTypeIdActive: 2,
238
+      tabTypeIdActive: 3,
245 239
       tabTypes: [
246 240
         {
247 241
           id: 1,
248
-          text: "待接单",
242
+          text: "全部",
249 243
           num: 0
250 244
         },
251 245
         {
252 246
           id: 2,
247
+          text: "待接单",
248
+          num: 0
249
+        },
250
+        {
251
+          id: 3,
253 252
           text: "处理中",
254 253
           num: 0
255 254
         }
@@ -839,14 +838,16 @@ export default {
839 838
         }
840 839
       }
841 840
       if(this.$route.params.status){
842
-        this.searchState = this.$route.params.status ? Number(this.$route.params.status) : 0;
841
+        this.searchState = this.$route.params.status ? Number(this.$route.params.status) : undefined;
843 842
       }
844 843
     },
845 844
     typeChange(tab) {
846 845
       this.tabTypeIdActive = tab.id;
847 846
       if(tab.id == 1){
848
-        this.searchState = 1543;
847
+        this.searchState = undefined;
849 848
       }else if(tab.id == 2){
849
+        this.searchState = 1543;
850
+      }else if(tab.id == 3){
850 851
         this.searchState = 1544;
851 852
       }
852 853
       this.loadShow = true;
@@ -897,6 +898,7 @@ export default {
897 898
         searchType: this.searchType,
898 899
         idx: 0,
899 900
         sum: 1,
901
+        belongtoMe: this.evt ? this.evt.belongtoMe : false,
900 902
         incident: { temporary: true,statusId }
901 903
       };
902 904
       if(this.evt && this.evt.category.id){
@@ -925,20 +927,24 @@ export default {
925 927
         this.$http
926 928
         .post("service/user/data/fetchDataList/incident", postData)
927 929
         .then((res) => {
928
-          if(statusId == 1543){
930
+          if(statusId === undefined){
929 931
             this.tabTypes[0].num = res.data.totalNum;
930
-          }else if(statusId == 1544){
932
+          }else if(statusId == 1543){
931 933
             this.tabTypes[1].num = res.data.totalNum;
934
+          }else if(statusId == 1544){
935
+            this.tabTypes[2].num = res.data.totalNum;
932 936
           }
933 937
         });
934 938
       }else{
935 939
         this.$http
936 940
         .post("service/bpm/bpm/fetchTask/bpm_incident", postData)
937 941
         .then((res) => {
938
-          if(statusId == 1543){
942
+          if(statusId === undefined){
939 943
             this.tabTypes[0].num = res.data.resultCount;
940
-          }else if(statusId == 1544){
944
+          }if(statusId == 1543){
941 945
             this.tabTypes[1].num = res.data.resultCount;
946
+          }else if(statusId == 1544){
947
+            this.tabTypes[2].num = res.data.resultCount;
942 948
           }
943 949
         });
944 950
       }
@@ -951,9 +957,10 @@ export default {
951 957
         searchType: this.searchType,
952 958
         idx: this.idx,
953 959
         sum: this.sum,
960
+        belongtoMe: this.evt ? this.evt.belongtoMe : false,
954 961
         incident: {
955 962
           temporary: true,
956
-          statusId:this.searchState?this.searchState:undefined,
963
+          statusId:this.searchState || undefined,
957 964
         }
958 965
       };
959 966
       if(this.evt && this.evt.category.id){
@@ -1006,11 +1013,17 @@ export default {
1006 1013
           } else {
1007 1014
             this.$refs.scroll.forceUpdate();
1008 1015
           }
1009
-          if(this.searchState == 1543){
1016
+          if(this.searchState === undefined){
1010 1017
             this.tabTypes[0].num = res.data.totalNum;
1018
+            this.getNum(1543);
1011 1019
             this.getNum(1544);
1012
-          }else if(this.searchState == 1544){
1020
+          }else if(this.searchState == 1543){
1013 1021
             this.tabTypes[1].num = res.data.totalNum;
1022
+            this.getNum();
1023
+            this.getNum(1544);
1024
+          }else if(this.searchState == 1544){
1025
+            this.tabTypes[2].num = res.data.totalNum;
1026
+            this.getNum();
1014 1027
             this.getNum(1543);
1015 1028
           }
1016 1029
           this.loadShow = false;
@@ -1044,11 +1057,17 @@ export default {
1044 1057
           } else {
1045 1058
             this.$refs.scroll.forceUpdate();
1046 1059
           }
1047
-          if(this.searchState == 1543){
1060
+          if(this.searchState === undefined){
1048 1061
             this.tabTypes[0].num = res.data.resultCount;
1062
+            this.getNum(1543);
1049 1063
             this.getNum(1544);
1050
-          }else if(this.searchState == 1544){
1064
+          }else if(this.searchState == 1543){
1051 1065
             this.tabTypes[1].num = res.data.resultCount;
1066
+            this.getNum();
1067
+            this.getNum(1544);
1068
+          }else if(this.searchState == 1544){
1069
+            this.tabTypes[2].num = res.data.resultCount;
1070
+            this.getNum();
1052 1071
             this.getNum(1543);
1053 1072
           }
1054 1073
           this.loadShow = false;
@@ -1262,9 +1281,12 @@ export default {
1262 1281
   justify-content: center;
1263 1282
   align-items: center;
1264 1283
 }
1265
-.header .header_left .tab:first-of-type{
1284
+.header .header_left .tab{
1266 1285
   border-right: 1px solid #515151;
1267 1286
 }
1287
+.header .header_left .tab:last-of-type{
1288
+  border-right: none;
1289
+}
1268 1290
 .header .header_left .tab.active{
1269 1291
   font-weight: bold;
1270 1292
   position: relative;