);
+ });
+ return group;
+ };
+
+ render() {
+ const { ledgerStore: { searchForm } } = this.props;
+ return (
+
+ {this.formRender(searchForm, searchConditions)}
+
+
+ );
+ }
+}
+
+export default LedgerSearchComp;
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/config.js b/pc4mobx/hrmSalary/pages/ledgerPage/config.js
index 1a9f3717..0c56f799 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/config.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/config.js
@@ -27,6 +27,38 @@ export const copyConditions = [
defaultshow: true
}
];
+export const searchConditions = [
+ {
+ items: [
+ {
+ colSpan: 1,
+ conditionType: "INPUT",
+ domkey: ["name"],
+ fieldcol: 24,
+ otherParams: {
+ placeholder: "请输入薪资账套名称"
+ },
+ lanId: 543431,
+ labelcol: 0,
+ value: "",
+ viewAttr: 2
+ },
+ {
+ colSpan: 1,
+ conditionType: "SELECT",
+ domkey: ["taxAgentId"],
+ fieldcol: 24,
+ placeholder: "请选择个税扣缴义务人",
+ lanId: 543234,
+ label: "",
+ labelcol: 0,
+ value: "",
+ viewAttr: 2
+ }
+ ],
+ defaultshow: true
+ }
+];
export const categoryConditions = [
{
items: [
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/index.js b/pc4mobx/hrmSalary/pages/ledgerPage/index.js
index 9cef3433..30db032d 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/index.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/index.js
@@ -10,6 +10,7 @@ import { WeaInputSearch, WeaTop } from "ecCom";
import { Button } from "antd";
import LedgerTable from "./components/ledgerTable";
import LedgerSlide from "./components/ledgerSlide";
+import LedgerSearchComp from "./components/ledgerSearchComp";
import "./index.less";
@inject("taxAgentStore")
@@ -60,11 +61,12 @@ class Index extends Component {
type="primary"
onClick={() => this.setState({ slideparams: { ...slideparams, visible: true } })}
>新建,
- this.setState({ searchVal })}
- onSearch={() => this.setState({ doSearch: !doSearch })}
- />
+
+ // this.setState({ searchVal })}
+ // onSearch={() => this.setState({ doSearch: !doSearch })}
+ // />
];
return (
button {
+ position: absolute;
+ right: -70px;
+ top: 0;
+ }
+
+ .wea-search-group, .wea-content {
+ padding: 0;
+ }
+
+ .wea-form-cell-wrapper {
+ & > div.wea-form-cell {
+ padding: 0;
+
+ .wea-form-item {
+ padding: 0;
+ }
+ }
+
+ & > div.wea-form-cell:first-child {
+ padding-right: 10px;
+ }
+ }
+}
diff --git a/pc4mobx/hrmSalary/stores/ledger.js b/pc4mobx/hrmSalary/stores/ledger.js
index d1a0860c..8dc46dc8 100644
--- a/pc4mobx/hrmSalary/stores/ledger.js
+++ b/pc4mobx/hrmSalary/stores/ledger.js
@@ -12,6 +12,7 @@ export class LedgerStore {
//重构薪资账套
@observable copyForm = new WeaForm(); // 复制form
@observable categoryForm = new WeaForm(); // 新增分类form
+ @observable searchForm = new WeaForm(); // 查询form
/*******************************************************/