From 0b6575ac66e2b411bb953679413d52210d204400 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Mon, 15 Jul 2024 20:59:15 +0800
Subject: [PATCH] uu
---
.../bpe-checkagree-tmp.vue | 2 +-
.../bpe-choosetypelist-tmp.vue | 5 ++-
pages/post/model.js | 2 +-
pages/post/post.vue | 40 ++++++++++++++++++-
4 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/components/buns-post-edit-templates/bpe-checkagree-tmp.vue b/components/buns-post-edit-templates/bpe-checkagree-tmp.vue
index 4392907..53d596d 100644
--- a/components/buns-post-edit-templates/bpe-checkagree-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-checkagree-tmp.vue
@@ -14,7 +14,7 @@
-
+
diff --git a/components/buns-post-edit-templates/bpe-choosetypelist-tmp.vue b/components/buns-post-edit-templates/bpe-choosetypelist-tmp.vue
index 6227921..7481094 100644
--- a/components/buns-post-edit-templates/bpe-choosetypelist-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-choosetypelist-tmp.vue
@@ -1,6 +1,6 @@
@@ -90,6 +90,9 @@
async calcTypeFee(params = {}){
let res = await apiService.preCalcWaybillFee({ custNo: this.modelInfo.custNo, ...params })
this.proTypeList = res.data || []
+ },
+ handleChooseItem(val, text, checkedList){
+ this.modelInfo.freight = checkedList?.[0]?.estFee
}
}
}
diff --git a/pages/post/model.js b/pages/post/model.js
index 7a8e853..09f937a 100644
--- a/pages/post/model.js
+++ b/pages/post/model.js
@@ -42,7 +42,7 @@ export const getOrderModels = () => {
productType: undefined, // 产品
customsClear: undefined, // 清关方式
customsEclaration: undefined, // 报关方式
- packType: undefined, // 包装类型
+ packType: 2, // 包装类型
dispatchMethod: undefined, // 派送方式
pickupMethod: undefined, // 取件方式
pickStartDate: undefined,
diff --git a/pages/post/post.vue b/pages/post/post.vue
index 8aa3159..1441bf4 100644
--- a/pages/post/post.vue
+++ b/pages/post/post.vue
@@ -145,7 +145,7 @@
- 下单
@@ -184,6 +184,11 @@
import * as apiService from "@/common/api"
import { getOrderModels } from "./model"
+ const pageTypeEnum = {
+ create: 'create',
+ edit: 'edit'
+ }
+
export default {
components: { BpeAddressinfoTmp, BpeGoodstaticTmp, BpeGooditemEditTmp, BpeGoodphotoTmp, BpeBindedpostTmp, BpeChoosetypelistTmp, BpeRemarkTmp, BpeCheckagreeTmp },
props: {
@@ -225,6 +230,12 @@
getMonthpayAccountList: apiService.getMonthpayAccountList,
getDefaultData() { // data的默认数据
return {
+ pageTypeEnum,
+ pageTypeMap: {
+ [pageTypeEnum.create]: { title: '上门取件', savedConfirmTitle: '是否操作下一单' },
+ [pageTypeEnum.edit]: { title: '运单修改', savedConfirmTitle: '是否操作下一单' }
+ },
+ curPageType: {},
pageLoading: true,
isEdit: false,
queryOption: {
@@ -250,6 +261,8 @@
},
async initData() { // 初始化
this.queryOption.billCode = this.queryOption.billCode || this.queryOption.copyBillCode
+ this.curPageType = this.pageTypeMap[this.queryOption.type] || {}
+ this.setNavigationBarTitle(this.curPageType.title || this.pageTypeMap[pageTypeEnum.create].title)
this.isEdit = Boolean(this.queryOption.billCode || this.queryOption.orderSn)
if(this.queryOption.defaultSubParams) {
try{
@@ -302,7 +315,7 @@
},
async updateDltSendSite({ lineCode }) {
- const { country, province, city, county, address } = this.submitParam.reciever
+ const { country, province, city, county, address } = this.submitParam.sender
let sendRes = await apiService.getCaculteSendSite({ lineCode, country, province, city, county, address })
let data = sendRes.data || {}
this.submitParam.sendSiteCode = data.siteCode
@@ -311,6 +324,29 @@
handleDialogClick(curModal){
curModal.show = true
+ },
+ async handleSave(type) {
+ let saveServerHand = apiService.submitOrder
+ if(this.isEdit) { }
+ let params = JSON.parse(JSON.stringify(this.submitParam));
+ params.goodsPics = params.goodsPics.join(",")
+ await saveServerHand(params)
+ await this.saveSuccessBack()
+ },
+ async saveSuccessBack(){
+ let { savedConfirmTitle } = this.curPageType
+ if(savedConfirmTitle) {
+ let cBl = await this.confirmModal(`操作成功,${savedConfirmTitle}`)
+ if(cBl) {
+ // 刷新当前页面状态
+ this.reloadCurrentPage(this)
+ } else {
+ this.goBack()
+ }
+ } else {
+ this.showToast('操作成功')
+ this.goBack()
+ }
}
}
}