diff --git a/src/views/main/ViewDeletedList/ViewDeletedList.vue b/src/views/main/ViewDeletedList/ViewDeletedList.vue index 1001247..f9646ad 100644 --- a/src/views/main/ViewDeletedList/ViewDeletedList.vue +++ b/src/views/main/ViewDeletedList/ViewDeletedList.vue @@ -6,9 +6,9 @@ - - - + + + @@ -260,7 +260,7 @@ export default { }, data() { return { - SearchContent:'', + SearchContent: '', spinning: false, TaskShippingOrderCompareVisible: false, TaskShippingOrderCompareData: { @@ -297,7 +297,86 @@ export default { pageSize: 20, pageSizes: [10, 20, 50, 100, 200, 500], }, - columns: JSON.parse(JSON.stringify(initData.columns)), + columns: [ + { noDraggable: true, type: 'checkbox', width: 60 }, + { + field: 'mblno', + label: 'MBLNO', + minwidth: 160, + title: '主提单号', + showHeaderOverflow: true, + showOverflow: false, + sortable: true, + slots: { default: 'mblno' }, + }, + { + field: 'createdTime', + label: 'CREATEDTIME', + width: 160, + title: '创建日期', + showHeaderOverflow: true, + sortable: true, + }, + { + field: 'createdUserName', + label: 'CREATEDUSERNAME', + minwidth: 160, + title: '创建人', + showHeaderOverflow: true, + sortable: true, + }, + { + field: 'etd', + label: 'ETD', + minwidth: 160, + title: '开船日期', + showHeaderOverflow: true, + sortable: true, + slots: { default: 'etd' }, + }, + { + field: 'customername', + label: 'CUSTOMERNAME', + minwidth: 160, + title: '委托单位', + showHeaderOverflow: true, + sortable: true, + }, // 客户 + { + field: 'consignee', + label: 'CONSIGNEE', + minwidth: 120, + title: '收货人', + showHeaderOverflow: true, + sortable: true, + }, + { + field: 'notifyparty', + label: 'NOTIFYPARTY', + width: 160, + title: '通知人', + showHeaderOverflow: true, + sortable: true, + }, + { field: 'carrier', width: 120, title: '船公司', showHeaderOverflow: true, sortable: true }, + { + field: 'portdischarge', + label: 'PORTDISCHARGE', + minwidth: 160, + title: '卸货港', + showHeaderOverflow: true, + sortable: true, + }, + { + field: 'operate', + title: '操作', + minwidth: 110, + noDraggable: true, + slots: { default: 'operate' }, + fixed: 'right', + resizable: false, + }, + ], data: [], // treeConfig: { // transform: true, @@ -550,7 +629,6 @@ export default { } this.gridOptions.data = [] this.getList(queryParam) - }, getConfigUser(isInit = false) { const query = { @@ -562,10 +640,12 @@ export default { switch (item.type) { case 'booking_list_cond': this.$set($data, 'booking_list_cond', item) + // this.setFormData(item, false, true) break case 'booking_list_column': this.$set($data, 'booking_list_column', item) + console.log('item==>>', item) // this.setTableList(item) break case 'booking_list_page': @@ -655,6 +735,7 @@ export default { console.log(err) }) }, + //日期 setFormData(data, isReset = false, isInit = false) { if (Object.keys(data).length > 0 && JSON.parse(data.configJson).length) { const arr = JSON.parse(data.configJson) @@ -712,16 +793,20 @@ export default { } this.$forceUpdate() }, + // 表头 setTableList(data) { if (Object.keys(data).length > 0 && JSON.parse(data.configJson).length) { this.formTableData = JSON.parse(data.configJson) + const nowTableArr = this.formTableData.map((item, index) => { if (item.field === 'operate') { item.width = 110 } return item.field }) - this.gridOptions.columns = JSON.parse(JSON.stringify(this.formTableData)) + // console.log('手写的',this.gridOptions.columns) + // this.gridOptions.columns = JSON.parse(JSON.stringify(this.formTableData)) + // console.log('赋值的',this.gridOptions.columns) const moreTableArr = [] this.fromTableAllData.map((item, index) => { if (!nowTableArr.includes(item.field)) { @@ -827,7 +912,7 @@ export default { console.log('== 展开结束 ==', new Date().getTime() - start) }, tableRefresh() { - this.formRes.MBLNO = this.SearchContent + this.formRes.MBLNO = this.SearchContent const data = { ...this.formRes } this.searchData = JSON.parse(JSON.stringify(data)) this.init(this.searchData) @@ -867,7 +952,7 @@ export default { }, tableReset() { - this.SearchContent = '' + this.SearchContent = '' }, submitForm(data) {