diff --git a/components/buns-post-edit-templates/bpe-goodsize-tmp.vue b/components/buns-post-edit-templates/bpe-goodsize-tmp.vue index efd91f5..89aa78f 100644 --- a/components/buns-post-edit-templates/bpe-goodsize-tmp.vue +++ b/components/buns-post-edit-templates/bpe-goodsize-tmp.vue @@ -84,6 +84,9 @@ methods: { calcuOther({ totalVolume }) { this.modelInfo.totalVolume = totalVolume + this.modelInfo.volumeWeight = (this.modelInfo.totalVolume ) * (1000000 / this.modelInfo.meterRate) + let maxVal = Math.max(this.modelInfo.volumeWeight, this.modelInfo.billWeight) + this.modelInfo.settlementWeight = this.modelInfo.totalWeight = maxVal } } } diff --git a/components/tpx-select/tpx-select.vue b/components/tpx-select/tpx-select.vue index 4215b63..978903c 100644 --- a/components/tpx-select/tpx-select.vue +++ b/components/tpx-select/tpx-select.vue @@ -136,11 +136,11 @@ } }, created() { - document.addEventListener('click', this.handleDocumentClick) + // document.addEventListener('click', this.handleDocumentClick) }, unmounted() { - document.removeEventListener('click', this.handleDocumentClick) + // document.removeEventListener('click', this.handleDocumentClick) }, methods: { diff --git a/components/tpx-text-item/tpx-text-item.vue b/components/tpx-text-item/tpx-text-item.vue index a822e3d..abdd529 100644 --- a/components/tpx-text-item/tpx-text-item.vue +++ b/components/tpx-text-item/tpx-text-item.vue @@ -23,7 +23,9 @@ title() { let title = this.value !this.value && this.list && (title = '请选择'); - this.value && this.list && (title = this.list.filter(t=> t.val == this.value)[0].title); + if(this.value && this.list) { + title = this.list.filter(t=> t.val == this.value || this.value.indexOf(t.val) > -1).map(t=> t.title).join(",") + } return title } }, diff --git a/pages/post/model.js b/pages/post/model.js index 9fa5c8b..1edca76 100644 --- a/pages/post/model.js +++ b/pages/post/model.js @@ -57,7 +57,7 @@ export const getOrderModels = () => { "totalVolume": undefined, // 总体积 "parcelQty": undefined, // 总件数 "billWeight": undefined, // 实际重量 - "volumeWeight": undefined, // 体积重量 + "volumeWeight": undefined, // 体积重量 = 实际体积(立方厘米)*(1000000/泡重比) (长宽高都是按 cm 来计量的 ) "currency": undefined, "settlementWeight": undefined, // 结算重量 "feeWeight": undefined, @@ -130,5 +130,7 @@ export const getOrderModels = () => { "prepareInBillCode": undefined, // 快递单号 "prepareInRemark": undefined, // 预入仓自定义标识 "prepareInSupplier": undefined, // 预入仓供应商 + "warehouseInNo": undefined, // 进仓单号 + "meterRate": undefined, // 泡重比 } } \ No newline at end of file diff --git a/pages/post/openorder.vue b/pages/post/openorder.vue index cd8c148..9bcf359 100644 --- a/pages/post/openorder.vue +++ b/pages/post/openorder.vue @@ -39,7 +39,7 @@