bug修改

.env.development

@@ -5,9 +5,9 @@ VITE_APP_TITLE = 租户平台
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = https://test.baoxianzhanggui.com/web-api #默认地址
 # VITE_APP_API_BASEURL = http://192.168.0.253:8001  #田智
-VITE_APP_API_BASEURL = http://192.168.0.55:8001  #董鑫
+# VITE_APP_API_BASEURL = http://192.168.0.55:8001  #董鑫
 # VITE_APP_API_BASEURL = http://192.168.0.106:8001  #屈晨
-# VITE_APP_API_BASEURL = http://192.168.0.59:8001  #徐强
+VITE_APP_API_BASEURL = http://192.168.0.59:8001  #徐强
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =

src/assets/styles/globals.css

@@ -229,7 +229,7 @@ textarea {
 }
 
 .vh100 {
-  height: calc(100vh - 200px);
+  height: calc(100vh - 150px);
 }
 
 .strong {
@@ -334,3 +334,26 @@ textarea {
 }
 
 /* dialog对话框样式 */
+
+/* 全局样式 */
+.bg-\[var\(--g-sub-sidebar-menu-active-bg\)\]\! {
+  background:
+    var(--g-sub-sidebar-menu-active-bg)
+    /* var(--g-sub-sidebar-menu-active-bg) */ !important;
+}
+
+.bg-\[var\(--g-header-menu-active-bg\)\]\! {
+  background-color:
+    #ffffff1a
+    /* var(--g-header-menu-active-bg) */ !important;
+}
+
+.text-\[var\(--g-header-menu-active-color\)\]\! {
+  color:
+    #fff
+    /* var(--g-header-menu-active-color) */ !important;
+}
+
+.sub-menu {
+  background: #f6fbff;
+}

src/components/complexTable/index.vue

@@ -173,17 +173,20 @@ onMounted(() => {
     counter: counter++
 
   }));
-  setTimeout(() => {
-    const tableElement = multipleTableRef.value?.$el as HTMLElement;
-    if (tableElement && !props.maxHeight) {
-      const offsetTop = tableElement.offsetTop; // 获取 offsetTop
-      let height = window.innerHeight;
-      tableHeight.value = height - offsetTop - 270 + "px";
-    }
-  }, 10);
-
-
+  handleResize();
 });
+function handleResize() {
+  // 获取当前窗口的高度
+  const height = window.innerHeight;
+  // 在这里可以执行其他操作，比如更新某个元素的高度等
+  const tableElement = multipleTableRef.value?.$el as HTMLElement;
+  if (tableElement) {
+    const offsetTop = tableElement.offsetTop; // 获取 offsetTop
+    tableHeight.value = height - offsetTop - 230 + "px";
+  }
+}
+// 监听窗口的 resize 事件
+window.addEventListener('resize', handleResize);
 const selectable = () => true;
 const handleSizeChange = (val: number) => {
   if (props.pageInfo) {

src/layouts/components/Header/index.vue

@@ -61,7 +61,7 @@ function handlerMouserScroll(event: WheelEvent) {
   </Transition>
 </template>
 
-<style scoped>
+<style scoped lang="scss">
 header {
   position: fixed;
   top: 0;
@@ -87,6 +87,15 @@ header {
     width: 100%;
     height: 100%;
     margin: 0 auto;
+    background-image:
+      url("../../../assets/images/decoration1.png"),
+      url("../../../assets/images/decoration2.png"),
+      url("../../../assets/images/decoration3.png");
+    background-repeat: no-repeat, no-repeat, no-repeat;
+    background-position:
+      left center,
+      center center,
+      calc(100% - 84px) center;
 
     :deep(a.title) {
       position: relative;

src/layouts/components/Topbar/Toolbar/rightSide.vue

@@ -2,11 +2,10 @@
 import useSettingsStore from '@/store/modules/settings'
 import useUserStore from '@/store/modules/user'
 import eventBus from '@/utils/eventBus'
-// import ColorScheme from './ColorScheme/index.vue'
-// import Fullscreen from './Fullscreen/index.vue'
-// import NavSearch from './NavSearch/index.vue'
-// import PageReload from './PageReload/index.vue'
-import {Bell} from "@element-plus/icons-vue"
+import ColorScheme from './ColorScheme/index.vue'
+import Fullscreen from './Fullscreen/index.vue'
+import NavSearch from './NavSearch/index.vue'
+import PageReload from './PageReload/index.vue'
 import {useRouter} from "vue-router"
 defineOptions({
   name: 'Tools',
@@ -27,13 +26,16 @@ watch(() => userStore.avatar, () => {
 
 <template>
   <div class="flex items-center">
-    <el-icon @click="router.push({
-      path:'/content/notice',
-    })"><Bell /></el-icon>
     <!-- <NavSearch v-if="settingsStore.settings.toolbar.navSearch" /> -->
-    <!-- <Fullscreen v-if="settingsStore.settings.toolbar.fullscreen" /> -->
-    <!-- <PageReload v-if="settingsStore.settings.toolbar.pageReload" /> -->
-    <!-- <ColorScheme v-if="settingsStore.settings.toolbar.colorScheme" /> -->
+    <Fullscreen v-if="settingsStore.settings.toolbar.fullscreen" />
+    <PageReload v-if="settingsStore.settings.toolbar.pageReload" />
+    <ColorScheme v-if="settingsStore.settings.toolbar.colorScheme" />
+
+    <span class="flex-center cursor-pointer px-2 py-1">
+    <SvgIcon @click="router.push({
+      path:'/content/notice',
+    })" name="i-ion:notifications" />
+    </span>
     <HDropdownMenu
       :items="[
         [

src/views/externalAgreement/agreement/agreementDetails.vue

@@ -155,7 +155,7 @@ const agreementInfo = ref<Agreement>({}); // 初始值为 null
 const route = useRoute();
 const router = useRouter();
 const id = ref(route.query.id as string);//id参数
-const activeName = ref('costManagement')//默认标签页
+const activeName = ref('agreementInfo')//默认标签页
 const authDeptlength = ref<number>(0);
 onBeforeMount(async () => {
   await loadDicts(['agreement_type', 'valid_status', 'is_enable', 'with_tax', 'audit_status', 'insurance_type']);//获取多个字典

src/views/externalAgreement/agreement/agreementIndex.vue

@@ -204,8 +204,8 @@ const columns = [
     prop: "validStatus", label: "生效状态", width: '120', component: "Tag",
     formatter: (row: any) => {
       let name = getDict('valid_status').find(val => val.value == row.validStatus).label
-      if (name) {
-        return { type: 'danger', text: name };
+      if (name=='生效中') {
+        return { type: 'primary', text: name };
       } else {
         return { type: 'danger', text: name };
       }

src/views/externalAgreement/agreement/components/contactPersonFeeDialog.vue

@@ -305,7 +305,7 @@ const handleStartDateChange = (value: any, index: number,) => {
 const cancel = () => {
   emits("cancel")
 }
-const close=()=>{
+const close = () => {
   emits("cancel")
 }
 const validateContactPerson = () => {
@@ -412,27 +412,31 @@ const hledclick = (pane: any) => {
   activeName.value = pane.props.name;
 }
 const draweropen = () => {
-  if(formRef.value){
-    formRef.value.resetFields();
-  }
-  contactPersonListid.value='';
-  ruleFeeinfo.ptlAgreementId = "";
-  ruleFeeinfo.contactPerson = "";
-  ruleFeeinfo.contactMobile = "";
-  ruleFeeinfo.ptlAgreementCostExternalAddList.map((val: any) => {
-    val.effectiveTime = "";
-    val.failureTime = "";
-    val.costDescribe = "";
-    val.costExternalTypeAdds.map((item: any) => {
-      for (let key in item) {
-        if(item[key]!='costType'){
-          item[key] = 0;
+  if (props.title == '添加') {
+    if (formRef.value) {
+      formRef.value.resetFields();
+    }
+    contactPersonListid.value = '';
+    ruleFeeinfo.ptlAgreementId = "";
+    ruleFeeinfo.contactPerson = "";
+    ruleFeeinfo.contactMobile = "";
+    ruleFeeinfo.ptlAgreementCostExternalAddList.map((val: any) => {
+      val.effectiveTime = "";
+      val.failureTime = "";
+      val.costDescribe = "";
+
+      val.costExternalTypeAdds.map((item: any) => {
+        for (const key in item) {
+          if (key !== 'costType') {
+            item[key] = 0;
+          }
         }
-      }
-      return item
+        return item
+      })
+      return val;
     })
-    return val;
-  })
+  }
+
 }
 </script>
 <!-- 样式区域 -->

src/views/externalAgreement/agreement/components/contactPersonFeeDialogEdit.vue

@@ -134,7 +134,7 @@
           <el-button @click="cancel">取消</el-button>
           <el-button type="primary" @click="save(contactPersonFormRef)">提交审核</el-button>
         </div>
-        <div class="flex f-c " v-if="!costitemEditInfo?.reviewDescription">
+        <div class="flex f-c " v-if="!costitemEditInfo?.reviewDescription && disabledShow">
           <el-checkbox v-model="automatic" label="审核后，自动跳支审核下一条费用" size="large" />
           <div class="flex a-c">
             <el-button @click="rejectOperation">审核驳回</el-button>

src/views/externalAgreement/costManagement.vue

@@ -153,9 +153,8 @@ const fields = ref([
     label: "承保规则", model: "rulesName", type: "input", placeholder: "输入业务规则查找",
   },
   {
-    label: "费用规则", model: "costRules", type: "input", placeholder: "输入费用规则关键字查找",
+    label: "费用描述", model: "costRules", type: "input", placeholder: "输入费用规则关键字查找",
   },
-
   {
     label: "费用状态", model: "agreementStatus", type: "select", placeholder: "选择状态", options: is_enable,
   },

themes/index.ts

@@ -66,13 +66,13 @@ export const lightTheme = {
   '--g-main-sidebar-menu-active-bg': '#FFFFFF',
   '--g-main-sidebar-menu-active-color': '#0376F9',
   // 次导航
-  '--g-sub-sidebar-bg': '#262930',
+  '--g-sub-sidebar-bg': '#fff',
   '--g-sub-sidebar-logo-bg': '#0376F9',
   '--g-sub-sidebar-logo-color': '#FFFFFF',
-  '--g-sub-sidebar-menu-color': 'rgba(255,255,255,0.65)',
+  '--g-sub-sidebar-menu-color': '#666666',
   '--g-sub-sidebar-menu-hover-bg': '#E6F0FF',
-  '--g-sub-sidebar-menu-hover-color': '#0376F9',
-  '--g-sub-sidebar-menu-active-bg': '#0376F9',
+  '--g-sub-sidebar-menu-hover-color': '#000',
+  '--g-sub-sidebar-menu-active-bg': 'linear-gradient( 91deg, #4FCAFF 0%, #2B62FF 100%)',
   '--g-sub-sidebar-menu-active-color': '#FFFFFF',
   // 标签栏
   '--g-tabbar-dividers-bg': '#E0E0E0',