|
@@ -560,32 +560,33 @@
|
|
|
})
|
|
|
.toPromise()
|
|
|
.then((response) => {
|
|
|
- var tmp = []
|
|
|
- tmp[0] = TextToCode[response.sourceProvince].code
|
|
|
- tmp[1] = TextToCode[response.sourceProvince][response.sourceCity].code
|
|
|
- if (tmp[0] == 810000 || tmp[0] == 820000) {
|
|
|
- tmp[2] = null
|
|
|
- } else {
|
|
|
- tmp[2] =
|
|
|
- TextToCode[response.sourceProvince][response.sourceCity][
|
|
|
- response.sourceArea
|
|
|
- ].code
|
|
|
- }
|
|
|
- this.selectedOptions = tmp
|
|
|
- var tmp1 = []
|
|
|
- tmp1[0] = TextToCode[response.deliveryProvince].code
|
|
|
- tmp1[1] =
|
|
|
- TextToCode[response.deliveryProvince][response.deliveryCity].code
|
|
|
- if (tmp1[0] == 810000 || tmp1[0] == 820000) {
|
|
|
- tmp1[2] = null
|
|
|
- } else {
|
|
|
- tmp1[2] =
|
|
|
- TextToCode[response.deliveryProvince][response.deliveryCity][
|
|
|
- response.deliveryArea
|
|
|
- ].code
|
|
|
- }
|
|
|
-
|
|
|
- this.selectedOptions1 = tmp1
|
|
|
+ this.newSelectedOptions = response.sourceProvince + "/" + response.sourceCity + "/" + response.sourceArea
|
|
|
+ this.newSelectedOptions1 = response.deliveryProvince + "/" + response.deliveryCity + "/" + response.deliveryArea
|
|
|
+ // var tmp = []
|
|
|
+ // tmp[0] = TextToCode[response.sourceProvince].code
|
|
|
+ // tmp[1] = TextToCode[response.sourceProvince][response.sourceCity].code
|
|
|
+ // if (tmp[0] == 810000 || tmp[0] == 820000) {
|
|
|
+ // tmp[2] = null
|
|
|
+ // } else {
|
|
|
+ // tmp[2] =
|
|
|
+ // TextToCode[response.sourceProvince][response.sourceCity][
|
|
|
+ // response.sourceArea
|
|
|
+ // ].code
|
|
|
+ // }
|
|
|
+ // this.selectedOptions = tmp
|
|
|
+ // var tmp1 = []
|
|
|
+ // tmp1[0] = TextToCode[response.deliveryProvince].code
|
|
|
+ // tmp1[1] =
|
|
|
+ // TextToCode[response.deliveryProvince][response.deliveryCity].code
|
|
|
+ // if (tmp1[0] == 810000 || tmp1[0] == 820000) {
|
|
|
+ // tmp1[2] = null
|
|
|
+ // } else {
|
|
|
+ // tmp1[2] =
|
|
|
+ // TextToCode[response.deliveryProvince][response.deliveryCity][
|
|
|
+ // response.deliveryArea
|
|
|
+ // ].code
|
|
|
+ // }
|
|
|
+ // this.selectedOptions1 = tmp1
|
|
|
this.deptBudgetList = response
|
|
|
if (this.deptBudgetList.deliverType == 1) {
|
|
|
this.deptBudgetList.deliverType1 = '我方送货'
|