diff --git a/src/views/basicdata/brand/basicdataFreight.vue b/src/views/basicdata/brand/basicdataFreight.vue index 39f68c52..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: [], @@ -732,8 +734,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'); @@ -897,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(',') @@ -912,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" /> 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="多个包条码请用逗号隔开" />