From 7f03a31a871d155f9ac2068c2662f044192af317 Mon Sep 17 00:00:00 2001
From: zhouzy062 <zhouzy062@tydic.com>
Date: Thu, 7 Mar 2024 16:46:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E5=BA=93=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/public/index.html                                 | 2 +-
 sgzb-ui/src/layout/components/Navbar.vue                  | 1 +
 sgzb-ui/src/main.js                                       | 4 ++--
 sgzb-ui/src/permission.js                                 | 1 +
 sgzb-ui/src/utils/request.js                              | 3 ++-
 .../src/views/claimAndRefund/secondStore/inStoreBook.vue  | 4 +---
 .../src/views/claimAndRefund/secondStore/outStoreBook.vue | 4 +---
 .../src/views/claimAndRefund/secondStore/secondStore.vue  | 5 +----
 sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue    | 8 ++++----
 sgzb-ui/src/views/cost/csotSettlement/costExame.vue       | 8 ++++----
 10 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/sgzb-ui/public/index.html b/sgzb-ui/public/index.html
index 925455ca..8ce50174 100644
--- a/sgzb-ui/public/index.html
+++ b/sgzb-ui/public/index.html
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <link rel="icon" href="favicon.ico">
     <title><%= webpackConfig.name %></title>
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
 	  <style>
diff --git a/sgzb-ui/src/layout/components/Navbar.vue b/sgzb-ui/src/layout/components/Navbar.vue
index cf315c34..9b9d77d0 100644
--- a/sgzb-ui/src/layout/components/Navbar.vue
+++ b/sgzb-ui/src/layout/components/Navbar.vue
@@ -104,6 +104,7 @@ export default {
       }).then(() => {
         this.$store.dispatch('LogOut').then(() => {
           location.href = '/login';
+          // location.href = '/gl/';
         })
       }).catch(() => {});
     }
diff --git a/sgzb-ui/src/main.js b/sgzb-ui/src/main.js
index 95523e37..8781dd12 100644
--- a/sgzb-ui/src/main.js
+++ b/sgzb-ui/src/main.js
@@ -12,7 +12,7 @@ import store from './store'
 import router from './router'
 import directive from './directive' // directive
 import plugins from './plugins' // plugins
-import { download,downloadCost } from '@/utils/request'
+import { download,downloadJson } from '@/utils/request'
 
 import './assets/icons' // icon
 import './permission' // permission control
@@ -48,7 +48,7 @@ Vue.prototype.addDateRange = addDateRange
 Vue.prototype.selectDictLabel = selectDictLabel
 Vue.prototype.selectDictLabels = selectDictLabels
 Vue.prototype.download = download
-Vue.prototype.downloadCost = downloadCost
+Vue.prototype.downloadJson = downloadJson
 Vue.prototype.handleTree = handleTree
 
 // 全局组件挂载
diff --git a/sgzb-ui/src/permission.js b/sgzb-ui/src/permission.js
index 1ccc6407..885299e3 100644
--- a/sgzb-ui/src/permission.js
+++ b/sgzb-ui/src/permission.js
@@ -33,6 +33,7 @@ router.beforeEach((to, from, next) => {
             store.dispatch('LogOut').then(() => {
               Message.error(err)
               next({ path: '/login' })
+              // next({ path: '/gl/' })
             })
           })
       } else {
diff --git a/sgzb-ui/src/utils/request.js b/sgzb-ui/src/utils/request.js
index cf22e1fb..d77410ec 100644
--- a/sgzb-ui/src/utils/request.js
+++ b/sgzb-ui/src/utils/request.js
@@ -88,6 +88,7 @@ service.interceptors.response.use(res => {
           isRelogin.show = false;
           store.dispatch('LogOut').then(() => {
             location.href = '/login';
+            // location.href = '/gl/';
           })
       }).catch(() => {
         isRelogin.show = false;
@@ -150,7 +151,7 @@ export function download(url, params, filename, config) {
 }
 
 // 通用下载方法
-export function downloadCost(url, params, filename, config) {
+export function downloadJson(url, params, filename, config) {
   downloadLoadingInstance = Loading.service({ text: "正在下载数据，请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", })
   return service.post(url, params, {
     transformRequest: [(params) => { return params }],
diff --git a/sgzb-ui/src/views/claimAndRefund/secondStore/inStoreBook.vue b/sgzb-ui/src/views/claimAndRefund/secondStore/inStoreBook.vue
index 51c534e7..ba6fa03f 100644
--- a/sgzb-ui/src/views/claimAndRefund/secondStore/inStoreBook.vue
+++ b/sgzb-ui/src/views/claimAndRefund/secondStore/inStoreBook.vue
@@ -211,9 +211,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/dict/type/export', {
-        ...this.queryParams
-      }, `type_${new Date().getTime()}.xlsx`)
+      this.downloadJson('material/secondaryWarehouse/exportIntOperateList',JSON.stringify(this.queryParams), `回库台账_${new Date().getTime()}.xlsx`)
     },
   }
 };
diff --git a/sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue b/sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue
index 5f39ee29..994566d0 100644
--- a/sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue
+++ b/sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue
@@ -210,9 +210,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/dict/type/export', {
-        ...this.queryParams
-      }, `type_${new Date().getTime()}.xlsx`)
+      this.downloadJson('material/secondaryWarehouse/exportOperateList',JSON.stringify(this.queryParams), `出库台账_${new Date().getTime()}.xlsx`)
     },
   }
 };
diff --git a/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue b/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue
index 1f54a425..6bc67f5f 100644
--- a/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue
+++ b/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue
@@ -61,7 +61,6 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['store:labelType:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -482,9 +481,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/dict/type/export', {
-        ...this.queryParams
-      }, `type_${new Date().getTime()}.xlsx`)
+      this.downloadJson('material/secondaryWarehouse/exportList',JSON.stringify(this.queryParams), `二级库_${new Date().getTime()}.xlsx`)
     },
   }
 };
diff --git a/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue b/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue
index 6bea5c0e..1cd73564 100644
--- a/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue
+++ b/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue
@@ -391,19 +391,19 @@
       /** 导出按钮操作 */
       //租赁
       handleExport1() {
-        this.downloadCost('material/sltAgreementInfo/exportLease',JSON.stringify(this.rowData), `租赁费用明细_${new Date().getTime()}.xlsx`)
+        this.downloadJson('material/sltAgreementInfo/exportLease',JSON.stringify(this.rowData), `租赁费用明细_${new Date().getTime()}.xlsx`)
       },
       //丢失
       handleExport2() {
-        this.downloadCost('material/sltAgreementInfo/exportLose',JSON.stringify(this.rowData), `丢失费用明细_${new Date().getTime()}.xlsx`)
+        this.downloadJson('material/sltAgreementInfo/exportLose',JSON.stringify(this.rowData), `丢失费用明细_${new Date().getTime()}.xlsx`)
       },
       // 维修
       handleExport3() {
-        this.downloadCost('material/sltAgreementInfo/exportRepair',JSON.stringify(this.rowData), `维修费用明细_${new Date().getTime()}.xlsx`)
+        this.downloadJson('material/sltAgreementInfo/exportRepair',JSON.stringify(this.rowData), `维修费用明细_${new Date().getTime()}.xlsx`)
       },
       //报废
       handleExport4() {
-        this.downloadCost('material/sltAgreementInfo/exportScrap',JSON.stringify(this.rowData), `报废费用明细_${new Date().getTime()}.xlsx`)
+        this.downloadJson('material/sltAgreementInfo/exportScrap',JSON.stringify(this.rowData), `报废费用明细_${new Date().getTime()}.xlsx`)
       },
       handleExportAll() {
         this.handleExport1()
diff --git a/sgzb-ui/src/views/cost/csotSettlement/costExame.vue b/sgzb-ui/src/views/cost/csotSettlement/costExame.vue
index fef63544..80459788 100644
--- a/sgzb-ui/src/views/cost/csotSettlement/costExame.vue
+++ b/sgzb-ui/src/views/cost/csotSettlement/costExame.vue
@@ -352,19 +352,19 @@ export default {
     /** 导出按钮操作 */
     //租赁
     handleExport1() {
-      this.downloadCost('material/sltAgreementInfo/exportLease',JSON.stringify(this.rowData), `租赁费用明细_${new Date().getTime()}.xlsx`)
+      this.downloadJson('material/sltAgreementInfo/exportLease',JSON.stringify(this.rowData), `租赁费用明细_${new Date().getTime()}.xlsx`)
     },
     //丢失
     handleExport2() {
-      this.downloadCost('material/sltAgreementInfo/exportLose',JSON.stringify(this.rowData), `丢失费用明细_${new Date().getTime()}.xlsx`)
+      this.downloadJson('material/sltAgreementInfo/exportLose',JSON.stringify(this.rowData), `丢失费用明细_${new Date().getTime()}.xlsx`)
     },
     // 维修
     handleExport3() {
-      this.downloadCost('material/sltAgreementInfo/exportRepair',JSON.stringify(this.rowData), `维修费用明细_${new Date().getTime()}.xlsx`)
+      this.downloadJson('material/sltAgreementInfo/exportRepair',JSON.stringify(this.rowData), `维修费用明细_${new Date().getTime()}.xlsx`)
     },
     //报废
     handleExport4() {
-      this.downloadCost('material/sltAgreementInfo/exportScrap',JSON.stringify(this.rowData), `报废费用明细_${new Date().getTime()}.xlsx`)
+      this.downloadJson('material/sltAgreementInfo/exportScrap',JSON.stringify(this.rowData), `报废费用明细_${new Date().getTime()}.xlsx`)
     },
     handleExportAll() {
       this.handleExport1()