+ this.setState({ targetType })}
+ />
+ {this.renderBrowser()}
+
+
+ this.setState({ captcha })}/>
+
+
+
+
+
+
+
+ {
+ referenceType !== "sql" &&
+
+
+ {getLabel(111, "变量")}
+
+ this.setState({ variableText })}/>
+
+ {
+ _.map(variableDatalist, item => {
+ const { key, value, children = [] } = item;
+ const itemChildren = _.filter(children.slice(1), it => it.name.indexOf(variItemText) !== -1);
+ return
+ {
+ _.map([...children.slice(0, 1), ...itemChildren], (child, childIndex) => {
+ const { name, fieldId } = child;
+ return (
+ fieldId === "searchInput" ?
+ this.setState({ variItemText })}
+ />
+ }
+ key={fieldId + "_" + childIndex}/> :
+
+ );
+ })
+ }
+ ;
+ })
+ }
+
+
+
+
+
+
+ {getLabel(111, "函数")}
+
+ this.setState({ funcText })}/>
+ this.setState({ funcExpandedKeys })}
+ >
+ {
+ _.map(funcDatalist, item => {
+ const { name, dataType, children = [] } = item;
+ return
+ {
+ _.map(children, (child, childIndex) => {
+ const { name: childName, chineseName } = child;
+ return (
+ this.props.onFuncSelect(childName)}
+ onMouseEnter={() => this.setState({ funcHoverItem: child })}>
+ {childName}
+ {chineseName}
+
+ }
+ key={childIndex}
+ />
+ );
+ })
+ }
+ ;
+ })
+ }
+
+
+
+
+ }
+
+ );
+ }
+}
+
+export default CodeAction;
+
+const TipList = (props) => {
+ const { tips } = props;
+ const { paramDescs = [], formatString, description, example, result } = tips;
+ return _.isEmpty(tips) ?
+
+
+ {!_.isEmpty(funcHoverItem) ? funcHoverItem.name : getLabel(111, "提示")}
+
+
+
:
+ {/*
+ {getLabel(111, "{C:选项} 用来选择特定选项字段下的备选项")}
*/}
+ {/*{getLabel(111, "{U:姓名} 用来选择工作区成员")}
*/}
+ {/*{getLabel(111, "{D:数据} 用来选择一个部门")}
*/}
+
+
;
+};
diff --git a/pc4mobx/hrmSalary/components/excelEditor/constants.js b/pc4mobx/hrmSalary/components/excelEditor/constants.js
new file mode 100644
index 00000000..2bb11e58
--- /dev/null
+++ b/pc4mobx/hrmSalary/components/excelEditor/constants.js
@@ -0,0 +1,16 @@
+export const keyboardBaseBtns=[
+ { key:"+", label: "+" },
+ { key:"-", label: "-" },
+ { key:">", label: ">" },
+ { key:">=", label: ">=" },
+ { key:"=", label: "=" },
+ { key:"*", label: "*" },
+ { key:"/", label: "/" },
+ { key:"<", label: "<" },
+ { key:"<=", label: "<=" },
+ { key:"!=", label: "!=" },
+ { key:"()", label: "(" },
+ { key:")", label: ")" },
+ { key:"%", label: "%" },
+ { key:" ", label: "space" },
+]
diff --git a/pc4mobx/hrmSalary/components/excelEditor/extendCodeMirror.js b/pc4mobx/hrmSalary/components/excelEditor/extendCodeMirror.js
new file mode 100644
index 00000000..e70c6967
--- /dev/null
+++ b/pc4mobx/hrmSalary/components/excelEditor/extendCodeMirror.js
@@ -0,0 +1,112 @@
+// extendCodeMirror.js
+/* eslint-disable */
+import * as CodeMirror from "codemirror";
+
+CodeMirror.extendMode("css", {
+ commentStart: "/*",
+ commentEnd: "*/",
+ newlineAfterToken: function (type, content) {
+ return /^[;{}]$/.test(content);
+ }
+});
+
+CodeMirror.extendMode("javascript", {
+ commentStart: "",
+ commentEnd: "",
+// FIXME semicolons inside of for
+ newlineAfterToken: function (type, content, textAfter, state) {
+ if (this.jsonMode) {
+ return /^[\[,{]$/.test(content) || /^}/.test(textAfter) || /^]/.test(textAfter);
+ } else {
+ if (content == ";" && state.lexical && state.lexical.type == ")") return false;
+ return /^[;{}]$/.test(content) && !/^;/.test(textAfter);
+ }
+ }
+});
+
+CodeMirror.extendMode("xml", {
+ commentStart: "",
+ newlineAfterToken: function (type, content, textAfter) {
+ return type == "tag" && />$/.test(content) || /^ -1 && endIndex > -1 && endIndex > startIndex) {
+ // Take string till comment start
+ selText = selText.substr(0, startIndex)
+ // From comment start till comment end
+ + selText.substring(startIndex + curMode.commentStart.length, endIndex)
+ // From comment end till string end
+ + selText.substr(endIndex + curMode.commentEnd.length);
+ }
+ cm.replaceRange(selText, from, to);
+ }
+ });
+});
+
+// Applies automatic mode-aware indentation to the specified range
+CodeMirror.defineExtension("autoIndentRange", function (from, to) {
+ var cmInstance = this;
+ this.operation(function () {
+ for (var i = from.line; i <= to.line; i++) {
+ cmInstance.indentLine(i, "smart");
+ }
+ });
+});
+
+// Applies automatic formatting to the specified range
+CodeMirror.defineExtension("autoFormatRange", function (from, to) {
+ var cm = this;
+ var outer = cm.getMode(), text = cm.getRange(from, to).split("\n");
+ var state = CodeMirror.copyState(outer, cm.getTokenAt(from).state);
+ var tabSize = cm.getOption("tabSize");
+
+ var out = "", lines = 0, atSol = from.ch == 0;
+
+ function newline() {
+ out += "\n";
+ atSol = true;
+ ++lines;
+ }
+
+ for (var i = 0; i < text.length; ++i) {
+ var stream = new CodeMirror.StringStream(text[i], tabSize);
+ while (!stream.eol()) {
+ var inner = CodeMirror.innerMode(outer, state);
+ var style = outer.token(stream, state), cur = stream.current();
+ stream.start = stream.pos;
+ if (!atSol || /\S/.test(cur)) {
+ out += cur;
+ atSol = false;
+ }
+ if (!atSol && inner.mode.newlineAfterToken &&
+ inner.mode.newlineAfterToken(style, cur, stream.string.slice(stream.pos) || text[i + 1] || "", inner.state))
+ newline();
+ }
+ if (!stream.pos && outer.blankLine) outer.blankLine(state);
+ if (!atSol) newline();
+ }
+
+ cm.operation(function () {
+ cm.replaceRange(out, from, to);
+ for (var cur = from.line + 1, end = from.line + lines; cur <= end; ++cur)
+ cm.indentLine(cur, "smart");
+ cm.setSelection(from, cm.getCursor(false));
+ });
+});
+// export default CodeMirror;
+module.exports = { CodeMirror };
diff --git a/pc4mobx/hrmSalary/components/excelEditor/index.js b/pc4mobx/hrmSalary/components/excelEditor/index.js
new file mode 100644
index 00000000..8b0fe4ae
--- /dev/null
+++ b/pc4mobx/hrmSalary/components/excelEditor/index.js
@@ -0,0 +1,175 @@
+import React, { Component } from "react";
+import { Button } from "antd";
+import { WeaLocaleProvider } from "ecCom";
+import { Controlled as CodeMirror } from "react-codemirror2";
+import { keyboardBaseBtns } from "./constants";
+import CodeAction from "./components/codeAction";
+import cs from "classnames";
+import "./index.less";
+import "codemirror/lib/codemirror.css";
+import "codemirror/lib/codemirror.js";
+import "codemirror/mode/javascript/javascript.js";
+
+require("./extendCodeMirror");
+const getLabel = WeaLocaleProvider.getLabel;
+
+class ExcelEditor extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ value: "",
+ isFormter: false,
+ isCustomFunctionClick: false
+ };
+ this.editorRef = null;
+ this.timer = null;
+ }
+
+ componentWillReceiveProps(nextProps, nextContext) {
+ if (nextProps.value !== this.props.value && nextProps.value) this.setState({ value: nextProps.value });
+ }
+
+ componentWillUnmount() {
+ if (this.timer) clearInterval(this.timer);
+ this.setState({ isCustomFunctionClick: false });
+ }
+
+ autoFormatSelection = () => {
+ const { isFormter } = this.state;
+ if (isFormter) {
+ const script_length = this.editorRef.getValue().length;
+ const startPos = { line: 0, ch: 0, sticky: null };
+ const endPos = this.editorRef.doc.posFromIndex(script_length);
+ this.editorRef.setSelection(startPos, endPos);
+ this.editorRef.autoFormatRange(startPos, endPos);
+ this.editorRef.commentRange(true, startPos, endPos);
+ } else {
+ this.editorRef.undo();
+ // this.editorRef.undo();
+ }
+ };
+ insertText = text => {
+ const cursor = this.editorRef.getCursor();
+ this.editorRef.replaceRange(text, cursor);
+ this.editorRef.refresh();
+ this.editorRef.focus();
+ };
+ replaceToWidget = (editor) => {
+ editor.getAllMarks().forEach(m => m.clear());
+ };
+ handleVariSelect = str => this.insertText(`{${str}}`);
+ handleFuncSelect = str => {
+ const cursor = this.editorRef.getCursor();
+ this.editorRef.replaceRange(`${str}()`, cursor);
+ this.timer = setTimeout(() => {
+ const { line, ch } = this.editorRef.getCursor();
+ this.editorRef.setCursor({ line, ch: ch - 1 });
+ this.editorRef.refresh();
+ this.editorRef.focus();
+ }, 100);
+ };
+ handleEditorRedo = () => {
+ const { ch, line } = this.editorRef.getCursor();
+ const delStr = this.editorRef.getRange({ line, ch: ch - 1 }, { line, ch });
+ const codeValue = this.editorRef.getValue();
+ if (delStr === "}") {
+ if (codeValue.slice(0, ch).lastIndexOf("{") === -1) {
+ this.editorRef.replaceRange("", { line, ch: ch - 1 }, { line, ch });
+ } else {
+ this.editorRef.replaceRange("", { line, ch: codeValue.slice(0, ch).lastIndexOf("{") }, { line, ch });
+ }
+ } else {
+ this.editorRef.replaceRange("", { line, ch: ch - 1 }, { line, ch });
+ }
+ this.editorRef.refresh();
+ this.editorRef.focus();
+ };
+ handleBackSpaceRedo = () => {
+ const { ch, line } = this.editorRef.getCursor();
+ const delStr = this.editorRef.getRange({ line, ch: ch - 1 }, { line, ch });
+ const codeValue = this.editorRef.getValue();
+ if (delStr === "}") {
+ if (codeValue.slice(0, ch).lastIndexOf("{") === -1) {
+ this.editorRef.replaceRange("", { line, ch: ch - 1 }, { line, ch });
+ } else {
+ this.editorRef.replaceRange("", { line, ch: codeValue.slice(0, ch).lastIndexOf("{") + 1 }, { line, ch });
+ }
+ }
+ this.editorRef.refresh();
+ this.editorRef.focus();
+ };
+
+ render() {
+ const { isFormter, isCustomFunctionClick } = this.state;
+ const { groupParams = {}, isCustomFunction, value, onChangeCustomFunction } = this.props;
+ const { referenceType } = groupParams;
+ return (
+
+
+ {getLabel(111, "语法")}
+
+
+ {formatString}
+ {description}
+ {getLabel(111, "参数")}
+ {
+ _.map(paramDescs, it => {
+ return
+ .
+ {it}
+
;
+ })
+ }
+ {getLabel(111, "示例")}
+ {example}
+ {getLabel(111, "结果")}
+ {result}
+
+
+ {/*公式参数列表*/}
+
+ this.editorRef = editor}
+ value={this.state.value}
+ onBeforeChange={(editor, data, value) => {
+ this.setState({ value }, () => this.props.onChange(this.state.value));
+ }}
+ onChange={(editor, data, value) => {
+ this.replaceToWidget(editor, data, value);
+ }}
+ options={{
+ lineNumbers: false,
+ mode: "javascript",
+ autofocus: false,
+ styleActiveLine: true,
+ lineWrapping: true,
+ matchBrackets: true,
+ lint: false,
+ indentUnit: 2,
+ cursorHeight: 0.85,
+ placeholder: "",
+ showCursorWhenSelecting: true
+ }}
+ onKeyDown={(_, { keyCode }) => keyCode === 8 && this.handleBackSpaceRedo()}
+ />
+
+ {
+ referenceType !== "sql" &&
+
+
+ }
+
+
+
+
+ {
+ _.map(keyboardBaseBtns, item => {
+ const { key, label } = item;
+ return ;
+ })
+ }
+
+
+
+
+
+
-
-
- )
- }
-}
\ No newline at end of file
+ render() {
+ return (
+
+
+ {/*
+ );
+ }
+}
diff --git a/pc4mobx/hrmSalary/components/importModal/index.js b/pc4mobx/hrmSalary/components/importModal/index.js
index 8e47ef9a..012c113f 100644
--- a/pc4mobx/hrmSalary/components/importModal/index.js
+++ b/pc4mobx/hrmSalary/components/importModal/index.js
@@ -107,7 +107,8 @@ export default class ImportModal extends React.Component {
localStorage.removeItem("fileList");
this.props.onCancel();
}}
- style={{ width: 850 }}
+ style={{ width: 850, height: 600 }}
+ hasScroll
className="importModalWrapper"
initLoadCss
buttons={
diff --git a/pc4mobx/hrmSalary/components/importModal/index.less b/pc4mobx/hrmSalary/components/importModal/index.less
index d472ab37..64c95083 100644
--- a/pc4mobx/hrmSalary/components/importModal/index.less
+++ b/pc4mobx/hrmSalary/components/importModal/index.less
@@ -1,7 +1,5 @@
.importModalWrapper {
- .wea-dialog-body {
- height: 80vh;
- overflow: hidden auto;
+ .ant-modal-body {
padding: 16px;
}
diff --git a/pc4mobx/hrmSalary/components/index.js b/pc4mobx/hrmSalary/components/index.js
index 98497f66..74d0b74a 100644
--- a/pc4mobx/hrmSalary/components/index.js
+++ b/pc4mobx/hrmSalary/components/index.js
@@ -1,17 +1,17 @@
-import React from 'react';
-import { inject, observer } from 'mobx-react';
-import { toJS } from 'mobx';
+import React from "react";
+import { inject, observer } from "mobx-react";
+import { toJS } from "mobx";
-import { Button } from 'antd';
-import { WeaLogView } from 'comsMobx';
-import { WeaTop, WeaRightMenu, WeaLocaleProvider, WeaNewScroll } from 'ecCom';
+import { Button } from "antd";
+import { WeaLogView } from "comsMobx";
+import { WeaLocaleProvider, WeaNewScroll, WeaTop } from "ecCom";
-import { renderNoright, renderLoading, getSearchs } from '../util'; // 从util文件引入公共的方法
+import { getSearchs, renderLoading, renderNoright } from "../util"; // 从util文件引入公共的方法
const getLabel = WeaLocaleProvider.getLabel;
const WeaLogViewComp = WeaLogView.Component;
-@inject('baseFormStore')
+@inject("baseFormStore")
@observer
export default class BaseForm extends React.Component {
componentWillMount() { // 初始化渲染页面
@@ -31,24 +31,24 @@ export default class BaseForm extends React.Component {
const { baseFormStore: { setLogVisible, saveForm } } = this.props;
let btnArr = [
{
- key: 'BTN_SAVE',
- icon: ,
- content : `${getLabel(86,'保存')}`,
- onClick : () => saveForm()
+ key: "BTN_SAVE",
+ icon: ,
+ content: `${getLabel(86, "保存")}`,
+ onClick: () => saveForm()
},
{
- key: 'log',
- content: getLabel(83, '日志'),
- icon: ,
- onClick: () => setLogVisible(true),
- },]
+ key: "log",
+ content: getLabel(83, "日志"),
+ icon: ,
+ onClick: () => setLogVisible(true)
+ }];
return btnArr;
}
-
+
render() {
/* 页面渲染说明：
1、判断是否无权限： 是显示无权限页面
- 2、渲染form页面:
+ 2、渲染form页面:
2-1: WeaRightMenu 右键菜单
2-2: WeaTop: 顶部: 包括下拉菜单
2-3: renderLoading: 加载数据中的loading效果(统一封装在util中)
@@ -56,51 +56,56 @@ export default class BaseForm extends React.Component {
2-5: 通过getSearchs方法渲染form
*/
const { baseFormStore } = this.props;
- const { loading, hasRight, form, condition, logVisible, logStore, saveLoading, setLogVisible, saveForm } = baseFormStore; // 从后台取数据 和 方法
-
+ const {
+ loading,
+ hasRight,
+ form,
+ condition,
+ logVisible,
+ logStore,
+ saveLoading,
+ setLogVisible,
+ saveForm
+ } = baseFormStore; // 从后台取数据 和 方法
+
if (!hasRight && !loading) { // 无权限处理
return renderNoright();
}
const btns = [ // 顶部按钮
- ,
+
];
const collectParams = { // 收藏功能配置
- favname: '基础表单',
+ favname: "基础表单",
favouritetype: 1,
objid: 0,
- link: 'wui/index.html#/ns_demo01/index',
- importantlevel: 1,
+ link: "wui/index.html#/ns_demo01/index",
+ importantlevel: 1
};
return (
-
+ {title}
+ this.setState({ searchValue })}
+ placeholder="请输入关键字" style={{ width: 200 }}
+ onSearch={onSearchItemSet}
+ />
+
;
+ const bottomLeft =
- {
- this.setState({ searchValue: value });
- }}
- onSearch={(value) => {
- this.props.onSearch(value);
- }}
- />
-
- {this.props.children}
-
- {
- this.handleShowChecked(value);
- }}/>
-
+ {children}
+ onSelectGroupAll(groupId, val)}/>
+ 已选择{number}个字段
+
;
+ };
render() {
+ const { searchVal, selectItem, showOnlyChecked } = this.state;
+ const { onSelectItem, dataSource } = this.props;
+ let setItemList = _.map(dataSource, item => {
+ return {
+ ...item,
+ items: _.filter(item.items || [], child => child.name.indexOf(searchVal) !== -1)
+ };
+ });
+ setItemList = _.map(setItemList, item => {
+ return {
+ ...item,
+ items: _.map(item.items, child => {
+ return { ...child, checked: selectItem.includes(child.id) };
+ })
+ };
+ });
+ if (showOnlyChecked) {
+ setItemList = _.map(setItemList, item => {
+ return { ...item, items: _.filter(item.items, it => !!it.checked) };
+ });
+ }
return (
-
-
{
- this.state.showContent &&
+ ;
+ })
}
-
-
+
);
}
}
+
+export default SelectItemsWrapper;
diff --git a/pc4mobx/hrmSalary/components/slideModalTitle/index.less b/pc4mobx/hrmSalary/components/slideModalTitle/index.less
index 1fadc267..4810f6f8 100644
--- a/pc4mobx/hrmSalary/components/slideModalTitle/index.less
+++ b/pc4mobx/hrmSalary/components/slideModalTitle/index.less
@@ -50,7 +50,7 @@
.btnWrapper {
position: absolute;
right: 50px;
- top: 0px;
+ top: 0;
}
}
@@ -58,5 +58,8 @@
.wea-new-top-req-wapper .wea-new-top-req-title>div:last-child{
right: 16px!important;
}
+ .wea-new-top-req-wapper .wea-new-top-req-title>div:first-child>div:first-child{
+ min-width: 440px!important;
+ }
}
diff --git a/pc4mobx/hrmSalary/components/stepSlide/index.js b/pc4mobx/hrmSalary/components/stepSlide/index.js
index d58989b9..cc5e8143 100644
--- a/pc4mobx/hrmSalary/components/stepSlide/index.js
+++ b/pc4mobx/hrmSalary/components/stepSlide/index.js
@@ -11,7 +11,7 @@ export default class StepSlide extends React.Component {
className='slideOuterWrapper'
visible={this.props.visible}
top={0}
- width={40}
+ width={65}
height={100}
direction={"right"}
measure={"%"}
diff --git a/pc4mobx/hrmSalary/components/stepSlide/stepSlideHeader.js b/pc4mobx/hrmSalary/components/stepSlide/stepSlideHeader.js
index 4a4918d9..35d4ac22 100644
--- a/pc4mobx/hrmSalary/components/stepSlide/stepSlideHeader.js
+++ b/pc4mobx/hrmSalary/components/stepSlide/stepSlideHeader.js
@@ -1,28 +1,29 @@
-import React from 'react';
-import { WeaSteps } from 'ecCom'
+import React from "react";
+import { WeaSteps } from "ecCom";
+import "./index.less";
+
const Step = WeaSteps.Step;
-import "./index.less"
export default class StepSlideHeader extends React.Component {
- render() {
- return (
-
- {this.props.title}} onChange={(value) => {
- this.handleAllChecked(value);
- }} value={this.state.checkStatus}/>
-
+ this.setState({
- showContent: !this.state.showContent
- })}>已选中{this.props.items ? this.props.items.filter(item => item.checked).length : 0}个字段
-
- {
- this.state.showContent ?
-
-
- {
- this.props.items && this.props.items.map(item => (
- {
- this.handleItemChange(value, item);
- }}/>
- ))
- }
-
-
+ _.map(setItemList, item => {
+ const { items } = item;
+ return
+ {
+ _.isEmpty(items) ?
+ 暂无数据 :
+
+ -
+ {
+ _.map(items, child => {
+ const { name, checked, id } = child;
+ return
-
+
onSelectItem(id, val)} + /> + ;
+ })
+ }
+
-
-
- )
- }
-}
\ No newline at end of file
+ render() {
+ return (
+
-
- {
- this.props.steps && this.props.steps.map(item =>
- (
-
-
-
- {this.props.children}
-
-
+
+
+ );
+ }
+}
diff --git a/pc4mobx/hrmSalary/components/upload/index.js b/pc4mobx/hrmSalary/components/upload/index.js
new file mode 100644
index 00000000..fd7cdd57
--- /dev/null
+++ b/pc4mobx/hrmSalary/components/upload/index.js
@@ -0,0 +1,84 @@
+import React, { Component } from "react";
+import { WeaLocaleProvider, WeaTools, WeaUpload } from "ecCom";
+import { Icon, Modal } from "antd";
+import "./index.less";
+
+const getLabel = WeaLocaleProvider.getLabel;
+const { viewer } = WeaTools;
+
+class ImageUploadList extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ imageUrl: ""
+ };
+ }
+
+ componentDidMount() {
+ const { wmImg } = this.props;
+ if (!_.isEmpty(wmImg)) {
+ this.setState({
+ imageUrl: wmImg[0].imgSrc
+ });
+ }
+ }
+
+ handleChange = (ids, list) => {
+ this.setState({
+ imageUrl: list[0].imgSrc
+ }, () => this.props.onChange([{ imgSrc: this.state.imageUrl }]));
+ };
+ handleDelete = () => {
+ Modal.confirm({
+ title: getLabel(111, "信息确认"),
+ content: getLabel(111, "确认要删除吗?"),
+ onOk: () => {
+ this.setState({
+ imageUrl: ""
+ }, () => this.props.onChange(null));
+ }
+ });
+ };
+
+
+ render() {
+ const { imageUrl } = this.state;
+ const uploadProps = {
+ uploadUrl: "/api/doc/upload/uploadFile",
+ listType: "img",
+ limitType: "jpg,jpeg,png,gif",
+ category: "string",
+ maxFilesNumber: 1,
+ onChange: this.handleChange
+ };
+ const imgPreviewProps = {
+ src: imageUrl,
+ width: 100,
+ height: 100
+ };
+ return (
+
+
+ {
+ this.props.steps && this.props.steps.map(item =>
+ (
+
+ )
+ )
+ }
+
+
+
+ {this.props.children}
+
+
+ {
+ imageUrl &&
+
+
+ }
+
+ );
+ }
+}
+
+export default ImageUploadList;
diff --git a/pc4mobx/hrmSalary/components/upload/index.less b/pc4mobx/hrmSalary/components/upload/index.less
new file mode 100644
index 00000000..577de7c7
--- /dev/null
+++ b/pc4mobx/hrmSalary/components/upload/index.less
@@ -0,0 +1,68 @@
+.textSetting {
+ .uploadWrapper {
+ display: flex;
+ align-items: center;
+ position: relative;
+
+ .previewWrapper {
+ border: 1px solid #d9d9d9 !important;
+
+ img {
+ width: 100%;
+ height: 100%;
+ margin-left: 0 !important;
+ cursor: pointer;
+ }
+
+ .operateWrapper {
+ display: none;
+ }
+ }
+
+ .previewWrapper:hover {
+ .operateWrapper {
+ display: flex;
+ position: absolute;
+ align-items: center;
+ justify-content: flex-end;
+ width: 30px;
+ height: 20px;
+ background-color: rgba(0, 0, 0, 0.3);
+ bottom: 4px;
+ right: 13px;
+ border-radius: 3px;
+ padding-right: 4px;
+ }
+ }
+ }
+
+ .upload-select-picture-card, .previewWrapper {
+ border: 1px dashed #d9d9d9;
+ width: 96px;
+ height: 96px;
+ padding: 0;
+ border-radius: 6px;
+ background-color: #fbfbfb;
+ text-align: center;
+ cursor: pointer;
+ -webkit-transition: border-color .3s ease;
+ -o-transition: border-color .3s ease;
+ transition: border-color .3s ease;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ margin-right: 8px;
+ margin-bottom: 8px;
+
+ span.rc-upload {
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ }
+
+ .upload-select-picture-card:hover {
+ border-color: #2db7f5;
+ }
+}
diff --git a/pc4mobx/hrmSalary/index.js b/pc4mobx/hrmSalary/index.js
index fdfd4990..29804d06 100644
--- a/pc4mobx/hrmSalary/index.js
+++ b/pc4mobx/hrmSalary/index.js
@@ -14,7 +14,7 @@ import OtherDeduct from "./pages/dataAcquisition/otherDeduct";
import CumSituation from "./pages/dataAcquisition/cumSituation";
import Attendance from "./pages/dataAcquisition/attendance";
import SpecialAddDeduction from "./pages/dataAcquisition/specialAddDeduction";
-import Ledger from "./pages/ledger";
+import Ledger from "./pages/ledgerPage";
import Calculate from "./pages/calculate";
import Payroll from "./pages/payroll";
import PayrollGrant from "./pages/payroll/payrollGrant";
@@ -32,6 +32,12 @@ import MobilePayroll from "./pages/mobilePayroll";
import SysConfig from "./pages/sysConfig";
import RuleConfig from "./pages/ruleConfig";
import Appconfig from "./pages/appConfig";
+import FieldManagement from "./pages/fieldManagement";
+import AnalysisOfSalaryStatistics from "./pages/analysisOfSalaryStatistics";
+import EmployeeList from "./pages/employeeView";
+import ReportView from "./pages/reportView";
+import MySalaryView from "./pages/mySalary/mySalaryView";
+import WatermarkPreview from "./pages/payroll/watermarkPreview";
import stores from "./stores";
import "./style/index";
@@ -50,6 +56,7 @@ const SocialSecurityBenefits = (props) => props.children;
const DataAcquisition = (props) => props.children;
// mySalary 我的薪资福利
+// mySalaryView 我的薪资福利-查看工资单
// socialSecurityBenefits 社保福利
// programme 社保福利方案
// archives 社保福利档案
@@ -77,6 +84,9 @@ const DataAcquisition = (props) => props.children;
// sysconfig 系統配置
// sysconfig-1 规则配置
// appconfig 应用配置
+// fieldManagement 字段管理
+// analysisOfSalaryStatistics 薪酬统计分析
+// reportView 薪酬报表查看
const Routes = (
+ ![]()
+
+ }
+ {
+ !imageUrl &&
+
+
+
+
+
+ {getLabel(111, "上传图片")}
+ {getLabel(111, "暂无数据")}
:
+ _.map(dataSource, it => {
+ const { reportName, dimension, id, dimensionId } = it;
+ return
+
+ ;
+ })
+ }
+
+
+ {reportName}
+
+
+
+ {getLabel(111, "统计维度")}：
+ {dimension}
+
+ this.handleOptsClick(e, id, dimensionId)}>
+ {getLabel(111, "编辑")}
+ {getLabel(111, "删除")}
+
+ }>
+
+
+
+
+ {getLabel(111, "统计维度管理")}
+
+
+ : getLabel(111, id ? "编辑报表" : "新建报表");
+ this.setState({
+ modalReq: {
+ ...modalReq, id, title,
+ visible: true, typeKey: key
+ }
+ }, () => id && this.initReportFormCondition({ id }));
+ }
+ };
+ handleCancel = (refresh = false) => {
+ const { attendanceStore: { reportForm } } = this.props;
+ const { modalReq } = this.state;
+ this.setState({
+ modalReq: {
+ ...modalReq, visible: false, id: ""
+ }
+ }, () => {
+ const { selectedKey, reportName, modalReq: { typeKey } } = this.state;
+ selectedKey === "statistics" && reportForm.resetForm();
+ typeKey === "dimension" && this.initReportFormCondition();
+ refresh && selectedKey === "statistics" && this.reportListRef.reportStatisticsReportList({ reportName });
+ });
+ };
+ handleAddDimension = (formId = "") => {
+ const { slideReq } = this.state;
+ this.setState({
+ slideReq: {
+ ...slideReq, visible: true,
+ formId
+ }
+ });
+ };
+ handleClose = (initTable = false) => {
+ const { attendanceStore: { statisticsForm } } = this.props;
+ const { slideReq } = this.state;
+ this.setState({
+ slideReq: {
+ ...slideReq, visible: false, formId: ""
+ }
+ }, () => {
+ statisticsForm.resetForm();
+ initTable && this.dimensionTableRef.dimensionList();
+ });
+ };
+
+ render() {
+ const { taxAgentStore: { statisticsReportBtn }, attendanceStore: { statisticsForm, reportForm } } = this.props;
+ const { selectedKey, modalReq, slideReq, conditions, reportConditions, reportName, keyword, year } = this.state;
+ const buttons = selectedKey === "statistics" ? [
+ ,
+ ,
+
- 核算
- 归档
-
- window.open(
- "/spa/hrmSalary/static/index.html#/main/hrmSalary/placeOnFileDetail"
- )}>
- 查看
-
- 删除
-
;
- }
- })
+ current: 1
};
this.pageInfo = { current: 1, pageSize: 10 };
}
@@ -60,16 +42,17 @@ export default class Calculate extends React.Component {
}
// 搜索
- handleSearch(value) {
+ handleSearch = (value, extra = {}) => {
const { calculateStore } = this.props;
const { getSalaryAcctList } = calculateStore;
getSalaryAcctList({
name: value,
startMonthStr: this.state.startDate,
endMonthStr: this.state.endDate,
- current: this.state.current
+ current: this.state.current,
+ ...extra
});
- }
+ };
handleRangePickerChange(type, value) {
const { calculateStore: { getSalaryAcctList } } = this.props;
@@ -141,6 +124,12 @@ export default class Calculate extends React.Component {
message.success("归档成功");
this.handleSearch(this.state.searchValue);
});
+ }).catch(() => {
+ clearInterval(this.timer);
+ this.setState({
+ progressVisible: false,
+ progress: 0
+ });
});
}
@@ -152,6 +141,20 @@ export default class Calculate extends React.Component {
});
}
+ // 回算
+ handleBackCalculate = (record) => {
+ Modal.confirm({
+ title: "信息确认",
+ content: "确定回算吗？\n 回算后，正常核算的数据会被覆盖，正常核算的工资单不能继续发放或撤回！",
+ onOk: () => {
+ const { calculateStore: { backCalculate } } = this.props;
+ backCalculate(record.id).then(() => {
+ this.handleSearch(this.state.searchValue);
+ });
+ }
+ });
+ };
+
// 查看详情回调
handleDetail(record) {
window.open(
@@ -161,23 +164,33 @@ export default class Calculate extends React.Component {
}
// 获取列表
- getColumns() {
+ getColumns = () => {
const {
calculateStore: { salaryListColumns },
taxAgentStore: { showOperateBtn }
} = this.props;
- let columns = [...salaryListColumns];
+ let columns = [...salaryListColumns].filter(item => item.dataIndex !== "backCalcStatus" && item.dataIndex !== "acctTimes");
columns.map(item => {
- if (item.title == "操作" && showOperateBtn) {
+ if (item.dataIndex === "salarySobName") {
+ item.width = 300;
item.render = (text, record) => {
- const accountBtn = _.filter(
- record.operate,
- it => it.text == "核算" || it.text == "重新核算"
- );
- const notAccountBtn = _.filter(
- record.operate,
- it => it.text != "核算" && it.text != "重新核算"
- );
+ return
+ {text}
+
;
+ };
+ }
+ if (item.dataIndex === "operate" && showOperateBtn) {
+ item.width = 150;
+ item.render = (text, record) => {
+ const accountBtn = _.take(record.operate, 2);
+ const notAccountBtn = _.drop(record.operate, 2);
let operateBtn = [];
if (!_.isEmpty(accountBtn)) {
operateBtn.push(
@@ -189,13 +202,8 @@ export default class Calculate extends React.Component {
style={{ display: "inline-block", marginRight: 8 }}>
{
- if (it.text == "核算" || it.text == "重新核算") {
- it.text == "核算"
- ? this.handleAccount(record)
- : this.handleReaccount(record);
- }
- }}>
+ style={(idx === 1 && it.text.length === 2) ? { padding: "0 12px" } : {}}
+ onClick={() => this.handleOperateClick(it.index, record)}>
{it.text}
@@ -211,29 +219,14 @@ export default class Calculate extends React.Component {
{notAccountBtn.map(cz =>
+ {
+ record.backCalcStatus === 1 &&
+
+ }
+ {`第${record.acctTimes}次`}
+
+
-
- {/* 收藏功能: 配置之后显示 收藏、帮助、显示页面地址 这3个功能 */}
- {
- }}
- />
- {
- this.handleDataPageChange(value);
- }}
- onShowSizeChange={(current, pageSize) => {
- this.pageInfo = { current, pageSize };
- this.handleShowSizeChange(this.pageInfo);
- }}
- />
-
- {/*归档进度条*/}
- {
- this.state.progressVisible &&
- {
- this.setState({ progressVisible: false, progress: 0 });
- }}
- progress={this.state.progress}
- />
- }
- {this.state.baseFormVisible &&
- this.handleSearch(this.state.searchValue)}
- onCancel={() => {
- this.setState({ baseFormVisible: false });
- }}
- />}
-
+ {/* 收藏功能: 配置之后显示 收藏、帮助、显示页面地址 这3个功能 */}
+
+ {
+ this.setState({ progressVisible: false, progress: 0 });
+ }}
+ progress={this.state.progress}
+ />
+ }
+ {this.state.baseFormVisible &&
+ this.handleSearch(this.state.searchValue)}
+ onCancel={() => {
+ this.setState({ baseFormVisible: false });
+ }}
+ />}
);
}
diff --git a/pc4mobx/hrmSalary/pages/calculate/index.less b/pc4mobx/hrmSalary/pages/calculate/index.less
index 1a510f08..2a274b60 100644
--- a/pc4mobx/hrmSalary/pages/calculate/index.less
+++ b/pc4mobx/hrmSalary/pages/calculate/index.less
@@ -1,11 +1,19 @@
.dataList-wrapper {
- .ant-modal-body{
+ .ant-modal-body {
padding: 16px 120px
}
+
.formItem {
+ display: flex;
+
+ .ant-col-8 {
+ line-height: 30px;
+ }
+
.wea-select, .ant-select {
width: 100%;
}
+
.ant-select-selection {
width: 100%;
height: 30px;
@@ -13,3 +21,25 @@
}
}
}
+
+.salarySobNameWrapper {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ width: 100%;
+
+ & > span {
+ flex: 1;
+ }
+
+ .salarySobNameTagWrapper {
+ display: flex;
+ align-items: center;
+
+ i {
+ color: #5d9cec;
+ margin-right: 10px;
+ cursor: pointer;
+ }
+ }
+}
diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/acctResultImportModal.js b/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/acctResultImportModal.js
index 44d0a208..b7bc7c27 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/acctResultImportModal.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/acctResultImportModal.js
@@ -4,6 +4,8 @@ import { Badge, Button, message } from "antd";
import { inject, observer } from "mobx-react";
import SelectFieldModal from "./selectFieldModal";
import { getQueryString } from "../../../../util/url";
+import AddHeaderFieldsModal from "./addHeaderFieldsModal";
+import { cacheImportField } from "../../../../apis/calculate";
@inject("calculateStore", "standingBookStore")
@observer
@@ -16,18 +18,17 @@ export default class AcctResultImportModal extends React.Component {
salaryItemIds: ""
},
step: 0,
- selectFieldVisible: false
+ selectFieldVisible: false,
+ addHeadFields: {
+ visible: false, itemsByGroup: []
+ }
};
}
componentWillMount() {
const { id } = this.props;
if (id) {
- let modalParam = { ...this.state.modalParam };
- modalParam.salaryAcctRecordId = id;
- this.setState({
- modalParam
- });
+ this.getImportField();
} else {
this.setState({
modalParam: { ...this.state.modalParam, salaryAcctRecordId: "123" }
@@ -35,9 +36,35 @@ export default class AcctResultImportModal extends React.Component {
}
}
+ getImportField = () => {
+ const { calculateStore: { getImportField }, id } = this.props;
+ const { addHeadFields } = this.props;
+ getImportField(id).then(data => {
+ this.setState({
+ addHeadFields: {
+ ...addHeadFields,
+ itemsByGroup: _.map(data.itemsByGroup, item => {
+ return {
+ ...item,
+ salaryItems: _.map(item.salaryItems, it => ({
+ ...it,
+ checked: false
+ }))
+ };
+ })
+ },
+ modalParam: {
+ ...this.state.modalParam,
+ salaryAcctRecordId: id,
+ salaryItemIds: data.checkItems.join(",")
+ }
+ });
+ });
+ };
+
// 获取模板
handleAccResultTemplateLink() {
- const { isStandingBook, standingBookTabKey } = this.props;
+ const { isStandingBook, standingBookTabKey, standingBookType } = this.props;
let url = "";
if (_.isEmpty(this.state.modalParam.salaryItemIds)) {
message.warning("请选择表单字段");
@@ -52,6 +79,8 @@ export default class AcctResultImportModal extends React.Component {
url = `${window.location.origin}/api/bs/hrmsalary/siaccount/welfare/importtemplate/export?welfareNames=${this.state.modalParam.salaryItemIds}&billMonth=${billMonth}&paymentOrganization=${paymentOrganization}`;
} else if (standingBookTabKey === "3") {
url = `${window.location.origin}/api/bs/hrmsalary/siaccount/welfare/supplyimporttemplate/export?welfareNames=${this.state.modalParam.salaryItemIds}&billMonth=${billMonth}&paymentOrganization=${paymentOrganization}`;
+ } else if (standingBookType === "difference") {
+ url = `${window.location.origin}/api/bs/hrmsalary/siaccount/welfare/balanceimporttemplate/export?welfareNames=${this.state.modalParam.salaryItemIds}&billMonth=${billMonth}&paymentOrganization=${paymentOrganization}`;
}
}
window.open(url, "_self");
@@ -82,24 +111,31 @@ export default class AcctResultImportModal extends React.Component {
}
// 渲染第一步表单
- renderFormComponent() {
+ renderFormComponent = () => {
return
+
+ {
+ this.handleDataPageChange(value);
+ }}
+ onShowSizeChange={(current, pageSize) => {
+ this.pageInfo = { current, pageSize };
+ this.handleShowSizeChange(this.pageInfo);
+ }}
+ />
+
+
+
+ {/*归档进度条*/}
+ {
+ this.state.progressVisible &&
+
{
visiable && {
this.handleImportModalInit();
}}
@@ -200,7 +240,11 @@ export default class AcctResultImportModal extends React.Component {
!isStandingBook ? fetchPreviewAcctResult(params) : welfarePreview(params);
}}
importFile={(params) => {
- !isStandingBook ? fetchImportAcctResult(params) : importInsuranceAcctDetail(params);
+ !isStandingBook ?
+ fetchImportAcctResult(params) :
+ standingBookType === "difference" ?
+ importBalanceInsuranceDetail({ ...params, billMonth }) :
+ importInsuranceAcctDetail(params);
}}
templateLink={() => {
this.handleAccResultTemplateLink();
@@ -215,6 +259,7 @@ export default class AcctResultImportModal extends React.Component {
{
selectFieldVisible && this.setState({ addHeadFields: { ...addHeadFields, visible: false } })}
+ onAdd={(salaryItemIds) => this.setState({
+ addHeadFields: {
+ ...addHeadFields,
+ visible: false
+ },
+ modalParam: {
+ ...modalParam,
+ salaryItemIds: salaryItemIds.join(",")
+ }
+ }, () => {
+ const { salaryItemIds } = this.state.modalParam;
+ cacheImportField({
+ salaryItems: salaryItemIds ? salaryItemIds.split(",") : []
+ }).then();
+ })}
+ />
);
}
diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/addHeaderFieldsModal.js b/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/addHeaderFieldsModal.js
new file mode 100644
index 00000000..66b00e4c
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/addHeaderFieldsModal.js
@@ -0,0 +1,105 @@
+/*
+ * Author: 黎永顺
+ * name: 表头字段添加
+ * Description:
+ * Date: 2023/5/17
+ */
+import React, { Component } from "react";
+import { Button, Col, Row } from "antd";
+import { WeaCheckbox, WeaDialog, WeaLocaleProvider, WeaSearchGroup } from "ecCom";
+import "./index.less";
+
+const { getLabel } = WeaLocaleProvider;
+
+class AddHeaderFieldsModal extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ itemsCheckeds: [],
+ showOnlyChecked: false
+ };
+ }
+
+ componentWillReceiveProps(nextProps, nextContext) {
+ if (nextProps.visible !== this.props.visible && nextProps.visible) {
+ this.setState({
+ itemsCheckeds: nextProps.selectItems ? _.map(nextProps.selectItems.split(","), it => Number(it)) : []
+ });
+ }
+ }
+
+ handleShowOnlyChecked = (showOnlyChecked) => this.setState({ showOnlyChecked: !!Number(showOnlyChecked) });
+ handleSelectGroupAll = (groupId, checked) => {
+ const { itemsCheckeds } = this.state;
+ const { itemsByGroup } = this.props;
+ _.map(itemsByGroup, item => {
+ if (item.salarySobItemGroupId === groupId) {
+ if (!!Number(checked)) {
+ this.setState({
+ itemsCheckeds: [...itemsCheckeds, ..._.map(item.salaryItems, child => child.salaryItemId)]
+ });
+ } else {
+ this.setState({
+ itemsCheckeds: _.differenceWith(itemsCheckeds, _.map(item.salaryItems, child => child.salaryItemId), _.isEqual)
+ });
+ }
+ }
+ });
+ };
+
+ render() {
+ const { showOnlyChecked, itemsCheckeds } = this.state;
+ const { itemsByGroup } = this.props;
+ let dataSource = _.map(itemsByGroup, item => {
+ return {
+ ...item,
+ salaryItems: _.map(item.salaryItems, child => {
+ return { ...child, checked: itemsCheckeds.includes(child.salaryItemId) };
+ })
+ };
+ });
+ if (showOnlyChecked) {
+ dataSource = _.map(dataSource, item => {
+ return { ...item, salaryItems: _.filter(item.salaryItems, it => !!it.checked) };
+ });
+ }
+ return (
+
{
!_.isEmpty(fieldData.formulaItems) &&
-
+
{
this.handleTitleCheckboxChange(value, "formula");
diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/compareDetail.js b/pc4mobx/hrmSalary/pages/calculateDetail/compareDetail.js
index 89423428..49085673 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/compareDetail.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/compareDetail.js
@@ -6,8 +6,10 @@ import CustomTab from "../../components/customTab";
import { inject, observer } from "mobx-react";
import CompareDetailImportModal from "./compareDetailImportModal";
import CustomPaginationTable from "../../components/customPaginationTable";
+import { salaryacctAcctresultCheckAuth } from "../../apis/calculate";
+import Authority from "../mySalary/authority";
-@inject("calculateStore")
+@inject("calculateStore", "taxAgentStore")
@observer
export default class CompareDetail extends React.Component {
constructor(props) {
@@ -17,15 +19,14 @@ export default class CompareDetail extends React.Component {
onlyDiffEmployee: true,
onlyDiffSalaryItem: true,
importModalVisible: false,
- searchValue: ""
+ searchValue: "",
+ calculateAuth: false
};
this.pageInfo = { current: 1, pageSize: 10 };
}
componentWillMount() {
- let id = getQueryString("id");
- this.id = id;
-
+ this.id = getQueryString("id");
const { calculateStore: { fetchComparisonResultList } } = this.props;
const { onlyDiffEmployee, onlyDiffSalaryItem } = this.state;
let params = {
@@ -35,27 +36,50 @@ export default class CompareDetail extends React.Component {
current: 1
};
fetchComparisonResultList(params);
+ this.salaryacctAcctresultCheckAuth({ salaryAcctRecordId: getQueryString("id") })
}
- getColumns(columns) {
+ salaryacctAcctresultCheckAuth = (params) => {
+ const { taxAgentStore: { getPermission } } = this.props;
+ getPermission().then(({ data }) => {
+ const { isOpenDevolution } = data;
+ if (isOpenDevolution) {
+ salaryacctAcctresultCheckAuth(params).then(({ status, data }) => {
+ this.setState({ calculateAuth: data && status });
+ });
+ } else {
+ this.setState({ calculateAuth: true });
+ }
+ });
+ };
+
+ getColumns = (columns) => {
let newColumns = [...columns];
newColumns.map(item => {
let n = Number(item.dataIndex);
if (!isNaN(n)) { // 数字
item.render = (text, record) => {
+ const showDifference = record[`${item.dataIndex}_type`] === "number";
+ const { acctResultValue, excelResultValue } = record[item.dataIndex];
return (
+
+ this.handleChange("orderRule", val)}
+ />
+
+
+ this.handleChange("ascOrDesc", val)}
+ />
+
+
+
+
+ this.handleChange("rule", val)}
+ />
+
+
+ {
+ showEncryptOperationButton === "true" &&
+
+
+ this.handleChange("enctry", val)}/>
+
+
+ }
+
+
+ this.handleChange("operateTaxDeclaration", val)}/>
+
+
+ this.handleChange("withDrawTaxDeclaration", val)}/>
+
+
+
+
+ this.handleChange("confValue", val)}/>
+
+
+
+
+ this.handleChange("matchRule", val)}
+ />
+
+
{
this.state.progressVisible &&
{
this.setState({ progressVisible: false, progress: 0 });
@@ -336,8 +368,6 @@ class Index extends Component {
}
}
-export default Index;
-
export const Select = payload => {
const {
label,
@@ -351,7 +381,7 @@ export const Select = payload => {
} = payload;
return (
- {
this.handleSave()
@@ -142,7 +141,7 @@ this.handleChange({effectiveTime: value})
-)
+);
//分页计算
-export function calcPageNo (total, pageNo = 1, pageSize = 10, selectDelDataLen = 1) {
- const totalPage = Math.ceil((total - selectDelDataLen) / pageSize) // 总页数
- pageNo = pageNo > totalPage ? totalPage : pageNo
- pageNo = pageNo < 1 ? 1 : pageNo
- return pageNo
+export function calcPageNo(total, pageNo = 1, pageSize = 10, selectDelDataLen = 1) {
+ const totalPage = Math.ceil((total - selectDelDataLen) / pageSize); // 总页数
+ pageNo = pageNo > totalPage ? totalPage : pageNo;
+ pageNo = pageNo < 1 ? 1 : pageNo;
+ return pageNo;
}
+//金额格式化
+export const format_with_regex = (number) => {
+ return !(number + "").includes(".")
+ ? // 就是说1-3位后面一定要匹配3位
+ (number + "").replace(/\d{1,3}(?=(\d{3})+$)/g, (match) => {
+ return match + ",";
+ })
+ : (number + "").replace(/\d{1,3}(?=(\d{3})+(\.))/g, (match) => {
+ return match + ",";
+ });
+};
+
diff --git a/pc4mobx/hrmSalary/util/options.js b/pc4mobx/hrmSalary/util/options.js
index 13ef81e4..6d2fe74a 100644
--- a/pc4mobx/hrmSalary/util/options.js
+++ b/pc4mobx/hrmSalary/util/options.js
@@ -1,19 +1,19 @@
// 添加全部选项
export const optionAddAll = (options) => {
- let results = [...options];
- results.unshift({
- key: "All",
- showname: "全部",
- selected: false
- })
- return results;
-}
+ let results = [...options];
+ results.unshift({
+ key: "All",
+ showname: "全部",
+ selected: false
+ });
+ return results;
+};
export const optionAddWhole = (options) => {
- let results = [...options];
- results.unshift({
- key: "",
- showname: "全部",
- selected: false
- })
- return results;
-}
+ let results = [...options];
+ results.unshift({
+ key: "",
+ showname: "全部个税扣缴义务人",
+ selected: false
+ });
+ return results;
+};
diff --git a/pc4mobx/hrmSalary/util/url.js b/pc4mobx/hrmSalary/util/url.js
index 0ef96e1b..a69b4f81 100644
--- a/pc4mobx/hrmSalary/util/url.js
+++ b/pc4mobx/hrmSalary/util/url.js
@@ -22,3 +22,18 @@ export const getQueryString = (variable) => {
}
return null;
};
+
+export const convertToUrlString = (data) => {
+ const _result = [];
+ for (const key in data) {
+ const value = data[key];
+ if (value.constructor === Array) {
+ value.forEach(function (_value) {
+ _result.push(key + "=" + _value);
+ });
+ } else {
+ _result.push(key + "=" + value);
+ }
+ }
+ return _result.join("&");
+};
-
);
};
+ } else {
+ item.fixed = "left";
}
});
return newColumns;
- }
+ };
// 导入
handleImportClick() {
@@ -163,7 +187,7 @@ export default class CompareDetail extends React.Component {
comparisonResultColumns
}
} = this.props;
- const { importModalVisible, searchValue } = this.state;
+ const { importModalVisible, searchValue, calculateAuth } = this.state;
const renderRightOperation = () => {
return (
系统值：{record[item.dataIndex].acctResultValue}
- 线下值：{record[item.dataIndex].excelResultValue}
- 差值：{calculateCompares(record[item.dataIndex].acctResultValue, record[item.dataIndex].excelResultValue)}
+ 系统值：{acctResultValue}
+ 线下值：{excelResultValue}
+ {
+ showDifference &&
+
+ 差值：{calculateCompares(acctResultValue, excelResultValue)}
+
+ }
@@ -197,70 +221,70 @@ export default class CompareDetail extends React.Component {
);
};
return (
-
- 报税规则
-
-
- } showGroup center items={declareItems}/>
+
- this.setState({ selectedKey: v })}
+ />
+ }
+ {
+ selectedKey === "0" && _.map(itemsByGroup, item => {
+ return ;
+ })
+ }
+ {
+ selectedKey === "1" &&
+
);
}
diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/index.js b/pc4mobx/hrmSalary/pages/calculateDetail/index.js
index 668a798e..72ce7a6b 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/index.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/index.js
@@ -4,13 +4,16 @@ import { inject, observer } from "mobx-react";
import SalaryDetail from "./salaryDetail";
import { Button, Dropdown, Menu, message, Modal } from "antd";
import { WeaBrowser, WeaCheckbox, WeaDropdown, WeaFormItem, WeaInput, WeaSearchGroup, WeaSelect, WeaTab } from "ecCom";
-import { getQueryString } from "../../util/url";
+import { convertToUrlString, getQueryString } from "../../util/url";
import AcctResultImportModal from "./acctResult/importModal/acctResultImportModal";
import ProgressModal from "../../components/progressModal";
+import { salaryacctAcctresultCheckAuth } from "../../apis/calculate";
+import Authority from "../mySalary/authority";
+
const { ButtonSelect } = WeaDropdown;
-@inject("calculateStore", "salaryFileStore")
+@inject("calculateStore", "salaryFileStore", "taxAgentStore")
@observer
export default class CalculateDetail extends React.Component {
constructor(props) {
@@ -19,10 +22,11 @@ export default class CalculateDetail extends React.Component {
showSearchAd: false,
searchItemsValue: {
employeeName: "",
+ workcode: "",
departmentIds: "",
positionIds: "",
subcompanyIds: "",
- status: "",
+ statuses: "",
consolidatedTaxation: "0"
},
selectedKey: "0",
@@ -30,37 +34,55 @@ export default class CalculateDetail extends React.Component {
acctResultImportVisiable: false,
progressVisible: false,
progress: 0,
- accountIds: []
+ accountIds: [],
+ accountExceptInfo: "",
+ calculateAuth: false
};
this.id = "";
- this.timer;
+ this.timer = null;
}
- componentWillMount() {
+ async componentWillMount() {
let id = getQueryString("id");
this.id = id;
const { calculateStore: { checkTaxAgent }, salaryFileStore } = this.props;
const { commonEnumList } = salaryFileStore;
+ this.salaryacctAcctresultCheckAuth({ salaryAcctRecordId: id });
checkTaxAgent(this.id);
let modalParam = { ...this.state.modalParam, salaryAcctRecordId: id };
this.setState({ modalParam });
commonEnumList("user", { enumClass: "com.engine.salary.enums.salarysob.SalaryEmployeeStatusEnum" });
}
+ salaryacctAcctresultCheckAuth = (params) => {
+ const { taxAgentStore: { getPermission } } = this.props;
+ getPermission().then(({ data }) => {
+ const { isOpenDevolution } = data;
+ if (isOpenDevolution) {
+ salaryacctAcctresultCheckAuth(params).then(({ status, data }) => {
+ this.setState({ calculateAuth: data && status });
+ });
+ } else {
+ this.setState({ calculateAuth: true });
+ }
+ });
+ };
+
Input = (value, key) => {
- const { employeeName } = this.state.searchItemsValue;
+ const { employeeName, workcode } = this.state.searchItemsValue;
return (
- this.setState({
- searchItemsValue: {
- ...this.state.searchItemsValue,
- [key]: val
- }
- })}/>
+ this.setState({
+ searchItemsValue: {
+ ...this.state.searchItemsValue,
+ [key]: val
+ }
+ })}/>
);
};
@@ -93,7 +115,7 @@ export default class CalculateDetail extends React.Component {
);
};
Select = (value, key) => {
- const { status } = this.state.searchItemsValue;
+ const { statuses } = this.state.searchItemsValue;
return (
this.setState({ searchItemsValue: { ...this.state.searchItemsValue, [key]: val } })}/>
@@ -160,7 +185,8 @@ export default class CalculateDetail extends React.Component {
this.timer = null;
this.setState({
progressVisible: false,
- accountIds: []
+ accountIds: [],
+ accountExceptInfo: data.message
});
message.success("核算完成");
// acctResultList({ salaryAcctRecordId: this.id });
@@ -172,7 +198,7 @@ export default class CalculateDetail extends React.Component {
url: "/api/bs/hrmsalary/salaryacct/acctresult/list",
selectedRowKeys: [],
queryParams: {
- salaryAcctRecordId,
+ salaryAcctRecordId
}
};
childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*");
@@ -181,7 +207,8 @@ export default class CalculateDetail extends React.Component {
this.timer = null;
this.setState({
progressVisible: false,
- accountIds: []
+ accountIds: [],
+ accountExceptInfo: data.message
});
message.error(data.message);
}
@@ -189,8 +216,6 @@ export default class CalculateDetail extends React.Component {
});
}, 1000);
});
- },
- onCancel() {
}
});
};
@@ -208,8 +233,11 @@ export default class CalculateDetail extends React.Component {
this.id
);
} else if (e.key == "3") {
+ const { searchItemsValue } = this.state;
+ const { consolidatedTaxation, ...extra } = searchItemsValue;
+ const payload = { ...extra, consolidatedTaxation: consolidatedTaxation === "0" ? "" : consolidatedTaxation };
window.open(
- "/api/bs/hrmsalary/salaryacct/acctresult/export?salaryAcctRecordId=" + this.id + "&ids="
+ `/api/bs/hrmsalary/salaryacct/acctresult/export?salaryAcctRecordId=${this.id}&ids=&${convertToUrlString(payload)}`
);
}
};
@@ -246,8 +274,18 @@ export default class CalculateDetail extends React.Component {
}
}
+ 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();
+ };
+
render() {
- const { selectedKey, acctResultImportVisiable, showSearchAd } = this.state;
+ const { selectedKey, acctResultImportVisiable, showSearchAd, calculateAuth } = this.state;
+ const { taxAgentStore: { payrollPermission } } = this.props;
const menu = (
- } showGroup center items={enctryItems}/>
-
- {
+ this.handleComparisonFinish();
+ }}
+ onCancel={() => {
+ this.setState({
+ importModalVisible: false
+ });
+ }}
+ />
+ }
+
+
);
}
}
// 计算差值
-export const calculateCompares=(systemValue, excelValue)=> {
- if (systemValue == null || excelValue == null) {
- return "";
- }
- let systemNum = Number(systemValue);
- let excelNum = Number(excelValue);
- if (!isNaN(systemNum) || !isNaN(excelNum)) { // 数字
- return (systemNum - excelNum).toFixed(2);
- }
- return "";
-}
+export const calculateCompares = (systemValue = 0, excelValue = 0) => {
+ const systemNum = Number(systemValue);
+ const excelNum = Number(excelValue);
+ return (systemNum - excelNum).toFixed(2);
+};
diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/compareDetailImportModal.js b/pc4mobx/hrmSalary/pages/calculateDetail/compareDetailImportModal.js
index 1c276127..9fc924e1 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/compareDetailImportModal.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/compareDetailImportModal.js
@@ -1,7 +1,7 @@
import React from "react";
import ImportModal from "../../components/importModal";
import { inject, observer } from "mobx-react";
-import { getQueryString } from "../../util/url";
+import { convertToUrlString, getQueryString } from "../../util/url";
@inject("calculateStore", "standingBookStore")
@observer
@@ -35,7 +35,12 @@ export default class CompareDetailImportModal extends React.Component {
if (this.props.id) {
url = "/api/bs/hrmsalary/salaryacct/comparisonresult/importtemplate/export?salaryAcctRecordId=" + this.props.id;
} else {
- url = `/api/bs/hrmsalary/siaccount/comparisonwelfare/importtemplate/export`;
+ const payload = {
+ billMonth: getQueryString("billMonth"),
+ paymentOrganization: getQueryString("paymentOrganization"),
+ paymentStatus: 0
+ };
+ url = `/api/bs/hrmsalary/siaccount/comparisonwelfare/importtemplate/export?${convertToUrlString(payload)}`;
}
window.open(url);
}
diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/editSalaryDetail.js b/pc4mobx/hrmSalary/pages/calculateDetail/editSalaryDetail.js
index 385fa87b..2051451d 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/editSalaryDetail.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/editSalaryDetail.js
@@ -1,41 +1,55 @@
import React from "react";
-import { WeaHelpfulTip, WeaInput } from "ecCom";
-import { Col, Row } from "antd";
+import { WeaHelpfulTip, WeaTab } from "ecCom";
+import IssuedAndReissueTable from "./issuedAndReissueTable";
+import PayrollItemsTable from "./payrollItemsTable";
import { inject, observer } from "mobx-react";
-import cs from "classnames";
+import { toJS } from "mobx";
import "./index.less";
@inject("calculateStore")
@observer
export default class EditSalaryDetail extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ selectedKey: "0"
+ };
+ }
+
componentWillMount() {
const { calculateStore: { acctresultDetail } } = this.props;
acctresultDetail(this.props.id);
}
- handleItemValueChange(field, value, isInput) {
+ handleItemValueChange = (field, value, isInput, groupId) => {
const { calculateStore: { acctresultDetailForm, setAcctresultDetailForm } } = this.props;
let form = { ...acctresultDetailForm };
- if (isInput) {
- form.inputItems = acctresultDetailForm.inputItems.map(item => {
- item = { ...item };
- if (item.salaryItemName == field) {
- item.resultValue = value;
+ if (isInput === "itemsByGroup") {
+ form.itemsByGroup = acctresultDetailForm.itemsByGroup.map(item => {
+ if (item.salarySobItemGroupId === groupId) {
+ return {
+ ...item,
+ salaryItems: _.map(item.salaryItems, it => {
+ if (it.salaryItemId === field) {
+ return { ...it, resultValue: value };
+ }
+ return { ...it };
+ })
+ };
}
- return item;
+ return { ...item };
});
- } else {
- form.formulaItems = acctresultDetailForm.formulaItems.map(item => {
+ } else if (isInput === "issuedAndReissueItems") {
+ form.issuedAndReissueItems = acctresultDetailForm.issuedAndReissueItems.map(item => {
item = { ...item };
- if (item.salaryItemName == field) {
+ if (item.salaryItemName === field) {
item.resultValue = value;
}
return item;
});
}
setAcctresultDetailForm(form);
- }
-
+ };
renderTableTr = (data, isInput) => {
const tables = [];
const len = data.length;
@@ -59,22 +73,27 @@ export default class EditSalaryDetail extends React.Component {
return tables;
};
-
render() {
const { calculateStore: { acctresultDetailForm } } = this.props;
+ const { selectedKey } = this.state;
+ const { itemsByGroup = [] } = toJS(acctresultDetailForm);
+ const topTab = [
+ {
+ title: "正常工资薪金所得",
+ viewcondition: "0"
+ },
+ {
+ title: "已发补发",
+ viewcondition: "1"
+ }
+ ];
return (
- 公式=
- 系统值；线下值；差值
+
+ {
- this.handleComparisonFinish();
- }}
- onCancel={() => {
- this.setState({
- importModalVisible: false
- });
- }}
- />
- }
-
+ {
+ importModalVisible &&
+
-
+
-
+ 公式=
+ 系统值；线下值；差值
+
- {
- this.pageInfo.current = value;
- this.handleDataPageChange(value);
- }}
- onShowSizeChange={(current, pageSize) => {
- this.pageInfo = { current, pageSize };
- this.handleShowSizeChange(this.pageInfo);
- }}
- />
-
+
+ {
+ this.pageInfo.current = value;
+ this.handleDataPageChange(value);
+ }}
+ onShowSizeChange={(current, pageSize) => {
+ this.pageInfo = { current, pageSize };
+ this.handleShowSizeChange(this.pageInfo);
+ }}
+ />
+
- {
- importModalVisible &&
基本信息
-
-
{
!_.isEmpty(acctresultDetailForm.employeeInfos) &&
@@ -84,73 +103,27 @@ export default class EditSalaryDetail extends React.Component {
}
-
-
-
-
- 输入项
-
-
-
- {
- acctresultDetailForm.inputItems && acctresultDetailForm.inputItems.map((item, index) => {
- const len = acctresultDetailForm.inputItems.length;
- return (
-
- {
- this.handleItemValueChange(item.salaryItemName, value, true);
- }}/>
-
-
- );
- })
- }
-
-
-
-
+ {
+ !_.isEmpty(toJS(acctresultDetailForm.issuedAndReissueItems)) &&
+
-
- 公式项
-
-
-
- {
- acctresultDetailForm.formulaItems && acctresultDetailForm.formulaItems.map((item, index) => {
- const len = acctresultDetailForm.formulaItems.length;
- return (
-
- {
- this.handleItemValueChange(item.salaryItemName, value, false);
- }}/>
-
-
- );
- })
- }
-
-
-