Bladeren bron

Merge branch 'deploy_0804' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into deploy_0804

chenrui 3 jaren geleden
bovenliggende
commit
0b6bc8e10d
1 gewijzigde bestanden met toevoegingen van 4 en 3 verwijderingen
  1. 4 3
      src/views/salesManagement/salesQuery/chooseCustomModal.vue

+ 4 - 3
src/views/salesManagement/salesQuery/chooseCustomModal.vue

@@ -181,9 +181,10 @@ export default {
       dealerRecevieAddrQuery({ defaultFlag: 1, dealerSn: this.form.buyerSn }).then(res => {
         if (res.status == 200) {
           if (res.data.length == 1) {
-            res.data[0].address = res.data[0].provinceName + '-' + res.data[0].cityName + '-' + res.data[0].countyName + '-' + res.data[0].addr
-            this.addressId = res.data[0].id || undefined
-            this.handleOk(res.data[0])
+            const ret = res.data[0]
+            ret.address = (ret.provinceName ? (ret.provinceName + '-') : '') + (ret.cityName ? (ret.cityName + '-') : '') + (ret.countyName ? (ret.countyName + '-') : '') + ret.addr
+            this.addressId = ret.id || undefined
+            this.handleOk(ret)
           } else {
             this.verifyFun(this.addressId)
           }