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

Credit amendment can be in the format of 0.XX.
https://dev.wormwood.com.sg/zentao/task-view-435.html

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

+ 14 - 2
Strides-Admin/src/views/financial/CreditActionDialog.vue

@@ -191,9 +191,21 @@ export default {
           trigger: 'blur',
           message: 'Please type amount',
         }, {
-          pattern: /^[1-9]+\d*\.?\d*$/,
           trigger: 'blur',
-          message: 'Please type a correct number'
+          //message: 'Please type a correct number',
+          validator: (rule, value, callback) => {
+            const reg1 = /^[1-9]+\d*\.?\d*$/;
+            const reg2 = /^[0]\.\d*$/;
+            if (!reg1.test(value)) {
+              if (reg2.test(value)) {
+                callback();
+                return
+              }
+              callback(new Error('Please type a correct number'));
+            } else {
+              callback();
+            }
+          }
         }],
         creditActionType: {
           required: true,

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

@@ -66,7 +66,6 @@
             </el-form-item>
             <el-form-item
               label="Monthly Credit Limit:"
-              prop="creditLimitAmount"
               v-if="isEdit">
               <span class="item-unit">(S$)</span>
               <el-input
@@ -207,7 +206,7 @@ export default {
         groupPk: "",
         providerPk: "",
         effectivePeriod: ["", ""],
-        creditLimitAmount: "",
+        creditLimitAmount: "0",
         onlyView: false,
         canDelete: true
       },