Browse Source

修改bug

chenrui 6 months ago
parent
commit
753ea4649c

+ 5 - 1
src/views/numsGoodsShelves/withdrawalManagementNew/applyWithdrawal.vue

@@ -21,9 +21,9 @@
         <a-form-model-item label="申请提现金额" prop="amount">
           <a-input-number
             v-model="form.amount"
-            :min="0.1"
             style="width: 73%;"
             :precision="2"
+            :min="0"
             :max="activeAmount-0.5"
             id="applyWithdrawal-amount"
             placeholder="请输入正数(最多两位小数)" />
@@ -104,6 +104,10 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const form = JSON.parse(JSON.stringify(_this.form))
+          if (form.amount <= 0) {
+            _this.$message.warning('提现金额不能小于等于0')
+            return
+          }
           form.serviceCharge = this.serviceCharge
           form.merchantType = 'DEALER'
           form.merchantSn = _this.pageInfo ? _this.pageInfo.merchantSn : ''

+ 1 - 1
src/views/numsGoodsShelves/withdrawalManagementNew/billFlowModal.vue

@@ -70,7 +70,7 @@
         <div class="alert-message">
           收入金额:<strong>{{ detailData&&(detailData.skAmount || detailData.skAmount==0) ? toThousands(detailData.skAmount) : '--' }}</strong>,
           其中到账金额:<strong>{{ detailData&&(detailData.skdzAmount || detailData.skdzAmount==0) ? toThousands(detailData.skdzAmount) : '--' }}</strong>,
-          在途金额:<strong>{{ detailData&&(detailData.skztAmount || detailData.skztAmount==0) ? toThousands(detailData.skztAmount) : '--' }}</strong>
+          在途金额:<strong>{{ detailData&&(detailData.skztAmount || detailData.skztAmount==0) ? toThousands(detailData.skztAmount) : '--' }}</strong>
           支出金额:<strong>{{ detailData&&(detailData.kkAmount || detailData.kkAmount==0) ? toThousands(detailData.kkAmount) : '--' }}</strong>,
           其中退款金额:<strong>{{ detailData&&(detailData.tkAmount || detailData.tkAmount==0) ? toThousands(detailData.tkAmount) : '--' }}</strong>,
           提现金额:<strong>{{ detailData&&(detailData.txAmount || detailData.txAmount==0) ? toThousands(detailData.txAmount) : '--' }}</strong>,

+ 5 - 5
src/views/numsGoodsShelves/withdrawalManagementNew/list.vue

@@ -73,15 +73,15 @@ export default {
       },
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '提现单号', dataIndex: 'cashOutNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '提现时间', dataIndex: 'cashOutDate', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '提现单号', dataIndex: 'cashOutNo', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '提现时间', dataIndex: 'cashOutDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '申请提现金额', dataIndex: 'amount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } },
-        { title: '开户名', dataIndex: 'bankAccount1', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '开户银行', dataIndex: 'bankAccount', width: '12%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '开户名', dataIndex: 'bankAccount', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '开户银行', dataIndex: 'bankName', width: '12%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '银行卡号', dataIndex: 'bankCard', width: '12%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '提现人', dataIndex: 'operName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '状态', dataIndex: 'stateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '备注', dataIndex: 'remarks', width: '12%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
+        { title: '备注', dataIndex: 'remarks', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {