From ffbb397cc648067ecd4375e8eb5227426739b0ad Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Wed, 22 May 2024 02:19:58 +0800
Subject: [PATCH] uu
---
common/api/order.js | 20 +++++++
common/api/url.js | 5 +-
.../tpx-scroll-view/tpx-scroll-view.vue | 4 +-
components/tpx-select/tpx-select.vue | 8 +++
components/tpx-text-item/tpx-text-item.vue | 12 +++-
pages/post/openorder.vue | 58 +++++++++++++------
6 files changed, 85 insertions(+), 22 deletions(-)
diff --git a/common/api/order.js b/common/api/order.js
index 73f5185..ea16506 100644
--- a/common/api/order.js
+++ b/common/api/order.js
@@ -29,6 +29,26 @@ export const getRSDStaffList = (data = {})=> {
return coreRequest(url.getPickStaffList, { ...data, postCode: 'RSD' }, {}, "GET")
}
+// 回款人联系列表
+export const getPayeeList = (data = {})=> {
+ return coreRequest(url.getPayeeList, { ...data, postCode: 'RSD' }, {}, "GET")
+}
+
+// 销售人联系列表
+export const getSalemanList = (data = {})=> {
+ return coreRequest(url.getSalemanList, { ...data, postCode: 'RSD' }, {}, "GET")
+}
+
+// 报价试算
+export const preCalcWaybillFee = (data = {})=> {
+ return coreRequest(url.preCalcWaybillFee, { ...data, postCode: 'RSD' }, {}, "GET")
+}
+
+// 物流轨迹
+export const queryWaybillTraceInfo = (data = {})=> {
+ return coreRequest(url.queryWaybillTraceInfo, { ...data, postCode: 'RSD' }, {}, "GET")
+}
+
// 历史-货物列表
export const getGoodsList = (data = {})=> {
diff --git a/common/api/url.js b/common/api/url.js
index 4455b3d..17dc163 100644
--- a/common/api/url.js
+++ b/common/api/url.js
@@ -47,7 +47,10 @@ export default {
getNextStationList: `/emis/emisTmsScanRecord/getNextStationList`, // 获取-扫描下一网点
-
+ getPayeeList: `/emis/emisStaff/getPayeeList`, // 回款人联系列表
+ getSalemanList: `/emis/emisStaff/getSalemanList`, // 销售人联系列表
+ preCalcWaybillFee: `/emis/emisWaybill/preCalcWaybillFee`, // 报价试算
+ queryWaybillTraceInfo: `/emis/emisTmsScanRecord/queryWaybillTraceInfo`, // 物流轨迹
}
diff --git a/components/tpx-scroll-view/tpx-scroll-view.vue b/components/tpx-scroll-view/tpx-scroll-view.vue
index b7c2e63..b38c160 100644
--- a/components/tpx-scroll-view/tpx-scroll-view.vue
+++ b/components/tpx-scroll-view/tpx-scroll-view.vue
@@ -37,9 +37,9 @@
export default {
watch: {
searchParam: {
- handler: debounce(function(cval, oval) {
+ handler: function(cval, oval) {
this.getDataList(true)
- }),
+ },
deep: true
}
},
diff --git a/components/tpx-select/tpx-select.vue b/components/tpx-select/tpx-select.vue
index a995f4d..5046637 100644
--- a/components/tpx-select/tpx-select.vue
+++ b/components/tpx-select/tpx-select.vue
@@ -145,6 +145,11 @@
// // titleKey: ''
// }
}
+ },
+ disabled: {
+ default () {
+ return false
+ }
}
},
data() {
@@ -175,6 +180,9 @@
}
},
handleSelectSwitch() {
+ if(this.disabled) {
+ return
+ }
// this.$emit('update:show', !this.show)
this.show = !this.show
},
diff --git a/components/tpx-text-item/tpx-text-item.vue b/components/tpx-text-item/tpx-text-item.vue
index b3092ad..c5f5cf1 100644
--- a/components/tpx-text-item/tpx-text-item.vue
+++ b/components/tpx-text-item/tpx-text-item.vue
@@ -10,7 +10,10 @@
-
+
+
+
+
@@ -33,7 +36,7 @@
title = this.checkedList.map(t=> t.title).join(',')
}
if((!title || title?.length == 0) && (this.list || this.checkedList?.length == 0)) {
- title = '请选择'
+ title = this.placeholder
}
return title
}
@@ -49,6 +52,11 @@
return ''
}
},
+ placeholder: {
+ default () {
+ return '请选择'
+ }
+ },
value: {
},
list: {
diff --git a/pages/post/openorder.vue b/pages/post/openorder.vue
index 5320ec1..37dd29c 100644
--- a/pages/post/openorder.vue
+++ b/pages/post/openorder.vue
@@ -101,26 +101,40 @@
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
@@ -285,7 +299,11 @@
isShowJifei(){
let vals = Object.values(this.jifeiParam)
return vals.length == vals.filter(v => !!v).length
- }
+ },
+ isShowYueJie(){
+ let { submitParam } = this
+ return submitParam.paymentType == 2 || submitParam.paymentType == 4 || submitParam.paymentType == 5
+ },
},
data() {
return this.getDefaultData()
@@ -321,6 +339,8 @@
yuejieRes: { list: [], checkedList: [] },
destPostRes: { list: [], checkedList: [] },
wareRes: { list: [], checkedList: [] },
+ paybeeRes: { list: [], checkedList: [] },
+ salemanRes: { list: [], checkedList: [] },
goodChooseModal: {
show: false,
},
@@ -338,6 +358,8 @@
getMonthpayAccountList: apiService.getMonthpayAccountList,
getDestPositionList: apiService.getDestPositionList,
getWarehouseInList: apiService.warehouseInList,
+ getPayeeList: apiService.getPayeeList,
+ getSalemanList: apiService.getSalemanList,
async initData() { // 初始化
this.isEdit = Boolean(this.queryOption.billCode || this.queryOption.orderSn)
if(this.isEdit) {
@@ -377,6 +399,8 @@
this.submitParam.salesmen = item.salesmen
this.submitParam.salesmenName = item.salesmenName
this.submitParam.payee = item.payeeName
+ this.salemanRes.checkedList = [{ title: item.salesmen, val: item.salesmen }]
+ this.paybeeRes.checkedList = [{ title: item.payee, val: item.payee }]
},
handleWayChange(val) { // 线路切换
let { productRes, submitParam } = this.getDefaultData()