Quellcode durchsuchen

Merge commit '8253628e0820b73b9fb08c1b69592a73c1b4f176' into HEAD

gitadmin vor 3 Jahren
Ursprung
Commit
e038e8089b

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

@@ -201,6 +201,11 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = Object.assign({}, _this.form)
+          console.log(params,'params---------------------')
+          if (params.settleType=='CREDIT'&&params.creditWarnLimit >= params.creditLimit) {
+            _this.$message.warning('结算提醒金额需要小于授信额度')
+            return
+          }
           if (this.shelfInfo) {
             console.log(this.shelfInfo, 'this.nowData')
             params.shelfSn = this.shelfInfo.shelfSn
@@ -212,10 +217,6 @@ export default {
             params.bondFlag = this.settleInfo.bondFlag
             params.id = this.settleInfo.id
           }
-          if (params.creditWarnLimit >= params.creditLimit) {
-            _this.$message.warning('结算提醒金额需要小于授信额度')
-            return
-          }
           _this.spinning = true
           shelfSettleRuleSave(params).then(res => {
             if (res.status == 200) {

+ 6 - 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,7 +147,7 @@
                       id="settlementSet-creditWarnLimit"
                       v-model="form.creditWarnLimit"
                       :precision="2"
-                      :min="0"
+                      :min="0.01"
                       :max="999999"
                       placeholder="请输入正数(最多允许两位小数)"
                       style="width: 100%;display: inline-block;" />
@@ -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,7 +425,8 @@ export default {
             params.storeSn = this.pageInfo.storeSn
             params.dealerSn = this.pageInfo.dealerSn
           }
-          if (params.creditWarnLimit >= params.creditLimit) {
+          console.log(params,'params----参数')
+          if (params.settleType=='CREDIT'&&params.creditWarnLimit >= params.creditLimit) {
             _this.$message.warning('结算提醒金额需要小于授信额度')
             return
           }