|
|
@@ -174,37 +174,15 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="saleMakeDate"
|
|
|
- label="制单时间"
|
|
|
+ label="制单日期"
|
|
|
width="110px"
|
|
|
align="center"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="consigneeName"
|
|
|
- label="客户"
|
|
|
- width="160px"
|
|
|
- align="center"
|
|
|
- column-key="consigneeName"
|
|
|
- :filters="filterConsigneeList"
|
|
|
- sortable
|
|
|
- show-overflow-tooltip
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="carrierName"
|
|
|
- label="承运商"
|
|
|
- align="center"
|
|
|
- width="80px"
|
|
|
- column-key="carrierList"
|
|
|
- sortable
|
|
|
- show-overflow-tooltip
|
|
|
- :filters="filterCarrierList"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
<el-table-column
|
|
|
prop="newCapacityNo"
|
|
|
column-key="newCapacityNo"
|
|
|
- label="车牌号"
|
|
|
+ label="车号"
|
|
|
align="center"
|
|
|
width="90px"
|
|
|
sortable
|
|
|
@@ -213,54 +191,29 @@
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="addressPlace"
|
|
|
- label="收货地址"
|
|
|
- width="250px"
|
|
|
- sortable
|
|
|
- column-key="addressPlace"
|
|
|
- :filters="filteraddressPlace"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="actualAddress"
|
|
|
- label="实际收货地址"
|
|
|
- width="250px"
|
|
|
+ prop="consigneeName"
|
|
|
+ label="客户"
|
|
|
+ width="160px"
|
|
|
+ align="center"
|
|
|
+ column-key="consigneeName"
|
|
|
+ :filters="filterConsigneeList"
|
|
|
sortable
|
|
|
- column-key="actualAddress"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column prop="priceValue" label="运价" width="100px">
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="detailsAmount"
|
|
|
- label="运费"
|
|
|
- width="100px"
|
|
|
- ></el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="netWeight"
|
|
|
- label="净重"
|
|
|
- show-overflow-tooltip
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="materialWeight"
|
|
|
- label="理重"
|
|
|
show-overflow-tooltip
|
|
|
>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
+ <el-table-column
|
|
|
prop="materialName"
|
|
|
column-key="materialNameList"
|
|
|
- label="物资名称"
|
|
|
+ label="物料名称"
|
|
|
align="center"
|
|
|
width="150px"
|
|
|
sortable
|
|
|
:filters="filtermaterialNameList"
|
|
|
>
|
|
|
- </el-table-column>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
prop="materialSpe"
|
|
|
- label="物资规格"
|
|
|
+ label="规格型号"
|
|
|
column-key="materialSpe"
|
|
|
align="center"
|
|
|
sortable
|
|
|
@@ -270,16 +223,22 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="materialPlanNumber"
|
|
|
- label="计划件数"
|
|
|
+ label="辅助数量"
|
|
|
align="center"
|
|
|
- width="50px"
|
|
|
+ width="100px"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="materialNum"
|
|
|
- label="装车件数"
|
|
|
+ label="累计出库数量"
|
|
|
align="center"
|
|
|
- width="50px"
|
|
|
+ width="100px"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="netWeight"
|
|
|
+ label="磅重"
|
|
|
+ show-overflow-tooltip
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -293,8 +252,34 @@
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
+ prop="carrierName"
|
|
|
+ label="承运商"
|
|
|
+ align="center"
|
|
|
+ width="80px"
|
|
|
+ column-key="carrierList"
|
|
|
+ sortable
|
|
|
+ show-overflow-tooltip
|
|
|
+ :filters="filterCarrierList"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="actualAddress"
|
|
|
+ label="下货地点"
|
|
|
+ width="250px"
|
|
|
+ sortable
|
|
|
+ column-key="actualAddress"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="priceValue" label="单价" width="100px">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="detailsAmount"
|
|
|
+ label="运费"
|
|
|
+ width="100px"
|
|
|
+ ></el-table-column>
|
|
|
+ <el-table-column
|
|
|
prop="closeEntryId"
|
|
|
- label="金蝶分录ID"
|
|
|
+ label="分录ID"
|
|
|
width="120px"
|
|
|
show-overflow-tooltip
|
|
|
>
|
|
|
@@ -315,29 +300,46 @@
|
|
|
:filters="filterSaleAreaList"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="unloadType" label="卸货类别" width="60px">
|
|
|
+ <el-table-column prop="unloadType" label="卸货类型" width="60px">
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="paymentCustomer"
|
|
|
- label="付款单位"
|
|
|
+ <el-table-column
|
|
|
+ prop="saleOrderReceiveCustomer"
|
|
|
+ label="收款客户"
|
|
|
width="120px"
|
|
|
show-overflow-tooltip
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="consingneeSettlementMethod"
|
|
|
- label="结算方式"
|
|
|
+ prop="addressPlace"
|
|
|
+ label="收货地址"
|
|
|
+ width="250px"
|
|
|
+ sortable
|
|
|
+ column-key="addressPlace"
|
|
|
+ :filters="filteraddressPlace"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="materialWeight"
|
|
|
+ label="理重"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+
|
|
|
+ <el-table-column
|
|
|
+ prop="paymentCustomer"
|
|
|
+ label="付款单位"
|
|
|
width="120px"
|
|
|
show-overflow-tooltip
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="saleOrderReceiveCustomer"
|
|
|
- label="收款单位"
|
|
|
+ prop="consingneeSettlementMethod"
|
|
|
+ label="结算方式"
|
|
|
width="120px"
|
|
|
show-overflow-tooltip
|
|
|
>
|
|
|
</el-table-column>
|
|
|
+
|
|
|
<el-table-column
|
|
|
prop="recordUserName"
|
|
|
label="操作人"
|
|
|
@@ -387,93 +389,46 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="saleMakeDate"
|
|
|
- label="制单时间"
|
|
|
+ label="制单日期"
|
|
|
width="110px"
|
|
|
align="center"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="consigneeName"
|
|
|
- label="客户"
|
|
|
- width="160px"
|
|
|
- align="center"
|
|
|
- column-key="consigneeName"
|
|
|
- :filters="filterConsigneeList"
|
|
|
- sortable
|
|
|
- show-overflow-tooltip
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="carrierName"
|
|
|
- label="承运商"
|
|
|
- align="center"
|
|
|
- width="80px"
|
|
|
- column-key="carrierList"
|
|
|
- sortable
|
|
|
- show-overflow-tooltip
|
|
|
- :filters="filterCarrierList"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
+ <el-table-column
|
|
|
prop="newCapacityNo"
|
|
|
column-key="newCapacityNo"
|
|
|
- label="车牌号"
|
|
|
+ label="车号"
|
|
|
align="center"
|
|
|
width="90px"
|
|
|
- sortable
|
|
|
- show-overflow-tooltip
|
|
|
:filters="filterCapacityList"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="addressPlace"
|
|
|
- label="收货地址"
|
|
|
- width="250px"
|
|
|
sortable
|
|
|
- column-key="addressPlace"
|
|
|
- :filters="filteraddressPlace"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="actualAddress"
|
|
|
- label="实际收货地址"
|
|
|
- width="250px"
|
|
|
- sortable
|
|
|
- column-key="actualAddress"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column prop="priceValue" label="运价" width="100px">
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="detailsAmount"
|
|
|
- label="运费"
|
|
|
- width="100px"
|
|
|
- ></el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="netWeight"
|
|
|
- label="净重"
|
|
|
show-overflow-tooltip
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="materialWeight"
|
|
|
- label="理重"
|
|
|
+ prop="consigneeName"
|
|
|
+ label="客户"
|
|
|
+ width="160px"
|
|
|
+ align="center"
|
|
|
+ column-key="consigneeName"
|
|
|
+ :filters="filterConsigneeList"
|
|
|
+ sortable
|
|
|
show-overflow-tooltip
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="materialName"
|
|
|
column-key="materialNameList"
|
|
|
- label="物资名称"
|
|
|
+ label="物料名称"
|
|
|
align="center"
|
|
|
width="150px"
|
|
|
sortable
|
|
|
:filters="filtermaterialNameList"
|
|
|
>
|
|
|
- </el-table-column>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
prop="materialSpe"
|
|
|
- label="物资规格"
|
|
|
+ label="规格型号"
|
|
|
column-key="materialSpe"
|
|
|
align="center"
|
|
|
sortable
|
|
|
@@ -483,19 +438,25 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="materialPlanNumber"
|
|
|
- label="计划件数"
|
|
|
+ label="辅助数量"
|
|
|
align="center"
|
|
|
- width="50px"
|
|
|
+ width="100px"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="materialNum"
|
|
|
- label="装车件数"
|
|
|
+ label="累计出库数量"
|
|
|
align="center"
|
|
|
- width="50px"
|
|
|
+ width="100px"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
+ <el-table-column
|
|
|
+ prop="netWeight"
|
|
|
+ label="磅重"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
prop="saleRemark"
|
|
|
column-key="saleRemark"
|
|
|
label="摘要"
|
|
|
@@ -505,9 +466,35 @@
|
|
|
show-overflow-tooltip
|
|
|
>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="carrierName"
|
|
|
+ label="承运商"
|
|
|
+ align="center"
|
|
|
+ width="80px"
|
|
|
+ column-key="carrierList"
|
|
|
+ sortable
|
|
|
+ show-overflow-tooltip
|
|
|
+ :filters="filterCarrierList"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="actualAddress"
|
|
|
+ label="下货地点"
|
|
|
+ width="250px"
|
|
|
+ sortable
|
|
|
+ column-key="actualAddress"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="priceValue" label="单价" width="100px">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="detailsAmount"
|
|
|
+ label="运费"
|
|
|
+ width="100px"
|
|
|
+ ></el-table-column>
|
|
|
<el-table-column
|
|
|
prop="closeEntryId"
|
|
|
- label="金蝶分录ID"
|
|
|
+ label="分录ID"
|
|
|
width="120px"
|
|
|
show-overflow-tooltip
|
|
|
>
|
|
|
@@ -528,29 +515,49 @@
|
|
|
:filters="filterSaleAreaList"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="unloadType" label="卸货类别" width="60px">
|
|
|
+ <el-table-column prop="unloadType" label="卸货类型" width="60px">
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="paymentCustomer"
|
|
|
- label="付款单位"
|
|
|
+ <el-table-column
|
|
|
+ prop="saleOrderReceiveCustomer"
|
|
|
+ label="收款客户"
|
|
|
width="120px"
|
|
|
show-overflow-tooltip
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="consingneeSettlementMethod"
|
|
|
- label="结算方式"
|
|
|
+ prop="addressPlace"
|
|
|
+ label="收货地址"
|
|
|
+ width="250px"
|
|
|
+ sortable
|
|
|
+ column-key="addressPlace"
|
|
|
+ :filters="filteraddressPlace"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ <el-table-column
|
|
|
+ prop="materialWeight"
|
|
|
+ label="理重"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+
|
|
|
+ <el-table-column
|
|
|
+ prop="paymentCustomer"
|
|
|
+ label="付款单位"
|
|
|
width="120px"
|
|
|
show-overflow-tooltip
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="saleOrderReceiveCustomer"
|
|
|
- label="收款单位"
|
|
|
+ prop="consingneeSettlementMethod"
|
|
|
+ label="结算方式"
|
|
|
width="120px"
|
|
|
show-overflow-tooltip
|
|
|
>
|
|
|
</el-table-column>
|
|
|
+
|
|
|
<el-table-column
|
|
|
prop="recordUserName"
|
|
|
label="操作人"
|
|
|
@@ -857,8 +864,8 @@ export default {
|
|
|
lable: '承运商'
|
|
|
},
|
|
|
{
|
|
|
- value: '车牌号',
|
|
|
- lable: '车牌号'
|
|
|
+ value: '车号',
|
|
|
+ lable: '车号'
|
|
|
},
|
|
|
{
|
|
|
value: '分录ID',
|
|
|
@@ -875,11 +882,11 @@ export default {
|
|
|
lable: '承运商'
|
|
|
},
|
|
|
{
|
|
|
- value: '车牌号',
|
|
|
- lable: '车牌号'
|
|
|
+ value: '车号',
|
|
|
+ lable: '车号'
|
|
|
}
|
|
|
],
|
|
|
- //合计净重
|
|
|
+ //合计净重（磅重）
|
|
|
totalNumber: 0,
|
|
|
//合计车数
|
|
|
totalCapacity: 0,
|
|
|
@@ -909,11 +916,11 @@ export default {
|
|
|
'出厂时间',
|
|
|
'进厂时间',
|
|
|
'运单状态',
|
|
|
- '车牌号',
|
|
|
+ '车号',
|
|
|
'承运商',
|
|
|
'客户',
|
|
|
'收货地址',
|
|
|
- '实际收货地址',
|
|
|
+ '下货地点',
|
|
|
'业务员',
|
|
|
'送货单打印',
|
|
|
'收货客户电话',
|
|
|
@@ -943,11 +950,11 @@ export default {
|
|
|
'出厂时间',
|
|
|
'进厂时间',
|
|
|
'运单状态',
|
|
|
- '车牌号',
|
|
|
+ '车号',
|
|
|
'承运商',
|
|
|
'客户',
|
|
|
'收货地址',
|
|
|
- '实际收货地址',
|
|
|
+ '下货地点',
|
|
|
'业务员',
|
|
|
'送货单打印',
|
|
|
'收货客户电话',
|
|
|
@@ -1768,6 +1775,7 @@ export default {
|
|
|
// },
|
|
|
//筛选
|
|
|
filterChange(obj) {
|
|
|
+ console.log("filterChangeParam",obj);
|
|
|
//承运商筛选,后续有待优化
|
|
|
if (typeof obj.carrierList != 'undefined' && obj.carrierList.length > 0) {
|
|
|
this.filterMap.carrierList = obj.carrierList
|
|
|
@@ -1778,7 +1786,7 @@ export default {
|
|
|
) {
|
|
|
delete this.filterMap.carrierList
|
|
|
}
|
|
|
- //物资名称筛选,后续有待优化
|
|
|
+ //物资名称（物料名称）筛选,后续有待优化
|
|
|
if (
|
|
|
typeof obj.materialNameList != 'undefined' &&
|
|
|
obj.materialNameList.length > 0
|
|
|
@@ -1791,9 +1799,15 @@ export default {
|
|
|
) {
|
|
|
delete this.filterMap.materialNameList
|
|
|
}
|
|
|
- //车牌号筛选,后续有待优化
|
|
|
- if (typeof obj.capacityNo != 'undefined' && obj.capacityNo.length > 0) {
|
|
|
- this.filterMap.capacityList = obj.capacityNo
|
|
|
+ //车号筛选,后续有待优化
|
|
|
+ if (typeof obj.newCapacityNo != 'undefined' && obj.newCapacityNo.length > 0) {
|
|
|
+ this.filterMap.capacityList = obj.newCapacityNo
|
|
|
+ }
|
|
|
+ if (
|
|
|
+ typeof obj.newCapacityNo != 'undefined' &&
|
|
|
+ obj.newCapacityNo.length == 0
|
|
|
+ ) {
|
|
|
+ delete this.filterMap.capacityList
|
|
|
}
|
|
|
if (typeof obj.capacityNo != 'undefined' && obj.capacityNo.length == 0) {
|
|
|
delete this.filterMap.capacityList
|
|
|
@@ -1824,7 +1838,7 @@ export default {
|
|
|
) {
|
|
|
delete this.filterMap.saleAreaList
|
|
|
}
|
|
|
- //物资规格筛选
|
|
|
+ //物资规格（规格型号）筛选
|
|
|
if (typeof obj.materialSpe != 'undefined' && obj.materialSpe.length > 0) {
|
|
|
this.filterMap.materialSpeList = obj.materialSpe
|
|
|
}
|
|
|
@@ -1887,7 +1901,7 @@ export default {
|
|
|
let carrierNameList = this.tableData.map(e => {
|
|
|
return e.carrierName
|
|
|
})
|
|
|
- //车牌号筛选数组
|
|
|
+ //车号筛选数组
|
|
|
let capacityList = this.tableData.map(e => {
|
|
|
return e.newCapacityNo
|
|
|
})
|
|
|
@@ -3001,7 +3015,7 @@ export default {
|
|
|
consigneeName = this.input
|
|
|
} else if (this.screen == '承运商') {
|
|
|
carrierName = this.input
|
|
|
- } else if (this.screen == '车牌号') {
|
|
|
+ } else if (this.screen == '车号') {
|
|
|
capacityNo = this.input
|
|
|
} else if (this.screen == '分录ID') {
|
|
|
console.log("进入了分录")
|
|
|
@@ -3013,7 +3027,7 @@ export default {
|
|
|
consigneeName = this.input1
|
|
|
} else if (this.screen1 == '承运商') {
|
|
|
carrierName = this.input1
|
|
|
- } else if (this.screen1 == '车牌号') {
|
|
|
+ } else if (this.screen1 == '车号') {
|
|
|
capacityNo = this.input1
|
|
|
} else {
|
|
|
remark = this.input1
|
|
|
@@ -3204,7 +3218,7 @@ export default {
|
|
|
consigneeName = this.input
|
|
|
} else if (this.screen == '承运商') {
|
|
|
carrierName = this.input
|
|
|
- } else if (this.screen == '车牌号') {
|
|
|
+ } else if (this.screen == '车号') {
|
|
|
capacityNo = this.input
|
|
|
} else if (this.screen == '分录ID') {
|
|
|
easPrimaryId = this.input
|
|
|
@@ -3215,7 +3229,7 @@ export default {
|
|
|
consigneeName = this.input1
|
|
|
} else if (this.screen1 == '承运商') {
|
|
|
carrierName = this.input1
|
|
|
- } else if (this.screen1 == '车牌号') {
|
|
|
+ } else if (this.screen1 == '车号') {
|
|
|
capacityNo = this.input1
|
|
|
}
|
|
|
if (getCookie('orgCode') == 'chengyunshang') {
|
