From 9b1d4011afb53fd772b3fe15671404666278f24c Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Tue, 24 Oct 2023 16:21:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/distributionStockArticle.js  | 16 ++++
 src/views/basicdata/brand/basicClient.vue     | 81 ++++++++++++++++---
 .../delivery/distributionStockArticle.vue     | 18 ++++-
 .../stockup/distributionStockupMarket.vue     |  2 +-
 4 files changed, 103 insertions(+), 14 deletions(-)

diff --git a/src/api/distribution/distributionStockArticle.js b/src/api/distribution/distributionStockArticle.js
index b090f526..0518f9aa 100644
--- a/src/api/distribution/distributionStockArticle.js
+++ b/src/api/distribution/distributionStockArticle.js
@@ -23,6 +23,22 @@ export const getListStockArticleWhole = (current, size, params) => {
   })
 }
 
+/**
+ * 订单数据导出
+ * @param row
+ * @returns {AxiosPromise}
+ */
+export const stockArticExport = (row) => {
+  return request({
+    url: '/api/logpm-distribution/distributionStockArticle/export-distributionStockArticle',
+    method: 'get',
+    params: {
+      ...row
+    },
+    responseType: 'blob',
+  })
+}
+
 /**
  * 查询客户的订单列表
  * @param {} current
diff --git a/src/views/basicdata/brand/basicClient.vue b/src/views/basicdata/brand/basicClient.vue
index cf8708f0..c797c3d7 100644
--- a/src/views/basicdata/brand/basicClient.vue
+++ b/src/views/basicdata/brand/basicClient.vue
@@ -71,9 +71,8 @@
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
             <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
-            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain
-              >删 除</el-button
-            >
+            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain >删 除</el-button >
+            <el-button type="danger"  icon="el-icon-delete"   @click="handleImport">导 入 </el-button>
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -173,6 +172,15 @@
           </el-pagination>
         </div>
       </el-row>
+      <el-dialog title="客户导入" append-to-body v-model="excelBox" width="555px">
+        <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
+          <template #excelTemplate>
+            <el-button type="primary" @click="handleTemplate">
+              点击下载<i class="el-icon-download el-icon--right"></i>
+            </el-button>
+          </template>
+        </avue-form>
+      </el-dialog>
       <!-- 表单模块 -->
       <el-dialog
         :title="title"
@@ -457,6 +465,8 @@ import { getToken } from '@/utils/auth';
 import globalc from '@/api/basicdata/globalc';
 import { Base64 } from 'js-base64';
 import dayjs from 'dayjs';
+import { exportBlob } from '@/api/common';
+import { downloadXls } from '@/utils/util';
 
 export default {
   components: {
@@ -464,6 +474,34 @@ export default {
   },
   data() {
     return {
+      excelForm: {},
+      excelBox: false,
+      excelOption: {
+        submitBtn: false,
+        emptyBtn: false,
+        column: [
+          {
+            label: '文件上传',
+            prop: 'excelFile',
+            type: 'upload',
+            drag: true,
+            loadText: '文件上传，请稍等',
+            span: 24,
+            propsHttp: {
+              res: 'data',
+            },
+            tip: '请上传 .xls,.xlsx 标准格式文件',
+            action: '/api/logpm-basicdata/basicdataClient/import-basicDataClient',
+          }
+          ,
+          {
+            label: '模板下载',
+            prop: 'excelTemplate',
+            formslot: true,
+            span: 24,
+          },
+        ],
+      },
       columnList: [
         {
           prop: '',
@@ -717,17 +755,36 @@ export default {
       });
       return ids.join(',');
     },
-    headers() {
-      return {
-        'Blade-Auth': 'Bearer ' + getToken(),
-      };
-    },
-    action() {
-      return '/api/blade-resource/oss/endpoint/put-file';
-      // return '/api/blade-resource/oss/endpoint/put-file-attach'
-    },
+    // headers() {
+    //   return {
+    //     'Blade-Auth': 'Bearer ' + getToken(),
+    //   };
+    // },
+    // action() {
+    //   return '/api/blade-resource/oss/endpoint/put-file';
+    //   // return '/api/blade-resource/oss/endpoint/put-file-attach'
+    // },
   },
   methods: {
+    uploadAfter(res, done, loading, column) {
+      window.console.log(column);
+      this.excelBox = false;
+      // this.refreshChange();
+      done();
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    handleImport() {
+      this.excelBox = true;
+    },
+    handleTemplate() {
+      exportBlob(
+        `/api/logpm-basicdata/basicdataClient/import-basicDataClient?${this.website.tokenHeader}=${getToken()}`
+      ).then(res => {
+        downloadXls(res.data, '用户数据模板.xlsx');
+      });
+    },
     showdrawer(value) {
       this.drawerShow = value;
     },
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
index 24f8e380..2cc3a81d 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
@@ -101,6 +101,7 @@
               v-if="handler"
               >修改服务类型</el-button
             >
+<!--            <el-button type="danger" icon="el-icon-plus" @click="handleExport" plain>导 出</el-button>-->
 
             <!--            <el-button type="danger"-->
             <!--                       icon="el-icon-delete"-->
@@ -411,7 +412,7 @@ import {
   add,
   update,
   remove,
-  addStock,
+  addStock, stockArticExport
 } from '@/api/distribution/distributionStockArticle';
 import { getListOwn } from '@/api/distribution/distributionParcelList';
 import { addCallDelivery } from '@/api/distribution/distrilbutionCallDelivery';
@@ -1079,6 +1080,21 @@ export default {
     },
   },
   methods: {
+
+    //导出
+    handleExport() {
+      let row = {  };
+      if(!!this.ids){
+        row.ids = this.ids;
+      }
+      stockArticExport(row).then( res =>{
+        console.log(res.data);
+        downloadXls(res.data, '全部订单数据.xlsx');
+      });
+
+    },
+
+
     uploadAfter(res, done, loading, column) {
       window.console.log(column);
       this.excelBox = false;
diff --git a/src/views/distribution/stockup/distributionStockupMarket.vue b/src/views/distribution/stockup/distributionStockupMarket.vue
index 323980b3..9e0ffad1 100644
--- a/src/views/distribution/stockup/distributionStockupMarket.vue
+++ b/src/views/distribution/stockup/distributionStockupMarket.vue
@@ -348,7 +348,7 @@ export default {
           head: false,
         },
         {
-          prop: 'stockupDate',
+          prop: 'outboundDate',
           label: '出库时间',
           type: 4,
           values: '',