whm
/
BookingHeChuanFront
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

5/11

Browse Source
szh_zidingyibiaoti
张同海 2 years ago
parent 0c73ced21a
commit 922821054e
3 changed files with 106 additions and 97 deletions
Show Stats Download Patch File Download Diff File

9
src/views/main/BookingLedger/detail/style/rightContent.less
Unescape Escape View File

@ -409,10 +409,12 @@
flex-direction: column;
>div{
display: flex;
margin-top: .5rem;
>span{
display: inline-block;
width: 2.5rem;
font-weight: bold;
font-weight: bolder;
color: @primary-color;
}
>div{
flex: 1;
@ -422,6 +424,11 @@
span{
&:nth-child(1){
margin-right: .3rem;
font-weight: 600;
}
&:nth-child(2){
// color: @primary-color;
}
}
}

10
src/views/main/BookingLedger/list/index.vue
Unescape Escape View File

@ -2050,7 +2050,7 @@ export default {
padding: 0 10px;
height: 28px;
line-height: 26px;
color:#000;
color: #000;
.iconfont {
margin-right: 6px;
}
@ -2379,7 +2379,8 @@ export default {
.active {
cursor: pointer;
// color: @primary-color;
color: #336600;
color: #4e9c00;
font-weight: bold;
}
}
}
@ -2417,7 +2418,8 @@ export default {
.active {
cursor: pointer;
// color: @primary-color;
color: #336600;
color: #4e9c00;
font-weight: bold;
}
&:nth-of-type(3) {
i {
@ -2733,7 +2735,7 @@ export default {
font-size: 100px;
}
}
/deep/ .content-table .vxe-body--column .vxe-cell div{
/deep/ .content-table .vxe-body--column .vxe-cell div {
color: #000;
}
.pono {

184
src/views/main/ViewDeletedList/ViewDeletedList.vue
Unescape Escape View File

@ -235,7 +235,7 @@ import {
DeleteBookingOrder,
RecoverDeleteOrder,
ExcuteShippingOrderCompareBatch,
GetTenantLineList,
GetTenantLineList
} from '@/api/modular/main/BookingLedger'
import initData from './modules/initData'
@ -247,7 +247,7 @@ const formInitData = [
{ title: '订舱编号', align: 'center', width: '90', label: 'CUSTNO', type: 'input' },
{ title: '开船日期', align: 'center', width: 160, label: 'ETD', type: 'dateRange', resLabel: ['BETD', 'EETD'] },
{ title: '实际开船日期', align: 'center', width: 160, label: 'ATD', type: 'dateRange', resLabel: ['BATD', 'EATD'] },
{ title: '船名', align: 'center', width: '90', label: 'VESSEL', type: 'input' },
{ title: '船名', align: 'center', width: '90', label: 'VESSEL', type: 'input' }
]
export default {
name: 'BookingLedger',
@ -256,7 +256,7 @@ export default {
XCard,
columnSetting,
setFormModel,
formLabel,
formLabel
},
data() {
return {
@ -264,7 +264,7 @@ export default {
spinning: false,
TaskShippingOrderCompareVisible: false,
TaskShippingOrderCompareData: {
showDetailList: '',
showDetailList: ''
},
ResetType: true,
tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
@ -295,7 +295,7 @@ export default {
total: 0,
currentPage: 1,
pageSize: 20,
pageSizes: [10, 20, 50, 100, 200, 500],
pageSizes: [10, 20, 50, 100, 200, 500]
},
columns: [
{ noDraggable: true, type: 'checkbox', width: 60 },
@ -307,7 +307,7 @@ export default {
showHeaderOverflow: true,
showOverflow: false,
sortable: true,
slots: { default: 'mblno' },
slots: { default: 'mblno' }
},
{
field: 'createdTime',
@ -315,7 +315,7 @@ export default {
width: 160,
title: '创建日期',
showHeaderOverflow: true,
sortable: true,
sortable: true
},
{
field: 'createdUserName',
@ -323,7 +323,7 @@ export default {
minwidth: 160,
title: '创建人',
showHeaderOverflow: true,
sortable: true,
sortable: true
},
{
field: 'etd',
@ -332,7 +332,7 @@ export default {
title: '开船日期',
showHeaderOverflow: true,
sortable: true,
slots: { default: 'etd' },
slots: { default: 'etd' }
},
{
field: 'customername',
@ -340,7 +340,7 @@ export default {
minwidth: 160,
title: '委托单位',
showHeaderOverflow: true,
sortable: true,
sortable: true
}, // 客户
{
field: 'consignee',
@ -348,7 +348,7 @@ export default {
minwidth: 120,
title: '收货人',
showHeaderOverflow: true,
sortable: true,
sortable: true
},
{
field: 'notifyparty',
@ -356,7 +356,7 @@ export default {
width: 160,
title: '通知人',
showHeaderOverflow: true,
sortable: true,
sortable: true
},
{ field: 'carrier', width: 120, title: '船公司', showHeaderOverflow: true, sortable: true },
{
@ -365,7 +365,7 @@ export default {
minwidth: 160,
title: '卸货港',
showHeaderOverflow: true,
sortable: true,
sortable: true
},
{
field: 'operate',
@ -374,10 +374,10 @@ export default {
noDraggable: true,
slots: { default: 'operate' },
fixed: 'right',
resizable: false,
},
resizable: false
}
],
data: [],
data: []
// treeConfig: {
// transform: true,
// rowField: 'index',
@ -392,7 +392,7 @@ export default {
radioStyle: {
display: 'block',
height: '50px',
lineHeight: '50px',
lineHeight: '50px'
},
moreNumVisible: false,
moreNumVal: '',
@ -407,7 +407,7 @@ export default {
editingModalVisible: false,
traceOptions: [
{ label: '起运港', value: '1' },
{ label: '目的港', value: '2' },
{ label: '目的港', value: '2' }
],
traceValue: [],
addNum: 0,
@ -423,11 +423,11 @@ export default {
portDischargeData: [],
destinationData: [],
RcarrierData: [],
RecentlyCarrierData: [],
RecentlyCarrierData: []
}
},
computed: {
...mapGetters(['bookingList', 'bookingGridOptions']),
...mapGetters(['bookingList', 'bookingGridOptions'])
},
beforeRouteLeave(to, from, next) {
// const copyArr = JSON.parse(JSON.stringify(this.gridOptions.data))
@ -457,7 +457,7 @@ export default {
next()
},
beforeRouteEnter(to, from, next) {
next((vm) => {
next(vm => {
vm.upDate()
})
},
@ -527,16 +527,16 @@ export default {
// 批量编辑
editingHandleOk() {
const {
editingForm: { validateFields },
editingForm: { validateFields }
} = this
validateFields((errors, values) => {
if (!errors) {
values.id = []
const select = this.$refs.xGrid.getCheckboxRecords()
select.forEach((item) => {
select.forEach(item => {
values.id.push(item.id)
})
BookingOrderBachUpdate(values).then((res) => {
BookingOrderBachUpdate(values).then(res => {
if (res.success) {
this.$message.success('编辑成功')
this.editingHandleCancel()
@ -563,7 +563,7 @@ export default {
this.WebVessel = data
}
GetVessellist({ KeyWord: data }).then((res) => {
GetVessellist({ KeyWord: data }).then(res => {
this.vesselData = res.data
})
},
@ -572,40 +572,40 @@ export default {
setTimeout(() => {
this.editingForm.setFieldsValue({
...this.editingForm.getFieldsValue(),
vessel: this.WebVessel,
vessel: this.WebVessel
})
}, 100)
}
},
portDischargeSearch(data) {
GetPortlist({ KeyWord: data }).then((res) => {
GetPortlist({ KeyWord: data }).then(res => {
this.portDischargeData = res.data
})
},
portDischargeChange(value) {
this.portDischargeData.forEach((item) => {
this.portDischargeData.forEach(item => {
if (item.enName == value) {
setTimeout(() => {
this.editingForm.setFieldsValue({
...this.editingForm.getFieldsValue(),
portDischargeId: item.ediCode,
portDischargeId: item.ediCode
})
}, 100)
}
})
},
destinationSearch(data) {
GetPortlist({ KeyWord: data }).then((res) => {
GetPortlist({ KeyWord: data }).then(res => {
this.destinationData = res.data
})
},
destinationChange(value) {
this.destinationData.forEach((item) => {
this.destinationData.forEach(item => {
if (item.enName == value) {
setTimeout(() => {
this.editingForm.setFieldsValue({
...this.editingForm.getFieldsValue(),
destinationid: item.ediCode,
destinationid: item.ediCode
})
}, 100)
}
@ -625,16 +625,16 @@ export default {
total: 0,
currentPage: 1,
pageSize: this.gridOptions.pagerConfig.pageSize,
pageSizes: [10, 20, 50, 100, 200, 500],
pageSizes: [10, 20, 50, 100, 200, 500]
}
this.gridOptions.data = []
this.getList(queryParam)
},
getConfigUser(isInit = false) {
const query = {
typeArr: ['booking_list_cond', 'booking_list_column', 'booking_list_page'],
typeArr: ['booking_list_cond', 'booking_list_column', 'booking_list_page']
}
DjyUserConfigMulti(this.$qs.stringify(query, { arrayFormat: 'repeat' })).then((res) => {
DjyUserConfigMulti(this.$qs.stringify(query, { arrayFormat: 'repeat' })).then(res => {
const $data = {}
res.data.map((item, index) => {
switch (item.type) {
@ -668,11 +668,11 @@ export default {
},
// 船公司 - start
getCarrier() {
const Rdata = (data) => {
const Rdata = data => {
let RData = {}
for (var i = 0; i < 26; i++) {
RData[String.fromCharCode(65 + i)] = []
data.forEach((item) => {
data.forEach(item => {
if (String.fromCharCode(65 + i) == item.enName[0].toUpperCase()) {
RData[String.fromCharCode(65 + i)].push(item)
}
@ -683,17 +683,17 @@ export default {
'E-L': ['E', 'F', 'G', 'H', 'I', 'J', 'K', 'L'],
'M-R': ['M', 'N', 'O', 'P', 'Q', 'R'],
'S-U': ['S', 'T', 'U'],
'V-Z': ['V', 'W', 'X', 'Y', 'Z'],
'V-Z': ['V', 'W', 'X', 'Y', 'Z']
}
let Data = {
'A-D': [],
'E-L': [],
'M-R': [],
'S-U': [],
'V-Z': [],
'V-Z': []
}
Object.keys(Obj).forEach((e) => {
Obj[e].forEach((item) => {
Object.keys(Obj).forEach(e => {
Obj[e].forEach(item => {
RData[item].forEach((Ai, AiIndex) => {
let imgSrc = ''
try {
@ -709,15 +709,15 @@ export default {
this.RcarrierData = Data
}
GetCarrierlist()
.then((res) => {
.then(res => {
if (res.code === 200) {
Rdata(res.data)
DjyUserConfigGet({ type: 'booking_memory' })
.then((e) => {
.then(e => {
if (e.data) {
let data = []
JSON.parse(e.data.configJson).forEach((item) => {
res.data.forEach((item2) => {
JSON.parse(e.data.configJson).forEach(item => {
res.data.forEach(item2 => {
if (item == item2.code) {
data.push(item2)
}
@ -731,7 +731,7 @@ export default {
})
}
})
.catch((err) => {
.catch(err => {
console.log(err)
})
},
@ -840,7 +840,7 @@ export default {
},
getFormData(isReset = false) {
DjyUserConfigGet({ type: 'booking_list_cond' }).then((res) => {
DjyUserConfigGet({ type: 'booking_list_cond' }).then(res => {
this.setFormData(res.data)
})
},
@ -862,7 +862,7 @@ export default {
},
getFromSelectData(func, ...args) {
return new Promise((resolve, reject) => {
func(...args).then((res) => {
func(...args).then(res => {
if (res.code === 200) {
resolve(res.data)
} else {
@ -882,12 +882,12 @@ export default {
editPageSizeSave(pageSize = 10) {
const data = {
pageSize: pageSize,
pageSize: pageSize
}
DjyUserConfigAdd({
type: 'booking_list_page',
configJson: JSON.stringify(data),
}).then((res) => {
configJson: JSON.stringify(data)
}).then(res => {
console.log('页码设置成功')
})
},
@ -936,7 +936,7 @@ export default {
'D+': date.getDate(),
'h+': date.getHours(),
'm+': date.getMinutes(),
's+': date.getSeconds(),
's+': date.getSeconds()
}
for (const k in o) {
if (new RegExp(`(${k})`).test(fmt)) {
@ -965,8 +965,8 @@ export default {
this.searchData = {}
DjyUserConfigAdd({
type: 'booking_list_cond',
configJson: JSON.stringify(arr),
}).then((res) => {
configJson: JSON.stringify(arr)
}).then(res => {
this.$message.success('保存成功')
this.$refs.setForm.handleCancel()
Object.keys(this.$refs).map((label, index) => {
@ -1015,8 +1015,8 @@ export default {
editColumnsSave(data = {}) {
DjyUserConfigAdd({
type: 'booking_list_column',
configJson: JSON.stringify(data),
}).then((res) => {
configJson: JSON.stringify(data)
}).then(res => {
this.$refs.setForm.handleCancel()
})
},
@ -1047,11 +1047,11 @@ export default {
...{
PageNo: currentPage,
PageSize: pageSize,
ISDel: true,
ISDel: true
},
...{
SortField: this.tableOrderLabel,
},
SortField: this.tableOrderLabel
}
}
Object.keys(query).map((item, index) => {
if (!query[item]) {
@ -1069,7 +1069,7 @@ export default {
query.firstFlag = true
}
BookingOrderPage(query)
.then((res) => {
.then(res => {
console.log('BookingOrderPage==>>', query)
if (res.success) {
let newBookingList = {}
@ -1085,7 +1085,7 @@ export default {
{ staCode: 'sta_zhuangzai', isChecked: false },
{ staCode: 'sta_mafang', isChecked: false },
{ staCode: 'sta_zhuangchuan', isChecked: false },
{ staCode: 'sta_atd', isChecked: false },
{ staCode: 'sta_atd', isChecked: false }
]
if (item.bookstatus.length > 0) {
bookstatus.map((book, bindex) => {
@ -1124,7 +1124,7 @@ export default {
this.ResetType = true
console.log(this.gridOptions)
})
.catch((err) => {
.catch(err => {
console.log(err)
})
},
@ -1160,7 +1160,7 @@ export default {
let data = []
data.push(this.carrierRadio)
if (this.RecentlyCarrierData.length) {
this.RecentlyCarrierData.forEach((item) => {
this.RecentlyCarrierData.forEach(item => {
if (item.code != this.carrierRadio && data.length < 10) {
data.push(item.code)
}
@ -1169,8 +1169,8 @@ export default {
DjyUserConfigAdd({
type: 'booking_memory',
configJson: JSON.stringify(data),
}).then((res) => {
configJson: JSON.stringify(data)
}).then(res => {
this.getCarrier()
this.addVisible = false
this.addNum = Math.round(Math.random() * 1000)
@ -1192,7 +1192,7 @@ export default {
this.moreNumVal
.replace(/\n|\r/g, ',')
.split(',')
.forEach((item) => {
.forEach(item => {
if (item.replace(/\s*/g, '')) {
if (data) {
data = `${data},${item}`
@ -1341,7 +1341,7 @@ export default {
yardCode: this.traceValue.includes('1') ? item.yardid : '',
carrierid: this.traceValue.includes('2') ? item.carrierid : '',
carrier: this.traceValue.includes('2') ? item.carrier : '',
isBook: !!this.traceValue.includes('2'),
isBook: !!this.traceValue.includes('2')
}
arr.push(query)
})
@ -1352,7 +1352,7 @@ export default {
}
SendTrace(arr)
.then((res) => {
.then(res => {
if (res.success) {
const tip = `订阅成功`
this.$message.success(tip)
@ -1364,7 +1364,7 @@ export default {
this.traceValue = []
}
})
.catch((err) => {
.catch(err => {
console.log(err)
})
},
@ -1383,50 +1383,50 @@ export default {
'ISSUEPLACE',
'PREPARDAT',
'SERVICE',
'SHIPAGENCY',
'SHIPAGENCY'
].includes(form.label)
) {
// 船公司 卸货港
query = {
KeyWord: value,
KeyWord: value
}
} else if (form.label === 'CUSTOMERNAME') {
// 客户/ 委托单位
query = {
KeyWord: value,
type: 'consignor',
type: 'consignor'
}
} else if (form.label === 'FORWARDER') {
// 订舱代理
query = {
KeyWord: value,
type: 'booking_agent',
type: 'booking_agent'
}
} else if (['SALE', 'CUSTSERVICE', 'DOC', 'ROUTE', 'OP'].includes(form.label)) {
// 销售 、 揽货人, 航线操作
query = {
name: value,
name: value
}
} else if (form.label === 'CUSTOMSER') {
// 报关行
query = {
SearchValue: value,
PropString: 'customs_broker',
PropString: 'customs_broker'
}
} else if (form.label === 'AGENTID') {
query = {
SearchValue: value,
PropString: 'out_agent',
PropString: 'out_agent'
}
} else if (form.label === 'TRUCKER') {
query = {
SearchValue: value,
PropString: 'fleet',
PropString: 'fleet'
}
}
const fun = this.emnuCompleteApi(form.label)
if (fun) {
this.getFromSelectData(this.emnuCompleteApi(form.label), query).then((data) => {
this.getFromSelectData(this.emnuCompleteApi(form.label), query).then(data => {
if (['CUSTOMERNAME', 'FORWARDER', 'CUSTOMSER', 'AGENTID', 'TRUCKER'].includes(form.label)) {
this.$refs[`fromlabel-${form.label}`][0].$data.dataSourceList = data.rows
} else {
@ -1488,7 +1488,7 @@ export default {
getSelectFirst({ form, index, value }) {
const fun = this.emnuSelectApi(form.label)
if (fun) {
this.getFromSelectData(fun).then((data) => {
this.getFromSelectData(fun).then(data => {
this.formData[index].dataList = data
this.$refs[`fromlabel-${form.label}`][0].$data.dataList = data
})
@ -1511,10 +1511,10 @@ export default {
},
deleteBookingOrder(arr) {
RecoverDeleteOrder(arr.toString())
.then((res) => {
.then(res => {
if (res.success) {
this.$message.success('恢复成功')
const _data = this.gridOptions.data.filter((item) => !arr.includes(item.id))
const _data = this.gridOptions.data.filter(item => !arr.includes(item.id))
this.$refs.xGrid.reloadData(_data).then(() => {
this.gridOptions.pagerConfig.total = this.gridOptions.pagerConfig.total - arr.length
})
@ -1523,7 +1523,7 @@ export default {
this.$message.error(res.message)
}
})
.catch((err) => {
.catch(err => {
console.log(err)
})
},
@ -1553,7 +1553,7 @@ export default {
}
this.spinning = true
ExcuteShippingOrderCompareBatch(arr)
.then((res) => {
.then(res => {
if (res.success) {
this.spinning = false
if (!res.data.succ) {
@ -1572,15 +1572,15 @@ export default {
this.$message.error(res.data.msg)
}
})
.catch((err) => {
.catch(err => {
console.log(err)
this.spinning = false
})
},
},
}
}
}
</script>
<style lang="less">
<style lang="less">
/*.ant-layout{
background: #f4f4f4;
}*/
@ -1748,7 +1748,7 @@ export default {
}
}
</style>
<style lang="less" scoped>
<style lang="less" scoped>
/*订舱表格内字体颜色 */
.mblno {
text-align: left;
@ -2104,7 +2104,8 @@ export default {
.active {
cursor: pointer;
// color: @primary-color;
color: #336600;
color: #4e9c00;
font-weight: bold;
}
}
}
@ -2142,7 +2143,8 @@ export default {
.active {
cursor: pointer;
// color: @primary-color;
color: #336600;
color: #4e9c00;
font-weight: bold;
}
&:nth-of-type(3) {
i {
@ -2573,5 +2575,3 @@ export default {
// }
// }
</style>
Write Preview
Loading…
Cancel
Save