diff --git a/components/buns-order-templates/bo-detail-tmp.vue b/components/buns-order-templates/bo-detail-tmp.vue index 27d75b1..b0af809 100644 --- a/components/buns-order-templates/bo-detail-tmp.vue +++ b/components/buns-order-templates/bo-detail-tmp.vue @@ -37,26 +37,10 @@ - - - {{item.goodsName}} - 预报: {{item.cargoQty}} - - - {{item.nationArea}} - 实入仓: {{ item.cargoQty - (item.abnormalQty || 0) }} - - - {{item.price}} CNY - - - - - - 总重量:{{modelInfo.totalWeight || '-'}}kg - 总体积:{{modelInfo.totalVolume || '-'}}m³ - + + + @@ -73,7 +57,7 @@ - 产品类型及费用 + 产品类型 @@ -84,75 +68,80 @@ - 寄件网点: + 寄件网点 {{ modelInfo.sendSiteName }} - 目的网点: + 目的网点 {{ modelInfo.dispatchUnderlingSiteName }} - - 目的地: + + 目的地 {{ modelInfo.destinationName }} - - - 目的国家: + 目的国家 {{ modelInfo.reciever.countryName }} + + - 线路: + 线路 {{ modelInfo.transLineTypeName }} - - - 产品类型: + 产品类型 {{ modelInfo.productTypeName }} - - 时效: - {{modelInfo.timeType}} - - - 基础运费: - ¥{{modelInfo.freight}} - - - 付款方式: + + 付款方式 + + + 时效 + {{modelInfo.timeType}} + + + 月结账号 + {{modelInfo.custNo}} + + - - 报关方式: + + 报关方式 - - - 清关方式: + + + 清关方式 - - - - - 运费: - ¥ {{modelInfo.freight}} - + + + + 费用明细 + + + + + + + + 取件信息 @@ -165,22 +154,22 @@ - - 取货方式: + + 取货方式 - + - 预约上门: + 预约上门 {{modelInfo.pickStartDate}} - 安排信息: + 安排信息 {{modelInfo.operateEmployeeName}} {{modelInfo.takePieceEmployeeName}} @@ -221,22 +210,20 @@ - 收件进仓单图片 - + - 签收货物图片 - + + + + + - 签收签名图片 - + + + + @@ -247,10 +234,14 @@ + + \ No newline at end of file diff --git a/components/buns-post-edit-templates/bpe-coststatic-tmp.vue b/components/buns-post-edit-templates/bpe-coststatic-tmp.vue new file mode 100644 index 0000000..1024fb8 --- /dev/null +++ b/components/buns-post-edit-templates/bpe-coststatic-tmp.vue @@ -0,0 +1,135 @@ + + + + + \ No newline at end of file diff --git a/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue b/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue index 8f5f87f..d7f6f21 100644 --- a/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue +++ b/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue @@ -12,7 +12,7 @@ - 实发 {{item.cargoQty}} + 件数 {{item.cargoQty}} diff --git a/pages/post/model.js b/pages/post/model.js index f89acc7..c27ee7b 100644 --- a/pages/post/model.js +++ b/pages/post/model.js @@ -147,5 +147,9 @@ export const getOrderModels = () => { payee: '', // 回款联系人名称 sendSiteName: '', // 发件网点名称 destinationName: '', // 目的地名称 + + blSpecialQuote: 0, // 特殊报价 + blSpecialGoods: 0, // 敏感物 + } } \ No newline at end of file diff --git a/pages/post/query.vue b/pages/post/query.vue index 19180e2..39364ac 100644 --- a/pages/post/query.vue +++ b/pages/post/query.vue @@ -18,42 +18,16 @@ - - - 货物图片 - - - - 查看 - - - - - - - + + - - - 签收底单 - - - - 查看 - - - - - - - + + + + + + @@ -107,6 +81,7 @@ import { debounce } from "@/common/util" import * as apiService from "@/common/api" import BpdSendRecieverTmp from "@/components/buns-post-detail-templates/bpd-send-reciever-tmp" + import BpdPicPreviewTmp from "@/components/buns-post-detail-templates/bpd-pic-preview-tmp" export default { props: { @@ -119,18 +94,15 @@ return this.$store.getters.dicData }, }, - components: { BpdSendRecieverTmp }, + components: { BpdSendRecieverTmp, BpdPicPreviewTmp }, data() { return { queryOption: { billCode: '', // 运单id }, modelInfo: { - billPicSendRmk: [], - billPicDispatchRmk: [], + }, - showHuoPreview: false, - showSignPreview: false, danCheckModal: { show: false }, @@ -154,36 +126,14 @@ initData() { - }, - handleCheckDanJu(list, type) { - let url = '' - if(list.length == 0) { - this.showToast("暂无数据") - } - if(type == 1) { - this.showHuoPreview = true - } - if(type == 2) { - this.showSignPreview = true - } - this.handlePreviewDiDan(list, 0) - }, - handlePreviewDiDan(list, index) { - uni.previewImage({ - urls: list, - current: index - }) }, handleScanValChange: debounce(function(val){ val && (this.handleSearch(val)) }), async handleSearch(val) { let res = await apiService.getOrderDetail({...this.searchParam, _loading: true}) - // 通过对象合并才能修改父级 数据 Object.assign(this.modelInfo, res.data || {}) - this.modelInfo.billPicSendRmk = this.modelInfo.billPicSendRmk?.split(",") || [] - this.modelInfo.billPicDispatchRmk = this.modelInfo.billPicDispatchRmk?.split(",") || [] }, handleSubmitDanCheck() { this.danCheckModal.show = false