master-新增年终奖计税

src/pages/salaryFileTable/index.tsx

@@ -129,14 +129,24 @@ const Index: FunctionComponent<Props> = (props) => {
         case "ext":
           opts = {
             ...opts,
-            render: (__: any, record: any) => (
+            render: (__: any, record: any) => {
+              let items: MenuProps["items"] = [
+                {
+                  key: "Log",
+                  label: i18n["操作日志"],
+                  onClick: () => handleSalaryFileOperate("log", record)
+                }
+              ];
+              return (
                 <Space>
                   <Button type="link"
                           onClick={() => handleSalaryFileOperate("CHANGE-SALARY", record)}>{i18n["调薪"]}</Button>
-                <Button type="link"
+                  <Dropdown menu={{ items }} placement="bottomRight">
-                        onClick={() => handleSalaryFileOperate("log", record)}>{i18n["操作日志"]}</Button>
+                    <Button type="link" icon={<MoreOutlined/>}/>
+                  </Dropdown>
                 </Space>
-            )
+              );
+            }
           };
           break;
         case "suspend":

src/pages/unitTable/renderColsOpts.tsx

@@ -75,7 +75,15 @@ export function renderCols(initialState: any[], type: string, i18n?: AnyObject,
                 !extraParams?.permission ?
                   <Space>
                     <Button type="link" onClick={() => postMessageToParent("VIEW", record)}>{i18n?.["查看"]}</Button>
-                    <Button type="link" onClick={() => postMessageToParent("log", record)}>{i18n?.["操作日志"]}</Button>
+                    <Dropdown menu={{
+                      items: [{
+                        key: "Log",
+                        label: i18n?.["操作日志"],
+                        onClick: () => postMessageToParent("log", record)
+                      }]
+                    }} placement="bottomRight">
+                      <Button type="link" icon={<MoreOutlined/>}/>
+                    </Dropdown>
                   </Space> :
                   <>
                     {
@@ -211,6 +219,25 @@ export function renderCols(initialState: any[], type: string, i18n?: AnyObject,
           case "idNo":
             col = { ...col, width: 150 };
             break;
+          case "originalTaxTypeDesc":
+          case "originalBonus":
+          case "originalTax":
+          case "originalIncome":
+            col = {
+              ...col,
+              render: (text: string) => (<div style={{ color: "rgb(93, 156, 236)" }}>{text}</div>)
+            };
+            break;
+          case "optimizedTaxTypeDesc":
+          case "optimizedBonus":
+          case "optimizedTax":
+          case "optimizedIncome":
+            col = { ...col, render: (text: string) => (<Text type="success">{text}</Text>) };
+            break;
+          case "companySave":
+          case "employeeGain":
+            col = { ...col, render: (text: string) => (<Text type="warning">{text}</Text>) };
+            break;
           default:
             col = { ...col };
             break;

src/pages/welfareArchiveTable/index.tsx

@@ -125,11 +125,22 @@ const Index: FunctionComponent<Props> = (props) => {
       case "ext":
         opts = {
           ...opts,
-          render: (__: any, record: any) => (
+          render: (__: any, record: any) => {
+            const items: MenuProps["items"] = [
+              {
+                key: "Log",
+                label: i18n["操作日志"],
+                onClick: () => handleWelfareOperate("log", record)
+              }
+            ];
+            return (
               <Space>
                 <Button type="link" onClick={() => handleWelfareOperate("EDIT", record)}>{i18n["编辑"]}</Button>
-              <Button type="link" onClick={() => handleWelfareOperate("log", record)}>{i18n["操作日志"]}</Button>
+                <Dropdown menu={{ items }} placement="bottomRight">
-            </Space>)
+                  <Button type="link" icon={<MoreOutlined/>}/>
+                </Dropdown>
+              </Space>);
+          }
         };
         break;
       case "3":