ソースを参照

Merge branch 'develop' of http://git.chelingzhu.com/jianguan-web/jq-repairFusion-html into develop_szhj

# Conflicts:
#	src/views/numsGoodsShelves/goodsShelvesAdministration/settlementSet.vue
zhangdan 3 年 前
コミット
09e2884fd2

+ 5 - 4
src/views/numsGoodsShelves/goodsShelvesAdministration/settlementModifyModal.vue

@@ -78,7 +78,7 @@
                     v-model="form.creditWarnLimit"
                     :precision="2"
                     :min="0.01"
-                    :max="form.creditLimit-0.1"
+                    :max="999999"
                     placeholder="请输入正数(最多允许两位小数)"
                     style="width: 100%;display: inline-block;" />
                 </a-form-model-item>
@@ -201,9 +201,10 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = Object.assign({}, _this.form)
-          // if (params.limitFlag == '') {
-          //   params.limitFlag = 0
-          // }
+          if (params.creditWarnLimit >= params.creditLimit) {
+            _this.$message.warning('结算提醒金额需要小于授信额度')
+            return
+          }
           if (this.shelfInfo) {
             console.log(this.shelfInfo, 'this.nowData')
             params.shelfSn = this.shelfInfo.shelfSn

+ 9 - 4
src/views/numsGoodsShelves/goodsShelvesAdministration/settlementSet.vue

@@ -100,6 +100,7 @@
                       placeholder="请输入正数(最多允许两位小数)"
                       style="width: 100%;display: inline-block;" />
                   </a-form-model-item>
+
                 </a-col>
                 <a-col :span="1"> <span style="display: inline-block; padding: 10px;">元</span></a-col>
                 <a-col :span="1">
@@ -146,8 +147,8 @@
                       id="settlementSet-creditWarnLimit"
                       v-model="form.creditWarnLimit"
                       :precision="2"
-                      :min="0"
-                      :max="form.creditLimit"
+                      :min="0.01"
+                      :max="999999"
                       placeholder="请输入正数(最多允许两位小数)"
                       style="width: 100%;display: inline-block;" />
                   </a-form-model-item>
@@ -271,6 +272,7 @@ export default {
         labelCol: { span: 13 },
         wrapperCol: { span: 11 }
       },
+      loadData: [],
       settleInfo: null, // 结算详情
       // shelfInfo: null, // 数字货架详情
       settlementType: '', // 结算方式
@@ -303,8 +305,7 @@ export default {
         { title: '保证金金额', dataIndex: 'bondAmount', width: '30%', align: 'right', customRender: function (text) { return toThousands(text, 2) || '--' } },
         { title: '状态', dataIndex: 'stateDictValue', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '支付时间', width: '20%', align: 'center', dataIndex: 'payDate' }
-      ],
-      loadData: []
+      ]
     }
   },
   methods: {
@@ -424,6 +425,10 @@ export default {
             params.storeSn = this.pageInfo.storeSn
             params.dealerSn = this.pageInfo.dealerSn
           }
+          if (params.creditWarnLimit >= params.creditLimit) {
+            _this.$message.warning('结算提醒金额需要小于授信额度')
+            return
+          }
           _this.spinning = true
           shelfSettleRuleSave(params).then(res => {
             if (res.status == 200) {