|
|
@@ -906,7 +906,7 @@
|
|
|
:on-change="fileChange1"
|
|
|
:on-preview="handlePictureCardPreview"
|
|
|
:on-exceed="exceed"
|
|
|
- accept=".jpg,.jpeg,.png,.gif,.bmp,.JPG,.JPEG,.PBG,.GIF,.BMP"
|
|
|
+ accept=".jpg,.jpeg,.png,.JPG,.JPEG"
|
|
|
:auto-upload="false"
|
|
|
>
|
|
|
<i class="el-icon-plus"></i>
|
|
|
@@ -2045,9 +2045,10 @@ export default {
|
|
|
)
|
|
|
}
|
|
|
console.log(data, 'data')
|
|
|
- this.selecteddetailsOrderAmount = data.reduce((prev, item) => {
|
|
|
- return item.detailsAmount + prev
|
|
|
- }, 0)
|
|
|
+ this.selecteddetailsOrderAmount =
|
|
|
+ data.reduce((prev, item) => {
|
|
|
+ return item.detailsAmount * 1000 + prev
|
|
|
+ }, 0) / 1000
|
|
|
this.selecteddetailsOrderAmount = this.selecteddetailsOrderAmount.toFixed(
|
|
|
2
|
|
|
)
|
|
|
@@ -2689,6 +2690,9 @@ export default {
|
|
|
// this.arrivalReceiving = true
|
|
|
// },
|
|
|
fileChange1(file, fileList) {
|
|
|
+ // console.log(file, 'file')
|
|
|
+ // let arr = ['.jpg', '.jpeg', '.png', '.JPG', '.JPEG']
|
|
|
+ // if (f)
|
|
|
this.statementList = fileList
|
|
|
},
|
|
|
fileChange2(file, fileList) {
|
|
|
@@ -3420,6 +3424,7 @@ export default {
|
|
|
|
|
|
//查询，输入查询条件
|
|
|
onclick(obj) {
|
|
|
+ this.setteldAllselectValue = 0
|
|
|
this.selecteddetailsOrderAmount = 0
|
|
|
this.amsPriceList = []
|
|
|
this.isRowClick = 0
|
|
|
@@ -3743,6 +3748,7 @@ export default {
|
|
|
//获取钢材统计报表
|
|
|
getSteelReport() {
|
|
|
this.selecteddetailsOrderAmount = 0
|
|
|
+ this.setteldAllselectValue = 0
|
|
|
this.amsPriceList = []
|
|
|
const loading = this.$loading({
|
|
|
lock: true,
|
|
|
@@ -3750,6 +3756,9 @@ export default {
|
|
|
spinner: 'el-icon-loading',
|
|
|
background: 'rgba(0, 0, 0, 0.7)'
|
|
|
})
|
|
|
+ if (this.screen2 == '制单日期') {
|
|
|
+ this.filterMap.saleMakeDate = 1
|
|
|
+ }
|
|
|
this.isRowClick = 0
|
|
|
let startTime = null
|
|
|
let endTime = null
|
luobang