|
@@ -93,6 +93,12 @@
|
|
|
:auto-upload="false">
|
|
|
<ws-button type="primary">导入</ws-button>
|
|
|
</el-upload>
|
|
|
+ <el-link
|
|
|
+ href="https://taohaoliang.oss-cn-beijing.aliyuncs.com/pcfiles/%E6%94%B6%E8%B4%AD%E4%BF%A1%E6%81%AF%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF%EF%BC%88%E6%96%B0%EF%BC%89.xlsx"
|
|
|
+ style="margin-left: 8px"
|
|
|
+ >
|
|
|
+ <el-button type="primary">模板下载</el-button>
|
|
|
+ </el-link>
|
|
|
</template>
|
|
|
<template slot="right"></template>
|
|
|
</BaseHeaderLayout>
|
|
@@ -583,6 +589,7 @@
|
|
|
obj.dryGrainPrice = v.单价
|
|
|
obj.qualityDate = _this.formatDate(v.日期, '-')
|
|
|
obj.deductionAmount = v.扣款
|
|
|
+ obj.goodsName = v.货名
|
|
|
_this.excelFreightspace.push(obj)
|
|
|
})
|
|
|
if (_this.excelFreightspace) {
|
|
@@ -592,15 +599,14 @@
|
|
|
}).toPromise()
|
|
|
.then((response) => {
|
|
|
if (response == 'ok') {
|
|
|
- this.$notify({
|
|
|
+ _this.getList()
|
|
|
+ _this.$notify({
|
|
|
title: '成功',
|
|
|
message: '导入成功',
|
|
|
type: 'success'
|
|
|
});
|
|
|
- _this.getList()
|
|
|
}
|
|
|
})
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
reader.readAsArrayBuffer(f);
|
|
@@ -1220,7 +1226,6 @@
|
|
|
)
|
|
|
},
|
|
|
printBig() {
|
|
|
- debugger
|
|
|
let _list1 = []
|
|
|
let _list2 = []
|
|
|
if (this.printType == 1) {
|