Commit b19cfc55 by 姜雷

Merge branch 'develop' into test

parents 34236e72 61061035
export const APP_ID = 'wx723baaa343083ca9'; export const APP_ID = 'wx723baaa343083ca9';
// export const SERVER_URL = 'http://ex-dev-gx-manager.168cad.top'; // export const SERVER_URL = 'http://ex-dev-gx-manager.168cad.top';
export const SERVER_URL = 'http://192.168.1.33:8888'; export const SERVER_URL = 'http://ex-logistics-service-manager.168cad.top';
export default { export default {
APP_ID, APP_ID,
......
...@@ -140,7 +140,7 @@ class PublicCarDeal extends Component { ...@@ -140,7 +140,7 @@ class PublicCarDeal extends Component {
return false; return false;
} }
if (value === 2) { if (value === 2) {
if (!carPlate) { if (carPlate === '-1') {
Toast.fail('请选择派车!'); Toast.fail('请选择派车!');
return false; return false;
} }
...@@ -201,7 +201,7 @@ class PublicCarDeal extends Component { ...@@ -201,7 +201,7 @@ class PublicCarDeal extends Component {
}; };
render() { render() {
const { const {
selected: { value, carPlate, dealOpinion }, selected: { value, dealOpinion },
dealDialogVisible, dealDialogVisible,
carPlateList, carPlateList,
} = this.state; } = this.state;
...@@ -279,9 +279,10 @@ class PublicCarDeal extends Component { ...@@ -279,9 +279,10 @@ class PublicCarDeal extends Component {
</div> </div>
<select <select
className={styles.select} className={styles.select}
value={carPlate}
onChange={this.onSelectHandle} onChange={this.onSelectHandle}
defaultValue="-1"
> >
<option disabled value="-1" />
{carPlateList.map(i => ( {carPlateList.map(i => (
<option key={i.value} value={i.lable}> <option key={i.value} value={i.lable}>
{i.lable} {i.lable}
......
...@@ -137,11 +137,11 @@ class ReprtRepair extends Component { ...@@ -137,11 +137,11 @@ class ReprtRepair extends Component {
Toast.fail('请选择报修人身份!'); Toast.fail('请选择报修人身份!');
return; return;
} }
if (!applyForm.area) { if (!applyForm.areaId) {
Toast.fail('请选择报修区域!'); Toast.fail('请选择报修区域!');
return; return;
} }
if (!applyForm.term) { if (!applyForm.termId) {
Toast.fail('请选择报修项目!'); Toast.fail('请选择报修项目!');
return; return;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment