1) 修改登录ui 2) 修改分销商文字提示 3)修复兑换无法编辑
This commit is contained in:
parent
f26f4203dd
commit
dd0f867b44
|
@ -356,7 +356,7 @@ export default class acclist extends React.Component {
|
||||||
let direct_reseller_ids = this.state.direct_reseller_id;
|
let direct_reseller_ids = this.state.direct_reseller_id;
|
||||||
if (direct_reseller_ids <= 0) {
|
if (direct_reseller_ids <= 0) {
|
||||||
// 老数据不能进行新增商品操作
|
// 老数据不能进行新增商品操作
|
||||||
Notify.error(`请编辑映射分销商`);
|
Notify.error(`请添加映射分销商`);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -921,7 +921,7 @@ export default class acclist extends React.Component {
|
||||||
this.setState({ drawerVisible2: true });
|
this.setState({ drawerVisible2: true });
|
||||||
} else {
|
} else {
|
||||||
// 老数据不能进行新增商品操作
|
// 老数据不能进行新增商品操作
|
||||||
Notify.error(`请编辑映射分销商`);
|
Notify.error(`请添加映射分销商`);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -104,6 +104,7 @@ export default class exchangedit extends React.Component {
|
||||||
let code_batch_id = sessionStorage.getItem("code_id");
|
let code_batch_id = sessionStorage.getItem("code_id");
|
||||||
let approval_id = sessionStorage.getItem("approval_id");
|
let approval_id = sessionStorage.getItem("approval_id");
|
||||||
let approval_status = sessionStorage.getItem("approval_status");
|
let approval_status = sessionStorage.getItem("approval_status");
|
||||||
|
console.log("approval_id ==>", Number(approval_id));
|
||||||
if (Number(approval_id) > 0) {
|
if (Number(approval_id) > 0) {
|
||||||
getApprovalsInfo(approval_id)
|
getApprovalsInfo(approval_id)
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
|
@ -240,13 +241,14 @@ export default class exchangedit extends React.Component {
|
||||||
this.setState({ plan_time: req.plan.end_time });
|
this.setState({ plan_time: req.plan.end_time });
|
||||||
//获取分销商
|
//获取分销商
|
||||||
getReseller(req.plan.reseller_id).then((res) => {
|
getReseller(req.plan.reseller_id).then((res) => {
|
||||||
handelResponse(res, (req, msg) => {
|
handelResponse(res, (req1, msg) => {
|
||||||
req.receive_email = req.contact_email[0];
|
console.log("req ==>1", req1);
|
||||||
this.setState({ reseller: req });
|
req.receive_email = req1.contact_email[0];
|
||||||
this.setState({ phone_list: req.contact_phone });
|
this.setState({ reseller: req1 });
|
||||||
this.setState({ email_list: req.contact_email });
|
this.setState({ phone_list: req1.contact_phone });
|
||||||
|
this.setState({ email_list: req1.contact_email });
|
||||||
this.setState({
|
this.setState({
|
||||||
direct_reseller_id: req.direct_reseller_id,
|
direct_reseller_id: req1.direct_reseller_id,
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -429,7 +431,7 @@ export default class exchangedit extends React.Component {
|
||||||
submit() {
|
submit() {
|
||||||
if (this.state.direct_reseller_id <= 0) {
|
if (this.state.direct_reseller_id <= 0) {
|
||||||
// 老数据不能进行新增商品操作
|
// 老数据不能进行新增商品操作
|
||||||
Notify.error(`请编辑映射分销商`);
|
Notify.error(`请添加映射分销商`);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (this.refs.code_info.validator() && this.refs.code_rule.validator()) {
|
if (this.refs.code_info.validator() && this.refs.code_rule.validator()) {
|
||||||
|
@ -526,7 +528,7 @@ export default class exchangedit extends React.Component {
|
||||||
let direct_reseller_ids = this.state.direct_reseller_id;
|
let direct_reseller_ids = this.state.direct_reseller_id;
|
||||||
if (direct_reseller_ids <= 0) {
|
if (direct_reseller_ids <= 0) {
|
||||||
// 老数据不能进行新增商品操作
|
// 老数据不能进行新增商品操作
|
||||||
Notify.error(`请编辑映射分销商`);
|
Notify.error(`请添加映射分销商`);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this.setState({
|
this.setState({
|
||||||
|
@ -785,6 +787,7 @@ export default class exchangedit extends React.Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
productEditShow(rowData) {
|
productEditShow(rowData) {
|
||||||
|
console.log("direct_reseller_id ==>", this.state.direct_reseller_id);
|
||||||
console.log("rowData 12==>", rowData);
|
console.log("rowData 12==>", rowData);
|
||||||
if (this.state.direct_reseller_id > 0) {
|
if (this.state.direct_reseller_id > 0) {
|
||||||
this.setState({
|
this.setState({
|
||||||
|
@ -805,7 +808,7 @@ export default class exchangedit extends React.Component {
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
// 老数据不能进行新增商品操作
|
// 老数据不能进行新增商品操作
|
||||||
Notify.error(`请编辑映射分销商`);
|
Notify.error(`请添加映射分销商`);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -107,6 +107,7 @@ overflow: hidden;
|
||||||
.zent-form-control[data-zv="9.11.0"]{
|
.zent-form-control[data-zv="9.11.0"]{
|
||||||
float: left;
|
float: left;
|
||||||
}
|
}
|
||||||
|
display: flex;
|
||||||
}
|
}
|
||||||
.yzmcode{
|
.yzmcode{
|
||||||
width: 38%;
|
width: 38%;
|
||||||
|
|
|
@ -171,7 +171,7 @@ export default class add extends React.Component {
|
||||||
if (this.state.curstep == 3) {
|
if (this.state.curstep == 3) {
|
||||||
if (this.state.direct_reseller_id <= 0) {
|
if (this.state.direct_reseller_id <= 0) {
|
||||||
// 老数据不能进行新增商品操作
|
// 老数据不能进行新增商品操作
|
||||||
Notify.error(`请编辑映射分销商`);
|
Notify.error(`请添加映射分销商`);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -237,7 +237,7 @@ export default class add extends React.Component {
|
||||||
|
|
||||||
if (this.state.direct_reseller_id <= 0) {
|
if (this.state.direct_reseller_id <= 0) {
|
||||||
// 老数据不能进行新增商品操作
|
// 老数据不能进行新增商品操作
|
||||||
Notify.error(`请编辑映射分销商`);
|
Notify.error(`请添加映射分销商`);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -419,7 +419,7 @@ export default class add extends React.Component {
|
||||||
};
|
};
|
||||||
if (this.state.direct_reseller_id <= 0) {
|
if (this.state.direct_reseller_id <= 0) {
|
||||||
// 老数据不能进行新增商品操作
|
// 老数据不能进行新增商品操作
|
||||||
Notify.error(`请编辑映射分销商`);
|
Notify.error(`请添加映射分销商`);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
approvals(plan_id, data).then((res) => {
|
approvals(plan_id, data).then((res) => {
|
||||||
|
|
|
@ -241,7 +241,7 @@ export default class acclist extends React.Component {
|
||||||
console.log("direct_reseller_ids =>", direct_reseller_ids);
|
console.log("direct_reseller_ids =>", direct_reseller_ids);
|
||||||
if (direct_reseller_ids <= 0) {
|
if (direct_reseller_ids <= 0) {
|
||||||
// 老数据不能进行新增商品操作
|
// 老数据不能进行新增商品操作
|
||||||
Notify.error(`请编辑映射分销商`);
|
Notify.error(`请添加映射分销商`);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this.setState({
|
this.setState({
|
||||||
|
@ -742,7 +742,7 @@ export default class acclist extends React.Component {
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
// 老数据不能进行新增商品操作
|
// 老数据不能进行新增商品操作
|
||||||
Notify.error(`请编辑映射分销商`);
|
Notify.error(`请添加映射分销商`);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -225,7 +225,7 @@ export default class acclist extends React.Component {
|
||||||
let valide = false;
|
let valide = false;
|
||||||
if (this.state.direct_reseller_id <= 0) {
|
if (this.state.direct_reseller_id <= 0) {
|
||||||
// 老数据不能进行新增商品操作
|
// 老数据不能进行新增商品操作
|
||||||
Notify.error(`请编辑映射分销商`);
|
Notify.error(`请添加映射分销商`);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (this.refs.form1.validator()) {
|
if (this.refs.form1.validator()) {
|
||||||
|
@ -330,7 +330,7 @@ export default class acclist extends React.Component {
|
||||||
let direct_reseller_ids = this.state.direct_reseller_id;
|
let direct_reseller_ids = this.state.direct_reseller_id;
|
||||||
if (direct_reseller_ids <= 0) {
|
if (direct_reseller_ids <= 0) {
|
||||||
// 老数据不能进行新增商品操作
|
// 老数据不能进行新增商品操作
|
||||||
Notify.error(`请编辑映射分销商`);
|
Notify.error(`请添加映射分销商`);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -980,7 +980,7 @@ export default class acclist extends React.Component {
|
||||||
this.setState({ drawerVisible2: true });
|
this.setState({ drawerVisible2: true });
|
||||||
} else {
|
} else {
|
||||||
// 老数据不能进行新增商品操作
|
// 老数据不能进行新增商品操作
|
||||||
Notify.error(`请编辑映射分销商`);
|
Notify.error(`请添加映射分销商`);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue