This commit is contained in:
aihe 2024-07-31 23:37:10 +08:00
parent d3c0acfc83
commit eafbc58bc0
13 changed files with 78 additions and 48 deletions

View File

@ -39,7 +39,7 @@ export default {
warehouseInList: `/oms2c/emisWarehouseIn/listSimple`, // 下单-进仓单列表 warehouseInList: `/oms2c/emisWarehouseIn/listSimple`, // 下单-进仓单列表
getOrderList: `/oms2c/emisWaybill/listSimple`, // 订单列表 -- DONE getOrderList: `/oms2c/emisWaybill/listSimple`, // 订单列表 -- DONE
getOrderDetail: `/oms2c/emisWaybill/getWaybillDetail`, // 订单详情 -- DONE getOrderDetail: `/oms2c/emisWaybill/getWaybillDetail`, // 订单详情 -- DONE
cancelOrder: `/emis/emisWaybill/cancelOrder`, // 取消订单 -- DONE cancelOrder: `/oms2c/emisWaybill/cancelOrder`, // 取消订单 -- DONE
sendBindMonthPayCode: `/oms2c/emisWaybill/bindMonthPayCode`, // 绑月结卡-发送邮件验证码 -- DONE sendBindMonthPayCode: `/oms2c/emisWaybill/bindMonthPayCode`, // 绑月结卡-发送邮件验证码 -- DONE
verifyBindMonthPayCode: `/oms2c/emisWaybill/verifyBindMonthPayCode`, // 确认绑定月结卡 -- DONE verifyBindMonthPayCode: `/oms2c/emisWaybill/verifyBindMonthPayCode`, // 确认绑定月结卡 -- DONE
scanRecord: `/oms2c/emisTmsScanRecord/scan`, // 扫描- 揽收 scanRecord: `/oms2c/emisTmsScanRecord/scan`, // 扫描- 揽收

View File

@ -57,6 +57,22 @@
display: none; display: none;
} }
} }
.lbRequiredDot{
position: relative;
&::after{
height: 26rpx;
line-height: 26rpx;
display: block;
content: '*';
position: absolute;
color: red;
top: 50%;
margin-top: -10rpx;
left: -16rpx;
font-size: 30rpx;
font-weight: bold;
}
}
.smp-tag{ .smp-tag{
margin: 0 20rpx 20rpx 0; display: inline-block; margin: 0 20rpx 20rpx 0; display: inline-block;
} }

View File

@ -1,9 +1,13 @@
<template> <template>
<tpx-dialog :show="show" :title="title" @onClose="handleCloseModal()" rootStyle="min-height:auto;"> <tpx-dialog :show="show" :title="title" @onClose="handleCloseModal()" rootStyle="min-height:auto;"
:contentStyle="contentStyle"
>
<view :style="cptStyle"> <view :style="cptStyle">
<tpx-layout> <tpx-layout>
<template v-slot:body> <template v-slot:body>
<view class="pl-30 pr-30">
<slot v-if="show" :value="submitVals"></slot> <slot v-if="show" :value="submitVals"></slot>
</view>
</template> </template>
<template v-slot:footer> <template v-slot:footer>
@ -41,6 +45,11 @@
return '' return ''
} }
}, },
contentStyle: {
default () {
return 'padding:0;'
}
},
percentHeight: { percentHeight: {
default () { default () {
return 60 return 60

View File

@ -17,7 +17,7 @@
</view> </view>
</u-row> </u-row>
<view @click="goto(`post/detail?billCode=${modelInfo.billCode}`)"> <view @click="handleGoDetail">
<u-row custom-style="margin-top: 30rpx;" justify="center"> <u-row custom-style="margin-top: 30rpx;" justify="center">
<u-col span="4"> <u-col span="4">
<u-text :text="(sender.countryName + sender.provinceName)||'-'" size="30" :bold="true" align="center"></u-text> <u-text :text="(sender.countryName + sender.provinceName)||'-'" size="30" :bold="true" align="center"></u-text>
@ -82,6 +82,11 @@
return true return true
} }
}, },
hideDetail: {
default () {
return false
}
},
}, },
data() { data() {
return {} return {}
@ -97,7 +102,11 @@
}, },
methods: { methods: {
handleGoDetail(){
if(!this.hideDetail) {
this.goto(`post/detail?billCode=${this.modelInfo.billCode}`)
}
}
} }
} }
</script> </script>

View File

@ -16,10 +16,10 @@
</view> </view>
</u-row> </u-row>
<u-row> <u-row>
<view @click="handleConnect" class="text-center"> <!-- <view @click="handleConnect" class="text-center">
<u-icon name="kefu-ermai" size="40" custom-style="margin: 0 auto;"></u-icon> <u-icon name="kefu-ermai" size="40" custom-style="margin: 0 auto;"></u-icon>
<text class="pt-10">客服</text> <text class="pt-10">客服</text>
</view> </view> -->
</u-row> </u-row>
</u-row> </u-row>
</template> </template>

View File

@ -8,27 +8,26 @@
</view> </view>
<view class="edm-input-item "> <view class="edm-input-item ">
<u-row align="top"> <u-row align="top">
<text class="font-weight pr-30">货物名称</text> <text class="font-weight pr-30 lbRequiredDot">货物名称</text>
<u-textarea v-model="modelInfo.goodsInfo" border="surround" height="100" placeholder="" <u-textarea v-model="modelInfo.goodsInfo" border="surround" height="100" placeholder=""
count></u-textarea> count></u-textarea>
</u-row> </u-row>
</view> </view>
<view class="edm-input-item mb-10"> <view class="edm-input-item mb-10">
<u-row justify="between"> <u-row justify="between">
<text class="font-28 font-weight">总件数</text> <text class="font-28 font-weight lbRequiredDot">总件数</text>
<view> <view>
<u-number-box v-model="modelInfo.parcelQty" :min="1" :max="100000" buttonSize="50" inputWidth="100" iconStyle="font-size: 18rpx;"></u-number-box> <tpx-input v-model:value="modelInfo.parcelQty" placeholder="" type="number" inputAlign="right"></tpx-input>
</view> </view>
</u-row> </u-row>
</view> </view>
<view class="edm-input-item mt-20"> <view class="edm-input-item mt-20">
<u-row justify="between"> <tpx-text-item :required="true" label="包裹重量" >
<text class="font-28 font-weight">包裹重量</text> <template #right>
<view>
<tpx-input v-model:value="modelInfo.billWeight" placeholder="" inputAlign="right" suffix="kg" _digit="5"></tpx-input> <tpx-input v-model:value="modelInfo.billWeight" placeholder="" inputAlign="right" suffix="kg" _digit="5"></tpx-input>
</view> </template>
</u-row> </tpx-text-item>
</view> </view>
<view class="edm-input-item"> <view class="edm-input-item">

View File

@ -5,7 +5,7 @@
</view> </view>
<view class="dt-cont"> <view class="dt-cont">
<view class="dt-block mt-10"> <view class="dt-block mt-10">
<tpx-tags v-model:value="checkedGoodId" type="single" :list="hotGoods" @onChange="handleChooseGood"></tpx-tags> <tpx-tags v-model:value="checkedGoodId" type="multiple" :list="hotGoods" @onChange="handleChooseGood"></tpx-tags>
</view> </view>
</view> </view>
</view> </view>
@ -194,9 +194,9 @@
this.$emit('update:value', this.modelInfo) this.$emit('update:value', this.modelInfo)
this.handleCloseModal() this.handleCloseModal()
}, },
handleChooseGood(val) { handleChooseGood(val, text) {
const item = this.goodsRes.list.concat(this.hotGoods).filter(t=> t.val == val)[0] const goodsNames = text
Object.assign(this.modelInfo, item) this.modelInfo.goodsName = goodsNames
} }
} }
} }

View File

@ -20,20 +20,11 @@
</u-row> </u-row>
</view> </view>
<view class="jsfm-item"> <view class="jsfm-item">
<u-row justify="between"> <tpx-text-item :required="true" label="件数" >
<u-row> <template #right>
<text class="font-28 font-weight pr-10">件数</text>
</u-row>
<u-row>
<tpx-input placeholder="请填写" v-model:value="modelInfo.cargoQty" inputAlign="right" type="number" suffix="件" :_maxNum="cargoQtyMaxNum"></tpx-input> <tpx-input placeholder="请填写" v-model:value="modelInfo.cargoQty" inputAlign="right" type="number" suffix="件" :_maxNum="cargoQtyMaxNum"></tpx-input>
<!-- <text class="font-28 font-weight pr-10">体积</text> </template>
<view style=""> </tpx-text-item>
{{modelInfo.volume || '0'}}
<text class="clr-sub">m³</text>
</view> -->
</u-row>
</u-row>
</view> </view>
</view> </view>
</template> </template>

View File

@ -72,8 +72,8 @@
handleoItemClick({ curItem }) { handleoItemClick({ curItem }) {
this.$emit('onItemClick', curItem) this.$emit('onItemClick', curItem)
}, },
handleChange(val) { handleChange(val, text, checkedList) {
this.$emit('onChange', val) this.$emit('onChange', val, text, checkedList)
this.$emit('update:value', val) this.$emit('update:value', val)
} }
} }

View File

@ -1,6 +1,7 @@
<template> <template>
<u-row justify="between"> <u-row justify="between">
<u-row> <u-row>
<view v-if="required" class="lbRequiredDot"></view>
<template v-if="!$slots.left"> <template v-if="!$slots.left">
<u-text :text="label" size="28" :bold="true"></u-text> <u-text :text="label" size="28" :bold="true"></u-text>
</template> </template>
@ -39,6 +40,11 @@
return '' return ''
} }
}, },
required: {
default () {
return false
}
},
placeholder: { placeholder: {
default () { default () {
return '请选择' return '请选择'

View File

@ -28,7 +28,7 @@
:getListFun="getTransLineList" :transKeyVal="{valKey: 'lineCode',titleKey: 'lineName'}" :getListFun="getTransLineList" :transKeyVal="{valKey: 'lineCode',titleKey: 'lineName'}"
:searchParam="waySearchParam" @onChange="handleWayChange" placeholder="请选择路线" :searchParam="waySearchParam" @onChange="handleWayChange" placeholder="请选择路线"
> >
<tpx-text-item label="路线" :value="submitParam.transLineTypeName"></tpx-text-item> <tpx-text-item :required="true" label="路线" :value="submitParam.transLineTypeName"></tpx-text-item>
</tpx-select> </tpx-select>
</view> </view>
</view> </view>
@ -37,7 +37,7 @@
<tpx-select v-model:value="submitParam.pickupMethod" :list="dicData.emis_qujian_fangshi" <tpx-select v-model:value="submitParam.pickupMethod" :list="dicData.emis_qujian_fangshi"
mode="drop" mode="drop"
> >
<tpx-text-item label="取件方式" :value="submitParam.pickupMethod" :list="dicData.emis_qujian_fangshi"></tpx-text-item> <tpx-text-item :required="true" label="取件方式" :value="submitParam.pickupMethod" :list="dicData.emis_qujian_fangshi"></tpx-text-item>
</tpx-select> </tpx-select>
</view> </view>
@ -114,7 +114,7 @@
<tpx-select v-model:value="submitParam.customsEclaration" :list="dicData.emis_declare_mode" <tpx-select v-model:value="submitParam.customsEclaration" :list="dicData.emis_declare_mode"
mode="drop" mode="drop"
> >
<tpx-text-item label="报关方式" :value="submitParam.customsEclaration" :list="dicData.emis_declare_mode"></tpx-text-item> <tpx-text-item :required="true" label="报关方式" :value="submitParam.customsEclaration" :list="dicData.emis_declare_mode"></tpx-text-item>
</tpx-select> </tpx-select>
</view> </view>
@ -122,7 +122,7 @@
<tpx-select v-model:value="submitParam.customsClear" :list="dicData.emis_customs_clear" <tpx-select v-model:value="submitParam.customsClear" :list="dicData.emis_customs_clear"
mode="drop" mode="drop"
> >
<tpx-text-item label="清关方式" :value="submitParam.customsClear" :list="dicData.emis_customs_clear"></tpx-text-item> <tpx-text-item :required="true" label="清关方式" :value="submitParam.customsClear" :list="dicData.emis_customs_clear"></tpx-text-item>
</tpx-select> </tpx-select>
</view> </view>

View File

@ -14,10 +14,10 @@
<view style="position: relative;"> <view style="position: relative;">
<view class="mp-aside"> <view class="mp-aside">
<bpd-send-reciever-tmp :value="modelInfo"></bpd-send-reciever-tmp> <bpd-send-reciever-tmp :value="modelInfo" :showInfoBtn="false" :hideDetail="true"></bpd-send-reciever-tmp>
</view> </view>
<view class="mp-aside"> <!-- <view class="mp-aside">
<view class=""> <view class="">
<bpd-pic-preview-tmp :list="modelInfo.billPicGoodsRmk" label="货物图片"></bpd-pic-preview-tmp> <bpd-pic-preview-tmp :list="modelInfo.billPicGoodsRmk" label="货物图片"></bpd-pic-preview-tmp>
</view> </view>
@ -29,7 +29,7 @@
<view class="mt-30"> <view class="mt-30">
<bpd-pic-preview-tmp :list="modelInfo.billPicDispatchRmk" label="签收底单"></bpd-pic-preview-tmp> <bpd-pic-preview-tmp :list="modelInfo.billPicDispatchRmk" label="签收底单"></bpd-pic-preview-tmp>
</view> </view>
</view> </view> -->
</view> </view>
<view class="dt-block"> <view class="dt-block">

View File

@ -83,18 +83,18 @@
orderStat: {}, orderStat: {},
}, },
mainBtnlist: [ mainBtnlist: [
{ title: '186单', subTitle: "寄件", icon: getCdnUrl(`mine/jijian.png`), url: '' }, { title: '0单', subTitle: "寄件", icon: getCdnUrl(`mine/jijian.png`), url: '' },
{ title: '186单', subTitle: "收件", icon: getCdnUrl(`mine/shjian.png`), url: '' } { title: '0单', subTitle: "收件", icon: getCdnUrl(`mine/shjian.png`), url: '' }
], ],
toolBtnlist: [ toolBtnlist: [
{ title: '运单列表', subTitle: "", icon: getCdnUrl(`mine/ydlib.png`), url: 'tabBar/search/search' }, { title: '运单列表', subTitle: "", icon: getCdnUrl(`mine/ydlib.png`), url: 'tabBar/search/search' },
{ title: '进仓单', subTitle: "", icon: getCdnUrl(`mine/jcdan.png`), url: 'warehousing/list' }, // { title: '进仓单', subTitle: "", icon: getCdnUrl(`mine/jcdan.png`), url: 'warehousing/list' },
{ title: '协议', subTitle: "", icon: getCdnUrl(`mine/xieyi.png`), url: '' }, // { title: '协议', subTitle: "", icon: getCdnUrl(`mine/xieyi.png`), url: '' },
{ title: '账单查询', subTitle: "", icon: getCdnUrl(`mine/zhdancha.png`), url: 'bill/list' }, // { title: '账单查询', subTitle: "", icon: getCdnUrl(`mine/zhdancha.png`), url: 'bill/list' },
{ title: '地址簿', subTitle: "", icon: getCdnUrl(`mine/dizhi.png`), url: 'address/list' }, { title: '地址簿', subTitle: "", icon: getCdnUrl(`mine/dizhi.png`), url: 'address/list' },
{ title: '快件查询', subTitle: "", icon: getCdnUrl(`mine/kjcha.png`), url: 'post/query' }, { title: '快件查询', subTitle: "", icon: getCdnUrl(`mine/kjcha.png`), url: 'post/query' },
{ title: '投诉建议', subTitle: "", icon: getCdnUrl(`mine/tousu.png`), url: 'complaint/complaint' }, // { title: '投诉建议', subTitle: "", icon: getCdnUrl(`mine/tousu.png`), url: 'complaint/complaint' },
{ title: '实名填写', subTitle: "", icon: getCdnUrl(`mine/shiming.png`), url: 'user/certification' } // { title: '实名填写', subTitle: "", icon: getCdnUrl(`mine/shiming.png`), url: 'user/certification' }
] ]
} }
}, },