From e3354a4679f426c96415d3c7cb80c325ae603df2 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 28 Jun 2024 08:59:50 +0800
Subject: [PATCH] md

---
 package.json                                  |  1 +
 src/api/system/sysActionStats.js              |  8 ++++++++
 src/layout/components/Navbar.vue              |  8 +++++++-
 src/layout/components/Sidebar/index.vue       |  2 +-
 src/layout/components/TopTagsView/index.vue   |  7 +++++--
 src/store/modules/tagsView.js                 | 19 +++++++++++--------
 .../emisCustomerAddress/recipientAddress.vue  |  8 ++++++--
 .../emisCustomerAddress/senderAddress.vue     |  8 ++++++--
 8 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index c4001e64..c67c871c 100644
--- a/package.json
+++ b/package.json
@@ -66,6 +66,7 @@
     "jsencrypt": "3.2.1",
     "jsmind": "^0.4.11",
     "jspdf": "^2.5.1",
+    "keymaster": "^1.6.2",
     "kr-print-designer": "^1.1.8",
     "loader-utils": "^3.3.1",
     "lodash": "^4.17.21",
diff --git a/src/api/system/sysActionStats.js b/src/api/system/sysActionStats.js
index 4afae0f6..bac970ab 100644
--- a/src/api/system/sysActionStats.js
+++ b/src/api/system/sysActionStats.js
@@ -9,6 +9,14 @@ export function listSysActionStats(query) {
   })
 }
 
+export function listSimpleAction(query) {
+  return request({
+    url: '/system/sysActionStats/listSimple',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询操作记录统计详细
 export function getSysActionStats(id) {
   return request({
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 410363d8..8031bdd4 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -2,7 +2,7 @@
   <div class="navbar">
     <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
     <!-- 搜索 -->
-    <!-- <search id="header-search"/> -->
+    <!-- <search2 id="header-search"/> -->
     <!-- <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/> -->
     <div class="user-restpwd-notice" v-if="needRstPwd"><i class="el-icon-warning-outline" /> 您当前密码不安全，请立即<span style="color:blue" @click="goToRstPwd">【修改密码】</span>!</div>
     <div class="user-restpwd-notice" v-if="needRecharge&&$store.getters.ownerSiteCode != '88888'"><i class="el-icon-warning-outline" /> 网点当前余额不足，请立即<span style="color:blue" @click="goToRecharge">【充值】</span>!</div>
@@ -24,6 +24,10 @@
        <top-tags-view class="topmenu-container" style="left:0px;" />
      </div>
 
+
+    <!-- <search id="header-search"/> -->
+
+
     <div class="right-menu">
       <!-- 消息通知 -->
       <div class="right-menu-item hover-effect" style="padding: 0 20px;">
@@ -130,6 +134,7 @@ import Hamburger from '@/components/Hamburger'
 import Screenfull from '@/components/Screenfull'
 import SizeSelect from '@/components/SizeSelect'
 import Search from '@/components/HeaderSearch'
+import Search2 from '@/components/HeaderSearch/index2'
 import TopTagsView  from '../components/TopTagsView'
 import TopNotice  from '../components/TopNotice'
 import Cookies from 'js-cookie'
@@ -155,6 +160,7 @@ export default {
     Screenfull,
     SizeSelect,
     Search,
+    Search2,
     TopTagsView,
     TopNotice,
     resetPwd,
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index f216acd5..6a6c224b 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -35,7 +35,7 @@ import {checkRole} from '@/utils/permission'
 import Logo from "./Logo";
 import SidebarItem from "./SidebarItem";
 import variables from "@/assets/styles/variables.scss";
-import BizNav from '@/components/BizNav'
+import BizNav from './BizNav'
 import Hamburger from '@/components/Hamburger'
 export default {
     components: {
diff --git a/src/layout/components/TopTagsView/index.vue b/src/layout/components/TopTagsView/index.vue
index ef5eaeaa..da00e178 100644
--- a/src/layout/components/TopTagsView/index.vue
+++ b/src/layout/components/TopTagsView/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="tags-view-container" class="tags-view-container">
-    <div class="tags-view-inner">
+    <div class="tags-view-inner" style="display:inline-flex">
       <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
         <!-- v-model="quickLinkList" -->
         <!-- <draggable
@@ -25,9 +25,11 @@
                 {{ tag.title }}
                 <span v-if="isActive(tag) && !isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
               </router-link>
+
         <!-- </draggable> -->
 
       </scroll-pane>
+      <!-- <search2 id="header-search"/> -->
 
     </div>
   </div>
@@ -37,9 +39,10 @@
 import ScrollPane from './ScrollPane'
 import path from 'path'
 import draggable from 'vuedraggable';
+import Search2 from '@/components/HeaderSearch/index2'
 
 export default {
-  components: { ScrollPane,draggable },
+  components: { ScrollPane,draggable,Search2 },
   data() {
     return {
       visible: false,
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index c53c1cfd..6f75baac 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -18,14 +18,17 @@ const mutations = {
   },
   ADD_VISITED_VIEW: (state, view) => {
     // console.log(view)
-    // var addActionLogData = {
-    //   title: view.meta.title,
-    //   path:  view.path,
-    //   menuId: view.meta.menuId,
-    //   navPath: "",
-    //   groupName: "",
-    // };
-    // addActionLog(addActionLogData);
+    try{
+      var addActionLogData = {
+        title: view.meta.title,
+        path:  view.path,
+        menuId: view.meta.menuId,
+        navPath: "",
+        groupName: "",
+      };
+      addActionLog(addActionLogData);
+    }catch(e){
+    }
 
     if (state.visitedViews.some(v => v.path === view.path)) return
     state.visitedViews.push(
diff --git a/src/views/emis/emisCustomerAddress/recipientAddress.vue b/src/views/emis/emisCustomerAddress/recipientAddress.vue
index dc43e2f2..f259a878 100644
--- a/src/views/emis/emisCustomerAddress/recipientAddress.vue
+++ b/src/views/emis/emisCustomerAddress/recipientAddress.vue
@@ -1,6 +1,6 @@
 <template>
   <XdPageContainer class="app-container">
-    <SearchForm slot="pageHeader" :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+    <SearchForm slot="pageHeader" :model="queryParams" ref="queryForm"   size="mini" :maxShow="8"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
       <el-form-item label="收件人" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -22,6 +22,9 @@
       <el-form-item :label="$t('所属国家')" prop="country">
             <CountryPicker :placeholder="$t('所属国家')" v-model="queryParams.country" @onChange="handleQuery"></CountryPicker>
        </el-form-item>
+       <el-form-item :label="$t('使用网点')" prop="useSiteCode">
+          <EmisSiteSimplePicker :placeholder="$t('使用网点')" :countryCode="queryParams.country"  v-model="queryParams.useSiteCode" @onChange="handleQuery"></EmisSiteSimplePicker>
+        </el-form-item>
     </SearchForm>
 
     <XdTable
@@ -179,10 +182,11 @@ import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 // import emisCustomerAddressView from '@/views/emis/emisCustomerAddress/emisCustomerAddressView';
 import recipientAddressForm from '@/views/emis/emisCustomerAddress/recipientAddressForm';
 import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
+import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
 
 export default {
   name: "RecipientAddress",
-  components: { elDateSimplePicker,recipientAddressForm,CountryPicker },
+  components: { elDateSimplePicker,recipientAddressForm,CountryPicker,EmisSiteSimplePicker },
   dicts: [
   ],
   data() {
diff --git a/src/views/emis/emisCustomerAddress/senderAddress.vue b/src/views/emis/emisCustomerAddress/senderAddress.vue
index 39a23727..b27c5f48 100644
--- a/src/views/emis/emisCustomerAddress/senderAddress.vue
+++ b/src/views/emis/emisCustomerAddress/senderAddress.vue
@@ -1,7 +1,7 @@
 <template>
   <XdPageContainer class="app-container">
 
-    <SearchForm slot="pageHeader"   :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+    <SearchForm slot="pageHeader"   :model="queryParams" ref="queryForm"   size="mini" :maxShow="8"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
       <el-form-item label="寄件人" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -23,6 +23,9 @@
       <el-form-item :label="$t('所属国家')" prop="country">
             <CountryPicker :placeholder="$t('所属国家')" v-model="queryParams.country" @onChange="handleQuery"></CountryPicker>
        </el-form-item>
+       <el-form-item :label="$t('使用网点')" prop="useSiteCode">
+          <EmisSiteSimplePicker :placeholder="$t('使用网点')" :countryCode="queryParams.country"  v-model="queryParams.useSiteCode" @onChange="handleQuery"></EmisSiteSimplePicker>
+        </el-form-item>
 
     </SearchForm>
 
@@ -183,10 +186,11 @@ import { listEmisCustomerAddress, getEmisCustomerAddress, delEmisCustomerAddress
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 import senderAddressForm from '@/views/emis/emisCustomerAddress/senderAddressForm';
 import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
+import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
 
 export default {
   name: "SenderAddress",
-  components: { elDateSimplePicker,senderAddressForm ,CountryPicker},
+  components: { elDateSimplePicker,senderAddressForm ,CountryPicker,EmisSiteSimplePicker},
   dicts: [
   ],
   data() {