合并master

seller/docker.sh

@@ -1 +1 @@
-docker build -t registry.cn-beijing.aliyuncs.com/lili-images/seller-ui-1.0.1:0.0.4 .
+docker build -t registry.cn-beijing.aliyuncs.com/lili-images/seller-ui-4.2.0:0.0.2 .

seller/src/api/order.js

@@ -12,6 +12,10 @@ export const verificationCode = verificationCode => {
 export const downLoadDeliverExcel = params => {
   return getRequest(`/orders/downLoadDeliverExcel`, params, 'blob');
 };
+// 导出待发货订单
+export const queryExportOrder = params => {
+  return getRequest(`/orders/queryExportOrder`, params);
+};
 
 
 // 上传待发货的订单列表

seller/src/config/index.js

@@ -22,6 +22,10 @@ export default {
     buyer: 'https://buyer-api.pickmall.cn',
     seller: 'https://store-api.pickmall.cn',
     manager: 'https://admin-api.pickmall.cn',
+    // common: 'http://192.168.0.109:8890',
+    // buyer: 'http://192.168.0.109:8888',
+    // seller: 'http://192.168.0.109:8889',
+    // manager: 'http://192.168.0.109:8887'
 
   },
   api_prod: {

seller/src/views/goods/goods-seller/goodsOperation.vue

@@ -776,6 +776,7 @@ export default {
       this.activestep = 0;
       this.isPublish = true;
       this.GET_GoodsTemplate();
+
       this.GET_NextLevelCategory();
     },
      // 获取已选模板
@@ -790,6 +791,8 @@ export default {
     handleClickGoodsTemplate(val) {
       this.draftId = val.id;
       this.selectGoodsType = false;
+      this.GET_GoodData();
+      this.activestep = 1;
     },
     // 点击商品类型
     handleClickGoodsType(val) {

seller/src/views/order/order/orderDetail.vue

@@ -63,7 +63,7 @@
 
       <div class="div-item" v-if="orderInfo.order.needReceipt == true">
         <div class="div-item-left">发票金额：</div>
-        <div class="div-item-right">{{ orderInfo.receipt.receiptPrice ? orderInfo.receipt.receiptPrice : '暂无' | unitPrice('￥')}}</div>
+        <div class="div-item-right"><span v-if="orderInfo.receipt.receiptPrice">￥</span>{{ orderInfo.receipt.receiptPrice ? orderInfo.receipt.receiptPrice : '暂无' | unitPrice}}</div>
       </div>
 
         <div class="div-item" v-if="orderInfo.order.needReceipt == true">

seller/src/views/order/order/orderList.vue

@@ -30,8 +30,19 @@
         <Button type="primary" class="export" @click="expressOrderDeliver">
           批量发货
         </Button>
+        <download-excel
+          style="display:inline-block;"
+          :data="data"
+          :fields="excelColumns"
+          :fetch="exportOrder"
+          name="待发货订单.xls"
+        >
+          <Button type="success">
+            导出待发货订单
+          </Button>
+        </download-excel>
       </div>
-      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"></Table>
       <Row type="flex" justify="end" class="page">
         <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
           show-total show-elevator show-sizer></Page>
@@ -43,8 +54,13 @@
 <script>
 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: {
+    "download-excel": JsonExcel,
+  },
   data() {
     return {
       orderCode: "",
@@ -71,11 +87,7 @@ export default {
         endTime: "",
         billPrice: "",
       },
-      // 表单验证规则
-      formValidate: {},
       submitLoading: false, // 添加或编辑提交状态
-      selectList: [], // 多选数据
-      selectCount: 0, // 多选计数
       columns: [
         {
           title: "订单号",
@@ -178,6 +190,13 @@ export default {
       ],
       data: [], // 表单数据
       total: 0, // 表单数据总数
+      excelColumns: { // 导出excel的参数
+        '编号': 'index',
+        '订单号': 'sn',
+        '收货人': 'consigneeName',
+        '收货人联系电话': 'consigneeMobile',
+        '收货地址': 'consigneeAddress',
+      }
     };
   },
   methods: {
@@ -202,22 +221,27 @@ export default {
         path: "/export-order-deliver",
       });
     },
+    // 初始化数据
     init() {
       this.getDataList();
     },
+    // 改变页码
     changePage(v) {
       this.searchForm.pageNumber = v;
       this.getDataList();
     },
+    // 改变页数
     changePageSize(v) {
       this.searchForm.pageSize = v;
       this.getDataList();
     },
+    // 搜索订单
     handleSearch() {
       this.searchForm.pageNumber = 1;
       this.searchForm.pageSize = 10;
       this.getDataList();
     },
+    // 重置
     handleReset() {
       this.searchForm = {};
       this.searchForm.pageNumber = 1;
@@ -228,25 +252,14 @@ export default {
       // 重新加载数据
       this.getDataList();
     },
-    changeSort(e) {
-      this.searchForm.sort = e.key;
-      this.searchForm.order = e.order;
-      if (e.order === "normal") {
-        this.searchForm.order = "";
-      }
-      this.getDataList();
-    },
-
-    changeSelect(e) {
-      this.selectList = e;
-      this.selectCount = e.length;
-    },
+    // 起始时间处理
     selectDateRange(v) {
       if (v) {
         this.searchForm.startDate = v[0];
         this.searchForm.endDate = v[1];
       }
     },
+    // 获取表格数据
     getDataList() {
       this.loading = true;
       API_Order.getOrderList(this.searchForm).then((res) => {
@@ -257,7 +270,33 @@ export default {
         }
       });
     },
-
+    // 导出的待发货订单数据
+    async exportOrder () {
+      let userInfo = JSON.parse(Cookies.get("userInfo"));
+      console.log(userInfo);
+      const params = {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 100, // 页面大小
+        sort: "startDate", // 默认排序字段
+        order: "desc", // 默认排序方式
+        startDate: "", // 起始时间
+        endDate: "", // 终止时间
+        orderSn: "",
+        buyerName: "",
+        tag: "WAIT_ROG",
+        orderType: "NORMAL",
+        storeId: userInfo.id
+      }
+      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) {
       let sn = v.sn;
       this.$router.push({