From 4a513ab9424017b42ac705b611e7835b6707f7d1 Mon Sep 17 00:00:00 2001
From: lijingjia <lijj_xl@163.com>
Date: Tue, 4 Jun 2024 10:12:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E6=B5=B7=E8=BF=90=E5=87=BA?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/user.ts               | 12 ++---
 src/views/operation/seaexport/index.vue | 68 +------------------------
 2 files changed, 6 insertions(+), 74 deletions(-)

diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 8f4859e0..e0369bd0 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -107,6 +107,7 @@ export const useUserStore = defineStore({
         if (res !== undefined) {
           const token = res?.data
           this.setToken(token)
+          return
           return this.afterLoginAction(true)
         }
       } catch (error) {
@@ -117,12 +118,7 @@ export const useUserStore = defineStore({
       if (!this.getToken) return null
       // get user info
       const userInfo = await this.getUserInfoAction()
-      // const res: API.DataResult = await getCollectWarningCount()
-      // console.log(res)
-
       const sessionTimeout = this.sessionTimeout
-
-      console.log(sessionTimeout)
       if (sessionTimeout) {
         this.setSessionTimeout(false)
       } else {
@@ -183,7 +179,7 @@ export const useUserStore = defineStore({
       this.setToken(undefined)
       this.setSessionTimeout(false)
       this.setUserInfo(null)
-      localStorage.clear()
+      // localStorage.clear()
       goLogin && router.push(PageEnum.BASE_LOGIN)
     },
 
@@ -199,9 +195,9 @@ export const useUserStore = defineStore({
         content: () => h('span', t('sys.app.logoutMessage')),
         onOk: async () => {
           await this.logout(true)
-        },
+        }
       })
-    },
+    }
   },
 })
 
diff --git a/src/views/operation/seaexport/index.vue b/src/views/operation/seaexport/index.vue
index c66e5672..ca68de08 100644
--- a/src/views/operation/seaexport/index.vue
+++ b/src/views/operation/seaexport/index.vue
@@ -66,8 +66,6 @@
         <ConditionFilter v-model="AdvancedQueryData" :filter-fields="fields" :disabled="false" />
       </div>
     </a-modal>
-    <!-- 批量编辑 -->
-    <!-- <BatchModification @register="registerModal" @success="BMSuccess" /> -->
     <a-modal
       :title="
         TaskShippingOrderCompareData.isExistsDiff ? '下货纸比对（有差异）' : '下货纸比对（正常）'
@@ -112,10 +110,6 @@
           >
             <p>{{ item.fieldName }}:</p>
             <p>{{ item.reqVal }}</p>
-            <!-- <p v-if="item.msg">
-              <a-icon type="close" :style="{ color: 'red' }" />
-            </p>
-            <p v-else><a-icon type="check" :style="{ color: 'green' }" /></p> -->
             <p>{{ item.fieldName }}:</p>
             <p v-if="!item.isDiff">{{ item.targetVal }}</p>
             <p v-else v-html="item.mergeHtml"></p>
@@ -143,10 +137,6 @@
           >
             <p>{{ item.fieldName }}:</p>
             <p>{{ item.reqVal }}</p>
-            <!-- <p v-if="item.msg">
-              <a-icon type="close" :style="{ color: 'red' }" />
-            </p>
-            <p v-else><a-icon type="check" :style="{ color: 'green' }" /></p> -->
             <p>{{ item.fieldName }}:</p>
             <p v-if="!item.isDiff">{{ item.targetVal }}</p>
             <p v-else v-html="item.mergeHtml"></p>
@@ -158,11 +148,10 @@
 </template>
 <script lang="ts" setup>
   import TableActionBar from './components/tableActionBar.vue'
-  // import BatchModification from './modules/BatchModification.vue'
   import ConditionFilter from '/@/components/Condition/index.vue'
   import { onMounted, ref } from 'vue'
   import { BasicTable, useTable } from '/@/components/Table'
-  import { PageDataByBooking, GetUserQuerySet, UpdateUserQuerySet } from './api/BookingLedger.js'
+  import { PageDataByBooking, UpdateUserQuerySet } from './api/BookingLedger.js'
   import { getColumnsByClient } from '/@/views/baseinfo/formcopy/api'
   import { useModal } from '/@/components/Modal'
   import { columns, searchFormSchema, FeeStatus } from './columns'
@@ -394,13 +383,12 @@
   //打开高级查询弹窗
   function FnOpenAdvancedQuery() {
     AdvancedQueryVisible.value = true
-    createdInit()
   }
   //关闭高级查询弹窗
   function FnCancelAdvancedQuery() {
     AdvancedQueryVisible.value = false
   }
-    // 批量编辑
+  // 批量编辑
   function batchEditing() {
     const select = getSelectRows()
     if (select.length === 0) {
@@ -415,60 +403,8 @@
   function TaskShippingOrderCompareHandleCancel() {
     TaskShippingOrderCompareVisible.value = false
   }
-  async function createdInit() {
-    showColumns.value = JSON.parse(JSON.stringify(initData.columns))
-    formAllData.value = JSON.parse(JSON.stringify(initData.condAllData))
-    fromTableAllData.value = JSON.parse(JSON.stringify(initData.columnsAllData))
-    tableHeight.value = document.body.clientHeight - 230
-    const res: API.DataResult = await getColumnsByClient({
-      tableViewName: 'op_sea_export',
-    })
-    const fullPath = ref(router.currentRoute.value.fullPath)
-    usePermissionStore().getWrouteList.forEach((item: Record<any, any>) => {
-      item.children[0].children?.forEach((item2: Record<any, any>) => {
-        if (fullPath.value.indexOf(item2.path) != -1) {
-          permissionId.value = item2.id
-        }
-      })
-    })
-    if (res.succeeded) {
-      console.log(res)
-
-      let data: any[] = []
-      res.data.forEach((item) => {
-        data.push({
-          id: item.dbColumnName,
-          title: item.columnDescription,
-          name: 'Select',
-          value: null,
-          props: {
-            disabled: false,
-            multiple: false,
-            // placeholder: '请选择请假事由',
-            options: [],
-          },
-          style: {
-            width: '100%',
-          },
-        })
-      })
-
-      fields.value = data
-    }
-    FnGetUserQuerySet()
-    // getConfigUser(true)
-  }
   const permissionId = ref<String>('')
   const ConditionalList: Ref<any> = ref()
-  async function FnGetUserQuerySet() {
-    const res: API.DataResult = await GetUserQuerySet({
-      permissionId: permissionId.value,
-    })
-    if (res.succeeded) {
-      console.log(res)
-      AdvancedQueryData.value = JSON.parse(res.data.content)
-    }
-  }
   //执行高级查询
   async function FnAdvancedQuery() {
     let Api = (data) => {