From c55ba0a511a46f6a5b0b9a256c053b63ab836423 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Tue, 19 Mar 2024 15:30:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E5=90=8E=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/basicdata/brand/basicdataFreight.vue | 5 +++--
src/views/reportforms/InventoryOutbound.vue | 5 +++++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/views/basicdata/brand/basicdataFreight.vue b/src/views/basicdata/brand/basicdataFreight.vue
index 39f68c52..58d0da4f 100644
--- a/src/views/basicdata/brand/basicdataFreight.vue
+++ b/src/views/basicdata/brand/basicdataFreight.vue
@@ -732,8 +732,9 @@ export default {
},
methods: {
// 上传成功
- doubledCountSuce(res) {
- popmsg(res);
+ async doubledCountSuce(res) {
+ await popmsg(res);
+ this.onLoad(this.page);
},
uploadAfter(res, done, loading, column) {
console.log('121221');
diff --git a/src/views/reportforms/InventoryOutbound.vue b/src/views/reportforms/InventoryOutbound.vue
index 0d61f463..752b9ae4 100644
--- a/src/views/reportforms/InventoryOutbound.vue
+++ b/src/views/reportforms/InventoryOutbound.vue
@@ -45,6 +45,7 @@
:rows="1"
type="textarea"
placeholder="多个商场名称请用逗号隔开"
+ clearable
/>
@@ -53,6 +54,7 @@
style="width: 240px"
:rows="1"
type="textarea"
+ clearable
placeholder="多个物料编码请用逗号隔开"
/>
@@ -62,6 +64,7 @@
v-model="TopQuery.materialNameRange"
style="width: 240px"
:rows="1"
+ clearable
type="textarea"
placeholder="多个物料名称请用逗号隔开"
/>
@@ -73,6 +76,7 @@
style="width: 240px"
:rows="1"
type="textarea"
+ clearable
placeholder="多个订单自编码请用逗号隔开"
/>
@@ -83,6 +87,7 @@
style="width: 240px"
:rows="1"
type="textarea"
+ clearable
placeholder="多个包条码请用逗号隔开"
/>
From 3710d52582eeb149e7a22a77054de5c4a15f0cdc Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Tue, 19 Mar 2024 16:13:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=B1=BB=E5=9E=8B?=
=?UTF-8?q?=E5=8E=BB=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/basicdata/brand/basicdataFreight.vue | 13 ++++++++-----
src/views/basicdata/brand/basicdataFreightFrom.vue | 8 ++++----
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/views/basicdata/brand/basicdataFreight.vue b/src/views/basicdata/brand/basicdataFreight.vue
index 58d0da4f..515a4412 100644
--- a/src/views/basicdata/brand/basicdataFreight.vue
+++ b/src/views/basicdata/brand/basicdataFreight.vue
@@ -77,10 +77,12 @@
-
+
+
+
-
@@ -451,7 +453,7 @@ export default {
},
{
label: '发货单位',
- prop: 'name',
+ prop: 'forwardingUnitName',
type: 'input',
width: '150px',
span: 12,
@@ -524,7 +526,7 @@ export default {
},
{
label: '品类',
- prop: 'brandName',
+ prop: 'categoryName',
type: 'select',
search: false,
dicData: [],
@@ -898,6 +900,7 @@ export default {
this.formInfo.categoryName = this.form.categoryName ? this.form.categoryName : '暂无'; //品类
this.formInfo.effectiveTime = this.form.effectiveTime ? this.form.effectiveTime : '暂无'; //生效时间
this.formInfo.expirationTime = this.form.expirationTime ? this.form.expirationTime : '暂无'; //截止时间
+ this.formInfo.forwardingUnitName= this.form.forwardingUnitName ? this.form.forwardingUnitName : '暂无';
this.formInfo.brand = this.form.brandName ? this.form.brandName : '暂无'; //品牌
this.formInfo.details = res.data.data.details
? res.data.data.details.map(res => res.typeName).join(',')
@@ -913,7 +916,7 @@ export default {
}
});
}
-
+ this.formInfo.details= [...new Set( this.formInfo.details.split(','))];;//服务类型去重
this.enrichDictionaryWithCosts(this.groundlineZd, this.groundlineInfo, 'itemName');
this.enrichDictionaryWithCosts(this.DeliveryZd, this.DeliveryInfo, 'itemName');
this.enrichDictionaryWithCosts(this.warehouseZd, this.warehouseInfo, 'itemName');
diff --git a/src/views/basicdata/brand/basicdataFreightFrom.vue b/src/views/basicdata/brand/basicdataFreightFrom.vue
index f96164e6..61c192c5 100644
--- a/src/views/basicdata/brand/basicdataFreightFrom.vue
+++ b/src/views/basicdata/brand/basicdataFreightFrom.vue
@@ -132,8 +132,8 @@
v-model="form.effectiveTime"
type="datetime"
placeholder="请选择生效时间"
- format="YYYY-MM-DD hh:mm:ss"
- value-format="YYYY-MM-DD h:m:s a"
+ format="YYYY-MM-DD HH:mm:ss"
+ value-format="YYYY-MM-DD HH:mm:ss"
/>
@@ -144,8 +144,8 @@
v-model="form.expirationTime"
type="datetime"
placeholder="请选择截至时间"
- format="YYYY-MM-DD hh:mm:ss"
- value-format="YYYY-MM-DD h:m:s a"
+ format="YYYY-MM-DD HH:mm:ss"
+ value-format="YYYY-MM-DD HH:mm:ss"
/>