Merge remote-tracking branch 'origin/master'
# Conflicts: # src/api/api.js # src/pages/custom-service/components/policy-change-contact.js
Showing
14 changed files
with
171 additions
and
74 deletions
... | @@ -53,6 +53,11 @@ module.exports = { | ... | @@ -53,6 +53,11 @@ module.exports = { |
53 | policyDetail: "/pingan_hklife_webapi/policy/detail", | 53 | policyDetail: "/pingan_hklife_webapi/policy/detail", |
54 | // 保单聯系方式變更 | 54 | // 保单聯系方式變更 |
55 | updatePolicyContanct: "/pingan_hklife_webapi/policy/updateContacts", | 55 | updatePolicyContanct: "/pingan_hklife_webapi/policy/updateContacts", |
56 | // 保单联系方式更改新版 | ||
57 | policyContactApi: "/pingan_hklife_webapi/policy/updatePolicyContacts", | ||
58 | //保单联系方式查询 | ||
59 | policyContactDetailApi: "/pingan_hklife_webapi/policy/policyContacts/detail", | ||
60 | |||
56 | // 保单客戶資料變更 | 61 | // 保单客戶資料變更 |
57 | updatePolicyInfo: "/pingan_hklife_webapi/policy/updateInfo", | 62 | updatePolicyInfo: "/pingan_hklife_webapi/policy/updateInfo", |
58 | updatePolicyInfoV2: "/pingan_hklife_webapi/policy/updatePolicyInfo", | 63 | updatePolicyInfoV2: "/pingan_hklife_webapi/policy/updatePolicyInfo", |
... | @@ -98,12 +103,9 @@ module.exports = { | ... | @@ -98,12 +103,9 @@ module.exports = { |
98 | // 刷新短信验证码 | 103 | // 刷新短信验证码 |
99 | refreshSmgOtp: "/pingan_hklife_webapi/user/refreshSmgOtp", | 104 | refreshSmgOtp: "/pingan_hklife_webapi/user/refreshSmgOtp", |
100 | 105 | ||
101 | // 保单联系方式更改 | 106 | // 上传文件到iobs |
102 | policyContactApi: "/pingan_hklife_webapi/policy/updatePolicyContacts", | 107 | uploadFileIobs: "/pingan_hklife_webapi/policy/upload/file/iobs" |
103 | // 上传excel | 108 | |
104 | policyContactUploadExcelApi: "/pingan_hklife_webapi/policy/upload/excel", | ||
105 | //保单联系方式查询 | ||
106 | policyContactDetailApi: "/pingan_hklife_webapi/policy/policyContacts/detail", | ||
107 | //首页产品列表 | 109 | //首页产品列表 |
108 | indexManageListApi: "/pingan_hklife_webapi/cms/index/manage" | 110 | indexManageListApi: "/pingan_hklife_webapi/cms/index/manage" |
109 | } | 111 | }; | ... | ... |
... | @@ -73,7 +73,8 @@ let encryptPattern = [ | ... | @@ -73,7 +73,8 @@ let encryptPattern = [ |
73 | let encryptWhileList = [ | 73 | let encryptWhileList = [ |
74 | "/pingan_hklife_webapi/policy/idPicUpload", | 74 | "/pingan_hklife_webapi/policy/idPicUpload", |
75 | "/pingan_hklife_webapi/policy/updateIdFileV2", | 75 | "/pingan_hklife_webapi/policy/updateIdFileV2", |
76 | "/pingan_hklife_webapi/policy/clarmsUpload" | 76 | "/pingan_hklife_webapi/policy/clarmsUpload", |
77 | "/pingan_hklife_webapi/policy/upload/file/iobs", | ||
77 | ] | 78 | ] |
78 | 79 | ||
79 | // 请求拦截器 | 80 | // 请求拦截器 | ... | ... |
... | @@ -708,10 +708,10 @@ module.exports = { | ... | @@ -708,10 +708,10 @@ module.exports = { |
708 | e2: "Please enter the collect address", | 708 | e2: "Please enter the collect address", |
709 | e3: "Please enter the collect E-mail", | 709 | e3: "Please enter the collect E-mail", |
710 | 710 | ||
711 | e4: "请选择国际号码区号", | 711 | e4: "Please select the collect nation(region)", |
712 | e5: "请选择国家(地区)", | 712 | e5: "Please select the collect district", |
713 | e6: "请选择省", | 713 | e6: "Please select the collect province", |
714 | e7: "请选择市", | 714 | e7: "Please select the collect city", |
715 | }, | 715 | }, |
716 | form:{ | 716 | form:{ |
717 | InternationalArea:"International area", | 717 | InternationalArea:"International area", |
... | @@ -723,7 +723,13 @@ module.exports = { | ... | @@ -723,7 +723,13 @@ module.exports = { |
723 | Address:"Address", | 723 | Address:"Address", |
724 | Mail:"Please enter", | 724 | Mail:"Please enter", |
725 | }, | 725 | }, |
726 | success: "Success", | 726 | tax:{ |
727 | tt:"IRS website", | ||
728 | t1:"The country of your request for change of correspondence address / phone no. is the United States of America. To comply with the requirements of the US tax regulations, please complete the W8 / W9 form and submit it to us at the same time. The W8 / W9 form can be downloaded from the ", | ||
729 | t2:". For questions about US tax regulations, please contact your tax advisor", | ||
730 | }, | ||
731 | success: "Successfully submitted", | ||
732 | uploadSuccess: "Uploaded successfully", | ||
727 | }, | 733 | }, |
728 | policyChangeInformation: { | 734 | policyChangeInformation: { |
729 | title: "Change of Customer Information", | 735 | title: "Change of Customer Information", | ... | ... |
... | @@ -718,10 +718,10 @@ module.exports = { | ... | @@ -718,10 +718,10 @@ module.exports = { |
718 | e2: "請填寫聯絡地址", | 718 | e2: "請填寫聯絡地址", |
719 | e3: "請填寫正確的電郵地址", | 719 | e3: "請填寫正確的電郵地址", |
720 | 720 | ||
721 | e4: "请选择国际号码区号", | 721 | e4: "請選擇國際號碼區號", |
722 | e5: "请选择国家(地区)", | 722 | e5: "請選擇國家(地區)", |
723 | e6: "请选择省", | 723 | e6: "請選擇省", |
724 | e7: "请选择市", | 724 | e7: "請選擇市", |
725 | }, | 725 | }, |
726 | form:{ | 726 | form:{ |
727 | InternationalArea:"國際號碼區號", | 727 | InternationalArea:"國際號碼區號", |
... | @@ -733,7 +733,13 @@ module.exports = { | ... | @@ -733,7 +733,13 @@ module.exports = { |
733 | Address:"詳細地址", | 733 | Address:"詳細地址", |
734 | Mail:"請輸入", | 734 | Mail:"請輸入", |
735 | }, | 735 | }, |
736 | success: "更新成功" | 736 | tax:{ |
737 | tt:"美國國稅局網站", | ||
738 | t1:"閣下遞交的更改聯繫地址/電話申请國家爲美國。爲符合美國稅務條例要求,請同時填妥W8/W9表格並遞交給我們,W8/W9表格可於", | ||
739 | t2:"下載。有關美國稅務條例疑問,請聯絡您的稅務顧問。", | ||
740 | }, | ||
741 | success: "遞交申請成功", | ||
742 | uploadSuccess:"上傳成功" | ||
737 | }, | 743 | }, |
738 | policyChangeInformation: { | 744 | policyChangeInformation: { |
739 | title: "客戶資料變更", | 745 | title: "客戶資料變更", | ... | ... |
... | @@ -733,7 +733,13 @@ module.exports = { | ... | @@ -733,7 +733,13 @@ module.exports = { |
733 | Address:"详细地址", | 733 | Address:"详细地址", |
734 | Mail:"请输入", | 734 | Mail:"请输入", |
735 | }, | 735 | }, |
736 | success: "更新成功" | 736 | tax:{ |
737 | tt:"美国国税局网站", | ||
738 | t1:"阁下递交的更改联系地址/电话申请国家为美国。为符合美国税务条例要求,请同时填妥W8/W9表格并递交给我们,W8/W9表格可于", | ||
739 | t2:"下载。有关美国税务条例疑问,请联络您的税务顾问。", | ||
740 | }, | ||
741 | success: "递交申请成功", | ||
742 | uploadSuccess:"上传成功" | ||
737 | }, | 743 | }, |
738 | policyChangeInformation: { | 744 | policyChangeInformation: { |
739 | title: "客户资料变更", | 745 | title: "客户资料变更", | ... | ... |
... | @@ -30,6 +30,7 @@ export default { | ... | @@ -30,6 +30,7 @@ export default { |
30 | dataInit: false, | 30 | dataInit: false, |
31 | selectedPolicies: [], | 31 | selectedPolicies: [], |
32 | data: { | 32 | data: { |
33 | policyContactCode: "", | ||
33 | // 国际号码区号列表 | 34 | // 国际号码区号列表 |
34 | mobileAreaCode: "", | 35 | mobileAreaCode: "", |
35 | // 电话 | 36 | // 电话 |
... | @@ -63,6 +64,7 @@ export default { | ... | @@ -63,6 +64,7 @@ export default { |
63 | 64 | ||
64 | modalSimpleVisiable: false, | 65 | modalSimpleVisiable: false, |
65 | modalVisiable: false, | 66 | modalVisiable: false, |
67 | modalVisiableTimeoutIndex: 0, //定时隐藏索引 | ||
66 | usTaxFormUploadCompVisible: false, | 68 | usTaxFormUploadCompVisible: false, |
67 | targetPath: "", | 69 | targetPath: "", |
68 | modalIcon: "succ", | 70 | modalIcon: "succ", |
... | @@ -92,9 +94,22 @@ export default { | ... | @@ -92,9 +94,22 @@ export default { |
92 | : {}; | 94 | : {}; |
93 | }, | 95 | }, |
94 | submitBtnDisabled() { | 96 | submitBtnDisabled() { |
97 | // let b1 = !this.selectedPolicies || this.selectedPolicies.length == 0; | ||
98 | // let b2 = !this.data.address && !this.data.email && !this.data.mobile; | ||
95 | let b1 = !this.selectedPolicies || this.selectedPolicies.length == 0; | 99 | let b1 = !this.selectedPolicies || this.selectedPolicies.length == 0; |
96 | let b2 = !this.data.address && !this.data.email && !this.data.mobile; | 100 | let b2 = |
97 | return b1 || b2; | 101 | !this.data.address || |
102 | !this.data.email || | ||
103 | !this.data.mobile || | ||
104 | !this.data.mobileAreaCode || | ||
105 | !this.data.countryId; | ||
106 | let b3 = false; | ||
107 | if (this.isChina) { | ||
108 | if (!this.data.provinceId || !this.data.cityId) { | ||
109 | b3 = true; | ||
110 | } | ||
111 | } | ||
112 | return b1 || b2 || b3; | ||
98 | }, | 113 | }, |
99 | isChina() { | 114 | isChina() { |
100 | let result = this.data.countryId == "28"; | 115 | let result = this.data.countryId == "28"; |
... | @@ -102,6 +117,7 @@ export default { | ... | @@ -102,6 +117,7 @@ export default { |
102 | }, | 117 | }, |
103 | isUSA() { | 118 | isUSA() { |
104 | let result = this.data.countryId == "225"; | 119 | let result = this.data.countryId == "225"; |
120 | // return true; | ||
105 | return result; | 121 | return result; |
106 | } | 122 | } |
107 | }, | 123 | }, |
... | @@ -113,11 +129,18 @@ export default { | ... | @@ -113,11 +129,18 @@ export default { |
113 | this.modalVisiable = true; | 129 | this.modalVisiable = true; |
114 | }, | 130 | }, |
115 | modalCallback() { | 131 | modalCallback() { |
132 | clearTimeout(this.modalVisiableTimeoutIndex); | ||
116 | this.modalVisiable = false; | 133 | this.modalVisiable = false; |
117 | }, | 134 | }, |
118 | showSuccess() { | 135 | showSuccess() { |
119 | this.showModal(this.i18n.policyChangeContact.success); | 136 | this.showModal(this.i18n.policyChangeContact.success); |
120 | }, | 137 | }, |
138 | showUploadSuccess() { | ||
139 | this.showModal(this.i18n.policyChangeContact.uploadSuccess); | ||
140 | this.modalVisiableTimeoutIndex = setTimeout(() => { | ||
141 | this.modalVisiable = false; | ||
142 | }, 3000); | ||
143 | }, | ||
121 | // 提交前准备 | 144 | // 提交前准备 |
122 | updateContactsHandler() { | 145 | updateContactsHandler() { |
123 | if (this.submitBtnDisabled) { | 146 | if (this.submitBtnDisabled) { |
... | @@ -140,7 +163,7 @@ export default { | ... | @@ -140,7 +163,7 @@ export default { |
140 | let b5 = this.checkNations(); | 163 | let b5 = this.checkNations(); |
141 | let b6 = this.checkProvince(); | 164 | let b6 = this.checkProvince(); |
142 | let b7 = this.checkCity(); | 165 | let b7 = this.checkCity(); |
143 | let b = b1 & b2 & b3 & b4 & b5 & b6 & b7; | 166 | let b = b1 && b2 && b3 && b4 && b5 && b6 && b7; |
144 | 167 | ||
145 | if (b) { | 168 | if (b) { |
146 | // 判断是否美国 出 | 169 | // 判断是否美国 出 |
... | @@ -163,29 +186,26 @@ export default { | ... | @@ -163,29 +186,26 @@ export default { |
163 | this.selectedPolicies.forEach(element => { | 186 | this.selectedPolicies.forEach(element => { |
164 | policies.push({ policyId: element.id, policyCode: element.code }); | 187 | policies.push({ policyId: element.id, policyCode: element.code }); |
165 | }); | 188 | }); |
166 | // let data = { | 189 | |
167 | // mobileNo: this.data.mobile, | ||
168 | // address: this.data.address, | ||
169 | // email: this.data.email, | ||
170 | // mobileNoAcceptMsg: this.checked1 ? 1 : 0, | ||
171 | // addressAcceptMsg: this.checked2 ? 1 : 0, | ||
172 | // emailAcceptMsg: this.checked3 ? 1 : 0, | ||
173 | // policies: policies | ||
174 | // }; | ||
175 | let data = Object.assign(this.data, val); | 190 | let data = Object.assign(this.data, val); |
176 | data.policies = policies; | 191 | data.policies = policies; |
177 | if (!this.isChina) { | 192 | if (!this.isChina) { |
178 | data.provinceId = ""; | 193 | data.provinceId = ""; |
179 | data.cityId = ""; | 194 | data.cityId = ""; |
180 | } | 195 | } |
196 | data.policyContactCode = ""; | ||
197 | data.policyId = ""; | ||
198 | data.policyCode = ""; | ||
199 | |||
181 | this.loading = true; | 200 | this.loading = true; |
182 | httpPost({ | 201 | httpPost({ |
183 | url: api.updatePolicyContanct, | 202 | url: api.policyContactApi, |
184 | data: data, | 203 | data: data, |
185 | sid: true | 204 | sid: true |
186 | }) | 205 | }) |
187 | .then(() => { | 206 | .then(() => { |
188 | this.loading = false; | 207 | this.loading = false; |
208 | this.usTaxFormUploadCompVisible = false; | ||
189 | this.showSuccess(); | 209 | this.showSuccess(); |
190 | }) | 210 | }) |
191 | .catch(err => { | 211 | .catch(err => { |
... | @@ -199,8 +219,8 @@ export default { | ... | @@ -199,8 +219,8 @@ export default { |
199 | /** | 219 | /** |
200 | * 从美国税务表单组件提交 | 220 | * 从美国税务表单组件提交 |
201 | */ | 221 | */ |
202 | onUsTaxSubmit(val){ | 222 | onUsTaxSubmit(val) { |
203 | this.doSubmit(val) | 223 | this.doSubmit(val); |
204 | }, | 224 | }, |
205 | 225 | ||
206 | checkMobile() { | 226 | checkMobile() { |
... | @@ -262,11 +282,17 @@ export default { | ... | @@ -262,11 +282,17 @@ export default { |
262 | return true; | 282 | return true; |
263 | }, | 283 | }, |
264 | /** | 284 | /** |
285 | * 选择国家 | ||
286 | */ | ||
287 | onChangeNations() { | ||
288 | // this.checkProvince(); | ||
289 | }, | ||
290 | /** | ||
265 | * 选择省份 | 291 | * 选择省份 |
266 | */ | 292 | */ |
267 | onChangeProvince() { | 293 | onChangeProvince() { |
268 | this.$set(this.data, "cityId", ""); | 294 | this.$set(this.data, "cityId", ""); |
269 | this.cityList = getCityList(this.$i18n.locale, this.data.provinceId) | 295 | this.cityList = getCityList(this.$i18n.locale, this.data.provinceId); |
270 | this.data.cityId = this.cityList[0].v; | 296 | this.data.cityId = this.cityList[0].v; |
271 | }, | 297 | }, |
272 | onAgreeHandler() { | 298 | onAgreeHandler() { |
... | @@ -300,7 +326,6 @@ export default { | ... | @@ -300,7 +326,6 @@ export default { |
300 | 326 | ||
301 | // 获取省份 | 327 | // 获取省份 |
302 | this.provinceList = getCnProvinceList(this.$i18n.locale); | 328 | this.provinceList = getCnProvinceList(this.$i18n.locale); |
303 | // console.log("this.provinceList:", this.provinceList); | ||
304 | 329 | ||
305 | if (this.dataInit) { | 330 | if (this.dataInit) { |
306 | return; | 331 | return; |
... | @@ -315,22 +340,21 @@ export default { | ... | @@ -315,22 +340,21 @@ export default { |
315 | policyCode: this.selectedPolicies[0].code | 340 | policyCode: this.selectedPolicies[0].code |
316 | }; | 341 | }; |
317 | httpPost({ | 342 | httpPost({ |
318 | url: api.policyDetail, | 343 | url: api.policyContactDetailApi, |
319 | data: param, | 344 | data: param, |
320 | sid: true | 345 | sid: true |
321 | }) | 346 | }) |
322 | .then(response => { | 347 | .then(response => { |
323 | // this.data = {}; | ||
324 | console.log("response:", response); | ||
325 | if (response) { | ||
326 | this.loading = false; | 348 | this.loading = false; |
327 | this.dataInit = true; | 349 | this.dataInit = true; |
328 | this.data.mobile = response.clientMobileNo; | 350 | if (response) { |
329 | this.checked1 = "1" == response.clientMobileAcceptMessage; | 351 | this.data = Object.assign(this.data, response); |
330 | this.data.address = response.clientContactAddress; | 352 | if (response.provinceId) { |
331 | this.checked2 = "1" == response.clientAddressAcceptMessage; | 353 | this.cityList = getCityList( |
332 | this.data.email = response.clientEmail; | 354 | this.$i18n.locale, |
333 | this.checked3 = "1" == response.clientEmailAcceptMessage; | 355 | this.data.provinceId |
356 | ); | ||
357 | } | ||
334 | } | 358 | } |
335 | }) | 359 | }) |
336 | .catch(res => { | 360 | .catch(res => { |
... | @@ -358,19 +382,6 @@ export default { | ... | @@ -358,19 +382,6 @@ export default { |
358 | } | 382 | } |
359 | }, | 383 | }, |
360 | uploadExcel() {}, | 384 | uploadExcel() {}, |
361 | queryPolicyContact() { | ||
362 | let param = { policyId: "4655100", policyCode: "P000200000000009" }; | ||
363 | httpPost({ | ||
364 | url: api.policyContactDetailApi, | ||
365 | data: param, | ||
366 | sid: true | ||
367 | }) | ||
368 | .then(response => { | ||
369 | console.log("response:", response); | ||
370 | }) | ||
371 | .catch(res => {}); | ||
372 | }, | ||
373 | uploadExcel() {}, | ||
374 | // aaa(){ | 385 | // aaa(){ |
375 | // httpPost({ | 386 | // httpPost({ |
376 | // url: api.indexManageListApi, | 387 | // url: api.indexManageListApi, |
... | @@ -413,6 +424,7 @@ export default { | ... | @@ -413,6 +424,7 @@ export default { |
413 | created() { | 424 | created() { |
414 | //this.aaa() | 425 | //this.aaa() |
415 | // this.loading = true; | 426 | // this.loading = true; |
427 | // this.queryPolicyContact(); | ||
416 | this.$root.eventBus.$on("langChange", () => { | 428 | this.$root.eventBus.$on("langChange", () => { |
417 | try { | 429 | try { |
418 | this.initData(); | 430 | this.initData(); | ... | ... |
... | @@ -5,7 +5,7 @@ | ... | @@ -5,7 +5,7 @@ |
5 | <input type="password" style="display: none;" /> | 5 | <input type="password" style="display: none;" /> |
6 | <auth @onLogin="userLogin" @onLogout="userLogout" :checkProfile="true" ref="auth" :tipModel="'m2'"></auth> | 6 | <auth @onLogin="userLogin" @onLogout="userLogout" :checkProfile="true" ref="auth" :tipModel="'m2'"></auth> |
7 | <modal-comp :visible="modalVisiable" :show-confirm="false" :icon="modalIcon" :content="modalContent" :confirm="modalCallback" :overlay="modalCallback"></modal-comp> | 7 | <modal-comp :visible="modalVisiable" :show-confirm="false" :icon="modalIcon" :content="modalContent" :confirm="modalCallback" :overlay="modalCallback"></modal-comp> |
8 | <us-tax-form-upload-comp :visible="usTaxFormUploadCompVisible" @close="usTaxFormUploadCompVisible = false" @submit="onUsTaxSubmit" ></us-tax-form-upload-comp> | 8 | <us-tax-form-upload-comp :visible="usTaxFormUploadCompVisible" @close="usTaxFormUploadCompVisible = false" @submit="onUsTaxSubmit" @uploadsuccess="showUploadSuccess"></us-tax-form-upload-comp> |
9 | <template v-if="showForm"> | 9 | <template v-if="showForm"> |
10 | <policy-head-list :multiSelectable="true" @onSelect="handlePolicySelect"></policy-head-list> | 10 | <policy-head-list :multiSelectable="true" @onSelect="handlePolicySelect"></policy-head-list> |
11 | 11 | ||
... | @@ -25,7 +25,7 @@ | ... | @@ -25,7 +25,7 @@ |
25 | <div class="ipt-wrap-linear"> | 25 | <div class="ipt-wrap-linear"> |
26 | <div class="down-arrow"></div> | 26 | <div class="down-arrow"></div> |
27 | <div class="cont"> | 27 | <div class="cont"> |
28 | <el-select class="ipt" v-model="data.mobileAreaCode" :placeholder="$t('policyChangeContact.form.InternationalArea')" @change="checkNationsPhoneCode"> | 28 | <el-select class="ipt sel" v-model="data.mobileAreaCode" :placeholder="$t('policyChangeContact.form.InternationalArea')" @change="checkNationsPhoneCode"> |
29 | <el-option v-for="(item, index) in nationsPhoneCodeList" :key="index" :label="item.n" :value="item.n"></el-option> | 29 | <el-option v-for="(item, index) in nationsPhoneCodeList" :key="index" :label="item.n" :value="item.n"></el-option> |
30 | </el-select> | 30 | </el-select> |
31 | </div> | 31 | </div> |
... | @@ -59,7 +59,7 @@ | ... | @@ -59,7 +59,7 @@ |
59 | <div class="ipt-wrap-linear"> | 59 | <div class="ipt-wrap-linear"> |
60 | <div class="down-arrow"></div> | 60 | <div class="down-arrow"></div> |
61 | <div class="cont"> | 61 | <div class="cont"> |
62 | <el-select class="ipt" v-model="data.countryId" :placeholder="$t('policyChangeContact.form.Nation')" @change="checkNations"> | 62 | <el-select class="ipt sel" v-model="data.countryId" :placeholder="$t('policyChangeContact.form.Nation')" @change="onChangeNations"> |
63 | <el-option v-for="(item, index) in nationsList" :key="index" :label="item.n" :value="item.v"></el-option> | 63 | <el-option v-for="(item, index) in nationsList" :key="index" :label="item.n" :value="item.v"></el-option> |
64 | </el-select> | 64 | </el-select> |
65 | </div> | 65 | </div> |
... | @@ -75,7 +75,7 @@ | ... | @@ -75,7 +75,7 @@ |
75 | <div class="ipt-wrap-linear"> | 75 | <div class="ipt-wrap-linear"> |
76 | <div class="down-arrow"></div> | 76 | <div class="down-arrow"></div> |
77 | <div class="cont"> | 77 | <div class="cont"> |
78 | <el-select class="ipt" v-model="data.provinceId" :placeholder="$t('policyChangeContact.form.Province')" @change="onChangeProvince"> | 78 | <el-select class="ipt sel" v-model="data.provinceId" :placeholder="$t('policyChangeContact.form.Province')" @change="onChangeProvince"> |
79 | <el-option v-for="(item, index) in provinceList" :key="index" :label="item.n" :value="item.v"></el-option> | 79 | <el-option v-for="(item, index) in provinceList" :key="index" :label="item.n" :value="item.v"></el-option> |
80 | </el-select> | 80 | </el-select> |
81 | </div> | 81 | </div> |
... | @@ -90,7 +90,7 @@ | ... | @@ -90,7 +90,7 @@ |
90 | <div class="ipt-wrap-linear"> | 90 | <div class="ipt-wrap-linear"> |
91 | <div class="down-arrow"></div> | 91 | <div class="down-arrow"></div> |
92 | <div class="cont"> | 92 | <div class="cont"> |
93 | <el-select class="ipt" v-model="data.cityId" :placeholder="$t('policyChangeContact.form.City')" @change="checkCity"> | 93 | <el-select class="ipt sel" v-model="data.cityId" :placeholder="$t('policyChangeContact.form.City')" @change="checkCity"> |
94 | <el-option v-for="(item, index) in cityList" :key="index" :label="item.n" :value="item.v"></el-option> | 94 | <el-option v-for="(item, index) in cityList" :key="index" :label="item.n" :value="item.v"></el-option> |
95 | </el-select> | 95 | </el-select> |
96 | </div> | 96 | </div> | ... | ... |
... | @@ -169,7 +169,7 @@ export default { | ... | @@ -169,7 +169,7 @@ export default { |
169 | item.activity = false; | 169 | item.activity = false; |
170 | delete this.selectPolicyCodes[code]; | 170 | delete this.selectPolicyCodes[code]; |
171 | } | 171 | } |
172 | // this.$set(this, 'myPolicyList', this.myPolicyList); | 172 | this.$set(this.myPolicyList, index, item); |
173 | let data = []; | 173 | let data = []; |
174 | for (let key in this.selectPolicyCodes) { | 174 | for (let key in this.selectPolicyCodes) { |
175 | data.push(this.selectPolicyCodes[key]); | 175 | data.push(this.selectPolicyCodes[key]); | ... | ... |
... | @@ -115,6 +115,7 @@ | ... | @@ -115,6 +115,7 @@ |
115 | overflow: auto; | 115 | overflow: auto; |
116 | .data-line { | 116 | .data-line { |
117 | // padding: 0 32px; | 117 | // padding: 0 32px; |
118 | // background-color: wheat; | ||
118 | height: 58px; | 119 | height: 58px; |
119 | margin: auto; | 120 | margin: auto; |
120 | display: flex; | 121 | display: flex; | ... | ... |
1 | /** | 1 | /** |
2 | * 组件描述:上传美国税务表格 | 2 | * 组件描述:上传美国税务表格 |
3 | */ | 3 | */ |
4 | import api from "@/api/api"; | ||
5 | import { | ||
6 | formdata | ||
7 | } from '@/api/fetch-api.js' | ||
8 | import { Loading } from 'vant'; | ||
4 | 9 | ||
5 | export default { | 10 | export default { |
6 | props: { | 11 | props: { |
... | @@ -14,7 +19,9 @@ export default { | ... | @@ -14,7 +19,9 @@ export default { |
14 | }, | 19 | }, |
15 | data() { | 20 | data() { |
16 | return { | 21 | return { |
17 | iobsKey: "asdfs" | 22 | fileName: "", |
23 | iobsKey: "", | ||
24 | loading: false | ||
18 | }; | 25 | }; |
19 | }, | 26 | }, |
20 | components: {}, | 27 | components: {}, |
... | @@ -35,9 +42,33 @@ export default { | ... | @@ -35,9 +42,33 @@ export default { |
35 | }, | 42 | }, |
36 | onUploadHandler() {}, | 43 | onUploadHandler() {}, |
37 | onSubmitHandler() { | 44 | onSubmitHandler() { |
45 | if(!this.iobsKey) return; | ||
38 | this.$emit("submit", { | 46 | this.$emit("submit", { |
39 | iobsKey: this.iobsKey | 47 | iobsKey: this.iobsKey |
40 | }); | 48 | }); |
49 | }, | ||
50 | selectImgs() { | ||
51 | let _this = this; | ||
52 | this.iobsKey = ""; | ||
53 | let file = this.$refs.file.files[0]; | ||
54 | let item = { | ||
55 | name: file.name, | ||
56 | size: file.size, | ||
57 | file: file | ||
58 | }; | ||
59 | // 转base64 | ||
60 | this.loading = true; | ||
61 | let myFormData = new FormData(); | ||
62 | myFormData.append("file", file); | ||
63 | formdata({ url: api.uploadFileIobs, myFormData: myFormData, sid: true }) | ||
64 | .then(res => { | ||
65 | this.loading = false; | ||
66 | this.iobsKey = res; | ||
67 | this.$emit("uploadsuccess"); | ||
68 | }) | ||
69 | .catch(err => { | ||
70 | this.loading = false; | ||
71 | }); | ||
41 | } | 72 | } |
42 | }, | 73 | }, |
43 | mounted() {}, | 74 | mounted() {}, | ... | ... |
... | @@ -50,7 +50,7 @@ | ... | @@ -50,7 +50,7 @@ |
50 | } | 50 | } |
51 | 51 | ||
52 | .message { | 52 | .message { |
53 | font-size: $fontSize-M2; | 53 | font-size: 0; |
54 | margin-left: 48px; | 54 | margin-left: 48px; |
55 | font-weight: bold; | 55 | font-weight: bold; |
56 | color: $cOrange2; | 56 | color: $cOrange2; |
... | @@ -61,6 +61,10 @@ | ... | @@ -61,6 +61,10 @@ |
61 | text-align-last: left; | 61 | text-align-last: left; |
62 | 62 | ||
63 | span { | 63 | span { |
64 | font-size: $fontSize-M2; | ||
65 | } | ||
66 | |||
67 | .link{ | ||
64 | cursor: pointer; | 68 | cursor: pointer; |
65 | text-decoration: underline; | 69 | text-decoration: underline; |
66 | } | 70 | } |
... | @@ -87,6 +91,7 @@ | ... | @@ -87,6 +91,7 @@ |
87 | display: flex; | 91 | display: flex; |
88 | justify-content: center; | 92 | justify-content: center; |
89 | .btn { | 93 | .btn { |
94 | position: relative; | ||
90 | @include btc4(144px, 42px, 16px); | 95 | @include btc4(144px, 42px, 16px); |
91 | margin: 20px 24px 0; | 96 | margin: 20px 24px 0; |
92 | @extend .pointer; | 97 | @extend .pointer; |
... | @@ -113,6 +118,16 @@ | ... | @@ -113,6 +118,16 @@ |
113 | } | 118 | } |
114 | } | 119 | } |
115 | 120 | ||
121 | input[type="file"] { | ||
122 | position: absolute; | ||
123 | left: 0; | ||
124 | top: 0; | ||
125 | width: 100%; | ||
126 | height: 100%; | ||
127 | opacity: 0; | ||
128 | cursor: pointer; | ||
129 | } | ||
130 | |||
116 | @media (max-width: 1150px) { | 131 | @media (max-width: 1150px) { |
117 | .close { | 132 | .close { |
118 | right: -15px; | 133 | right: -15px; | ... | ... |
... | @@ -10,15 +10,19 @@ | ... | @@ -10,15 +10,19 @@ |
10 | <img src="@/assets/images/clarms/info.png"> | 10 | <img src="@/assets/images/clarms/info.png"> |
11 | </div> | 11 | </div> |
12 | <div class="message" :class="{'lsp':locale != 'en'}"> | 12 | <div class="message" :class="{'lsp':locale != 'en'}"> |
13 | 阁下更改联系地址/电话国家为美国。为符合美国税务条例要求,请同时填妥W8/W9表格并递交给我们,W8/W9表格可于<span @click="toDownLoadTaxForm">美国国税局网站</span>下载。有关美国税务条例疑问,请联络您的税务顾问。 | 13 | <span>{{$t('policyChangeContact.tax.t1')}}</span> |
14 | <span class="link" @click="toDownLoadTaxForm">{{$t('policyChangeContact.tax.tt')}}</span> | ||
15 | <span>{{$t('policyChangeContact.tax.t2')}}</span> | ||
14 | </div> | 16 | </div> |
15 | 17 | ||
16 | </div> | 18 | </div> |
17 | <div class="modal-form"> | 19 | <div class="modal-form"> |
18 | us-tax.excel | 20 | <!-- {{fileName}} --> |
19 | </div> | 21 | </div> |
20 | <div class="modal-btn-wrap"> | 22 | <div class="modal-btn-wrap"> |
21 | <div @click="onUploadHandler" class="btn">上载表格</div> | 23 | <div class="btn"> |
24 | <input type="file" @change="selectImgs" ref="file"> | ||
25 | <van-loading v-if="loading" />上载表格</div> | ||
22 | <div @click="onSubmitHandler" class="btn" :class="{'disable':iobsKey ==''}">提交</div> | 26 | <div @click="onSubmitHandler" class="btn" :class="{'disable':iobsKey ==''}">提交</div> |
23 | </div> | 27 | </div> |
24 | 28 | ... | ... |
... | @@ -129,6 +129,12 @@ | ... | @@ -129,6 +129,12 @@ |
129 | letter-spacing: 1.1px; | 129 | letter-spacing: 1.1px; |
130 | } | 130 | } |
131 | } | 131 | } |
132 | |||
133 | .sel{ | ||
134 | padding: 0 48px 0 24px; | ||
135 | // @include ellipsis; | ||
136 | } | ||
137 | |||
132 | ::-webkit-input-placeholder { | 138 | ::-webkit-input-placeholder { |
133 | color: rgba(102, 102, 102, 0.5); | 139 | color: rgba(102, 102, 102, 0.5); |
134 | } | 140 | } | ... | ... |
... | @@ -3890,21 +3890,25 @@ export function getCnProvinceList(lan) { | ... | @@ -3890,21 +3890,25 @@ export function getCnProvinceList(lan) { |
3890 | switch (lan) { | 3890 | switch (lan) { |
3891 | case "zh": | 3891 | case "zh": |
3892 | data.n = element.ZH_NAME; | 3892 | data.n = element.ZH_NAME; |
3893 | break; | ||
3893 | case "en": | 3894 | case "en": |
3894 | data.n = element.EN_NAME; | 3895 | data.n = element.EN_NAME; |
3896 | break; | ||
3895 | default: | 3897 | default: |
3896 | data.n = element.TC_NAME; | 3898 | data.n = element.TC_NAME; |
3899 | break; | ||
3897 | } | 3900 | } |
3898 | result.push(data) | 3901 | result.push(data); |
3899 | }); | 3902 | }); |
3900 | return result; | 3903 | return result; |
3901 | } | 3904 | } |
3902 | 3905 | ||
3903 | // 获取根据省ID中国大陆城市 | 3906 | // 获取根据省ID中国大陆城市 |
3904 | export function getCityList(lan,PROVINCE_ID) { | 3907 | export function getCityList(lan, PROVINCE_ID) { |
3905 | let result = []; | 3908 | let result = []; |
3909 | console.log("lan:", lan); | ||
3906 | cnCityList.forEach(element => { | 3910 | cnCityList.forEach(element => { |
3907 | if(element.PROVINCE_ID == PROVINCE_ID){ | 3911 | if (element.PROVINCE_ID == PROVINCE_ID) { |
3908 | let data = { | 3912 | let data = { |
3909 | v: element.CITY_ID, | 3913 | v: element.CITY_ID, |
3910 | n: "" | 3914 | n: "" |
... | @@ -3912,12 +3916,15 @@ export function getCityList(lan,PROVINCE_ID) { | ... | @@ -3912,12 +3916,15 @@ export function getCityList(lan,PROVINCE_ID) { |
3912 | switch (lan) { | 3916 | switch (lan) { |
3913 | case "zh": | 3917 | case "zh": |
3914 | data.n = element.ZH_NAME; | 3918 | data.n = element.ZH_NAME; |
3919 | break; | ||
3915 | case "en": | 3920 | case "en": |
3916 | data.n = element.EN_NAME; | 3921 | data.n = element.EN_NAME; |
3922 | break; | ||
3917 | default: | 3923 | default: |
3918 | data.n = element.TC_NAME; | 3924 | data.n = element.TC_NAME; |
3925 | break; | ||
3919 | } | 3926 | } |
3920 | result.push(data) | 3927 | result.push(data); |
3921 | } | 3928 | } |
3922 | }); | 3929 | }); |
3923 | return result; | 3930 | return result; | ... | ... |
-
Please register or sign in to post a comment