From be2280907e65847102b55ab2fab07b6824b346b3 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Fri, 2 Jul 2021 09:10:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=BE=85=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../goodsDetail/ShowGoodsDetail.vue           | 11 +++---
 seller/src/api/order.js                       |  2 +-
 seller/src/views/order/order/orderList.vue    | 34 +++++++++++--------
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/buyer/src/components/goodsDetail/ShowGoodsDetail.vue b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
index 7d8256ec..ab2ca565 100644
--- a/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
+++ b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
@@ -90,7 +90,7 @@
               <template v-if="detail.goodsParamsDTOList && detail.goodsParamsDTOList.length">
                 <div class="goods-params" v-for="item in detail.goodsParamsDTOList" :key="item.groupId">
                   <span class="ml_10">{{item.groupName}}</span>
-                  <table class="mt_10" cellpadding='0' cellspacing="0" >
+                  <table class="mb_10" cellpadding='0' border="1" cellspacing="0" >
                     <tr v-for="param in item.goodsParamsItemDTOList" :key="param.paramId">
                       <td style="text-align:right">{{param.paramName}}</td><td>{{param.paramValue}}</td>
                     </tr>
@@ -489,16 +489,17 @@ export default {
   color: $theme_color;
 }
 table{
-  border-color: #eee;
+  border-color:#efefef;
   color: #999;
-  width: 50%;
+  min-width: 30%;
   margin-left: 10px;
+  font-size: 12px;
   tr{
     td:nth-child(1){
-      width: 100px;
+      min-width: 70px;
     }
     td:nth-child(2){
-      padding-left: 20px;
+      padding-left: 10px;
     }
   }
   td{
diff --git a/seller/src/api/order.js b/seller/src/api/order.js
index 8f303fc1..60872d72 100644
--- a/seller/src/api/order.js
+++ b/seller/src/api/order.js
@@ -12,7 +12,7 @@ export const verificationCode = verificationCode => {
 export const downLoadDeliverExcel = params => {
   return getRequest(`/orders/downLoadDeliverExcel`, params, 'blob');
 };
-// 下载待发货的订单列表
+// 导出待发货订单
 export const queryExportOrder = params => {
   return getRequest(`/orders/queryExportOrder`, params);
 };
diff --git a/seller/src/views/order/order/orderList.vue b/seller/src/views/order/order/orderList.vue
index fc38a8dc..6b197f29 100644
--- a/seller/src/views/order/order/orderList.vue
+++ b/seller/src/views/order/order/orderList.vue
@@ -30,8 +30,7 @@
         <Button type="primary" class="export" @click="expressOrderDeliver">
           批量发货
         </Button>
-        
-        <!-- <download-excel
+        <download-excel
           style="display:inline-block;"
           :data="data"
           :fields="excelColumns"
@@ -41,7 +40,7 @@
           <Button type="success">
             导出待发货订单
           </Button>
-        </download-excel> -->
+        </download-excel>
       </div>
       <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"></Table>
       <Row type="flex" justify="end" class="page">
@@ -56,6 +55,7 @@
 import * as API_Order from "@/api/order";
 import { verificationCode } from "@/api/order";
 import JsonExcel from "vue-json-excel";
+import Cookies from "js-cookie";
 export default {
   name: "orderList",
   components: {
@@ -87,8 +87,6 @@ export default {
         endTime: "",
         billPrice: "",
       },
-      // 表单验证规则
-      formValidate: {},
       submitLoading: false, // 添加或编辑提交状态
       columns: [
         {
@@ -195,9 +193,9 @@ export default {
       excelColumns: { // 导出excel的参数
         '编号': 'index',
         '订单号': 'sn',
-        '收货人': 'memberName',
-        '收货人联系电话': 'memberName',
-        '收货地址': 'memberName',
+        '收货人': 'consigneeName',
+        '收货人联系电话': 'consigneeMobile',
+        '收货地址': 'consigneeAddress',
       }
     };
   },
@@ -274,21 +272,29 @@ export default {
     },
     // 导出的待发货订单数据
     async exportOrder () {
+      let userInfo = JSON.parse(Cookies.get("userInfo"));
+      console.log(userInfo);
       const params = {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
-        sort: "", // 默认排序字段
-        order: "", // 默认排序方式
+        pageSize: 100, // 页面大小
+        sort: "startDate", // 默认排序字段
+        order: "desc", // 默认排序方式
         startDate: "", // 起始时间
         endDate: "", // 终止时间
         orderSn: "",
         buyerName: "",
-        orderStatus: "UNDELIVERED",
+        tag: "WAIT_ROG",
         orderType: "NORMAL",
+        storeId: userInfo.id
       }
-      const res = await API_Order.getOrderList(params)
-      return res.result.records
+      const res = await API_Order.queryExportOrder(params)
+      for (let i=0; i<res.result.length; i++) {
+        res.result[i].index = i+1;
+        res.result[i].consigneeAddress = 
+          res.result[i].consigneeAddressPath.replace(/,/g, "") + res.result[i].consigneeDetail
+      }
+      return res.result
     },
     // 查看订单详情
     detail(v) {