Commit 0181339c authored by youjie's avatar youjie

no message

parent 50e173e6
...@@ -367,13 +367,12 @@ ...@@ -367,13 +367,12 @@
map-options map-options
emit-value emit-value
option-label="Name" option-label="Name"
option-value="ID" option-value="PhoneCode"
v-model="chosenObj.RelationPhoneType" v-model="chosenObj.RelationPhoneType"
@input="(e)=>{getValue(e,'AreaCode')}" @input="(e)=>{getValue(e,'AreaCode')}"
:options="countrys" :options="countrys"
style="width: 120px" style="width: 120px"
ref="RelationPhoneType" ref="RelationPhoneType"
:rules="[(val) =>!!val || '請选择國家/地區']"
/> />
<q-input <q-input
class="col q-ml-sm" class="col q-ml-sm"
...@@ -386,8 +385,8 @@ ...@@ -386,8 +385,8 @@
:rules="[(val) => !!val || '請輸入收件人電話']" :rules="[(val) => !!val || '請輸入收件人電話']"
> >
<template v-slot:prepend> <template v-slot:prepend>
<div class="text-subtitle2" v-if="userInfo.RelationPhoneType"> <div class="text-subtitle2" v-if="chosenObj.RelationPhoneType">
+ {{ userInfo.RelationPhoneType }} + {{ chosenObj.RelationPhoneType }}
</div> </div>
</template> </template>
</q-input> </q-input>
...@@ -716,7 +715,7 @@ export default { ...@@ -716,7 +715,7 @@ export default {
}, },
getValue(e,type,i) { getValue(e,type,i) {
if(type=='Invoice') this.chosenObj.InvoiceType = e.value if(type=='Invoice') this.chosenObj.InvoiceType = e.value
if(type=='AreaCode') this.userInfo.RelationPhoneType = e.PhoneCode // if(type=='AreaCode') this.chosenObj.RelationPhoneType = e.PhoneCode
if(type=='Province') { if(type=='Province') {
this.provinceList.filter(item=>{ this.provinceList.filter(item=>{
if(item.Name==e) { if(item.Name==e) {
...@@ -862,7 +861,7 @@ export default { ...@@ -862,7 +861,7 @@ export default {
ReceiverProvince: this.chosenObj.ReceiverProvince,// 收件人省 ReceiverProvince: this.chosenObj.ReceiverProvince,// 收件人省
ReceiverCity: this.chosenObj.ReceiverCity,// 收件人市 ReceiverCity: this.chosenObj.ReceiverCity,// 收件人市
ReceiverAddress: this.chosenObj.ReceiverAddress,// 收件人地址 ReceiverAddress: this.chosenObj.ReceiverAddress,// 收件人地址
RelationPhoneType: this.userInfo.RelationPhoneType,// 手机号码归属国家 RelationPhoneType: this.chosenObj.RelationPhoneType,// 手机号码归属国家
}, },
OrderForm: 1,//1电脑端 OrderForm: 1,//1电脑端
ClientType: 2,//客户类型 1同业 2直客 ClientType: 2,//客户类型 1同业 2直客
...@@ -1028,11 +1027,15 @@ export default { ...@@ -1028,11 +1027,15 @@ export default {
}, },
initCountry() { initCountry() {
this.apipost("GetCountryInfo_post", {}, (r) => { this.apipost("GetCountryInfo_post", {}, (r) => {
this.countrys = r.data.data.countList; this.countrys = r.data.data.phoneCountList;
this.userInfo.country = this.countrys[0].ID; if(!this.userInfo.Country){
this.userInfo.Country = this.countrys[0].ID;
this.userInfo.PhoneCountryStr = '+'+this.countrys[0].PhoneCode
}
this.chosenObj.RelationPhoneType = this.countrys[0].PhoneCode;
this.areaCodes = r.data.data.phoneCountList; this.areaCodes = r.data.data.phoneCountList;
this.changeCountry(this.userInfo.country); this.changeCountry(this.userInfo.Country);
this.areaCodes.forEach((x) => { this.areaCodes.forEach((x) => {
let temp = this.countrys.find((y) => y.ID == x.ID); let temp = this.countrys.find((y) => y.ID == x.ID);
x.EnName = `${temp.EnName}(${x.PhoneCode})`; x.EnName = `${temp.EnName}(${x.PhoneCode})`;
...@@ -1056,6 +1059,7 @@ export default { ...@@ -1056,6 +1059,7 @@ export default {
this.apipost("GetCustomerInfo_post", { Id: u.id }, (r) => { this.apipost("GetCustomerInfo_post", { Id: u.id }, (r) => {
if (r.data.resultCode == 1) { if (r.data.resultCode == 1) {
this.userInfo = r.data.data this.userInfo = r.data.data
console.log(this.userInfo,'-----')
Object.assign(this.userInfo, r.data.data) Object.assign(this.userInfo, r.data.data)
} else { } else {
this.$user.userInfo = null; this.$user.userInfo = null;
......
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