v1.0.2改版更新

src/views/finance/details.vue

@@ -19,9 +19,9 @@
         <div v-for="order in repacts.orderInfos" :key="order.orderId">
           <el-row :gutter="22" class="box-row">
             <el-col :span="5"><b>订单编号：</b> {{ order.shopOrders[0].shopOrderNo + '(' + order.shopOrders[0].shopOrderId + ')' }}</el-col>
-            <el-col :span="5"><b>订单金额：</b> ¥{{ order.orderAmount | amountfilters }}</el-col>
-            <el-col :span="4"><b>应收金额：</b> ¥{{ order.payableAmount | amountfilters }}</el-col>
-            <el-col :span="4"><b>已收金额：</b> ¥{{ order.receiptAmount | amountfilters }}</el-col>
+            <el-col :span="5"><b>订单金额：</b> ¥{{ order.shopOrders[0].needPayAmount | amountfilters }}</el-col>
+            <el-col :span="4"><b>应收金额：</b> ¥{{ order.shopOrders[0].needPayAmount | amountfilters }}</el-col>
+            <el-col :span="4"><b>已收金额：</b> ¥{{ order.shopOrders[0].receiptAmount | amountfilters }}</el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
             <el-col :span="5"><b>机构名称：</b> {{ order.clubName }}</el-col>

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

@@ -1,18 +1,8 @@
 <template>
-  <div class="app-container">
+  <div v-loading="loading" class="app-container">
     <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>
@@ -29,7 +19,7 @@
             <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-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">
@@ -37,7 +27,7 @@
               <template v-else-if="cmReturn.returnedWay*1===1">
                 <template v-if="cmReturn.refundOnlineFee*1 !== 0">
                   <el-col :span="5">
-                    <b>线上退回:</b>
+                    <b>线上退回：</b>
                     <span>¥{{ cmReturn.refundOnlineFee | amountfilters }}</span>
                   </el-col>
                 </template>
@@ -46,59 +36,14 @@
                     <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-col v-else>----</el-col>
             </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>
@@ -163,9 +108,9 @@
               </el-table-column>
               <el-table-column label="退款状态" align="center">
                 <template>
-                  <el-tag v-if="order.newShopOrders[0].orderStatusFlag*1===1" type="info" size="small">无退款</el-tag>
-                  <el-tag v-if="order.newShopOrders[0].orderStatusFlag*1===2" type="warning" size="small">退款中</el-tag>
-                  <el-tag v-if="order.newShopOrders[0].orderStatusFlag*1===3" type="success" size="small">已退款</el-tag>
+                  <el-tag v-if="order.newShopOrders[0].refundStatus*1===1" type="info" size="small">无退款</el-tag>
+                  <el-tag v-if="order.newShopOrders[0].refundStatus*1===2" type="warning" size="small">退款中</el-tag>
+                  <el-tag v-if="order.newShopOrders[0].refundStatus*1===3" type="success" size="small">已退款</el-tag>
                 </template>
               </el-table-column>
               <el-table-column label="供应商" align="center" prop="shopName" />
@@ -197,7 +142,8 @@ export default {
       repacts: {},
       products: [],
       cmReturnedPurchase: {},
-      cmReturnedPurchaseList: []
+      cmReturnedPurchaseList: [],
+      loading: true
     }
   },
   computed: {
@@ -218,6 +164,7 @@ export default {
         this.order = res.data.order
         this.cmReturnedPurchase = res.data.cmReturnedPurchase
         this.cmReturnedPurchaseList = res.data.cmReturnedPurchaseList
+        this.loading = false
         console.log('res', res)
       } catch (error) {
         console.log('error', error)

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

@@ -3,7 +3,7 @@
     <div id="printBox">
       <el-card ref="print" class="box-card" style="margin: 0 auto">
         <div class="refund-item">
-          <el-row v-if="dataOrder.order.newShopOrders.length > 0" :gutter="24" class="box-row">
+          <el-row v-if="dataOrder.order.newShopOrders && dataOrder.order.newShopOrders.length > 0" :gutter="24" class="box-row">
             <el-col
               :span="5"
             ><b>订单编号(ID)：</b> {{ dataOrder.order.newShopOrders[0].shopOrderNo }}({{
@@ -24,7 +24,7 @@
                 <el-tag type="success" size="small"> 交易中 </el-tag>
               </template>
             </el-col>
-            <el-col v-if="dataOrder.order.newShopOrders.length > 0" :span="4">
+            <el-col v-if="dataOrder.order.newShopOrders && dataOrder.order.newShopOrders.length > 0" :span="4">
               <b>收款状态：</b>
               <el-tag
                 v-if="dataOrder.order.newShopOrders[0].receiptStatus * 1 === 1"
@@ -42,7 +42,7 @@
                 size="small"
               >已收款</el-tag>
             </el-col>
-            <el-col v-if="dataOrder.order.newShopOrders.length > 0" :span="4">
+            <el-col v-if="dataOrder.order.newShopOrders && dataOrder.order.newShopOrders.length > 0" :span="4">
               <b>付款状态：</b>
               <el-tag
                 v-if="dataOrder.order.newShopOrders[0].payStatus * 1 === 1"
@@ -73,7 +73,7 @@
               <b>地址：</b>
               {{ dataOrder.order.address }}</el-col>
           </el-row>
-          <el-row v-if="dataOrder.order.newShopOrders.length > 0" :gutter="24" class="box-row">
+          <el-row v-if="dataOrder.order.newShopOrders && dataOrder.order.newShopOrders.length > 0" :gutter="24" class="box-row">
             <el-col
               :span="5"
             ><b>订单金额：</b> ¥{{

src/views/order/detail.vue

@@ -310,17 +310,17 @@
               :span="6"
             ><b>退款状态：</b>
               <el-tag
-                v-if="shopOrder.orderStatusFlag * 1 === 1"
+                v-if="shopOrder.refundStatus * 1 === 1"
                 type="info"
                 size="small"
               >无退款</el-tag>
               <el-tag
-                v-if="shopOrder.orderStatusFlag * 1 === 2"
+                v-if="shopOrder.refundStatus * 1 === 2"
                 type="warning"
                 size="small"
               >退款中</el-tag>
               <el-tag
-                v-if="shopOrder.orderStatusFlag * 1 === 3"
+                v-if="shopOrder.refundStatus * 1 === 3"
                 type="success"
                 size="small"
               >已退款</el-tag>

src/views/order/order-remarks.vue

@@ -46,9 +46,9 @@
           </el-form>
         </div>
       </el-card>
-      <div class="goBack">
+      <!-- <div class="goBack">
         <el-button plain @click="backToList">返回</el-button>
-      </div>
+      </div> -->
     </div>
   </div>
 </template>

src/views/order/refund-detail.vue

@@ -13,11 +13,6 @@
             <el-col :span="5"><b>退款编号：</b> {{ cmReturnedPurchase.returnedNo }}</el-col>
             <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>
-            </el-col> -->
           </el-row>
           <h1 class="refund-item-title">退款方式</h1>
           <el-row :gutter="24" class="box-row">
@@ -34,73 +29,14 @@
                   <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>
-            <span v-else>----</span>
+            <el-col v-else :gutter="24">----</el-col>
           </el-row>
         </div>
       </el-card>
       <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="5">
-              <b>订单编号(ID)：</b>{{ orderData.orderNo }}({{ orderData.orderId }})
-            </el-col>
-            <el-col :span="5">
-              <b>下单时间：</b>{{ orderData.orderTime }}
-            </el-col>
-            <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>
-              </template>
-              <template v-else>
-                <el-tag :type="orderData.status*1===6?'info':''" size="small">{{ orderData.status | orderStatusFilter }}</el-tag>
-              </template>
-            </el-col>
-          </el-row>
-          <el-row :gutter="24" class="box-row">
-            <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="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="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="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="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>
-              <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> {{ 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">
               <template slot-scope="{row}">
@@ -147,8 +83,8 @@
             </el-table-column>
             <el-table-column label="退款状态" align="center" prop="receiptStatus">
               <template slot-scope="{row}">
-                <el-tag v-if="row.refundType*1===1" type="warning" size="small">部分退款</el-tag>
-                <el-tag v-if="row.refundType*1===2" type="success" size="small">全部付款</el-tag>
+                <el-tag v-if="row.refundStatus*1===1" type="warning" size="small">无退款</el-tag>
+                <el-tag v-if="row.refundStatus*1===3" type="success" size="small">已退款</el-tag>
                 <el-tag v-else type="info" size="small">无退款</el-tag>
               </template>
             </el-table-column>
@@ -157,21 +93,6 @@
           </el-table>
         </div>
       </el-card>
-      <!-- <el-card ref="print" 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="6">
-              <b>审核时间：</b>
-              {{ cmReturnedPurchase.confirmReturnTime ? cmReturnedPurchase.confirmReturnTime :'--' }}
-            </el-col>
-            <el-col :span="11">
-              <b>审核备注：</b>
-              {{ cmReturnedPurchase.reviewRemarks ? cmReturnedPurchase.reviewRemarks :'无' }}
-            </el-col>
-          </el-row>
-        </div>
-      </el-card> -->
       <el-card ref="print" class="box-card" style="margin: 5px auto;">
         <div class="refund-item">
           <h1 class="refund-item-title">申请信息</h1>

src/views/order/refund-record.vue

@@ -1,10 +1,5 @@
 <template>
   <div class="app-container">
-
-    <!--<el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal">
-      <el-menu-item index="1" @click="backToList">订单列表</el-menu-item>
-      <el-menu-item index="2">收退款记录</el-menu-item>
-    </el-menu>-->
     <div class="app-header-top" style="width: 100%;float: right;margin-bottom: 10px;">
       <div class="app-title">收退款记录</div>
       <el-button type="primary" icon="el-icon-back" style="float: right;" @click="backToList">返回</el-button>
@@ -117,13 +112,13 @@
           <span>{{ row.returnTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="退款状态" align="center" prop="payType">
+      <!-- <el-table-column label="退款状态" align="center" prop="payType">
         <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> -->
     </el-table>
     <template>
       <el-backtop style="right: 40px; bottom: 40px;">

src/views/order/refund.vue

@@ -15,7 +15,7 @@
       <div class="filter-control">
         <span>订单ID:</span>
         <el-input
-          v-model="listQuery.orderId"
+          v-model="listQuery.shopOrderId"
           style="width: 180px"
           placeholder="订单ID"
           clearable
@@ -45,15 +45,6 @@
           @clear="getList"
         />
       </div>
-      <!-- <div class="filter-control">
-        <span>退款审核状态:</span>
-        <el-select v-model="listQuery.status" style="width:180px;" clearable @change="getList">
-          <el-option value="" label="所有" />
-          <el-option label="待审核" value="1" />
-          <el-option label="审核通过" value="2" />
-          <el-option label="审核不通过" value="3" />
-        </el-select>
-      </div> -->
       <div class="filter-control">
         <span>申请时间:</span>
         <el-date-picker
@@ -127,23 +118,6 @@
           <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">
-        <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>
-        </template>
-      </el-table-column>
-      <el-table-column label="退款审核状态" align="center" prop="status" width="90">
-        <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">
         <template slot-scope="{ row }">
           <el-button
@@ -192,7 +166,7 @@ export default {
         pageSize: 10,
         organizeId: this.$store.getters.organizeId,
         returnedNo: '',
-        orderId: '',
+        shopOrderId: '',
         orderNo: '',
         userName: '',
         beginReturnTime: '',