From 62d69c142e8d6b6d5b9ccc2f1247a0a9d74ed789 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Thu, 11 Jul 2024 22:25:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E6=8F=8F=20=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../bo-page-cart-scan-tmp.vue | 7 ++--
.../bo-page-fajian-scan-tmp.vue | 9 +++--
components/tpx-scan-input/tpx-scan-input.vue | 36 +++++++++++++------
.../tpx-scroll-view/tpx-scroll-view.vue | 9 ++++-
pages/deliveryDeal/arriveList.vue | 20 +++++++----
pages/deliveryDeal/paiList.vue | 20 +++++++----
pages/deliveryDeal/pickUp.vue | 14 ++++----
pages/deliveryDeal/sendList.vue | 20 +++++++----
pages/deliveryDeal/signedScanning.vue | 8 ++---
pages/post/openorder.vue | 12 ++++---
pages/post/query.vue | 10 +++---
pages/print/courierNote.vue | 4 +--
pages/tabBar/order/order.vue | 25 ++++++++-----
pages/tms/coPackingScanning.vue | 12 +++----
pages/tms/unpackingScanning.vue | 9 +++--
15 files changed, 134 insertions(+), 81 deletions(-)
diff --git a/components/buns-order-templates/bo-page-cart-scan-tmp.vue b/components/buns-order-templates/bo-page-cart-scan-tmp.vue
index bb54453..eae0cb7 100644
--- a/components/buns-order-templates/bo-page-cart-scan-tmp.vue
+++ b/components/buns-order-templates/bo-page-cart-scan-tmp.vue
@@ -5,7 +5,7 @@
+ @scanChange="handleScanValChange" :showConfirm="true" @confirmClick="handleScanValChange" iconPos="left">
@@ -120,9 +120,8 @@
initData() {
this.submitParam.billCode = this.queryOption.billCode
},
- async handleSubmit(val) {
+ async handleSubmit() {
let extParam = {}
- val && (extParam.billCode = val);
await checkParams(this.submitParam, this.submitValidConfig)
// 转换图片格式
extParam.picUrl = this.submitParam.picUrl.join(",")
@@ -136,7 +135,7 @@
}
},
handleScanValChange: debounce(function(val){
- val && (this.handleSubmit(val))
+ this.handleSubmit()
}),
resetForm() {
this.submitParam.billCode = ''
diff --git a/components/buns-order-templates/bo-page-fajian-scan-tmp.vue b/components/buns-order-templates/bo-page-fajian-scan-tmp.vue
index 0248fda..b7a6be5 100644
--- a/components/buns-order-templates/bo-page-fajian-scan-tmp.vue
+++ b/components/buns-order-templates/bo-page-fajian-scan-tmp.vue
@@ -5,7 +5,7 @@
+ @scanChange="handleScanValChange" :showConfirm="true" @confirmClick="handleScanValChange" iconPos="left">
@@ -99,9 +99,8 @@
initData() {
this.submitParam.billCode = this.queryOption.billCode
},
- async handleSubmit(val) {
+ async handleSubmit() {
let extParam = {}
- val && (extParam.billCode = val);
await checkParams(this.submitParam, this.submitValidConfig)
let scnParam = getScanParams(scanTypeEnum.faJian, { ...this.submitParam, ...extParam })
let res = await apiService.scanRecord({...scnParam, _loading: true})
@@ -112,8 +111,8 @@
this.resetForm()
}
},
- handleScanValChange: debounce(function(val){
- val && (this.handleSubmit(val))
+ handleScanValChange: debounce(function(){
+ this.handleSubmit()
}),
resetForm() {
this.submitParam.billCode = ''
diff --git a/components/tpx-scan-input/tpx-scan-input.vue b/components/tpx-scan-input/tpx-scan-input.vue
index e737f1a..f3ba111 100644
--- a/components/tpx-scan-input/tpx-scan-input.vue
+++ b/components/tpx-scan-input/tpx-scan-input.vue
@@ -1,16 +1,22 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+ 确认
+
+
@@ -50,6 +56,11 @@
return ''
}
},
+ showConfirm:{
+ default () {
+ return false
+ }
+ },
},
data() {
},
@@ -77,6 +88,9 @@
handleScanChange(val){
this.$emit('scanChange', val)
this.handleChange(val)
+ },
+ handleConfirm(){
+ this.$emit('confirmClick')
}
}
}
diff --git a/components/tpx-scroll-view/tpx-scroll-view.vue b/components/tpx-scroll-view/tpx-scroll-view.vue
index 2fb2b18..d4dc5ee 100644
--- a/components/tpx-scroll-view/tpx-scroll-view.vue
+++ b/components/tpx-scroll-view/tpx-scroll-view.vue
@@ -26,7 +26,9 @@
watch: {
searchParam: {
handler: function(cval, oval) {
- this.getDataList(true)
+ if(this.autoReload) {
+ this.getDataList(true)
+ }
},
deep: true
}
@@ -41,6 +43,11 @@
}
},
props: {
+ autoReload: {
+ default () {
+ return true
+ }
+ },
searchParam: {
default () {
return {}
diff --git a/pages/deliveryDeal/arriveList.vue b/pages/deliveryDeal/arriveList.vue
index 726fc41..6a4afca 100644
--- a/pages/deliveryDeal/arriveList.vue
+++ b/pages/deliveryDeal/arriveList.vue
@@ -4,14 +4,14 @@
运单号
+ @scanChange="handleSearch" iconPos="right">
@@ -20,10 +20,10 @@
-
+
+ 查询
+
@@ -107,6 +107,14 @@
},
initData() {
+ },
+ handleSearch(){
+ setTimeout(()=> {
+ this.triggerListReload()
+ }, 300)
+ },
+ triggerListReload(){
+ this?.$refs?.listRef?.getDataList?.(true) // 重置到第一页数据
},
handleSubmit() {
diff --git a/pages/deliveryDeal/paiList.vue b/pages/deliveryDeal/paiList.vue
index 67fc696..795e0e8 100644
--- a/pages/deliveryDeal/paiList.vue
+++ b/pages/deliveryDeal/paiList.vue
@@ -4,14 +4,14 @@
运单号
+ @scanChange="handleSearch" iconPos="right">
@@ -20,10 +20,10 @@
-
+
+ 查询
+
@@ -107,6 +107,14 @@
},
initData() {
+ },
+ handleSearch(){
+ setTimeout(()=> {
+ this.triggerListReload()
+ }, 300)
+ },
+ triggerListReload(){
+ this?.$refs?.listRef?.getDataList?.(true) // 重置到第一页数据
},
handleSubmit() {
diff --git a/pages/deliveryDeal/pickUp.vue b/pages/deliveryDeal/pickUp.vue
index 0907324..e191993 100644
--- a/pages/deliveryDeal/pickUp.vue
+++ b/pages/deliveryDeal/pickUp.vue
@@ -7,10 +7,10 @@
运单号
-
+
- 确定
+ 确定
@@ -92,6 +92,7 @@
orderDetailModal: {
show: false
},
+ orderNo: '',
submitParam: {
}
@@ -115,13 +116,14 @@
this.billCode = this.queryOption.billCode || this.queryOption.orderSn
this.billCode && (this.queryOrderDetail(this.queryOption))
},
- async queryOrderDetail(params) {
- let res = await apiService.getOrderDetail({...params, _loading: true})
+ async queryOrderDetail(params = {}) {
+ let orderNo = this.orderNo
+ let res = await apiService.getOrderDetail({ billCode: orderNo, orderSn: orderNo, ...params, _loading: true})
this.submitParam = res.data
this.pageLoading = false
},
- handleScanValChange: debounce(function(val){
- val && ( this.queryOrderDetail({ billCode: val, orderSn: val, }) )
+ handleScanValChange: debounce(function(){
+ this.queryOrderDetail()
}),
handleDialogClick(curModal){
curModal.show = true
diff --git a/pages/deliveryDeal/sendList.vue b/pages/deliveryDeal/sendList.vue
index d5caa24..89cfafb 100644
--- a/pages/deliveryDeal/sendList.vue
+++ b/pages/deliveryDeal/sendList.vue
@@ -4,14 +4,14 @@
运单号
+ @scanChange="handleSearch" iconPos="right">
@@ -20,10 +20,10 @@
-
+
+ 查询
+
@@ -107,6 +107,14 @@
},
initData() {
+ },
+ handleSearch(){
+ setTimeout(()=> {
+ this.triggerListReload()
+ }, 300)
+ },
+ triggerListReload(){
+ this?.$refs?.listRef?.getDataList?.(true) // 重置到第一页数据
},
handleSubmit() {
diff --git a/pages/deliveryDeal/signedScanning.vue b/pages/deliveryDeal/signedScanning.vue
index 1519d57..7b7f00e 100644
--- a/pages/deliveryDeal/signedScanning.vue
+++ b/pages/deliveryDeal/signedScanning.vue
@@ -7,7 +7,7 @@
+ @scanChange="handleScanValChange" :showConfirm="true" @confirmClick="handleScanValChange" iconPos="left">
@@ -105,10 +105,8 @@
initData() {
this.submitParam.billCode = this.queryOption.billCode
},
- handleScanValChange: debounce(async function(val){
- if(val) {
- let preBl = await preCheckScan({ scanType: scanTypeEnum.qianShou, param: { ...this.submitParam, billCode: val } })
- }
+ handleScanValChange: debounce(async function(){
+ let preBl = await preCheckScan({ scanType: scanTypeEnum.qianShou, param: { ...this.submitParam } })
}),
async handleSubmit() {
await checkParams(this.submitParam, this.submitValidConfig)
diff --git a/pages/post/openorder.vue b/pages/post/openorder.vue
index d9b5fad..badf3c0 100644
--- a/pages/post/openorder.vue
+++ b/pages/post/openorder.vue
@@ -7,9 +7,10 @@
运单号
-
+
-
+
系统生成
@@ -331,6 +332,9 @@
let { submitParam } = this
return submitParam.paymentType == 2 || submitParam.paymentType == 4 || submitParam.paymentType == 5
},
+ showCreateBNoBtn(){
+ return this.queryOption.type == this.pageTypeEnum.create || this.queryOption.copyBillCode
+ }
},
data() {
return this.getDefaultData()
@@ -433,11 +437,11 @@
initEvent() {
},
- handleScanChange: debounce(function(val){
+ handleScanChange: debounce(function(){
// 创建不做 查询详情
if(this.queryOption.type != pageTypeEnum.create) {
// 扫码回调 要重新查询新运单信息，并覆盖老的
- this.queryOption.billCode = val
+ this.queryOption.billCode = this.submitParam.billCode
this.initData();
this.initEvent()
}
diff --git a/pages/post/query.vue b/pages/post/query.vue
index bf51874..5668932 100644
--- a/pages/post/query.vue
+++ b/pages/post/query.vue
@@ -4,8 +4,8 @@
@@ -127,10 +127,10 @@
initData() {
},
- handleScanValChange: debounce(function(val){
- val && (this.handleSearch(val))
+ handleTriggerChange: debounce(function(){
+ this.handleSearch()
}),
- async handleSearch(val) {
+ async handleSearch() {
let res = await apiService.getOrderDetail({...this.searchParam, _loading: true})
// 通过对象合并才能修改父级 数据
Object.assign(this.modelInfo, res.data || {})
diff --git a/pages/print/courierNote.vue b/pages/print/courierNote.vue
index 78c5ea9..343169d 100644
--- a/pages/print/courierNote.vue
+++ b/pages/print/courierNote.vue
@@ -28,9 +28,9 @@
-
+
查询
+ custom-style="height:66rpx;font-size: 30rpx;border-radius: 14rpx;">查询
diff --git a/pages/tabBar/order/order.vue b/pages/tabBar/order/order.vue
index d774dcf..ec8dea2 100644
--- a/pages/tabBar/order/order.vue
+++ b/pages/tabBar/order/order.vue
@@ -21,7 +21,7 @@
运单号
+ @scanChange="handleSearch" iconPos="right">
@@ -30,14 +30,21 @@
+
+
+ 查询
+
+
+
({{ staticInfo.orderStat[curOrdTab.item.val] || 0 }})
@@ -50,7 +57,7 @@
@@ -171,8 +178,8 @@
methods: {
transSearchPm(param){
let cpParam = JSON.parse(JSON.stringify(param))
- cpParam.params.beginDate = cpParam._date[0]
- cpParam.params.endDate = cpParam._date[1]
+ cpParam.params.beginDate = cpParam?._date?.[0]
+ cpParam.params.endDate = cpParam?._date?.[1]
return cpParam
},
async getListFun(param){
@@ -182,6 +189,11 @@
},
initData(){
+ },
+ handleSearch(){
+ setTimeout(()=> {
+ this.triggerListReload()
+ }, 300)
},
listenListReload(params){
// list重置到第一页，需重新查询统计数据
@@ -233,9 +245,6 @@
default:
break;
}
- },
- handleSearchParamChange() {
-
}
}
}
diff --git a/pages/tms/coPackingScanning.vue b/pages/tms/coPackingScanning.vue
index dfd41d0..20f2523 100644
--- a/pages/tms/coPackingScanning.vue
+++ b/pages/tms/coPackingScanning.vue
@@ -6,7 +6,7 @@
+ @scanChange="handleScanValChange" :showConfirm="true" @confirmClick="handleScanValChange" iconPos="left">
@@ -131,12 +131,10 @@
this.resetForm()
}
},
- handleScanValChange: debounce(async function(val){
- if(val) {
- let preBl = await preCheckScan({ scanType: scanTypeEnum.heBao, param: { ...this.submitParam, billCode: val }, list: this.resData.list })
- if(preBl) {
- // this.submitParam.billCode = ''
- }
+ handleScanValChange: debounce(async function(){
+ let preBl = await preCheckScan({ scanType: scanTypeEnum.heBao, param: { ...this.submitParam }, list: this.resData.list })
+ if(preBl) {
+ this.submitParam.billCode = ''
}
}),
resetForm() {
diff --git a/pages/tms/unpackingScanning.vue b/pages/tms/unpackingScanning.vue
index bfaa1be..2391acf 100644
--- a/pages/tms/unpackingScanning.vue
+++ b/pages/tms/unpackingScanning.vue
@@ -6,7 +6,7 @@
+ @scanChange="handleScanValChange" :showConfirm="true" @confirmClick="handleScanValChange" iconPos="left">