From 16e57a6a836690cf6512d411acc002faaf7d5695 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Wed, 26 Mar 2025 15:01:21 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix=EF=BC=9A=E4=BC=98=E5=8C=96=E9=A2=84?= =?UTF-8?q?=E9=AA=8C=E6=94=B6=E5=85=A5=E5=BA=93=E6=8F=90=E5=89=8D=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=87=8F=E5=A4=A7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/DialogCreateOrderSelect.vue | 33 +++++++++++++++++---- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/src/views/inout/DialogCreateOrderSelect.vue b/src/views/inout/DialogCreateOrderSelect.vue index 1b321fc9..40e8c03d 100644 --- a/src/views/inout/DialogCreateOrderSelect.vue +++ b/src/views/inout/DialogCreateOrderSelect.vue @@ -22,6 +22,7 @@ { + // this.fromInvOptions = response.data || []; + // }) + // .catch(() => { + // }); + // }, + //获取往来单位候选列表 + findMethod(query) { + this.fromOptions = []; + let cQuery = { + key: query, + corpType: null, + page: 1, + limit: 20, + }; + + getBasicUnitMaintains(cQuery) .then((response) => { - this.fromInvOptions = response.data || []; + this.loading = false; + this.fromInvOptions = response.data.list || []; }) .catch(() => { + this.loading = false; }); }, getResultDetailList() { @@ -827,7 +850,7 @@ export default { }, created() { this.getInvList(); - this.findFromInvList(); + // this.findFromInvList(); this.getBusType(); this.getList(); }, From dc1c872c5c89a9f661a7ac87d099ee61687ade30 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 28 Mar 2025 09:51:58 +0800 Subject: [PATCH 2/5] =?UTF-8?q?3/14=20=E5=A4=84=E7=90=86=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E4=BC=98=E5=8C=961.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/collect/DealOrder.vue | 106 ++++++++++----------------- src/views/collect/PannelOrderBiz.vue | 102 ++++++++++++++++++++------ 2 files changed, 120 insertions(+), 88 deletions(-) diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue index f118e522..7e0316a0 100644 --- a/src/views/collect/DealOrder.vue +++ b/src/views/collect/DealOrder.vue @@ -100,8 +100,11 @@
+ + + - - + - - - - - - + + + + + + + + + + + + + + + + + + + + + + +
- - - - - - - - - - - {{ formData.billNo }} - {{ formData.shipperName }} - {{ formData.fromCorpName }} - {{ formData.billTime }} - + +
{{ formData.billNo }}
+
{{ formData.shipperName }}
+
{{ formData.fromCorpName }}
+
{{ formData.billTime }}
+
- + - - -
- -
- -
未赋码  
- - - -
- - -
预赋码  
- - - - -
- - -
已赋码
- -
-
-
@@ -1871,6 +1839,10 @@ export default { } +.custom-input-height { + height: 40px !important; /* 设置高度 */ +} + .barcode-wrapper { display: flex; flex-direction: column; diff --git a/src/views/collect/PannelOrderBiz.vue b/src/views/collect/PannelOrderBiz.vue index 51344f21..eea0f13e 100644 --- a/src/views/collect/PannelOrderBiz.vue +++ b/src/views/collect/PannelOrderBiz.vue @@ -112,36 +112,62 @@ - - - - - + + + + + + + + - + + + + + + + - - - - - - - - - - - - - + + + + + + + - +> +