|
@@ -1607,7 +1607,8 @@ const NewService = Form.create()(
|
|
|
theArr.push({
|
|
|
processName: thisdata.processName,
|
|
|
adminName: thisdata.adminName,
|
|
|
- createDate: thisdata.createDate
|
|
|
+ createDate: thisdata.createDate,
|
|
|
+ remarks: thisdata.remarks
|
|
|
});
|
|
|
}
|
|
|
}
|
|
@@ -1867,8 +1868,12 @@ const NewService = Form.create()(
|
|
|
this.refs.commodityPrice.focus();
|
|
|
return false;
|
|
|
}
|
|
|
- if (!this.state.commodityQuantity) {
|
|
|
- message.warning("请输入商品数量!");
|
|
|
+ let reg = /^([0]|[1-9][0-9]*)$/
|
|
|
+ if (
|
|
|
+ !this.state.commodityQuantity ||
|
|
|
+ !reg.test(this.state.commodityQuantity)
|
|
|
+ ) {
|
|
|
+ message.warning("请输入正确商品数量!");
|
|
|
this.refs.commodityQuantity.focus();
|
|
|
return false;
|
|
|
}
|
|
@@ -1934,8 +1939,9 @@ const NewService = Form.create()(
|
|
|
message.warning("金额不能为空!");
|
|
|
return false;
|
|
|
}
|
|
|
- if (!this.state.commodityQuantity) {
|
|
|
- message.warning("数量不能为空!");
|
|
|
+ let reg = /^([0]|[1-9][0-9]*)$/
|
|
|
+ if (!this.state.commodityQuantity || !reg.test(this.state.commodityQuantity)) {
|
|
|
+ message.warning("请输入正确商品数量!");
|
|
|
return false;
|
|
|
}
|
|
|
if (!this.state.main) {
|