diff --git a/src/api/modular/main/BookingLedger.js b/src/api/modular/main/BookingLedger.js
index 0625b4b..83f937d 100644
--- a/src/api/modular/main/BookingLedger.js
+++ b/src/api/modular/main/BookingLedger.js
@@ -872,3 +872,27 @@ export function downloadBookingConfirm(parameter) {
data: parameter
})
}
+
+export function downloadDraft(parameter) {
+ return axios({
+ url: '/BookingValueAdded/DownloadDraft',
+ method: 'post',
+ data: parameter
+ })
+}
+
+export function checkUpdateETA(parameter) {
+ return axios({
+ url: '/BookingValueAdded/CheckUpdateETA',
+ method: 'post',
+ data: parameter
+ })
+}
+
+export function checkUpdateManifestNo(parameter) {
+ return axios({
+ url: '/BookingValueAdded/CheckUpdateManifestNo',
+ method: 'post',
+ data: parameter
+ })
+}
diff --git a/src/components/Table/index.js b/src/components/Table/index.js
index e42b8a4..f321855 100644
--- a/src/components/Table/index.js
+++ b/src/components/Table/index.js
@@ -16,7 +16,7 @@ export default {
selectedRows: [],
selectedRowKeys: [],
-
+ sortObj: { DescSort: '' },
localLoading: false,
localDataSource: [],
localPagination: Object.assign({}, this.pagination),
@@ -136,6 +136,10 @@ export default {
})) ||
false
this.needTotalList = this.initTotalList(this.columns)
+ this.sortObj = {
+ DescSort: '',
+ field: ''
+ }
this.loadData()
// this.columnsSetting = this.columns
// 记录选择显示的列,以当前路由为key
@@ -165,6 +169,7 @@ export default {
* @param Boolean bool
*/
refresh(bool = false) {
+ console.log(this.sortObj)
bool &&
(this.localPagination = Object.assign(
{},
@@ -182,9 +187,10 @@ export default {
* @param {Object} sorter 排序条件
*/
loadData(pagination, filters, sorter) {
- console.log(pagination)
this.localLoading = true
-
+ if (sorter) {
+ this.sortObj = sorter
+ }
const parameter = Object.assign(
{
pageNo:
@@ -194,16 +200,24 @@ export default {
(this.showPagination && this.localPagination.pageSize) ||
this.pageSize
},
- (sorter && sorter.field && { SortField: sorter.field }) || {},
- (sorter && sorter.order && { sortOrder: sorter.order }) || {},
+ (this.sortObj && this.sortObj.field && { SortField: this.sortObj.field }) || {},
{
...filters
}
)
- if (sorter && sorter.order === 'descend') {
+ if (this.sortObj && this.sortObj.order === 'descend' && this.sortObj.field) {
parameter.DescSort = true
+ this.sortObj.DescSort = true
} else {
- parameter.DescSort = false
+ if (this.sortObj && this.sortObj.field) {
+ parameter.DescSort = false
+ this.sortObj.DescSort = false
+ } else {
+ delete parameter.DescSort
+ if (this.sortObj) {
+ this.sortObj.DescSort = ''
+ }
+ }
}
const result = this.data(parameter)
// 对接自己的通用数据接口需要修改下方代码中的 r.pageNo, r.totalCount, r.data
diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue
index 30cb138..f12ab04 100644
--- a/src/views/main/BookingLedger/list/index.vue
+++ b/src/views/main/BookingLedger/list/index.vue
@@ -101,16 +101,16 @@
船公司文件