Browse Source

修改bug

chenrui 5 months ago
parent
commit
c3450c4d3e

+ 6 - 6
src/views/numsGoodsShelves/withdrawalManagementNew/applyWithdrawal.vue

@@ -30,7 +30,7 @@
           <a-button type="primary" class="button-primary" @click="handleAmount" id="applyWithdrawal-getNum-btn">全部</a-button>
         </a-form-model-item>
         <a-form-model-item label="实际扣除金额">
-          <span>{{ (activeAmount||activeAmount==0)?toThousands(activeAmount,2):'--' }}元 </span><span style="color: #999;">(申请提现金额+提现手续费)</span>
+          <span>{{ toThousands(serviceCharge,2)||'--' }}元 </span><span style="color: #999;">(申请提现金额+提现手续费)</span>
         </a-form-model-item>
         <a-form-model-item label="提现账户">
           <span style="display: block;" v-if="pageInfo">{{ pageInfo.merchantBankAccountEntity?pageInfo.merchantBankAccountEntity.bankAccount:'' }}{{ ' ( '+ pageInfo.dealerName +' ) ' }}</span>
@@ -62,11 +62,11 @@ export default {
       }
     }
   },
-  // computed: {
-  //   serviceCharge () {
-  //     return (this.activeAmount || this.activeAmount == 0) ? this.activeAmount * 1 + 0.5 : 0
-  //   }
-  // },
+  computed: {
+    serviceCharge () {
+      return !this.form.amount ? 0 : this.form.amount + 0.5
+    }
+  },
   data () {
     return {
       formItemLayout: {

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

@@ -90,11 +90,11 @@
         :defaultLoadData="false"
         bordered>
         <!-- 金额 -->
-        <template slot="tradeAmount" slot-scope="text, record">
-          <div v-if="record.tradeAmount">
-            {{ record.tradeType=='SK'? '+'+(record.tradeAmount).toFixed(2):'-'+(record.tradeAmount).toFixed(2) }}
+        <template slot="realAmount" slot-scope="text, record">
+          <div v-if="record.realAmount">
+            {{ record.tradeType=='SK'? '+'+(record.realAmount).toFixed(2):'-'+(record.realAmount).toFixed(2) }}
           </div>
-          <div v-else>{{ (record.tradeAmount&&record.tradeAmount==0)?(record.tradeAmount).toFixed(2):'--' }}</div>
+          <div v-else>{{ (record.realAmount&&record.realAmount==0)?(record.realAmount).toFixed(2):'--' }}</div>
         </template>
         <!-- 交易状态 -->
         <template slot="status" slot-scope="text, record">
@@ -146,7 +146,7 @@ export default {
         { title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'customerName', width: '12%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '关联单号', dataIndex: 'dealerSalesNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '金额(¥)', dataIndex: 'tradeAmount', width: '8%', align: 'right', scopedSlots: { customRender: 'tradeAmount' } },
+        { title: '金额(¥)', dataIndex: 'realAmount', width: '8%', align: 'right', scopedSlots: { customRender: 'realAmount' } },
         { title: '交易类型', dataIndex: 'tradeTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '交易状态', dataIndex: 'dealStateDictValue', width: '8%', align: 'center', scopedSlots: { customRender: 'status' } }
       ],

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

@@ -21,8 +21,8 @@
         <div style="margin:10px 0">
           <p>可提现金额:<strong style="color:#ed1c24;">{{ pageInfo&&(pageInfo.activeAmount||pageInfo.activeAmount==0)?toThousands(pageInfo.activeAmount):'--' }}</strong></p>
           账户总金额:{{ pageInfo&&(pageInfo.totalAmount||pageInfo.totalAmount==0)?toThousands(pageInfo.totalAmount):'--' }}(包含到账金额:<span>{{ pageInfo&&(pageInfo.activeAmount||pageInfo.activeAmount==0)?toThousands(pageInfo.activeAmount):'--' }}</span>,在途金额:{{ pageInfo&&(pageInfo.floatAmount||pageInfo.floatAmount==0)?toThousands(pageInfo.floatAmount):'--' }})
+          <p>账户冻结金额:{{ pageInfo&&(pageInfo.freezeAmount||freezeAmount==0)?toThousands(pageInfo.freezeAmount):'--' }}</p>
           <p style="margin-top:10px;">(提示:①提现手续费为0.5元/笔;②资金到账周期为工作日+1天;③线上支付订单需审核通过后才能提现;④订单被审核不通过或修理厂取消订单后将会在1-3个工作日原路返回到修理厂)</p>
-          账户冻结金额:{{ pageInfo&&(pageInfo.freezeAmount||freezeAmount==0)?toThousands(pageInfo.freezeAmount):'--' }}
         </div>
         <a-button
           id="withdrawal-tixian"
@@ -156,7 +156,7 @@ export default {
     // 计算表格高度
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 300
+      this.tableHeight = window.innerHeight - tableSearchH - 350
     },
     // 页面初始化
     pageInit () {