|
@@ -758,7 +758,8 @@ export default {
|
|
|
overHidden: true,
|
|
|
disabled: false,
|
|
|
width: 100
|
|
|
- }, {
|
|
|
+ },
|
|
|
+ {
|
|
|
label: '商品描述',
|
|
|
prop: 'goodsDescription',
|
|
|
disabled: false,
|
|
@@ -1035,7 +1036,7 @@ export default {
|
|
|
this.findObject(this.excelOption.column, "excelFile").action = '/api/blade-sales-part/order/import-item-name'
|
|
|
this.templateUrl = '/api/blade-sales-part/order/export-item-name'
|
|
|
} else if (name == 'code') {
|
|
|
- this.findObject(this.excelOption.column, "excelFile").action = '/api/blade-sales-part/order/import-item-code'
|
|
|
+ this.findObject(this.excelOption.column, "excelFile").action = '/api/blade-sales-part/order/import-item-code?storageId='+this.form.storageId
|
|
|
this.templateUrl = '/api/blade-sales-part/order/export-item-code'
|
|
|
}
|
|
|
this.excelBox = true
|
|
@@ -1244,13 +1245,13 @@ export default {
|
|
|
for (let row of this.form.centerShipCostList.filter(item => item.isDeleted != 1)) {
|
|
|
if (!row.costName || !row.goodsNum || !row.costPrice) {
|
|
|
this.$refs.outbound_records.rowCell(row, row.$index)
|
|
|
- return this.$message.error("请完善费用明细信息");
|
|
|
+ return this.$message.error("请完善收费明细信息");
|
|
|
}
|
|
|
}
|
|
|
for (let row of this.form.centerShipPaymentCostList.filter(item => item.isDeleted != 1)) {
|
|
|
if (!row.costName || !row.goodsNum || !row.costPrice) {
|
|
|
this.$refs.outbound_records2.rowCell(row, row.$index)
|
|
|
- return this.$message.error("请完善费用明细信息");
|
|
|
+ return this.$message.error("请完善付费明细信息");
|
|
|
}
|
|
|
}
|
|
|
let obj = {
|