ソースを参照

Enhance filters and table

vbea 2 年 前
コミット
c01d54eb50

+ 6 - 1
Strides-Admin/src/views/charging/ChargingProfiles.vue

@@ -25,7 +25,8 @@
     <el-table
     <el-table
       v-loading="listLoading"
       v-loading="listLoading"
       :data="tableList"
       :data="tableList"
-      style="width: 100%;">
+      style="width: 100%;"
+      class="no-border">
       <el-table-column
       <el-table-column
         :label="item.label"
         :label="item.label"
         align="center"
         align="center"
@@ -98,6 +99,10 @@
           width: 100,
           width: 100,
           key: 'stackLevel',
           key: 'stackLevel',
           label: 'Stack Level'
           label: 'Stack Level'
+        },{
+          width: 150,
+          key: 'profilePurpose',
+          label: 'Purpose'
         },{
         },{
           key: 'description',
           key: 'description',
           label: 'Description',
           label: 'Description',

+ 12 - 2
Strides-Admin/src/views/financial/index.vue

@@ -71,7 +71,7 @@
       v-loading="loading">
       v-loading="loading">
       <el-table-column
       <el-table-column
         min-width="120"
         min-width="120"
-        label="Transaction ID"
+        label="Payment ID"
         align="center">
         align="center">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
           <span
           <span
@@ -130,7 +130,17 @@
         label="Rate"
         label="Rate"
         align="center"
         align="center"
         prop="rate"
         prop="rate"
-        min-width="200"/>
+        min-width="200">
+        <template slot-scope="{row}" v-if="row.rates">
+          <span
+            v-for="(item, idx) in row.rates"
+            :key="idx"
+            style="display: block;"
+            :title="item">
+            {{item}}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column
       <el-table-column
         label="Charges"
         label="Charges"
         align="center"
         align="center"

+ 25 - 2
Strides-Admin/src/views/rfid/index.vue

@@ -90,14 +90,37 @@
         label="User Type"
         label="User Type"
         align="center"
         align="center"
         prop="userType"
         prop="userType"
-        min-width="140">
+        min-width="120">
+        <template slot-scope="{row}" v-if="row.userTypes">
+          <span
+            v-for="(item, idx) in row.userTypes"
+            :key="idx"
+            style="display: block;"
+            :title="item">
+            {{item}}
+          </span>
+        </template>
       </el-table-column>
       </el-table-column>
       <el-table-column
       <el-table-column
         label="Group"
         label="Group"
         align="center"
         align="center"
         prop="groupName"
         prop="groupName"
-        min-width="140">
+        min-width="160">
+        <template slot-scope="{row}" v-if="row.groupNames">
+          <span
+            v-for="(item, idx) in row.groupNames"
+            :key="idx"
+            style="display: block;"
+            :title="item">
+            {{item}}
+          </span>
+        </template>
       </el-table-column>
       </el-table-column>
+      <el-table-column
+        label="Valid Date"
+        align="center"
+        prop="validDate"
+        min-width="120"/>
       <el-table-column
       <el-table-column
         label="Status"
         label="Status"
         align="center"
         align="center"

+ 2 - 2
Strides-Admin/src/views/transaction/transactions.vue

@@ -169,9 +169,9 @@
         label="Rate"
         label="Rate"
         align="center"
         align="center"
         min-width="150">
         min-width="150">
-        <template slot-scope="{row}" v-if="row.rate">
+        <template slot-scope="{row}" v-if="row.rates">
           <span
           <span
-            v-for="(item, idx) in row.rate.split(';')"
+            v-for="(item, idx) in row.rates"
             :key="idx"
             :key="idx"
             style="display: block;"
             style="display: block;"
             :title="item">
             :title="item">