Quellcode durchsuchen

When select this report need a group select.
https://dev.wormwood.com.sg/zentao/task-view-736.html

vbea vor 1 Jahr
Ursprung
Commit
9ffae73601
1 geänderte Dateien mit 23 neuen und 3 gelöschten Zeilen
  1. 23 3
      Strides-Admin/src/views/report/ReportV2.vue

+ 23 - 3
Strides-Admin/src/views/report/ReportV2.vue

@@ -71,6 +71,7 @@
           v-model="filter.pageVo.providerPks"
           class="filter-input"
           placeholder="Service Provider"
+          collapse-tags
           clearable
           multiple>
           <el-option
@@ -89,7 +90,8 @@
           v-show="isAppendixSite"
           v-model="filter.pageVo.sitePks"
           class="filter-input"
-          placeholder="Sites">
+          placeholder="Sites"
+          style="max-width: 400px;">
           <el-option
             v-for="(item, index) in options.siteOptions"
             :key="index"
@@ -99,6 +101,7 @@
         <el-select
           clearable
           multiple
+          collapse-tags
           v-show="filter.pageVo.reportType == 'MNTHFLET'"
           v-model="filter.pageVo.groupPks"
           class="filter-input"
@@ -112,6 +115,7 @@
         <el-select
           clearable
           multiple
+          collapse-tags
           v-show="filter.pageVo.reportType == 'MNTHMEMB'"
           v-model="filter.pageVo.groupPks"
           class="filter-input"
@@ -125,6 +129,7 @@
         <el-select
           clearable
           multiple
+          collapse-tags
           v-show="filter.pageVo.reportType == 'MNTHPART'"
           v-model="filter.pageVo.groupPks"
           class="filter-input"
@@ -135,6 +140,20 @@
             :label="item.name"
             :value="item.value"/>
         </el-select>
+        <el-select
+          clearable
+          multiple
+          collapse-tags
+          v-show="filter.pageVo.reportType == 'MNTHGCU'"
+          v-model="filter.pageVo.groupPks"
+          class="filter-input"
+          placeholder="Groups">
+          <el-option
+            v-for="(item, index) in options.groupOptions"
+            :key="index"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
         <el-button
           class="generate-button"
           type="primary"
@@ -288,7 +307,7 @@ export default {
           }
         }]
       },
-      hasGrouptype: ["MNTHFLET", "MNTHMEMB", "MNTHPART"]
+      hasGrouptype: ["MNTHFLET", "MNTHMEMB", "MNTHPART","MNTHGCU"]
     }
   },
   computed: {
@@ -493,7 +512,7 @@ export default {
     display: flex;
     flex-wrap: wrap;
     align-items: center;
-    margin-bottom: 15px;
+    margin-bottom: 10px;
     .el-form-item__label {
       color: #333;
       width: 100px;
@@ -516,6 +535,7 @@ export default {
   .generate-button {
     width: 100px;
     height: 40px;
+    margin: 5px 0;
     margin-left: 10px;
   }