-
} iconBgcolor="#F14A2D"
- showDropIcon onDropMenuClick={this.onDropMenuClick}
- dropMenuDatas={[
- {
- key: "import",
- icon:
,
- content: getLabel(111, "导入")
- },
- {
- key: "export",
- icon:
,
- content: getLabel(111, "导出")
- },
- {
- key: "log", icon:
,
- content: getLabel(545781, "操作日志")
- }
- ]} buttons={(showOperateBtn || showSalaryItemBtn) ? buttons : buttons.slice(-1)}>
-
-
- record.id}
- loading={loading}
- rowSelection={rowSelection}
- dataSource={tableDataSource}
- columns={this.getColumns(tableColumns)}
- total={this.state.searchParams.total}
- current={this.state.searchParams.current}
- pageSize={this.state.searchParams.pageSize}
- onPageChange={(value) => {
- this.handlePageChange(value);
- }}
- onShowSizeChange={(current, pageSize) => {
- this.setState({
- searchParams: {
- ...this.state.searchParams,
- current,
- pageSize
- }
- }, () => {
- this.handleShowSizeChange({ name: this.state.searchValue, ...this.state.searchParams });
- });
- }}
- />
-
+
+ } iconBgcolor="#F14A2D"
+ buttons={buttons} showDropIcon onDropMenuClick={this.onDropMenuClick} dropMenuDatas={dropMenuDatas}
+ className="salaryProjectManagement">
+
+ this.setState({ selectedRowKeys: val })}/>
+ {/*添加系统薪资项目*/}
+ this.setState({ isQuery: !isQuery })}
+ onCancel={(callback) => this.setState({ sysVisible: false }, () => callback && callback())}/>
+ {/*同步薪资账套*/}
this.setState({
- syncSalarySetDialog: {
- ...this.state.syncSalarySetDialog,
- visible: false, title: ""
- }
- })}
- />
+ onCancel={() => this.setState({ syncSalarySetDialog: { visible: false, id: "" } })}/>
{/*操作日志*/}
this.setState({ logDialogVisible: false })}/>
@@ -436,61 +203,15 @@ export default class SalaryItem extends React.Component {
onCancel={callback => {
this.setState({
salaryItemImpDialog: { ...salaryItemImpDialog, visible: false }
- }, () => callback && this.handleSearch(this.state.searchValue));
+ }, () => callback && this.setState({ isQuery: !isQuery }));
}}/>
- {
- systemItemVisible &&
- {
- setSystemItemVisible(false);
- }}
- onInitTableList={() => {
- getTableDatas({ ...this.state.searchParams, name: this.state.searchValue }).then(res => {
- this.setState({
- searchParams: {
- ...this.state.searchParams,
- total: res.total
- }
- });
- });
- }}
- />
- }
- {
- editSlideVisible &&
-
- }
- content={
- {
- handleSaveSlideChange(value);
- }}/>
- }
- onClose={() => setEditSlideVisible(false)}
- />
- }
-
+ {/*新增编辑自定义薪资项目*/}
+
this.setState({ isQuery: !isQuery })}
+ showOperateBtn={showOperateBtn}
+ onClose={callback => this.setState({
+ customItemDialog: { ...customItemDialog, visible: false, id: "" }
+ }, () => callback && callback())}/>
+
);
}
}
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.less b/pc4mobx/hrmSalary/pages/salaryItem/index.less
index 1d28f1ca..cf539484 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/index.less
+++ b/pc4mobx/hrmSalary/pages/salaryItem/index.less
@@ -1,3 +1,91 @@
+//薪资项目重构项
+.salaryProjectManagement {
+ .wea-input-focus {
+ height: 31.36px;
+ line-height: 0;
+ }
+
+ .salaryItems_content {
+ height: 100%;
+ padding: 8px 16px;
+ background: #f6f6f6;
+
+ .wea-new-table {
+ background: #FFFFFF;
+ }
+ }
+
+}
+
+.custom_salaryItemSlide {
+ .wea-slide-modal-title {
+ border-bottom: 1px solid #e5e5e5 !important;
+ }
+
+ .wea-slide-modal-content {
+ height: 100%;
+ background: #f6f6f6;
+
+ .wea-form-item-wrapper {
+ //display: block !important;
+
+ .formula_input_div {
+ cursor: pointer;
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ z-index: 2;
+ }
+ }
+ }
+
+ .titleDialog {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 0 46px 0 16px;
+
+ .titleCol {
+ flex: 1;
+ display: flex;
+ align-items: center;
+ }
+
+ .titleLeftBox {
+ .titleIcon {
+ color: #fff;
+ margin: 0;
+ width: 40px;
+ height: 40px;
+ line-height: 40px;
+ font-size: 22px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background: #F14A2D;
+ border-radius: 50%;
+ }
+
+ .title {
+ font-size: 14px;
+ color: #333;
+ padding-left: 6px;
+ }
+ }
+
+ .titleRightBox {
+ justify-content: flex-end;
+
+ button {
+ margin-left: 10px;
+ }
+ }
+ }
+}
+
+
.customSalaryItemSlide {
padding: 16px;
@@ -62,20 +150,20 @@
//系统薪资项添加modal
.sys-salary-wrapper {
- .wea-dialog-body {
- height: 50vh;
- overflow: hidden auto;
+ .sys-item-title {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ }
- .headerSearchWrapper {
- display: flex;
- justify-content: flex-end;
- align-items: center;
- padding: 16px 20px;
+ .sys-item-table-box {
+ width: 100%;
+ height: 100%;
+ background: #F6F6F6;
+ padding: 8px 16px;
- .wea-tab {
- width: 100%;
- border-bottom: none;
- }
+ .wea-new-table {
+ background: #FFFFFF;
}
}
}
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/options.js b/pc4mobx/hrmSalary/pages/salaryItem/options.js
index 58e64e3e..e7ac5f78 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/options.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/options.js
@@ -25,7 +25,6 @@ export const roundingModeOptions = [
showname: "见分进角"
}
];
-
export const patternOptions = [
{
key: "0",
@@ -83,7 +82,6 @@ export const patternOptions = [
selected: false
}
];
-
export const dataTypeOptions = [
{
key: "number",
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemsTable.js b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemsTable.js
new file mode 100644
index 00000000..56de78a7
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemsTable.js
@@ -0,0 +1,111 @@
+/*
+ * 薪资项目管理
+ * 表格
+ * @Author: 黎永顺
+ * @Date: 2024/8/16
+ * @Wechat:
+ * @Email: 971387674@qq.com
+ * @description:
+*/
+import React, { Component } from "react";
+import { WeaCheckbox, WeaLocaleProvider, WeaTable } from "ecCom";
+import { Dropdown, Menu, Spin } from "antd";
+import * as API from "../../apis/item";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+class SalaryItemsTable extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ loading: false, columns: [], dataSource: [],
+ pageInfo: { current: 1, pageSize: 10, total: 0 }
+ };
+ }
+
+ componentDidMount() {
+ this.getItemList(this.props);
+ }
+
+ componentWillReceiveProps(nextProps, nextContext) {
+ if (nextProps.isQuery !== this.props.isQuery) this.setState({
+ pageInfo: { ...this.state.pageInfo, current: 1 }
+ }, () => this.getItemList(nextProps));
+ }
+
+ getItemList = (props) => {
+ const { name } = props;
+ const { pageInfo } = this.state;
+ const payload = { name, ...pageInfo };
+ this.setState({ loading: true });
+ API.getItemList(payload).then(({ status, data }) => {
+ this.setState({ loading: false });
+ if (status) {
+ const { columns, list: dataSource, pageNum: current, pageSize, total } = data;
+ this.setState({
+ dataSource, pageInfo: { ...pageInfo, current, pageSize, total },
+ columns: _.map(columns, o => {
+ if (o.dataIndex === "useDefault" || o.dataIndex === "hideDefault" || o.dataIndex === "useInEmployeeSalary") {
+ return { ...o, width: 80, render: text => };
+ }
+ return { ...o };
+ })
+ });
+ }
+ });
+ };
+
+ render() {
+ const { dataSource, columns, pageInfo, loading } = this.state;
+ const { selectedRowKeys, onChange, onDropMenuClick, showOperateBtn } = this.props;
+ const pagination = {
+ ...pageInfo,
+ showTotal: total => `${getLabel(111, "共")} ${total} ${getLabel(111, "条")}`,
+ showQuickJumper: true,
+ showSizeChanger: true,
+ pageSizeOptions: ["10", "20", "50", "100"],
+ onShowSizeChange: (current, pageSize) => {
+ this.setState({
+ pageInfo: { ...pageInfo, current, pageSize }
+ }, () => this.getItemList(this.props));
+ },
+ onChange: current => {
+ this.setState({ pageInfo: { ...pageInfo, current } }, () => this.getItemList(this.props));
+ }
+ };
+ const rowSelection = {
+ selectedRowKeys, onChange,
+ getCheckboxProps: record => ({ disabled: !record.canDelete })
+ };
+ return (
+ (
+ onDropMenuClick("edit", record.id)}
+ href="javascript:void(0);">{showOperateBtn ? getLabel(111, "编辑") : getLabel(111, "查看")}
+ {
+ showOperateBtn && record.canDelete &&
+ onDropMenuClick("delete", record.id)}>{getLabel(111, "删除")}
+ }
+
+
+ onDropMenuClick("log", record.id)}>{getLabel(545781, "操作日志")}
+
+
+ }>
+
+
+ )
+ }
+ ]}/>
+ );
+ }
+}
+
+export default SalaryItemsTable;
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/syncToSalaryAccountSetDialog.js b/pc4mobx/hrmSalary/pages/salaryItem/syncToSalaryAccountSetDialog.js
index 797a6466..d7d11617 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/syncToSalaryAccountSetDialog.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/syncToSalaryAccountSetDialog.js
@@ -51,7 +51,6 @@ class SyncToSalaryAccountSetDialog extends Component {
}
});
};
-
save = () => {
const { salaryItemStore: { salarySetform }, id: salaryItemId } = this.props;
salarySetform.validateForm().then(f => {
@@ -79,14 +78,12 @@ class SyncToSalaryAccountSetDialog extends Component {
const { conditions } = this.state;
return (
(pre += cur.items.length), 0) * 47 + 33 }}
buttons={[]}
>
-
- {getSearchs(salarySetform, conditions, 1)}
-
+ {getSearchs(salarySetform, conditions, 1, false)}
);
}
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/systemSalaryItemModal.js b/pc4mobx/hrmSalary/pages/salaryItem/systemSalaryItemModal.js
index 2e7d169f..1ba632af 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/systemSalaryItemModal.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/systemSalaryItemModal.js
@@ -1,8 +1,7 @@
import React from "react";
-import { WeaDialog, WeaLocaleProvider, WeaTab } from "ecCom";
-import { Button, message } from "antd";
+import { WeaDialog, WeaInputSearch, WeaLocaleProvider, WeaTable } from "ecCom";
+import { Button, message, Spin } from "antd";
import { getSysItemList, saveSysItem } from "../../apis/item";
-import UnifiedTable from "../../components/UnifiedTable";
import "./index.less";
const { getLabel } = WeaLocaleProvider;
@@ -10,20 +9,16 @@ export default class SystemSalaryItemModal extends React.Component {
constructor(props) {
super(props);
this.state = {
- dataSource: [],
- columns: [],
- name: "",
- loading: false,
- saveLoading: false,
- selectedRowKeys: [],
- pageInfo: {
- current: 1, pageSize: 10, total: 0
- }
+ dataSource: [], columns: [], name: "", loading: false, saveLoading: false,
+ selectedRowKeys: [], pageInfo: { current: 1, pageSize: 10, total: 0 }
};
}
- componentDidMount() {
- this.getSysItemList();
+ componentWillReceiveProps(nextProps, nextContext) {
+ if (nextProps.visible !== this.props.visible && nextProps.visible) this.getSysItemList();
+ if (nextProps.visible !== this.props.visible && !nextProps.visible) this.setState({
+ selectedRowKeys: [], name: ""
+ });
}
getSysItemList = () => {
@@ -33,41 +28,33 @@ export default class SystemSalaryItemModal extends React.Component {
this.setState({ loading: false });
if (status) {
const { columns, list: dataSource, pageNum: current, pageSize, total } = data;
- this.setState({
- columns: _.map(columns, item => {
- return {
- ...item,
- render: (text) => {
- return {text};
- }
- };
- }),
- dataSource,
- pageInfo: { ...pageInfo, current, pageSize, total }
- });
+ this.setState({ columns, dataSource, pageInfo: { ...pageInfo, current, pageSize, total } });
}
}).catch(() => this.setState({ loading: false }));
};
handleAdd = () => {
const { selectedRowKeys } = this.state;
- if (_.isEmpty(selectedRowKeys)) {
- message.info(getLabel(111, "未选择任何条目"));
- return;
- }
this.setState({ saveLoading: true });
saveSysItem(selectedRowKeys).then(({ status, errormsg }) => {
this.setState({ saveLoading: false });
if (status) {
message.success(getLabel(111, "添加成功"));
- this.setState({ selectedRowKeys: [] }, () => {
- this.props.onInitTableList();
- this.props.onCancel();
- });
+ this.setState({ selectedRowKeys: [] }, () => this.props.onCancel(this.props.onSearch()));
} else {
message.error(errormsg);
}
}).catch(() => this.setState({ saveLoading: false }));
};
+ renderTitle = () => {
+ const { name, pageInfo } = this.state;
+ return
+ {getLabel(111, "添加系统薪资项目")}
+ this.setState({ name: val })} style={{ width: 200 }}
+ placeholder={getLabel(111, "请输入薪资项目名称")} onSearch={() => this.setState({
+ pageInfo: { ...pageInfo, current: 1 }
+ }, () => this.getSysItemList())}/>
+
;
+ };
render() {
const { selectedRowKeys, pageInfo, loading, columns, dataSource, saveLoading } = this.state;
@@ -95,33 +82,20 @@ export default class SystemSalaryItemModal extends React.Component {
onChange: (selectedRowKeys) => this.setState({ selectedRowKeys })
};
return (
- {
- this.setState({ selectedRowKeys: [] }, () => {
- this.props.onCancel();
- });
- }} style={{ width: "60vw" }} scalable
- buttons={[
-
- ]}
- >
-
-
this.setState({ name })}
- onSearch={this.getSysItemList}
- />
+ this.sysItemRef = dom}
+ style={{
+ width: "60vw", height: 600, minHeight: 200, minWidth: 380,
+ maxHeight: "90%", maxWidth: "90%", overflow: "hidden", transform: "translate(0px, 0px)"
+ }} title={this.renderTitle()}
+ buttons={[]}>
+
+
+
+
-
);
}
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js
index 2f5cda63..040986a0 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js
@@ -60,7 +60,8 @@ class StandingBook extends Component {
progressVisible: true
}, () => {
this.timer = setInterval(() => {
- getCalculateProgress(moment(billMonth).format("YYYY-MM"), payload.paymentOrganization).then(({ status, data }) => {
+ getCalculateProgress(moment(billMonth).format("YYYY-MM"), payload.paymentOrganization)
+ .then(({ status, data }) => {
if (status) {
if (!data.status) {
clearInterval(this.timer);
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less
index 235eba25..c7117046 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less
@@ -4,12 +4,16 @@
height: 100%;
background: #f6f6f6;
+ .wea-tab {
+ border-bottom: none !important;
+ }
+
.wea-new-top-req-wapper .wea-new-top-req {
z-index: 0 !important;
}
.wea-search-tab, .wea-input-focus {
- background: #f6f6f6;
+ background: #f1f1f1;
}
.normalWapper {
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js
index e2342e93..e00b4f83 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js
@@ -116,7 +116,7 @@ class Index extends Component {
} else if (getKey(g).indexOf("StartTime") !== -1) {
return {
...g, label: getLabel(g.lanId, g.label),
- viewAttr: (formData[o["typename"]][`${o.title}Name`] && showOperateBtn) ? 3 : g.viewAttr
+ viewAttr: (runStatuses === "4,5" || !showOperateBtn) ? 1 : (formData[o["typename"]][`${o.title}Name`] && showOperateBtn) ? 3 : g.viewAttr
};
}
return {
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/planSetTable.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/planSetTable.js
index 10751d50..aa3942b0 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/planSetTable.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/planSetTable.js
@@ -84,7 +84,7 @@ class PlanSetTable extends Component {
com: [{
type: "custom",
key: "custom",
- render: text => ({text})
+ render: text => ({text})
}]
},
{
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.less b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.less
index 5566cc8e..0c19ca25 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.less
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.less
@@ -232,6 +232,14 @@
text-overflow: ellipsis;
overflow: hidden;
}
+
+ .text-td-elli {
+ display: inline-block;
+ width: 120px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
}
}
}
diff --git a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
index 7813cde7..8e9d740e 100644
--- a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
+++ b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
@@ -46,29 +46,20 @@ class Index extends Component {
...item, items: _.map(item.items, o => {
if (getKey(o) === "taxAgentIds") {
return {
- ...o,
- viewAttr: !_.isEmpty(detail) ? 1 : 3,
- label: getLabel(o.lanId, o.label),
+ ...o, viewAttr: !_.isEmpty(detail) ? 1 : 3, label: getLabel(o.lanId, o.label),
value: detail[getKey(o)] || "",
options: _.map(taxAgentOption, (o, i) => ({ key: o.id, showname: o.content }))
};
}
return {
- ...o,
- viewAttr: !_.isEmpty(detail) ? 1 : 3,
- label: getLabel(o.lanId, o.label),
+ ...o, viewAttr: !_.isEmpty(detail) ? 1 : 3, label: getLabel(o.lanId, o.label),
value: detail[getKey(o)] || ""
};
})
})), {
items: _.map(data, o => ({
- conditionType: "INPUT",
- domkey: [String(o.id)],
- fieldcol: 14,
- label: o.name,
- labelcol: 6,
- value: detail[`${String(o.id)}_variableItem`] || "",
- viewAttr: 2
+ conditionType: "INPUT", domkey: [String(o.id)], fieldcol: 14, label: o.name, labelcol: 6,
+ value: detail[`${String(o.id)}_variableItem`] || "", viewAttr: 2, dataType: o.dataType
})), title: "", col: 2, defaultshow: true
}]
}, () => {
@@ -76,8 +67,7 @@ class Index extends Component {
if (!_.isEmpty(detail)) {
VSSalaryFileForm.updateFields({
employeeId: {
- value: detail["employeeId"],
- valueSpan: detail["username"],
+ value: detail["employeeId"], valueSpan: detail["username"],
valueObj: [{ id: detail["employeeId"], name: detail["username"] }]
}
});
@@ -128,6 +118,19 @@ class Index extends Component {
{getSearchs(VSSalaryFileForm, conditions, 2, false)}
}
+ content={{getSearchs(VSSalaryFileForm, conditions, 2, false, this.handleChange)}
}
/>);
}
}
diff --git a/pc4mobx/hrmSalary/stores/baseForm.js b/pc4mobx/hrmSalary/stores/baseForm.js
index 3eb3a57e..29cdc064 100644
--- a/pc4mobx/hrmSalary/stores/baseForm.js
+++ b/pc4mobx/hrmSalary/stores/baseForm.js
@@ -10,12 +10,9 @@ const getLabel = WeaLocaleProvider.getLabel;
export class BaseFormStore {
@observable form = new WeaForm(); // 规则渲染form
-
- @observable logStore = new LogStore();
- @observable condition = []; // 存储后台得到的form数据
- @observable saveLoading = false; // 保存状态处理：保证保存的时候接口只走一次
- @observable loading = true; // 页面初始化的loading状态：数据加载成功前后前使用
- @observable hasRight = true; // 判断用户是有权限查看当前页面： 没有权限渲染无权限页面，有权限渲染数据
+ @action("初始化form表单") initForm = () => this.form = new WeaForm();
+ @observable formExtra = new WeaForm(); // 规则渲染form
+ @action("初始化form表单") initFormExtra = () => this.formExtra = new WeaForm();
@observable logVisible = false; // 控制日志弹框的显影
@action // 初始化操作： 一般用来初始化获取后台数据
diff --git a/pc4mobx/hrmSalary/stores/salaryItem.js b/pc4mobx/hrmSalary/stores/salaryItem.js
index cc3a0214..45f30171 100644
--- a/pc4mobx/hrmSalary/stores/salaryItem.js
+++ b/pc4mobx/hrmSalary/stores/salaryItem.js
@@ -9,6 +9,9 @@ const { TableStore } = WeaTableNew;
export class SalaryItemStore {
@observable salarySetform = new WeaForm(); //同步薪资账套form
+ @observable itemsForm = new WeaForm(); //自定义薪资项目form
+ @action initItemsForm = () => this.itemsForm = new WeaForm();
+
@observable tableStore = new TableStore(); // new table
@observable sysListTableStore = new TableStore();
diff --git a/pc4mobx/hrmSalary/style/index.less b/pc4mobx/hrmSalary/style/index.less
index c1425339..a30c6151 100644
--- a/pc4mobx/hrmSalary/style/index.less
+++ b/pc4mobx/hrmSalary/style/index.less
@@ -39,6 +39,10 @@
.form-dialog-layout {
background: #f6f6f6;
+ .wea-form-item-wrapper {
+ display: block !important;
+ }
+
.wea-form-item .wea-form-item-wrapper .wea-field-readonly {
line-height: 28px;
}
@@ -134,3 +138,10 @@
}
}
+//公共表格操作按钮间距
+.space_div {
+ a:not(:last-child) {
+ margin-right: 8px;
+ }
+}
+
diff --git a/pc4mobx/hrmSalary/util/index.js b/pc4mobx/hrmSalary/util/index.js
index 0ce4532f..0b63ffda 100644
--- a/pc4mobx/hrmSalary/util/index.js
+++ b/pc4mobx/hrmSalary/util/index.js
@@ -36,19 +36,20 @@ export const getSearchs = (form, condition, col, isCenter, onChange = () => void
items.push({
com: (
+ {`${fields.label}`}
+ {
+ fields.labelExtra && onChange(fields.labelType)}>{fields.labelExtra}
+ }
+ } // label 标签的文本
labelCol={{ span: `${fields.labelcol}` }} // label标签占一行比例
wrapperCol={{ span: `${fields.fieldcol}` }} // 右侧控件占一行比例
error={form.getError(fields)} // 错误提示: 处理表单中有必填项,保存的校验
tipPosition="bottom" // 错误提示的显示位置: top/bottom
className={(fields.domkey[0] === "subcompanyName" || fields.domkey[0] === "departmentName") ? "hideFormItem" : classnames}
>
-
+
{
fields.helpfulTitle &&