Commit 1f8f50270c7657b565fefcfc1b5c5cc9fe095998
1 parent
c77cac38
111
Showing
2 changed files
with
12 additions
and
7 deletions
pages/funeralreport/funeralreport.vue
| ... | ... | @@ -304,7 +304,6 @@ |
| 304 | 304 | funeralresult(){ |
| 305 | 305 | this.from.accessLocation = this.area |
| 306 | 306 | this.from.accessTime = this.accessTime |
| 307 | - // this.info.obituaryType = "网上报丧" | |
| 308 | 307 | if(uni.getStorageSync('dh') == 2){ |
| 309 | 308 | this.from.obituaryType = "电话报丧" |
| 310 | 309 | }else{ |
| ... | ... | @@ -312,15 +311,18 @@ |
| 312 | 311 | } |
| 313 | 312 | this.from.remarks = this.remarks |
| 314 | 313 | this.from.userId = uni.getStorageSync("USERS_KEY").userId |
| 315 | - // console.log(this.from); | |
| 316 | - if(this.from.deceasedName == '' || this.from.deceasedAge == '' || this.from.idCardNumber == '' || this.from.ethnicity == '' || this.from.contactName == '' || this.from.contactPhone == '' || this.from.deathCase == '' || this.from.deathdate == '请选择' || this.sex == '请选择' || this.area != '请输入详细地址' || this.accessTime != "请选择" || this.remarks != ''){ | |
| 314 | + console.log("提交数据",this.from,this.sex,this.area,this.accessTime,this.remarks); | |
| 315 | + if(this.from.deceasedName != '' && this.from.deceasedAge != '' | |
| 316 | + && this.from.idCardNumber != '' && this.from.ethnicity != '' | |
| 317 | + && this.from.contactName != '' && this.from.contactPhone != '' | |
| 318 | + && this.from.deathCase != '' && this.from.deathdate == '请选择' | |
| 319 | + && this.deceasedSex != '请选择' && this.accessLocation != '请输入详细地址' && this.accessTime != "请选择" && this.remarks != ''){ | |
| 317 | 320 | uni.showToast({ |
| 318 | 321 | icon:"error", |
| 319 | 322 | title:"请填写完整必填信息" |
| 320 | 323 | }) |
| 321 | 324 | }else{ |
| 322 | - // console.log(1123); | |
| 323 | - this.API.tjwsyy(this.info).then(res=>{ | |
| 325 | + this.API.tjwsyy(this.from).then(res=>{ | |
| 324 | 326 | console.log("网上报丧",res); |
| 325 | 327 | }) |
| 326 | 328 | uni.navigateTo({ |
| ... | ... | @@ -372,7 +374,10 @@ |
| 372 | 374 | console.log("提交的数据",this.from,this.sex); |
| 373 | 375 | // return |
| 374 | 376 | // deceasedName deceasedAge idCardNumber ethnicity contactName contactPhone deathCase deathdate sex |
| 375 | - if(this.from.deceasedName == '' || this.from.deceasedAge == '' || this.from.idCardNumber == '' || this.from.ethnicity == '' || this.from.contactName == '' || this.from.contactPhone == '' || this.from.deathCase == '' || this.from.deathdate == '请选择' || this.sex == '请选择'){ | |
| 377 | + if(this.from.deceasedName == '' || this.from.deceasedAge == '' | |
| 378 | + || this.from.idCardNumber == '' || this.from.ethnicity == '' | |
| 379 | + || this.from.contactName == '' || this.from.contactPhone == '' | |
| 380 | + || this.from.deathCase == '' || this.from.deathdate == '请选择' || this.sex == '请选择'){ | |
| 376 | 381 | uni.showToast({ |
| 377 | 382 | title: '请输入完整必填', |
| 378 | 383 | //将值设置为 success 或者直接不用写icon这个参数 | ... | ... |