丽格V1.0.1

src/api/finance.js

@@ -131,16 +131,16 @@ export function organizePayInfos(params) {
  */
 export function organizeReceiptRecord(id) {
   return request({
-    url: `/order/organize/receipt/record/${id.orderId}/${id.shopOrderId}`,
+    url: `/order/organize/receipt/record/${id}`,
     method: 'get'
   })
 }
 /**
  * 订单退款退货记录
  */
-export function organizeToRecturnRecordByOrderId(id) {
+export function organizeToRecturnRecordByOrderId(params) {
   return request({
-    url: `/order/organize/toRecturnRecordByOrderId?orderId=${id.orderId}&shopOrderId=${id.shopOrderId}`,
+    url: `/order/organize/toRecturnRecordByOrderId?orderId=${params.orderId}&shopOrderId=${params.shopOrderId}`,
     method: 'get'
   })
 }

src/filters/index.js

@@ -103,22 +103,19 @@ export function amountfilters(value) {
 export function orderStatusFilter(status) {
   const map = {
     '0': '待确认',
-    '1': '待支付',
-    '2': '交易中',
-    '4': '交易完成',
-    '5': '订单完成',
-    '6': '已关闭',
-    '7': '交易全退',
-    '8': '退货退款',
-    '11': '待收款、待发货',
-    '12': '待收款、部分发货',
-    '13': '待收款、全部发货',
-    '21': '部分收款、待发货',
-    '22': '部分收款、部分发货',
-    '23': '部分收款、全部发货',
-    '31': '全部收款、待发货',
-    '32': '全部收款、部分发货',
-    '33': '全部收款、全部发货'
+    '2': '交易完成',
+    '4': '已关闭',
+    '5': '交易全退',
+    '6': '交易全退',
+    '11': '待付款待发货',
+    '12': '待付款部分发货',
+    '13': '待付款已发货',
+    '21': '部分付款待发货',
+    '22': '部分付款部分发货',
+    '23': '部分付款已发货',
+    '31': '已付款待发货',
+    '32': '已付款部分发货',
+    '33': '已付款已发货'
   }
   return map[status]
 }

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

@@ -3,95 +3,90 @@
     <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 && dataOrder.order.newShopOrders.length > 0" :gutter="24" class="box-row">
+          <el-row v-if="shopOrder" :gutter="24" class="box-row">
             <el-col
-              :span="5"
-            ><b>订单编号(ID)：</b> {{ dataOrder.order.newShopOrders[0].shopOrderNo }}({{
-              dataOrder.order.newShopOrders[0].shopOrderId
+              :span="7"
+            ><b>订单编号(ID)：</b> {{ shopOrder.shopOrderNo }}({{
+              shopOrder.shopOrderId
             }})</el-col>
-            <el-col :span="4"><b>下单时间：</b> {{ dataOrder.order.newShopOrders[0].orderTime }}</el-col>
-            <el-col :span="4"><b>机构名称：</b> {{ dataOrder.order.newShopOrders[0].clubName }}</el-col>
+            <el-col :span="6"><b>下单时间：</b> {{ shopOrder.orderTime }}</el-col>
+            <el-col :span="6"><b>机构名称：</b> {{ shopOrder.clubName }}</el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
-            <el-col :span="5">
+            <el-col :span="7">
               <b>订单状态：</b>
-              <template v-if="dataOrder.order.newShopOrders[0].shopStatus < 10">
-                <el-tag type="success" size="small">
-                  {{ orderStatus(dataOrder.order.newShopOrders[0].shopStatus) }}
-                </el-tag>
-              </template>
-              <template v-else>
-                <el-tag type="success" size="small"> 交易中 </el-tag>
-              </template>
+              <el-tag type="success" size="small">
+                {{ shopOrder.shopStatus | orderStatusFilter }}
+              </el-tag>
             </el-col>
-            <el-col v-if="dataOrder.order.newShopOrders && dataOrder.order.newShopOrders.length > 0" :span="4">
+            <el-col v-if="shopOrder" :span="6">
               <b>收款状态：</b>
               <el-tag
-                v-if="dataOrder.order.newShopOrders[0].receiptStatus * 1 === 1"
+                v-if="shopOrder.receiptStatus * 1 === 1"
                 type="danger"
                 size="small"
               >待收款</el-tag>
               <el-tag
-                v-if="dataOrder.order.newShopOrders[0].receiptStatus * 1 === 2"
+                v-if="shopOrder.receiptStatus * 1 === 2"
                 type="warning"
                 size="small"
               >部分收款</el-tag>
               <el-tag
-                v-if="dataOrder.order.newShopOrders[0].receiptStatus * 1 === 3"
+                v-if="shopOrder.receiptStatus * 1 === 3"
                 type="success"
                 size="small"
               >已收款</el-tag>
             </el-col>
-            <el-col v-if="dataOrder.order.newShopOrders && dataOrder.order.newShopOrders.length > 0" :span="4">
+            <el-col v-if="shopOrder" :span="6">
               <b>付款状态：</b>
               <el-tag
-                v-if="dataOrder.order.newShopOrders[0].payStatus * 1 === 1"
+                v-if="shopOrder.payStatus * 1 === 1"
                 type="danger"
                 size="small"
               >待付款</el-tag>
               <el-tag
-                v-if="dataOrder.order.newShopOrders[0].payStatus * 1 === 2"
+                v-if="shopOrder.payStatus * 1 === 2"
                 type="warning"
                 size="small"
               >部分付款</el-tag>
               <el-tag
-                v-if="dataOrder.order.newShopOrders[0].payStatus * 1 === 3"
+                v-if="shopOrder.payStatus * 1 === 3"
                 type="success"
                 size="small"
               >已付款</el-tag>
             </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
-            <el-col :span="5">
+            <el-col :span="7">
               <b>收货人：</b>
-              {{ dataOrder.order.receiver }}
+              {{ shopOrder.receiver }}
             </el-col>
-            <el-col :span="4">
+            <el-col :span="6">
               <b>手机：</b>
-              {{ dataOrder.order.mobile }}</el-col>
-            <el-col :span="15">
+              {{ shopOrder.mobile }}</el-col>
+            <el-col :span="11">
               <b>地址：</b>
-              {{ dataOrder.order.address }}</el-col>
+              {{ shopOrder.address }}</el-col>
           </el-row>
-          <el-row v-if="dataOrder.order.newShopOrders && dataOrder.order.newShopOrders.length > 0" :gutter="24" class="box-row">
+          <el-row v-if="shopOrder" :gutter="24" class="box-row">
             <el-col
-              :span="5"
+              :span="7"
             ><b>订单金额：</b> ¥{{
-              dataOrder.order.newShopOrders[0].totalAmount | amountfilters
+              shopOrder.totalAmount | amountfilters
             }}</el-col>
             <el-col
-              :span="4"
+              :span="6"
             ><b>应收金额：</b> ¥{{
-              dataOrder.order.newShopOrders[0].needPayAmount | amountfilters
+              shopOrder.needPayAmount | amountfilters
             }}</el-col>
             <!-- <el-col :span="5">
               <b>运费：</b>
-              <span>{{ dataOrder.order.postageInfo }}</span>
+              <span>{{ shopOrder.postageInfo }}</span>
             </el-col> -->
             <el-col
-              :span="4"
+              :span="6"
             ><b>退款金额：</b> ¥{{
-              dataOrder.order.newShopOrders[0].refundsAmount | amountfilters
+              shopOrder.refundsAmount | amountfilters
             }}</el-col>
           </el-row>
           <h1 class="refund-item-title">收款记录</h1>
@@ -160,7 +155,8 @@ export default {
   },
   data() {
     return {
-      dataOrder: {}
+      dataOrder: {},
+      shopOrder: {}
     }
   },
   computed: {
@@ -175,26 +171,12 @@ export default {
     this.organizeReceiptRecord()
   },
   methods: {
-    // 订单状态更新
-    orderStatus(state) {
-      const status = {
-        0: '待确认',
-        1: '已确认',
-        2: '交易完成',
-        3: '订单完成',
-        4: '已关闭',
-        5: '交易全退'
-      }
-      return status[state]
-    },
     async organizeReceiptRecord() {
       try {
-        const res = await organizeReceiptRecord({
-          orderId: this.orderId,
-          shopOrderId: this.shopOrderId
-        })
+        const res = await organizeReceiptRecord(this.shopOrderId)
         console.log('res', res)
         this.dataOrder = res.data
+        this.shopOrder = res.data.shopOrder
         this.listLoading = false
       } catch (error) {
         this.listLoading = false

src/views/order/detail.vue

@@ -14,10 +14,18 @@
         <el-row :gutter="24" class="box-row">
           <el-col :span="5"><b>下单时间：</b> {{ order.orderTime }}</el-col>
           <el-col
-            :span="5"
+            :span="6"
           ><b>订单编号(ID)：</b> {{ order.orderNo + "(" + order.orderId + ")" }}</el-col>
-          <el-col
-            :span="4"
+          <el-col :span="6"><b>订单来源：</b> 【丽格集采联盟】平台</el-col>
+          <el-col :span="7">
+            <b>订单类型：</b>
+            <span style="margin: 0;">{{ order.orderType === 1 ? '自主订单' : '采购员订单' }}</span>
+            <span v-if="order.orderType === 0" style="margin: 0;">({{ order.spName }})</span>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="box-row">
+          <!-- <el-col
+            :span="5"
           ><b>订单状态：</b>
             <template
               v-if="
@@ -33,15 +41,7 @@
                 order.status | orderStatusFilter
               }}</el-tag>
             </template>
-          </el-col>
-          <el-col :span="5">
-            <b>订单类型：</b>
-            <span style="margin: 0;">{{ order.orderType === 1 ? '自主订单' : '采购员订单' }}</span>
-            <span v-if="order.orderType === 0" style="margin: 0;">({{ order.spName }})</span>
-          </el-col>
-          <el-col :span="4"><b>订单来源：</b> 【丽格集采联盟】平台</el-col>
-        </el-row>
-        <el-row :gutter="24" class="box-row">
+          </el-col> -->
           <el-col
             :span="5"
           ><b>收款状态：</b>
@@ -80,8 +80,8 @@
               size="small"
             >已发货</el-tag>
           </el-col>
-          <el-col
-            :span="4"
+          <!-- <el-col
+            :span="5"
           ><b>付款状态：</b>
             <el-tag
               v-if="order.payStatus * 1 === 1"
@@ -113,7 +113,7 @@
               size="small"
             >已退款</el-tag>
             <el-tag v-else type="info" size="small">无退款</el-tag>
-          </el-col>
+          </el-col> -->
         </el-row>
       </div>
       <div class="refund-item">
@@ -243,14 +243,9 @@
             <el-col
               :span="6"
             ><b>子订单状态：</b>
-              <template v-if="shopOrder.shopStatus < 10">
-                <el-tag type="success" size="small">
-                  {{ orderStatus(shopOrder.shopStatus) }}
-                </el-tag>
-              </template>
-              <template v-else>
-                <el-tag type="success" size="small"> 交易中 </el-tag>
-              </template>
+              <el-tag type="success" size="small">
+                {{ shopOrder.shopStatus | orderStatusFilter }}
+              </el-tag>
             </el-col>
             <el-col
               :span="6"
@@ -292,44 +287,45 @@
             </el-col>
             <el-col
               :span="6"
-            ><b>付款状态：</b>
+            ><b>退款状态：</b>
               <el-tag
-                v-if="shopOrder.payStatus * 1 === 1"
-                type="danger"
+                v-if="shopOrder.refundStatus * 1 === 1"
+                type="info"
                 size="small"
-              >待付款</el-tag>
+              >无退款</el-tag>
               <el-tag
-                v-if="shopOrder.payStatus * 1 === 2"
+                v-if="shopOrder.refundStatus * 1 === 2"
                 type="warning"
                 size="small"
-              >部分付款</el-tag>
+              >退款中</el-tag>
               <el-tag
-                v-if="shopOrder.payStatus * 1 === 3"
+                v-if="shopOrder.refundStatus * 1 === 3"
                 type="success"
                 size="small"
-              >已付款</el-tag>
+              >已退款</el-tag>
             </el-col>
-          </el-row>
-          <el-row :gutter="22" class="box-row">
-            <el-col
+            <!-- <el-col
               :span="6"
-            ><b>退款状态：</b>
+            ><b>付款状态：</b>
               <el-tag
-                v-if="shopOrder.refundStatus * 1 === 1"
-                type="info"
+                v-if="shopOrder.payStatus * 1 === 1"
+                type="danger"
                 size="small"
-              >无退款</el-tag>
+              >待付款</el-tag>
               <el-tag
-                v-if="shopOrder.refundStatus * 1 === 2"
+                v-if="shopOrder.payStatus * 1 === 2"
                 type="warning"
                 size="small"
-              >退款中</el-tag>
+              >部分付款</el-tag>
               <el-tag
-                v-if="shopOrder.refundStatus * 1 === 3"
+                v-if="shopOrder.payStatus * 1 === 3"
                 type="success"
                 size="small"
-              >已退款</el-tag>
-            </el-col>
+              >已付款</el-tag>
+            </el-col> -->
+          </el-row>
+          <el-row :gutter="22" class="box-row">
+
             <el-col
               :span="6"
             ><b>留言：</b> {{ shopOrder.note ? shopOrder.note : "无" }}</el-col>

src/views/order/list.vue

@@ -154,16 +154,16 @@
       </el-table-column>
       <el-table-column label="机构" align="center" prop="clubName" />
       <el-table-column label="收货人" align="center" prop="receiver" width="100" />
-      <el-table-column label="订单状态" align="center" prop="status" width="150">
+      <!-- <el-table-column label="订单状态" align="center" prop="status" width="120">
         <template slot-scope="{row}">
-          <template v-if="['11','12','13','21','22','23','31','32','33'].indexOf(row.status)>=0">
-            <el-tag type="success" size="small">交易中</el-tag><span style="display: inline-block;margin:5px;">{{ row.status | orderStatusFilter }}</span>
+          <template v-if="['11'].indexOf(row.status)>=0">
+            <el-tag type="success" size="small">交易中</el-tag>
           </template>
           <template v-else>
             <el-tag :type="row.status*1===6?'info':''" size="small">{{ row.status | orderStatusFilter }}</el-tag>
           </template>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="收款状态" align="center" prop="receiptStatus" width="120">
         <template slot-scope="{row}">
           <el-tag v-if="row.receiptStatus*1===1" type="danger" size="small">待收款</el-tag>
@@ -171,13 +171,13 @@
           <el-tag v-if="row.receiptStatus*1===3" type="success" size="small">已收款</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="付款状态" align="center" prop="receiptStatus" width="120">
+      <!-- <el-table-column label="付款状态" align="center" prop="receiptStatus" width="120">
         <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> -->
       <el-table-column label="发货状态" align="center" prop="sendOutStatus" width="120">
         <template slot-scope="{row}">
           <el-tag v-if="row.sendOutStatus*1===1" type="danger" size="small">待发货</el-tag>
@@ -185,13 +185,13 @@
           <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="refundType" width="120">
+      <!-- <el-table-column label="退款状态" align="center" prop="refundType" width="120">
         <template slot-scope="{row}">
           <el-tag v-if="row.refundType*1===1" type="info" size="small">部分退款</el-tag>
           <el-tag v-else-if="row.refundType*1===2" type="info" size="small">全部退款</el-tag>
           <el-tag v-else type="info" size="small">无退款</el-tag>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="订单金额" align="center" prop="payTotalFee">
         <template slot-scope="{row}">
           ¥{{ row.payTotalFee | toThousandFloatFilter }}