|
@@ -2079,13 +2079,9 @@ export default {
|
|
|
'拼数',
|
|
|
'是否继续装',
|
|
|
'订单上传时间',
|
|
|
- '收款公司',
|
|
|
- '净重',
|
|
|
- '皮重时间',
|
|
|
- '皮重',
|
|
|
- '毛重时间',
|
|
|
- '毛重',
|
|
|
+ '收款公司'
|
|
|
],
|
|
|
+ netWeightMegeList: ['净重', '皮重时间', '皮重', '毛重时间', '毛重'],
|
|
|
//钢材多拼车辆线路ID
|
|
|
//索引从1-10为1-10拼路线ID
|
|
|
lineSpelling: [
|
|
@@ -4067,7 +4063,7 @@ export default {
|
|
|
this.onchangeProvince()
|
|
|
this.onchangeCity()
|
|
|
this.centerDialogVisible = true
|
|
|
- this.getSpanArr1(res.data.data.mapList);
|
|
|
+ this.getSpanArr1(res.data.data.mapList)
|
|
|
})
|
|
|
},
|
|
|
//查看抵达图
|
|
@@ -4879,7 +4875,7 @@ export default {
|
|
|
this.pos = 0
|
|
|
} else {
|
|
|
// 判断当前元素与上一个元素是否相同
|
|
|
- if (data[i].saleOrderMaterialId === data[i - 1].saleOrderMaterialId || ( data[i].weightBatchId && data[i].weightBatchId ===data[i - 1].weightBatchId)) {
|
|
|
+ if (data[i].saleOrderMaterialId === data[i - 1].saleOrderMaterialId) {
|
|
|
this.spanArr[this.pos] += 1
|
|
|
// data[i].group = data[i - 1].group
|
|
|
this.spanArr.push(0)
|
|
@@ -4901,7 +4897,11 @@ export default {
|
|
|
this.pos1 = 0
|
|
|
} else {
|
|
|
// 判断当前元素与上一个元素是否相同
|
|
|
- if (data[i].saleOrderMaterialId === data[i - 1].saleOrderMaterialId || ( data[i].weightBatchId && data[i].weightBatchId ===data[i - 1].weightBatchId)) {
|
|
|
+ if (
|
|
|
+ data[i].saleOrderMaterialId === data[i - 1].saleOrderMaterialId ||
|
|
|
+ (data[i].weightBatchId &&
|
|
|
+ data[i].weightBatchId === data[i - 1].weightBatchId)
|
|
|
+ ) {
|
|
|
this.spanArr1[this.pos] += 1
|
|
|
// data[i].group = data[i - 1].group
|
|
|
this.spanArr1.push(0)
|