订单

src/api/finance.js

@@ -125,6 +125,15 @@ export function organizeReceiptRecord(id) {
     method: 'get'
   })
 }
+/**
+ * 订单退款退货记录
+ */
+export function organizeToRecturnRecordByOrderId(id) {
+  return request({
+    url: '/order/organize/toRecturnRecordByOrderId?orderId=' + id,
+    method: 'get'
+  })
+}
 /**
  * 订单结算记录
  */

src/api/order.js

@@ -30,17 +30,6 @@ export function saveRemarks(query) {
     data: query
   })
 }
-
-/**
- * 订单退款退货记录
- */
-export function getRefundReturn(query) {
-  return request({
-    url: '/order/organize/toRecturnRecordByOrderId',
-    method: 'get',
-    params: query
-  })
-}
 /**
  * 收退款记录
  */

src/router/modules/finance.js

@@ -105,7 +105,7 @@ const financeRouter = {
       path: 'refund-record',
       name: 'RefundRecord',
       component: () => import('@/views/finance/payfinance-refund-record'),
-      meta: { title: '用户退款记录', noCache: true, icon: 'el-icon-takeaway-box' },
+      meta: { title: '退货/退款记录', noCache: true, icon: 'el-icon-takeaway-box' },
       hidden: true
     }
   ]

src/router/modules/order.js

@@ -76,20 +76,6 @@ const orderRouter = {
       component: () => import('@/views/order/logistics'),
       meta: { title: '发货记录', noCache: true, activeMenu: '/order/list' },
       hidden: true
-    },
-    {
-      path: 'refund-record',
-      name: 'RefundRecord',
-      component: () => import('@/views/order/refund-record'),
-      meta: { title: '收退款记录', noCache: true, activeMenu: '/order/list' },
-      hidden: true
-    },
-    {
-      path: 'refund-return',
-      name: 'RefundRreturn',
-      component: () => import('@/views/order/refund-return'),
-      meta: { title: '退款（退货）记录', noCache: true, activeMenu: '/order/list' },
-      hidden: true
     }
   ]
 }

src/views/finance/payapply-edit.vue

@@ -111,7 +111,12 @@
           <el-row :gutter="24" class="box-row">
             <el-col :span="5"><b>供应商名称：</b> {{ shopOrder.shopName }}</el-col>
             <el-col :span="18"><b>供应商运费：</b>
-              <el-input v-model="shopOrder.shopPostFee" style="width: 100px;" size="mini" />
+              <el-input
+                v-model="shopOrder.shopPostFee"
+                :disabled="shopOrder.isShopPostFee"
+                style="width: 100px;"
+                size="mini"
+              />
             </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
@@ -218,7 +223,7 @@ export default {
         bankAccount: [{ required: true, message: '付供应商开户行不能为空', trigger: 'blur' }],
         bankName: [{ required: true, message: '付供应商开户行不能为空', trigger: 'blur' }],
         cmType: [{ required: true, message: '请选择付采美账户类型', trigger: 'change' }],
-        type: [{ required: true, message: '请选择付供应商账户类型', trigger: 'blur' }]
+        type: [{ required: true, message: '请选择付供应商账户类型', trigger: 'change' }]
       },
       applyType: ''
     }
@@ -227,7 +232,7 @@ export default {
     shopOrderIds() {
       return JSON.parse(this.$route.query.shopOrderIds)
     },
-    totalCmTotalAmount() {
+    totalCmTotalAmount() { // 计算付采美总额
       let payCmTotalAmount = 0
       const shopOrders = this.payRepacts.shopOrders
       shopOrders.forEach(item => {
@@ -235,13 +240,15 @@ export default {
       })
       return payCmTotalAmount
     },
-    totalShopTotalAmount() {
+    totalShopTotalAmount() { // 计算付供应商总额
       let waitPayShop = 0
+      let shopPostFee = 0
       const shopOrders = this.payRepacts.shopOrders
       shopOrders.forEach(item => {
         waitPayShop += item.waitPayShop
+        shopPostFee += item.shopPostFee
       })
-      return waitPayShop
+      return Number(waitPayShop) + Number(shopPostFee)
     }
   },
   created() {
@@ -259,6 +266,14 @@ export default {
         const res = await getApplyPays(this.shopOrderIds)
         this.payRepacts = res.data
         this.payRepacts.applicantName = this.$store.getters.name
+        this.payRepacts.shopOrders = this.payRepacts.shopOrders.map((shopOrder) => {
+          if (shopOrder.shopPostFee > 0 || shopOrder.shopId === 1613) {
+            return { ...shopOrder, ...{ isShopPostFee: true }}
+          } else {
+            return { ...shopOrder, ...{ isShopPostFee: false }}
+          }
+        })
+        console.log('shopOrders', this.payRepacts.shopOrders)
       } catch (error) {
         console.log('error', error)
       }
@@ -272,6 +287,13 @@ export default {
         console.log('error', error)
       }
     },
+    disabled(shopOrder) {
+      if (shopOrder.shopId === 1613 || shopOrder.isShopPostFee) {
+        return true
+      } else {
+        return false
+      }
+    },
     // 提交付款申请
     hanldeSubmit(formName) {
       this.$refs[formName].validate(valid => {

src/views/finance/payapply-list.vue

@@ -209,7 +209,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="total>20" :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
+    <pagination v-show="total>10" :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
   </div>
 </template>
 
@@ -255,7 +255,7 @@ export default {
         listType: 1, // 1申请付款 2子订单分账 3子订单结算
         organizeId: this.$store.getters.organizeId,
         pageNum: 1,
-        pageSize: 20,
+        pageSize: 10,
         shopName: '', // 供应商名称
         clubName: '', // 机构名称
         orderNo: '', // 订单编号

src/views/finance/paycents-list.vue

@@ -278,6 +278,7 @@ export default {
     async getList() {
       this.listLoading = true
       try {
+        this.initTime()
         const res = await getPayOrderList(this.listQuery)
         this.list = res.data.list
         this.listLoading = false

src/views/finance/payfinance-list.vue

@@ -261,7 +261,7 @@
       <el-table-column label="操作" align="center" width="160">
         <template slot-scope="{row}">
           <el-button type="primary" size="mini" style="margin:5px;" @click="handleToRecord(1,row.orderId)">收付款记录</el-button>
-          <el-button type="primary" size="mini" style="margin:5px;" @click="handleToRecord(2,row.orderId)">用户退款/退货记录</el-button>
+          <el-button type="primary" size="mini" style="margin:5px;" @click="handleToRecord(2,row.orderId)">退货/退款记录</el-button>
           <!-- <el-button type="text" size="mini" @click="handleToRecord(3,row.orderId)">供应商退/付款记录</el-button> -->
         </template>
       </el-table-column>

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

@@ -1,143 +1,160 @@
 <template>
   <div class="app-container">
-    <el-card v-if="cmReturnedPurchaseList.length === 0" class="box-card" style="text-align:center;color: #999;line-height: 120px;">暂无退款退货记录~</el-card>
-    <div v-else id="printBox">
-      <el-card ref="print" class="box-card" style="margin: 5px auto;">
+    <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> 卢海珠</el-col>
-            <el-col :span="4"><b>审核时间：</b> 2023-03-06 15:28:50</el-col>
-            <el-col :span="15"><b>审核备注：</b> 没有货了</el-col>
+            <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 ref="print" class="box-card" style="margin: 5px auto;">
+      <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> 卢海珠</el-col>
-            <el-col :span="4"><b>申请时间：</b> 2023-03-06 15:28:50</el-col>
-            <el-col :span="15"><b>退款备注：</b> 有部分没有货，客户需要重新下单</el-col>
+            <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 ref="print" class="box-card" style="margin: 5px auto;">
+      <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> T1678087730239854</el-col>
-            <el-col :span="4"><b>申请时间：</b> 2023-03-06 15:28:50</el-col>
-            <el-col :span="4"><b>申请金额：</b> 30000.00元</el-col>
-            <el-col :span="11"><b>退款方式：</b> 线上退回：597.00元</el-col>
+            <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>
+            <span v-else>----</span>
           </el-row>
         </div>
       </el-card>
-      <el-card ref="print" class="box-card" style="margin: 5px auto;">
+      <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> {{ repacts.orderNo }}({{ repacts.orderId }})</el-col>
-            <el-col :span="4"><b>下单时间：</b> {{ repacts.applyTime }}</el-col>
-            <el-col :span="4"><b>机构名称：</b> {{ repacts.clubName }}</el-col>
-            <el-col :span="4"><b>订单状态：</b> 交易中</el-col>
+            <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> {{ repacts.payableAmount }}</el-col>
-            <el-col :span="4"><b>应收金额：</b> {{ repacts.payableAmount }}</el-col>
-            <el-col :span="4"><b>机构运费：</b>  <span>{{ repacts.postageInfo }}</span></el-col>
+            <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> {{ repacts.status | statusFilter }}</el-col>
-            <el-col :span="4"><b>发货状态：</b> {{ repacts.status | statusFilter }}</el-col>
-            <el-col :span="4"><b>付款状态：</b> {{ repacts.status | statusFilter }}</el-col>
-            <el-col :span="4"><b>退款状态：</b> {{ repacts.status | statusFilter }}</el-col>
+            <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> 黄志国</el-col>
-            <el-col :span="4"><b>手机：</b> 15817887257</el-col>
-            <el-col :span="15"><b>地址：</b> 广东省深圳市龙华区大浪街道上早新村</el-col>
+            <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="repacts.shopOrderIdList" border fit highlight-current-row default-expand-all :header-cell-style="{background:'#e9f3f7',color:'#606266'}">
+          <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="scope">
-                <el-table :data="scope.row.products" border fit highlight-current-row :header-cell-style="{background:'#f9f9f9',color:'#606266'}">
+              <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="{row}">
+                    <template slot-scope="scope">
                       <el-popover
                         placement="top-start"
                         title=""
                         width="120"
                         trigger="hover"
                       >
-                        <img :src="row.image" alt="" style="width:100px;height:100px;">
-                        <img slot="reference" :src="row.image" alt="" style="width:50px;height:50px;">
+                        <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="productName" />
+                  <el-table-column label="商品名" align="center" prop="name" />
                   <el-table-column label="规格" align="center" prop="unit" />
-                  <el-table-column label="购买数量" align="center" prop="num" />
-                  <el-table-column label="退货" align="center" prop="returnNum" />
+                  <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="totalPrice" />
-                  <el-table-column label="已发货" align="center" prop="num" />
-                  <el-table-column label="已退货" align="center" prop="num" />
-                  <el-table-column label="本次退货" align="center" prop="num" />
-                  <el-table-column label="待发货" align="center" prop="num" />
-                  <el-table-column label="已取消" align="center" prop="num" />
-                  <el-table-column label="本次取消" align="center" prop="num" />
+                  <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="scope">
-                <span>{{ scope.row.shopOrderNos }}({{ scope.row.shopOrderIds }})</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="子订单金额" align="center" prop="payShopTotals" />
-            <el-table-column label="收款状态" prop="status" align="center" width="100">
-              <template slot-scope="{ row }">
-                <span
-                  :class="{
-                    'el-span-warning': row.status == 0,
-                    'el-span-success': row.status == 1,
-                    'el-span-danger': row.status == 2
-                  }"
-                >
-                  {{ row.status | statusFilter }}
-                </span>
+              <template slot-scope="{row}">
+                <span>{{ row.shopOrderNo }}({{ row.shopOrderId }})</span>
               </template>
             </el-table-column>
-            <el-table-column label="发货状态" prop="status" align="center" width="100">
-              <template slot-scope="{ row }">
-                <span
-                  :class="{
-                    'el-span-warning': row.status == 0,
-                    'el-span-success': row.status == 1,
-                    'el-span-danger': row.status == 2
-                  }"
-                >
-                  待发货
-                </span>
+            <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="付款状态" prop="status" align="center" width="100">
-              <template slot-scope="{ row }">
-                <span
-                  :class="{
-                    'el-span-warning': row.status == 0,
-                    'el-span-success': row.status == 1,
-                    'el-span-danger': row.status == 2
-                  }"
-                >
-                  待付款
-                </span>
+            <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-column label="商品总额" align="center" prop="payShopTotals" />
-            <el-table-column label="应付金额" align="center" prop="payShopTotals" />
-            <el-table-column label="已付金额" align="center" prop="payShopTotals" />
-            <el-table-column label="待付金额" align="center" prop="payShopTotals" />
           </el-table>
         </div>
       </el-card>
@@ -146,7 +163,7 @@
 </template>
 
 <script>
-import { getRefundRecord } from '@/api/order'
+import { organizeToRecturnRecordByOrderId } from '@/api/finance'
 export default {
   name: 'RefundRecord',
   filters: {
@@ -161,9 +178,10 @@ export default {
   },
   data() {
     return {
-      payRepacts: {},
+      order: {},
       repacts: {},
       products: [],
+      cmReturnedPurchase: {},
       cmReturnedPurchaseList: []
     }
   },
@@ -173,12 +191,14 @@ export default {
     }
   },
   created() {
-    this.getRefundRecord()
+    this.organizeToRecturnRecordByOrderId()
   },
   methods: {
-    async getRefundRecord() {
+    async organizeToRecturnRecordByOrderId() {
       try {
-        const res = await getRefundRecord({ orderId: this.orderId })
+        const res = await organizeToRecturnRecordByOrderId(this.orderId)
+        this.order = res.data.order
+        this.cmReturnedPurchase = res.data.cmReturnedPurchase
         this.cmReturnedPurchaseList = res.data.cmReturnedPurchaseList
         console.log('res', res)
       } catch (error) {

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

@@ -12,10 +12,10 @@
             <el-col :span="5">
               <b>订单状态：</b>
               <template v-if="['11','12','13','21','22','23','31','32','33'].indexOf(dataOrder.order.status)>=0">
-                <el-tag type="success" size="small">{{ '交易中('+statusObj[dataOrder.order.status]+')' }}</el-tag>
+                <el-tag type="success" size="small">交易中</el-tag>
               </template>
               <template v-else>
-                <el-tag :type="dataOrder.order.status*1===6?'info':''" size="small">{{ statusObj[dataOrder.order.status] }}</el-tag>
+                <el-tag :type="dataOrder.order.status*1===6?'info':''" size="small">{{ dataOrder.order.status | orderStatusFilter }}</el-tag>
               </template>
             </el-col>
             <el-col :span="4">
@@ -94,23 +94,7 @@ export default {
   },
   data() {
     return {
-      dataOrder: {},
-      statusObj: {
-        '0': '待确认',
-        '4': '交易完成',
-        '5': '订单完成',
-        '6': '已关闭',
-        '7': '交易全退',
-        '11': '待收款、待发货',
-        '12': '待收款、部分发货',
-        '13': '待收款、全部发货',
-        '21': '部分收款、待发货',
-        '22': '部分收款、部分发货',
-        '23': '部分收款、全部发货',
-        '31': '全部收款、待发货',
-        '32': '全部收款、部分发货',
-        '33': '全部收款、全部发货'
-      }
+      dataOrder: {}
     }
   },
   computed: {

src/views/finance/payment-details.vue

@@ -3,7 +3,7 @@
     <div class="filter-container" style="text-align: right;">
       <el-button v-if="detailsType === 'verify' && payRepacts.status === 0" type="primary" @click="handlePayCheck(1)">审核通过</el-button>
       <el-button v-if="detailsType === 'verify' && payRepacts.status === 0" type="danger" @click="dialogVisible = true">审核不通过</el-button>
-      <el-button v-if="payRepacts.status === 1" v-print="printObj" type="primary">打印</el-button>
+      <el-button v-if="payRepacts.status === 1 && detailsType === 'print'" v-print="printObj" type="primary">打印</el-button>
     </div>
     <div id="printBox">
       <el-card ref="print" class="box-card" style="margin: 0 auto;">
@@ -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.productAmount | 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>
@@ -175,10 +175,10 @@
         <div class="refund-item">
           <el-row :gutter="24" class="box-row">
             <el-col :span="6"><b>付供应商总金额：</b>
-              <span class="el-span-danger"> {{ payRepacts.totalAmount | amountfilters }} </span>
+              <span class="el-span-danger"> ¥{{ payRepacts.totalAmount | amountfilters }} </span>
             </el-col>
             <el-col :span="6"><b>付采美总金额：</b>
-              <span class="el-span-danger"> {{ payRepacts.payCmTotalAmount | amountfilters }}  </span>
+              <span class="el-span-danger"> ¥{{ payRepacts.payCmTotalAmount | amountfilters }}  </span>
             </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
@@ -227,7 +227,7 @@
             </el-col>
             <el-col v-if="payRepacts.status === 2" :span="20"><b>原因：</b> <span class="el-span-danger">{{ payRepacts.reason }}</span> </el-col>
           </el-row>
-          <el-row :gutter="24" class="box-row">
+          <el-row v-if="detailsType ==='print'" :gutter="24" class="box-row">
             <el-col :span="6"><b>财务签名：</b> </el-col>
             <el-col :span="6"><b>审批人签名：</b> </el-col>
           </el-row>

src/views/finance/payment-list.vue

@@ -180,7 +180,7 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="180">
+      <el-table-column label="操作" align="center" width="210">
         <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">
@@ -196,8 +196,8 @@
             <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>
           </template>
-          <template v-if="row.status === 1 && row.payType === 6">
-            <el-button type="primary" size="mini" style="margin:5px;" @click="handleOperate(1,row.payShopId)">打印</el-button>
+          <template v-if="row.status === 1">
+            <el-button type="primary" size="mini" style="margin:5px;" @click="handleOperate(7,row.payShopId)">打印</el-button>
           </template>
         </template>
       </el-table-column>
@@ -289,7 +289,7 @@ export default {
        */
       switch (type) {
         case 1:// 1查看详情
-          this.$router.push({ path: '/finance/payment-details', query: { type: 'print', payShopId: payShopId }})
+          this.$router.push({ path: '/finance/payment-details', query: { payShopId: payShopId }})
           break
         case 2:// 2修改申请
           this.$router.push({ path: '/finance/payapply-edit', query: { type: 'edit', payShopId: payShopId }})
@@ -306,6 +306,9 @@ export default {
         case 6:// 6撤销付款
           this.handleCancelBack(payShopId)
           break
+        case 7:// 7打印
+          this.$router.push({ path: '/finance/payment-details', query: { type: 'print', payShopId: payShopId }})
+          break
       }
     },
     // 取消付款操作

src/views/finance/payment-record.vue

@@ -4,29 +4,29 @@
       <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="5"><b>订单编号(ID)：</b> {{ shopOrder.orderNo }}({{ shopOrder.orderId }})</el-col>
-            <el-col :span="5"><b>下单时间：</b> {{ shopOrder.orderTime }}</el-col>
-            <el-col :span="4">
+            <el-col :span="6"><b>订单编号(ID)：</b> {{ shopOrder.orderNo }}({{ shopOrder.orderId }})</el-col>
+            <el-col :span="6"><b>下单时间：</b> {{ shopOrder.orderTime }}</el-col>
+            <el-col :span="6">
               <b>订单金额：</b>
               <span class="el-span-danger">¥{{ shopOrder.payTotalFee | amountfilters }}</span>
             </el-col></el-row>
           <el-row :gutter="24" class="box-row">
-            <el-col :span="5"><b>机构名称：</b> {{ shopOrder.clubName }}</el-col>
-            <el-col :span="5"><b>机构运费：</b> <span>{{ shopOrder.postageInfo }}</span></el-col>
-            <el-col :span="4">
+            <el-col :span="6"><b>机构名称：</b> {{ shopOrder.clubName }}</el-col>
+            <el-col :span="6"><b>机构运费：</b> <span>{{ shopOrder.postageInfo }}</span></el-col>
+            <el-col :span="6">
               <b>收款状态：</b>
               <el-tag v-if="shopOrder.receiptStatus*1===1" type="danger" size="small">待收款</el-tag>
               <el-tag v-if="shopOrder.receiptStatus*1===2" type="warning" size="small">部分收款</el-tag>
               <el-tag v-if="shopOrder.receiptStatus*1===3" type="success" size="small">已收款</el-tag>
             </el-col>
-            <el-col :span="10">
+            <el-col :span="6">
               <b>收款金额：</b>
               <span class="el-span-danger">¥{{ shopOrder.payableAmount | amountfilters }}</span>
             </el-col></el-row>
           <el-row :gutter="24" class="box-row">
-            <el-col :span="5"><b>子订单编号(ID)</b> {{ shopOrder.shopOrderNo }}({{ shopOrder.shopOrderId }})</el-col>
-            <el-col :span="5"><b>商品费：</b> ¥{{ shopOrder.payableAmount | amountfilters }}</el-col>
-            <el-col :span="10">
+            <el-col :span="6"><b>子订单编号(ID)</b> {{ shopOrder.shopOrderNo }}({{ shopOrder.shopOrderId }})</el-col>
+            <el-col :span="6"><b>商品费：</b> ¥{{ shopOrder.productAmount | amountfilters }}</el-col>
+            <el-col :span="6">
               <b>付款状态：</b>
               <el-tag v-if="shopOrder.payStatus*1===1" type="danger" size="small">待付款</el-tag>
               <el-tag v-if="shopOrder.payStatus*1===2" type="warning" size="small">部分付款</el-tag>
@@ -34,9 +34,9 @@
             </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
-            <el-col :span="5"><b>供应商名称：</b> {{ shopOrder.shopName }}</el-col>
-            <el-col :span="5"><b>供应商运费：</b> {{ shopOrder.shopPostFee | amountfilters }}</el-col>
-            <el-col :span="14">
+            <el-col :span="6"><b>供应商名称：</b> {{ shopOrder.shopName }}</el-col>
+            <el-col :span="6"><b>供应商运费：</b> {{ shopOrder.shopPostFee | amountfilters }}</el-col>
+            <el-col :span="6">
               <b>付供应商：</b>
               <b style="margin-left: 10px;">已付采美:</b>¥{{ shopOrder.payTotalFee | amountfilters }}
               <b style="margin-left: 10px;">已付供应商:</b>¥{{ shopOrder.payTotalFee | amountfilters }}

src/views/finance/paysettle-list.vue

@@ -281,6 +281,7 @@ export default {
     async getList() {
       this.listLoading = true
       try {
+        this.initTime()
         const res = await getPayOrderList(this.listQuery)
         this.list = res.data.list
         this.listLoading = false

src/views/login/index.vue

@@ -194,8 +194,8 @@ $light_gray:#eee;
   background-color: $bg;
   overflow: hidden;
   .loginTit {
-    max-width: 700px;
-    padding: 220px 20px 0;
+    width: 400px;
+    padding: 200px 20px 0;
     margin: 0 auto;
     img{
        width:100%;
@@ -203,12 +203,13 @@ $light_gray:#eee;
   }
   .login-form {
     position: relative;
-    width: 450px;
+    width: 400px;
     max-width: 100%;
-    padding: 45px 35px;
-    margin: 0 auto;
+    padding: 45px 35px 0 35px;
+    margin: 20px auto;
     overflow: hidden;
     border-radius: 8px;
+    background: rgba(255, 255, 255, 0.4);
     .el-form-item {
       margin-bottom: 40px;
     }

src/views/order/detail.vue

@@ -33,13 +33,13 @@
                   <div @click="handeleDropdown(2,order.orderId)">发货记录</div>
                 </el-dropdown-item>
                 <el-dropdown-item>
-                  <div @click="handeleDropdown(3,order.orderId)">收退款记录</div>
+                  <div @click="handeleDropdown(3,order.orderId)">收付款记录</div>
                 </el-dropdown-item>
                 <el-dropdown-item>
                   <div @click="handeleDropdown(4,order.orderId)">退款（退货）记录</div>
                 </el-dropdown-item>
                 <el-dropdown-item>
-                  <div @click="RemarksOrder(order.orderId)">订单备注</div>
+                  <div @click="handeleDropdown(5,order.orderId)">订单备注</div>
                 </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
@@ -156,7 +156,7 @@
               </el-table-column>
               <el-table-column label="已发/已收" align="center" prop="returnedPurchaseProductNum">
                 <template slot-scope="{row}">
-                  <span>{{ `${row.num - row.notOutStore}/${row.receivedNum ? row.receivedNum : 0}` }}</span>
+                  <span>{{ `${row.sendOutNum ? row.sendOutNum : 0}/${row.receivedNum ? row.receivedNum : 0}` }}</span>
                 </template>
               </el-table-column>
               <el-table-column label="退款(退货)中/已完成" align="center" prop="returnedPurchaseProductNum">
@@ -317,12 +317,15 @@ export default {
         case 2:// 发货记录
           this.$router.push({ path: '/order/deliver-record', query: { orderId: orderId }})
           break
-        case 3:// 收退款记录
-          this.$router.push({ path: '/order/refund-record', query: { orderId: orderId }})
+        case 3:// 收付款记录
+          this.$router.push({ path: '/finance/remit-record', query: { orderId: orderId }})
           break
         case 4:// 退款（退货）记录
           this.$router.push({ path: '/finance/refund-record', query: { orderId: orderId }})
           break
+        case 5:// 订单备注
+          this.$router.push({ path: '/order/order-remarks', query: { orderId: orderId }})
+          break
       }
     },
     async handleChangOrder() {

src/views/order/refund-detail.vue

@@ -11,7 +11,7 @@
           <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">
+          <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>
@@ -35,13 +35,10 @@
         <div class="refund-item">
           <el-row :gutter="24" class="box-row">
             <el-col :span="7">
-              <b>订单编号(ID)：</b>
-              {{ orderData.orderNo }}
-              ({{ orderData.orderId }})
+              <b>订单编号(ID)：</b>{{ orderData.orderNo }}({{ orderData.orderId }})
             </el-col>
             <el-col :span="6">
-              <b>下单时间：</b>
-              {{ orderData.orderTime }}
+              <b>下单时间：</b>{{ orderData.orderTime }}
             </el-col>
             <el-col :span="4">
               <b>订单状态：</b>
@@ -111,15 +108,14 @@
                   <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="returnedPurchaseProductNum" width="100" />
                   <el-table-column label="单价" align="center" prop="price" />
-                  <el-table-column label="总额" align="center" prop="totalFee" />
-                  <el-table-column label="已发货" align="center" prop="returnedPurchaseProductNum" width="100" />
+                  <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="returnedPurchaseProductNum" width="100" />
-                  <el-table-column label="待发货" align="center" prop="returnedPurchaseProductNum" width="100" />
-                  <el-table-column label="已取消" align="center" prop="returnedPurchaseProductNum" 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>
@@ -128,8 +124,8 @@
                 <span>{{ row.shopOrderNo }}({{ row.shopOrderId }})</span>
               </template>
             </el-table-column>
-            <el-table-column label="子订单金额" align="center" prop="payShopTotals" />
-            <el-table-column label="发货状态" align="center" prop="receiptStatus">
+            <el-table-column label="子订单金额" align="center" prop="totalAmount" />
+            <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>

src/views/order/refund-record.vue

@@ -21,7 +21,7 @@
             <el-tag type="success" size="small">交易中</el-tag>
           </template>
           <template v-else>
-            <el-tag :type="order.status*1===6?'info':''" size="small">{{ statusObj[order.status] }}</el-tag>
+            <el-tag :type="order.status*1===6?'info':''" size="small">{{ order.status | orderStatusFilter }}</el-tag>
           </template>
         </el-col>
         <el-col :span="6"><b>收款状态:</b>
@@ -75,7 +75,7 @@
         </template>
       </el-table-column>
       <el-table-column label="收款ID" align="center" prop="receiptId" />
-      <el-table-column label="收款方式" align="center" prop="payType" />
+      <el-table-column label="收款方式" align="center" prop="bankNameType" />
       <el-table-column label="金额" align="center" prop="associateAmount">
         <template slot-scope="{row}">
           ¥{{ row.associateAmount | toThousandFloatFilter }}
@@ -89,7 +89,7 @@
       </el-table-column>
     </el-table>
 
-    <h3>退款记录: {{ cmReturnedPurchaseList.length>0 ? '' : '无' }}</h3>
+    <h3>付款记录: {{ cmReturnedPurchaseList.length>0 ? '' : '无' }}</h3>
     <el-table
       v-if="cmReturnedPurchaseList.length>0"
       v-loading="listLoading"
@@ -143,23 +143,7 @@ export default {
       cmReturnedPurchaseList: [],
       order: null,
       refundFee: 0,
-      returnedPurchaseFee: 0,
-      statusObj: {
-        '0': '待确认',
-        '4': '交易完成',
-        '5': '订单完成',
-        '6': '已关闭',
-        '7': '交易全退',
-        '11': '待收款、待发货',
-        '12': '待收款、部分发货',
-        '13': '待收款、全部发货',
-        '21': '部分收款、待发货',
-        '22': '部分收款、部分发货',
-        '23': '部分收款、全部发货',
-        '31': '全部收款、待发货',
-        '32': '全部收款、部分发货',
-        '33': '全部收款、全部发货'
-      }
+      returnedPurchaseFee: 0
     }
   },
   computed: {

src/views/order/refund.vue

@@ -96,7 +96,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="total>20" :total="total" :page.sync="listQuery.index" :limit.sync="listQuery.pageSize" @pagination="getList" />
+    <pagination v-show="total>10" :total="total" :page.sync="listQuery.index" :limit.sync="listQuery.pageSize" @pagination="getList" />
     <template>
       <el-backtop style="right: 40px; bottom: 40px;">
         <i class="el-icon-upload2" />
@@ -119,7 +119,7 @@ export default {
       searchTimeVal: '',
       listQuery: {
         index: 1,
-        pageSize: 20,
+        pageSize: 10,
         organizeId: this.$store.getters.organizeId,
         returnedNo: '',
         orderID: '',