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"
/>