From 240ae5dd2e9a363b15f4d2733e7b03cf4979855e Mon Sep 17 00:00:00 2001
From: hyt <958868763@qq.com>
Date: Wed, 6 Nov 2024 09:19:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BD=E7=9F=A5=E4=B8=AD=E5=8F=B0=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../u8positiveReports/TOBoutputWarehouse.vue  | 50 +++++---------
 .../u8positiveReports/TOBreturnWarehouse.vue  | 54 +++++----------
 .../u8positiveReports/TOCoutputWarehouse.vue  | 51 +++++---------
 .../u8positiveReports/TOCreturnWarehouse.vue  | 67 +++++--------------
 vue.config.js                                 |  4 +-
 5 files changed, 66 insertions(+), 160 deletions(-)

diff --git a/src/views/systemReports/u8positiveReports/TOBoutputWarehouse.vue b/src/views/systemReports/u8positiveReports/TOBoutputWarehouse.vue
index fce22e9..18c33c6 100644
--- a/src/views/systemReports/u8positiveReports/TOBoutputWarehouse.vue
+++ b/src/views/systemReports/u8positiveReports/TOBoutputWarehouse.vue
@@ -114,14 +114,14 @@
         style=" margin: 5px 5px"
       >查询
       </el-button>
-      <!--      <el-button-->
-      <!--        type="primary"-->
-      <!--        @click="downLoad"-->
-      <!--        :loading="loading"-->
-      <!--        size="small"-->
-      <!--        style=" margin: 5px 5px"-->
-      <!--      >excel导出-->
-      <!--      </el-button>-->
+            <el-button
+              type="primary"
+              @click="downLoad"
+              :loading="loading"
+              size="small"
+              style=" margin: 5px 5px"
+            >excel导出
+            </el-button>
       <el-button
         type="warning"
         @click="reset"
@@ -362,39 +362,21 @@ export default {
   },
   methods: {
     async downLoad() {
-      if (this.queryCriteria.business_date_start && this.queryCriteria.business_date_end) {
-        let startDate = new Date(this.queryCriteria.business_date_start)
-        let endDate = new Date(this.queryCriteria.business_date_end)
-        let differenceInMillis = endDate - startDate
-        let differenceInDays = differenceInMillis / (1000 * 60 * 60 * 24)
-        // 判断差值是否在15天以内
-        if (!isNaN(differenceInDays) && differenceInDays < 31) {
-        } else {
-          this.$vmNews('开始时间和结束时间范围请选择在30天内')
-          return
-        }
-      } else {
-        this.$vmNews('请选择开始时间和结束时间')
-        return
-      }
       let params = {
         ...this.queryCriteria,
-        ...this.pageModel,
-        pageSize: 9999,
-        pageNum: 1
-      }
+      };
       this.openLoading('detail')
-      const res = await authApi('busidataTocsalesServiceImpl', 'busidataTocsalesServiceImpl', 'queryToCSalesReportExcel', '', params)
+      const res = await authApi("tocofsSaleoutServiceImplReport", "tocofsSaleoutServiceImplReport", "exportToCSalesReportExcel", "", params);
 
       if (res.status == 200) {
         const response = await downFilesBasedFileNameFileTypeAPI(res.attribute)
         // console.log(res)
-        const url = window.URL.createObjectURL(new Blob([response]), { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' })
-        const link = document.createElement('a')
-        link.href = url
-        link.setAttribute('download', 'toc正向流程报表.xlsx') // 设置下载的文件名
-        document.body.appendChild(link)
-        link.click()
+        const url = window.URL.createObjectURL(new Blob([response]), {type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'});
+        const link = document.createElement('a');
+        link.href = url;
+        link.setAttribute('download', 'TOB销售核对表.xlsx'); // 设置下载的文件名
+        document.body.appendChild(link);
+        link.click();
       }
       return
 
diff --git a/src/views/systemReports/u8positiveReports/TOBreturnWarehouse.vue b/src/views/systemReports/u8positiveReports/TOBreturnWarehouse.vue
index c7ca22e..58c0f33 100644
--- a/src/views/systemReports/u8positiveReports/TOBreturnWarehouse.vue
+++ b/src/views/systemReports/u8positiveReports/TOBreturnWarehouse.vue
@@ -115,14 +115,14 @@
         style=" margin: 5px 5px"
       >查询
       </el-button>
-<!--      <el-button-->
-<!--        type="primary"-->
-<!--        @click="downLoad"-->
-<!--        :loading="loading"-->
-<!--        size="small"-->
-<!--        style=" margin: 5px 5px"-->
-<!--      >excel导出-->
-<!--      </el-button>-->
+      <el-button
+        type="primary"
+        @click="downLoad"
+        :loading="loading"
+        size="small"
+        style=" margin: 5px 5px"
+      >excel导出
+      </el-button>
       <el-button
         type="warning"
         @click="reset"
@@ -368,42 +368,18 @@ export default {
   },
   methods: {
     async downLoad() {
-      if (this.queryCriteria.business_date_start && this.queryCriteria.business_date_end) {
-        let startDate = new Date(this.queryCriteria.business_date_start)
-        let endDate = new Date(this.queryCriteria.business_date_end)
-        let differenceInMillis = endDate - startDate
-        let differenceInDays = differenceInMillis / (1000 * 60 * 60 * 24)
-        // 判断差值是否在15天以内
-        if (!isNaN(differenceInDays) && differenceInDays < 31) {
-        } else {
-          this.$vmNews('开始时间和结束时间范围请选择在30天内')
-          return
-        }
-      } else {
-        this.$vmNews('请选择开始时间和结束时间')
-        return
-      }
       let params = {
         ...this.queryCriteria,
-        ...this.pageModel,
-        pageSize: 9999,
-        pageNum: 1
       }
       this.openLoading('detail')
-      const res = await authApi('busidataTocsalesServiceImpl', 'busidataTocsalesServiceImpl', 'queryToCSalesReportExcel', '', params)
-
-      if (res.status == 200) {
-        const response = await downFilesBasedFileNameFileTypeAPI(res.attribute)
-        // console.log(res)
-        const url = window.URL.createObjectURL(new Blob([response]), { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' })
-        const link = document.createElement('a')
-        link.href = url
-        link.setAttribute('download', 'toc正向流程报表.xlsx') // 设置下载的文件名
-        document.body.appendChild(link)
-        link.click()
-      }
+      const response = await authApi('tocofsSaleoutServiceImplReport', 'tocofsSaleoutServiceImplReport', 'exportToCSalesReportExcel', '', params)
+      const url = window.URL.createObjectURL(new Blob([response]), { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' })
+      const link = document.createElement('a')
+      link.href = url
+      link.setAttribute('download', 'TOB销售核对报表.xlsx') // 设置下载的文件名
+      document.body.appendChild(link)
+      link.click()
       return
-
     },
     reset() {
       this.pageModel.pageNum = 1
diff --git a/src/views/systemReports/u8positiveReports/TOCoutputWarehouse.vue b/src/views/systemReports/u8positiveReports/TOCoutputWarehouse.vue
index a83ace0..ac9e666 100644
--- a/src/views/systemReports/u8positiveReports/TOCoutputWarehouse.vue
+++ b/src/views/systemReports/u8positiveReports/TOCoutputWarehouse.vue
@@ -125,14 +125,14 @@
         style=" margin: 5px 5px"
       >查询
       </el-button>
-<!--      <el-button-->
-<!--        type="primary"-->
-<!--        @click="downLoad"-->
-<!--        :loading="loading"-->
-<!--        size="small"-->
-<!--        style=" margin: 5px 5px"-->
-<!--      >excel导出-->
-<!--      </el-button>-->
+      <el-button
+        type="primary"
+        @click="downLoad"
+        :loading="loading"
+        size="small"
+        style=" margin: 5px 5px"
+      >excel导出
+      </el-button>
       <el-button
         type="warning"
         @click="reset"
@@ -403,21 +403,6 @@ export default {
   },
   methods: {
     async downLoad() {
-      if (this.queryCriteria.business_date_start && this.queryCriteria.business_date_end) {
-        let startDate = new Date(this.queryCriteria.business_date_start)
-        let endDate = new Date(this.queryCriteria.business_date_end)
-        let differenceInMillis = endDate - startDate
-        let differenceInDays = differenceInMillis / (1000 * 60 * 60 * 24)
-        // 判断差值是否在15天以内
-        if (!isNaN(differenceInDays) && differenceInDays < 31) {
-        } else {
-          this.$vmNews('开始时间和结束时间范围请选择在30天内')
-          return
-        }
-      } else {
-        this.$vmNews('请选择开始时间和结束时间')
-        return
-      }
       let params = {
         ...this.queryCriteria,
         ...this.pageModel,
@@ -425,20 +410,14 @@ export default {
         pageNum: 1
       }
       this.openLoading('detail')
-      const res = await authApi('busidataTocsalesServiceImpl', 'busidataTocsalesServiceImpl', 'queryToCSalesReportExcel', '', params)
-
-      if (res.status == 200) {
-        const response = await downFilesBasedFileNameFileTypeAPI(res.attribute)
-        // console.log(res)
-        const url = window.URL.createObjectURL(new Blob([response]), { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' })
-        const link = document.createElement('a')
-        link.href = url
-        link.setAttribute('download', 'toc正向流程报表.xlsx') // 设置下载的文件名
-        document.body.appendChild(link)
-        link.click()
-      }
+      const response = await authApi('tocofsSaleoutServiceImplReport', 'tocofsSaleoutServiceImplReport', 'exportToCReturnReportExcel', '', params)
+      const url = window.URL.createObjectURL(new Blob([response]), { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' })
+      const link = document.createElement('a')
+      link.href = url
+      link.setAttribute('download', 'TOC退货核对报表.xlsx') // 设置下载的文件名
+      document.body.appendChild(link)
+      link.click()
       return
-
     },
     reset() {
       this.pageModel.pageNum = 1
diff --git a/src/views/systemReports/u8positiveReports/TOCreturnWarehouse.vue b/src/views/systemReports/u8positiveReports/TOCreturnWarehouse.vue
index 74d04e9..f92c155 100644
--- a/src/views/systemReports/u8positiveReports/TOCreturnWarehouse.vue
+++ b/src/views/systemReports/u8positiveReports/TOCreturnWarehouse.vue
@@ -140,14 +140,14 @@
         style="margin: 5px 5px"
         >查询
       </el-button>
-      <!--      <el-button-->
-      <!--        type="primary"-->
-      <!--        @click="downLoad"-->
-      <!--        :loading="loading"-->
-      <!--        size="small"-->
-      <!--        style=" margin: 5px 5px"-->
-      <!--      >excel导出-->
-      <!--      </el-button>-->
+            <el-button
+              type="primary"
+              @click="downLoad"
+              :loading="loading"
+              size="small"
+              style=" margin: 5px 5px"
+            >excel导出
+            </el-button>
       <el-button
         type="warning"
         @click="reset"
@@ -401,52 +401,21 @@ export default {
   },
   methods: {
     async downLoad() {
-      if (
-        this.queryCriteria.business_date_start &&
-        this.queryCriteria.business_date_end
-      ) {
-        let startDate = new Date(this.queryCriteria.business_date_start);
-        let endDate = new Date(this.queryCriteria.business_date_end);
-        let differenceInMillis = endDate - startDate;
-        let differenceInDays = differenceInMillis / (1000 * 60 * 60 * 24);
-        // 判断差值是否在15天以内
-        if (!isNaN(differenceInDays) && differenceInDays < 31) {
-        } else {
-          this.$vmNews("开始时间和结束时间范围请选择在30天内");
-          return;
-        }
-      } else {
-        this.$vmNews("请选择开始时间和结束时间");
-        return;
-      }
       let params = {
         ...this.queryCriteria,
         ...this.pageModel,
         pageSize: 9999,
-        pageNum: 1,
-      };
-      this.openLoading("detail");
-      const res = await authApi(
-        "busidataTocsalesServiceImpl",
-        "busidataTocsalesServiceImpl",
-        "queryToCSalesReportExcel",
-        "",
-        params
-      );
-
-      if (res.status == 200) {
-        const response = await downFilesBasedFileNameFileTypeAPI(res.attribute);
-        // console.log(res)
-        const url = window.URL.createObjectURL(new Blob([response]), {
-          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-        });
-        const link = document.createElement("a");
-        link.href = url;
-        link.setAttribute("download", "toc正向流程报表.xlsx"); // 设置下载的文件名
-        document.body.appendChild(link);
-        link.click();
+        pageNum: 1
       }
-      return;
+      this.openLoading('detail')
+      const response = await authApi('tocofsSaleoutServiceImplReport', 'tocofsSaleoutServiceImplReport', 'exportToCSalesReportExcel', '', params)
+      const url = window.URL.createObjectURL(new Blob([response]), { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' })
+      const link = document.createElement('a')
+      link.href = url
+      link.setAttribute('download', 'TOC销售核对报表.xlsx') // 设置下载的文件名
+      document.body.appendChild(link)
+      link.click()
+      return
     },
     reset() {
       this.pageModel.pageNum = 1;
diff --git a/vue.config.js b/vue.config.js
index 41334f2..03f1340 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -40,7 +40,7 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://hzya.ufyct.com:9067/`,
-        target: `http://ufidahz.com.cn:9067/`,
+        // target: `http://ufidahz.com.cn:9067/`,
         // target: `http://127.0.0.1:9081/`,
         // target: `http://192.168.2.78:9999`,
         // target: `http://192.168.2.85:9999`,
@@ -48,7 +48,7 @@ module.exports = {
         // target: `http://192.168.2.78:10086`,
         // target: `http://192.168.2.185:10086`,
         // target: `http://192.168.2.83:9999`,
-        // target:'http://39.170.109.90:8081/',
+        target:'http://39.170.109.90:8081/',
         // target:'http://192.168.2.75:1024/',
         changeOrigin: true,
         pathRewrite: {