Просмотр исходного кода

Display amount again
https://dev.wormwood.com.sg/zentao/task-view-366.html

vbea 1 год назад
Родитель
Сommit
1c066cafb0

+ 2 - 2
Strides-Admin/src/views/limit2/detail.vue

@@ -91,7 +91,7 @@
               label="Overall Balance:">
               <el-input
                 class="add-text"
-                :value="form.individualCredit + '/' + form.groupCredit"
+                :value="form.overallBalance"
                 readonly/>
             </el-form-item>
           </div>
@@ -120,7 +120,7 @@
             prop="currentConsumptionCredit"
             min-width="140">
             <template slot-scope="{row}">
-              <span>{{row.creditLimitRemainingAmount}}/{{row.groupCredit}}</span>
+              <span>{{row.groupCurrentConsumption}}</span>
             </template>
           </el-table-column>
         </el-table>

+ 1 - 1
Strides-Admin/src/views/limit2/plans.vue

@@ -33,7 +33,7 @@
       <el-table-column
         align="center"
         label="Current Consumption"
-        prop="currentConsumptionCredit"
+        prop="individualCurrentConsumption"
         min-width="170"/>
       <el-table-column
         align="center"

+ 2 - 1
Strides-Admin/src/views/site2/index.vue

@@ -198,13 +198,14 @@ import waves from '@/directive/waves'
 // secondary package based on el-pagination
 import Pagination from '@/components/Pagination'
 import TableAction from '@/components/TableAction.vue'
+import HistoryRate from '../site/historyRate.vue'
 import site from '../../http/api/site'
 import provider from '../../http/api/provider'
 import { getRoleName } from '@/utils/auth'
 
 export default {
   name: 'SiteManagement',
-  components: { Pagination, TableAction },
+  components: { HistoryRate, Pagination, TableAction },
   directives: { waves },
   data() {
     return {