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

Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuanFront

Browse Source
szh_zidingyibiaoti
张同海 2 years ago
parent 2ce1ad08a3 087f8a4cc4
commit e4ec8153d1
4 changed files with 55 additions and 40 deletions
Show Stats Download Patch File Download Diff File

64
src/views/main/BookingLedger/detail/modules/goodsTable.vue
Unescape Escape View File

@ -472,30 +472,30 @@ export default {
) )
} }
}, },
// { {
// field: 'weighdate', field: 'weighdate',
// key: 'weighdate', key: 'weighdate',
// title: '称重日期', title: '称重日期',
// align: 'left', align: 'left',
// width: 120, width: 120,
// edit: false, edit: false,
// renderBodyCell: ({ row, column, rowIndex }, h) => { renderBodyCell: ({ row, column, rowIndex }, h) => {
// return ( return (
// <a-date-picker on-change={(date, dateString) => { <a-date-picker value={row['weighdate']} on-change={(date, dateString) => {
// console.log('== 选择日期 ==', dateString) console.log('== 选择日期 ==', dateString)
// this.tableData[rowIndex].weighdate = dateString this.tableData[rowIndex].weighdate = dateString
// row['weighdate'] = dateString row['weighdate'] = dateString
// }} /> }} />
// ) )
// }, },
// renderHeaderCell: ({ column }, h) => { renderHeaderCell: ({ column }, h) => {
// return ( return (
// <span class="text-bold" style="text-align: center;"> <span class="text-bold" style="text-align: center;">
// {this.rules.weightype.required ? <i style="color: #f00">*</i> : ''} {column.title} {this.rules.weightype.required ? <i style="color: #f00">*</i> : ''} {column.title}
// </span> </span>
// ) )
// } }
// }, },
], ],
modelColumns: [ modelColumns: [
{ {
@ -1017,7 +1017,7 @@ export default {
watch: { watch: {
details: { details: {
handler(nval, oval) { handler(nval, oval) {
console.log('=== 修改table内容 ===', nval.ctnInputs, this.pType, this.inTableLoad) // console.log('=== 修改table内容 ===', nval.ctnInputs, this.pType, this.inTableLoad)
if (!this.inSave && !this.inTableLoad) { if (!this.inSave && !this.inTableLoad) {
this.$emit('changeDetail', { this.$emit('changeDetail', {
detail: nval, detail: nval,
@ -1216,6 +1216,7 @@ export default {
this.tableData = arr this.tableData = arr
this.tableLoaded = true this.tableLoaded = true
this.totalCtnall = '' this.totalCtnall = ''
console.log('== 箱信息 ==', this.tableData)
} else { } else {
this.tableData = [] this.tableData = []
this.tableLoaded = true this.tableLoaded = true
@ -1262,6 +1263,7 @@ export default {
tareweight: '', tareweight: '',
weightype: '累加', weightype: '累加',
weighkgs: '', weighkgs: '',
weighdate: '',
rowKey: this.tableData.length > 0 ? Number(this.tableData[this.tableData.length - 1].rowKey) + 1 : 0 rowKey: this.tableData.length > 0 ? Number(this.tableData[this.tableData.length - 1].rowKey) + 1 : 0
} }
this.tableData.push(data) this.tableData.push(data)
@ -1479,7 +1481,8 @@ export default {
cbm: item.CBM, cbm: item.CBM,
tareweight: item.TAREWEIGHT, tareweight: item.TAREWEIGHT,
weightype: this.tableData[cntrnoArr.indexOf(item.CNTRNO)].weightype, weightype: this.tableData[cntrnoArr.indexOf(item.CNTRNO)].weightype,
weighkgs: this.tableData[cntrnoArr.indexOf(item.CNTRNO)].weighkgs weighkgs: this.tableData[cntrnoArr.indexOf(item.CNTRNO)].weighkgs,
weighdate: item.WEIGHDATE
} }
} else { } else {
const _data = { const _data = {
@ -1494,7 +1497,8 @@ export default {
cbm: item.CBM, cbm: item.CBM,
tareweight: item.TAREWEIGHT, tareweight: item.TAREWEIGHT,
weightype: '', weightype: '',
weighkgs: '' weighkgs: '',
weighdate: item.WEIGHDATE
} }
addTable.push(_data) addTable.push(_data)
} }
@ -1634,7 +1638,8 @@ export default {
cbm: this.tableData[cntrnoArr.indexOf(item.CNTRNO)].cbm, cbm: this.tableData[cntrnoArr.indexOf(item.CNTRNO)].cbm,
tareweight: item.TAREWEIGHT, tareweight: item.TAREWEIGHT,
weightype: this.tableData[cntrnoArr.indexOf(item.CNTRNO)].weightype, weightype: this.tableData[cntrnoArr.indexOf(item.CNTRNO)].weightype,
weighkgs: setWeighkgs weighkgs: setWeighkgs,
weighdate: this.tableData[cntrnoArr.indexOf(item.CNTRNO)].weighdate
} }
} else { } else {
const _data = { const _data = {
@ -1649,7 +1654,8 @@ export default {
cbm: '', cbm: '',
tareweight: item.TAREWEIGHT, tareweight: item.TAREWEIGHT,
weightype: '', weightype: '',
weighkgs: '' weighkgs: '',
weighdate: ''
} }
addTable.push(_data) addTable.push(_data)
} }

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

@ -671,7 +671,8 @@ import {
GetForwarderlist, GetForwarderlist,
DjyUserConfigMulti, DjyUserConfigMulti,
DeleteBookingOrder, DeleteBookingOrder,
ExcuteShippingOrderCompareBatch ExcuteShippingOrderCompareBatch,
GetTenantLineList
} from '@/api/modular/main/BookingLedger' } from '@/api/modular/main/BookingLedger'
import initData from './modules/initData' import initData from './modules/initData'
@ -1205,6 +1206,8 @@ export default {
return GetPackage return GetPackage
case 'ISSUETYPE': case 'ISSUETYPE':
return Codeissuetypelist return Codeissuetypelist
case 'lineName':
return GetTenantLineList
} }
}, },
getFromSelectData(func, ...args) { getFromSelectData(func, ...args) {

14
src/views/main/BookingLedger/list/modules/formLabel.vue
Unescape Escape View File

@ -252,11 +252,15 @@ export default {
}, },
getSelectFirst (e) { getSelectFirst (e) {
if (!e) { if (!e) {
this.$emit('selectFirst', { if (['LINENAME'].includes(this.labelData.label)) {
form: this.labelData, this.dataList = this.lineList
index: this.formIndex, } else {
value: '' this.$emit('selectFirst', {
}) form: this.labelData,
index: this.formIndex,
value: ''
})
}
} }
}, },
completeSelect (value) { completeSelect (value) {

12
src/views/main/BookingLedger/list/modules/initData.js
Unescape Escape View File

@ -60,7 +60,7 @@ export default {
{ field: 'prepardat', label: 'PREPARDAT', width: 160, title: '预付地点', showHeaderOverflow: true, sortable: true }, { field: 'prepardat', label: 'PREPARDAT', width: 160, title: '预付地点', showHeaderOverflow: true, sortable: true },
{ field: 'service', label: 'SERVICE', width: 160, title: '运输条款', showHeaderOverflow: true, sortable: true }, { field: 'service', label: 'SERVICE', width: 160, title: '运输条款', showHeaderOverflow: true, sortable: true },
{ field: 'sale', label: 'SALE', width: 160, title: '揽货人', showHeaderOverflow: true, sortable: true }, // 销售 { field: 'sale', label: 'SALE', width: 160, title: '揽货人', showHeaderOverflow: true, sortable: true }, // 销售
{ field: 'lanename', label: 'LANENAME', width: 160, title: '航线', showHeaderOverflow: true, sortable: true }, { field: 'lanename', label: 'LANENAME', width: 160, title: '船司航线', showHeaderOverflow: true, sortable: true },
// { field: 'servicecontractno', label: 'SERVICECONTRACTNO', width: 160, title: '客户合同号', showHeaderOverflow: true, sortable: true }, // 没有设置该字段的地方 - 暂时去掉 // { field: 'servicecontractno', label: 'SERVICECONTRACTNO', width: 160, title: '客户合同号', showHeaderOverflow: true, sortable: true }, // 没有设置该字段的地方 - 暂时去掉
{ field: 'bsstatusname', label: 'BSSTATUSNAME', width: 160, title: '业务状态', showHeaderOverflow: true, sortable: true }, { field: 'bsstatusname', label: 'BSSTATUSNAME', width: 160, title: '业务状态', showHeaderOverflow: true, sortable: true },
{ field: 'bookingno', label: 'BOOKINGNO', width: 160, title: '业务编号', showHeaderOverflow: true, sortable: true }, { field: 'bookingno', label: 'BOOKINGNO', width: 160, title: '业务编号', showHeaderOverflow: true, sortable: true },
@ -81,7 +81,7 @@ export default {
{ field: 'dunno', label: 'DUNNO', width: 120, title: '危险品编号', showHeaderOverflow: true, sortable: true }, { field: 'dunno', label: 'DUNNO', width: 120, title: '危险品编号', showHeaderOverflow: true, sortable: true },
{ field: 'contractno', label: 'CONTRACTNO', width: 120, title: '合约号', showHeaderOverflow: true, sortable: true }, { field: 'contractno', label: 'CONTRACTNO', width: 120, title: '合约号', showHeaderOverflow: true, sortable: true },
{ field: 'route', label: 'ROUTE', width: 120, title: '航线操作', showHeaderOverflow: true, sortable: true }, { field: 'route', label: 'ROUTE', width: 120, title: '航线操作', showHeaderOverflow: true, sortable: true },
{ field: 'lanecode', label: 'LANECODE', width: 120, title: '航线代码', showHeaderOverflow: true, sortable: true }, // { field: 'lanecode', label: 'LANECODE', width: 120, title: '航线代码', showHeaderOverflow: true, sortable: true },
{ field: 'shipperid', label: 'SHIPPERID', width: 120, title: '发货人代码', showHeaderOverflow: true, sortable: true }, // 台账无字段 { field: 'shipperid', label: 'SHIPPERID', width: 120, title: '发货人代码', showHeaderOverflow: true, sortable: true }, // 台账无字段
{ field: 'notifypartyid', label: 'NOTIFYPARTYID', width: 120, title: '通知人代码', showHeaderOverflow: true, sortable: true }, // 台账无字段 { field: 'notifypartyid', label: 'NOTIFYPARTYID', width: 120, title: '通知人代码', showHeaderOverflow: true, sortable: true }, // 台账无字段
{ field: 'notifypartY2', label: 'NOTIFYPARTY2', width: 120, title: '第二通知人', showHeaderOverflow: true, sortable: true }, // 台账无，详情有 { field: 'notifypartY2', label: 'NOTIFYPARTY2', width: 120, title: '第二通知人', showHeaderOverflow: true, sortable: true }, // 台账无，详情有
@ -101,7 +101,8 @@ export default {
{ field: 'dzRemark', label: 'DZREMARK', width: 160, title: '单证备注', showHeaderOverflow: true, sortable: true, slots: { default: 'dzRemark' } }, { field: 'dzRemark', label: 'DZREMARK', width: 160, title: '单证备注', showHeaderOverflow: true, sortable: true, slots: { default: 'dzRemark' } },
{ field: 'czRemark', label: 'CZREMARK', width: 160, title: '操作备注', showHeaderOverflow: true, sortable: true, slots: { default: 'czRemark' } }, { field: 'czRemark', label: 'CZREMARK', width: 160, title: '操作备注', showHeaderOverflow: true, sortable: true, slots: { default: 'czRemark' } },
{ field: 'goodsStatusList', label: 'GOODSSTATUSLIST', minWidth: 160, title: '货物状态', showHeaderOverflow: true, slots: { default: 'goodsStatusList' } }, { field: 'goodsStatusList', label: 'GOODSSTATUSLIST', minWidth: 160, title: '货物状态', showHeaderOverflow: true, slots: { default: 'goodsStatusList' } },
{ field: 'tmblno', label: 'TMBLNO', width: 120, title: '真提单号', showHeaderOverflow: true, sortable: true } { field: 'tmblno', label: 'TMBLNO', width: 120, title: '真提单号', showHeaderOverflow: true, sortable: true },
{ field: 'linename', label: 'LINENAME', width: 120, title: '航线', showHeaderOverflow: true, sortable: true }
], ],
// ==== 表单部分 ==== // ==== 表单部分 ====
condAllData: [ condAllData: [
@ -127,7 +128,7 @@ export default {
{ title: '业务编号', align: 'center', width: 120, label: 'BOOKINGNO', type: 'input' }, { title: '业务编号', align: 'center', width: 120, label: 'BOOKINGNO', type: 'input' },
{ title: '业务状态', align: 'center', width: 120, label: 'BSSTATUS', type: 'input' }, { title: '业务状态', align: 'center', width: 120, label: 'BSSTATUS', type: 'input' },
// { title: '客户合同号', align: 'center', width: 120, label: 'SERVICECONTRACTNO', type: 'input' }, // 暂时去掉 // { title: '客户合同号', align: 'center', width: 120, label: 'SERVICECONTRACTNO', type: 'input' }, // 暂时去掉
{ title: '航线代码', align: 'center', width: 120, label: 'LANECODE', type: 'input' }, // { title: '航线代码', align: 'center', width: 120, label: 'LANECODE', type: 'input' },
{ title: '内部航次', align: 'center', width: 120, label: 'VOYNOINNER', type: 'input' }, { title: '内部航次', align: 'center', width: 120, label: 'VOYNOINNER', type: 'input' },
{ title: '海关航次', align: 'center', width: 120, label: 'VOYNO', type: 'input' }, { title: '海关航次', align: 'center', width: 120, label: 'VOYNO', type: 'input' },
{ title: '发货人', align: 'center', width: 120, label: 'SHIPPER', type: 'input' }, { title: '发货人', align: 'center', width: 120, label: 'SHIPPER', type: 'input' },
@ -157,7 +158,7 @@ export default {
{ title: '重量', align: 'center', width: 160, label: 'KGS', type: 'input' }, { title: '重量', align: 'center', width: 160, label: 'KGS', type: 'input' },
{ title: '尺码', align: 'center', width: 160, label: 'CBM', type: 'input' }, { title: '尺码', align: 'center', width: 160, label: 'CBM', type: 'input' },
{ title: 'HS编码', align: 'center', width: 160, label: 'HSCODE', type: 'input' }, { title: 'HS编码', align: 'center', width: 160, label: 'HSCODE', type: 'input' },
{ title: '航线', align: 'center', width: 160, label: 'LANENAME', type: 'input' }, { title: '船司航线', align: 'center', width: 160, label: 'LANENAME', type: 'input' },
{ title: '设置温度', align: 'center', width: 160, label: 'TEMPSET', type: 'input' }, { title: '设置温度', align: 'center', width: 160, label: 'TEMPSET', type: 'input' },
{ title: '通风度', align: 'center', width: 160, label: 'REEFERF', type: 'input' }, { title: '通风度', align: 'center', width: 160, label: 'REEFERF', type: 'input' },
{ title: '付款方', align: 'center', width: 160, label: 'FREIGHTPAYER', type: 'input' }, { title: '付款方', align: 'center', width: 160, label: 'FREIGHTPAYER', type: 'input' },
@ -179,6 +180,7 @@ export default {
{ title: '箱型', align: 'center', width: 120, label: 'CNTRTOTAL', type: 'select', showLabel: 'name' }, { title: '箱型', align: 'center', width: 120, label: 'CNTRTOTAL', type: 'select', showLabel: 'name' },
{ title: '包装', align: 'center', width: 120, label: 'KINDPKGS', type: 'select', showLabel: 'name' }, { title: '包装', align: 'center', width: 120, label: 'KINDPKGS', type: 'select', showLabel: 'name' },
{ title: '签单方式', align: 'center', width: 160, label: 'ISSUETYPE', type: 'select', showLabel: 'enName', showLabel2: 'cnName' }, { title: '签单方式', align: 'center', width: 160, label: 'ISSUETYPE', type: 'select', showLabel: 'enName', showLabel2: 'cnName' },
{ title: '航线', align: 'center', width: 160, label: 'LINENAME', type: 'select', showLabel: 'name' },
{ {
title: '提单份数', title: '提单份数',
align: 'center', align: 'center',

Write Preview
Loading…
Cancel
Save