需求池208 提交

README.md

@@ -57,7 +57,7 @@
     1. 组件会加载 src/assets/svg-icons 文件夹下面的svg图片，需要图标方式使用的svg图片的请放到该文件。
       + 使用方式：svgIcon的 name 属性为 svgIcon-[dir]-[name]  svgIcon：前缀 dir：文件夹名 name：文件名 表示使用 'dir'文件夹下的'name'文件名的svg图片
     2. 使用的svg图片如果不需要改变颜色，就可以直接使用；需要通过属性改变颜色需要对svg文件做一些修改，如 - 菜单图标
-      + 改变颜色首先需要将svg文件中<svg></svg>标签的fill属性去除，也可以将fill属性设为'currentColor'，但是这样只能使用css方式修改颜色。
+      + 对需要变色的区域做一些修改。
       + 使用v-bind修改颜色：需要将需要修改颜色的标签的fill属性去除 方可通过v-bind方式修改颜色 svgIcon上的color属性
       + 使用css修改颜色：需要将需要修改颜色的标签的fill属性的值设为'currentColor' ,方可通过css修改颜色。
       + 两种方式可以混用。

package.json

@@ -12,11 +12,13 @@
   "dependencies": {
     "@element-plus/icons-vue": "^2.0.9",
     "axios": "^0.26.0",
+    "echarts": "^5.4.0",
     "element-plus": "^2.2.14",
     "html2canvas": "1.4.0",
     "js-base64": "^3.7.2",
     "js-md5": "^0.7.3",
     "lodash": "^4.17.21",
+    "moment": "^2.29.4",
     "nprogress": "^0.2.0",
     "vue": "^3.2.37",
     "vue-router": "^4.1.3",

src/App.vue

@@ -1,5 +1,6 @@
 <script setup>
 import zhCn from 'element-plus/lib/locale/lang/zh-cn'
+import moment from 'moment'
 
 const isRouterAlive = ref(true)
 
@@ -11,6 +12,7 @@ const reload=()=>{
 }
 
 provide('reload',reload)
+provide('$moment',moment)
 </script>
 
 <template>

src/api/crm.js

@@ -19,15 +19,13 @@ export function getPermissionList(data) {
 // 获取销售列表
  /**
   * @param {
-  * seller_type - 销售类型: 1-FICC(默认); 2-权益 - 非必填
   * } data 
   * @returns 
   */
-export function getSellerList(data) {
+export function getSellerList() {
   return request({
       url:'/crm/company_seller/list',
-      method:'get',
-      params:data
+      method:'get'
   })
 }
 // 根据合同编号搜索合同列表
@@ -64,11 +62,17 @@ export function getServiceDetail(data) {
      params:data
  })
 }
-
- // 获取销售组别列表
+ /**
+  * 获取销售组别列表
+  * @param {
+ * seller_type - 1 ficc销售、2 权益销售 - 必填
+ * } data 
+ * @returns 
+ */
  export function getSellerGroupList(data) {
   return request({
       url:'/crm/company_seller/group_list',
-      method:'get'
+      method:'get',
+      params:data
   })
  }

src/api/dashboard.js

@@ -0,0 +1,9 @@
+import request from "../utils/request"
+//----------------首页
+ // 获取首页 图表数据
+export function getStatistic() {
+  return request({
+      url:'/home/statistic',
+      method:'get'
+  })
+}

src/api/financialMana.js

@@ -1,6 +1,18 @@
 import request from "../utils/request"
 
 // -----------------------------财务列表
+ /**
+  * 获取简易的套餐列表（用于搜索下拉框）
+ * @returns 
+ */
+export function getSimpleServiceList() {
+ return request({
+     url:'/contract/service/simple',
+     method:'get'
+ })
+}
+
+
  // 获取套餐列表
  /**
   * 
@@ -47,6 +59,23 @@ export function registerListExport(data) {
       responseType:'blob'
   })
 }
+
+ /**
+  * 合同名称或者合同有效期查询校验
+  * @param {
+ * company_name - 客户名称 - 必填
+ * start_date - 开始日期：格式2022-11-22 - 必填
+ * end_date - 开始日期：格式2022-11-22 - 必填
+ * } data 
+ * @returns 
+ */
+export function contractRegisterCheck(data) {
+ return request({
+     url:'/contract/register/check_contract_code',
+     method:'get',
+     params:data
+ })
+}
 // 合规登记 - 新增
  /**
   * 
@@ -114,7 +143,7 @@ export function registerDetail(data) {
   * 
   * @param {
   * contract_register_id - 合同登记ID - 必填
-  * contract_status - 合同状态: 1-已审批; 2-单章寄出; 3-已签回 - 必填
+  * contract_status - 合同状态: 1-已审批; 2-单章寄出; 3-已签回 4-已终止 - 必填
   * } data 
   * @returns 
   */
@@ -204,3 +233,81 @@ export function importDataApi(data) {
      data
  })
 }
+// -----------------到款预登记
+// 获取到款预登记列表
+ /**
+  * 
+  * @param {
+ * page_size - 每页数据量 - 必填
+ * current - 页码 - 必填
+ * Keyword - 关键词-客户姓名/销售姓名 - 非必填
+ * StartDate - 约定开始时间：格式2022-11-22 - 非必填
+ * EndDate - 约定结束时间：格式2022-11-22 - 非必填
+ * SortType - 枚举值：asc 正序 desc 倒序 - 非必填
+ * } data 
+ * @returns 
+ */
+export function getPrePlacementList(data) {
+ return request({
+     url:'/contract/pre_pay/list',
+     method:'get',
+     params:data
+ })
+}
+
+// 新增到款预登记
+ /**
+  * @param data.company_name 客户名称 
+  * @param data.seller_id 销售ID 
+  * @param data.seller_name 销售姓名 
+  * @param data.amount 到款金额 
+  * @param data.currency_unit 货币代码 
+  * @param data.start_date 约定开始日期 
+  * @param data.end_date 约定结束日期 
+  * @param data.remark 备注 
+ * @returns 
+ */
+export function prePlacementAdd(data) {
+ return request({
+     url:'/contract/pre_pay/add',
+     method:'post',
+     data
+ })
+}
+
+// 编辑到款预登记
+ /**
+  * @param data.pre_pay_id 到款预登记Id 
+  * @param data.company_name 客户名称 
+  * @param data.seller_id 销售ID 
+  * @param data.seller_name 销售姓名 
+  * @param data.amount 到款金额 
+  * @param data.currency_unit 货币代码 
+  * @param data.start_date 约定开始日期 
+  * @param data.end_date 约定结束日期 
+  * @param data.remark 备注 
+ * @returns 
+ */
+ export function prePlacementEdit(data) {
+  return request({
+      url:'/contract/pre_pay/edit',
+      method:'post',
+      data
+  })
+ }
+
+ // 删除到款预登记
+ /**
+  * 
+  * @param {
+ * pre_pay_id - 到款预登记ID - 必填
+ * } data 
+ * @returns 
+ */
+export function prePlacementDelete(data) {
+ return request({
+     url:'/contract/pre_pay/del',
+     method:'post',
+     data
+ })
+}

src/assets/img/layout/logo-big.svg

@@ -1,27 +1,27 @@
 <svg width="120" height="34" viewBox="0 0 120 34" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M25.5547 17.4061C25.5547 17.4061 25.4934 17.3594 25.3796 17.2894C25.5955 19.5096 25.5197 22.646 23.8713 24.7436C23.8713 24.7436 19.9327 30.7595 12.7848 29.4408C12.7848 29.4408 9.13792 28.8719 8.39104 25.4438L2.70483 25.4234C2.70483 25.4234 5.53773 31.2934 13.6367 33.0089C13.6367 33.0089 18.6898 34.1963 23.0777 32.0782C23.562 31.3372 29.1666 22.6168 25.5547 17.4061Z" fill="#5F7FB2"/>
 <path d="M32.3496 10.4391C20.4899 7.27656 14.4886 21.7124 14.4886 21.7124C17.5199 22.8093 20.3236 18.5935 20.3236 18.5935C22.5234 15.8365 24.7524 16.9014 25.3768 17.2894C25.4905 17.3594 25.5518 17.4061 25.5518 17.4061C29.1637 22.6168 23.5592 31.3372 23.0632 32.087L23.0253 32.1424C38.6164 24.8166 32.3496 10.4391 32.3496 10.4391Z" fill="#0C3872"/>
-<path d="M19.9706 0.332904C19.9706 0.332904 14.9145 -0.857435 10.5266 1.26359C10.0306 2.01047 4.42611 10.7309 8.0409 15.9415C8.0409 15.9415 8.10217 15.9882 8.21303 16.0582C7.99714 13.838 8.07299 10.7017 9.72138 8.60694C9.72138 8.60694 13.6629 2.58813 20.8225 3.90684C20.8225 3.90684 24.4664 4.49034 25.1987 7.90382L30.8878 7.92424C30.8878 7.92424 28.0666 2.05715 19.9706 0.332904Z" fill="#AB9523"/>
+<path d="M19.9706 0.332904C19.9706 0.332904 14.9145 -0.857435 10.5266 1.26359C10.0306 2.01047 4.42611 10.7309 8.0409 15.9415C8.0409 15.9415 8.10217 15.9882 8.21303 16.0582C7.99714 13.838 8.07299 10.7017 9.72138 8.60694C9.72138 8.60694 13.6629 2.58813 20.8225 3.90684C20.8225 3.90684 24.4664 4.49034 25.1987 7.90382L30.8878 7.92424C30.8878 7.92424 28.0666 2.05715 19.9706 0.332904Z" fill="#D27A53"/>
 <path d="M10.5266 1.26367L10.5645 1.20532C-5.02366 8.53117 1.24605 22.9086 1.24605 22.9086C13.1057 26.0712 19.107 11.6354 19.107 11.6354C16.0786 10.5384 13.272 14.7542 13.272 14.7542C11.0751 17.5112 8.84614 16.4463 8.21887 16.0583C8.10801 15.9883 8.04674 15.9416 8.04674 15.9416C4.42613 10.731 10.0306 2.01055 10.5266 1.26367Z" fill="#C54322"/>
-<path d="M42.7387 26.3045C42.4762 26.6137 41.8255 26.7917 40.7811 26.8384C40.7521 26.417 40.6044 26.0124 40.3551 25.6714C41.2566 25.6947 41.7059 25.6218 41.7059 25.4555C41.7789 25.3388 41.8022 24.8165 41.7789 23.8917H40.1772L40.2472 21.1171H42.0269V20.2273H40.0692V19.2558H43.1647V22.0653H41.3938L41.3558 22.9202H43.0276C43.0042 24.27 42.9809 25.1355 42.9575 25.5167C42.9566 25.7942 42.881 26.0663 42.7387 26.3045ZM44.6934 25.1375H44.8014C45.2744 25.0886 45.7496 25.0643 46.2251 25.0645C46.1989 24.9478 46.1522 24.7728 46.0822 24.5685C46.0677 24.4824 46.0432 24.3982 46.0092 24.3176C45.8857 23.8691 45.7317 23.4294 45.5483 23.0018C45.5153 22.9468 45.4917 22.8866 45.4783 22.8239L46.5081 22.4329C47.0717 23.6991 47.5702 24.9933 48.0019 26.3103C47.6693 26.4036 47.2317 26.5466 46.6861 26.7362C46.6609 26.504 46.6009 26.2768 46.5081 26.0623C45.539 26.0872 44.5746 26.2065 43.6286 26.4182C43.6147 26.4188 43.601 26.4222 43.5885 26.4282C43.5759 26.4342 43.5648 26.4428 43.5556 26.4532C43.4127 26.5233 43.331 26.5233 43.3076 26.4532C43.118 25.718 43.0451 25.3271 43.0947 25.2862L43.1647 25.2483C43.2615 25.2214 43.3506 25.172 43.4246 25.104C43.4987 25.0361 43.5556 24.9516 43.5906 24.8574C44.2636 22.9958 44.6358 21.0389 44.6934 19.0603C45.1831 19.0631 45.6714 19.111 46.1522 19.2033L46.1872 19.2733C46.1405 19.4629 46.0472 19.8918 45.8955 20.5541C45.5796 22.1009 45.1783 23.6291 44.6934 25.1316V25.1375Z" fill="#040000"/>
-<path d="M63.5668 26.3046C64.6093 25.6413 65.2015 25.0014 65.3435 24.3849C65.4556 23.7986 65.5035 23.2018 65.4865 22.6052V20.6125H65.8074C66.0671 20.6125 66.3151 20.6125 66.5543 20.6505C66.671 20.6505 66.706 20.7205 66.6593 20.8634C66.5886 21.081 66.5531 21.3086 66.5543 21.5374V22.1442C66.5525 22.9166 66.5047 23.6882 66.4113 24.4549C67.7398 25.3554 68.439 25.865 68.509 25.9836C68.1982 26.2231 67.9056 26.4855 67.6338 26.7684C67.6104 26.7684 67.5287 26.6955 67.3858 26.5526C66.9666 26.1514 66.5274 25.7717 66.07 25.4147C65.5721 26.0299 64.9987 26.5798 64.3633 27.0514C64.1139 26.7858 63.8479 26.5363 63.5668 26.3046ZM64.0628 24.5978V19.2559H68.048V24.5074H66.9803V20.2566H65.1305V24.5978H64.0628ZM68.544 25.0238V19.8656H68.9C69.1261 19.866 69.3521 19.8786 69.5768 19.9036C69.6964 19.9036 69.7315 19.9736 69.6848 20.1165C69.6117 20.3094 69.5751 20.5142 69.5768 20.7205V25.0238H68.544ZM70.1457 25.5577V18.9408H70.5688C70.7833 18.9418 70.9975 18.9545 71.2106 18.9787C71.3273 18.9787 71.3769 19.0254 71.3536 19.1188C71.3469 19.2167 71.3343 19.3141 71.3157 19.4105C71.2961 19.5517 71.2844 19.6939 71.2806 19.8365V26.2404C71.4226 26.7869 70.8391 27.0232 69.5301 26.9493C69.501 26.5542 69.3659 26.1743 69.1392 25.8494C69.9328 25.8922 70.2702 25.795 70.1516 25.5577H70.1457Z" fill="#040000"/>
-<path d="M87.4289 19.3346H91.0554V19.1187H95.4667V20.0815H94.784V22.2492H95.7818V23.247H94.784V27.0164H93.6461V23.247H92.8993V23.387C92.9193 24.0765 92.7934 24.7625 92.53 25.4C92.2665 26.0375 91.8714 26.6122 91.3705 27.0864C91.2042 26.9434 90.9183 26.7305 90.5157 26.4475C90.4492 26.3934 90.3779 26.3455 90.3027 26.3045C90.8093 26.0336 91.2246 25.6191 91.4965 25.113C91.7685 24.607 91.885 24.0319 91.8315 23.46V23.247H90.9562V25.6743H89.8826V25.3826H89.2057V26.1645H88.2108V23.9238L87.8899 24.2798C87.747 24.0435 87.7003 23.9588 87.747 24.0318C87.534 23.6992 87.3677 23.4483 87.251 23.2849C87.9512 22.4298 88.3952 21.3941 88.5318 20.2974H87.4289V19.3346ZM89.2057 22.5701V24.5278H89.8826V22.5701H89.2057ZM89.6696 20.2945C89.6326 20.4221 89.6082 20.553 89.5966 20.6854C89.5225 21.0119 89.425 21.3327 89.3049 21.6453H90.9416V22.2842H91.8169V20.0815H91.105V20.2945H89.6696ZM93.652 22.2842V20.0436H92.9401V22.2842H93.652Z" fill="#040000"/>
-<path d="M114.331 23.2469C114.331 23.1497 114.343 22.9834 114.366 22.7481C114.375 22.5326 114.399 22.3181 114.439 22.1062C115.314 22.1325 115.767 22.1675 115.79 22.2141C115.783 22.2744 115.772 22.3339 115.755 22.3921C115.664 22.6588 115.593 22.9319 115.542 23.209H117.427V25.5926C117.403 25.8318 117.462 25.9369 117.605 25.9135H117.961C118.252 26.0098 118.41 25.7122 118.387 25.0383C118.767 25.1846 119.157 25.3035 119.554 25.3942C119.577 26.532 119.234 27.03 118.524 26.888H117.249C116.514 26.9347 116.194 26.7334 116.289 26.2841V24.1864H115.364C115.17 25.5829 114.114 26.5554 112.199 27.1039C111.991 26.743 111.74 26.4089 111.452 26.109C113.039 25.7998 113.939 25.1715 114.153 24.2243H112.172V23.2644L114.331 23.2469ZM111.735 22.4271C112.603 22.0151 113.396 21.462 114.083 20.7904C114.431 20.9656 114.763 21.1685 115.078 21.3972C115.148 21.4439 115.113 21.5256 114.973 21.6452C114.973 21.6219 114.958 21.6219 114.935 21.6452C114.194 22.199 113.414 22.6982 112.601 23.139L111.735 22.4271ZM114.83 19.7605C114.757 19.4688 114.675 19.177 114.579 18.8853C114.814 18.8461 115.053 18.8343 115.291 18.8503C115.516 18.8211 115.743 18.8211 115.968 18.8503C115.972 18.9223 115.983 18.9938 116.003 19.0632C116.026 19.3725 116.038 19.6088 116.038 19.7751H119.025V21.4819H117.888V20.7146H112.872V21.5315H111.77V19.7547L114.83 19.7605ZM118.039 23.317C117.294 22.6659 116.484 22.0939 115.621 21.6102C115.912 21.395 116.185 21.1569 116.438 20.8984C117.309 21.3331 118.132 21.8571 118.894 22.4621L118.039 23.317Z" fill="#040000"/>
-<path d="M43.4536 9.88193H40.5624V6.86523H38.9519V14.5091H40.5624V11.1627H43.4974V14.5091H45.1078V6.86523H43.4536V9.88193Z" fill="#040000"/>
-<path d="M49.0318 9.04456C47.2696 9.12625 46.3467 10.0628 46.2631 11.8541C46.3486 13.6163 47.2715 14.5246 49.0318 14.5791C50.7939 14.5246 51.7168 13.6163 51.8005 11.8541C51.7188 10.0705 50.7959 9.13403 49.0318 9.04456ZM49.0318 13.59C48.2878 13.59 47.9173 13.0065 47.9173 11.8395C47.9173 10.6725 48.2878 10.0628 49.0318 10.0628C49.8312 10.0628 50.2202 10.655 50.1988 11.8395C50.19 13.0211 49.802 13.6017 49.0318 13.6017V13.59Z" fill="#040000"/>
-<path d="M54.3212 10.1708H54.2804V9.17887H52.8217C52.8217 9.34517 52.8362 9.57857 52.8625 9.88199V14.5091H54.4321V11.6996C54.4714 11.431 54.5408 11.1677 54.6393 10.9148C54.8548 10.711 55.1297 10.5812 55.4241 10.5443H56.1272V9.13803C55.2286 9.0826 54.6247 9.42686 54.3212 10.1708Z" fill="#040000"/>
-<path d="M58.6158 9.17877H57.0054V14.509H58.6158V9.17877Z" fill="#040000"/>
-<path d="M58.6595 6.86523H56.9645V8.22771H58.6595V6.86523Z" fill="#040000"/>
-<path d="M64.1124 10.2553V9.17877H59.7332V10.2553H62.5836L59.6515 13.4354V14.509H64.194V13.4354H61.1773L64.1124 10.2553Z" fill="#040000"/>
-<path d="M67.7884 9.04456C66.0262 9.12625 65.1033 10.0628 65.0197 11.8541C65.1033 13.6163 66.0262 14.5246 67.7884 14.5791C69.5505 14.5246 70.4734 13.6163 70.5571 11.8541C70.4754 10.0705 69.5525 9.13403 67.7884 9.04456ZM67.7884 13.59C67.0444 13.59 66.6739 13.0065 66.6739 11.8395C66.6739 10.6725 67.0444 10.0628 67.7884 10.0628C68.5878 10.0628 68.9768 10.655 68.9554 11.8395C68.9466 13.0211 68.5586 13.6017 67.7884 13.6017V13.59Z" fill="#040000"/>
-<path d="M74.945 9.04456C74.167 9.04456 73.6302 9.30616 73.3346 9.82936L73.2937 9.78852V9.16709H71.7212V14.4974H73.2937V11.3173C73.3754 10.5393 73.6915 10.126 74.2419 10.0774C74.876 10.0774 75.193 10.4907 75.193 11.3173V14.4974H76.8035V11.0401C76.7951 10.7601 76.754 10.482 76.6809 10.2116C76.4796 9.5522 75.899 9.16709 74.945 9.04456Z" fill="#040000"/>
-<path d="M87.2481 9.04456C86.4779 9.04456 85.9382 9.30713 85.6377 9.82936L85.5968 9.78852V9.16709H84.0243V14.4974H85.5968V11.3173C85.6785 10.5393 85.9946 10.126 86.545 10.0774C87.1771 10.0774 87.4942 10.4907 87.4961 11.3173V14.4974H89.1066V11.0401C89.0982 10.7601 89.0571 10.482 88.984 10.2116C88.7915 9.5522 88.2109 9.16709 87.2481 9.04456Z" fill="#040000"/>
-<path d="M92.8265 11.1627C92.1379 10.9964 91.7937 10.8068 91.7937 10.5792C91.7937 10.2495 91.9979 10.0832 92.4122 10.0832C92.8265 10.0832 93.0861 10.2904 93.1153 10.62H94.5741C94.4924 9.57168 93.7766 9.04848 92.4268 9.05042C90.968 9.16129 90.2104 9.68449 90.154 10.62C90.0976 11.5556 90.7453 12.1391 92.0971 12.3705C92.7856 12.5077 93.1416 12.7294 93.1707 13.0299C93.1707 13.4179 92.9228 13.6134 92.4268 13.6134C91.9308 13.6134 91.6128 13.3771 91.5515 12.992H90.0636C90.12 14.0384 90.9048 14.5752 92.418 14.6024C93.9312 14.4935 94.7297 13.9431 94.8133 12.9511C94.8094 12.1167 94.1471 11.5206 92.8265 11.1627Z" fill="#040000"/>
-<path d="M97.3281 9.17877H95.7177V14.509H97.3281V9.17877Z" fill="#040000"/>
-<path d="M97.3718 6.86523H95.6768V8.22771H97.3718V6.86523Z" fill="#040000"/>
-<path d="M102.203 9.8003C101.954 9.30432 101.473 9.05634 100.759 9.05634C99.378 9.13803 98.6341 10.0327 98.5271 11.7404C98.635 13.4209 99.3673 14.302 100.715 14.3866C101.003 14.4112 101.293 14.3592 101.554 14.2357C101.815 14.1122 102.039 13.9216 102.203 13.6835C102.368 14.868 102.011 15.4602 101.13 15.4602C100.578 15.4602 100.275 15.2385 100.219 14.798H98.7342C98.7595 15.965 99.5852 16.5436 101.211 16.5339C103.003 16.5611 103.87 15.7209 103.814 14.0132V9.17887H102.203V9.8003ZM101.17 13.3538C100.482 13.3538 100.138 12.8287 100.138 11.7842C100.138 10.6542 100.482 10.0891 101.17 10.0891C101.859 10.0891 102.203 10.6542 102.203 11.7842C102.203 12.8374 101.859 13.3538 101.17 13.3538Z" fill="#040000"/>
-<path d="M108.359 9.04456C107.581 9.04456 107.044 9.30616 106.749 9.82937H106.708V6.85352H105.138V14.4974H106.708V11.3173C106.789 10.5393 107.106 10.126 107.656 10.0774C108.288 10.0774 108.605 10.4907 108.607 11.3173V14.4974H110.218V11.0401C110.209 10.7601 110.168 10.482 110.095 10.2116C109.902 9.5522 109.322 9.16709 108.359 9.04456Z" fill="#040000"/>
-<path d="M113.564 7.5683L111.953 8.1518V9.18459H110.88V10.2611H111.953V12.8636C111.899 14.0753 112.395 14.653 113.441 14.5966L114.722 14.5149V13.5638C114.545 13.5939 114.365 13.6085 114.185 13.6075C113.715 13.6892 113.507 13.3975 113.564 12.7323V10.2553H114.731V9.17876H113.564V7.5683Z" fill="#040000"/>
-<path d="M118.028 11.1627C117.339 10.9964 116.995 10.8068 116.995 10.5792C116.995 10.2495 117.202 10.0832 117.613 10.0832C118.025 10.0832 118.287 10.2904 118.317 10.62H119.761C119.679 9.57168 118.963 9.04848 117.613 9.05042C116.155 9.16129 115.397 9.68449 115.341 10.62C115.284 11.5556 115.932 12.1391 117.284 12.3705C117.972 12.5077 118.328 12.7294 118.357 13.0299C118.357 13.4179 118.109 13.6134 117.613 13.6134C117.117 13.6134 116.802 13.3771 116.738 12.992H115.25C115.307 14.0384 116.091 14.5752 117.605 14.6024C119.118 14.4935 119.916 13.9431 120 12.9511C120.006 12.1167 119.348 11.5206 118.028 11.1627Z" fill="#040000"/>
-<path d="M80.1644 7.59166H81.0513V13.1466H80.1644V14.5966H83.5896V13.1466H82.7026V7.59166H83.5896V6.14166H80.1644V7.59166Z" fill="#040000"/>
+<path d="M42.7387 26.3045C42.4762 26.6137 41.8255 26.7917 40.7811 26.8384C40.7521 26.417 40.6044 26.0124 40.3551 25.6714C41.2566 25.6947 41.7059 25.6218 41.7059 25.4555C41.7789 25.3388 41.8022 24.8165 41.7789 23.8917H40.1772L40.2472 21.1171H42.0269V20.2273H40.0692V19.2558H43.1647V22.0653H41.3938L41.3558 22.9202H43.0276C43.0042 24.27 42.9809 25.1355 42.9575 25.5167C42.9566 25.7942 42.881 26.0663 42.7387 26.3045ZM44.6934 25.1375H44.8014C45.2744 25.0886 45.7496 25.0643 46.2251 25.0645C46.1989 24.9478 46.1522 24.7728 46.0822 24.5685C46.0677 24.4824 46.0432 24.3982 46.0092 24.3176C45.8857 23.8691 45.7317 23.4294 45.5483 23.0018C45.5153 22.9468 45.4917 22.8866 45.4783 22.8239L46.5081 22.4329C47.0717 23.6991 47.5702 24.9933 48.0019 26.3103C47.6693 26.4036 47.2317 26.5466 46.6861 26.7362C46.6609 26.504 46.6009 26.2768 46.5081 26.0623C45.539 26.0872 44.5746 26.2065 43.6286 26.4182C43.6147 26.4188 43.601 26.4222 43.5885 26.4282C43.5759 26.4342 43.5648 26.4428 43.5556 26.4532C43.4127 26.5233 43.331 26.5233 43.3076 26.4532C43.118 25.718 43.0451 25.3271 43.0947 25.2862L43.1647 25.2483C43.2615 25.2214 43.3506 25.172 43.4246 25.104C43.4987 25.0361 43.5556 24.9516 43.5906 24.8574C44.2636 22.9958 44.6358 21.0389 44.6934 19.0603C45.1831 19.0631 45.6714 19.111 46.1522 19.2033L46.1872 19.2733C46.1405 19.4629 46.0472 19.8918 45.8955 20.5541C45.5796 22.1009 45.1783 23.6291 44.6934 25.1316V25.1375Z" fill="#333333"/>
+<path d="M63.5668 26.3046C64.6093 25.6413 65.2015 25.0014 65.3435 24.3849C65.4556 23.7986 65.5035 23.2018 65.4865 22.6052V20.6125H65.8074C66.0671 20.6125 66.3151 20.6125 66.5543 20.6505C66.671 20.6505 66.706 20.7205 66.6593 20.8634C66.5886 21.081 66.5531 21.3086 66.5543 21.5374V22.1442C66.5525 22.9166 66.5047 23.6882 66.4113 24.4549C67.7398 25.3554 68.439 25.865 68.509 25.9836C68.1982 26.2231 67.9056 26.4855 67.6338 26.7684C67.6104 26.7684 67.5287 26.6955 67.3858 26.5526C66.9666 26.1514 66.5274 25.7717 66.07 25.4147C65.5721 26.0299 64.9987 26.5798 64.3633 27.0514C64.1139 26.7858 63.8479 26.5363 63.5668 26.3046ZM64.0628 24.5978V19.2559H68.048V24.5074H66.9803V20.2566H65.1305V24.5978H64.0628ZM68.544 25.0238V19.8656H68.9C69.1261 19.866 69.3521 19.8786 69.5768 19.9036C69.6964 19.9036 69.7315 19.9736 69.6848 20.1165C69.6117 20.3094 69.5751 20.5142 69.5768 20.7205V25.0238H68.544ZM70.1457 25.5577V18.9408H70.5688C70.7833 18.9418 70.9975 18.9545 71.2106 18.9787C71.3273 18.9787 71.3769 19.0254 71.3536 19.1188C71.3469 19.2167 71.3343 19.3141 71.3157 19.4105C71.2961 19.5517 71.2844 19.6939 71.2806 19.8365V26.2404C71.4226 26.7869 70.8391 27.0232 69.5301 26.9493C69.501 26.5542 69.3659 26.1743 69.1392 25.8494C69.9328 25.8922 70.2702 25.795 70.1516 25.5577H70.1457Z" fill="#333333"/>
+<path d="M87.4289 19.3346H91.0554V19.1187H95.4667V20.0815H94.784V22.2492H95.7818V23.247H94.784V27.0164H93.6461V23.247H92.8993V23.387C92.9193 24.0765 92.7934 24.7625 92.53 25.4C92.2665 26.0375 91.8714 26.6122 91.3705 27.0864C91.2042 26.9434 90.9183 26.7305 90.5157 26.4475C90.4492 26.3934 90.3779 26.3455 90.3027 26.3045C90.8093 26.0336 91.2246 25.6191 91.4965 25.113C91.7685 24.607 91.885 24.0319 91.8315 23.46V23.247H90.9562V25.6743H89.8826V25.3826H89.2057V26.1645H88.2108V23.9238L87.8899 24.2798C87.747 24.0435 87.7003 23.9588 87.747 24.0318C87.534 23.6992 87.3677 23.4483 87.251 23.2849C87.9512 22.4298 88.3952 21.3941 88.5318 20.2974H87.4289V19.3346ZM89.2057 22.5701V24.5278H89.8826V22.5701H89.2057ZM89.6696 20.2945C89.6326 20.4221 89.6082 20.553 89.5966 20.6854C89.5225 21.0119 89.425 21.3327 89.3049 21.6453H90.9416V22.2842H91.8169V20.0815H91.105V20.2945H89.6696ZM93.652 22.2842V20.0436H92.9401V22.2842H93.652Z" fill="#333333"/>
+<path d="M114.331 23.2469C114.331 23.1497 114.343 22.9834 114.366 22.7481C114.375 22.5326 114.399 22.3181 114.439 22.1062C115.314 22.1325 115.767 22.1675 115.79 22.2141C115.783 22.2744 115.772 22.3339 115.755 22.3921C115.664 22.6588 115.593 22.9319 115.542 23.209H117.427V25.5926C117.403 25.8318 117.462 25.9369 117.605 25.9135H117.961C118.252 26.0098 118.41 25.7122 118.387 25.0383C118.767 25.1846 119.157 25.3035 119.554 25.3942C119.577 26.532 119.234 27.03 118.524 26.888H117.249C116.514 26.9347 116.194 26.7334 116.289 26.2841V24.1864H115.364C115.17 25.5829 114.114 26.5554 112.199 27.1039C111.991 26.743 111.74 26.4089 111.452 26.109C113.039 25.7998 113.939 25.1715 114.153 24.2243H112.172V23.2644L114.331 23.2469ZM111.735 22.4271C112.603 22.0151 113.396 21.462 114.083 20.7904C114.431 20.9656 114.763 21.1685 115.078 21.3972C115.148 21.4439 115.113 21.5256 114.973 21.6452C114.973 21.6219 114.958 21.6219 114.935 21.6452C114.194 22.199 113.414 22.6982 112.601 23.139L111.735 22.4271ZM114.83 19.7605C114.757 19.4688 114.675 19.177 114.579 18.8853C114.814 18.8461 115.053 18.8343 115.291 18.8503C115.516 18.8211 115.743 18.8211 115.968 18.8503C115.972 18.9223 115.983 18.9938 116.003 19.0632C116.026 19.3725 116.038 19.6088 116.038 19.7751H119.025V21.4819H117.888V20.7146H112.872V21.5315H111.77V19.7547L114.83 19.7605ZM118.039 23.317C117.294 22.6659 116.484 22.0939 115.621 21.6102C115.912 21.395 116.185 21.1569 116.438 20.8984C117.309 21.3331 118.132 21.8571 118.894 22.4621L118.039 23.317Z" fill="#333333"/>
+<path d="M43.4536 9.88193H40.5624V6.86523H38.9519V14.5091H40.5624V11.1627H43.4974V14.5091H45.1078V6.86523H43.4536V9.88193Z" fill="#333333"/>
+<path d="M49.0318 9.04456C47.2696 9.12625 46.3467 10.0628 46.2631 11.8541C46.3486 13.6163 47.2715 14.5246 49.0318 14.5791C50.7939 14.5246 51.7168 13.6163 51.8005 11.8541C51.7188 10.0705 50.7959 9.13403 49.0318 9.04456ZM49.0318 13.59C48.2878 13.59 47.9173 13.0065 47.9173 11.8395C47.9173 10.6725 48.2878 10.0628 49.0318 10.0628C49.8312 10.0628 50.2202 10.655 50.1988 11.8395C50.19 13.0211 49.802 13.6017 49.0318 13.6017V13.59Z" fill="#333333"/>
+<path d="M54.3212 10.1708H54.2804V9.17887H52.8217C52.8217 9.34517 52.8362 9.57857 52.8625 9.88199V14.5091H54.4321V11.6996C54.4714 11.431 54.5408 11.1677 54.6393 10.9148C54.8548 10.711 55.1297 10.5812 55.4241 10.5443H56.1272V9.13803C55.2286 9.0826 54.6247 9.42686 54.3212 10.1708Z" fill="#333333"/>
+<path d="M58.6158 9.17877H57.0054V14.509H58.6158V9.17877Z" fill="#333333"/>
+<path d="M58.6595 6.86523H56.9645V8.22771H58.6595V6.86523Z" fill="#333333"/>
+<path d="M64.1124 10.2553V9.17877H59.7332V10.2553H62.5836L59.6515 13.4354V14.509H64.194V13.4354H61.1773L64.1124 10.2553Z" fill="#333333"/>
+<path d="M67.7884 9.04456C66.0262 9.12625 65.1033 10.0628 65.0197 11.8541C65.1033 13.6163 66.0262 14.5246 67.7884 14.5791C69.5505 14.5246 70.4734 13.6163 70.5571 11.8541C70.4754 10.0705 69.5525 9.13403 67.7884 9.04456ZM67.7884 13.59C67.0444 13.59 66.6739 13.0065 66.6739 11.8395C66.6739 10.6725 67.0444 10.0628 67.7884 10.0628C68.5878 10.0628 68.9768 10.655 68.9554 11.8395C68.9466 13.0211 68.5586 13.6017 67.7884 13.6017V13.59Z" fill="#333333"/>
+<path d="M74.945 9.04456C74.167 9.04456 73.6302 9.30616 73.3346 9.82936L73.2937 9.78852V9.16709H71.7212V14.4974H73.2937V11.3173C73.3754 10.5393 73.6915 10.126 74.2419 10.0774C74.876 10.0774 75.193 10.4907 75.193 11.3173V14.4974H76.8035V11.0401C76.7951 10.7601 76.754 10.482 76.6809 10.2116C76.4796 9.5522 75.899 9.16709 74.945 9.04456Z" fill="#333333"/>
+<path d="M87.2481 9.04456C86.4779 9.04456 85.9382 9.30713 85.6377 9.82936L85.5968 9.78852V9.16709H84.0243V14.4974H85.5968V11.3173C85.6785 10.5393 85.9946 10.126 86.545 10.0774C87.1771 10.0774 87.4942 10.4907 87.4961 11.3173V14.4974H89.1066V11.0401C89.0982 10.7601 89.0571 10.482 88.984 10.2116C88.7915 9.5522 88.2109 9.16709 87.2481 9.04456Z" fill="#333333"/>
+<path d="M92.8265 11.1627C92.1379 10.9964 91.7937 10.8068 91.7937 10.5792C91.7937 10.2495 91.9979 10.0832 92.4122 10.0832C92.8265 10.0832 93.0861 10.2904 93.1153 10.62H94.5741C94.4924 9.57168 93.7766 9.04848 92.4268 9.05042C90.968 9.16129 90.2104 9.68449 90.154 10.62C90.0976 11.5556 90.7453 12.1391 92.0971 12.3705C92.7856 12.5077 93.1416 12.7294 93.1707 13.0299C93.1707 13.4179 92.9228 13.6134 92.4268 13.6134C91.9308 13.6134 91.6128 13.3771 91.5515 12.992H90.0636C90.12 14.0384 90.9048 14.5752 92.418 14.6024C93.9312 14.4935 94.7297 13.9431 94.8133 12.9511C94.8094 12.1167 94.1471 11.5206 92.8265 11.1627Z" fill="#333333"/>
+<path d="M97.3281 9.17877H95.7177V14.509H97.3281V9.17877Z" fill="#333333"/>
+<path d="M97.3718 6.86523H95.6768V8.22771H97.3718V6.86523Z" fill="#333333"/>
+<path d="M102.203 9.8003C101.954 9.30432 101.473 9.05634 100.759 9.05634C99.378 9.13803 98.6341 10.0327 98.5271 11.7404C98.635 13.4209 99.3673 14.302 100.715 14.3866C101.003 14.4112 101.293 14.3592 101.554 14.2357C101.815 14.1122 102.039 13.9216 102.203 13.6835C102.368 14.868 102.011 15.4602 101.13 15.4602C100.578 15.4602 100.275 15.2385 100.219 14.798H98.7342C98.7595 15.965 99.5852 16.5436 101.211 16.5339C103.003 16.5611 103.87 15.7209 103.814 14.0132V9.17887H102.203V9.8003ZM101.17 13.3538C100.482 13.3538 100.138 12.8287 100.138 11.7842C100.138 10.6542 100.482 10.0891 101.17 10.0891C101.859 10.0891 102.203 10.6542 102.203 11.7842C102.203 12.8374 101.859 13.3538 101.17 13.3538Z" fill="#333333"/>
+<path d="M108.359 9.04456C107.581 9.04456 107.044 9.30616 106.749 9.82937H106.708V6.85352H105.138V14.4974H106.708V11.3173C106.789 10.5393 107.106 10.126 107.656 10.0774C108.288 10.0774 108.605 10.4907 108.607 11.3173V14.4974H110.218V11.0401C110.209 10.7601 110.168 10.482 110.095 10.2116C109.902 9.5522 109.322 9.16709 108.359 9.04456Z" fill="#333333"/>
+<path d="M113.564 7.5683L111.953 8.1518V9.18459H110.88V10.2611H111.953V12.8636C111.899 14.0753 112.395 14.653 113.441 14.5966L114.722 14.5149V13.5638C114.545 13.5939 114.365 13.6085 114.185 13.6075C113.715 13.6892 113.507 13.3975 113.564 12.7323V10.2553H114.731V9.17876H113.564V7.5683Z" fill="#333333"/>
+<path d="M118.028 11.1627C117.339 10.9964 116.995 10.8068 116.995 10.5792C116.995 10.2495 117.202 10.0832 117.613 10.0832C118.025 10.0832 118.287 10.2904 118.317 10.62H119.761C119.679 9.57168 118.963 9.04848 117.613 9.05042C116.155 9.16129 115.397 9.68449 115.341 10.62C115.284 11.5556 115.932 12.1391 117.284 12.3705C117.972 12.5077 118.328 12.7294 118.357 13.0299C118.357 13.4179 118.109 13.6134 117.613 13.6134C117.117 13.6134 116.802 13.3771 116.738 12.992H115.25C115.307 14.0384 116.091 14.5752 117.605 14.6024C119.118 14.4935 119.916 13.9431 120 12.9511C120.006 12.1167 119.348 11.5206 118.028 11.1627Z" fill="#333333"/>
+<path d="M80.1644 7.59166H81.0513V13.1466H80.1644V14.5966H83.5896V13.1466H82.7026V7.59166H83.5896V6.14166H80.1644V7.59166Z" fill="#333333"/>
 </svg>

src/assets/img/layout/logo_mini.svg

@@ -1,6 +1,6 @@
 <svg width="34" height="34" viewBox="0 0 34 34" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M25.5548 17.4063C25.5548 17.4063 25.4935 17.3596 25.3797 17.2896C25.5956 19.5098 25.5197 22.6461 23.8714 24.7438C23.8714 24.7438 19.9327 30.7597 12.7849 29.4409C12.7849 29.4409 9.13798 28.872 8.3911 25.444L2.7049 25.4235C2.7049 25.4235 5.53779 31.2936 13.6368 33.009C13.6368 33.009 18.6899 34.1965 23.0778 32.0784C23.5621 31.3373 29.1666 22.6169 25.5548 17.4063Z" fill="#5F7FB2"/>
-<path d="M32.3495 10.4393C20.4899 7.27668 14.4886 21.7125 14.4886 21.7125C17.5199 22.8095 20.3236 18.5937 20.3236 18.5937C22.5234 15.8366 24.7524 16.9015 25.3767 17.2895C25.4905 17.3596 25.5517 17.4062 25.5517 17.4062C29.1636 22.6169 23.5591 31.3373 23.0631 32.0871L23.0252 32.1425C38.6163 24.8167 32.3495 10.4393 32.3495 10.4393Z" fill="#0C3872"/>
-<path d="M19.9706 0.332904C19.9706 0.332904 14.9145 -0.857435 10.5266 1.26359C10.0306 2.01047 4.42611 10.7309 8.0409 15.9415C8.0409 15.9415 8.10217 15.9882 8.21303 16.0582C7.99714 13.838 8.07299 10.7017 9.72138 8.60694C9.72138 8.60694 13.6629 2.58813 20.8225 3.90684C20.8225 3.90684 24.4664 4.49034 25.1987 7.90382L30.8878 7.92424C30.8878 7.92424 28.0666 2.05715 19.9706 0.332904Z" fill="#AB9523"/>
-<path d="M10.5266 1.26343L10.5645 1.20508C-5.02366 8.53092 1.24605 22.9084 1.24605 22.9084C13.1057 26.0709 19.107 11.6351 19.107 11.6351C16.0786 10.5382 13.272 14.754 13.272 14.754C11.0751 17.511 8.84614 16.4461 8.21887 16.0581C8.10801 15.9881 8.04674 15.9414 8.04674 15.9414C4.42613 10.7307 10.0306 2.01031 10.5266 1.26343Z" fill="#C54322"/>
+<path d="M25.8635 17.7504C25.8635 17.7504 25.8014 17.7028 25.6863 17.6313C25.9048 19.8955 25.828 23.0938 24.1597 25.233C24.1597 25.233 20.1735 31.3678 12.9393 30.023C12.9393 30.023 9.24836 29.4429 8.49245 25.947L2.73755 25.9262C2.73755 25.9262 5.60467 31.9123 13.8015 33.6617C13.8015 33.6617 18.9156 34.8726 23.3566 32.7126C23.8467 31.9569 29.519 23.0641 25.8635 17.7504Z" fill="#5F7FB2"/>
+<path d="M32.7404 10.6456C20.7375 7.42049 14.6637 22.1418 14.6637 22.1418C17.7316 23.2604 20.5692 18.9613 20.5692 18.9613C22.7956 16.1497 25.0515 17.2357 25.6833 17.6314C25.7985 17.7028 25.8605 17.7504 25.8605 17.7504C29.516 23.0641 23.8438 31.9569 23.3418 32.7215L23.3034 32.7781C39.0829 25.3074 32.7404 10.6456 32.7404 10.6456Z" fill="#0C3872"/>
+<path d="M20.2118 0.339487C20.2118 0.339487 15.0947 -0.874392 10.6537 1.28858C10.1518 2.05023 4.47955 10.9431 8.13801 16.2568C8.13801 16.2568 8.20002 16.3044 8.31222 16.3758C8.09372 14.1117 8.17049 10.9133 9.83879 8.77714C9.83879 8.77714 13.828 2.63931 21.074 3.9841C21.074 3.9841 24.762 4.57914 25.5031 8.06012L31.261 8.08095C31.261 8.08095 28.4057 2.09783 20.2118 0.339487Z" fill="#D27A53"/>
+<path d="M10.6538 1.28869L10.6922 1.22919C-5.08435 8.6999 1.2611 23.3617 1.2611 23.3617C13.264 26.5868 19.3378 11.8655 19.3378 11.8655C16.2729 10.7468 13.4323 15.046 13.4323 15.046C11.2089 17.8576 8.95301 16.7716 8.31817 16.3759C8.20596 16.3045 8.14396 16.2569 8.14396 16.2569C4.4796 10.9432 10.1518 2.05034 10.6538 1.28869Z" fill="#C54322"/>
 </svg>

src/assets/svg-icons/common/arrow_down.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.54028 6.45964L4.45952 5.54041L7.9999 9.08079L11.5403 5.54041L12.4595 6.45964L7.9999 10.9193L3.54028 6.45964Z" fill="currentColor"/>
+</svg>

src/assets/svg-icons/common/arrow_right.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.46042 12.4592L5.54119 11.54L9.08157 7.99962L5.54119 4.45924L6.46042 3.54L10.92 7.99962L6.46042 12.4592Z" fill="currentColor"/>
+</svg>

src/assets/svg-icons/common/edit.svg

@@ -1,3 +1,8 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.4798 0.813167C12.5259 0.765411 12.5811 0.72732 12.6421 0.701116C12.7031 0.674911 12.7687 0.661118 12.8351 0.660541C12.9015 0.659964 12.9674 0.672615 13.0288 0.697756C13.0902 0.722896 13.1461 0.760023 13.193 0.806969C13.24 0.853915 13.2771 0.909741 13.3022 0.971189C13.3274 1.03264 13.34 1.09848 13.3394 1.16487C13.3389 1.23126 13.3251 1.29687 13.2989 1.35787C13.2727 1.41887 13.2346 1.47404 13.1868 1.52017L6.11632 8.59083C6.02255 8.68461 5.89536 8.73729 5.76274 8.73729C5.63012 8.73729 5.50293 8.68461 5.40916 8.59083C5.31538 8.49706 5.2627 8.36987 5.2627 8.23725C5.2627 8.10463 5.31538 7.97744 5.40916 7.88367L12.4798 0.813333V0.813167ZM12.3333 6C12.3333 5.86739 12.386 5.74021 12.4798 5.64645C12.5735 5.55268 12.7007 5.5 12.8333 5.5C12.9659 5.5 13.0931 5.55268 13.1869 5.64645C13.2806 5.74021 13.3333 5.86739 13.3333 6V11.5C13.3333 12.5125 12.5125 13.3333 11.5 13.3333H2.49999C1.48749 13.3333 0.666656 12.5125 0.666656 11.5V2.5C0.666656 1.4875 1.48749 0.666667 2.49999 0.666667H7.83332C7.96593 0.666667 8.09311 0.719345 8.18688 0.813113C8.28064 0.906881 8.33332 1.03406 8.33332 1.16667C8.33332 1.29927 8.28064 1.42645 8.18688 1.52022C8.09311 1.61399 7.96593 1.66667 7.83332 1.66667H2.49999C2.27898 1.66667 2.06701 1.75446 1.91073 1.91074C1.75445 2.06702 1.66666 2.27899 1.66666 2.5V11.5C1.66666 11.721 1.75445 11.933 1.91073 12.0893C2.06701 12.2455 2.27898 12.3333 2.49999 12.3333H11.5C11.721 12.3333 11.933 12.2455 12.0892 12.0893C12.2455 11.933 12.3333 11.721 12.3333 11.5V6Z" fill="#AB9523"/>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g opacity="0.9">
+<path d="M14.1321 4.95049L10.8888 1.70711L11.5959 1L14.8393 4.24338L14.1321 4.95049Z" fill="currentColor"/>
+<path d="M5.97196 13.1108L2.359 13.8334C2.14909 13.8754 1.96401 13.6903 2.00599 13.4804L2.72858 9.86742L10.0262 2.56982L13.2696 5.8132L5.97196 13.1108ZM11.8554 5.8132L10.0262 3.98403L3.64979 10.3604L3.19249 12.6469L5.47895 12.1896L11.8554 5.8132Z" fill="currentColor"/>
+<path d="M15 11H11V12H15V11Z" fill="currentColor"/>
+<path d="M15 13H8.5V14H15V13Z" fill="currentColor"/>
+</g>
 </svg>

src/assets/svg-icons/common/expand.svg

@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1.99951 3.98621L13.9989 4.00001L14.0001 3.00001L2.00066 2.98621L1.99951 3.98621Z" fill="#333333"/>
+<path d="M7.50009 8.50001H13.9995V7.50001H7.50009V8.50001Z" fill="#333333"/>
+<path d="M1.99951 12.9862L13.9989 13L14.0001 12L2.00066 11.9862L1.99951 12.9862Z" fill="#333333"/>
+<path d="M5.96675 7.59308C6.23342 7.79308 6.23342 8.19308 5.96675 8.39308L2.80009 10.7681C2.47047 11.0153 2.00009 10.7801 2.00009 10.3681L2.00009 5.61808C2.00009 5.20605 2.47047 4.97086 2.80009 5.21808L5.96675 7.59308ZM3.00009 6.61808L3.00009 9.36808L4.83342 7.99308L3.00009 6.61808Z" fill="#333333"/>
+</svg>

src/assets/svg-icons/common/fold.svg

@@ -0,0 +1,6 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15.7506 13.5155L2.25129 13.5L2.25 14.625L15.7493 14.6405L15.7506 13.5155Z" fill="#333333"/>
+<path d="M9.56246 8.4375L2.25065 8.4375L2.25065 9.5625L9.56246 9.5625V8.4375Z" fill="#333333"/>
+<path d="M15.7506 3.39053L2.25129 3.375L2.25 4.5L15.7493 4.51553L15.7506 3.39053Z" fill="#333333"/>
+<path d="M11.2875 9.4578C10.9875 9.2328 10.9875 8.7828 11.2875 8.5578L14.85 5.88593C15.2208 5.60781 15.75 5.8724 15.75 6.33593L15.75 11.6797C15.75 12.1432 15.2208 12.4078 14.85 12.1297L11.2875 9.4578ZM14.625 10.5547L14.625 7.46093L12.5625 9.0078L14.625 10.5547Z" fill="#333333"/>
+</svg>

src/assets/svg-icons/menu/dashboard.svg

@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.00004 11.0001V12.0001H10V11.0001H6.00004Z" fill="currentColor"/>
+<path d="M7.64648 1.64652C7.84175 1.45126 8.15833 1.45126 8.35359 1.64652L14.8536 8.14652L14.1465 8.85363L13 7.70718V13.5001C13 14.0524 12.5523 14.5001 12 14.5001H4.00004C3.44775 14.5001 3.00004 14.0524 3.00004 13.5001V7.70718L1.85359 8.85363L1.14648 8.14652L7.64648 1.64652ZM8.00004 2.70718L4.00004 6.70718V13.5001H12V6.70718L8.00004 2.70718Z" fill="currentColor"/>
+</svg>

src/assets/svg-icons/menu/financialMana.svg

@@ -1,3 +1,9 @@
-<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
-<path d="M10 0C4.48214 0 0 4.48214 0 10C0 15.5179 4.48214 20 10 20C15.5179 20 20 15.5179 20 10C20 4.48214 15.5179 0 10 0ZM10 18.5714C5.26786 18.5714 1.42857 14.7321 1.42857 10C1.42857 5.26786 5.26786 1.42857 10 1.42857C14.7321 1.42857 18.5714 5.26786 18.5714 10C18.5714 14.7321 14.7321 18.5714 10 18.5714ZM10.8036 8.57143H14.2857V10H10.7321V11.4286H14.2857V12.8571H10.7321V17.1786H9.30357V12.8571H5.71429V11.4286H9.30357V10H5.71429V8.57143H9.23214L5.98214 5.32143L7 4.30357L10.0357 7.33929L13.0714 4.30357L14.0893 5.32143L10.8036 8.57143Z" />
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0_2_332" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="16" height="16">
+<rect width="16" height="16" fill="#D9D9D9"/>
+</mask>
+<g mask="url(#mask0_2_332)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.79095 4L7.99998 5.76988L6.20901 4.00002L5.50191 4.69879L7.14835 6.32584H5.31207V7.31405H7.5V8.35225H5.31207V9.34047H7.5V12H8.5V9.34047H10.6879V8.35225H8.5V7.31405H10.6879V6.32584H8.85161L10.4981 4.69878L9.79095 4Z" fill="currentColor"/>
+<circle cx="8" cy="8" r="5.75" stroke="#333333"/>
+</g>
 </svg>

src/assets/svg-icons/menu/financialStatistics.svg

@@ -1,3 +1,9 @@
-<svg width="22" height="22" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
-<path d="M20.1026 15.144C20.0379 15.286 19.9194 15.3964 19.7732 15.451C19.6271 15.5056 19.4652 15.4999 19.3232 15.4352C19.1812 15.3704 19.0708 15.252 19.0162 15.1058C18.9616 14.9596 18.9673 14.7977 19.032 14.6558C19.925 12.6944 20.0693 10.4741 19.4376 8.41365C18.806 6.35323 17.4421 4.59521 15.6033 3.47127C13.7646 2.34734 11.578 1.9352 9.45629 2.31263C7.33454 2.69006 5.42427 3.83095 4.08589 5.52005C2.74752 7.20915 2.07359 9.32966 2.19125 11.4815C2.30891 13.6334 3.21002 15.6677 4.72458 17.2009C6.23914 18.734 8.26241 19.6598 10.4127 19.8036C12.5629 19.9474 14.6915 19.2994 16.3968 17.9817C16.5205 17.8929 16.6738 17.8556 16.8244 17.8775C16.9751 17.8995 17.1114 17.979 17.2046 18.0994C17.2979 18.2197 17.3408 18.3716 17.3244 18.523C17.3081 18.6743 17.2336 18.8135 17.1168 18.9111C15.1845 20.4051 12.7722 21.1403 10.3351 20.9779C7.89802 20.8155 5.60463 19.7667 3.88766 18.0295C2.1707 16.2924 1.14889 13.9868 1.01504 11.548C0.881185 9.10919 1.64455 6.7057 3.16109 4.79105C4.67763 2.87639 6.84247 1.58298 9.24716 1.15485C11.6518 0.726715 14.1301 1.19348 16.2142 2.46706C18.2984 3.74064 19.8444 5.73297 20.5605 8.06813C21.2766 10.4033 21.1133 12.9198 20.1014 15.1428L20.1026 15.144ZM9.49088 14.344L7.73089 11.2181L5.58971 14.1546C5.54414 14.217 5.48671 14.2698 5.42072 14.3101C5.35473 14.3503 5.28146 14.3771 5.2051 14.389C5.12873 14.4009 5.05077 14.3977 4.97567 14.3795C4.90056 14.3613 4.82978 14.3284 4.76736 14.2828C4.70494 14.2373 4.65212 14.1798 4.61189 14.1138C4.57167 14.0479 4.54484 13.9746 4.53293 13.8982C4.52102 13.8219 4.52427 13.7439 4.54249 13.6688C4.56071 13.5937 4.59355 13.5229 4.63913 13.4605L7.85912 9.04638L9.62971 12.1923L12.2356 8.7005L14.5062 11.637L17.0862 7.17815C17.1666 7.04779 17.2947 6.95394 17.4432 6.91656C17.5918 6.87918 17.7491 6.90122 17.8816 6.978C18.0141 7.05477 18.1115 7.18021 18.153 7.32766C18.1945 7.47511 18.1769 7.63293 18.1038 7.76756L14.6473 13.7428L12.2521 10.6452L9.49206 14.344H9.49088Z" stroke="#AB9523" stroke-width="0.3"/>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0_4_657" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="16" height="16">
+<rect width="16" height="16" fill="#D9D9D9"/>
+</mask>
+<g mask="url(#mask0_4_657)">
+<circle cx="8" cy="8" r="5.75" stroke="#333333"/>
+<path d="M4.5 10L6.15278 7.52274L7.08611 9.72728L8.58333 7.1591L9.86667 9.22727L11.5 6" stroke="#333333" stroke-linecap="round"/>
+</g>
 </svg>

src/assets/svg-icons/menu/recruitmentMana.svg

@@ -1,4 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
-<path d="M10 20C4.47708 20 0 15.5229 0 10C0 4.47708 4.47708 0 10 0C15.5229 0 20 4.47708 20 10C20 15.5229 15.5229 20 10 20ZM10 18.75C14.8325 18.75 18.75 14.8325 18.75 10C18.75 5.1675 14.8325 1.25 10 1.25C5.1675 1.25 1.25 5.1675 1.25 10C1.25 14.8325 5.1675 18.75 10 18.75Z" />
-<path d="M13.43 7.66988V6.88988H12.16V7.66988H13.43ZM13.43 8.99988V8.19988H12.16V8.99988H13.43ZM10.18 8.19988V8.99988H11.47V8.19988H10.18ZM10.18 6.88988V7.66988H11.47V6.88988H10.18ZM14.11 6.32988V9.54988H9.51997V6.32988H11.47V5.37988H12.16V6.32988H14.11ZM6.76997 12.1499L8.06997 11.8699V10.5599H6.76997V12.1499ZM8.06997 6.48988H6.76997V7.86988H8.06997V6.48988ZM6.76997 8.49988V9.92988H8.06997V8.49988H6.76997ZM9.28997 11.6099L9.33997 12.2599L8.73997 12.3899V14.4899H8.06997V12.5399C7.14997 12.7499 6.25997 12.9499 5.54997 13.1099L5.40997 12.4199C5.61997 12.3799 5.85997 12.3299 6.10997 12.2799V6.48988H5.48997V5.80988H9.31997V6.48988H8.73997V11.7299L9.28997 11.6099ZM14.57 10.8499H11.12C11.05 11.1499 10.96 11.4699 10.88 11.7499H14.06C14.06 11.7499 14.05 11.9599 14.03 12.0599C13.88 13.3699 13.74 13.9399 13.48 14.1799C13.29 14.3599 13.1 14.4099 12.8 14.4299C12.55 14.4499 12.02 14.4399 11.48 14.4199C11.46 14.1999 11.38 13.9299 11.25 13.7399C11.79 13.7899 12.33 13.7999 12.53 13.7999C12.71 13.7999 12.82 13.7899 12.9 13.7099C13.06 13.5799 13.18 13.1999 13.29 12.3699H9.92997C10.09 11.9499 10.25 11.3899 10.39 10.8499H9.05997V10.2199H14.57V10.8499Z"/>
-</svg>

src/layout/headerBar/breadcrumb.vue

@@ -34,8 +34,9 @@
 
 <template>
   <el-breadcrumb class="header-breadcrumb">
-    <el-breadcrumb-item v-for="(item,index) in route.matched" :key="item.path">
-      <span v-if="index!=(route.matched.length-1)" class="canClick" @click.stop="routeClick(item)">
+    <!-- 判断route.meta.first_level_menu 为了面包屑中在一级路由时只显示一个标题 -->
+    <el-breadcrumb-item v-for="(item,index) in route.meta.first_level_menu?route.matched.slice(0,1):route.matched" :key="item.path">
+      <span v-if="index!=(route.matched.length-1) && !route.meta.first_level_menu" class="canClick" @click.stop="routeClick(item)">
         {{ item.meta.title }}
       </span>
       <span v-else style="font-size:16px;">{{ item.meta.title }}</span>

src/layout/headerBar/index.vue

@@ -33,9 +33,9 @@
     <div id="headerBar-container" :style="{left:isCollapse?'70px':''}">
       <div class="headerBar-left">
         <div class="coll_btn" @click="collapseHandler">
-          <el-icon size="22px" color="#606266">
-            <Expand v-show="!isCollapse" />
-            <Fold v-show="isCollapse" />
+          <el-icon size="18px" color="#606266">
+            <svg-Icon name="svgIcon-common-fold" v-show="!isCollapse"></svg-Icon>
+            <svg-Icon name="svgIcon-common-expand" v-show="isCollapse"></svg-Icon>
           </el-icon>
         </div>
         <breadcrumb />
@@ -83,7 +83,7 @@
       align-items: center;
       .coll_btn{
         cursor: pointer;
-        margin-right: 20px;
+        margin-right: 8px;
         display: flex;
         align-items: center;
       }

src/layout/sideBar/sidebarItem.vue

@@ -41,7 +41,7 @@ const resolvePath=(path)=>{
             <a :href="`${item.path}/index`" 
             :style="`display: block;color:${item.path+'/index'===active ? '#fff ' : '#666'}`" 
             @click="(e) => e.preventDefault() ">
-              <el-icon size="24px" style="margin-right: 10px;">
+              <el-icon size="16px" style="margin-right: 10px;">
                 <svg-Icon v-if="item.meta.icon_path.startsWith('svgIcon')" :name="item.meta.icon_path"
                 :color="item.path+'/index'===active?'#fff':'#666'" />
                 <component :is="item.meta.icon_path" v-else />
@@ -53,7 +53,7 @@ const resolvePath=(path)=>{
         <template v-else>
           <el-sub-menu :index="resolvePath(item.path)" >
             <template #title>
-              <el-icon size="24px" style="margin-right: 10px;" 
+              <el-icon size="16px" style="margin-right: 10px;" 
               :style="{'color':item.children.some(child => resolvePath(child.path)===active)?'var(--themeColor)':'#666'}">
                 <svg-Icon v-if="item.meta.icon_path.startsWith('svgIcon')" :name="item.meta.icon_path"
                 :color="item.children.some(child => resolvePath(child.path)===active)?'var(--themeColor)':'#666'" />

src/permission.js

@@ -32,6 +32,7 @@ router.beforeEach(async (to,from,next)=>{
         return 
       }
     }
+    console.log(to);
     if(store.getters.permissionButtons.length == 0){
       // 获取权限按钮
       await store.dispatch('router/getPermissionButtons') 
@@ -43,6 +44,18 @@ router.beforeEach(async (to,from,next)=>{
     }else{
       console.log('拦截');
       await store.dispatch('router/setRoutes')
+      // 特殊的重定向
+      if(to.path == '/redirctPage'){
+        if(router.getRoutes().findIndex(item => item.path=='/dashboard/index')!=-1){
+          // 有首页的路由权限
+          next({path:'/dashboard/index',replace:true})
+        }else{
+          // 没有首页路由的权限
+          next({path:'/financial/list',replace:true})
+        }
+        return 
+      }
+
       next({...to,replace:true})
     }
   }else{

src/store/modules/router.js

@@ -8,6 +8,8 @@ const hiddenArray=[false,true]
 const routeAllPathToCompMap = import.meta.glob(`@/views/**/*.vue`)
 // console.log(routeAllPathToCompMap);
 
+let count=0
+
 const routeHandle=(route,path='index')=>{
   path = path.startsWith('/')?path.substring(1):path
   if(route.component){
@@ -26,6 +28,7 @@ const routeHandle=(route,path='index')=>{
   }else{
     if(route.children && route.children.length>0){
       route.children = route.children.map(item=>{
+        count++
         return routeHandle(item,item.path)
       })
       return route.children
@@ -57,6 +60,7 @@ export default {
           routesData.map(item=>{
             let afterHandlePath = item.path.startsWith('/')?item.path:'/'+item.path
             if(item.hidden_layout==0){
+              count=0
               let afterHandle = routeHandle(Object.assign({},item))
               // console.log(afterHandle);
               // 判断 afterHandle 是不是数组
@@ -73,7 +77,9 @@ export default {
                 meta:{
                   title:item.name,
                   icon_path:item.icon_path,
-                  type:!flag?'menu':'content'
+                  type:!flag?'menu':'content',
+                  // 是否是一级路由
+                  first_level_menu:count===0?true:false
                 },
                 children:!flag?[afterHandle]:afterHandle
               })

src/styles/main.scss

@@ -126,7 +126,7 @@ div::-webkit-scrollbar-corner {
 // 表格头部
 .el-table__header{
   .cell{
-    font-weight: 400;
+    font-weight: 600;
     color: #333333;
   }
 }
@@ -134,6 +134,23 @@ div::-webkit-scrollbar-corner {
   td.el-table__cell{
     div{
       color: #666666;
+
+    }
+  }
+  .sort-caret.descending{
+    border-top-color:#333333!important;
+  }
+  .sort-caret.ascending{
+    border-bottom-color:#333333!important;
+  }
+  .descending{
+    .sort-caret.descending{
+      border-top-color:$themeColor!important;
+    }
+  }
+  .ascending{
+    .sort-caret.ascending{
+      border-bottom-color:$themeColor!important;
     }
   }
 }

src/views/Login.vue

@@ -52,7 +52,8 @@
 						localStorage.setItem('account',Base64.encode(login.ruleForm.account))
 						localStorage.setItem('checkPass',Base64.encode(login.ruleForm.checkPass))
 					}
-					router.replace('/')
+					// 特殊需求 /redirctPage 根据权限跳转，有首页跳首页，没有跳财务列表
+					router.replace('/redirctPage')
 				})
 			}
 		})

src/views/dashboard/index.vue

@@ -0,0 +1,180 @@
+<script setup>
+
+  import {getStatistic} from '@/api/dashboard'
+  import * as echarts from 'echarts/core';
+  // 引入柱状图图表，图表后缀都为 Chart
+  import { BarChart } from 'echarts/charts';
+  // 引入提示框，标题，直角坐标系，数据集，内置数据转换器组件，组件后缀都为 Component
+  import {
+    TitleComponent,
+    TooltipComponent,
+    GridComponent,
+    DatasetComponent,
+    LegendComponent
+  } from 'echarts/components';
+  // 标签自动布局、全局过渡动画等特性
+  import { LabelLayout, UniversalTransition } from 'echarts/features';
+  // 引入 Canvas 渲染器，注意引入 CanvasRenderer 或者 SVGRenderer 是必须的一步
+  import { CanvasRenderer } from 'echarts/renderers';
+
+  import {useRouter} from 'vue-router'
+
+  // 注册必须的组件
+  echarts.use([
+    TitleComponent,
+    TooltipComponent,
+    GridComponent,
+    DatasetComponent,
+    LegendComponent,
+    BarChart,
+    LabelLayout,
+    UniversalTransition,
+    CanvasRenderer
+  ]);
+  
+  const router = useRouter()
+
+  const barChartRef = ref(null)
+  let barChart = null
+
+  const paymentNavigator=()=>{
+    // 去往商品到款统计页面
+    router.push('/financialStatistics/commodityPayment')
+  }
+
+  const resizeChart=()=>{
+    barChart.resize();
+  }
+
+  const getChartData=()=>{
+    getStatistic().then(res=>{
+      nextTick(()=>{
+        chartDraw(res.data.ContractMoney || [],res.data.ArrivalMoney || [],res.data.Date || [])
+      })
+    })
+  }
+
+  const chartDraw=(invoiceData,placementData,dateData)=>{
+    // console.log(barChartRef.value);
+    barChart = echarts.init(barChartRef.value)
+    barChart.setOption({
+      title: {
+        text:'开票到款统计图',
+        textStyle:{
+          fontSize:20,
+          fontWeight:500
+        },
+        left:'center'
+      },
+      legend:{
+        icon:'circle',
+        left:'center',
+        top:40,
+        textStyle:{
+          fontSize:14
+        },
+        itemGap:34,
+        itemWidth:12
+      },
+      tooltip:{
+        textStyle:{
+          align:'left'
+        }
+      },
+      grid:{
+        top:120
+      },
+      color: ['#FF903E', '#FBE947'],
+      xAxis:{
+        type: 'category',
+        data:dateData,
+        axisLabel: {
+          color: '#999', //更改坐标轴文字颜色
+          fontSize: 14, //更改坐标轴文字大小
+        },
+      },
+      yAxis: {
+        name:'万元',
+        type: 'value',
+        nameGap:20,
+        splitNumber:10,
+        nameTextStyle:{
+          align:'right',
+          color:'#999'
+        },
+        axisLabel:{
+          color:'#999',
+          formatter:(value)=>{
+            return value/10000
+          }
+        }
+      },
+      series:[{
+        data: invoiceData,
+        type: 'bar',
+        name:'开票金额'
+      },
+      {
+        data: placementData,
+        type: 'bar',
+        name:'到款金额'
+      }]
+    })
+    window.addEventListener('resize', resizeChart);
+  }
+
+  onUnmounted(()=>{
+    barChart?.dispose()
+    window.removeEventListener('resize', resizeChart);
+  })
+
+  onMounted(()=>{
+    getChartData()
+  })
+
+
+</script>
+
+<template>
+    <div id="dashboard-index-container">
+      <div class="data-detail" >
+        <span @click="paymentNavigator" v-permission="'dashboard/index/dataDetail'">
+          查看数据详情
+          <el-icon size="16px" color="var(--themeColor)" >
+            <svg-Icon name="svgIcon-common-arrow_right"></svg-Icon>
+          </el-icon>
+        </span>
+      </div>
+      <div ref="barChartRef" class="bar-chart"></div>
+    </div>
+</template>
+  
+<style lang="scss" scoped>
+  #dashboard-index-container{
+    background-color: white;
+    height: calc(100vh - 120px);
+    padding: 30px;
+    box-sizing: border-box;
+    text-align: right;
+    .data-detail{
+      display: flex;
+      // align-items: center;
+      justify-content: flex-end;
+      margin-bottom: 30px;
+      span{
+        display: inline-flex;
+        align-items: center;
+        color: $themeColor;
+        font-size: 14px;
+        cursor: pointer;
+        line-height: 22px;
+        i{
+          margin-left: 4px;
+        }
+      }
+    }
+    .bar-chart{
+      height: calc(100% - 52px) 
+    }
+  }
+</style>

src/views/financialManagement/components/permissionQyDia.vue

@@ -0,0 +1,181 @@
+
+<script setup>
+  
+  const props=defineProps({
+    visible:{
+      type:Boolean,
+      default:false
+    },
+    hasCheckedPermission:{
+      type:Array,
+      default:()=>[]
+    },
+    permissionData:{
+      type:Array,
+      default:()=>[]
+    },
+    // view - 查看 edit - 编辑
+    type:{
+      type:String,
+      default:'view'
+    },
+    // 1-权益大套餐 2-行业套餐
+    serviceType:{
+      type:Number,
+      default:1
+    }
+  })
+
+  const emits=defineEmits(['update:visible','selectFinish'])
+
+  const permissionDia=reactive({
+    permissionChecked:[],
+    qyBigService:''
+  })
+
+  watch(()=>props.visible,(newVal)=>{
+    // console.log(newVal);
+    if(newVal){
+      // 初始化
+      if(props.serviceType==1){
+        permissionDia.qyBigService=props.hasCheckedPermission[0]
+      }else{
+        props.permissionData.length>0&&props.permissionData.map(item=>{
+          item.check_list = [];
+          item.checked = false;
+          item.indeterminate = false;
+          item.children?.map(it => {
+            it.checked=false
+          })
+        })
+        // permissionDia.permissionChecked=[...props.hasCheckedPermission]
+        U:for (let i = 0,len=props.hasCheckedPermission.length; i < len; i++) {
+          const permission_id = +props.hasCheckedPermission[i];
+          for (let j = 0,jLen=props.permissionData.length; j < jLen; j++) {
+            const element = props.permissionData[j];
+            let index=element.children.findIndex(it => it.service_template_id==permission_id)
+            // console.log(index);
+            if(index!=-1){
+              element.children[index].checked=true
+              element.check_list.push(permission_id)
+              continue U
+            }
+          }
+        }
+        props.permissionData.map(item=>{
+          permissionCheckedChange(item)
+        })
+      }
+    }
+  },{immediately:true})
+
+  // -------method
+  const permissionCheckedChange=(e)=>{
+    e.checked = e.check_list.length == e.children.length
+    e.indeterminate = e.check_list.length>0 && e.check_list.length < e.children.length
+  }
+  const permissionAllChecked=(e)=>{
+    let arr = e.children.map((item) => {
+      return item.service_template_id;
+    });
+    e.check_list = e.checked ? arr : [];
+    e.indeterminate = false;
+  }
+ 
+  const submit=()=>{
+    permissionDia.permissionChecked=[]
+    if(props.serviceType==1 && !permissionDia.qyBigService){
+      ElMessage.warning('请选择权益大套餐品种')
+      return 
+    }
+    if(props.serviceType==2){
+      props.permissionData.map(item =>{
+        permissionDia.permissionChecked=[...permissionDia.permissionChecked,...item.check_list]
+      })
+    }
+    emits('selectFinish',props.serviceType==1?[permissionDia.qyBigService]: permissionDia.permissionChecked)
+    closeDia()
+  }
+
+  const closeDia=()=>{
+    emits('update:visible',false)
+  }
+
+  // --------------created
+</script>
+
+<template>
+  <div id="permission-qy-container">
+    <el-dialog title="选择品种" :model-value="props.visible"
+    :close-on-click-modal="false" width="360" @close="closeDia">
+      <div class="variety-big-box" v-show='props.serviceType==1'>
+        <el-radio model-value="权益大套餐" label="权益大套餐" :disabled="props.type=='view'">
+          <span class="first-level">权益大套餐：</span>
+        </el-radio>
+        <el-radio-group v-model="permissionDia.qyBigService" :disabled="props.type=='view'">
+          <el-radio :label="item.service_template_id" v-for="item in props.permissionData" 
+          :key="item.service_template_id" >{{ item.title }}</el-radio>
+        </el-radio-group>
+      </div>
+      <div class="variety-small-box" v-show='props.serviceType==2'>
+        <div v-for="item in props.permissionData" class="variety-item" :key="item.service_template_id" >
+          <el-checkbox v-model="item.checked" :indeterminate="item.check_list?.length>0 && item.check_list?.length < item.children?.length" 
+            @change="permissionAllChecked(item)" :disabled="props.type=='view'">
+            <span class="first-level">{{item.title}}：</span>
+          </el-checkbox>
+          <el-checkbox-group v-model="item.check_list" @change="permissionCheckedChange(item)" :disabled="props.type=='view'">
+            <el-checkbox :label="it.service_template_id" v-for="it in item.children" :key="it.service_template_id">{{it.title}}</el-checkbox>
+          </el-checkbox-group>
+        </div>
+      </div>
+      <template #footer v-if="props.type!='view'">
+        <div class="permission-buttons-zone">
+          <el-button @click="closeDia" style="background-color: #F5F7FA;border:none;color:var(--mainTextColor) ;">取消</el-button>
+          <el-button type="primary" @click="submit" style="color: white;margin-left: 30px;">保存</el-button>
+        </div>
+      </template> 
+    </el-dialog>
+  </div>
+</template>
+  
+  
+<style lang="scss" scoped>
+    .variety-big-box{
+      margin-right: -20px;
+      display: flex;
+      justify-content: center;
+    }
+    .variety-small-box{
+      // display: flex;
+      // justify-content: center;
+      // flex-wrap: wrap;
+      padding-left: 56px;
+      .variety-item{
+        display:flex;
+        justify-content: start;
+        margin: 0 auto;
+      }
+    }
+    .first-level{
+      font-weight: bold;
+    }
+    .permission-buttons-zone{
+      padding-bottom: 20px;
+    }
+</style>
+<style lang="scss">
+  #permission-qy-container{
+    .el-checkbox{
+      margin-right: 22px;
+    }
+    // .el-checkbox-group{
+    //   margin-right:-22px ;
+      // .el-checkbox{
+      //   margin-right: 22px;
+      // }
+    // }
+    .el-radio{
+      margin-right: 20px;
+    }
+  }
+</style>

src/views/financialManagement/composition/IandPList.js

@@ -3,8 +3,13 @@ import {useRouter} from 'vue-router'
 import {getIandPList} from '@/api/financialMana'
 import { downloadByFlow } from '@/utils/common-methods'
 export default function getIandPListCom(type) {
+  const moment = inject('$moment')
   const router = useRouter()
 
+  const dateButtonData=[{text:'本月',tabId:1},{text:'上月',tabId:2},{text:'前月',tabId:3}]
+
+  const serviceTypeArray=[{label:'FICC套餐',value:1},{label:'权益套餐',value:2}]
+
   const placement=reactive({
     searchParams:{
       current:1,
@@ -15,13 +20,16 @@ export default function getIandPListCom(type) {
       min_amount:'',
       max_amount:'',
       invoice_type:type,
+      seller_ids:'',
+      service_product_id:'',
       is_export:0
     },
     dateRange:[],
     tableData:[],
     total:0,
     amountTotal:0,
-    countryAmountList:[]
+    countryAmountList:[],
+    currentDateTab:0
   })
 
 
@@ -47,7 +55,7 @@ export default function getIandPListCom(type) {
   }
   
   const searchPlacement=()=>{
-    console.log('search');
+    // console.log('search');
     placement.searchParams.current = 1
     placementList()
   }
@@ -94,6 +102,19 @@ export default function getIandPListCom(type) {
       ElMessage.warning('开始金额不能大于结束金额')
     }
   }
+  // 切换日期 本月、上月、前月
+  const changeDateType=(tabId)=>{
+    if(placement.currentDateTab==tabId) return
+    placement.currentDateTab=tabId
+    if(tabId==1){
+      // 本月指 本月初 至 今天
+      placement.dateRange=[moment().subtract((tabId-1), 'months').startOf('month').format('YYYY-MM-DD'),
+      moment(new Date()).format('YYYY-MM-DD')]
+    }else{
+      placement.dateRange=[moment().subtract((tabId-1), 'months').startOf('month').format('YYYY-MM-DD'),
+      moment().subtract((tabId-1), 'months').endOf('month').format('YYYY-MM-DD')]
+    }
+  }
 
   // 切换每页的数量
   const changePageSize=(pageSize)=>{
@@ -106,6 +127,10 @@ export default function getIandPListCom(type) {
   }
   
   const placementDetail=(row,detailType)=>{
+    if(row.contract_status == 4){
+      // 已终止 不允许开票和到款 模式改成查看
+      detailType='view'
+    }
     router.push({path:'/financial/list/contractProgress',query:{type:detailType,complianceId:row.contract_register_id}})
   }
   const placementExport=()=>{
@@ -114,8 +139,10 @@ export default function getIandPListCom(type) {
       downloadByFlow(res,'xlxs',fileName)
     })
   }
+
   return {
     data:placement,
+    dateButtonData,
     placementList,
     searchPlacement,
     moneyChange,
@@ -123,6 +150,8 @@ export default function getIandPListCom(type) {
     placementDetail,
     changePageNo,
     changePageSize,
-    checkMoney
+    checkMoney,
+    changeDateType,
+    serviceTypeArray
   }
 }

src/views/financialManagement/financialList.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { Search } from '@element-plus/icons-vue'
 import {useRouter,useRoute} from 'vue-router'
-import {getServiceList,getRegisterList,updateRegisterStatus,
+import {getSimpleServiceList,getRegisterList,updateRegisterStatus,
   registerDelete,registerListExport,importDataApi} from '@/api/financialMana'
 import {downloadByFlow} from '@/utils/common-methods'
 
@@ -9,7 +9,7 @@ const router = useRouter()
 const route = useRoute()
 const changeStatusForm=ref(null)
 const contractTypeArray=[{id:1,label:"新签合同"},{id:2,label:"续约合同"},{id:3,label:"代付合同"},{id:4,label:"补充协议"}]
-const contractStatusArray=[{id:1,label:"已审批"},{id:2,label:"单章寄出"},{id:3,label:"已签回"}]
+const contractStatusArray=[{id:1,label:"已审批"},{id:2,label:"单章寄出"},{id:3,label:"已签回"},{id:4,label:"已终止"},{id:5,label:"邮件备案"}]
 const statusArray=[{id:1,label:"进行中"},{id:2,label:"已完成"}]
 
   const financial=reactive({
@@ -17,7 +17,7 @@ const statusArray=[{id:1,label:"进行中"},{id:2,label:"已完成"}]
       keyword:'',
       start_date:'',
       end_date:'',
-      service_type:'',
+      service_types:'',
       register_status:'',
       contract_type:'',
       page_size:10,
@@ -67,7 +67,8 @@ const statusArray=[{id:1,label:"进行中"},{id:2,label:"已完成"}]
 //  --------------------------method
   //获取套餐列表
   const getServiceListFun=()=>{
-    getServiceList().then(res=>{
+    getSimpleServiceList().then(res=>{
+      // console.log(res);
       financial.serviceTypeArray=res.data || []
     })
   }
@@ -88,6 +89,12 @@ const statusArray=[{id:1,label:"进行中"},{id:2,label:"已完成"}]
     financial.searchParams.current = pageNo
     financialList()
   }
+
+  const serviceTypeChange=(value)=>{
+    financial.searchParams.service_types=value.join(',')
+    searchFinancial()
+  }
+
   const searchFinancial=()=>{
     financial.searchParams.current = 1
     financialList()
@@ -190,10 +197,13 @@ const statusArray=[{id:1,label:"进行中"},{id:2,label:"已完成"}]
     }).catch(()=>{})
   }
   //  ---------------------created
-  getServiceListFun()
-  financialList()
-  // 获取sessionStorage里面储存的表格选中列项
-  financial.tabelColumnShowArr=sessionStorage.getItem('financialListColumn')?sessionStorage.getItem('financialListColumn').split(','):[]
+  // 由于三级路由还是在当前页面，所以判断路径，避免重复请求
+  if(route.path=='/financial/list'){
+    getServiceListFun()
+    financialList()
+    // 获取sessionStorage里面储存的表格选中列项
+    financial.tabelColumnShowArr=sessionStorage.getItem('financialListColumn')?sessionStorage.getItem('financialListColumn').split(','):[]
+  }
 </script>
 
 <template>
@@ -204,31 +214,40 @@ const statusArray=[{id:1,label:"进行中"},{id:2,label:"已完成"}]
           <!-- 搜索区域 -->
           <div class="financial-search-zone">
             <el-input v-model="financial.searchParams.keyword" placeholder="合同编号/客户姓名/销售/实际使用方" :prefix-icon="Search"
-            style="width: 286px;margin-bottom: 8px;" @input="searchFinancial" clearable />
+            style="width: 340px;margin-bottom: 8px;" @input="searchFinancial" clearable />
             <el-date-picker v-model="financial.createtime" start-placeholder="登记日期-开始"
-            end-placeholder="登记日期-结束" style="margin-right: 30px;max-width: 286px;margin-bottom: 8px;"
+            end-placeholder="登记日期-结束" style="margin-right: 30px;max-width: 240px;margin-bottom: 8px;"
             value-format="YYYY-MM-DD" type="daterange"></el-date-picker>
-            <el-select v-model="financial.searchParams.service_type" placeholder="请选择套餐类型" clearable
+            <!-- <el-select v-model="financial.searchParams.service_type" placeholder="请选择套餐类型" clearable
             @change="searchFinancial" style="width: 286px;margin-bottom: 8px;">
               <el-option v-for="item in financial.serviceTypeArray" :key="item.service_template_id"
               :label="item.title" :value="item.service_template_id"></el-option>
-            </el-select>
+            </el-select> -->
+            <el-cascader :options="financial.serviceTypeArray" style="width: 240px;margin-bottom: 8px;margin-right: 30px;"
+              @change="serviceTypeChange"
+             placeholder="请选择套餐" clearable collapse-tags :show-all-levels="false"
+            :props="{multiple:true,label:'title',value:'service_template_id',children:'children',emitPath:false}">
+            </el-cascader>
             <el-select v-model="financial.searchParams.contract_type" placeholder="请选择合同类型" clearable
-            @change="searchFinancial" style="width: 286px;margin-bottom: 8px;">
+            @change="searchFinancial" style="width: 240px;margin-bottom: 8px;">
               <el-option :label="item.label" :value="item.id" v-for="item in contractTypeArray" :key="item.id"></el-option>
             </el-select>
             <el-select v-model="financial.searchParams.register_status" placeholder="请选择登记状态" clearable
-            @change="searchFinancial" style="width: 286px;margin-bottom: 8px;">
+            @change="searchFinancial" style="width: 240px;margin-bottom: 8px;">
               <el-option :label="item.label" :value="item.id" v-for="item in statusArray" :key="item.id"></el-option>
             </el-select>
           </div>
           <!-- 顶部按钮区域 -->
           <div class="financial-top-option-zone">
-              <el-button type="primary" size="large" style="width: 130px;margin-right: 30px;" v-permission="'financial:list:complianceAdd'"
-              @click="registration('compliance')">合规登记</el-button>
+              <div>
+                <el-button type="primary" size="large" v-permission="'financial:list:complianceAdd'"
+                @click="registration('compliance')" class="element-common-button" style="color: white;">合规登记</el-button>
+                <!-- <el-button type="primary" size="large" style="margin-left: 0;color: white;"
+                @click="router.push('/financial/placementPre')" class="element-common-button">到款预登记</el-button> -->
+              </div>
               <div class="financial-top-option-zone-right">
-                <a href="https://hzstatic.hzinsights.com/static/fms/excel/财务列表-导入模板.xlsx" download>
-                  <el-button class="element-common-button" size="large" style="margin-right: 30px;" 
+                <a href="https://hzchart.oss-cn-shanghai.aliyuncs.com/static/fms/excel/财务列表-导入模版（新）.xlsx" download>
+                  <el-button class="element-common-button" size="large"
                   v-permission="'financial:list:complianceImport'">下载导入模版</el-button>
                 </a>
                 <el-upload
@@ -239,9 +258,9 @@ const statusArray=[{id:1,label:"进行中"},{id:2,label:"已完成"}]
                   v-permission="'financial:list:complianceImport'"
                 >
                   <el-button size="large" :loading="financial.importLoading"
-                  style="margin-right:30px;" class="element-common-button" >导入</el-button>
+                  class="element-common-button" >导入</el-button>
                 </el-upload>
-                <el-button @click="exportData" size="large" class="element-common-button" >导出</el-button>
+                <el-button @click="exportData" size="large" class="element-common-button" style="margin-right: 0;" >导出</el-button>
               </div>              
           </div>
           <div class="financial-table-zone">
@@ -251,7 +270,11 @@ const statusArray=[{id:1,label:"进行中"},{id:2,label:"已完成"}]
               prop="contract_code" fixed="left" min-width="150"></el-table-column>
               <el-table-column label="客户名称" align="center" prop="company_name"
               show-overflow-tooltip min-width="120"></el-table-column>
-              <el-table-column label="销售" align="center" prop="seller_name" width="120"></el-table-column>
+              <el-table-column label="销售" align="center" prop="seller_name" width="120">
+                <template #default="{row}">
+                  {{ row.seller_name+(row.seller_name&&row.rai_seller_name?`、`:'')+row.rai_seller_name }}
+                </template>
+              </el-table-column>
               <el-table-column label="合同类型" align="center" width="90" prop="contract_type"
               v-if="financial.tabelColumnShowArr.includes('contract_type')">
                 <template #default="{row}">
@@ -333,11 +356,11 @@ const statusArray=[{id:1,label:"进行中"},{id:2,label:"已完成"}]
                         删除
                       </span>
                       <span class="table-option-buttons" v-permission="'financial:list:invoice'"
-                      @click="registration('invoice',row.contract_register_id)" v-if="row.has_payment!=1">
+                      @click="registration('invoice',row.contract_register_id)" v-if="row.has_payment!=1 && row.contract_status!=4">
                         开票登记
                       </span>
                       <span class="table-option-buttons" v-permission="'financial:list:placement'"
-                      @click="registration('placement',row.contract_register_id)" v-if="row.has_payment!=1">
+                      @click="registration('placement',row.contract_register_id)" v-if="row.has_payment!=1 && row.contract_status!=4">
                         到款登记
                       </span>
                       <span class="table-option-buttons" @click="changeContractStatus(row)">
@@ -420,6 +443,11 @@ const statusArray=[{id:1,label:"进行中"},{id:2,label:"已完成"}]
       .financial-top-option-zone-right{
         display: flex;
       }
+      .element-common-button{
+        width: 118px;
+        margin-right: 30px;
+        font-size: 14px;
+      }
     }
     .financial-table-zone{
       margin-top: 20px;

src/views/financialManagement/invoice/invoiceList.vue

@@ -1,26 +1,55 @@
 <script setup>
-
+import {getSellerList} from '@/api/crm'
 import getCom from '../composition/IandPList'
 import '../style/iandPList.scss'
 
 const invoice=getCom(1)
 const data = invoice.data
 
+const sellerArray=ref([])
+
+const sellerChange=(value)=>{
+  data.searchParams.seller_ids = value.join(',')
+  invoice.searchPlacement()
+}
+
+const getSellerListFun=()=>{
+  getSellerList().then(res=>{
+    sellerArray.value = res.data?.all_list || []
+    // console.log(res);
+  })
+}
 // --------created
+getSellerListFun()
 invoice.placementList()
 
+
+
 </script>
 
 <template>
     <div id="iandP-list-container">
       <div class="iandP-search-zone">
         <div class="iandP-search-box">
-          <el-input v-model="data.searchParams.contract_code" placeholder="请输入合同编号/销售"
-          style="width: 309px;margin-left: 40px;margin-bottom: 8px;" clearable @input="invoice.searchPlacement" ></el-input>
-          <el-date-picker v-model="data.dateRange" start-placeholder="起始日期"
-            end-placeholder="结束日期" style="margin-left: 40px;max-width: 321px;margin-bottom: 8px;"
-            value-format="YYYY-MM-DD" type="daterange" ></el-date-picker>
-          <div style="margin-left: 40px;margin-bottom: 8px;">
+          <el-input v-model="data.searchParams.contract_code" placeholder="请输入合同编号"
+          class="iandP-search-item" clearable @input="invoice.searchPlacement" ></el-input>
+          <el-cascader :options="sellerArray" class="iandP-search-item" filterable 
+             @change="sellerChange" placeholder="请选择销售" clearable collapse-tags :show-all-levels="false"
+            :props="{multiple:true,label:'seller_name',value:'seller_id',children:'child',emitPath:false}">
+          </el-cascader>
+          <el-select v-model="data.searchParams.service_product_id" placeholder="请选择套餐类型" clearable
+          @change="invoice.searchPlacement" class="iandP-search-item">
+            <el-option v-for="item in invoice.serviceTypeArray" :key="item.value"
+            :label="item.label" :value="item.value"></el-option>
+          </el-select>
+          <div class="date-box">
+            <el-date-picker v-model="data.dateRange" start-placeholder="起始日期"
+            end-placeholder="结束日期" style="max-width: 240px;margin-right: 20px;"
+            value-format="YYYY-MM-DD" type="daterange" @change="data.currentDateTab=0"></el-date-picker>
+            <el-button v-for="item in invoice.dateButtonData" class="date-button"
+            :key="item.tabId" :class="data.currentDateTab==item.tabId?'selectTab':''" @click="invoice.changeDateType(item.tabId)">{{ item.text }}</el-button>
+          </div>
+          <div style="margin-left: 30px;margin-bottom: 8px;">
             开票金额
             <el-input v-model.trim="data.searchParams.min_amount" @blur="invoice.checkMoney"
             @input="(value)=>invoice.moneyChange(value,'min_amount')" style="width: 104px;margin:0 8px" clearable></el-input>
@@ -37,14 +66,14 @@ invoice.placementList()
             <div class="iandP-amout-box">
               <div class="iandP-amout-box-text">
                 <span>已开票合计金额（换算后）</span>
-                <span>{{ data.amountTotal }}（元）</span>
+                <span>{{ data.amountTotal }}（CNY）</span>
               </div>
-              <svg-Icon name="svgIcon-financial-calculation" size="40" />
+              <svg-Icon name="svgIcon-financial-calculation" size="40" style="min-width: 40px;" />
             </div>
             <div class="iandP-amout-box" v-for="item in data.countryAmountList" :key="item.code">
               <div class="iandP-amout-box-text">
-                <span>{{ item.name }}</span>
-                <span>{{ item.amount }}（{{ item.unit_name }}）</span>
+                <span>{{ item.name }}（{{ item.code }}）</span>
+                <span>{{ item.amount }}</span>
               </div>
               <img :src="item.flag_img" style="height: 40px;width: 40px;" />
             </div>
@@ -54,6 +83,11 @@ invoice.placementList()
         <!-- 表格 -->
         <el-table :data="data.tableData" border max-height="560px" size="default" style="position: sticky;"> 
           <el-table-column label="合同编号" align="center" prop="contract_code" show-overflow-tooltip></el-table-column>
+          <el-table-column label="套餐类型" align="center" prop="service_product_id">
+            <template #default="{row}">
+              {{ invoice.serviceTypeArray[row.service_product_id-1]?.label }}
+            </template>
+          </el-table-column>
           <el-table-column label="开票金额" align="center" prop="origin_amount" show-overflow-tooltip></el-table-column>
           <el-table-column label="金额单位" align="center" prop="unit_name"></el-table-column>
           <el-table-column label="换算金额（元）" align="center" prop="amount" show-overflow-tooltip></el-table-column>

src/views/financialManagement/placement/placementList.vue

@@ -17,12 +17,21 @@ placement.placementList()
     <div id="iandP-list-container">
       <div class="iandP-search-zone">
         <div class="iandP-search-box">
-          <el-input v-model="data.searchParams.contract_code" placeholder="请输入合同编号"
-          style="width: 309px;margin-left: 40px;margin-bottom: 8px;" clearable @input="placement.searchPlacement" ></el-input>
-          <el-date-picker v-model="data.dateRange" start-placeholder="起始日期"
-            end-placeholder="结束日期" style="margin-left: 40px;max-width: 321px;margin-bottom: 8px;"
-            value-format="YYYY-MM-DD" type="daterange" ></el-date-picker>
-          <div style="margin-left: 40px;margin-bottom: 8px;">
+          <el-input v-model="data.searchParams.contract_code" placeholder="请输入合同编号" class="iandP-search-item"
+          clearable @input="placement.searchPlacement" ></el-input>
+          <el-select v-model="data.searchParams.service_product_id" placeholder="请选择套餐类型" clearable
+          @change="placement.searchPlacement" class="iandP-search-item">
+            <el-option v-for="item in placement.serviceTypeArray" :key="item.value"
+            :label="item.label" :value="item.value"></el-option>
+          </el-select>
+          <div class="date-box">
+            <el-date-picker v-model="data.dateRange" start-placeholder="起始日期"
+            end-placeholder="结束日期" style="max-width: 240px;margin-right: 20px;"
+            value-format="YYYY-MM-DD" type="daterange" @change="data.currentDateTab=0"></el-date-picker>
+            <el-button v-for="item in placement.dateButtonData" class="date-button"
+            :key="item.tabId" :class="data.currentDateTab==item.tabId?'selectTab':''" @click="placement.changeDateType(item.tabId)">{{ item.text }}</el-button>
+          </div>
+          <div style="margin-left: 30px;margin-bottom: 8px;">
             到款金额
             <el-input v-model.trim="data.searchParams.min_amount" @blur="placement.checkMoney"
             @input="(value)=>placement.moneyChange(value,'min_amount')" style="width: 104px;margin:0 8px" clearable></el-input>
@@ -39,14 +48,15 @@ placement.placementList()
             <div class="iandP-amout-box">
               <div class="iandP-amout-box-text">
                 <span>已到款合计金额（换算后）</span>
-                <span>{{ data.amountTotal }}（元）</span>
+                <span>{{ data.amountTotal }}（CNY）</span>
               </div>
-              <svg-Icon name="svgIcon-financial-calculation" size="40" />
+              <svg-Icon name="svgIcon-financial-calculation" style="min-width: 40px;"
+              size="40" />
             </div>
             <div class="iandP-amout-box" v-for="item in data.countryAmountList" :key="item.code">
               <div class="iandP-amout-box-text">
-                <span>{{ item.name }}</span>
-                <span>{{ item.amount }}（{{ item.unit_name }}）</span>
+                <span>{{ item.name }}（{{ item.code }}）</span>
+                <span>{{ item.amount }}</span>
               </div>
               <img :src="item.flag_img" style="height: 40px;width: 40px;" />
             </div>
@@ -56,6 +66,11 @@ placement.placementList()
         <!-- 表格 -->
         <el-table :data="data.tableData" border max-height="560px" size="default" style="position: sticky;"> 
           <el-table-column label="合同编号" align="center" prop="contract_code" show-overflow-tooltip></el-table-column>
+          <el-table-column label="套餐类型" align="center" prop="service_product_id">
+            <template #default="{row}">
+              {{ placement.serviceTypeArray[row.service_product_id-1]?.label }}
+            </template>
+          </el-table-column>
           <el-table-column label="到款金额" align="center" prop="origin_amount" show-overflow-tooltip></el-table-column>
           <el-table-column label="金额单位" align="center" prop="unit_name"></el-table-column>
           <el-table-column label="换算金额（元）" align="center" prop="amount" show-overflow-tooltip></el-table-column>

src/views/financialManagement/placementPre.vue

@@ -0,0 +1,381 @@
+<script setup>
+import { Search } from '@element-plus/icons-vue'
+import {useRouter} from 'vue-router'
+import {getSellerList} from '@/api/crm'
+import {getCurrencyList} from '@/api/common'
+import {getPrePlacementList,prePlacementAdd,prePlacementEdit,prePlacementDelete} from '@/api/financialMana'
+
+
+const router = useRouter()
+
+  const placemenetPre=reactive({
+    searchParams:{
+      keyword:'',
+      start_date:'',
+      end_date:'',
+      sort_type:'',
+      page_size:10,
+      current:1,
+    },
+    // 创建时间数组
+    createtime:[],
+    tableData:[],
+    total:0,
+  })
+  // 销售列表
+  const sellerList = ref([])
+  // 货币列表
+  const currencyList=ref([])
+
+  // -----------------弹窗
+  const editPreForm=ref(null)
+
+  const dialog=reactive({
+    // 更改合同状态
+    editPreShow:false,
+    title:'',
+    editPreForm:{
+      company_name:'',
+      payment_date:'',
+      amount:'',
+      currency_unit:'CNY',
+      start_date:'',
+      end_date:'',
+      remark:''
+    },
+    rules:{
+      company_name:{required:true,message:'客户名称不能为空',trigger:'blur'},
+      payment_date:{required:true,message:'到款日不能为空',trigger:'blur'},
+      amount:[{required:true,message:'到款金额不能为空',trigger:'blur'},
+      {
+        validator:(rule,value,callback)=>{
+          if(!parseFloat(value)){
+            callback(new Error('到款金额格式错误'))
+          }else{
+            callback()
+          }
+        },
+        trigger:'blur'
+      }],
+      start_date:{required:true,message:'约定有效期不能为空',trigger:'change'}
+    },
+    validityDate:[]
+  })
+
+  // 监听
+  watch(()=>placemenetPre.createtime,(newVal)=>{
+    if(!newVal){
+      placemenetPre.searchParams.start_date=''
+      placemenetPre.searchParams.end_date=''
+    }else{
+      placemenetPre.searchParams.start_date = newVal[0]
+      placemenetPre.searchParams.end_date = newVal[1]
+    }
+    searchPlacementPre()
+  })
+
+  watch(()=>dialog.validityDate,(newVal)=>{
+    if(!newVal){
+      dialog.editPreForm.start_date=''
+      dialog.editPreForm.end_date=''
+    }else{
+      dialog.editPreForm.start_date = newVal[0]
+      dialog.editPreForm.end_date = newVal[1]
+    }
+  })
+
+//  --------------------------method
+
+  //获取销售列表
+  const getSellerListFun=()=>{
+    getSellerList().then(res=>{
+      sellerList.value=res.data || []
+    })
+  }
+
+  // 获取货币列表
+  const getCurrencyListFun=()=>{
+    getCurrencyList().then(res=>{
+      currencyList.value=res.data || []
+    })
+  }
+
+  // 预到款登记列表
+  const placementPreList=()=>{
+    getPrePlacementList(placemenetPre.searchParams).then(res=>{
+      placemenetPre.tableData=res.data.list || []
+      placemenetPre.total=res.data.page?.total || 0
+      // console.log(res);
+    })
+  }
+  // 切换每页的数量
+  const changePageSize=(pageSize)=>{
+    placemenetPre.searchParams.page_size = pageSize
+    placementPreList()
+  }
+  const changePageNo = (pageNo)=>{
+    placemenetPre.searchParams.current = pageNo
+    placementPreList()
+  }
+  const searchPlacementPre=()=>{
+    placemenetPre.searchParams.current = 1
+    placementPreList()
+  }
+
+  const sortChange=({order})=>{
+    console.log(order);
+    placemenetPre.searchParams.sort_type = order=='ascending'?1:order=='descending'?2:''
+    searchPlacementPre()
+  }
+
+  // 补录合同
+  const supplementaryContract=(row)=>{  
+    // console.log(id);
+    router.push({path:'/financial/list/contractProgress',query:{
+      supplementaryId:row.pre_pay_id,
+      company_name:row.company_name,
+      currency_unit:row.currency_unit,
+      placement_amount:row.origin_amount,
+      start_date:row.start_date,
+      end_date:row.end_date
+    }})
+  }
+
+  //新增预到款
+  const addPre=()=>{
+    dialog.title='新增到款预登记'
+    dialog.editPreShow=true
+  }
+  //编辑预到款
+  const editPre=(row)=>{
+    dialog.editPreForm.pre_pay_id = row.pre_pay_id
+    dialog.editPreForm.company_name=row.company_name
+    dialog.editPreForm.payment_date=row.payment_date
+    dialog.editPreForm.amount=row.origin_amount
+    dialog.editPreForm.currency_unit=row.currency_unit
+    dialog.editPreForm.remark=row.remark
+    dialog.validityDate=[row.start_date,row.end_date]
+    dialog.title='编辑到款预登记'
+    dialog.editPreShow=true
+  }
+
+  //弹窗关闭动画 回调
+  const dialogClosed=()=>{
+    dialog.editPreForm.pre_pay_id = ''
+    dialog.editPreForm.company_name=''
+    dialog.editPreForm.payment_date=''
+    dialog.editPreForm.amount=''
+    dialog.editPreForm.currency_unit='CNY'
+    dialog.editPreForm.remark=''
+    dialog.validityDate=[]
+    setTimeout(()=>{
+      editPreForm.value.clearValidate()
+    },0)
+  }
+
+  // 提交
+  const submitForm=()=>{
+    editPreForm.value.validate((valid)=>{
+      if(valid){
+        console.log(dialog.editPreForm);
+        dialog.editPreForm.amount = parseFloat(dialog.editPreForm.amount)
+        let prePlacementProp=prePlacementAdd
+        if(dialog.editPreForm.pre_pay_id){
+          // 编辑
+          prePlacementProp=prePlacementEdit
+        }
+        prePlacementProp(dialog.editPreForm).then(res=>{
+          dialog.editPreShow=false
+          ElMessage.success(`${dialog.title}成功`)
+          placementPreList()
+        })
+      }
+    })
+  }
+  // 删除
+  const delteRecord=(row)=>{
+    let hintText = '已补录合同，删除后不可恢复，是否确认删除该条到款预登记信息？'
+    if(row.contract_register_id== 0){
+      hintText='未补录合同，删除后不可恢复，是否确认删除该条到款预登记信息？'
+    }
+    ElMessageBox.confirm(hintText,'操作提示',    
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(res=>{
+      prePlacementDelete({pre_pay_id:row.pre_pay_id}).then(res=>{
+        ElMessage.success('删除成功')
+        placementPreList()
+      })
+    }).catch(()=>{})
+  }
+
+  //  ---------------------created
+  // getSellerListFun()
+  getCurrencyListFun()
+  placementPreList()
+</script>
+
+<template>
+  <div class="placemenetPre-list-container" id="placemenetPre-list-container" > 
+    <!-- 顶部区域 -->
+    <div class="placemenetPre-top-zone">
+      <div class="placemenetPre-top-search-zone">
+        <el-input v-model="placemenetPre.searchParams.keyword" placeholder="客户姓名" :prefix-icon="Search"
+        style="width: 340px;margin-right: 30px;" @input="searchPlacementPre" clearable />
+        <!-- <el-date-picker v-model="placemenetPre.createtime" start-placeholder="开始日期"
+        end-placeholder="结束日期" style="max-width: 240px;"
+        value-format="YYYY-MM-DD" type="daterange"></el-date-picker> -->
+      </div>
+      <!-- 按钮区域 -->
+      <div class="placemenetPre-top-option-zone" v-permission="'financial:placementPre:add'">
+        <el-button type="primary" size="large" style="color: white;"
+        @click="addPre" class="element-common-button">新增</el-button>         
+      </div>
+    </div>
+    <div class="placemenetPre-table-zone">
+      <!-- 表格 -->
+      <el-table :data="placemenetPre.tableData" border max-height="695px"
+      size="default" style="position: sticky;"> 
+        <el-table-column label="客户名称" prop="company_name"
+        show-overflow-tooltip min-width="120"></el-table-column>
+        <el-table-column label="到款日" prop="payment_date"
+        show-overflow-tooltip min-width="110"></el-table-column>
+        <el-table-column label="到款金额" prop="origin_amount" width="120"></el-table-column>
+        <el-table-column label="金额单位" prop="unit_name" width="90">
+        </el-table-column>
+        <el-table-column label="约定有效期" width="210" prop="start_date">
+          <template #default="{row}">
+            {{(row.start_date+' 至 '+row.end_date)}}
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" prop="remark" show-overflow-tooltip></el-table-column>
+        <!-- <el-table-column label="创建时间" prop="create_time" width="165" sortable="custom"></el-table-column> -->
+        <el-table-column label="创建人" width="90" prop="admin_name"></el-table-column>
+        <el-table-column label="操作" fixed="right" 
+        v-permission="['financial:placementPre:supplementary','financial:placementPre:edit','financial:placementPre:delete']">
+          <template #default="{row}">
+            <div class="table-options">
+              <span class="table-option-buttons" v-permission="'financial:placementPre:supplementary'"
+              @click="supplementaryContract(row)">
+                补录合同
+              </span>
+              <span class="table-option-buttons" v-permission="'financial:placementPre:edit'"
+              @click="editPre(row)">
+                编辑
+              </span>
+              <span class="table-option-buttons" v-permission="'financial:placementPre:delete'"
+              @click="delteRecord(row)" style="color:var(--dangerColor);">
+                删除
+              </span>
+            </div>
+          </template>
+        </el-table-column>
+        <template #empty>
+          <div class="table-no-data">
+            <img src="@/assets/img/icon/empty-data.png" />
+            <span>暂无数据</span>
+          </div>
+        </template>
+      </el-table>
+      <!-- 分页 -->
+      <m-page :pageSize="placemenetPre.searchParams.page_size" :page_no="placemenetPre.searchParams.current" 
+      style="display: flex;justify-content: flex-end;margin-top: 20px;" 
+      :total="placemenetPre.total" @handleCurrentChange="changePageNo" @handleSizeChange="changePageSize"/>
+    </div>
+    <!-- 新增/编辑弹窗 -->
+    <el-dialog v-model="dialog.editPreShow" :title="dialog.title" width="556px" @closed="dialogClosed"
+     :close-on-click-modal="false">
+      <!-- <template style="display: flex;justify-content: center;"> -->
+        <el-form :model="dialog.editPreForm" ref="editPreForm" label-width="130px"
+        :rules="dialog.rules" style="margin-top: 10px;">
+          <el-form-item label="客户名称" prop="company_name">
+            <el-input v-model="dialog.editPreForm.company_name"
+            placeholder="请输入客户名称" style="width:346px" />
+          </el-form-item>
+          <el-form-item label="到款日" prop="payment_date">
+            <el-date-picker v-model="dialog.editPreForm.payment_date" placeholder="请选择到款日" 
+            :clearable="false" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="到款金额" id="contractInfo-contractAmount"
+          prop="amount">
+            <el-input v-model.trim="dialog.editPreForm.amount"
+            placeholder="请输入到款金额" style="width: 206px;" />
+            <el-select v-model="dialog.editPreForm.currency_unit" placeholder="请选择货币类型" 
+            style="margin-left: 20px;width: 120px;">
+              <el-option v-for="item in currencyList" :key="item.code" :label="item.name" :value="item.code">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="约定有效期" prop="start_date">
+            <el-date-picker type="daterange" 
+            v-model="dialog.validityDate" style="max-width: 346px;"
+            start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD"
+            :clearable="false">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="备注" prop="remark">
+            <el-input
+              v-model="dialog.editPreForm.remark"
+              style="width: 346px;"
+              :rows="3"
+              placeholder="请输入内容"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-form>
+      <!-- </template> -->
+      <template #footer>
+        <div>
+          <el-button @click="dialog.editPreShow=false">取消</el-button>
+          <el-button type="primary" @click="submitForm" style="margin-left: 30px;">确定</el-button>
+        </div>
+      </template> 
+    </el-dialog>
+  </div>
+</template>
+  
+<style lang="scss" scoped>
+  .placemenetPre-list-container{
+    min-height: 100%;
+    .placemenetPre-top-zone{
+      display: flex;
+      flex-wrap: wrap;
+      align-items: flex-start;
+      justify-content: space-between;
+      margin-bottom: 20px;
+      .placemenetPre-top-search-zone{
+        display: flex;
+        align-items: center;
+        margin-bottom: 8px;
+      }
+      .placemenetPre-top-option-zone{
+        // margin-bottom: 8px;
+        .element-common-button{
+          width: 118px;
+          margin-left: 30px;
+          font-size: 14px;
+        }
+      }
+    }
+    .placemenetPre-table-zone{
+      margin-top: 20px;
+    }
+  }
+</style>
+<style lang="scss">
+  #placemenetPre-list-container{
+    .el-dialog__footer{
+      padding-top: 0!important;
+      padding: 0 0 36px 0;
+    }
+    .el-date-editor{
+      .el-input__wrapper{
+        width: 346px;
+      }
+    }
+  }
+
+</style>

src/views/financialManagement/style/iandPList.scss

@@ -3,9 +3,29 @@
   .iandP-search-zone{
     margin-bottom: 20px;
     .iandP-search-box{
-      margin-left: -40px;
+      margin-left: -30px;
       display: flex;
       flex-wrap: wrap;
+      .iandP-search-item{
+        width: 240px;
+        margin-left: 30px;
+        margin-bottom: 8px;
+      }
+      .date-box{
+        display: flex;
+        align-items: center;
+        margin: 0 0 8px 30px;
+        .date-button{
+          height: 40px;
+          width: 52px;
+          color: $themeColor;
+          border: 1px solid $themeColor;
+        }
+        .selectTab{
+          color:white;
+          background-color: $themeColor;
+        }
+      }
     }
   }
   .iandP-table-container{
@@ -46,20 +66,6 @@
             }
           }
         }
-        // font-size: 14px;
-        // .iandP-top-amout-span{
-        //   color: $dangerColor;
-        // }
-        // .iandP-top-amout-box{
-        //   display: flex;
-        //   // align-items: center;
-        //   flex-wrap: nowrap;
-        //   .iandP-top-amout-row{
-        //     display: flex;
-        //     flex-wrap: wrap;
-        //     align-items: center;
-        //   }
-        // }
       }
     }
   }

src/views/financialStatistics/commodityPayment.vue

@@ -1,34 +1,40 @@
 <script setup>
 import { Search } from '@element-plus/icons-vue'
-import dropdownText from '@/components/dropdown-text/index.vue'  
+// import dropdownText from '@/components/dropdown-text/index.vue'  
 import {getInvoicePaymentList,updatePayType,setServiceAmount} from '@/api/financialStatistics'
-import {getSellerGroupList} from '@/api/crm'
-import {getServiceList} from '@/api/financialMana'
+import {getSellerGroupList,getSellerList} from '@/api/crm'
+import {getSimpleServiceList} from '@/api/financialMana'
 import {downloadByFlow} from '@/utils/common-methods'
 
-  
-  const dateTypeList=[{id:1,type:'开票时间'},{id:2,type:'到款时间'}]
+const moment = inject('$moment')
+  const timeTypeData=[{label:'开票日期',value:1},{label:'到款日期',value:2},{label:'开票日期&到款日期',value:3}]
+  const dateButtonData=[{text:'近1月',tabId:1},{text:'近2月',tabId:2},{text:'近3月',tabId:3}]
 
-  const groupList=ref([])
-  const serviceList=ref([])
+  // const groupList=ref([])
 
+  // sell_group_id:'',
   const searchParams=reactive({
     current:1,
     page_size:10,
     keyword:'',
-    sell_group_id:'',
-    service_type:'',
-    start_date:'',
-    end_date:'',
-    // 1-开票时间 2-到款时间
-    time_type:1,
+    seller_ids:'',
+    service_types:'',
+    start_date:moment().startOf('year').format('YYYY-MM-DD') || '',
+    end_date:moment(new Date()).format('YYYY-MM-DD') || '',
+    // 1-开票日期&到款日期 2-开票日期 3-到款日期
+    time_type:"",
     // 1-已开票
-    has_invoice:0,
+    has_invoice:'',
     // 1-已到款
-    has_payment:0,
+    has_payment:'',
+    sort_type:'',
+    sort_param:'',
     is_export:0
   })
-  const searchDate=ref(null)
+  const searchDate=ref([moment().startOf('year').format('YYYY-MM-DD'),moment(new Date()).format('YYYY-MM-DD')])
+  const currentDateTab=ref(0)
+
+
   watch(searchDate,(newVal)=>{
     if(newVal){
       searchParams.start_date=newVal[0]
@@ -43,7 +49,6 @@ import {downloadByFlow} from '@/utils/common-methods'
   const commodityPData=reactive({
     tableData:[],
     total:25,
-    rowMergeArray:[],
     invoiceAmountTotal:0,
     invoiceAmountList:[],
     placementAmountTotal:0,
@@ -58,37 +63,25 @@ import {downloadByFlow} from '@/utils/common-methods'
   // method
 
   //获取销售组别
-  const getSellerGroupListFun=()=>{
-    getSellerGroupList().then(res=>{
-      groupList.value=res.data || []
-    })
-  }
-  // 获取套餐列表
-  const getServiceListFun=()=>{
-    getServiceList().then(res=>{
-      serviceList.value=res.data || []
-    })
-  }
-
-
+  // const getSellerGroupListFun=()=>{
+  //   getSellerGroupList().then(res=>{
+  //     groupList.value=res.data || []
+  //   })
+  // }
   const commodityPList=()=>{
     // console.log(searchParams);
     getInvoicePaymentList(searchParams).then(res=>{
       // console.log(res);
       commodityPData.tableData=[]
-      commodityPData.rowMergeArray=[]
       let tempData = res.data.list.data_list || []
       commodityPData.total = res.data.page.total
       commodityPData.invoiceAmountTotal=res.data.list.invoice_total
       commodityPData.invoiceAmountList = res.data.list.invoice_currency_total || []
       commodityPData.placementAmountTotal=res.data.list.payment_total
       commodityPData.placementAmountList = res.data.list.payment_currency_total || []
+      // console.log(tempData);
       tempData.map((item,index) =>{
-        commodityPData.rowMergeArray.push(item.invoice_payment_list.length)
         item.invoice_payment_list.map((it,ind) =>{
-          if(ind-1>=0){
-            commodityPData.rowMergeArray.push(0)
-          }
           commodityPData.tableData.push({
             serialNumber:searchParams.page_size*(searchParams.current-1)+index+1,
             ...item,date:item.start_date+'至'+item.end_date,...it
@@ -104,11 +97,19 @@ import {downloadByFlow} from '@/utils/common-methods'
     commodityPList()
   }
 
-  const dateTypeCommand=(id)=>{
-    if(id == searchParams.time_type) return 
-    searchParams.time_type=id
+  const sortChange=({order,prop})=>{
+    console.log(order,prop);
+    searchParams.sort_type=order=='descending'?'desc':order=='ascending'?'asc':''
+    searchParams.sort_param=order?prop:''
     searchCommodityP()
-    // console.log(id);
+  }
+  
+  // 切换日期 近1月、近2月、近3月 从今天开始往后推
+  const changeDateType=(tabId)=>{
+    if(currentDateTab.value==tabId) return
+    currentDateTab.value=tabId
+    searchDate.value=[moment(new Date()).subtract(tabId, 'months').format('YYYY-MM-DD'),
+      moment(new Date()).format('YYYY-MM-DD')]
   }
 
   // 切换每页的数量
@@ -126,24 +127,8 @@ import {downloadByFlow} from '@/utils/common-methods'
       downloadByFlow(res,'xlsx',`商品到款统计列表`)
     })
   }
-  // 是否已开票或已到款 改变
-  const haveIAndPChange=(value,prop)=>{
-    searchParams[prop]=value?1:0
-    searchCommodityP()
-  }
 
 
-  // 单元格合并
-  const cellMerge=({ row,column,rowIndex,columnIndex})=>{
-    // console.log({ row,column,rowIndex,columnIndex});
-    if([0,1,2,3].includes(columnIndex)){
-      const _row = commodityPData.rowMergeArray[rowIndex];
-      return {
-        rowspan: _row,
-        colspan: 1
-      };
-    }
-  }
   // 自定义表格行的类名
   const tableRowClassName=({ row, rowIndex })=>{
     if (row.serialNumber%2 === 1) {
@@ -153,15 +138,46 @@ import {downloadByFlow} from '@/utils/common-methods'
   }
   // 开票到款金额展开收起
   const foldOrUnfold=(type)=>{
+    if(!(commodityPData.tableData?.length>0)){
+      return 
+    }
     // type: 0-开票  1-到款
     if(type){
       placementIsFold.value = !placementIsFold.value
     }else{
       invoiceIsFold.value = !invoiceIsFold.value
     }
-    console.log(type,invoiceIsFold.value);
+    // console.log(type,invoiceIsFold.value);
   }
+  // --------------------------销售选择
 
+  const sellerArray=ref([])
+  // 销售类型
+  const sellerTypeArray=ref(['','FICC销售','权益销售'])
+  const sellerChange=(value)=>{
+    searchParams.seller_ids = value.join(',')
+    searchCommodityP()
+  }
+  // 获取销售列表
+  const getSellerListFun=()=>{
+    getSellerList().then(res=>{
+      sellerArray.value = res.data?.all_list || []
+      // console.log(res);
+    })
+  }
+
+  // -------------------套餐选择
+  const serviceList=ref([])
+  // 获取简易套餐列表
+  const getServiceListFun=()=>{
+    getSimpleServiceList().then(res=>{
+      serviceList.value=res.data || []
+    })
+  }
+  const serviceChange=(value)=>{
+    searchParams.service_types = value.join(',')
+    searchCommodityP()
+  }
   //  -----------------------------------------------------弹窗
   // ---------------------------------编辑付款方式
   const payTypeArray=[{id:0,type:'无'},{id:1,type:'年付'},{id:2,type:'半年付'},{id:3,type:'季付'},{id:4,type:'次付'},{id:5,type:'异常'}]
@@ -255,83 +271,113 @@ import {downloadByFlow} from '@/utils/common-methods'
   // --------------------------------设置套餐信息
   //  -----------------------------------------------------弹窗
 
-
+  
   // created
-  getSellerGroupListFun()
+  // getSellerGroupListFun()
   getServiceListFun()
   commodityPList()
+  getSellerListFun()
 
 </script>
 
 <template>
     <div id="commodity-payment-container" class="commodity-payment-container">
       <div class="search-zone">
-        <el-input v-model="searchParams.keyword" placeholder="请输入客户名称/销售" clearable 
-        @input="searchCommodityP" :prefix-icon="Search" style="width: 286px;margin: 0 30px 10px 0;" ></el-input>
-        <el-select v-model="searchParams.sell_group_id" placeholder="请选择销售组别" clearable style="width: 240px;margin: 0 30px 10px 0;"
+        <el-input v-model="searchParams.keyword" placeholder="请输入客户名称" clearable class="search-item"
+        @input="searchCommodityP" :prefix-icon="Search" style="width: 240px;" ></el-input>
+        <!-- <el-select v-model="searchParams.sell_group_id" placeholder="请选择销售组别" clearable style="width: 240px;margin: 0 30px 10px 0;"
         @change="searchCommodityP">
           <el-option :label="item.group_name" :value="item.group_id" v-for="item in groupList"></el-option>
-        </el-select>
-        <el-select v-model="searchParams.service_type" placeholder="请选择套餐信息" clearable style="width: 240px;margin: 0 30px 10px 0;"
+        </el-select> -->
+        <el-cascader :options="sellerArray"  filterable style="width: 200px;margin: 0 0 8px 30px;"
+          @change="sellerChange" placeholder="请选择销售" clearable collapse-tags :show-all-levels="false"
+          :props="{multiple:true,label:'seller_name',value:'seller_id',children:'child',emitPath:false}" key="seller" >
+        </el-cascader>
+        <el-cascader :options="serviceList" style="width: 200px;margin: 0 0 8px 30px;" filterable 
+          @change="serviceChange" placeholder="请选择套餐信息" clearable collapse-tags :show-all-levels="false"
+          :props="{multiple:true,label:'title',value:'service_template_id',children:'children',emitPath:false}"
+          collapse-tags-tooltip key="serivce" >
+        </el-cascader>
+        <!-- <el-select v-model="searchParams.service_type" placeholder="请选择套餐信息" clearable style="width: 240px;margin: 0 30px 10px 0;"
         @change="searchCommodityP">
           <el-option :label="item.title" :value="item.service_template_id" v-for="item in serviceList"></el-option>
-        </el-select>
-        <el-date-picker v-model="searchDate" type="daterange" style="max-width: 240px;margin: 0 20px 10px 0;"
-        value-format="YYYY-MM-DD" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-        <el-dropdown size="large" trigger="click" style="margin:0 60px 10px 0;" @command="dateTypeCommand">
-          <dropdownText>
-            {{dateTypeList.find(it => it.id==searchParams.time_type).type}}
-          </dropdownText>
-          <template #dropdown>
-            <el-dropdown-menu>
-              <el-dropdown-item :command="item.id" v-for="item in dateTypeList" :key="item.id">{{ item.type }}</el-dropdown-item>
-            </el-dropdown-menu>
-          </template>
-        </el-dropdown>
-        <div class="search-checkbox" >
-          <el-checkbox label="已开票" @change="(value)=>haveIAndPChange(value,'has_invoice')"></el-checkbox>
-          <el-checkbox el-checkbox label="已到款" @change="(value)=>haveIAndPChange(value,'has_payment')"></el-checkbox>
+        </el-select> -->
+        <div class="date-box">
+          <el-date-picker v-model="searchDate" type="daterange" @change="currentDateTab=0" style="max-width: 240px;margin-right: 20px;"
+            value-format="YYYY-MM-DD" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+          <div class="composition-button-tabs">
+            <el-button size="large" v-for="(item,index) in dateButtonData" :key="item.tabId"
+            class="date-button" 
+            :class="[index==0?'first-button':index==(dateButtonData.length-1)?'last-button':'inner-button',currentDateTab==item.tabId?'selectTab':'']" 
+            @click="changeDateType(item.tabId)">{{ item.text }}</el-button>
+          </div>
+          <el-select v-model="searchParams.time_type" placeholder="请选择日期类型" @change="searchCommodityP"
+          style="width: 200px;" clearable>
+            <el-option :label="item.label" :value="item.value" v-for="item in timeTypeData" :key="item.value"></el-option>
+          </el-select>
         </div>
+        <el-select v-model="searchParams.has_invoice" placeholder="请选择开票状态" clearable 
+         class="search-item" @change="searchCommodityP" >
+          <el-option label="未开票" :value="0"></el-option>
+          <el-option label="已开票" :value="1"></el-option>
+        </el-select>
+        <el-select v-model="searchParams.has_payment" class="search-item" placeholder="请选择到款状态" clearable
+        @change="searchCommodityP">
+          <el-option label="未到款" :value="0"></el-option>
+          <el-option label="已到款" :value="1"></el-option>
+        </el-select>
       </div>
       <div class="operation-zone">
         <div class="amount-show-zone">
           <div class="amount-show-item">
-            <div class="amount-item-head" @click="foldOrUnfold(0)">
-              <div class="amount-item-head-title">
-                已开票合计金额（换算后）：{{ commodityPData.invoiceAmountTotal }}（元）
+            <div class="amount-item-head" @click="foldOrUnfold(0)" 
+            :style="{cursor:commodityPData.tableData?.length>0?'pointer':'',padding:invoiceIsFold?'8px 20px 8px 20px':'20px'}">
+              <div class="amount-item-head-title" >
+                已开票合计金额（换算后）：{{ commodityPData.invoiceAmountTotal }}（CNY）
               </div>
-              <span class="amount-item-head-icon">
+              <div class="fold-expand-row" v-show="commodityPData.tableData?.length>0">
+                <span class="amount-item-head-icon">
                 {{ invoiceIsFold?'展开':'收起' }}
-              </span>
+                </span>
+                <el-icon color="var(--themeColor)" :style="!invoiceIsFold && 'transform: rotate(180deg)'">
+                  <svg-Icon name="svgIcon-common-arrow_down"></svg-Icon>
+                </el-icon>
+              </div>
             </div>
             <div class="amount-item-body-package" :style="{height:invoiceIsFold?'0':'66px'}">
               <div class="amount-item-body">
                 <div class="amount-item-body-box" v-for="item in commodityPData.invoiceAmountList" :key="item.code">
                   <img :src="item.flag_img" style="height: 40px;width: 40px;margin-right: 20px;" />
                   <div class="amount-item-body-info">
-                    <span>{{ item.name }}</span>
-                    <span>{{ item.amount }}（{{ item.unit_name }}）</span>
+                    <span>{{ item.name }}（{{ item.code }}）</span>
+                    <span>{{ item.amount }}</span>
                   </div>
                 </div>
               </div>
             </div>
           </div>
           <div class="amount-show-item">
-            <div class="amount-item-head" @click="foldOrUnfold(1)">
-              <div class="amount-item-head-title">
-                已到款合计金额（换算后）：{{ commodityPData.placementAmountTotal }}（元）
+            <div class="amount-item-head" @click="foldOrUnfold(1)" 
+            :style="{cursor:commodityPData.tableData?.length>0?'pointer':'',padding:placementIsFold?'8px 20px 8px 20px':'20px'}">
+              <div class="amount-item-head-title" >
+                已到款合计金额（换算后）：{{ commodityPData.placementAmountTotal }}（CNY）
               </div>
-              <span class="amount-item-head-icon">
+              <div class="fold-expand-row" v-show="commodityPData.tableData?.length>0">
+                <span class="amount-item-head-icon">
                 {{ placementIsFold?'展开':'收起' }}
-              </span>
+                </span>
+                <el-icon color="var(--themeColor)" :style="!placementIsFold && 'transform: rotate(180deg)'">
+                  <svg-Icon name="svgIcon-common-arrow_down"></svg-Icon>
+                </el-icon>
+              </div>
             </div>
             <div class="amount-item-body-package" :style="{height:placementIsFold?'0':'66px'}"> 
               <div class="amount-item-body">
                 <div class="amount-item-body-box" v-for="item in commodityPData.placementAmountList" :key="item.code">
                   <img :src="item.flag_img" style="height: 40px;width: 40px;margin-right: 20px;" />
                   <div class="amount-item-body-info">
-                    <span>{{ item.name }}</span>
-                    <span>{{ item.amount }}（{{ item.unit_name }}）</span>
+                    <span>{{ item.name }}（{{ item.code }}）</span>
+                    <span>{{ item.amount }}</span>
                   </div>
                 </div>
               </div>
@@ -342,7 +388,7 @@ import {downloadByFlow} from '@/utils/common-methods'
       </div>
       <div class="table-zone">
         <el-table :data="commodityPData.tableData" border ref="tableRef"
-        max-height="600" :row-class-name="tableRowClassName" :span-method="cellMerge">
+        max-height="600" :row-class-name="tableRowClassName" @sort-change="sortChange" >
           <el-table-column label="序号" align="center" prop="serialNumber" >
           </el-table-column>
           <el-table-column label="客户名称" prop="company_name" align="center" show-overflow-tooltip ></el-table-column>
@@ -352,9 +398,9 @@ import {downloadByFlow} from '@/utils/common-methods'
             </template>
           </el-table-column>
           <el-table-column label="合同有效期" prop="date" align="center" show-overflow-tooltip ></el-table-column>
-          <el-table-column label="开票日" show-overflow-tooltip  prop="invoice_time" align="center" id="spc-column"></el-table-column>
+          <el-table-column label="开票日" show-overflow-tooltip sortable="custom" prop="invoice_time" align="center" id="spc-column"></el-table-column>
           <el-table-column label="开票金额" prop="invoice_amount" align="center"></el-table-column>
-          <el-table-column label="到款日" show-overflow-tooltip prop="payment_date" align="center"></el-table-column>
+          <el-table-column label="到款日" show-overflow-tooltip sortable="custom" prop="payment_date" align="center"></el-table-column>
           <el-table-column label="到款金额" prop="payment_amount" align="center"></el-table-column>
           <el-table-column label="付款方式" prop="pay_type" align="center">
             <template #default="{row,$index}">
@@ -362,13 +408,18 @@ import {downloadByFlow} from '@/utils/common-methods'
               <span v-else @click="editPayType(row,$index)"
               style="cursor: pointer;display: flex;align-items: center;justify-content: center;">
                 <span style="color: var(--dangerColor);">{{ payTypeArray[row.pay_type].type }}</span>
-                <svg-Icon name="svgIcon-common-edit" size="13" 
-                style="position: absolute;right: 4px;top: 50%;transform: translateX(-50%) translateY(-50%);" ></svg-Icon>
+                <svg-Icon name="svgIcon-common-edit" size="16" 
+                style="color: var(--dangerColor);margin-left: 8px;" ></svg-Icon>
               </span>
             </template>
           </el-table-column>
           <el-table-column label="销售" prop="seller_name" align="center"></el-table-column>
-          <el-table-column label="组别" prop="seller_group_name" align="center"></el-table-column>
+          <el-table-column label="销售组别" prop="seller_group_name" align="center"></el-table-column>
+          <el-table-column label="销售类型" prop="seller_type" align="center">
+            <template #default="{row}">
+              {{ sellerTypeArray[row.seller_type] }}
+            </template>
+          </el-table-column>
           <el-table-column label="套餐信息" prop="services_name" align="center">
             <template #default="{row}">
               <span v-if="row.payment_amount&&row.payment_amount!=0" @click="setServiceInfo(row)"
@@ -444,15 +495,49 @@ import {downloadByFlow} from '@/utils/common-methods'
     min-height: 100%;
     .search-zone{
       margin-bottom: 20px;
+      margin-left: -30px;
       display: flex;
       align-items: center;
       flex-wrap: wrap;
-      .search-checkbox{
-        // margin-left: 60px;
-        margin-bottom: 10px;
-        height: 40px;
+      .search-item{
+        width: 200px;
+        margin: 0 0 8px 30px;
+      }
+      .date-box{
         display: flex;
         align-items: center;
+        margin: 0 0 8px 30px;
+        .composition-button-tabs{
+          margin-right: 20px;
+
+          .date-button{
+            height: 40px;
+            color: $hitTextColorTwo;
+            // border: 1px solid $auxiliaryColor;
+            margin: 0;
+            width: 58px;
+          }
+          .first-button{
+            border-color: $auxiliaryColor;
+            border-style: solid;
+            border-width: 1px 0 1px 1px;
+            border-radius: 4px 0 0 4px;
+          }
+          .inner-button{
+            border: 1px solid $auxiliaryColor;
+            border-radius: 0;
+          }
+          .last-button{
+            border-color: $auxiliaryColor;
+            border-style: solid;
+            border-width: 1px 1px 1px 0;
+            border-radius:0 4px 4px 0 ;
+          }
+          .selectTab{
+            color:white;
+            background-color: $themeColor;
+          }
+        }
       }
     }
     .operation-zone{
@@ -478,21 +563,28 @@ import {downloadByFlow} from '@/utils/common-methods'
           box-sizing: border-box;
           // padding-bottom: 16px;
           .amount-item-head{
-            padding: 20px 20px 20px 20px;
+            // padding: 20px 20px 20px 20px;
+            transition: all 0.1s ease;
             display: flex;
             align-items: center;
             justify-content: space-between;
-            cursor: pointer;
+            // cursor: pointer;
             .amount-item-head-title{
-              font-weight: 400;
+              font-weight: 600;
               font-size: 18px;
               color: #000000;
             }
-            .amount-item-head-icon{
-              font-weight: 400;
-              font-size: 14px;
-              color: $themeColor;
+            .fold-expand-row{
+              display: flex;
+              align-items: center;
+              .amount-item-head-icon{
+                font-weight: 400;
+                font-size: 14px;
+                color: $themeColor;
+                margin-right: 4px;
+              }
             }
+ 
           }
           .amount-item-body-package{
             overflow: hidden;

src/views/financialStatistics/salesStatistics.vue

@@ -24,7 +24,9 @@
     // 排序方式: 1-正序; 2-倒序
     sort_type:'',
     // 是否导出：0-否；1-是
-    is_export:0
+    is_export:0,
+    // 销售类型 1-ficc销售 2-权益销售
+    seller_type:1
   })
   // 搜索参数-创建时间数组
   const createtime=ref(null)
@@ -40,12 +42,15 @@
     searchStatistics()
     
   })
-
-  // method
+  // 销售类型缓存 为了减少请求次数
+  let sellerTypeCache=0
 
   const changeTab=(tab)=>{
     if(tabType.value==tab) return 
     tabType.value=tab
+    if(tab==2 && sellerTypeCache!=searchParams.seller_type){
+      getSellerGroup()
+    }
     searchParams.current=1
     searchParams.page_size=10
     searchParams.group_id=''
@@ -69,12 +74,6 @@
         // console.log(res);
       })
     }else if(tabType.value==2){
-      // 获取销售组别
-      if(!groupList.value || groupList.value.length==0){
-        getSellerGroupList().then(res=>{
-          groupList.value=res.data || []
-        })
-      }
 
       // 销售排名
       getSellerStatisticsList(searchParams).then(res=>{
@@ -86,6 +85,22 @@
 
   }
 
+  // 获取销售组别
+  const getSellerGroup=()=>{
+    sellerTypeCache=searchParams.seller_type
+    getSellerGroupList({seller_type:searchParams.seller_type}).then(res=>{
+      groupList.value=res.data || []
+    })
+  }
+  // 切换销售类型
+  const changeSellerType=()=>{
+    if(tabType.value==2&&sellerTypeCache!=searchParams.seller_type){
+      searchParams.group_id=''
+      getSellerGroup()
+    }
+    searchStatistics()
+  }
+
   const searchStatistics=()=>{
     searchParams.current = 1
     statisticsList()
@@ -122,7 +137,7 @@
 
   // created
   statisticsList()
-
+  // getSellerGroup()
 </script>
 
 <template>
@@ -135,12 +150,17 @@
       </div>
       <div class="statistics-top-zone">
         <div class="statistics-search-zone">
-          <el-select v-model="searchParams.group_id" placeholder="请选择销售组别" style="width: 300px;margin-right: 30px;"
+          <el-select v-model="searchParams.seller_type" placeholder="请选择销售类型"
+          @change="changeSellerType" class="statistics-search-item" >
+            <el-option label="FICC销售" :value="1"></el-option>
+            <el-option label="权益销售" :value="2"></el-option>
+          </el-select>
+          <el-select v-model="searchParams.group_id" placeholder="请选择销售组别" class="statistics-search-item"
           @change="searchStatistics" v-show="tabType==2" clearable >
             <el-option :label="item.group_name" :value="item.group_id" v-for="item in groupList"></el-option>
           </el-select>
           <el-date-picker v-model="createtime" type="daterange" 
-          value-format="YYYY-MM-DD" style="width:300px"
+          value-format="YYYY-MM-DD" style="max-width:240px;margin-bottom: 8px"
           start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
         </div>
         <div class="statistice-buttons-zone">
@@ -210,12 +230,19 @@
     }
     .statistics-top-zone{
       display: flex;
-      align-items: center;
+      // align-items: center;
       justify-content: space-between;
-      margin-bottom: 26px;
+      margin-bottom: 20px;
       .statistics-search-zone{
         display: flex;
         align-items: center;
+        flex-wrap: wrap;
+        margin-right: 30px;
+        .statistics-search-item{
+          width: 200px;
+          margin-bottom: 8px;
+          margin-right: 30px;
+        }
       }
     }
   }

src/views/systemManagement/menuM.vue

@@ -234,10 +234,10 @@ const IconsAll=Object.keys(ElementPlusIconsVue).map(key=> key)
           <el-table :data="menu.tableData" border max-height="690px" row-key="menu_id" style="position: sticky;"
           default-expand-all> 
             <el-table-column label="菜单名称" show-overflow-tooltip prop="name"></el-table-column>
-            <el-table-column label="图标" align="center" show-overflow-tooltip prop="icon">
+            <el-table-column label="图标"  show-overflow-tooltip prop="icon">
               <template #default="scope">
                 <el-icon size="18px" color="#000" v-if="scope.row.icon_path"
-                style="top: 50%;left: 50%;position: absolute;transform: translateX(-50%) translateY(-50%);">
+                style="top: 50%;left: 12px;position: absolute;transform: translateY(-50%);">
                   <svg-icon :name="scope.row.icon_path" color="#000" v-if="scope.row.icon_path.startsWith('svgIcon')"/>
                   <component :is="scope.row.icon_path" v-else/>
                 </el-icon>

src/views/systemManagement/roleM.vue

@@ -144,10 +144,10 @@ const route = useRoute()
           <div class="role-container-right-table">
             <!-- 表格 -->
             <el-table :data="role.tableData" border max-height="690px" style="position: sticky;"> 
-              <el-table-column label="序号" show-overflow-tooltip align="center" prop="role_id"></el-table-column>
-              <el-table-column label="角色" show-overflow-tooltip align="center" prop="role_name"></el-table-column>
-              <el-table-column label="创建时间" show-overflow-tooltip align="center" prop="create_time"></el-table-column>
-              <el-table-column label="操作" align="center">
+              <el-table-column label="序号" show-overflow-tooltip prop="role_id"></el-table-column>
+              <el-table-column label="角色" show-overflow-tooltip prop="role_name"></el-table-column>
+              <el-table-column label="创建时间" show-overflow-tooltip prop="create_time"></el-table-column>
+              <el-table-column label="操作">
                 <template #default="scope" >
                   <div class="table-options">
                     <span class="table-option-buttons" @click="premission('view',scope.row.role_id)"