From f78a59285a13407161d146233aa5c0a6ae2f7235 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Fri, 20 Oct 2023 11:18:27 +0800 Subject: [PATCH 1/4] hotfix/2.9.42310.01 --- .../doCalc/components/salaryEditCalc/index.js | 7 +------ .../hrmSalary/pages/calculate/doCalc/index.js | 17 ++++++++++++++--- .../hrmSalary/pages/calculate/doCalc/index.less | 7 +++++++ 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js index e077a08f..8618f667 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js @@ -6,7 +6,6 @@ */ import React, { Component } from "react"; import { WeaHelpfulTip, WeaLocaleProvider } from "ecCom"; -import { Alert } from "antd"; import { getColumnDesc, getSalarySobCycle } from "../../../../../apis/calculate"; import { sysConfCodeRule } from "../../../../../apis/ruleconfig"; import EditCalcAdvanceSearchPannel from "./editCalcAdvanceSearchPannel"; @@ -52,14 +51,10 @@ class Index extends Component { render() { const { salarySobCycle, showSearchAd, formulaTd, columnDesc, showTotalCell } = this.state; - const { accountExceptInfo, routeParams: { salaryAcctRecordId } } = this.props; + const { routeParams: { salaryAcctRecordId } } = this.props; const formulaObj = _.get(columnDesc, [formulaTd]) || {}; return (
- { - accountExceptInfo && - - }
{getLabel(542604, "薪资所属月")}： diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js index 17480945..d8a8d78e 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js @@ -130,7 +130,7 @@ class Index extends Component { } }; renderReqBtns = () => { - const { selectedKey } = this.state; + const { selectedKey, accountExceptInfo } = this.state; let reqBtns = []; switch (selectedKey) { case "calc": @@ -155,21 +155,32 @@ class Index extends Component { this.calc.openAdvanceSearch()} onAdvanceSearch={() => this.calc.onAdSearch(false)}/> ]; + accountExceptInfo && reqBtns.unshift( this.downloadTxtfile(accountExceptInfo)}/>); break; default: break; } return reqBtns; }; + downloadTxtfile = (value) => { + const element = document.createElement("a"); + const file = new Blob([value], { type: "text/plain" }); + element.href = URL.createObjectURL(file); + element.download = "核算异常信息.txt"; + document.body.appendChild(element); + element.click(); + }; renderContent = () => { - const { selectedKey, accountExceptInfo } = this.state; + const { selectedKey } = this.state; let dom = null; switch (selectedKey) { case "person": dom = ; break; case "calc": - dom = this.calc = dom}/>; + dom = this.calc = dom}/>; break; default: break; diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.less b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.less index b64a4dad..90c0839b 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.less +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.less @@ -5,6 +5,13 @@ height: 100%; background: #f6f6f6; + .icon-jinggao { + color: red; + font-size: 20px; + margin-right: 10px; + cursor: pointer; + } + .wea-new-top-req { z-index: 0 !important; } From 26b25e04dfbcc1d82a9636930f0e37cecb2ba58f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Fri, 20 Oct 2023 11:21:14 +0800 Subject: [PATCH 2/4] hotfix/2.9.42310.01 --- .../doCalc/components/salaryEditCalc/editSalaryCalcSlide.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js index d04b80bf..16cacd2c 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js @@ -50,7 +50,7 @@ class EditSalaryCalcSlide extends Component {
{getLabel(543559, "编辑薪资")}
- +
; }; From 4898ff833522cc0bfae2573bad8d29341f074ab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Fri, 20 Oct 2023 11:39:20 +0800 Subject: [PATCH 3/4] hotfix/2.9.42310.01 --- .../excelEditor/components/codeAction.js | 15 ++++++- .../components/excelEditor/index.less | 43 ++++++++++++++++++- 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/pc4mobx/hrmSalary/components/excelEditor/components/codeAction.js b/pc4mobx/hrmSalary/components/excelEditor/components/codeAction.js index bca61000..5dc1a646 100644 --- a/pc4mobx/hrmSalary/components/excelEditor/components/codeAction.js +++ b/pc4mobx/hrmSalary/components/excelEditor/components/codeAction.js @@ -7,6 +7,7 @@ import React, { Component } from "react"; import { WeaInputSearch, WeaLocaleProvider } from "ecCom"; import { Tree } from "antd"; +import cs from "classnames"; import { formualSearchField, formualSearchGroup, getFormulaDes } from "../../../apis/item"; import "../index.less"; @@ -139,7 +140,7 @@ class CodeAction extends Component { return { _.map([...children.slice(0, 1), ...itemChildren], (child, childIndex) => { - const { name, fieldId } = child; + const { name, fieldId, fieldType } = child; return ( fieldId === "searchInput" ? } key={fieldId + "_" + childIndex}/> : - + + {name} + { + fieldType ? + {fieldType === "number" ? "数字" : "文本"} : + + } +
+ } key={fieldId}/> ); }) } diff --git a/pc4mobx/hrmSalary/components/excelEditor/index.less b/pc4mobx/hrmSalary/components/excelEditor/index.less index 0ea0081a..35de776f 100644 --- a/pc4mobx/hrmSalary/components/excelEditor/index.less +++ b/pc4mobx/hrmSalary/components/excelEditor/index.less @@ -186,14 +186,53 @@ .code-action-list { padding: 10px 0; - .code-action-tips-title{ + + .code-action-tips-title { height: 22px; line-height: 22px; } - .code-action-tips-info{ + + .code-action-tips-info { color: #999 } } + + .weapp-excel-code-action-list-variable { + width: 100%; + display: flex; + justify-content: space-between; + align-items: center; + + .weapp-excel-code-action-list-variable-name { + height: 20px; + line-height: 18px; + -webkit-flex: 1 1; + flex: 1 1; + overflow: hidden; + text-overflow: ellipsis; + word-break: keep-all; + white-space: nowrap; + cursor: pointer; + } + + .danger { + color: rgb(255, 102, 106)!important; + border: 1px solid rgb(255, 193, 195)!important; + background-color: rgb(255, 223, 224)!important; + } + + .weapp-excel-code-action-list-variable-tip { + width: 40px; + height: 20px; + line-height: 18px; + text-align: center; + vertical-align: middle; + color: rgb(255, 205, 80); + border: 1px solid rgb(255, 222, 138); + background-color: rgb(255, 245, 219); + border-radius: 2px; + } + } } } } From d075fceb05559dea329c940b6815c301607ee2c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Fri, 20 Oct 2023 14:41:42 +0800 Subject: [PATCH 4/4] hotfix/2.9.42310.01 --- .../fieldManagement/components/fieldSlide.js | 33 +++++++++++-------- .../pages/salaryItem/salaryItemForm.js | 7 +++- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js index 9e10b3a6..ab02fe74 100644 --- a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js +++ b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js @@ -306,20 +306,25 @@ class FieldSlide extends Component { onChange={value => this.handleChangeFields("dataType", value)} /> - - this.handleChangeFields("roundingMode", value)} - /> - - - this.handleChangeFields("pattern", value)} - /> - + { + dataType === "number" && + + + this.handleChangeFields("roundingMode", value)} + /> + + + this.handleChangeFields("pattern", value)} + /> + + + } this.handleChangeFields("sortedIndex", value)}/> diff --git a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js index bf80c8f8..4d102ebd 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js @@ -30,7 +30,7 @@ class SalaryItemForm extends Component { componentDidMount() { const { salaryItemFieldsList } = this.state; const { request, editable, record, isAdd = false, taxAgentAdminOption, isLedger = false } = this.props; - const { systemType = "", sharedType, valueType, useInEmployeeSalary } = request; + const { systemType = "", sharedType, valueType, useInEmployeeSalary, dataType } = request; this.setState({ salaryItemFieldsList: _.map(salaryItemFieldsList, item => { const { key } = item; @@ -43,6 +43,9 @@ class SalaryItemForm extends Component { viewAttr: (!isLedger && ((editable && record.canEdit) || isAdd)) ? 2 : 1, display: !isLedger }; + case "pattern": + case "roundingMode": + return { ...item, display: dataType === "number" }; case "sortedIndex": return { ...item }; case "useInEmployeeSalary": @@ -101,6 +104,8 @@ class SalaryItemForm extends Component { salaryItemFieldsList: _.map(salaryItemFieldsList, item => { if (key === "sharedType" && item.key === "taxAgentIds") { return { ...item, display: v === "1", viewAttr: 3 }; + } else if (key === "dataType" && (item.key === "roundingMode" || item.key === "pattern")) { + return { ...item, display: v === "number" }; } else if (key === "valueType" && (item.key === "originSqlContent" || item.key === "originFormulaContent")) { return { ...item,