Merge branch 'liys_dev' into dev
This commit is contained in:
commit
821c46bb9d
|
|
@ -2,9 +2,9 @@
|
||||||
* Author: 黎永顺
|
* Author: 黎永顺
|
||||||
* Description: 分部编号设置
|
* Description: 分部编号设置
|
||||||
* Date: 2022-05-17 14:30:57
|
* Date: 2022-05-17 14:30:57
|
||||||
* LastEditTime: 2022-05-17 17:18:36
|
* LastEditTime: 2022-05-18 14:13:24
|
||||||
*/
|
*/
|
||||||
import React, { Component } from "react";
|
import React, { Component, Fragment } from "react";
|
||||||
import { Button } from "antd";
|
import { Button } from "antd";
|
||||||
import { WeaTop, WeaFormItem, WeaCheckbox, WeaSearchGroup } from "ecCom";
|
import { WeaTop, WeaFormItem, WeaCheckbox, WeaSearchGroup } from "ecCom";
|
||||||
import StartReservedNumberSet from "./components/startReservedNumberSet";
|
import StartReservedNumberSet from "./components/startReservedNumberSet";
|
||||||
|
|
@ -77,16 +77,23 @@ export default class BranchNumSetting extends Component {
|
||||||
</WeaFormItem>
|
</WeaFormItem>
|
||||||
</div>
|
</div>
|
||||||
{/* 内容区 */}
|
{/* 内容区 */}
|
||||||
<div className="numberComposition">
|
{checkVal === "1" && (
|
||||||
<WeaSearchGroup title={"编号组成"} showGroup>
|
<Fragment>
|
||||||
<NumberComposition />
|
<div className="numberComposition">
|
||||||
</WeaSearchGroup>
|
<WeaSearchGroup title={"编号组成"} showGroup>
|
||||||
</div>
|
<NumberComposition />
|
||||||
<div className="startReservedNumberSet">
|
</WeaSearchGroup>
|
||||||
<WeaSearchGroup title={"起始编号及预留编号设置"} showGroup center>
|
</div>
|
||||||
<StartReservedNumberSet />
|
<div className="startReservedNumberSet">
|
||||||
</WeaSearchGroup>
|
<WeaSearchGroup
|
||||||
</div>
|
title={"起始编号及预留编号设置"}
|
||||||
|
showGroup
|
||||||
|
center>
|
||||||
|
<StartReservedNumberSet />
|
||||||
|
</WeaSearchGroup>
|
||||||
|
</div>
|
||||||
|
</Fragment>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue