修复测试

src/utils/request.js

@@ -90,7 +90,7 @@ service.interceptors.response.use(
     console.log(error)
     if (reg.test(error.message) || error.message === 'Network Error') {
       Message({
-        message: '网络连接错误，请联系系统管理员！',
+        message: '系统连接错误，请联系管理员！',
         type: 'error',
         duration: 3 * 1000
       })

src/views/finance/details.vue

@@ -24,7 +24,7 @@
             <el-col :span="4"><b>已收金额：</b> ¥{{ order.receiptAmount | amountfilters }}</el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
-            <el-col :span="5"><b>机构名称：</b> {{ order.userName }}</el-col>
+            <el-col :span="5"><b>机构名称：</b> {{ order.clubName }}</el-col>
             <el-col :span="5"><b>下单日期：</b> {{ order.orderTime }}</el-col>
           </el-row>
           <template v-if="repacts.payWay === 1">

src/views/finance/list.vue

@@ -39,7 +39,7 @@
       <div class="filter-control">
         <span>机构名称:</span>
         <el-input
-          v-model="listQuery.userName"
+          v-model="listQuery.clubName"
           style="width:180px;"
           placeholder="客户名称"
           clearable
@@ -116,9 +116,9 @@
           <span v-else>{{ row.bankNameType }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="机构名称" align="center" prop="userName">
+      <el-table-column label="机构名称" align="center" prop="clubName">
         <template slot-scope="{ row }">
-          {{ row.userName ? row.userName : '---' }}
+          {{ row.clubName ? row.clubName : '---' }}
         </template>
       </el-table-column>
       <el-table-column label="关联订单号" align="center" prop="shopOrderNos">

src/views/finance/payapply-edit.vue

@@ -138,7 +138,12 @@
               <b style="margin-left: 10px;">已付供应商：</b>
               <span class="el-span-danger"> ¥{{ shopOrder.payedShopAmount | amountfilters }}  </span>
               <b style="margin-left: 10px;">待付供应商：</b>
-              <el-input v-model="shopOrder.waitPayShop" style="width: 100px;" size="mini" />
+              <el-input
+                v-model="shopOrder.waitPayShop"
+                style="width: 100px;"
+                size="mini"
+                @input="handleWaitPayShop($event,shopOrder)"
+              />
             </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
@@ -290,6 +295,14 @@ export default {
         console.log('error', error)
       }
     },
+    handleWaitPayShop(value, shopOrder) {
+      const waitPayShop = shopOrder.shouldPayShopAmount - shopOrder.payedShopAmount
+      if (Number(value) > waitPayShop) {
+        shopOrder.waitPayShop = waitPayShop
+      } else {
+        shopOrder.waitPayShop = Number(value)
+      }
+    },
     disabled(shopOrder) {
       if (shopOrder.shopId === 1613 || shopOrder.isShopPostFee) {
         return true

src/views/finance/payfinance-refund-record.vue

@@ -1,164 +1,167 @@
 <template>
   <div class="app-container">
-    <div v-for="(cmReturn,index) in cmReturnedPurchaseList" id="printBox" :key="index">
-      <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> {{ cmReturn.reviewUserName }}</el-col>
-            <el-col :span="4"><b>审核时间：</b> {{ cmReturn.confirmReturnTime ? cmReturn.confirmReturnTime :'--' }}</el-col>
-            <el-col :span="15"><b>审核备注：</b> {{ cmReturn.reviewRemarks ? cmReturn.reviewRemarks :'--' }}</el-col>
-          </el-row>
-        </div>
-      </el-card>
-      <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> {{ cmReturn.applicationUserNam ? cmReturn.applicationUserNam :'--' }}</el-col>
-            <el-col :span="4"><b>申请时间：</b> {{ cmReturn.returnTime ? cmReturn.returnTime :'--' }}</el-col>
-            <el-col :span="15"><b>退款备注：</b> {{ cmReturn.remarks ? cmReturn.remarks :'--' }}</el-col>
-          </el-row>
-        </div>
-      </el-card>
-      <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> {{ cmReturn.returnedNo }}</el-col>
-            <el-col :span="4"><b>申请时间：</b> {{ cmReturn.returnTime }}</el-col>
-            <el-col :span="15"><b>申请金额</b> ¥{{ cmReturn.refundFee | amountfilters }} </el-col>
-          </el-row>
-          <h1 class="refund-item-title">退款方式</h1>
-          <el-row :gutter="24" class="box-row">
-            <el-col v-if="cmReturn.returnedWay*1===4" :span="4"><b>未支付无退款</b> </el-col>
-            <template v-else-if="cmReturn.returnedWay*1===1">
-              <template v-if="cmReturn.refundOnlineFee*1 !== 0">
-                <el-col :span="5">
-                  <b>线上退回:</b>
-                  <span>¥{{ cmReturn.refundOnlineFee | amountfilters }}</span>
-                </el-col>
+    <el-card v-if="cmReturnedPurchaseList.length === 0" class="box-card" style="height: 100px;line-height: 100px; text-align:center;color: #999;">暂无退款退货详情记录~</el-card>
+    <template v-else>
+      <div v-for="(cmReturn,index) in cmReturnedPurchaseList" id="printBox" :key="index">
+        <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> {{ cmReturn.reviewUserName }}</el-col>
+              <el-col :span="4"><b>审核时间：</b> {{ cmReturn.confirmReturnTime ? cmReturn.confirmReturnTime :'--' }}</el-col>
+              <el-col :span="15"><b>审核备注：</b> {{ cmReturn.reviewRemarks ? cmReturn.reviewRemarks :'--' }}</el-col>
+            </el-row>
+          </div>
+        </el-card>
+        <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> {{ cmReturn.applicationUserNam ? cmReturn.applicationUserNam :'--' }}</el-col>
+              <el-col :span="4"><b>申请时间：</b> {{ cmReturn.returnTime ? cmReturn.returnTime :'--' }}</el-col>
+              <el-col :span="15"><b>退款备注：</b> {{ cmReturn.remarks ? cmReturn.remarks :'--' }}</el-col>
+            </el-row>
+          </div>
+        </el-card>
+        <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> {{ cmReturn.returnedNo }}</el-col>
+              <el-col :span="4"><b>申请时间：</b> {{ cmReturn.returnTime }}</el-col>
+              <el-col :span="15"><b>申请金额</b> ¥{{ cmReturn.refundFee | amountfilters }} </el-col>
+            </el-row>
+            <h1 class="refund-item-title">退款方式</h1>
+            <el-row :gutter="24" class="box-row">
+              <el-col v-if="cmReturn.returnedWay*1===4" :span="4"><b>未支付无退款</b> </el-col>
+              <template v-else-if="cmReturn.returnedWay*1===1">
+                <template v-if="cmReturn.refundOnlineFee*1 !== 0">
+                  <el-col :span="5">
+                    <b>线上退回:</b>
+                    <span>¥{{ cmReturn.refundOnlineFee | amountfilters }}</span>
+                  </el-col>
+                </template>
+                <template v-if="cmReturn.refundOfflineFee*1 !== 0">
+                  <el-col :span="5">
+                    <b>线下转账：</b>
+                    <span>¥{{ cmReturn.refundOfflineFee | amountfilters }}</span>
+                  </el-col>
+                  <el-col :span="4"><b>开户名：</b><span>{{ cmReturn.bankAccountName }}</span> </el-col>
+                  <el-col :span="4"><b>账号：</b> <span>{{ cmReturn.bankAccountNo }}</span> </el-col>
+                  <el-col :span="4"><b>开户行：</b> <span>{{ cmReturn.openBank }}</span> </el-col>
+                  <el-col :span="4"><b>账户类型：</b> <span>{{ cmReturn.bankAccountType*1 === 1 ? '公账' : '私账' }}</span> </el-col>
+                </template>
               </template>
-              <template v-if="cmReturn.refundOfflineFee*1 !== 0">
-                <el-col :span="5">
-                  <b>线下转账：</b>
-                  <span>¥{{ cmReturn.refundOfflineFee | amountfilters }}</span>
-                </el-col>
-                <el-col :span="4"><b>开户名：</b><span>{{ cmReturn.bankAccountName }}</span> </el-col>
-                <el-col :span="4"><b>账号：</b> <span>{{ cmReturn.bankAccountNo }}</span> </el-col>
-                <el-col :span="4"><b>开户行：</b> <span>{{ cmReturn.openBank }}</span> </el-col>
-                <el-col :span="4"><b>账户类型：</b> <span>{{ cmReturn.bankAccountType*1 === 1 ? '公账' : '私账' }}</span> </el-col>
-              </template>
-            </template>
-            <span v-else>----</span>
-          </el-row>
-        </div>
-      </el-card>
-      <el-card class="box-card" style="margin: 5px auto;">
-        <div class="refund-item">
-          <el-row :gutter="24" class="box-row">
-            <el-col :span="5"><b>订单编号(ID)：</b> {{ order.orderNo }}({{ order.orderId }})</el-col>
-            <el-col :span="4"><b>下单时间：</b> {{ order.orderTime }}</el-col>
-            <el-col :span="6"><b>机构名称：</b> {{ order.clubName }}</el-col>
-            <el-col :span="9">
-              <b>订单状态：</b>
-              <template v-if="['11','12','13','21','22','23','31','32','33'].indexOf(order.status)>=0">
-                <el-tag type="success" size="small">交易中</el-tag>
-              </template>
-              <template v-else>
-                <el-tag :type="order.status*1===6?'info':''" size="small">{{ order.status | orderStatusFilter }}</el-tag>
-              </template>
-            </el-col>
-          </el-row>
-          <el-row :gutter="24" class="box-row">
-            <el-col :span="5"><b>订单金额：</b> {{ order.payTotalFee }}</el-col>
-            <el-col :span="4"><b>应收金额：</b> {{ order.payableAmount }}</el-col>
-            <el-col :span="15"><b>机构运费：</b>  <span>{{ order.postageInfo }}</span></el-col>
-          </el-row>
-          <el-row :gutter="24" class="box-row">
-            <el-col :span="5"><b>收款状态:</b>
-              <el-tag v-if="order.receiptStatus*1===1" type="danger" size="small">待收款</el-tag>
-              <el-tag v-if="order.receiptStatus*1===2" type="warning" size="small">部分收款</el-tag>
-              <el-tag v-if="order.receiptStatus*1===3" type="success" size="small">已收款</el-tag>
-            </el-col>
-            <el-col :span="4"><b>退款状态:</b>
-              <el-tag v-if="order.refundType*1===1" type="warning" size="small">部分退款</el-tag>
-              <el-tag v-else-if="order.refundType*1===2" type="danger" size="small">已退款</el-tag>
-              <el-tag v-else type="info" size="small">无退款</el-tag>
-            </el-col>
-            <el-col :span="6"><b>发货状态:</b>
-              <el-tag v-if="order.sendOutStatus*1===1" type="danger" size="small">待发货</el-tag>
-              <el-tag v-if="order.sendOutStatus*1===2" type="warning" size="small">部分发货</el-tag>
-              <el-tag v-if="order.sendOutStatus*1===3" type="success" size="small">已发货</el-tag>
-            </el-col>
-            <el-col :span="9"><b>退款状态：</b>
-              <el-tag v-if="order.refundType*1===1" type="warning" size="small">部分退款</el-tag>
-              <el-tag v-else-if="order.refundType*1===2" type="danger" size="small">已退款</el-tag>
-              <el-tag v-else type="info" size="small">无退款</el-tag>
-            </el-col>
-          </el-row>
-          <el-row :gutter="24" class="box-row">
-            <el-col :span="5"><b>机构:</b> {{ order.bpOrderUserinfo.name }}</el-col>
-            <el-col :span="4"><b>收货人:</b> {{ order.bpOrderUserinfo.shouHuoRen }}</el-col>
-            <el-col :span="6"><b>手机:</b> {{ order.bpOrderUserinfo.mobile }}</el-col>
-            <el-col :span="9"><b>地址:</b> {{ order.bpOrderUserinfo.province +' '+ order.bpOrderUserinfo.city +' '+ order.bpOrderUserinfo.town +' '+ order.bpOrderUserinfo.address }}</el-col>
-          </el-row>
-          <el-table :data="cmReturn.shopOrderReturnedList" border fit highlight-current-row default-expand-all :header-cell-style="{background:'#e9f3f7',color:'#606266'}">
-            <el-table-column label="商品信息" type="expand" width="80px">
-              <template slot-scope="{row}">
-                <el-table :data="row.cmReturnedPurchaseProductList" border fit highlight-current-row :header-cell-style="{background:'#f9f9f9',color:'#606266'}">
-                  <el-table-column label="商品图片" align="center" prop="image" width="100">
-                    <template slot-scope="scope">
-                      <el-popover
-                        placement="top-start"
-                        title=""
-                        width="120"
-                        trigger="hover"
-                      >
-                        <img :src="scope.row.mainImage" alt="" style="width:100px;height:100px;">
-                        <img slot="reference" :src="scope.row.mainImage" alt="" style="width:50px;height:50px;">
-                      </el-popover>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="商品名" align="center" prop="name" />
-                  <el-table-column label="规格" align="center" prop="unit" />
-                  <el-table-column label="购买数量" align="center" prop="num" width="100" />
-                  <el-table-column label="单价" align="center" prop="price" />
-                  <el-table-column label="总额" align="center" prop="totalAmount" />
-                  <el-table-column label="已发货" align="center" prop="sendOutNum" width="100" />
-                  <el-table-column label="已退货" align="center" prop="returnedPurchaseProductNum" width="100" />
-                  <el-table-column label="本次退货" align="center" prop="actualReturnedNum" width="100" />
-                  <el-table-column label="待发货" align="center" prop="notOutStore" width="100" />
-                  <el-table-column label="已取消" align="center" prop="cancelProductNum" width="100" />
-                  <el-table-column label="本次取消" align="center" prop="actualCancelNum" width="100" />
-                </el-table>
-              </template>
-            </el-table-column>
-            <el-table-column label="子订单编号(ID)" align="center" prop="shopOrderNos" width="240">
-              <template slot-scope="{row}">
-                <span>{{ row.shopOrderNo }}({{ row.shopOrderId }})</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="子订单金额" align="center" prop="productAmount" />
-            <el-table-column label="发货状态" align="center" prop="sendOutStatus">
-              <template slot-scope="{row}">
-                <el-tag v-if="row.sendOutStatus*1===1" type="danger" size="small">待发货</el-tag>
-                <el-tag v-if="row.sendOutStatus*1===2" type="warning" size="small">部分发货</el-tag>
-                <el-tag v-if="row.sendOutStatus*1===3" type="success" size="small">已发货</el-tag>
-              </template>
-            </el-table-column>
-            <el-table-column label="付款状态" align="center" prop="receiptStatus">
-              <template slot-scope="{row}">
-                <el-tag v-if="row.payStatus*1===1" type="danger" size="small">待付款</el-tag>
-                <el-tag v-if="row.payStatus*1===2" type="warning" size="small">部分付款</el-tag>
-                <el-tag v-if="row.payStatus*1===3" type="success" size="small">已付款</el-tag>
-              </template>
-            </el-table-column>
-            <el-table-column label="供应商" align="center" prop="shopName" />
-          </el-table>
-        </div>
-      </el-card>
-    </div>
+              <span v-else>----</span>
+            </el-row>
+          </div>
+        </el-card>
+        <el-card class="box-card" style="margin: 5px auto;">
+          <div class="refund-item">
+            <el-row :gutter="24" class="box-row">
+              <el-col :span="5"><b>订单编号(ID)：</b> {{ order.orderNo }}({{ order.orderId }})</el-col>
+              <el-col :span="4"><b>下单时间：</b> {{ order.orderTime }}</el-col>
+              <el-col :span="6"><b>机构名称：</b> {{ order.clubName }}</el-col>
+              <el-col :span="9">
+                <b>订单状态：</b>
+                <template v-if="['11','12','13','21','22','23','31','32','33'].indexOf(order.status)>=0">
+                  <el-tag type="success" size="small">交易中</el-tag>
+                </template>
+                <template v-else>
+                  <el-tag :type="order.status*1===6?'info':''" size="small">{{ order.status | orderStatusFilter }}</el-tag>
+                </template>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24" class="box-row">
+              <el-col :span="5"><b>订单金额：</b> {{ order.payTotalFee }}</el-col>
+              <el-col :span="4"><b>应收金额：</b> {{ order.payableAmount }}</el-col>
+              <el-col :span="15"><b>机构运费：</b>  <span>{{ order.postageInfo }}</span></el-col>
+            </el-row>
+            <el-row :gutter="24" class="box-row">
+              <el-col :span="5"><b>收款状态:</b>
+                <el-tag v-if="order.receiptStatus*1===1" type="danger" size="small">待收款</el-tag>
+                <el-tag v-if="order.receiptStatus*1===2" type="warning" size="small">部分收款</el-tag>
+                <el-tag v-if="order.receiptStatus*1===3" type="success" size="small">已收款</el-tag>
+              </el-col>
+              <el-col :span="4"><b>退款状态:</b>
+                <el-tag v-if="order.refundType*1===1" type="warning" size="small">部分退款</el-tag>
+                <el-tag v-else-if="order.refundType*1===2" type="danger" size="small">已退款</el-tag>
+                <el-tag v-else type="info" size="small">无退款</el-tag>
+              </el-col>
+              <el-col :span="6"><b>发货状态:</b>
+                <el-tag v-if="order.sendOutStatus*1===1" type="danger" size="small">待发货</el-tag>
+                <el-tag v-if="order.sendOutStatus*1===2" type="warning" size="small">部分发货</el-tag>
+                <el-tag v-if="order.sendOutStatus*1===3" type="success" size="small">已发货</el-tag>
+              </el-col>
+              <el-col :span="9"><b>退款状态：</b>
+                <el-tag v-if="order.refundType*1===1" type="warning" size="small">部分退款</el-tag>
+                <el-tag v-else-if="order.refundType*1===2" type="danger" size="small">已退款</el-tag>
+                <el-tag v-else type="info" size="small">无退款</el-tag>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24" class="box-row">
+              <el-col :span="5"><b>机构:</b> {{ order.bpOrderUserinfo.name }}</el-col>
+              <el-col :span="4"><b>收货人:</b> {{ order.bpOrderUserinfo.shouHuoRen }}</el-col>
+              <el-col :span="6"><b>手机:</b> {{ order.bpOrderUserinfo.mobile }}</el-col>
+              <el-col :span="9"><b>地址:</b> {{ order.bpOrderUserinfo.province +' '+ order.bpOrderUserinfo.city +' '+ order.bpOrderUserinfo.town +' '+ order.bpOrderUserinfo.address }}</el-col>
+            </el-row>
+            <el-table :data="cmReturn.shopOrderReturnedList" border fit highlight-current-row default-expand-all :header-cell-style="{background:'#e9f3f7',color:'#606266'}">
+              <el-table-column label="商品信息" type="expand" width="80px">
+                <template slot-scope="{row}">
+                  <el-table :data="row.cmReturnedPurchaseProductList" border fit highlight-current-row :header-cell-style="{background:'#f9f9f9',color:'#606266'}">
+                    <el-table-column label="商品图片" align="center" prop="image" width="100">
+                      <template slot-scope="scope">
+                        <el-popover
+                          placement="top-start"
+                          title=""
+                          width="120"
+                          trigger="hover"
+                        >
+                          <img :src="scope.row.mainImage" alt="" style="width:100px;height:100px;">
+                          <img slot="reference" :src="scope.row.mainImage" alt="" style="width:50px;height:50px;">
+                        </el-popover>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="商品名" align="center" prop="name" />
+                    <el-table-column label="规格" align="center" prop="unit" />
+                    <el-table-column label="购买数量" align="center" prop="num" width="100" />
+                    <el-table-column label="单价" align="center" prop="price" />
+                    <el-table-column label="总额" align="center" prop="totalAmount" />
+                    <el-table-column label="已发货" align="center" prop="sendOutNum" width="100" />
+                    <el-table-column label="已退货" align="center" prop="returnedPurchaseProductNum" width="100" />
+                    <el-table-column label="本次退货" align="center" prop="actualReturnedNum" width="100" />
+                    <el-table-column label="待发货" align="center" prop="notOutStore" width="100" />
+                    <el-table-column label="已取消" align="center" prop="cancelProductNum" width="100" />
+                    <el-table-column label="本次取消" align="center" prop="actualCancelNum" width="100" />
+                  </el-table>
+                </template>
+              </el-table-column>
+              <el-table-column label="子订单编号(ID)" align="center" prop="shopOrderNos" width="240">
+                <template slot-scope="{row}">
+                  <span>{{ row.shopOrderNo }}({{ row.shopOrderId }})</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="子订单金额" align="center" prop="productAmount" />
+              <el-table-column label="发货状态" align="center" prop="sendOutStatus">
+                <template slot-scope="{row}">
+                  <el-tag v-if="row.sendOutStatus*1===1" type="danger" size="small">待发货</el-tag>
+                  <el-tag v-if="row.sendOutStatus*1===2" type="warning" size="small">部分发货</el-tag>
+                  <el-tag v-if="row.sendOutStatus*1===3" type="success" size="small">已发货</el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column label="付款状态" align="center" prop="receiptStatus">
+                <template slot-scope="{row}">
+                  <el-tag v-if="row.payStatus*1===1" type="danger" size="small">待付款</el-tag>
+                  <el-tag v-if="row.payStatus*1===2" type="warning" size="small">部分付款</el-tag>
+                  <el-tag v-if="row.payStatus*1===3" type="success" size="small">已付款</el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column label="供应商" align="center" prop="shopName" />
+            </el-table>
+          </div>
+        </el-card>
+      </div>
+    </template>
   </div>
 </template>
 

src/views/finance/payfinance-remit-record.vue

@@ -59,7 +59,11 @@
             </el-table-column>
             <el-table-column label="收款ID" align="center" prop="receiptId" />
             <el-table-column label="收款方式" align="center" prop="bankNameType" />
-            <el-table-column label="收款金额" align="center" prop="receiptAmount" />
+            <el-table-column label="收款金额" align="center" prop="receiptAmount">
+              <template slot-scope="{row}">
+                ¥{{ row.receiptAmount | amountfilters }}
+              </template>
+            </el-table-column>
             <el-table-column label="收款时间" align="center" prop="receiptTime" />
           </el-table>
           <h1 class="refund-item-title">付款记录</h1>
@@ -69,8 +73,16 @@
             </el-table-column>
             <el-table-column label="付款单ID" align="center" prop="payShopId" />
             <el-table-column label="付款方式" align="center" prop="bankNameType" />
-            <el-table-column label="付款金额" align="center" prop="payAmount" />
-            <el-table-column label="付款时间" align="center" prop="payTime" />
+            <el-table-column label="付款金额" align="center" prop="payAmount">
+              <template slot-scope="{row}">
+                ¥{{ row.payAmount | amountfilters }}
+              </template>
+            </el-table-column>
+            <el-table-column label="付款时间" align="center" prop="payTime">
+              <template slot-scope="{row}">
+                {{ row.payTime ? row.payTime : '---' }}
+              </template>
+            </el-table-column>
           </el-table>
         </div>
       </el-card>

src/views/finance/payment-details.vue

@@ -119,7 +119,7 @@
             <el-col v-if="!detailsType === 'print'" :span="6"><b>子订单佣金：</b>
               <span> {{ shopOrder.brokerage | amountfilters }}  </span>
             </el-col>
-            <el-col :span="4"><b>商品费：</b> {{ shopOrder.shopProductAmount | amountfilters }}</el-col>
+            <el-col :span="4"><b>商品费：</b> ¥{{ shopOrder.shopProductAmount | amountfilters }}</el-col>
             <el-col :span="8"><b>付款状态：</b>
               <el-tag v-if="shopOrder.payStatus===1" type="danger" size="small">待付款</el-tag>
               <el-tag v-if="shopOrder.payStatus===2" type="warning" size="small">部分付款</el-tag>
@@ -137,8 +137,8 @@
               <b>付供应商：</b>
               <b style="margin-left: 10px;">应付采美：</b>
               <span class="el-span-danger"> ¥{{ shopOrder.shouldPayCmAmount | amountfilters }}  </span>
-              <b style="margin-left: 10px;">¥已付采美：</b>
-              <span class="el-span-danger"> {{ shopOrder.payCmAmount | amountfilters }}  </span>
+              <b style="margin-left: 10px;">已付采美：</b>
+              <span class="el-span-danger"> ¥{{ shopOrder.payCmAmount | amountfilters }}  </span>
               <b style="margin-left: 10px;">待付采美：</b>
               <span class="el-span-danger"> ¥{{ shopOrder.waitPayCmAmount | amountfilters }}  </span>
               <b style="margin-left: 10px;">应付供应商：</b>

src/views/finance/payment-list.vue

@@ -135,7 +135,7 @@
       <el-table-column label="付款金额" align="center" prop="totalAmount" />
       <el-table-column label="订单编号(ID)" align="center" prop="orderNos">
         <template slot-scope="{row}">
-          <span class="el-p-link" @click="handleOrderDetails(row)">{{ row.orderNo }}({{ row.orderId }})</span>
+          <span class="el-p-link" @click="handleOrderDetails(row)">{{ row.orderNo }}</span>
         </template>
       </el-table-column>
       <el-table-column label="子订单编号(ID)" align="center" prop="shopOrderNos">
@@ -184,7 +184,7 @@
         <template slot-scope="{row}">
           <el-button type="primary" size="mini" style="margin:5px;" @click="handleOperate(1,row.payShopId)">查看详情</el-button>
           <template v-if="row.status === 0 && row.payType !== 6">
-            <el-button type="primary" size="mini" style="margin:5px;" @click="handleOperate(2,row.payShopId)">修改申请</el-button>
+            <!-- <el-button type="primary" size="mini" style="margin:5px;" @click="handleOperate(2,row.payShopId)">修改申请</el-button> -->
             <el-button type="primary" size="mini" style="margin:5px;" @click="handleOperate(3,row.payShopId)">取消付款</el-button>
             <el-button type="primary" size="mini" style="margin:5px;" @click="handleOperate(4,row.payShopId)">付款审核</el-button>
           </template>

src/views/login/index.vue

@@ -203,13 +203,13 @@ $light_gray:#eee;
   }
   .login-form {
     position: relative;
-    width: 400px;
+    width: 360px;
     max-width: 100%;
     padding: 45px 35px 0 35px;
     margin: 20px auto;
     overflow: hidden;
     border-radius: 8px;
-    background: rgba(255, 255, 255, 0.4);
+    background: rgba(255, 255, 255, 0.9);
     .el-form-item {
       margin-bottom: 40px;
     }

src/views/order/detail.vue

@@ -70,7 +70,7 @@
       </div>
       <div class="refund-item">
         <el-row v-if="order.bpOrderUserinfo" :gutter="24" class="box-row">
-          <el-col v-if="order.bpOrderUserinfo" :span="6"><b>机构：</b> {{ order.bpOrderUserinfo.name }}</el-col>
+          <el-col v-if="order.bpOrderUserinfo" :span="6"><b>机构：</b> {{ order.clubName }}</el-col>
         </el-row>
         <el-row v-if="order.bpOrderUserinfo" :gutter="24" class="box-row">
           <el-col :span="6"><b>收货人：</b> {{ order.bpOrderUserinfo.shouHuoRen }}</el-col>

src/views/order/refund-detail.vue

@@ -11,9 +11,9 @@
           <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-col :span="5"><b>申请时间：</b> {{ cmReturnedPurchase.returnTime }}</el-col>
+            <el-col :span="4"><b>申请金额：</b> ¥{{ cmReturnedPurchase.refundFee | amountfilters }} </el-col>
+            <el-col :span="4"><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>
@@ -47,13 +47,13 @@
       <el-card ref="print" class="box-card" style="margin: 5px auto;">
         <div class="refund-item">
           <el-row :gutter="24" class="box-row">
-            <el-col :span="7">
+            <el-col :span="5">
               <b>订单编号(ID)：</b>{{ orderData.orderNo }}({{ orderData.orderId }})
             </el-col>
-            <el-col :span="6">
+            <el-col :span="5">
               <b>下单时间：</b>{{ orderData.orderTime }}
             </el-col>
-            <el-col :span="4">
+            <el-col :span="5">
               <b>订单状态：</b>
               <template v-if="['11','12','13','21','22','23','31','32','33'].indexOf(orderData.status)>=0">
                 <el-tag type="success" size="small">交易中({{ orderData.status | orderStatusFilter }})</el-tag>
@@ -64,32 +64,32 @@
             </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
-            <el-col :span="7"><b>订单金额：</b> ¥{{ orderData.payTotalFee }}</el-col>
-            <el-col :span="6"><b>应收金额：</b> ¥{{ orderData.payableAmount }}</el-col>
-            <el-col :span="4"><b>机构运费：</b>
+            <el-col :span="5"><b>订单金额：</b> ¥{{ orderData.payTotalFee }}</el-col>
+            <el-col :span="5"><b>应收金额：</b> ¥{{ orderData.payableAmount }}</el-col>
+            <el-col :span="14"><b>机构运费：</b>
               <span>{{ orderData.postageInfo }}</span>
             </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
-            <el-col :span="7">
+            <el-col :span="5">
               <b>收款状态：</b>
               <el-tag v-if="orderData.receiptStatus*1===1" type="danger" size="small">待收款</el-tag>
               <el-tag v-if="orderData.receiptStatus*1===2" type="warning" size="small">部分收款</el-tag>
               <el-tag v-if="orderData.receiptStatus*1===3" type="success" size="small">已收款</el-tag>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="5">
               <b>发货状态：</b>
               <el-tag v-if="orderData.sendOutStatus*1===1" type="danger" size="small">待发货</el-tag>
               <el-tag v-if="orderData.sendOutStatus*1===2" type="warning" size="small">部分发货</el-tag>
               <el-tag v-if="orderData.sendOutStatus*1===3" type="success" size="small">已发货</el-tag>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="5">
               <b>付款状态：</b>
               <el-tag v-if="orderData.payStatus*1===1" type="danger" size="small">待付款</el-tag>
               <el-tag v-if="orderData.payStatus*1===2" type="warning" size="small">部分付款</el-tag>
               <el-tag v-if="orderData.payStatus*1===3" type="success" size="small">已付款</el-tag>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="5">
               <b>退款状态：</b>
               <el-tag v-if="orderData.refundType*1===1" type="warning" size="small">部分退款</el-tag>
               <el-tag v-if="orderData.refundType*1===2" type="success" size="small">全部付款</el-tag>
@@ -97,9 +97,9 @@
             </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
-            <el-col :span="7"><b>机构名称：</b> {{ orderData.clubName }}</el-col>
-            <el-col :span="6"><b>收货人：</b> {{ orderData.receiver }}({{ orderData.mobile }})</el-col>
-            <el-col :span="11"><b>地址：</b> {{ orderData.address }}</el-col>
+            <el-col :span="5"><b>机构名称：</b> {{ orderData.clubName }}</el-col>
+            <el-col :span="5"><b>收货人：</b> {{ orderData.receiver }}({{ orderData.mobile }})</el-col>
+            <el-col :span="14"><b>地址：</b> {{ orderData.address }}</el-col>
           </el-row>
           <el-table :data="orderData.newShopOrders" border fit highlight-current-row default-expand-all :header-cell-style="{background:'#e9f3f7',color:'#606266'}">
             <el-table-column label="商品信息" type="expand" width="110">
@@ -186,7 +186,7 @@
           </el-row>
         </div>
       </el-card>
-      <el-card ref="print" class="box-card" style="margin: 5px 0 0 0;">
+      <el-card ref="print" class="box-card" style="margin: 0 auto;">
         <div class="refund-item">
           <el-row :gutter="24" class="box-row">
             <el-col :span="14"><b>申请退款金额：</b>￥{{ cmReturnedPurchase.refundFee }}元</el-col>

src/views/order/refund.vue

@@ -7,7 +7,7 @@
       </div>
       <div class="filter-control">
         <span>订单ID:</span>
-        <el-input v-model="listQuery.orderID" style="width:180px;" placeholder="订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.orderId" style="width:180px;" placeholder="订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>订单编号:</span>
@@ -15,7 +15,7 @@
       </div>
       <div class="filter-control">
         <span>机构名称:</span>
-        <el-input v-model="listQuery.orderID" style="width:180px;" placeholder="机构名称" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.clubName" style="width:180px;" placeholder="机构名称" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>退款审核状态:</span>
@@ -56,7 +56,7 @@
       <el-table-column label="订单编号(ID)" align="center" prop="orderNo" width="200">
         <template slot-scope="{row}">{{ row.orderNo + '(' + row.orderId + ')' }}</template>
       </el-table-column>
-      <el-table-column label="机构" align="center" prop="userName" />
+      <el-table-column label="机构" align="center" prop="clubName" />
       <el-table-column label="退款金额" align="center" prop="refundFee" width="110">
         <template slot-scope="{row}">¥{{ row.refundFee | toThousandFloatFilter }}</template>
       </el-table-column>
@@ -71,13 +71,21 @@
           <template v-else>----</template>
         </template>
       </el-table-column>
-      <el-table-column label="申请人" align="center" prop="applicationUserName" width="100" />
+      <el-table-column label="申请人" align="center" prop="applicationUserName" width="100">
+        <template slot-scope="{row}">
+          <span>{{ row.applicationUserName ? row.applicationUserName : '--' }}</span>
+        </template>
+      </el-table-column>
       <el-table-column align="center" label="申请时间" prop="returnTime">
         <template v-if="row.returnTime" slot-scope="{row}">
           <span>{{ row.returnTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="审核人" align="center" prop="reviewUserName" width="100" />
+      <el-table-column label="审核人" align="center" prop="reviewUserName" width="100">
+        <template slot-scope="{row}">
+          <span>{{ row.reviewUserName ? row.reviewUserName : '--' }}</span>
+        </template>
+      </el-table-column>
       <el-table-column align="center" label="审核时间" prop="confirmReturnTime">
         <template v-if="row.confirmReturnTime" slot-scope="{row}">
           <span>{{ row.confirmReturnTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -122,7 +130,7 @@ export default {
         pageSize: 10,
         organizeId: this.$store.getters.organizeId,
         returnedNo: '',
-        orderID: '',
+        orderId: '',
         orderNo: '',
         userName: '',
         beginReturnTime: '',