|
|
@@ -36,7 +36,7 @@
|
|
|
<van-field class="font-heigth" @click="changeAdderInfo"
|
|
|
v-model="transmitMessageVlaue.addresseeName" name="" label="姓名" placeholder="自动填充" />
|
|
|
<van-field class="font-heigth" @click="changeAdderInfo"
|
|
|
- v-model="transmitMessageVlaue.addresseePhone" label="手机号" name="pattern"
|
|
|
+ v-model="transmitMessageVlaue.addresseePhone" label="手机/固话" name="pattern"
|
|
|
placeholder="自动填充" />
|
|
|
<div class="address font-heigth" @click="changeAdderInfo">
|
|
|
<div class="address_label">地址</div>
|
|
|
@@ -44,14 +44,15 @@
|
|
|
v-if="transmitMessageVlaue.addresseeProvince == undefined">自动填充
|
|
|
</div>
|
|
|
<div class="address_text" v-else>{{ transmitMessageVlaue.addresseeProvince }}{{
|
|
|
- transmitMessageVlaue.addresseeCity }}{{ transmitMessageVlaue.addresseeCounty }}{{
|
|
|
+ transmitMessageVlaue.addresseeCity }}{{ transmitMessageVlaue.addresseeCounty
|
|
|
+ }}{{
|
|
|
transmitMessageVlaue.addresseeTown }}{{
|
|
|
transmitMessageVlaue.addresseeAddrInfo }}
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="dzb" @click="link(2)">
|
|
|
+ <div class="dzb" @click="link(2)" v-if="mailingTypeVlaue != '港澳台寄件'">
|
|
|
<img src="../assets/images/addlist.png" alt="">
|
|
|
<p>地址簿</p>
|
|
|
</div>
|
|
|
@@ -143,6 +144,20 @@
|
|
|
<img @click="vxSearchIcon" src="../assets/images/sm.png" alt="">
|
|
|
</div>
|
|
|
|
|
|
+ <!-- 寄件类型 mailingType 当选择 -->
|
|
|
+ <div class="kdshow" v-if="expressInfoShow == '顺丰快递'">
|
|
|
+ <van-field readonly clickable name="picker" :value="mailingTypeVlaue" label="寄件类型" placeholder="请选择寄件类型"
|
|
|
+ @click="isMailingType = true" />
|
|
|
+ <van-popup v-model="isMailingType" position="bottom">
|
|
|
+ <van-picker show-toolbar :columns="mailingTypeCol" @confirm="onMailingType"
|
|
|
+ @cancel="isMailingType = false">
|
|
|
+ <template v-slot:option="slotProps">
|
|
|
+ {{ slotProps.value }}
|
|
|
+ </template>
|
|
|
+ </van-picker>
|
|
|
+ </van-popup>
|
|
|
+ </div>
|
|
|
+
|
|
|
<!-- 我同意 -->
|
|
|
<div class="check">
|
|
|
<van-checkbox icon-size=".24rem" v-model="check" shape="">我同意《电子运单契约条款》</van-checkbox>
|
|
|
@@ -171,7 +186,7 @@
|
|
|
<van-form @submit="onSubmit">
|
|
|
<van-field v-model="discern.name" name="姓名" label="姓名" placeholder="自动填充"
|
|
|
:rules="[{ required: false }]" />
|
|
|
- <van-field v-model="discern.phone" maxlength="11" type="number" name="手机" label="手机"
|
|
|
+ <van-field v-model="discern.phone" maxlength="11" type="number" name="手机" label="手机/固话"
|
|
|
placeholder="自动填充" :rules="[{ required: false }]" />
|
|
|
<van-field name="area" v-model="discern.province" label="省" placeholder="自动填充" />
|
|
|
<van-field name="area" v-model="discern.city" label="市" placeholder="自动填充" />
|
|
|
@@ -238,6 +253,10 @@ export default {
|
|
|
expressPhone: "",//快递公司电话传值
|
|
|
expressInfo: "1",//快递公司传值
|
|
|
columns: [],//快递公司列表
|
|
|
+ mailingTypeCol: [{ value: '顺丰特快', id: 1 }, { value: '顺丰标快', id: 2 }, { value: '港澳台寄件', id: 2 }],//港澳列表
|
|
|
+ isMailingType: false,//港澳弹窗
|
|
|
+ mailingTypeVlaue: '顺丰特快',//港澳选择的值
|
|
|
+ mailingTypeId: 1,//传给后端的id
|
|
|
columns2: ["个人件", "公司件"],
|
|
|
declaredValue: '0', //声明价值
|
|
|
showPicker2: false,
|
|
|
@@ -335,13 +354,13 @@ export default {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- if (this.discern.phone != '' && this.discern.phone != undefined) {
|
|
|
- let regPhone = new RegExp(this.$store.state.regPhone)
|
|
|
- if (!regPhone.test(this.discern.phone)) {
|
|
|
- Toast('手机号格式不正确')
|
|
|
- return
|
|
|
- }
|
|
|
- }
|
|
|
+ // if (this.discern.phone != '' && this.discern.phone != undefined) {
|
|
|
+ // let regPhone = new RegExp(this.$store.state.regPhone)
|
|
|
+ // if (!regPhone.test(this.discern.phone)) {
|
|
|
+ // Toast('手机号格式不正确')
|
|
|
+ // return
|
|
|
+ // }
|
|
|
+ // }
|
|
|
|
|
|
if (this.discern.province == '' || this.discern.province == undefined) {
|
|
|
Toast('请输入省')
|
|
|
@@ -460,6 +479,13 @@ export default {
|
|
|
this.expressInfo = e.id
|
|
|
this.showPicker = false
|
|
|
},
|
|
|
+ // 选择快递公司
|
|
|
+ onMailingType(e) {
|
|
|
+ console.log(e, 'eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee')
|
|
|
+ this.mailingTypeVlaue = e.value
|
|
|
+ this.mailingTypeId = e.id
|
|
|
+ this.isMailingType = false
|
|
|
+ },
|
|
|
// 选择物品确定
|
|
|
onConfirm1(e) {//确定
|
|
|
this.wptype = e
|
|
|
@@ -614,6 +640,8 @@ export default {
|
|
|
addresseeAddrInfo: this.transmitMessageVlaue.addresseeAddrInfo,//详细地址
|
|
|
verificationCode: this.authorization, //财务核销码
|
|
|
printId: printId,//打印机ID
|
|
|
+ waybillNo: this.waybillNo,// 运单号
|
|
|
+ expressTypeId: this.mailingTypeId, //快递类型的id
|
|
|
}
|
|
|
const res = await saveMailDo({ ...parmas })
|
|
|
if (res.msg == 'success') {
|
