master

public/css/iconfont/demo_index.html

@@ -54,6 +54,30 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe689;</span>
+                <div class="name">payment</div>
+                <div class="code-name">&amp;#xe689;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe78b;</span>
+                <div class="name">my</div>
+                <div class="code-name">&amp;#xe78b;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe608;</span>
+                <div class="name">还款</div>
+                <div class="code-name">&amp;#xe608;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe600;</span>
+                <div class="name">编辑</div>
+                <div class="code-name">&amp;#xe600;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe696;</span>
                 <div class="name">批量更新</div>
@@ -144,9 +168,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1701833672416') format('woff2'),
+  src: url('iconfont.woff2?t=1708504618246') format('woff2'),
-       url('iconfont.woff?t=1701833672416') format('woff'),
+       url('iconfont.woff?t=1708504618246') format('woff'),
-       url('iconfont.ttf?t=1701833672416') format('truetype');
+       url('iconfont.ttf?t=1708504618246') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -172,6 +196,42 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-payment"></span>
+            <div class="name">
+              payment
+            </div>
+            <div class="code-name">.icon-payment
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-my"></span>
+            <div class="name">
+              my
+            </div>
+            <div class="code-name">.icon-my
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-reimbursement"></span>
+            <div class="name">
+              还款
+            </div>
+            <div class="code-name">.icon-reimbursement
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-bianji"></span>
+            <div class="name">
+              编辑
+            </div>
+            <div class="code-name">.icon-bianji
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-pilianggengxin"></span>
             <div class="name">
@@ -307,6 +367,38 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-payment"></use>
+                </svg>
+                <div class="name">payment</div>
+                <div class="code-name">#icon-payment</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-my"></use>
+                </svg>
+                <div class="name">my</div>
+                <div class="code-name">#icon-my</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-reimbursement"></use>
+                </svg>
+                <div class="name">还款</div>
+                <div class="code-name">#icon-reimbursement</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-bianji"></use>
+                </svg>
+                <div class="name">编辑</div>
+                <div class="code-name">#icon-bianji</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-pilianggengxin"></use>

public/css/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4257468 */
-  src: url('iconfont.woff2?t=1701833672416') format('woff2'),
+  src: url('iconfont.woff2?t=1708504618246') format('woff2'),
-       url('iconfont.woff?t=1701833672416') format('woff'),
+       url('iconfont.woff?t=1708504618246') format('woff'),
-       url('iconfont.ttf?t=1701833672416') format('truetype');
+       url('iconfont.ttf?t=1708504618246') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,22 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-payment:before {
+  content: "\e689";
+}
+
+.icon-my:before {
+  content: "\e78b";
+}
+
+.icon-reimbursement:before {
+  content: "\e608";
+}
+
+.icon-bianji:before {
+  content: "\e600";
+}
+
 .icon-pilianggengxin:before {
   content: "\e696";
 }

public/css/iconfont/iconfont.json

@@ -5,6 +5,34 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "289230",
+      "name": "payment",
+      "font_class": "payment",
+      "unicode": "e689",
+      "unicode_decimal": 59017
+    },
+    {
+      "icon_id": "330201",
+      "name": "my",
+      "font_class": "my",
+      "unicode": "e78b",
+      "unicode_decimal": 59275
+    },
+    {
+      "icon_id": "9492514",
+      "name": "还款",
+      "font_class": "reimbursement",
+      "unicode": "e608",
+      "unicode_decimal": 58888
+    },
+    {
+      "icon_id": "201638",
+      "name": "编辑",
+      "font_class": "bianji",
+      "unicode": "e600",
+      "unicode_decimal": 58880
+    },
     {
       "icon_id": "2442443",
       "name": "批量更新",

src/pages/unitTable/renderColsOpts.tsx

@@ -1,6 +1,6 @@
 import React from "react";
-import { Button, Dropdown, MenuProps, Space, Typography } from "antd";
+import { Button, Dropdown, MenuProps, Space, Tooltip, Typography } from "antd";
-import { MoreOutlined } from "@ant-design/icons";
+import { MoreOutlined, QuestionCircleFilled } from "@ant-design/icons";
 
 const { Text } = Typography;
 
@@ -97,19 +97,12 @@ export function renderCols(initialState: any[], type: string, i18n?: AnyObject,
         }
       }];
     } else if (type === "bonusplan") {
-      return [..._.map(_.filter(initialState, o => o.dataIndex !== "id"), g => {
+      return [..._.map(initialState, g => {
-        let col = { ...g, ellipsis: true, fixed: g.dataIndex === "billMonth", width: 180 };
+        let col = { ...g, ellipsis: true, fixed: false, width: 150 };
         switch (g.dataIndex) {
-          case "billMonth":
+          case "taxYear":
-            col = {
+          case "fileStatusDesc":
-              ...col,
+            col = { ...col, width: 80 };
-              width: 120,
-              render: (text: string, record: any) => {
-                const { billStatus } = record;
-                return (<Button type="link"
-                                onClick={() => postMessageToParent(billStatus === "0" ? "CALC" : "VIEW", record)}>{text}</Button>);
-              }
-            };
             break;
           case "billStatus":
             col = {
@@ -120,23 +113,61 @@ export function renderCols(initialState: any[], type: string, i18n?: AnyObject,
               )
             };
             break;
-          case "paymentOrganization":
+          case "optimizedBonusSum":
-            col = { ...col, width: 200 };
+            col = { ...col, width: 220 };
             break;
-          case "socialNum":
+          case "employeeCount":
-          case "otherNum":
+            col = {
-          case "fundNum":
+              ...col, title: <Space>
-            col = { ...col, width: 118 };
+                <Text>{g.title}</Text>
-            break;
+                <Tooltip placement="top"
-          case "remarks":
+                         title={i18n?.["若同一个人 在两个个税扣缴义务人下 同一纳税年度 同时发年终奖，统计为两个人"]}>
-            col = { ...col, width: 200 };
+                  <QuestionCircleFilled/>
+                </Tooltip>
+              </Space>
+            };
             break;
           default:
             col = { ...col };
             break;
         }
         return col;
-      })];
+      }), {
+        dataIndex: "operate", title: i18n?.["操作"], width: 185, fixed: "right",
+        render: (__: string, record: any) => {
+          const { fileStatus } = record;
+          const items: MenuProps["items"] = [
+            {
+              key: "FileList",
+              label: fileStatus === 0 ? i18n?.["归档"] : i18n?.["取消归档"],
+              onClick: () => postMessageToParent("FILE", record)
+            },
+            {
+              key: "DeleteList",
+              label: i18n?.["删除"],
+              onClick: () => postMessageToParent("DEL", record)
+            }
+          ];
+          return (
+            <Space>
+              {
+                !permission ?
+                  <Button type="link"
+                          onClick={() => postMessageToParent("VIEW", record)}>{i18n?.["查看详情"]}</Button> :
+                  <>
+                    <Button type="link"
+                            onClick={() => postMessageToParent("VIEW", record)}>{i18n?.["查看详情"]}</Button>
+                    <Button type="link"
+                            onClick={() => postMessageToParent("EDIT", record)}>{i18n?.["编辑"]}</Button>
+                    <Dropdown menu={{ items }} placement="bottomRight">
+                      <Button type="link" icon={<MoreOutlined/>}/>
+                    </Dropdown>
+                  </>
+              }
+            </Space>
+          );
+        }
+      }];
     }
     return [];
   }, [initialState, type, i18n, permission]);