فهرست منبع

Amend monthly credit UI
https://dev.wormwood.com.sg/zentao/task-view-446.html

vbea 1 سال پیش
والد
کامیت
4baf90fc97

+ 19 - 19
Strides-Admin/src/views/access/detail2.vue

@@ -92,6 +92,20 @@
         </el-form-item>
       </div>
       <div class="form-row">
+        <el-form-item
+          class="form-item"
+          label="PROVIDER:"
+          prop="providerPk">
+          <el-select
+            v-model="form.providerPk"
+            class="flex-item2">
+            <el-option
+              v-for="(item, index) in providerOptions"
+              :key="index"
+              :label="item.key"
+              :value="item.value"/>
+          </el-select>
+        </el-form-item>
         <el-form-item
           class="form-item"
           label="ROLE:">
@@ -107,26 +121,13 @@
               :value="item.roleName"/>
           </el-select>
         </el-form-item>
-        <el-form-item
-          class="form-item"
-          label="PROVIDER NAME:"
-          prop="providerPk"
-          v-if="form.roleName=='PROVIDER'">
-          <el-select
-            v-model="form.providerPk"
-            class="flex-item2">
-            <el-option
-              v-for="(item, index) in providerOptions"
-              :key="index"
-              :label="item.key"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
+      </div>
+      <div class="form-row">
         <el-form-item
           class="form-item"
           label="GROUP NAME:"
           prop="groupPk"
-          v-else-if="form.roleName=='GROUP'">
+          v-if="form.roleName=='GROUP'">
           <el-select
             v-model="form.groupPk"
             class="flex-item2">
@@ -144,7 +145,7 @@
           v-else-if="form.roleName=='SITE' || form.roleName=='STACK HOLDER'">
           <el-select
             v-model="form.sitePks"
-            class="flex-item"
+            class="flex-item2"
             filterable
             multiple
             placeholder="Select with search">
@@ -155,7 +156,6 @@
               :value="item.sitePk"/>
           </el-select>
         </el-form-item>
-        <div class="form-item flex-item" v-else></div>
       </div>
       <div class="flexcc" style="margin-top: 10px;">
         <el-button
@@ -418,7 +418,7 @@ export default {
       })
     },
     changeRole() {
-      this.form.providerPk = ""
+      //this.form.providerPk = ""
       this.form.groupPk = ""
       this.form.sitePks = []
       this.$nextTick(() => {

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

@@ -126,7 +126,7 @@
           </el-table-column>
           <el-table-column
             align="center"
-            label="Assigned Users"
+            label="Group Credit Users"
             min-width="120">
             <template slot-scope="{row}">
               <span>{{row.approvedUsers-row.individualApprovedUsers}}</span>

+ 5 - 4
Strides-Admin/src/views/limit2/plans.vue

@@ -11,7 +11,8 @@
     </div>
     <el-table
       v-loading="table.loading"
-      :data="table.data">
+      :data="table.data"
+      empty-text="No individual plans assigned. Click 'Individual Plan' to add a new one.">
       <el-table-column
         align="center"
         label="Amount"
@@ -37,7 +38,7 @@
       </el-table-column>
       <el-table-column
         align="center"
-        label="Suspend Users"
+        label="Suspended Users"
         prop="suspendUsers"
         min-width="170">
         <template slot-scope="{row}">
@@ -50,12 +51,12 @@
       </el-table-column>
       <el-table-column
         align="center"
-        label="Suspend Credit"
+        label="Suspended Credit"
         prop="suspendCredit"
         min-width="170"/>
       <el-table-column
         align="center"
-        label="Not Suspend Credit"
+        label="Not Suspended Credit"
         prop="notSuspendCredit"
         min-width="170"/>
 <!--      <el-table-column