|
|
@@ -17,8 +17,8 @@
|
|
|
<div class="jjaddress">
|
|
|
<p>寄</p>
|
|
|
<div>
|
|
|
- <van-field readonly v-model="SendInfoValue.address" label="姓名" name="pattern"
|
|
|
- placeholder="请输入正确的手机号" />
|
|
|
+ <van-field readonly v-model="SendInfoValue.address" label="地址" name="pattern"
|
|
|
+ placeholder="请输入正确的地址" />
|
|
|
<van-field v-model="SendInfoValue.phone" label="手机号" name="pattern"
|
|
|
placeholder="请输入正确的手机号" />
|
|
|
</div>
|
|
|
@@ -60,16 +60,6 @@
|
|
|
</van-popup>
|
|
|
</div>
|
|
|
|
|
|
- <!--成本中心-->
|
|
|
- <div class="kdshow" v-show="this.accountType == 2">
|
|
|
- <van-field readonly clickable name="picker2" :value="costCenterInfoShow" label="成本中心" placeholder="请选择成本中心"
|
|
|
- @click="showPicker9 = true" />
|
|
|
- <van-popup v-model="showPicker9" position="bottom">
|
|
|
- <van-picker show-toolbar :columns="costCenterList" @confirm="onConfirm9"
|
|
|
- @cancel="showPicker9 = false" />
|
|
|
- </van-popup>
|
|
|
- </div>
|
|
|
-
|
|
|
<!-- 寄件属性 -->
|
|
|
<div class="choose">
|
|
|
<div>
|
|
|
@@ -81,9 +71,19 @@
|
|
|
</div>
|
|
|
<div>
|
|
|
<p>
|
|
|
- <template v-if="wptype == '物品'">重量(公斤)</template>
|
|
|
- <template v-if="wptype == '非产品'">重量(公斤)</template>
|
|
|
- <template v-if="wptype == '文件'">数量(件数)</template>
|
|
|
+ <template>重量(公斤)</template>
|
|
|
+ </p>
|
|
|
+ <p>
|
|
|
+ <van-field name="Kilogram" style="padding: 0px;">
|
|
|
+ <template #input>
|
|
|
+ <van-stepper v-model="Kilogram" max="10"></van-stepper>
|
|
|
+ </template>
|
|
|
+ </van-field>
|
|
|
+ </p>
|
|
|
+ </div>
|
|
|
+ <div>
|
|
|
+ <p>
|
|
|
+ <template>数量(件数)</template>
|
|
|
</p>
|
|
|
<p>
|
|
|
<van-field name="stepper" style="padding: 0px;">
|
|
|
@@ -120,16 +120,6 @@
|
|
|
|
|
|
</div>
|
|
|
</div>
|
|
|
-
|
|
|
- <!--商品订单编号-->
|
|
|
- <div class="sm" style="padding-bottom: 0;" v-show="this.accountType == 1">
|
|
|
- <div>
|
|
|
- <van-field maxlength="50" v-model="goodOrderNo" name="POS/订单号" label="POS/订单号"
|
|
|
- placeholder="请输入POS/订单号" />
|
|
|
- <img @click="wxScanCode(2)" src="../assets/images/sm.png" alt="">
|
|
|
- </div>
|
|
|
- </div>
|
|
|
-
|
|
|
<!-- 备注 -->
|
|
|
<div class="bz">
|
|
|
<div>
|
|
|
@@ -145,7 +135,6 @@
|
|
|
<van-button type="info" color="#00c4b8" @click="save()">立即寄件</van-button>
|
|
|
</div>
|
|
|
|
|
|
-
|
|
|
<!-- 弹窗物品类型 -->
|
|
|
<van-popup v-model="wpshow" position="bottom">
|
|
|
<van-picker title="物品类型" show-toolbar :columns="wplist" @confirm="onConfirm1" @cancel="wpshow = false" />
|
|
|
@@ -203,9 +192,10 @@ export default {
|
|
|
addressshow: false,//地址类型弹窗显示
|
|
|
addlist: ['顾客邮购', '非顾客邮购'],//
|
|
|
wpshow: false,//物品类型弹窗显示
|
|
|
- wplist: ["产品", "文件"],
|
|
|
+ wplist: ["物品", "文件"],
|
|
|
pricetype: "月结(公司件)",//付款类型
|
|
|
- stepper: '',
|
|
|
+ stepper: '',//件数
|
|
|
+ Kilogram: '',//公斤
|
|
|
max: '',
|
|
|
priceshow: false,//付款类型弹窗显示
|
|
|
pricelist: ["到付", "自费(个人件)", "月结(公司件)",],
|
|
|
@@ -257,10 +247,10 @@ export default {
|
|
|
this.accountType = localStorage.getItem("accountType")
|
|
|
console.log("accountType:" + this.accountType)
|
|
|
// if (this.accountType == '1') {
|
|
|
- // this.wplist = ["产品", "非产品", "文件", "测试弹窗1"]
|
|
|
+ // this.wplist = ["物品", "非产品", "文件", "测试弹窗1"]
|
|
|
|
|
|
// } else {
|
|
|
- // this.wplist = ["产品", "文件", "测试弹窗2"]
|
|
|
+ // this.wplist = ["物品", "文件", "测试弹窗2"]
|
|
|
// }
|
|
|
this.mailRoomId = localStorage.getItem("roomId")
|
|
|
|
|
|
@@ -271,6 +261,7 @@ export default {
|
|
|
},
|
|
|
async mounted() {
|
|
|
this.SendInfoValue = await getSendInfo({ userId: localStorage.getItem("userId") })
|
|
|
+ console.log(this.SendInfoValue, 'this.SendInfoValue')
|
|
|
this.geLogisticsListAPIList()
|
|
|
},
|
|
|
methods: {
|
|
|
@@ -403,75 +394,75 @@ export default {
|
|
|
this.addshow = true
|
|
|
},
|
|
|
// 填写地址确定
|
|
|
- onSubmit() {
|
|
|
-
|
|
|
- if (this.name == '' || this.name == undefined) {
|
|
|
- Toast('请填写姓名')
|
|
|
- return
|
|
|
- }
|
|
|
- // if(this.phone == '' || this.phone == undefined ){
|
|
|
- // Toast('请填写手机')
|
|
|
- // return
|
|
|
- // }
|
|
|
- // let regPhone = new RegExp(this.$store.state.regPhone)
|
|
|
- // if(!regPhone.test(this.phone)){
|
|
|
- // Toast('手机号格式不正确')
|
|
|
- // return
|
|
|
- // }
|
|
|
-
|
|
|
- if ((this.phone == '' || this.phone == undefined) && (this.telPhone == '' || this.telPhone == undefined)) {
|
|
|
- Toast('请填写手机号或者座机号')
|
|
|
- return
|
|
|
- }
|
|
|
-
|
|
|
- if (this.phone != '' && this.phone != undefined) {
|
|
|
- let regPhone = new RegExp(this.$store.state.regPhone)
|
|
|
- if (!regPhone.test(this.phone)) {
|
|
|
- Toast('手机号格式不正确')
|
|
|
- return
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- if (this.city == '' || this.city == undefined) {
|
|
|
- Toast('请选择省市区')
|
|
|
- return
|
|
|
- }
|
|
|
- if (this.address == '' || this.address == undefined) {
|
|
|
- Toast('请填写详细地址')
|
|
|
- return
|
|
|
- }
|
|
|
- if (this.index == 1) {
|
|
|
- this.jjname = this.name + ' ' + this.phone
|
|
|
- this.jjadd = this.city + ' ' + this.address
|
|
|
- this.jjInfo.jjname = this.jjname
|
|
|
- this.jjInfo.jjadd = this.jjadd
|
|
|
- this.jjInfo.sender = this.name
|
|
|
- this.jjInfo.senderPhone = this.phone
|
|
|
- this.jjInfo.senderMobile = this.telPhone
|
|
|
- this.jjInfo.sendAddr = this.city
|
|
|
- this.jjInfo.sendAddress = this.address
|
|
|
- this.$store.commit("getJjInfo", this.jjInfo)
|
|
|
- }
|
|
|
- if (this.index == 2) {
|
|
|
- this.sjname = this.name + ' ' + this.phone
|
|
|
- this.sjadd = this.city + ' ' + this.address
|
|
|
- this.sjInfo.sjname = this.sjname
|
|
|
- this.sjInfo.sjadd = this.sjadd
|
|
|
- this.sjInfo.receiver = this.name
|
|
|
- this.sjInfo.receiverPhone = this.phone
|
|
|
- this.sjInfo.receiveMobile = this.telPhone
|
|
|
- this.sjInfo.receiveAddr = this.city
|
|
|
- this.sjInfo.receiveAddress = this.address
|
|
|
- this.$store.commit("getSjInfo", this.sjInfo)
|
|
|
- }
|
|
|
-
|
|
|
- this.addshow = false
|
|
|
- this.name = ""
|
|
|
- this.phone = ""
|
|
|
- this.telPhone = ""
|
|
|
- this.city = ""
|
|
|
- this.address = ""
|
|
|
- },
|
|
|
+ // onSubmit() {
|
|
|
+
|
|
|
+ // if (this.name == '' || this.name == undefined) {
|
|
|
+ // Toast('请填写姓名')
|
|
|
+ // return
|
|
|
+ // }
|
|
|
+ // // if(this.phone == '' || this.phone == undefined ){
|
|
|
+ // // Toast('请填写手机')
|
|
|
+ // // return
|
|
|
+ // // }
|
|
|
+ // // let regPhone = new RegExp(this.$store.state.regPhone)
|
|
|
+ // // if(!regPhone.test(this.phone)){
|
|
|
+ // // Toast('手机号格式不正确')
|
|
|
+ // // return
|
|
|
+ // // }
|
|
|
+
|
|
|
+ // if ((this.phone == '' || this.phone == undefined) && (this.telPhone == '' || this.telPhone == undefined)) {
|
|
|
+ // Toast('请填写手机号或者座机号')
|
|
|
+ // return
|
|
|
+ // }
|
|
|
+
|
|
|
+ // if (this.phone != '' && this.phone != undefined) {
|
|
|
+ // let regPhone = new RegExp(this.$store.state.regPhone)
|
|
|
+ // if (!regPhone.test(this.phone)) {
|
|
|
+ // Toast('手机号格式不正确')
|
|
|
+ // return
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+
|
|
|
+ // if (this.city == '' || this.city == undefined) {
|
|
|
+ // Toast('请选择省市区')
|
|
|
+ // return
|
|
|
+ // }
|
|
|
+ // if (this.address == '' || this.address == undefined) {
|
|
|
+ // Toast('请填写详细地址')
|
|
|
+ // return
|
|
|
+ // }
|
|
|
+ // if (this.index == 1) {
|
|
|
+ // this.jjname = this.name + ' ' + this.phone
|
|
|
+ // this.jjadd = this.city + ' ' + this.address
|
|
|
+ // this.jjInfo.jjname = this.jjname
|
|
|
+ // this.jjInfo.jjadd = this.jjadd
|
|
|
+ // this.jjInfo.sender = this.name
|
|
|
+ // this.jjInfo.senderPhone = this.phone
|
|
|
+ // this.jjInfo.senderMobile = this.telPhone
|
|
|
+ // this.jjInfo.sendAddr = this.city
|
|
|
+ // this.jjInfo.sendAddress = this.address
|
|
|
+ // this.$store.commit("getJjInfo", this.jjInfo)
|
|
|
+ // }
|
|
|
+ // if (this.index == 2) {
|
|
|
+ // this.sjname = this.name + ' ' + this.phone
|
|
|
+ // this.sjadd = this.city + ' ' + this.address
|
|
|
+ // this.sjInfo.sjname = this.sjname
|
|
|
+ // this.sjInfo.sjadd = this.sjadd
|
|
|
+ // this.sjInfo.receiver = this.name
|
|
|
+ // this.sjInfo.receiverPhone = this.phone
|
|
|
+ // this.sjInfo.receiveMobile = this.telPhone
|
|
|
+ // this.sjInfo.receiveAddr = this.city
|
|
|
+ // this.sjInfo.receiveAddress = this.address
|
|
|
+ // this.$store.commit("getSjInfo", this.sjInfo)
|
|
|
+ // }
|
|
|
+
|
|
|
+ // this.addshow = false
|
|
|
+ // this.name = ""
|
|
|
+ // this.phone = ""
|
|
|
+ // this.telPhone = ""
|
|
|
+ // this.city = ""
|
|
|
+ // this.address = ""
|
|
|
+ // },
|
|
|
close() {
|
|
|
this.name = ""
|
|
|
this.phone = ""
|
|
|
@@ -481,57 +472,10 @@ export default {
|
|
|
},
|
|
|
// 地址簿跳转
|
|
|
link(obj) {
|
|
|
- // this.$router.push({ path: '/Addressbook', query: { active: obj } })
|
|
|
this.$router.push({ path: '/Myaddressbook', query: { active: obj } })
|
|
|
},
|
|
|
//立即寄件交互
|
|
|
async save() {
|
|
|
-
|
|
|
- // if (this.accountType == 2) {//办公室
|
|
|
- // //成本中心
|
|
|
- // if (this.costCenterName == '' || this.costCenterName == undefined ||
|
|
|
- // this.costCenterId == '' || this.costCenterId == undefined) {
|
|
|
- // Toast('请选择成本中心')
|
|
|
- // return
|
|
|
- // }
|
|
|
-
|
|
|
- // } else if (this.accountType == 1) {//柜台
|
|
|
-
|
|
|
- // //顾客邮购
|
|
|
- // if (this.addresstype == '顾客邮购') {
|
|
|
- // this.youGouType = '1'
|
|
|
- // } else if (this.addresstype == '非顾客邮购') {
|
|
|
- // this.youGouType = '2'
|
|
|
- // }
|
|
|
-
|
|
|
- // //POS/订单号
|
|
|
- // if (this.goodOrderNo == '') {
|
|
|
- // Toast('请填写订单号')
|
|
|
- // return
|
|
|
- // }
|
|
|
-
|
|
|
- // } else {//没有绑定账号类型
|
|
|
- // Toast('当前账号没有绑定账号类型,请联系管理员')
|
|
|
- // return
|
|
|
-
|
|
|
- // }
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- // if (this.jjname == '' || this.jjname == undefined ||
|
|
|
- // this.jjadd == '' || this.jjadd == undefined) {
|
|
|
- // Toast('请填写寄件人信息')
|
|
|
- // return
|
|
|
- // }
|
|
|
-
|
|
|
- // if (this.sjname == '' || this.sjname == undefined ||
|
|
|
- // this.sjadd == '' || this.sjadd == undefined) {
|
|
|
- // Toast('请填写收件人信息')
|
|
|
- // return
|
|
|
- // }
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
if (this.SendInfoValue.phone == '' || this.SendInfoValue.phone == undefined) {
|
|
|
Toast('寄件人手机号不能为空')
|
|
|
return
|
|
|
@@ -552,8 +496,6 @@ export default {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
if (!this.pattern.test(this.transmitMessageVlaue.addresseePhone)) {
|
|
|
Toast('收件人手机号码不正确')
|
|
|
return
|
|
|
@@ -564,8 +506,6 @@ export default {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
if (this.wptype == '' || this.wptype == undefined) {
|
|
|
Toast('请选择物品类型')
|
|
|
return
|
|
|
@@ -591,7 +531,6 @@ export default {
|
|
|
mainType = '公司件'
|
|
|
}
|
|
|
|
|
|
-
|
|
|
if (this.check == false) {
|
|
|
Toast('请点击同意《电子运单契约条款》')
|
|
|
return
|
|
|
@@ -624,10 +563,10 @@ export default {
|
|
|
expressNum: this.stepper, //快递数量
|
|
|
payInfo: pricetypeValue,//付费信息 1-到付 2-自付 3-月付
|
|
|
expressRemark: this.bz,//快递备注
|
|
|
- expressWeight: this.stepper,//公斤
|
|
|
+ expressWeight: this.Kilogram,//公斤
|
|
|
expressPrice: this.declaredValue,//价值
|
|
|
phone: this.SendInfoValue.phone,//寄件人手机号
|
|
|
- addresseeName: this.transmitMessageVlaue.addresseeName,//
|
|
|
+ addresseeName: this.transmitMessageVlaue.addresseeName,//寄件人姓名
|
|
|
addresseePhone: this.transmitMessageVlaue.addresseePhone,//收件人手机号
|
|
|
}
|
|
|
const res = await saveMailDo({ ...parmas })
|
