部分需求

.env.development

@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = ByteSailing
+VITE_APP_TITLE = 尔泓时代
 
 # 开发环境配置
 VITE_APP_ENV = 'development'

.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = ByteSailing
+VITE_APP_TITLE = 尔泓时代
 
 # 生产环境配置
 VITE_APP_ENV = 'production'

.env.staging

@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = ByteSailing
+VITE_APP_TITLE = 尔泓时代
 
 # 生产环境配置
 VITE_APP_ENV = 'staging'

index.html

@@ -7,7 +7,7 @@
   <meta name="renderer" content="webkit">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
   <link rel="icon" href="/favicon.ico">
-  <title>ByteSailing</title>
+  <title>尔泓时代</title>
   <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
   <style>
     html,

package.json

@@ -1,8 +1,8 @@
 {
   "name": "ruoyi",
   "version": "3.8.5",
-  "description": "ByteSailing",
-  "author": "ByteSailing",
+  "description": "尔泓时代",
+  "author": "尔泓时代",
   "license": "MIT",
   "scripts": {
     "dev": "vite",

src/assets/icons/iconfont/iconfont.json

@@ -1,6 +1,6 @@
 {
   "id": "3933484",
-  "name": "ByteSailing",
+  "name": "尔泓时代",
   "font_family": "iconfont",
   "css_prefix_text": "icon-",
   "description": "",

src/components/headerBar/header-bar.vue

@@ -2,7 +2,7 @@
   <div id="main" class="header-bar" @click="isChildMenu = false">
     <header>
       <ul class="nav">
-        <!-- <div class="logo">ByteSailing</div> -->
+        <!-- <div class="logo">尔泓时代</div> -->
         <div
           class="logo"
           style="display: flex; align-items: center; justify-content: center"

src/lang/en.js

@@ -103,7 +103,7 @@ export const lang = {
 		deviceInformation:"设备信息",
 		switchLanguage:'switch English',
 		logOut:'退出登录',
-		title:"ByteSailing管理系统",
+		title:"尔泓时代管理系统",
 		form:{
 			tenantId:"请输入租户ID",
 			username:"请输入账号",
@@ -113,7 +113,7 @@ export const lang = {
 		loginText:'登录',
 		demo:"demo",
 		agreement:{
-			text:"已阅读并同意：Bytesailing",
+			text:"已阅读并同意：尔泓时代",
 			clause:"服务条款",
 			agreement:"隐私协议",
 			and:"和"

src/layout/components/Sidebar/Logo.vue

@@ -25,7 +25,7 @@ defineProps({
   }
 })
 
-const title = ref('ByteSailing');
+const title = ref('尔泓时代');
 const settingsStore = useSettingsStore();
 const sideTheme = computed(() => settingsStore.sideTheme);
 </script>

src/views/EHSD/procurement/profitBudgetEHSD/index.vue

@@ -10,6 +10,8 @@
       :loading="loading"
       :selectConfig="selectConfig"
       highlight-current-row
+      :onMoreSearch="true"
+      @moreSearch="clickMoreSearch"
       :action-list="[
         {
           text: '默认汇率',
@@ -448,6 +450,26 @@
         >
       </template>
     </el-dialog>
+
+    <el-dialog
+      :title="'高级检索'"
+      v-model="moreSearchDialog"
+      width="500px"
+      destroy-on-close
+    >
+      <byForm
+        :formConfig="formSearchConfig"
+        :formOption="formOption"
+        v-model="sourceList.pagination"
+      >
+      </byForm>
+      <template #footer>
+        <el-button @click="moreSearchReset" size="large">重置</el-button>
+        <el-button @click="moreSearchQuery" type="primary" size="large"
+          >搜索</el-button
+        >
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -469,6 +491,11 @@ const sourceList = ref({
     pageSize: 10,
     keyword: "",
     userId: "",
+    userName: "",
+    contractCode: "",
+    customerName: "",
+    beginTime: "",
+    endTime: "",
   },
 });
 const loading = ref(false);
@@ -957,6 +984,70 @@ const submitBudgetForm = () => {
     getList();
   });
 };
+
+const formSearchConfig = computed(() => {
+  return [
+    {
+      type: "input",
+      label: "业务员",
+      prop: "userName",
+      itemWidth: 100,
+    },
+    {
+      type: "input",
+      label: "合同编号",
+      prop: "contractCode",
+      itemWidth: 100,
+    },
+    {
+      type: "input",
+      label: "客户名称",
+      prop: "customerName",
+      itemWidth: 100,
+    },
+    {
+      type: "date",
+      itemType: "datetime",
+      label: "合同时间",
+      prop: "beginTime",
+      placeholder: "合同开始时间",
+      itemWidth: 50,
+      clearable: true,
+    },
+    {
+      type: "date",
+      itemType: "datetime",
+      label: " ",
+      prop: "endTime",
+      placeholder: "合同结束时间",
+      itemWidth: 50,
+      clearable: true,
+    },
+  ];
+});
+const moreSearchDialog = ref(false);
+const clickMoreSearch = () => {
+  moreSearchDialog.value = true;
+};
+const moreSearchQuery = () => {
+  moreSearchDialog.value = false;
+  getList();
+};
+const moreSearchReset = () => {
+  sourceList.value.pagination = {
+    total: 0,
+    pageNum: sourceList.value.pagination.pageNum,
+    pageSize: sourceList.value.pagination.pageSize,
+    keyword: "",
+    userId: "",
+    userName: "",
+    contractCode: "",
+    customerName: "",
+    beginTime: "",
+    endTime: "",
+  };
+  moreSearchQuery();
+};
 </script>
 
 <style lang="scss" scoped>

src/views/EHSD/procurement/profitSettlementEHSD/index.vue

@@ -8,6 +8,8 @@
       :config="config"
       :loading="loading"
       highlight-current-row
+      :onMoreSearch="true"
+      @moreSearch="clickMoreSearch"
       @get-list="getList"
     >
     </byTable>
@@ -167,6 +169,26 @@
         >
       </template>
     </el-dialog>
+
+    <el-dialog
+      :title="'高级检索'"
+      v-model="moreSearchDialog"
+      width="500px"
+      destroy-on-close
+    >
+      <byForm
+        :formConfig="formSearchConfig"
+        :formOption="formOption"
+        v-model="sourceList.pagination"
+      >
+      </byForm>
+      <template #footer>
+        <el-button @click="moreSearchReset" size="large">重置</el-button>
+        <el-button @click="moreSearchQuery" type="primary" size="large"
+          >搜索</el-button
+        >
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -187,6 +209,11 @@ const sourceList = ref({
     pageSize: 10,
     keyword: "",
     userId: "",
+    userName: "",
+    contractCode: "",
+    customerName: "",
+    beginTime: "",
+    endTime: "",
   },
 });
 const loading = ref(false);
@@ -302,6 +329,70 @@ const submitRemarkForm = () => {
     getList();
   });
 };
+
+const formSearchConfig = computed(() => {
+  return [
+    {
+      type: "input",
+      label: "业务员",
+      prop: "userName",
+      itemWidth: 100,
+    },
+    {
+      type: "input",
+      label: "合同编号",
+      prop: "contractCode",
+      itemWidth: 100,
+    },
+    {
+      type: "input",
+      label: "客户名称",
+      prop: "customerName",
+      itemWidth: 100,
+    },
+    {
+      type: "date",
+      itemType: "datetime",
+      label: "合同时间",
+      prop: "beginTime",
+      placeholder: "合同开始时间",
+      itemWidth: 50,
+      clearable: true,
+    },
+    {
+      type: "date",
+      itemType: "datetime",
+      label: " ",
+      prop: "endTime",
+      placeholder: "合同结束时间",
+      itemWidth: 50,
+      clearable: true,
+    },
+  ];
+});
+const moreSearchDialog = ref(false);
+const clickMoreSearch = () => {
+  moreSearchDialog.value = true;
+};
+const moreSearchQuery = () => {
+  moreSearchDialog.value = false;
+  getList();
+};
+const moreSearchReset = () => {
+  sourceList.value.pagination = {
+    total: 0,
+    pageNum: sourceList.value.pagination.pageNum,
+    pageSize: sourceList.value.pagination.pageSize,
+    keyword: "",
+    userId: "",
+    userName: "",
+    contractCode: "",
+    customerName: "",
+    beginTime: "",
+    endTime: "",
+  };
+  moreSearchQuery();
+};
 </script>
 
 <style lang="scss" scoped>

src/views/EHSD/saleContract/contractEHSD/index.vue

@@ -352,6 +352,8 @@ const sourceList = ref({
     keyword: "",
     status: "",
     sellCorporationId: "",
+    beginTime: "",
+    endTime: "",
   },
 });
 const loading = ref(false);
@@ -1167,6 +1169,7 @@ const formSearchConfig = computed(() => {
       prop: "beginTime",
       placeholder: "合同开始时间",
       itemWidth: 50,
+      clearable: true,
     },
     {
       type: "date",
@@ -1175,6 +1178,7 @@ const formSearchConfig = computed(() => {
       prop: "endTime",
       placeholder: "合同结束时间",
       itemWidth: 50,
+      clearable: true,
     },
   ];
 });
@@ -1194,6 +1198,8 @@ const moreSearchReset = () => {
     keyword: "",
     status: "",
     sellCorporationId: "",
+    beginTime: "",
+    endTime: "",
   };
   moreSearchQuery();
 };

src/views/login.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="login">
-    <h1>ByteSailing</h1>
+    <h1>尔泓时代</h1>
     <div class="content">
       <div class="warp-bg">
         <div class="left-bg">
@@ -37,7 +37,7 @@
           >
             <div class="form" style="margin-top: 300px">
               <div class="">{{ $t("login.welcomeToLogin") }}~</div>
-              <h2>ByteSailing {{ $t("login.managementSystem") }}</h2>
+              <h2>尔泓时代 {{ $t("login.managementSystem") }}</h2>
               <el-form-item prop="tenantId" style="margin-top: 30px">
                 <el-input
                   :placeholder="$t('login.pleaseEnterTheTenantId')"

src/views/register.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerRef" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">ByteSailing</h3>
+      <h3 class="title">尔泓时代</h3>
       <el-form-item prop="username">
         <el-input 
           v-model="registerForm.username"