🔀 merge: 合并master
This commit is contained in:
commit
b030df5963
|
@ -261,6 +261,7 @@ export default function Merchant() {
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<Checkbox value={"KEY.USED"}>key码核销通知</Checkbox>
|
<Checkbox value={"KEY.USED"}>key码核销通知</Checkbox>
|
||||||
|
<Checkbox value={"VOUCHER.USED"}>立减金核销通知</Checkbox>
|
||||||
</Checkbox.Group>
|
</Checkbox.Group>
|
||||||
</FormItem>
|
</FormItem>
|
||||||
</Form>
|
</Form>
|
||||||
|
|
|
@ -40,7 +40,6 @@ export default class add extends React.Component {
|
||||||
{ id: 3, title: "落地页", child: [{ step: 1, title: "绑定落地页" }] }
|
{ id: 3, title: "落地页", child: [{ step: 1, title: "绑定落地页" }] }
|
||||||
],
|
],
|
||||||
phone_list: [],
|
phone_list: [],
|
||||||
|
|
||||||
email_list: [],
|
email_list: [],
|
||||||
phone: "",
|
phone: "",
|
||||||
email: "",
|
email: "",
|
||||||
|
|
|
@ -26,6 +26,7 @@ export default class accList extends React.Component {
|
||||||
reseller: null,
|
reseller: null,
|
||||||
return_id: "1",
|
return_id: "1",
|
||||||
date_time: ["", ""],
|
date_time: ["", ""],
|
||||||
|
stock_id: null,
|
||||||
settlement_type: null
|
settlement_type: null
|
||||||
},
|
},
|
||||||
settlementOptions: [],
|
settlementOptions: [],
|
||||||
|
@ -80,6 +81,7 @@ export default class accList extends React.Component {
|
||||||
model.title = data.title
|
model.title = data.title
|
||||||
model.type = parseInt(data.type)
|
model.type = parseInt(data.type)
|
||||||
model.return_id = data.return_type
|
model.return_id = data.return_type
|
||||||
|
model.stock_id = data.stock_id
|
||||||
|
|
||||||
model.reseller = {
|
model.reseller = {
|
||||||
key: data.reseller_id,
|
key: data.reseller_id,
|
||||||
|
@ -119,8 +121,13 @@ export default class accList extends React.Component {
|
||||||
Notify.error("结束日期不能为空")
|
Notify.error("结束日期不能为空")
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
if (this.state.model.stock_id && !/^[a-zA-Z0-9]+$/.test(this.state.model.stock_id)) {
|
||||||
|
Notify.error("请输入由字母或数字组成的计划编号")
|
||||||
|
return false
|
||||||
|
}
|
||||||
let data = {}
|
let data = {}
|
||||||
data.title = this.state.model.title
|
data.title = this.state.model.title
|
||||||
|
data.stock_id = this.state.model.stock_id
|
||||||
data.type = parseInt(this.state.model.type)
|
data.type = parseInt(this.state.model.type)
|
||||||
data.return_type = 1
|
data.return_type = 1
|
||||||
data.reseller_id = this.state.model.reseller.key
|
data.reseller_id = this.state.model.reseller.key
|
||||||
|
@ -298,6 +305,30 @@ export default class accList extends React.Component {
|
||||||
alignment={"left"}
|
alignment={"left"}
|
||||||
/>
|
/>
|
||||||
</FormItem>
|
</FormItem>
|
||||||
|
<FormItem labelname="营销计划编号" prop="stock_id" id="stock_id" required="">
|
||||||
|
<Ipt
|
||||||
|
disabled={this.props.disabled}
|
||||||
|
onChange={(e) => {
|
||||||
|
let model2 = this.state.model
|
||||||
|
model2.stock_id = e
|
||||||
|
this.setState({ model: model2 })
|
||||||
|
}}
|
||||||
|
onClearItem={(e) => {
|
||||||
|
let model2 = this.state.model
|
||||||
|
model2.stock_id = ""
|
||||||
|
this.setState({ model: model2 })
|
||||||
|
}}
|
||||||
|
value={this.state.model.stock_id}
|
||||||
|
countShow={false}
|
||||||
|
placeholder={"字段为空自动生成ID"}
|
||||||
|
labelWidth={"0px"}
|
||||||
|
maxLength={16}
|
||||||
|
height={"36px"}
|
||||||
|
width={"520px"}
|
||||||
|
alignment={"left"}
|
||||||
|
/>
|
||||||
|
</FormItem>
|
||||||
|
|
||||||
<FormItem labelname="计划类型" prop="type" id="type">
|
<FormItem labelname="计划类型" prop="type" id="type">
|
||||||
<RadioGroup
|
<RadioGroup
|
||||||
onChange={(e) => {
|
onChange={(e) => {
|
||||||
|
|
Loading…
Reference in New Issue