付款

src/views/finance/payapply-edit.vue

@@ -127,7 +127,12 @@
               <b style="margin-left: 10px;">已付采美：</b>
               <span class="el-span-danger"> ¥{{ shopOrder.payCmAmount | amountfilters }}  </span>
               <b style="margin-left: 10px;">待付采美：</b>
-              <el-input v-model="shopOrder.waitPayCmAmount" style="width: 100px;" size="mini" />
+              <el-input
+                v-model="shopOrder.waitPayCmAmount"
+                :disabled="shopOrder.payCmAmount === shopOrder.shouldPayCmAmount"
+                style="width: 100px;"
+                size="mini"
+              />
               <b style="margin-left: 10px;">应付供应商：</b>
               <span class="el-span-danger"> ¥{{ shopOrder.shouldPayShopAmount | amountfilters }}  </span>
               <b style="margin-left: 10px;">已付供应商：</b>
@@ -242,13 +247,11 @@ export default {
     },
     totalShopTotalAmount() { // 计算付供应商总额
       let waitPayShop = 0
-      let shopPostFee = 0
       const shopOrders = this.payRepacts.shopOrders
       shopOrders.forEach(item => {
         waitPayShop += item.waitPayShop
-        shopPostFee += item.shopPostFee
       })
-      return Number(waitPayShop) + Number(shopPostFee)
+      return waitPayShop
     }
   },
   created() {
@@ -320,7 +323,7 @@ export default {
         setTimeout(() => {
           this.$store.dispatch('tagsView/delView', this.$route).then(() => {
             this.$nextTick(() => {
-              this.$router.push({ path: '/finance/payapply-list' })
+              this.$router.push({ path: '/finance/payment-list' })
             })
           })
         }, 1000)

src/views/order/refund-detail.vue

@@ -6,30 +6,43 @@
     </div>
     <div id="printBox" style="margin: 0 auto;">
       <h1 class="app-title">退款单</h1>
-      <el-card ref="print" class="box-card" style="margin: 5px auto;">
-        <el-table :data="cmReturnedPurchaseList" border fit highlight-current-row :header-cell-style="{background:'#eef1f6',color:'#606266'}">
-          <el-table-column label="退款编号：" align="center" prop="returnedNo" />
-          <el-table-column label="申请时间：" align="center" prop="confirmReturnTime" />
-          <el-table-column label="申请金额：" align="center" prop="refundFee" />
-          <el-table-column label="退款审核状态：" align="center" prop="status">
-            <template slot-scope="{row}">
-              <el-tag v-if="row.status*1===1" type="warning" size="small">待审核</el-tag>
-              <el-tag v-if="row.status*1===2" type="success" size="small">审核通过</el-tag>
-              <el-tag v-if="row.status*1===3" type="danger" size="small">审核不通过</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column label="退款方式：" align="center" prop="returnedWay">
-            <template slot-scope="{row}">
-              <span v-if="row.returnedWay*1===4">未支付无退款</span>
-              <span v-else-if="row.returnedWay*1===1">
-                <p v-if="row.refundBalanceFee*1 !== 0">余额账户:¥{{ row.refundBalanceFee | toThousandFloatFilter }}</p>
-                <p v-if="row.refundOnlineFee*1 !== 0">线上退回:¥{{ row.refundOnlineFee | toThousandFloatFilter }}</p>
-                <p v-if="row.refundOfflineFee*1 !== 0">线下转账:¥{{ row.refundOfflineFee | toThousandFloatFilter }}</p>
-              </span>
-              <span v-else>----</span>
+      <el-card class="box-card" style="margin: 5px auto;">
+        <div class="refund-item">
+          <h1 class="refund-item-title">退款信息</h1>
+          <el-row :gutter="24" class="box-row">
+            <el-col :span="5"><b>退款编号：</b> {{ cmReturnedPurchase.returnedNo }}</el-col>
+            <el-col :span="4"><b>申请时间：</b> {{ cmReturnedPurchase.returnTime }}</el-col>
+            <el-col :span="6"><b>申请金额：</b> ¥{{ cmReturnedPurchase.refundFee | amountfilters }} </el-col>
+            <el-col :span="6"><b>退款审核状态：</b>
+              <el-tag v-if="cmReturnedPurchase.status*1===1" type="warning" size="small">待审核</el-tag>
+              <el-tag v-if="cmReturnedPurchase.status*1===2" type="success" size="small">审核通过</el-tag>
+              <el-tag v-if="cmReturnedPurchase.status*1===3" type="danger" size="small">审核不通过</el-tag>
+            </el-col>
+          </el-row>
+          <h1 class="refund-item-title">退款方式</h1>
+          <el-row :gutter="24" class="box-row">
+            <el-col v-if="cmReturnedPurchase.returnedWay*1===4" :span="4"><b>未支付无退款</b> </el-col>
+            <template v-else-if="cmReturnedPurchase.returnedWay*1===1">
+              <template v-if="cmReturnedPurchase.refundOnlineFee*1 !== 0">
+                <el-col :span="5">
+                  <b>线上退回:</b>
+                  <span>¥{{ cmReturnedPurchase.refundOnlineFee | amountfilters }}</span>
+                </el-col>
+              </template>
+              <template v-if="cmReturnedPurchase.refundOfflineFee*1 !== 0">
+                <el-col :span="5">
+                  <b>线下转账：</b>
+                  <span>¥{{ cmReturnedPurchase.refundOfflineFee | amountfilters }}</span>
+                </el-col>
+                <el-col :span="4"><b>开户名：</b><span>{{ cmReturnedPurchase.bankAccountName }}</span> </el-col>
+                <el-col :span="4"><b>账号：</b> <span>{{ cmReturnedPurchase.bankAccountNo }}</span> </el-col>
+                <el-col :span="4"><b>开户行：</b> <span>{{ cmReturnedPurchase.openBank }}</span> </el-col>
+                <el-col :span="4"><b>账户类型：</b> <span>{{ cmReturnedPurchase.bankAccountType*1 === 1 ? '公账' : '私账' }}</span> </el-col>
+              </template>
             </template>
-          </el-table-column>
-        </el-table>
+            <span v-else>----</span>
+          </el-row>
+        </div>
       </el-card>
       <el-card ref="print" class="box-card" style="margin: 5px auto;">
         <div class="refund-item">