diff --git a/src/api/modular/main/BookingLedger.js b/src/api/modular/main/BookingLedger.js index b68694c..561b596 100644 --- a/src/api/modular/main/BookingLedger.js +++ b/src/api/modular/main/BookingLedger.js @@ -995,4 +995,12 @@ export function SubmitRule0pinion (parameter) { method: 'post', data: parameter }) -} \ No newline at end of file +} + +export function BookingCustomerOrderPage (parameter) { + return axios({ + url: 'BookingCustomerOrder/PageData', + method: 'post', + data: parameter + }) +} diff --git a/src/api/modular/system/fileManage.js b/src/api/modular/system/fileManage.js index 7bcbf36..e60c9f0 100644 --- a/src/api/modular/system/fileManage.js +++ b/src/api/modular/system/fileManage.js @@ -34,13 +34,13 @@ export function sysFileInfoList (parameter) { * @author yubaoshan * @date 2020/6/30 00:20 */ -export function sysFileInfoUpload (parameter,uploadProcess) { +export function sysFileInfoUpload (parameter, uploadProcess) { return axios({ url: '/sysFileInfo/upload', method: 'post', data: parameter, - onUploadProgress:function(progressEvent){ - let percent = (progressEvent.loaded / progressEvent.total * 100 | 0) + onUploadProgress: function(progressEvent) { + const percent = (progressEvent.loaded / progressEvent.total * 100 | 0) uploadProcess && uploadProcess(percent) } }) @@ -131,3 +131,17 @@ export function sysFileInfoUploadAvatar (parameter) { data: parameter }) } + +/** + * 客户订舱临时文件 + * + * @author zuohuaijun + * @date 2021/4/23 00:20 + */ +export function UploadTempFile (parameter) { + return axios({ + url: '/BookingCustomerOrder/UploadTempFile', + method: 'post', + data: parameter + }) +} diff --git a/src/router/generator-routers.js b/src/router/generator-routers.js index 6560ec7..8c911c7 100644 --- a/src/router/generator-routers.js +++ b/src/router/generator-routers.js @@ -35,7 +35,8 @@ const constantRouterComponents = { TaskLaraRegist: () => import('@/views/main/Taskmanage/TaskLaraRegist'), TaskVgmContrast: () => import('@/views/main/Taskmanage/TaskVgmContrast'), TaskOriginalLost: () => import('@/views/main/Taskmanage/TaskOriginalLost'), - TaskChangeShip: () => import('@/views/main/Taskmanage/TaskChangeShip') + TaskChangeShip: () => import('@/views/main/Taskmanage/TaskChangeShip'), + BookingCustomerDetail: () => import('@/views/main/BookingCustomerLedger/detail') } // 前端未找到页面路由（固定不用改）、原来为 /404 @@ -241,6 +242,17 @@ const booking = [ }, component: 'BookingDetail' }, + { + name: 'BookingCustomerDetail', + path: '/BookingCustomerDetail', + pid: 0, + id: 10031, + meta: { + title: '客户订舱详情', + show: false + }, + component: 'BookingCustomerDetail' + }, { name: 'CustomerInformationManagementAdd', path: '/CustomerInformationManagementAdd', diff --git a/src/views/main/BookingCustomerLedger/detail/index.vue b/src/views/main/BookingCustomerLedger/detail/index.vue index 0cf1726..a96c27f 100644 --- a/src/views/main/BookingCustomerLedger/detail/index.vue +++ b/src/views/main/BookingCustomerLedger/detail/index.vue @@ -1,1758 +1,784 @@ diff --git a/src/views/main/BookingCustomerLedger/list/index.vue b/src/views/main/BookingCustomerLedger/list/index.vue index 3310474..b688e46 100644 --- a/src/views/main/BookingCustomerLedger/list/index.vue +++ b/src/views/main/BookingCustomerLedger/list/index.vue @@ -72,8 +72,8 @@
新建
复制
-
导入
-
模板
+
导入
+
模板
删除
 -
发送订舱
+
发送订舱
@@ -122,6 +119,33 @@ {{ row.pono }} + + + + @@ -137,6 +161,9 @@ + @@ -157,9 +184,6 @@ - + - -
- - - - - - - - - -
- - - -
- - - - - - - {{ item.name }} - - - - - - - - - - - - - - - - - - - - - - - - - {{ item.enName }} - - - - - - - - - - - - - - {{ item.enName }} - - - - - - - - - - - - - - - - - - - - - -
- - -
-
时间{{ bcFile.executeTime }}
- {{ bcFile.batchTotal }} -
-
-
- {{ item.bno }} - {{ item.msg }} -
-
-
{{ bcFile.msg }}
- @@ -645,8 +408,10 @@ import { XCard, setFormModel } from '@/components' import columnSetting from '@/components/tableColumnSetting' import formLabel from './modules/formLabel' +import importBc from './modules/importBc' +import importBcMore from './modules/importBcMore' import { - BookingOrderPage, + BookingCustomerOrderPage, SendTrace, GetVessellist, GetPortlist, @@ -669,8 +434,9 @@ import { GetTenantLineList, downloadBookingConfirm, downloadDraft, - checkUpdateETA, - checkUpdateManifestNo + checkUpdateManifestNo, + singleBCFileRead, + RefreshBillTrace } from '@/api/modular/main/BookingLedger' import initData from './modules/initData' @@ -685,17 +451,24 @@ const formInitData = [ { title: '船名', align: 'center', width: '90', label: 'VESSEL', type: 'input' } ] export default { - name: 'BookingCustomerLedger', + name: 'BookingCustomerOrder', inject: ['reload'], components: { XCard, columnSetting, setFormModel, - formLabel + formLabel, + importBc, + importBcMore }, data() { return { spinning: false, + isUpload: false, + refshYZloading: false, + copyMoreForm: this.$form.createForm(this, { number: '' }), + copyMoreFlag: false, + percent: 0, TaskShippingOrderCompareVisible: false, TaskShippingOrderCompareData: { showDetailList: '' @@ -705,13 +478,14 @@ export default { advanced: false, formData: formInitData, formRes: {}, - searchData: {}, + searchData: { multisort: [] }, formAllData: null, formMoreData: null, formBtnCol: 8, formBtnLoading: false, setVisible: false, showColumns: null, + importBcData: {}, gridOptions: { border: false, resizable: true, @@ -733,11 +507,6 @@ export default { }, columns: JSON.parse(JSON.stringify(initData.columns)), data: [] - // treeConfig: { - // transform: true, - // rowField: 'index', - // parentField: 'parentId', - // }, }, formTableData: JSON.parse(JSON.stringify(initData.columns)), fromTableAllData: null, @@ -779,38 +548,17 @@ export default { destinationData: [], RcarrierData: [], RecentlyCarrierData: [], + sortLabelList: [], bcFile: { ext: [] }, - bcFileFlag: false + bcFileFlag: false, + bcObj: {} } }, computed: { ...mapGetters(['bookingList', 'bookingGridOptions']) }, beforeRouteLeave(to, from, next) { - // const copyArr = JSON.parse(JSON.stringify(this.gridOptions.data)) - // const first = copyArr.splice(0, 20) this.setBookingGridOptions(this.gridOptions) - // this.gridOptions = { - // border: false, - // resizable: true, - // showOverflow: true, - // loading: false, - // stripe: true, - // round: true, - // autoResize: true, - // align: 'left', - // columnConfig: { resizable: true }, - // importConfig: {}, - // exportConfig: {}, - // pagerConfig: { - // total: 0, - // currentPage: 1, - // pageSize: 10, - // pageSizes: [10, 20, 50, 100, 200, 500] - // }, - // columns: this.gridOptions.columns, - // data: first - // } next() }, beforeRouteEnter(to, from, next) { @@ -827,15 +575,73 @@ export default { methods: { ...mapActions(['setBookingList', 'setBookingGridOptions']), createdInit() { - console.log(initData.condAllData) this.showColumns = JSON.parse(JSON.stringify(initData.columns)) this.formAllData = JSON.parse(JSON.stringify(initData.condAllData)) this.fromTableAllData = JSON.parse(JSON.stringify(initData.columnsAllData)) this.tableHeight = document.body.clientHeight - 230 - // this.getList({}, true) this.getConfigUser(true) this.getCarrier() }, + bcClose() { + this.bcObj = {} + }, + handleSubmitCopyMore(e) { + e.preventDefault(); + this.copyMoreForm.validateFields((err, values) => { + if (!err) { + const select = this.$refs.xGrid.getCheckboxRecords() + const pkIdArr = select.map((item, index) => { + return item.id + }) + this.$store.commit('SET_COPYPAGES', { number: values.number, path: pkIdArr[0] }) + this.copyMoreFlag = false + } + }); + }, + handleSuccess(file) { + const select = this.$refs.xGrid.getCheckboxRecords() + const pkIdArr = select.map((item, index) => { + return item.id + }) + console.log(pkIdArr) + const formData = new FormData() + formData.append('file', file) + formData.append('bookingOrderId', pkIdArr[0]) + singleBCFileRead(formData).then((res) => { + if (res.data.succ) { + this.bcObj = res.data.ext + this.$message.success('上传成功') + this.$refs.importBc.loading = false + } else { + this.$message.error(res.data.msg) + this.$refs.importBc.loading = false + } + }).catch((res) => { + this.$message.error('上传失败') + this.$refs.importBc.loading = false + }) + }, + handleImportBc() { + const select = this.$refs.xGrid.getCheckboxRecords() + const pkIdArr = select.map((item, index) => { + return item.id + }) + if (pkIdArr.length === 0) { + this.$message.error('请选择一条数据') + return false + } else { + if (pkIdArr.length > 1) { + this.$message.error('只能选择一条数据') + return false + } else { + this.bcObj = {} + this.$refs.importBc.open() + } + } + }, + handleImportBcMore() { + this.$refs.importBcMore.open() + }, onresize() { window.onresize = () => { this.screenWidth = document.body.clientWidth @@ -871,15 +677,6 @@ export default { }, 600) }, 10) } - // if (this.bookingGridOptions.data && this.bookingGridOptions.data.length > 0) { - // console.log(this.gridOptions.loading) - // const copyArr = JSON.parse(JSON.stringify(this.bookingGridOptions.data)) - // console.log('== 获取到了历史数据 ==', copyArr) - // newData.data = copyArr - // setTimeout(() => { - // this.gridOptions = { ...this.gridOptions, ...newData } - // }, 200) - // } } }, handleDownByBc(type) { @@ -894,48 +691,48 @@ export default { this.spinning = true if (type === 1) { downloadBookingConfirm(pkIdArr) - .then((res) => { - if (res.success) { - this.spinning = false - this.bcFileFlag = true - this.bcFile = res.data - } else { - this.$message.error(res.message) - } - }) - .catch((err) => { - console.log(err) - }) + .then((res) => { + if (res.success) { + this.spinning = false + this.bcFileFlag = true + this.bcFile = res.data + } else { + this.$message.error(res.message) + } + }) + .catch((err) => { + console.log(err) + }) } if (type === 2) { downloadDraft(pkIdArr) - .then((res) => { - if (res.success) { - this.spinning = false - this.bcFileFlag = true - this.bcFile = res.data - } else { - this.$message.error(res.message) - } - }) - .catch((err) => { - console.log(err) - }) + .then((res) => { + if (res.success) { + this.spinning = false + this.bcFileFlag = true + this.bcFile = res.data + } else { + this.$message.error(res.message) + } + }) + .catch((err) => { + console.log(err) + }) } if (type === 4) { checkUpdateManifestNo(pkIdArr) - .then((res) => { - if (res.success) { - this.spinning = false - this.bcFileFlag = true - this.bcFile = res.data - } else { - this.$message.error(res.message) - } - }) - .catch((err) => { - console.log(err) - }) + .then((res) => { + if (res.success) { + this.spinning = false + this.bcFileFlag = true + this.bcFile = res.data + } else { + this.$message.error(res.message) + } + }) + .catch((err) => { + console.log(err) + }) } } }, @@ -1047,48 +844,78 @@ export default { }, getConfigUser(isInit = false) { const query = { - typeArr: ['booking_list_cond', 'booking_list_column', 'booking_list_page', 'booking_sort'] + typeArr: ['booking_customer_list_cond', 'booking_customer_list_page', 'booking_customer_list_sort'] } DjyUserConfigMulti(this.$qs.stringify(query, { arrayFormat: 'repeat' })).then((res) => { const $data = {} res.data.map((item, index) => { switch (item.type) { - case 'booking_list_cond': - this.$set($data, 'booking_list_cond', item) - // this.setFormData(item, false, true) + case 'booking_customer_list_cond': + this.$set($data, 'booking_customer_list_cond', item) break - case 'booking_list_column': - this.$set($data, 'booking_list_column', item) - // this.setTableList(item) - break - case 'booking_sort': + case 'booking_customer_list_sort': this.setSort(item) break - case 'booking_list_page': + case 'booking_customer_list_page': this.setPageSize(item) break } }) - if (Object.keys($data).includes('booking_list_cond')) { - this.setFormData($data.booking_list_cond, false, true) + if (Object.keys($data).includes('booking_customer_list_cond')) { + this.setFormData($data.booking_customer_list_cond, false, true) } else { this.setFormData({}, false, true) } - if (Object.keys($data).includes('booking_list_column')) { - this.setTableList($data.booking_list_column) - } else { - this.setTableList({}) - } }) }, + handleRefshYZ() { + const select = this.$refs.xGrid.getCheckboxRecords() + const arr = [] + select.forEach((item) => { + arr.push(item.id) + }) + if (arr.length === 0) { + this.$message.warning('请先选择') + return false + } else { + const data = { + ids: arr.join(',') + } + this.refshYZloading = true + RefreshBillTrace(data).then(res => { + if (res.success) { + this.refshYZloading = false + this.$message.success('操作成功') + } else { + this.refshYZloading = false + this.$message.error(res.message) + } + }) + } + }, setSort(item) { - const key = JSON.parse(item.configJson).key - const sort = JSON.parse(item.configJson).sort - this.tableOrderLabel = key || '' - this.tableOrderType = sort || '' - this.$refs.xGrid.sort(key, sort) - console.log(this.$refs.xGrid) + if (Array.isArray(JSON.parse(item.configJson))) { + this.sortLabelList = JSON.parse(item.configJson) + if (this.sortLabelList.length > 0) { + const key = JSON.parse(item.configJson)[0].sortField + const sort = JSON.parse(item.configJson)[0].descSort + this.tableOrderLabel = key || '' + this.tableOrderType = sort ? 'desc' : 'asc' + this.$refs.xGrid.sort(key, sort) + } else { + this.tableOrderLabel = '' + this.tableOrderType = '' + this.$refs.xGrid.clearSort() + } + } else { + this.sortLabelList = [] + const key = JSON.parse(item.configJson).key + const sort = JSON.parse(item.configJson).sort ? 'desc' : 'asc' + this.tableOrderLabel = key || '' + this.tableOrderType = sort ? 'desc' : 'asc' + this.$refs.xGrid.sort(key, sort) + } }, // 船公司 - start getCarrier() { @@ -1220,6 +1047,12 @@ export default { setTableList(data) { if (Object.keys(data).length > 0 && JSON.parse(data.configJson).length) { this.formTableData = JSON.parse(data.configJson) + this.formTableData.forEach(item => { + if (!item.slots && item.field === 'bsstatusname') { + item.slots = { 'default': 'bsstatusname' } + } + }) + console.log(this.formTableData, 123123) const nowTableArr = this.formTableData.map((item, index) => { if (item.field === 'operate') { item.width = 110 @@ -1260,7 +1093,7 @@ export default { }, getFormData(isReset = false) { - DjyUserConfigGet({ type: 'booking_list_cond' }).then((res) => { + DjyUserConfigGet({ type: 'booking_customer_list_cond' }).then((res) => { this.setFormData(res.data) }) }, @@ -1305,7 +1138,7 @@ export default { pageSize: pageSize } DjyUserConfigAdd({ - type: 'booking_list_page', + type: 'booking_customer_list_page', configJson: JSON.stringify(data) }).then((res) => { console.log('页码设置成功') @@ -1333,6 +1166,7 @@ export default { }, tableRefresh() { const data = { ...this.formRes } + data.multisort = this.searchData.multisort this.searchData = JSON.parse(JSON.stringify(data)) this.init(this.searchData) this.formRes = data @@ -1347,7 +1181,40 @@ export default { this.moreNumVal = val this.moreNumVisible = !this.moreNumVisible }, - + submitSort(arr) { + const newArr = [] + if (arr.length > 0) { + arr.forEach(item => { + newArr.push({ + sortField: item.field, + descSort: item.descSort + }) + }) + this.searchData.multisort = newArr + DjyUserConfigAdd({ + type: 'booking_customer_list_sort', + configJson: JSON.stringify(newArr) + }).then((res) => { + const key = newArr[0].sortField + const sort = newArr[0].descSort + this.sortLabelList = newArr + this.tableOrderLabel = key || '' + this.tableOrderType = sort ? 'desc' : 'asc' + this.$refs.xGrid.sort(key, sort) + this.getList(this.searchData) + }) + } else { + DjyUserConfigAdd({ + type: 'booking_customer_list_sort', + configJson: JSON.stringify([]) + }).then((res) => { + this.searchData.multisort = [] + this.tableOrderLabel = '' + this.tableOrderType = '' + this.getList(this.searchData) + }) + } + }, dateFtt(fmt, date) { const o = { 'Y+': date.getFullYear(), @@ -1375,15 +1242,14 @@ export default { Object.keys(this.formRes).map((item, index) => { this.formRes[item] = '' }) + const data = this.searchData.multisort this.searchData = JSON.parse(JSON.stringify(this.formRes)) + this.searchData.multisort = data Object.keys(this.$refs).map((label, index) => { if (label.includes('fromlabel-') && this.$refs[label].length > 0) { this.$refs[label][0].$data.value = '' } }) - this.tableOrderLabel = '' - this.tableOrderType = '' - this.$refs.xGrid.clearSort() setTimeout(() => { this.ResetType = true }, 100) @@ -1398,7 +1264,7 @@ export default { this.formRes = {} this.searchData = {} DjyUserConfigAdd({ - type: 'booking_list_cond', + type: 'booking_customer_list_cond', configJson: JSON.stringify(arr) }).then((res) => { this.$message.success('保存成功') @@ -1426,6 +1292,8 @@ export default { this.formRes[form.label] = value } else if (form.type === 'complete') { this.formRes[form.label] = value + } else if (form.type === 'selectTree') { + this.formRes[form.label] = value } this.$forceUpdate() }, @@ -1474,14 +1342,14 @@ export default { this.$message.success('复制成功'); const text = this.$refs.bcBox.innerText var cInput = document.createElement('input'); - cInput.value = text; - document.body.appendChild(cInput); - cInput.select(); // 选取文本框内容 - document.execCommand('copy'); - document.body.removeChild(cInput); + cInput.value = text; + document.body.appendChild(cInput); + cInput.select(); // 选取文本框内容 + document.execCommand('copy'); + document.body.removeChild(cInput); }, editColumns(row) { - this.$router.push({ name: 'BookingDetail', query: { id: row.id, type: row.carrierid, mblno: row.mblno } }) + this.$router.push({ name: 'BookingCustomerDetail', query: { id: row.id, type: row.carrierid, mblno: row.mblno } }) }, getList(queryParam = {}, isInit = false, isAdd = 'normal') { this.$set(this.gridOptions, 'loading', true) @@ -1491,9 +1359,6 @@ export default { ...{ PageNo: currentPage, PageSize: pageSize - }, - ...{ - SortField: this.tableOrderLabel } } Object.keys(query).map((item, index) => { @@ -1501,17 +1366,21 @@ export default { delete query[item] } }) - if (this.tableOrderType !== '') { - query.DescSort = this.tableOrderType === 'desc' - } if (query.MBLNO && query.MBLNO.split(/，|,/).length > 0) { const arr = this.searchData.MBLNO.split(/，|,/) query.MBLNO = arr.toString() } - if (isInit) { + const firstFlag = JSON.parse(localStorage.getItem('pro__FIRSTFLAG')).value + if (firstFlag) { query.firstFlag = true } - BookingOrderPage(query) + if ((!queryParam.multisort || queryParam.multisort.length === 0) && this.tableOrderLabel && this.tableOrderType) { + query.multisort = [{ + sortField: this.tableOrderLabel, + descSort: this.tableOrderType === 'desc' + }] + } + BookingCustomerOrderPage(query) .then((res) => { if (res.success) { let newBookingList = {} @@ -1521,32 +1390,6 @@ export default { const _data = res.data.items.map((item, index) => { this.$set(newBookingList, item.id, item) item.index = (currentPage - 1) * pageSize + index - const bookstatus = [ - { staCode: 'sta_cangdan', isChecked: false }, - { staCode: 'sta_haifang', isChecked: false }, - { staCode: 'sta_zhuangzai', isChecked: false }, - { staCode: 'sta_mafang', isChecked: false }, - { staCode: 'sta_zhuangchuan', isChecked: false }, - { staCode: 'sta_atd', isChecked: false } - ] - if (item.bookstatus.length > 0) { - bookstatus.map((book, bindex) => { - item.bookstatus.map((item, index) => { - if (item.staCode === book.staCode) { - bookstatus[bindex] = item - bookstatus[bindex].isChecked = true - } - }) - }) - } - item.bookstatus = bookstatus - let hasGoods = 0 - item.goodsStatusList.map((gitem, gindex) => { - if (gitem.finishTime || gitem.remark) { - hasGoods++ - } - }) - item.hasGoods = hasGoods return item }) this.$set(this.gridOptions.pagerConfig, 'columns', JSON.parse(JSON.stringify(initData.columns))) @@ -1559,6 +1402,8 @@ export default { this.setBookingList(newBookingList) if (this.tableOrderType) { this.$refs.xGrid.sort(this.tableOrderLabel, this.tableOrderType) + } else { + this.$refs.xGrid.clearSort() } this.$forceUpdate() @@ -1568,7 +1413,7 @@ export default { this.$forceUpdate() } this.ResetType = true - console.log(this.gridOptions) + localStorage.setItem('pro__FIRSTFLAG', false) }) .catch((err) => { console.log(err) @@ -1590,17 +1435,21 @@ export default { this.$message.error('请至少选择一条数据') return false } - this.$router.push({ name: 'BookingDetail', query: { id: pkIdArr[0], isCopy: true } }) + this.$router.push({ name: 'BookingCustomerDetail', query: { id: pkIdArr[0], isCopy: true } }) }, copyBookingMore() { const select = this.$refs.xGrid.getCheckboxRecords() const pkIdArr = select.map((item, index) => { return item.id }) - if (pkIdArr.length === 0) { + if (pkIdArr.length > 1) { + this.$message.error('请选择一条数据') + return false + } else if (pkIdArr.length === 0) { this.$message.error('请至少选择一条数据') return false } + this.copyMoreFlag = true }, addSubmit() { const data = [] @@ -1620,7 +1469,7 @@ export default { this.getCarrier() this.addVisible = false this.addNum = Math.round(Math.random() * 1000) - this.$router.push({ name: 'BookingDetail', query: { type: this.carrierRadio, addNum: this.addNum } }) + this.$router.push({ name: 'BookingCustomerDetail', query: { type: this.carrierRadio, addNum: this.addNum } }) }) }, addCancel() { @@ -1658,20 +1507,20 @@ export default { }, tableSortChange(e) { const { property, order } = e - console.log(property, order) this.tableOrderLabel = property || '' - this.tableOrderType = order || '' - const data = { - key: property, - sort: order - } + this.tableOrderType = order + const data = [{ + sortField: property, + descSort: order === 'desc' + }] DjyUserConfigAdd({ - type: 'booking_sort', + type: 'booking_customer_list_sort', configJson: JSON.stringify(data) }).then((res) => { + this.sortLabelList = [] + this.searchData.multisort = data this.getList(this.searchData) }) - // this.$refs.xGrid.sort(this.tableOrderLabel, this.tableOrderType) }, enmuBookingBtn(val) { switch (val) { @@ -2508,8 +2357,8 @@ export default { padding: 3px 0; text-align: center; justify-content: center; - - .billtrace-btn { +} +.billtrace-btn { font-size: 12px; height: 16px; width: 30%; @@ -2545,6 +2394,15 @@ export default { } } } +.billtrace-btn1{ + font-size: 12px; + .active { + cursor: pointer; + // color: @primary-color; + color: #ff9702 !important; + font-weight: bold; + font-size: 12px; + } } /deep/ .ant-form-item { @@ -2977,22 +2835,6 @@ export default { flex: 1; } - // &:nth-child(3) { - // flex: 2; - // margin: 0 1rem; - // padding-left: 0.5rem; - // &.TaskShippingOrderCompareMainThird { - // background: #facd91; - // border: 1px solid red; - // } - // } - // &.TaskShippingOrderCompareMainThird { - // flex: 2; - // background: #facd91; - // border: 1px solid red; - // margin: 0 1rem; - // padding-left: 0.5rem; - // } } &.BoxNo { @@ -3008,40 +2850,33 @@ export default { } } -// .form-box{ -// .form-main{ -// float: left; -// margin-right: 10px; -// display: flex; -// width: 16%; -// overflow: hidden; -// .form-label{ -// display: inline-block; -// margin-right: 10px; -// } -// .form-content{ -// flex: 1; -// } -// } -// .more-btn{ -// } -// } -.bcfile-title{ - border-bottom:1px dashed black; +.bcfile-title { + border-bottom: 1px dashed black; padding-bottom: 5px; margin-bottom: 10px; display: flex; align-items: center; justify-content: space-between; } -.bc-box{ + +.bc-box { max-height: 200px; overflow-y: auto; padding-right: 14px; - .bc-item{ + + .bc-item { margin: 7px 0px; display: flex; justify-content: space-between; } } +.txfcSpan{ + width: 140px; + display: inline-block; +} +.flag-icon{ + color: #1d8aff; + cursor: pointer; + font-size: 20px; +} diff --git a/src/views/main/BookingCustomerLedger/list/modules/initData.js b/src/views/main/BookingCustomerLedger/list/modules/initData.js index d8f05c5..9cf10f5 100644 --- a/src/views/main/BookingCustomerLedger/list/modules/initData.js +++ b/src/views/main/BookingCustomerLedger/list/modules/initData.js @@ -2,64 +2,47 @@ export default { // ==== 表格部分 ==== columns: [ { type: 'checkbox', width: 60, noDraggable: true }, - { field: 'carrier', width: 120, title: '船公司', showHeaderOverflow: true, sortable: true }, - { field: 'yard', label: 'YARD', width: 120, title: '场站', showHeaderOverflow: true, sortable: true }, { - field: 'mblno', - label: 'MBLNO', + field: 'bsstatus', + label: 'bsstatus', width: 160, - title: '主提单号', + title: '业务状态', showHeaderOverflow: true, showOverflow: false, sortable: true, - slots: { default: 'mblno' } - }, - { field: 'vessel', label: 'VESSEL', width: 120, title: '船名', showHeaderOverflow: true, sortable: true }, - { - field: 'etd', - label: 'ETD', - width: 110, - title: '开船日期', - showHeaderOverflow: true, - sortable: true, - slots: { default: 'etd' } - }, - { field: 'voyno', label: 'VOYNO', width: 120, title: '海关航次', showHeaderOverflow: true }, - // { field: 'bookingStatus', label: 'BOOKINGSTATUS', width: 120, title: '订舱状态', showHeaderOverflow: true }, - // { field: 'vgm', label: 'VGM', width: 120, title: 'VGM', showHeaderOverflow: true }, - // { field: 'billStatus', label: 'BILLSTATUS', width: 120, title: '提单状态', showHeaderOverflow: true }, - { - field: 'portdischarge', - label: 'PORTDISCHARGE', - width: 120, - title: '卸货港', - showHeaderOverflow: true, - sortable: true + slots: { default: 'bsstatusname' } }, + { field: 'bookingno', label: 'bookingno', width: 160, title: '订舱编号', showHeaderOverflow: true, sortable: true }, + { field: 'carrier', width: 120, title: '船公司', showHeaderOverflow: true, sortable: true }, { - field: 'createdUserName', - label: 'CREATEDUSERNAME', + field: 'cntrtotal', + label: 'CNTRTOTAL', width: 120, - title: '创建人', + title: '箱型*箱量', showHeaderOverflow: true, sortable: true }, { - field: 'createdTime', - label: 'CREATEDTIME', - width: 160, - title: '创建日期', + field: 'bookstatus', + label: 'BOOKSTATUS', + minWidth: 140, + title: '运踪', showHeaderOverflow: true, - sortable: true + slots: { default: 'bookstatus' } }, { - field: 'cntrtotal', - label: 'CNTRTOTAL', - width: 120, - title: '箱型*箱量', + field: 'etd', + label: 'ETD', + width: 110, + title: '开船日期', showHeaderOverflow: true, - sortable: true + sortable: true, + slots: { default: 'etd' } }, + { field: 'blfrt', label: 'BLFRT', width: 120, title: '付费方式', showHeaderOverflow: true, sortable: true }, + { field: 'cargoid', label: 'CARGOID', width: 120, title: '货物标识', showHeaderOverflow: true, sortable: true }, + { field: 'vessel', label: 'VESSEL', width: 120, title: '船名', showHeaderOverflow: true, sortable: true }, + { field: 'voyno', label: 'VOYNO', width: 120, title: '航次', showHeaderOverflow: true }, { field: 'operate', title: '操作',