修改bug

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 }}

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>

src/layouts/default/header/index.vue

@@ -3,15 +3,15 @@
     <!-- left start -->
     <div :class="`${prefixCls}-left`" >
       <!-- logo -->
-      <AppLogo v-if="getShowHeaderLogo || getIsMobile" :class="`${prefixCls}-logo`" :theme="getHeaderTheme"
+      <AppLogo v-if="getShowHeaderLogo || getIsMobile" :class="`${prefixCls}-logo`" :theme="getHeaderTheme" :style="getLogoWidth" />
-        :style="getLogoWidth" />
+      <LayoutTrigger
-      <LayoutTrigger v-if="(getShowContent && getShowHeaderTrigger && !getSplit && !getIsMixSidebar) || getIsMobile"
+        v-if="(getShowContent && getShowHeaderTrigger && !getSplit && !getIsMixSidebar) || getIsMobile"
-        :theme="getHeaderTheme" :sider="false" />
+        :theme="getHeaderTheme"
+        :sider="false"
+      />
       <LayoutBreadcrumb v-if="getShowContent && getShowBread" :theme="getHeaderTheme" />
       <!-- 欢迎语 -->
-      <span v-if="getShowContent && getShowBreadTitle && !getIsMobile" style="background: #ceeef7 !important;"
+      <span v-if="getShowContent && getShowBreadTitle && !getIsMobile" style="background:#e2edff !important" :class="[prefixCls, `${prefixCls}--${getHeaderTheme}`,'headerIntroductionClass']"> {{t('layout.header.welcomeIn')}} {{ title }} </span>
-        :class="[prefixCls, `${prefixCls}--${getHeaderTheme}`, 'headerIntroductionClass']">
-        {{ t('layout.header.welcomeIn') }} {{ title }} </span>
     </div>
     <!-- left end -->
 
@@ -24,8 +24,7 @@
     <!-- 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" />
       <Notify v-if="getShowNotice" :class="`${prefixCls}-action__item notify-item`" />
@@ -76,7 +75,6 @@ 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();
 
   export default defineComponent({
@@ -109,7 +107,7 @@ export default defineComponent({
       const { getShowTopMenu, getShowHeaderTrigger, getSplit, getIsMixMode, getMenuWidth, getIsMixSidebar } = useMenuSetting();
       const { getUseErrorHandle, getShowSettingButton, getSettingButtonPosition } = useRootSetting();
       const { title } = useGlobSetting();
-    const orgName = ref('')
+
       const {
         getHeaderTheme,
         getShowFullScreen,
@@ -187,9 +185,6 @@ export default defineComponent({
       }
 
       onMounted(() => {
-      getOrgInfo().then(res => {
-        orgName.value = res.orgName
-      })
         showLoginSelect();
       });
 
@@ -220,8 +215,7 @@ export default defineComponent({
         loginSelectOk,
         loginSelectRef,
         title,
-      t,
+        t
-      orgName,
       };
     },
   });
@@ -257,24 +251,22 @@ export default defineComponent({
       .headerIntroductionClass {
         color: rgba(255, 255, 255, 1);
       }
-
+      .anticon, .truncate {
-    .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-image: url('../resource/img/bj.png')  !important;
-  background-repeat: no-repeat;
+  // background-repeat: no-repeat;
-  background-size: 100% auto;
+  // background-size: 100% auto;
-  background-color: #e5f5f9 !important;
+  // background-color: #eef3f8 !important;
+  background: linear-gradient(to right, #e2edff, #eef3f8) !important;
 }
 </style>

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>

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);