From 7adbdcb034a4930612f41c97643f4b65509b0511 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Fri, 26 Apr 2024 18:32:18 +0800
Subject: [PATCH] uu
---
common/api/url.js | 2 +-
.../tpx-scroll-view/tpx-scroll-view.vue | 1 -
components/tpx-select/tpx-select.vue | 12 +-
pages/post/model.js | 154 +++++++++---------
pages/post/openorder.vue | 68 ++++----
5 files changed, 124 insertions(+), 113 deletions(-)
diff --git a/common/api/url.js b/common/api/url.js
index f6567b3..8224f9e 100644
--- a/common/api/url.js
+++ b/common/api/url.js
@@ -9,7 +9,7 @@ export default {
getDicDataJson: `/common/getDicDataJson`, // 获取枚举字段
getTransLineList: `/emis/emisTransLine/listSimple`, // 获取路线列表
- getTransProductList: `/emis/emisTransLine/listSimple`, // 获取产品列表
+ getTransProductList: `/emis/emisTransProduct/listSimple`, // 获取产品列表
createOrderNo: `/emis/common/realMatchWaybill`, // 创建运单号
submitOrder: `/emis/emisWaybill/realSubmitOrder`, // 提交订单
diff --git a/components/tpx-scroll-view/tpx-scroll-view.vue b/components/tpx-scroll-view/tpx-scroll-view.vue
index 58db09a..c4e5821 100644
--- a/components/tpx-scroll-view/tpx-scroll-view.vue
+++ b/components/tpx-scroll-view/tpx-scroll-view.vue
@@ -32,7 +32,6 @@
watch: {
searchParam: {
handler: debounce(function(cval, oval) {
- console.log("========qqqqqqqqqq")
this.getDataList(true)
}),
deep: true
diff --git a/components/tpx-select/tpx-select.vue b/components/tpx-select/tpx-select.vue
index 89e1a68..4215b63 100644
--- a/components/tpx-select/tpx-select.vue
+++ b/components/tpx-select/tpx-select.vue
@@ -7,11 +7,13 @@
-
-
-
+
+
+
+
+
diff --git a/pages/post/model.js b/pages/post/model.js
index 9ef414b..5be8253 100644
--- a/pages/post/model.js
+++ b/pages/post/model.js
@@ -2,89 +2,89 @@
export const getOrderModels = ()=> {
return {
"reciever": { // 收件人信息
- "country": null,
+ "country": undefined,
"name": "",
- "phone": null,
- "province": null,
- "city": null,
- "district": null,
- "town": null,
- "address": null,
- "postCode": null,
- "email": null,
- "company": null
+ "phone": undefined,
+ "province": undefined,
+ "city": undefined,
+ "district": undefined,
+ "town": undefined,
+ "address": undefined,
+ "postCode": undefined,
+ "email": undefined,
+ "company": undefined
},
"sender": { // 发件人信息
- "country": null,
+ "country": undefined,
"name": "",
- "phone": null,
- "province": null,
- "city": null,
- "district": null,
- "town": null,
- "address": null,
- "postCode": null,
- "email": null,
- "company": null
+ "phone": undefined,
+ "province": undefined,
+ "city": undefined,
+ "district": undefined,
+ "town": undefined,
+ "address": undefined,
+ "postCode": undefined,
+ "email": undefined,
+ "company": undefined
},
- "custOrderId": null, // 客户单号
+ "custOrderId": undefined, // 客户单号
"billCode": "", // 运单号
- "billCodeSub": null, // 子单号
- "orderDate": null,
+ "billCodeSub": undefined, // 子单号
+ "orderDate": undefined,
"userId": '', // 客户id
- "openId": null,
- "paymentType": null,
- "calcFeeType": null,
- "custNo": null,
- "transLine": null,
- "productType": null,
- "customsClear": null,
- "customsEclaration": null,
- "packType": null,
- "dispatchMethod": null,
- "pickupMethod": null,
- "pickStartDate": null,
- "pickFinishDate": null,
- "intoWarehouseCode": null,
- "intoWarehouseName": null,
- "intoWarehouseAddress": null,
- "intoWarehouseContact": null,
- "intoWarehousePhone": null,
- "intoWarehouseBillCode": null,
- "customerDeliveryBeginTime": null,
- "goodsType": null,
- "goodsInfo": null,
- "totalWeight": null,
- "totalVolume": null,
- "parcelQty": null,
- "billWeight": null,
- "volumeWeight": null,
- "currency": null,
- "settlementWeight": null,
- "feeWeight": null,
- "freight": null,
- "blOverLong": null,
- "blOverWeight": null,
- "overWeightNumber": null,
- "feeRemaker": null,
- "realValue": null,
- "blDispFd": null,
- "transferCode": null,
- "transferBillcode": null,
- "dispFdDate": null,
- "takePieceEmployeeCode": null,
- "sendSiteCode": null,
- "destinationCode": null,
- "destinationProvince": null,
- "destinationCity": null,
- "destinationCounty": null,
- "dispatchUnderlingSiteCode": null,
- "destinationCenterCode": null,
- "marketManCode": null,
- "payee": null,
- "salesmen": null,
- "operateEmployeeCode": null,
- "blMessage": null,
- "blAcceptMessage": null
+ "openId": undefined,
+ "paymentType": undefined,
+ "calcFeeType": undefined,
+ "custNo": undefined,
+ "transLine": '', // 路线
+ "productType": undefined,
+ "customsClear": undefined,
+ "customsEclaration": undefined,
+ "packType": undefined,
+ "dispatchMethod": undefined,
+ "pickupMethod": undefined,
+ "pickStartDate": undefined,
+ "pickFinishDate": undefined,
+ "intoWarehouseCode": undefined,
+ "intoWarehouseName": undefined,
+ "intoWarehouseAddress": undefined,
+ "intoWarehouseContact": undefined,
+ "intoWarehousePhone": undefined,
+ "intoWarehouseBillCode": undefined,
+ "customerDeliveryBeginTime": undefined,
+ "goodsType": undefined,
+ "goodsInfo": undefined,
+ "totalWeight": undefined,
+ "totalVolume": undefined,
+ "parcelQty": undefined,
+ "billWeight": undefined,
+ "volumeWeight": undefined,
+ "currency": undefined,
+ "settlementWeight": undefined,
+ "feeWeight": undefined,
+ "freight": undefined,
+ "blOverLong": undefined,
+ "blOverWeight": undefined,
+ "overWeightNumber": undefined,
+ "feeRemaker": undefined,
+ "realValue": undefined,
+ "blDispFd": undefined,
+ "transferCode": undefined,
+ "transferBillcode": undefined,
+ "dispFdDate": undefined,
+ "takePieceEmployeeCode": undefined,
+ "sendSiteCode": undefined,
+ "destinationCode": undefined,
+ "destinationProvince": undefined,
+ "destinationCity": undefined,
+ "destinationCounty": undefined,
+ "dispatchUnderlingSiteCode": undefined,
+ "destinationCenterCode": undefined,
+ "marketManCode": undefined,
+ "payee": undefined,
+ "salesmen": undefined,
+ "operateEmployeeCode": undefined,
+ "blMessage": undefined,
+ "blAcceptMessage": undefined
}
}
\ No newline at end of file
diff --git a/pages/post/openorder.vue b/pages/post/openorder.vue
index c42158e..ebc3bc7 100644
--- a/pages/post/openorder.vue
+++ b/pages/post/openorder.vue
@@ -17,7 +17,7 @@
客户
-
+
@@ -34,31 +34,38 @@
路线信息
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
@@ -281,9 +288,6 @@
-
-
-
托寄货物描述
@@ -319,18 +323,22 @@
// }
},
computed: {
-
+ waySearchParam() {
+ return { country: this.submitParam.reciever.country, fromCountry: this.submitParam.sender.country }
+ },
+ productSearchParam() {
+ return { transLineCode: this.submitParam.transLine }
+ }
},
data() {
return {
...(JSON.parse(JSON.stringify({ qingguanList, baoguanList, sendTypeEnum, sendTypeList }))),
kehuRes: { list: [] },
+ wayRes: { list: [] },
+ productRes: { list: [] },
tipsList: [
],
- wayModal: {
- show: false,
- },
goodChooseModal: {
show: false,
},
@@ -365,6 +373,8 @@
},
methods: {
getCustomerUserList: apiService.getCustomerUserList,
+ getTransLineList: apiService.getTransLineList,
+ getTransProductList: apiService.getTransProductList,
async initData() {
// uni.showLoading({
// title: '加载中'