Ver Fonte

Enhance Monthly Credit Limit
https://dev.wormwood.com.sg/zentao/task-view-345.html

vbea há 1 ano atrás
pai
commit
74fa39bd32

+ 32 - 9
Strides-Admin/src/views/limit2/detail.vue

@@ -84,22 +84,44 @@
                 readonly/>
             </el-form-item>
             <el-form-item
-              label="Group Credit:">
+              label="Overall Balance:">
               <el-input
                 class="add-text"
-                v-model="form.groupCredit"
-                readonly/>
-            </el-form-item>
-            <el-form-item
-              label="Individual Credit:">
-              <el-input
-                class="add-text"
-                v-model="form.individualCredit"
+                :value="form.individualCredit + '/' + form.groupCredit"
                 readonly/>
             </el-form-item>
           </div>
         </div>
       </div>
+      <div class="content" v-if="isEdit">
+        <div class="section-title">Group Credit</div>
+        <el-table
+          :data="[form]">
+          <el-table-column
+            align="center"
+            label="Amount"
+            prop="groupCredit"
+            min-width="100"/>
+          <el-table-column
+            align="center"
+            label="Assigned Users"
+            min-width="120">
+            <template slot-scope="{row}">
+              <span>{{row.approvedUsers-row.individualApprovedUsers}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="Current Consumption"
+            prop="currentConsumptionCredit"
+            min-width="140">
+            <template slot-scope="{row}">
+              <span>{{row.creditLimitRemainingAmount}}/{{row.groupCredit}}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <p></p>
+      </div>
       <div class="content" v-if="isEdit">
         <div class="section-title">Individual Plans</div>
         <plans
@@ -107,6 +129,7 @@
           :groupPk="form.groupPk"
           v-if="form.groupCreditPk"
           @refresh="getLimitInfo"/>
+        <p></p>
       </div>
       <div class="content flexcr">
         <div class="buttons">

+ 11 - 1
Strides-Admin/src/views/limit2/index.vue

@@ -40,7 +40,17 @@
         align="center"
         label="Group"
         prop="groupName"
-        min-width="120"/>
+        min-width="120">
+        <template slot-scope="{row}">
+          <span
+            class="link-type"
+            @click="editLimit(row)"
+            v-if="!$route.meta.onlyView">
+            {{ row.groupName }}
+          </span>
+          <span v-else>{{ row.groupName }}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         align="center"
         label="Service Provider"