From bb010f9ff00bca40ad8e302e96646ec930ae21f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Thu, 28 Sep 2023 15:05:08 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=8E=A5=E5=8F=A3=E7=9C=8B=E6=9D=BF+s?=
 =?UTF-8?q?tore+job=E3=80=91=E8=A7=A3=E5=86=B3=E9=93=BE=E6=8E=A5=E6=9C=89?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=90=8D=E7=A7=B0=EF=BC=8Ctoken=E4=B8=8D?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/commonTabel-drawer/index.vue      |  6 +++---
 PC/InterFace.Dash/src/permission.js                  | 12 ++++++++++++
 .../src/components/commonTabel-drawer/index.vue      |  6 +++---
 PC/UI.WinIn.FasterZ.Job/src/permission.js            | 12 ++++++++++++
 .../src/components/commonTabel-drawer/index.vue      |  6 +++---
 PC/UI.WinIn.FasterZ.Store/src/permission.js          | 12 ++++++++++++
 .../src/utils/baseData/urlOption.js                  |  6 +++---
 7 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/PC/InterFace.Dash/src/components/commonTabel-drawer/index.vue b/PC/InterFace.Dash/src/components/commonTabel-drawer/index.vue
index 8412328..e92d1de 100644
--- a/PC/InterFace.Dash/src/components/commonTabel-drawer/index.vue
+++ b/PC/InterFace.Dash/src/components/commonTabel-drawer/index.vue
@@ -9,7 +9,7 @@
     :modal="false"
     size="100%"
   >
-    <div class="drawer-heder">
+    <!-- <div class="drawer-heder">
       <div class="heder-left">
         <div class="header-text">
           <span>{{ propsData[title[0].prop] }}</span>
@@ -40,7 +40,7 @@
           </template>
         </curren-Button>
       </div>
-    </div>
+    </div> -->
     <div class="drawer-main">
       <curren-tabs
         :tabsData="dropdownTabs"
@@ -66,7 +66,7 @@
             :currenButtonData="detailHeaderButton"
             :tableData="propsData.details"
             :tableColumns="tableColumns"
-            :setUTableHeight="showDetailColumnsSet && showDetailFilters ? 300 : 260"
+            :setUTableHeight="showDetailColumnsSet || showDetailFilters ? 220 : 180"
             @rowDrop="rowDrop"
             :searchOverallCoverHeight="'calc(100vh - 345px)'"
             :rowSource="'detail_api'"
diff --git a/PC/InterFace.Dash/src/permission.js b/PC/InterFace.Dash/src/permission.js
index 77fb358..1b4b51d 100644
--- a/PC/InterFace.Dash/src/permission.js
+++ b/PC/InterFace.Dash/src/permission.js
@@ -84,6 +84,18 @@ const getErrHandle = (to, from, next) => {
 const toNextHandle = async (to, from, next) => {
   let isFresh = false
 
+  // 如果有登录特殊配置，重新获取token
+  let isAutoLogin = JSON.parse(localStorage.getItem('isConfigLogin')) || to.query.loginName
+  if(isAutoLogin){
+    let _username = localStorage.getItem("isConfigLogin") && localStorage.getItem("isConfigLogin") != 'false' ? localStorage.getItem("configLoginName") : to.query.loginName
+    await store.dispatch('user/login', {
+      username:_username,
+      password:localStorage.getItem("configLoginPass")
+    }).catch(()=>{
+      getErrHandle(to, from, next)
+    })
+  }
+
   // 获取表头转义
   if(!store.getters.columZHList){
     await store.dispatch('definition/getColumZHList').catch(()=>{
diff --git a/PC/UI.WinIn.FasterZ.Job/src/components/commonTabel-drawer/index.vue b/PC/UI.WinIn.FasterZ.Job/src/components/commonTabel-drawer/index.vue
index 8412328..e92d1de 100644
--- a/PC/UI.WinIn.FasterZ.Job/src/components/commonTabel-drawer/index.vue
+++ b/PC/UI.WinIn.FasterZ.Job/src/components/commonTabel-drawer/index.vue
@@ -9,7 +9,7 @@
     :modal="false"
     size="100%"
   >
-    <div class="drawer-heder">
+    <!-- <div class="drawer-heder">
       <div class="heder-left">
         <div class="header-text">
           <span>{{ propsData[title[0].prop] }}</span>
@@ -40,7 +40,7 @@
           </template>
         </curren-Button>
       </div>
-    </div>
+    </div> -->
     <div class="drawer-main">
       <curren-tabs
         :tabsData="dropdownTabs"
@@ -66,7 +66,7 @@
             :currenButtonData="detailHeaderButton"
             :tableData="propsData.details"
             :tableColumns="tableColumns"
-            :setUTableHeight="showDetailColumnsSet && showDetailFilters ? 300 : 260"
+            :setUTableHeight="showDetailColumnsSet || showDetailFilters ? 220 : 180"
             @rowDrop="rowDrop"
             :searchOverallCoverHeight="'calc(100vh - 345px)'"
             :rowSource="'detail_api'"
diff --git a/PC/UI.WinIn.FasterZ.Job/src/permission.js b/PC/UI.WinIn.FasterZ.Job/src/permission.js
index 77fb358..1b4b51d 100644
--- a/PC/UI.WinIn.FasterZ.Job/src/permission.js
+++ b/PC/UI.WinIn.FasterZ.Job/src/permission.js
@@ -84,6 +84,18 @@ const getErrHandle = (to, from, next) => {
 const toNextHandle = async (to, from, next) => {
   let isFresh = false
 
+  // 如果有登录特殊配置，重新获取token
+  let isAutoLogin = JSON.parse(localStorage.getItem('isConfigLogin')) || to.query.loginName
+  if(isAutoLogin){
+    let _username = localStorage.getItem("isConfigLogin") && localStorage.getItem("isConfigLogin") != 'false' ? localStorage.getItem("configLoginName") : to.query.loginName
+    await store.dispatch('user/login', {
+      username:_username,
+      password:localStorage.getItem("configLoginPass")
+    }).catch(()=>{
+      getErrHandle(to, from, next)
+    })
+  }
+
   // 获取表头转义
   if(!store.getters.columZHList){
     await store.dispatch('definition/getColumZHList').catch(()=>{
diff --git a/PC/UI.WinIn.FasterZ.Store/src/components/commonTabel-drawer/index.vue b/PC/UI.WinIn.FasterZ.Store/src/components/commonTabel-drawer/index.vue
index 8412328..e92d1de 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/components/commonTabel-drawer/index.vue
+++ b/PC/UI.WinIn.FasterZ.Store/src/components/commonTabel-drawer/index.vue
@@ -9,7 +9,7 @@
     :modal="false"
     size="100%"
   >
-    <div class="drawer-heder">
+    <!-- <div class="drawer-heder">
       <div class="heder-left">
         <div class="header-text">
           <span>{{ propsData[title[0].prop] }}</span>
@@ -40,7 +40,7 @@
           </template>
         </curren-Button>
       </div>
-    </div>
+    </div> -->
     <div class="drawer-main">
       <curren-tabs
         :tabsData="dropdownTabs"
@@ -66,7 +66,7 @@
             :currenButtonData="detailHeaderButton"
             :tableData="propsData.details"
             :tableColumns="tableColumns"
-            :setUTableHeight="showDetailColumnsSet && showDetailFilters ? 300 : 260"
+            :setUTableHeight="showDetailColumnsSet || showDetailFilters ? 220 : 180"
             @rowDrop="rowDrop"
             :searchOverallCoverHeight="'calc(100vh - 345px)'"
             :rowSource="'detail_api'"
diff --git a/PC/UI.WinIn.FasterZ.Store/src/permission.js b/PC/UI.WinIn.FasterZ.Store/src/permission.js
index 77fb358..1b4b51d 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/permission.js
+++ b/PC/UI.WinIn.FasterZ.Store/src/permission.js
@@ -84,6 +84,18 @@ const getErrHandle = (to, from, next) => {
 const toNextHandle = async (to, from, next) => {
   let isFresh = false
 
+  // 如果有登录特殊配置，重新获取token
+  let isAutoLogin = JSON.parse(localStorage.getItem('isConfigLogin')) || to.query.loginName
+  if(isAutoLogin){
+    let _username = localStorage.getItem("isConfigLogin") && localStorage.getItem("isConfigLogin") != 'false' ? localStorage.getItem("configLoginName") : to.query.loginName
+    await store.dispatch('user/login', {
+      username:_username,
+      password:localStorage.getItem("configLoginPass")
+    }).catch(()=>{
+      getErrHandle(to, from, next)
+    })
+  }
+
   // 获取表头转义
   if(!store.getters.columZHList){
     await store.dispatch('definition/getColumZHList').catch(()=>{
diff --git a/PC/UI.WinIn.FasterZ.Store/src/utils/baseData/urlOption.js b/PC/UI.WinIn.FasterZ.Store/src/utils/baseData/urlOption.js
index 0aa52bc..b8245ca 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/utils/baseData/urlOption.js
+++ b/PC/UI.WinIn.FasterZ.Store/src/utils/baseData/urlOption.js
@@ -111,7 +111,7 @@ export const DeliverNote = {
 }
 
 export const DeliverNoteDetail = {
-    baseURL:'DeliverNote/base',//主表-列表
+    baseURL:'DeliverNoteDetail/base',//主表-列表
     detailURL:'app/deliver-note-detail',//主表-明细 + 明细-查看主表
 }
 
@@ -123,7 +123,7 @@ export const DeliverPlan = {
 }
 
 export const DeliverPlanDetail = {
-    baseURL:'DeliverPlan/base',//主表-列表
+    baseURL:'DeliverPlanDetail/base',//主表-列表
     detailURL:'app/deliver-plan-detail',//主表-明细 + 明细-查看主表
 }
 
@@ -152,7 +152,7 @@ export const InspectAbnormalNote = {
 }
 
 export const InspectAbnormalNoteDetail = {
-    baseURL:'InspectAbnormalNote/base',//主表-列表
+    baseURL:'InspectAbnormalNoteDetail/base',//主表-列表
     detailURL:'app/inspect-abnormal-note-detail',//主表-明细 + 明细-查看主表
 }