From b4de48e8e7c3b895a3e9adadd5e846b71eb4f648 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Fri, 15 Aug 2025 16:34:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Application/src/AppLogo.vue    |   2 +-
 src/components/SimpleMenu/src/SimpleMenu.vue  |  14 +
 src/layouts/default/header/index.vue          | 438 +++++++++---------
 .../components/ConfigMaterialInfoForm.vue     |   4 +-
 .../components/WlqianyiModal.vue              |   2 +-
 5 files changed, 233 insertions(+), 227 deletions(-)

diff --git a/src/components/Application/src/AppLogo.vue b/src/components/Application/src/AppLogo.vue
index 06294c8..eb30eec 100644
--- a/src/components/Application/src/AppLogo.vue
+++ b/src/components/Application/src/AppLogo.vue
@@ -3,7 +3,7 @@
  * @Description: logo component
 -->
 <template>
-  <div class="anticon" :class="getAppLogoClass" @click="goHome" style="background: #ceeef7;text-align: center;">
+  <div class="anticon" :class="getAppLogoClass" @click="goHome" style="background: #e2edff !important;text-align: center;">
     <img src="../../../assets/images/logo.png" />
     <div class="ml-2 truncate md:opacity-100" :class="getTitleClass" v-show="showTitle">
       {{ shortTitle }}
diff --git a/src/components/SimpleMenu/src/SimpleMenu.vue b/src/components/SimpleMenu/src/SimpleMenu.vue
index f5b40a4..fa646e3 100644
--- a/src/components/SimpleMenu/src/SimpleMenu.vue
+++ b/src/components/SimpleMenu/src/SimpleMenu.vue
@@ -203,6 +203,7 @@
 .jeecg-menu-light.jeecg-menu-vertical .jeecg-menu-item-active.jeecg-menu-submenu {
   color: #606266 !important;
   background: #f0f0f0;
+  padding-bottom: 10px;;
   
 }
 .jeecg-menu-vertical .jeecg-menu-item, .jeecg-menu-vertical .jeecg-menu-submenu-title {
@@ -222,4 +223,17 @@
     // margin: 10px 20px 0 20px;
     transform: scale(1.02);
 }
+
+.ant-drawer-close {
+  position: absolute;
+  right: 0;
+  left: auto !important;
+  margin-right: 16px;
+}
+.jeecg-layout-content{
+position: relative;
+  flex: 1 1 auto;
+  min-height: 0;
+  padding: 3px;
+}
 </style>
diff --git a/src/layouts/default/header/index.vue b/src/layouts/default/header/index.vue
index 91b3f92..d43e1d0 100644
--- a/src/layouts/default/header/index.vue
+++ b/src/layouts/default/header/index.vue
@@ -1,17 +1,17 @@
 <template>
   <Header :class="getHeaderClass" class="headClass">
     <!-- left start -->
-    <div :class="`${prefixCls}-left`">
+    <div :class="`${prefixCls}-left`" >
       <!-- logo -->
-      <AppLogo v-if="getShowHeaderLogo || getIsMobile" :class="`${prefixCls}-logo`" :theme="getHeaderTheme"
-        :style="getLogoWidth" />
-      <LayoutTrigger v-if="(getShowContent && getShowHeaderTrigger && !getSplit && !getIsMixSidebar) || getIsMobile"
-        :theme="getHeaderTheme" :sider="false" />
+      <AppLogo v-if="getShowHeaderLogo || getIsMobile" :class="`${prefixCls}-logo`" :theme="getHeaderTheme" :style="getLogoWidth" />
+      <LayoutTrigger
+        v-if="(getShowContent && getShowHeaderTrigger && !getSplit && !getIsMixSidebar) || getIsMobile"
+        :theme="getHeaderTheme"
+        :sider="false"
+      />
       <LayoutBreadcrumb v-if="getShowContent && getShowBread" :theme="getHeaderTheme" />
       <!-- 欢迎语 -->
-      <span v-if="getShowContent && getShowBreadTitle && !getIsMobile" style="background: #ceeef7 !important;"
-        :class="[prefixCls, `${prefixCls}--${getHeaderTheme}`, 'headerIntroductionClass']">
-        {{ t('layout.header.welcomeIn') }} {{ title }} </span>
+      <span v-if="getShowContent && getShowBreadTitle && !getIsMobile" style="background:#e2edff !important" :class="[prefixCls, `${prefixCls}--${getHeaderTheme}`,'headerIntroductionClass']"> {{t('layout.header.welcomeIn')}} {{ title }} </span>
     </div>
     <!-- left end -->
 
@@ -24,20 +24,19 @@
     <!-- action  -->
     <div :class="`${prefixCls}-action`">
       <!-- <AppSearch :class="`${prefixCls}-action__item `" v-if="getShowSearch" /> -->
-      <span >{{ orgName }}</span>
-      <a-divider type="vertical" />
+
       <ErrorAction v-if="getUseErrorHandle" :class="`${prefixCls}-action__item error-action`" />
-      <a-divider type="vertical" v-if="getUseErrorHandle" />
+      <a-divider type="vertical"  v-if="getUseErrorHandle" />
       <Notify v-if="getShowNotice" :class="`${prefixCls}-action__item notify-item`" />
-      <a-divider type="vertical" v-if="getShowNotice" />
+      <a-divider type="vertical" v-if="getShowNotice"  />
       <FullScreen v-if="getShowFullScreen" :class="`${prefixCls}-action__item fullscreen-item`" />
-      <a-divider type="vertical" v-if="getShowFullScreen" />
+      <a-divider type="vertical" v-if="getShowFullScreen"  />
       <LockScreen v-if="getUseLockPage" />
-      <a-divider type="vertical" v-if="getUseLockPage" />
+      <a-divider type="vertical" v-if="getUseLockPage"  />
       <!-- <AppLocalePicker v-if="getShowLocalePicker" :reload="true" :showText="false" :class="`${prefixCls}-action__item`" /> -->
 
       <UserDropDown :theme="getHeaderTheme" />
-      <a-divider type="vertical" />
+      <a-divider type="vertical"  />
       <SettingDrawer v-if="getShowSetting" :class="`${prefixCls}-action__item`" />
       <!-- ai助手 -->
       <!-- <Aide></Aide> -->
@@ -46,235 +45,228 @@
   <LoginSelect ref="loginSelectRef" @success="loginSelectOk"></LoginSelect>
 </template>
 <script lang="ts">
-import { defineComponent, unref, computed, ref, onMounted, toRaw } from 'vue';
-import { useGlobSetting } from '/@/hooks/setting';
-import { propTypes } from '/@/utils/propTypes';
+  import { defineComponent, unref, computed, ref, onMounted, toRaw } from 'vue';
+  import { useGlobSetting } from '/@/hooks/setting';
+  import { propTypes } from '/@/utils/propTypes';
 
-import { Layout } from 'ant-design-vue';
-import { AppLogo } from '/@/components/Application';
-import LayoutMenu from '../menu/index.vue';
-import LayoutTrigger from '../trigger/index.vue';
+  import { Layout } from 'ant-design-vue';
+  import { AppLogo } from '/@/components/Application';
+  import LayoutMenu from '../menu/index.vue';
+  import LayoutTrigger from '../trigger/index.vue';
 
-import { AppSearch } from '/@/components/Application';
+  import { AppSearch } from '/@/components/Application';
 
-import { useHeaderSetting } from '/@/hooks/setting/useHeaderSetting';
-import { useMenuSetting } from '/@/hooks/setting/useMenuSetting';
-import { useRootSetting } from '/@/hooks/setting/useRootSetting';
+  import { useHeaderSetting } from '/@/hooks/setting/useHeaderSetting';
+  import { useMenuSetting } from '/@/hooks/setting/useMenuSetting';
+  import { useRootSetting } from '/@/hooks/setting/useRootSetting';
 
-import { MenuModeEnum, MenuSplitTyeEnum } from '/@/enums/menuEnum';
-import { SettingButtonPositionEnum } from '/@/enums/appEnum';
-import { AppLocalePicker } from '/@/components/Application';
+  import { MenuModeEnum, MenuSplitTyeEnum } from '/@/enums/menuEnum';
+  import { SettingButtonPositionEnum } from '/@/enums/appEnum';
+  import { AppLocalePicker } from '/@/components/Application';
 
-import { UserDropDown, LayoutBreadcrumb, FullScreen, Notify, ErrorAction, LockScreen } from './components';
-import { useAppInject } from '/@/hooks/web/useAppInject';
-import { useDesign } from '/@/hooks/web/useDesign';
+  import { UserDropDown, LayoutBreadcrumb, FullScreen, Notify, ErrorAction, LockScreen } from './components';
+  import { useAppInject } from '/@/hooks/web/useAppInject';
+  import { useDesign } from '/@/hooks/web/useDesign';
 
-import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent';
-import { useLocale } from '/@/locales/useLocale';
+  import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent';
+  import { useLocale } from '/@/locales/useLocale';
 
-import LoginSelect from '/@/views/sys/login/LoginSelect.vue';
-import { useUserStore } from '/@/store/modules/user';
-import { useI18n } from '/@/hooks/web/useI18n';
-import Aide from "@/views/dashboard/ai/components/aide/index.vue"
-import { getOrgInfo } from '@/api/common/api'
-const { t } = useI18n();
+  import LoginSelect from '/@/views/sys/login/LoginSelect.vue';
+  import { useUserStore } from '/@/store/modules/user';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import Aide from "@/views/dashboard/ai/components/aide/index.vue"
+  const { t } = useI18n();
 
-export default defineComponent({
-  name: 'LayoutHeader',
-  components: {
-    Header: Layout.Header,
-    AppLogo,
-    LayoutTrigger,
-    LayoutBreadcrumb,
-    LayoutMenu,
-    UserDropDown,
-    AppLocalePicker,
-    FullScreen,
-    Notify,
-    AppSearch,
-    ErrorAction,
-    LockScreen,
-    LoginSelect,
-    SettingDrawer: createAsyncComponent(() => import('/@/layouts/default/setting/index.vue'), {
-      loading: true,
-    }),
-    Aide
-  },
-  props: {
-    fixed: propTypes.bool,
-  },
-  setup(props) {
-    const { prefixCls } = useDesign('layout-header');
-    const userStore = useUserStore();
-    const { getShowTopMenu, getShowHeaderTrigger, getSplit, getIsMixMode, getMenuWidth, getIsMixSidebar } = useMenuSetting();
-    const { getUseErrorHandle, getShowSettingButton, getSettingButtonPosition } = useRootSetting();
-    const { title } = useGlobSetting();
-    const orgName = ref('')
-    const {
-      getHeaderTheme,
-      getShowFullScreen,
-      getShowNotice,
-      getShowContent,
-      getShowBread,
-      getShowHeaderLogo,
-      getShowHeader,
-      getShowSearch,
-      getUseLockPage,
-      getShowBreadTitle,
-    } = useHeaderSetting();
+  export default defineComponent({
+    name: 'LayoutHeader',
+    components: {
+      Header: Layout.Header,
+      AppLogo,
+      LayoutTrigger,
+      LayoutBreadcrumb,
+      LayoutMenu,
+      UserDropDown,
+      AppLocalePicker,
+      FullScreen,
+      Notify,
+      AppSearch,
+      ErrorAction,
+      LockScreen,
+      LoginSelect,
+      SettingDrawer: createAsyncComponent(() => import('/@/layouts/default/setting/index.vue'), {
+        loading: true,
+      }),
+      Aide
+    },
+    props: {
+      fixed: propTypes.bool,
+    },
+    setup(props) {
+      const { prefixCls } = useDesign('layout-header');
+      const userStore = useUserStore();
+      const { getShowTopMenu, getShowHeaderTrigger, getSplit, getIsMixMode, getMenuWidth, getIsMixSidebar } = useMenuSetting();
+      const { getUseErrorHandle, getShowSettingButton, getSettingButtonPosition } = useRootSetting();
+      const { title } = useGlobSetting();
 
-    const { getShowLocalePicker } = useLocale();
+      const {
+        getHeaderTheme,
+        getShowFullScreen,
+        getShowNotice,
+        getShowContent,
+        getShowBread,
+        getShowHeaderLogo,
+        getShowHeader,
+        getShowSearch,
+        getUseLockPage,
+        getShowBreadTitle,
+      } = useHeaderSetting();
 
-    const { getIsMobile } = useAppInject();
+      const { getShowLocalePicker } = useLocale();
 
-    const getHeaderClass = computed(() => {
-      const theme = unref(getHeaderTheme);
-      return [
+      const { getIsMobile } = useAppInject();
+
+      const getHeaderClass = computed(() => {
+        const theme = unref(getHeaderTheme);
+        return [
+          prefixCls,
+          {
+            [`${prefixCls}--fixed`]: props.fixed,
+            [`${prefixCls}--mobile`]: unref(getIsMobile),
+            [`${prefixCls}--${theme}`]: theme,
+          },
+        ];
+      });
+
+      const getShowSetting = computed(() => {
+        if (!unref(getShowSettingButton)) {
+          return false;
+        }
+        const settingButtonPosition = unref(getSettingButtonPosition);
+
+        if (settingButtonPosition === SettingButtonPositionEnum.AUTO) {
+          return unref(getShowHeader);
+        }
+        return settingButtonPosition === SettingButtonPositionEnum.HEADER;
+      });
+
+      const getLogoWidth = computed(() => {
+        if (!unref(getIsMixMode) || unref(getIsMobile)) {
+          return {};
+        }
+        const width = unref(getMenuWidth) < 180 ? 180 : unref(getMenuWidth);
+        return { width: `${width}px` };
+      });
+
+      const getSplitType = computed(() => {
+        return unref(getSplit) ? MenuSplitTyeEnum.TOP : MenuSplitTyeEnum.NONE;
+      });
+
+      const getMenuMode = computed(() => {
+        return unref(getSplit) ? MenuModeEnum.HORIZONTAL : null;
+      });
+
+      /**
+       * 首页多租户部门弹窗逻辑
+       */
+      const loginSelectRef = ref();
+
+      function showLoginSelect() {
+        //update-begin---author:liusq  Date:20220101  for：判断登录进来是否需要弹窗选择租户----
+        //判断是否是登陆进来
+        const loginInfo = toRaw(userStore.getLoginInfo) || {};
+        if (!!loginInfo.isLogin) {
+          loginSelectRef.value.show(loginInfo);
+        }
+        //update-end---author:liusq  Date:20220101  for：判断登录进来是否需要弹窗选择租户----
+      }
+
+      function loginSelectOk() {
+        console.log('成功。。。。。');
+      }
+
+      onMounted(() => {
+        showLoginSelect();
+      });
+
+      return {
         prefixCls,
-        {
-          [`${prefixCls}--fixed`]: props.fixed,
-          [`${prefixCls}--mobile`]: unref(getIsMobile),
-          [`${prefixCls}--${theme}`]: theme,
-        },
-      ];
-    });
-
-    const getShowSetting = computed(() => {
-      if (!unref(getShowSettingButton)) {
-        return false;
-      }
-      const settingButtonPosition = unref(getSettingButtonPosition);
-
-      if (settingButtonPosition === SettingButtonPositionEnum.AUTO) {
-        return unref(getShowHeader);
-      }
-      return settingButtonPosition === SettingButtonPositionEnum.HEADER;
-    });
-
-    const getLogoWidth = computed(() => {
-      if (!unref(getIsMixMode) || unref(getIsMobile)) {
-        return {};
-      }
-      const width = unref(getMenuWidth) < 180 ? 180 : unref(getMenuWidth);
-      return { width: `${width}px` };
-    });
-
-    const getSplitType = computed(() => {
-      return unref(getSplit) ? MenuSplitTyeEnum.TOP : MenuSplitTyeEnum.NONE;
-    });
-
-    const getMenuMode = computed(() => {
-      return unref(getSplit) ? MenuModeEnum.HORIZONTAL : null;
-    });
-
-    /**
-     * 首页多租户部门弹窗逻辑
-     */
-    const loginSelectRef = ref();
-
-    function showLoginSelect() {
-      //update-begin---author:liusq  Date:20220101  for：判断登录进来是否需要弹窗选择租户----
-      //判断是否是登陆进来
-      const loginInfo = toRaw(userStore.getLoginInfo) || {};
-      if (!!loginInfo.isLogin) {
-        loginSelectRef.value.show(loginInfo);
-      }
-      //update-end---author:liusq  Date:20220101  for：判断登录进来是否需要弹窗选择租户----
-    }
-
-    function loginSelectOk() {
-      console.log('成功。。。。。');
-    }
-
-    onMounted(() => {
-      getOrgInfo().then(res => {
-        orgName.value = res.orgName
-      })
-      showLoginSelect();
-    });
-
-    return {
-      prefixCls,
-      getHeaderClass,
-      getShowHeaderLogo,
-      getHeaderTheme,
-      getShowHeaderTrigger,
-      getIsMobile,
-      getShowBreadTitle,
-      getShowBread,
-      getShowContent,
-      getSplitType,
-      getSplit,
-      getMenuMode,
-      getShowTopMenu,
-      getShowLocalePicker,
-      getShowFullScreen,
-      getShowNotice,
-      getUseErrorHandle,
-      getLogoWidth,
-      getIsMixSidebar,
-      getShowSettingButton,
-      getShowSetting,
-      getShowSearch,
-      getUseLockPage,
-      loginSelectOk,
-      loginSelectRef,
-      title,
-      t,
-      orgName,
-    };
-  },
-});
+        getHeaderClass,
+        getShowHeaderLogo,
+        getHeaderTheme,
+        getShowHeaderTrigger,
+        getIsMobile,
+        getShowBreadTitle,
+        getShowBread,
+        getShowContent,
+        getSplitType,
+        getSplit,
+        getMenuMode,
+        getShowTopMenu,
+        getShowLocalePicker,
+        getShowFullScreen,
+        getShowNotice,
+        getUseErrorHandle,
+        getLogoWidth,
+        getIsMixSidebar,
+        getShowSettingButton,
+        getShowSetting,
+        getShowSearch,
+        getUseLockPage,
+        loginSelectOk,
+        loginSelectRef,
+        title,
+        t
+      };
+    },
+  });
 </script>
 <style lang="less">
-@import './index.less';
-//update-begin---author:scott ---date:2022-09-30  for：默认隐藏顶部菜单面包屑-----------
-//顶部欢迎语展示样式
-@prefix-cls: ~'@{namespace}-layout-header';
-
-.ant-layout .@{prefix-cls} {
-  display: flex;
-  padding: 0 8px;
-  // update-begin--author:liaozhiyang---date:20240407---for：【QQYUN-8762】顶栏高度
-  height: @header-height;
-  // update-end--author:liaozhiyang---date:20240407---for：【QQYUN-8762】顶栏高度
-  align-items: center;
-
-  .headerIntroductionClass {
-    margin-right: 4px;
-    margin-bottom: 2px;
-    border-bottom: 0px;
-    border-left: 0px;
-  }
-
-  &--light {
+  @import './index.less';
+  //update-begin---author:scott ---date:2022-09-30  for：默认隐藏顶部菜单面包屑-----------
+  //顶部欢迎语展示样式
+  @prefix-cls: ~'@{namespace}-layout-header';
+  
+  .ant-layout .@{prefix-cls} {
+    display: flex;
+    padding: 0 8px;
+    // update-begin--author:liaozhiyang---date:20240407---for：【QQYUN-8762】顶栏高度
+    height: @header-height;
+    // update-end--author:liaozhiyang---date:20240407---for：【QQYUN-8762】顶栏高度
+    align-items: center;
+    
     .headerIntroductionClass {
-      color: #000;
+      margin-right: 4px;
+      margin-bottom: 2px;
+      border-bottom: 0px;
+      border-left: 0px;
     }
+    
+    &--light {
+      .headerIntroductionClass {
+        color: #000;
+      }
+    }
+
+    &--dark {
+      .headerIntroductionClass {
+        color: rgba(255, 255, 255, 1);
+      }
+      .anticon, .truncate {
+        color: rgba(255, 255, 255, 1);
+      }
+    }
+    //update-end---author:scott ---date::2022-09-30  for：默认隐藏顶部菜单面包屑--------------
   }
-
-  &--dark {
-    .headerIntroductionClass {
-      color: rgba(255, 255, 255, 1);
-    }
-
-    .anticon,
-    .truncate {
-      color: rgba(255, 255, 255, 1);
-    }
-  }
-
-  //update-end---author:scott ---date::2022-09-30  for：默认隐藏顶部菜单面包屑--------------
-}
-
 .jeecg-layout-header--light {
   border-bottom: 0px;
   border-left: 0px;
 }
+
 .headClass{
-  background-image: url('../resource/img/bj.png')  !important;
-  background-repeat: no-repeat;
-  background-size: 100% auto;
-  background-color: #e5f5f9 !important;
+  // background-image: url('../resource/img/bj.png')  !important;
+  // background-repeat: no-repeat;
+  // background-size: 100% auto;
+  // background-color: #eef3f8 !important;
+  background: linear-gradient(to right, #e2edff, #eef3f8) !important;
 }
 </style>
diff --git a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue
index 9866ee2..dfd7085 100644
--- a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue
+++ b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue
@@ -94,12 +94,12 @@
 								<a-input-number v-model:value="formData.twoUnitPrice" maxlength="10" placeholder="请输入一级单位价格" style="width: 100%" />
 							</a-form-item>
 						</a-col>
-						<a-col :span="8">
+						<a-col :span="8" hidden>
 							<a-form-item label="物料上限" v-bind="validateInfos.upperLimit" id="ConfigMaterialInfoForm-upperLimit" name="upperLimit">
 								<a-input v-model:value="formData.upperLimit" maxlength="10" placeholder="请输入物料上限" style="width: 100%" />
 							</a-form-item>
 						</a-col>
-						<a-col :span="8">
+						<a-col :span="8" hidden>
 							<a-form-item label="物料下限" v-bind="validateInfos.lowerLimit" id="ConfigMaterialInfoForm-lowerLimit" name="lowerLimit">
 								<a-input v-model:value="formData.lowerLimit" maxlength="10" placeholder="请输入物料下限" style="width: 100%" />
 							</a-form-item>
diff --git a/src/views/invoicing/ConfigMaterial/components/WlqianyiModal.vue b/src/views/invoicing/ConfigMaterial/components/WlqianyiModal.vue
index f892fbe..434de7e 100644
--- a/src/views/invoicing/ConfigMaterial/components/WlqianyiModal.vue
+++ b/src/views/invoicing/ConfigMaterial/components/WlqianyiModal.vue
@@ -37,7 +37,7 @@
    * @param record
    */
   function edit(record) {
-    title.value = disableSubmit.value ? '详情' : '编辑';
+    title.value = disableSubmit.value ? '详情' : '迁移';
     visible.value = true;
     nextTick(() => {
       registerForm.value.edit(record);