|
@@ -146,6 +146,21 @@ export default {
|
|
|
prop: "paymode"
|
|
|
},
|
|
|
{
|
|
|
+ label: "收付",
|
|
|
+ search: true,
|
|
|
+ type: 'select',
|
|
|
+ dicData:[{
|
|
|
+ label:'收',
|
|
|
+ value: 'D'
|
|
|
+ },{
|
|
|
+ label:'付',
|
|
|
+ value: 'C'
|
|
|
+ }],
|
|
|
+ prop: "dc"
|
|
|
+ },
|
|
|
+
|
|
|
+
|
|
|
+ {
|
|
|
label: "计量单位",
|
|
|
prop: "unitNo"
|
|
|
},
|
|
@@ -205,17 +220,29 @@ export default {
|
|
|
{
|
|
|
label: "船名",
|
|
|
search: true,
|
|
|
+ width: "180",
|
|
|
prop: "vesselCnName"
|
|
|
},
|
|
|
{
|
|
|
label: "航次",
|
|
|
search: true,
|
|
|
+ width: "180",
|
|
|
prop: "voyageNo"
|
|
|
},
|
|
|
{
|
|
|
label: "ETD",
|
|
|
+ prop: "etd",
|
|
|
+ width: "180"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "ETD",
|
|
|
search: true,
|
|
|
- prop: "etd"
|
|
|
+ type: 'daterange',
|
|
|
+ hide: true,
|
|
|
+ format:'yyyy-MM-dd',
|
|
|
+ valueFormat:'yyyy-MM-dd',
|
|
|
+ searchRange: true,
|
|
|
+ prop: "etdList"
|
|
|
},
|
|
|
|
|
|
|
|
@@ -1382,7 +1409,15 @@ export default {
|
|
|
},
|
|
|
onLoad(page, params = {}) {
|
|
|
this.loading = true;
|
|
|
- feecenterList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
|
|
|
+ var querys = this.query
|
|
|
+ if (this.query.etd) {
|
|
|
+ var etdList = []
|
|
|
+ etdList[0] = this.query.etd[0] + ' 00:00'
|
|
|
+ etdList[1] = this.query.etd[1] + ' 23:59'
|
|
|
+ querys.etdList = etdList;
|
|
|
+ querys.etd = null
|
|
|
+ }
|
|
|
+ feecenterList(page.currentPage, page.pageSize, Object.assign(params, querys)).then(res => {
|
|
|
const data = res.data.data;
|
|
|
this.page.total = data.total;
|
|
|
this.data = data.records;
|