|
@@ -202,7 +202,6 @@
|
|
|
:cell-style="cellStyle"
|
|
|
@filter-change="filterChange"
|
|
|
:key="saleSteelKey"
|
|
|
- id="salesLogisticsStat_saleSteelReports_table"
|
|
|
@select="selectOne"
|
|
|
@selection-change="handleSelectionChange()"
|
|
|
:header-cell-style="headCellStyle"
|
|
@@ -3177,7 +3176,7 @@ export default {
|
|
|
},
|
|
|
receiveClick(src, title) {
|
|
|
// this.dialogImageUrl = src
|
|
|
- downloadFile(src, `${this.downloadCapacityNo}${title}照片`, '.jpg')
|
|
|
+ downloadFile(src, `${this.downloadCapacityNo}${title}照片`, 'jpg')
|
|
|
// this.dialogVisible = true
|
|
|
},
|
|
|
openRemarkPic() {
|
|
@@ -3793,13 +3792,13 @@ export default {
|
|
|
cellClik(row, column, cell, event) {
|
|
|
if (column.property == 'arrivalAddress') {
|
|
|
if (row.orderNo && row.arrivalAddress) {
|
|
|
- this.downloadCapacityNo = row.capacityNo
|
|
|
+ this.downloadCapacityNo = `${row.orderTime}-${row.capacityNo}`
|
|
|
this.toPhotoClick(row.orderNo, 1)
|
|
|
}
|
|
|
}
|
|
|
if (column.property == 'receiptAddress') {
|
|
|
if (row.orderNo && row.receiptAddress) {
|
|
|
- this.downloadCapacityNo = row.capacityNo
|
|
|
+ this.downloadCapacityNo = `${row.orderTime}-${row.capacityNo}`
|
|
|
this.receipctPhotoClick(row.orderNo, 1)
|
|
|
}
|
|
|
}
|
|
@@ -4466,9 +4465,17 @@ export default {
|
|
|
},
|
|
|
//获取所有省数据
|
|
|
getAllProvince() {
|
|
|
- this.axios.post('/api/v1/uc/getAllProvince').then(res => {
|
|
|
- this.provinceList = res.data.data
|
|
|
- })
|
|
|
+ // this.provinceList = []
|
|
|
+ // return
|
|
|
+ this.axios
|
|
|
+ .post('/api/v1/uc/getAllProvince')
|
|
|
+ .then(res => {
|
|
|
+ // console.log(res.data.data)
|
|
|
+ this.provinceList = res.data.data
|
|
|
+ })
|
|
|
+ .catch(e => {
|
|
|
+ console.log(e)
|
|
|
+ })
|
|
|
},
|
|
|
//省改变
|
|
|
onchangeProvince() {
|
|
@@ -4967,6 +4974,7 @@ export default {
|
|
|
//获取钢材统计报表
|
|
|
getSteelReportDebounce() {
|
|
|
this.$store.commit('updateSaleSteelToggleIds', { isClear: 1 })
|
|
|
+ console.log('---------------------------1111')
|
|
|
const loading = this.$loading({
|
|
|
lock: true,
|
|
|
text: '正在获取数据,请稍候',
|
|
@@ -5075,6 +5083,7 @@ export default {
|
|
|
return e != '净重'
|
|
|
})
|
|
|
}
|
|
|
+
|
|
|
let a = 1
|
|
|
if (
|
|
|
this.visibleList.length > 0 &&
|
|
@@ -5083,8 +5092,8 @@ export default {
|
|
|
a = this.visibleList[0].rowKey
|
|
|
}
|
|
|
this.visibleList = []
|
|
|
- // this.getNodeNum(this.tableData)
|
|
|
- this.visibleList = this.tableData.slice(
|
|
|
+ // this.getNodeLNum(this.tableData)
|
|
|
+ this.visibleist = this.tableData.slice(
|
|
|
0,
|
|
|
Math.floor(this.maxHeight / this.itemHeight) + 1
|
|
|
)
|