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

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

Browse Source
master
sunzehua 1 year ago
parent 3198ccedbd a4f237fad7
commit 12f5087dfd
2 changed files with 112 additions and 281 deletions
Show Stats Download Patch File Download Diff File

369
src/views/main/ExpressModule/details.vue
Unescape Escape View File

@ -54,12 +54,18 @@
:wrapperCol="{ xs: { span: 25 }, sm: { span: 18 } }" :wrapperCol="{ xs: { span: 25 }, sm: { span: 18 } }"
has-feedback has-feedback
> >
<!-- <a-select v-decorator="['state']" allow-clear> <a-select v-decorator="['state']" allow-clear>
<a-select-option v-for="item in orderStatusData" :key="item.code" :value="item.code"> <a-select-option value="新建">
{{ item.name }} 新建
</a-select-option> </a-select-option>
</a-select> --> <a-select-option value="顺丰">
<a-input v-decorator="['state']" allowClear /> 顺丰
</a-select-option>
<a-select-option value="普通">
普通
</a-select-option>
</a-select>
<!-- <a-input v-decorator="['state']" allowClear /> -->
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="5"> <a-col :span="5">
@ -575,19 +581,14 @@
</vxe-table> </vxe-table>
</a-col> </a-col>
</a-row> </a-row>
<a-row :style="{ marginTop: '10px' }" v-if="type == 'Details'"> <a-row :style="{ marginTop: '10px' }">
<a-col :span="3"> <!-- <a-col :span="3">
<a-form-item <a-form-item
label="业务类型:" label="业务类型:"
:labelCol="{ xs: { span: 25 }, sm: { span: 8 } }" :labelCol="{ xs: { span: 25 }, sm: { span: 8 } }"
:wrapperCol="{ xs: { span: 25 }, sm: { span: 15 } }" :wrapperCol="{ xs: { span: 25 }, sm: { span: 15 } }"
has-feedback has-feedback
> >
<!-- <a-select size="small" v-decorator="['ywType']" allow-clear>
<a-select-option v-for="item in orderStatusData" :key="item.code" :value="item.code">
{{ item.name }}
</a-select-option>
</a-select> -->
<a-input size="small" v-model="SearchData.ywType" allowClear /> <a-input size="small" v-model="SearchData.ywType" allowClear />
</a-form-item> </a-form-item>
</a-col> </a-col>
@ -600,28 +601,28 @@
> >
<a-input size="small" v-model="SearchData.kdCode" allowClear /> <a-input size="small" v-model="SearchData.kdCode" allowClear />
</a-form-item> </a-form-item>
</a-col> </a-col> -->
<a-col :span="2"> <a-col :span="4">
<a-form-item <a-form-item
label="船名:" label="船名:"
:labelCol="{ xs: { span: 25 }, sm: { span: 6 } }" :labelCol="{ xs: { span: 25 }, sm: { span: 6 } }"
:wrapperCol="{ xs: { span: 25 }, sm: { span: 17 } }" :wrapperCol="{ xs: { span: 25 }, sm: { span: 17 } }"
has-feedback has-feedback
> >
<a-input size="small" v-model="SearchData.vessel" allowClear /> <a-input size="small" v-model="SearchData.VESSEL" allowClear />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="2"> <a-col :span="4">
<a-form-item <a-form-item
label="航次:" label="航次:"
:labelCol="{ xs: { span: 25 }, sm: { span: 6 } }" :labelCol="{ xs: { span: 25 }, sm: { span: 6 } }"
:wrapperCol="{ xs: { span: 25 }, sm: { span: 17 } }" :wrapperCol="{ xs: { span: 25 }, sm: { span: 17 } }"
has-feedback has-feedback
> >
<a-input size="small" v-model="SearchData.voyno" allowClear /> <a-input size="small" v-model="SearchData.VOYNO" allowClear />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="3"> <a-col :span="4">
<a-form-item <a-form-item
label="委托单位:" label="委托单位:"
:labelCol="{ xs: { span: 25 }, sm: { span: 8 } }" :labelCol="{ xs: { span: 25 }, sm: { span: 8 } }"
@ -633,7 +634,7 @@
{{ item.name }} {{ item.name }}
</a-select-option> </a-select-option>
</a-select> --> </a-select> -->
<a-input size="small" v-model="SearchData.wtUnit" allowClear /> <a-input size="small" v-model="SearchData.CUSTOMERNAME" allowClear />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="4"> <a-col :span="4">
@ -649,7 +650,7 @@
valueFormat="YYYY-MM-DD" valueFormat="YYYY-MM-DD"
show-time show-time
:style="{ width: '100%' }" :style="{ width: '100%' }"
v-model="SearchData.setd" v-model="SearchData.BETD"
allowClear allowClear
/> />
</a-form-item> </a-form-item>
@ -667,7 +668,7 @@
valueFormat="YYYY-MM-DD" valueFormat="YYYY-MM-DD"
show-time show-time
:style="{ width: '100%' }" :style="{ width: '100%' }"
v-model="SearchData.eetd" v-model="SearchData.EETD"
allowClear allowClear
/> />
</a-form-item> </a-form-item>
@ -693,185 +694,36 @@
</vxe-toolbar> </vxe-toolbar>
<vxe-table <vxe-table
class="firstTable" class="firstTable"
ref="xTable2"
border border
resizable resizable
show-overflow show-overflow
:data="BusinessData" :data="BusinessData"
:edit-config="{ trigger: 'click', mode: 'row' }" :loading="BusinessLoading"
height="300"
> >
<vxe-column type="checkbox" width="45"></vxe-column> <vxe-column type="checkbox" width="45"></vxe-column>
<vxe-column field="businessType" title="业务类型" :edit-render="{}" width="100"> <vxe-column field="businessType" title="业务类型" :edit-render="{}" width="100"> </vxe-column>
<!-- <template #default="{ row }"> <vxe-column field="bsstatusname" title="业务状态" :edit-render="{}" width="100"> </vxe-column>
<span>{{ FnRdispatchStatus(row.businessType) }}</span> <vxe-column field="changeOrder" title="更改单" :edit-render="{}" width="100"> </vxe-column>
</template> --> <vxe-column field="accounting" title="会计期间" :edit-render="{}" width="100"> </vxe-column>
<template #edit="{ row }"> <vxe-column field="bsdate" title="业务日期" :edit-render="{}" width="100"> </vxe-column>
<!-- <vxe-select v-model="row.businessType" transfer> <vxe-column field="customername" title="委托单位" :edit-render="{}" width="100"> </vxe-column>
<vxe-option <vxe-column field="weituoCode" title="委托编码" :edit-render="{}" width="100"> </vxe-column>
v-for="item in dispatchStatusList" <vxe-column field="contractno" title="运费协议号" :edit-render="{}" width="100"> </vxe-column>
:key="item.code" <vxe-column field="fwContract" title="服务合同号" :edit-render="{}" width="100"> </vxe-column>
:value="item.code" <vxe-column field="mblno" title="主提单号" :edit-render="{}" width="100"> </vxe-column>
:label="item.name" <vxe-column field="hblno" title="分提单号" :edit-render="{}" width="100"> </vxe-column>
></vxe-option> <vxe-column field="etd" title="开船日期" :edit-render="{}" width="100"> </vxe-column>
</vxe-select> --> <vxe-column field="vessel" title="船名" :edit-render="{}" width="100"> </vxe-column>
<vxe-input v-model="row.businessType" type="text" transfer></vxe-input> <vxe-column field="voyno" title="航次" :edit-render="{}" width="100"> </vxe-column>
</template> <vxe-column field="bspo" title="业务员" :edit-render="{}" width="100"> </vxe-column>
</vxe-column> <vxe-column field="oppo" title="操作" :edit-render="{}" width="100"> </vxe-column>
<vxe-column field="businessStatus" title="业务状态" :edit-render="{}" width="100"> <vxe-column field="doc" title="单证" :edit-render="{}" width="100"> </vxe-column>
<!-- <template #default="{ row }"> <vxe-column field="custservice" title="客服" :edit-render="{}" width="100"> </vxe-column>
<span>{{ FnRdispatchStatus(row.businessStatus) }}</span> <vxe-column field="portload" title="起运港" :edit-render="{}" width="100"> </vxe-column>
</template> --> <vxe-column field="destination" title="目的港" :edit-render="{}" width="100"> </vxe-column>
<template #edit="{ row }"> <vxe-column field="carrier" title="船公司" :edit-render="{}" width="100"> </vxe-column>
<!-- <vxe-select v-model="row.businessStatus" transfer>
<vxe-option
v-for="item in dispatchStatusList"
:key="item.code"
:value="item.code"
:label="item.name"
></vxe-option>
</vxe-select> -->
<vxe-input v-model="row.businessStatus" type="text" transfer></vxe-input>
</template>
</vxe-column>
<vxe-column field="changeOrder" title="更改单" :edit-render="{}" width="100">
<!-- <template #default="{ row }">
<span>{{ FnRdispatchStatus(row.changeOrder) }}</span>
</template> -->
<template #edit="{ row }">
<!-- <vxe-select v-model="row.changeOrder" transfer>
<vxe-option
v-for="item in dispatchStatusList"
:key="item.code"
:value="item.code"
:label="item.name"
></vxe-option>
</vxe-select> -->
<vxe-input v-model="row.changeOrder" type="text" transfer></vxe-input>
</template>
</vxe-column>
<vxe-column field="accounting" title="会计期间" :edit-render="{}" width="100">
<template #edit="{ row }">
<vxe-input v-model="row.accounting" type="date" transfer></vxe-input>
</template>
</vxe-column>
<vxe-column field="businessDate" title="业务日期" :edit-render="{}" width="100">
<template #edit="{ row }">
<vxe-input v-model="row.businessDate" type="date" transfer></vxe-input>
</template>
</vxe-column>
<vxe-column field="weituo" title="委托单位" :edit-render="{}" width="100">
<template #edit="{ row }">
<vxe-input v-model="row.weituo" type="text"></vxe-input>
</template>
</vxe-column>
<vxe-column field="weituoCode" title="委托编码" :edit-render="{}" width="100">
<template #edit="{ row }">
<vxe-input v-model="row.weituoCode" type="text"></vxe-input>
</template>
</vxe-column>
<vxe-column field="contractno" title="运费协议号" :edit-render="{}" width="100">
<template #edit="{ row }">
<vxe-input v-model="row.contractno" type="text"></vxe-input>
</template>
</vxe-column>
<vxe-column field="fwContract" title="服务合同号" :edit-render="{}" width="100">
<template #edit="{ row }">
<vxe-input v-model="row.fwContract" type="text"></vxe-input>
</template>
</vxe-column>
<vxe-column field="mblno" title="主提单号" :edit-render="{}" width="100">
<template #edit="{ row }">
<vxe-input v-model="row.mblno" type="text"></vxe-input>
</template>
</vxe-column>
<vxe-column field="hblno" title="分提单号" :edit-render="{}" width="100">
<template #edit="{ row }">
<vxe-input v-model="row.hblno" type="text"></vxe-input>
</template>
</vxe-column>
<vxe-column field="etd" title="开船日期" :edit-render="{}" width="100">
<template #edit="{ row }">
<vxe-input v-model="row.etd" type="date" transfer></vxe-input>
</template>
</vxe-column>
<vxe-column field="vessel" title="船名" :edit-render="{}" width="100">
<template #edit="{ row }">
<vxe-input v-model="row.vessel" type="text"></vxe-input>
<!-- <vxe-select v-model="row.vessel" transfer>
<vxe-option
v-for="item in VesselData"
:key="item.name"
:value="item.name"
:label="item.name"
></vxe-option>
</vxe-select> -->
</template>
</vxe-column>
<vxe-column field="voyno" title="航次" :edit-render="{}" width="100">
<template #edit="{ row }">
<vxe-input v-model="row.voyno" type="text"></vxe-input>
</template>
</vxe-column>
<vxe-column field="bspo" title="业务员" :edit-render="{}" width="100">
<template #edit="{ row }">
<vxe-input v-model="row.bspo" type="text"></vxe-input>
</template>
</vxe-column>
<vxe-column field="oppo" title="操作" :edit-render="{}" width="100">
<template #edit="{ row }">
<vxe-input v-model="row.oppo" type="text"></vxe-input>
</template>
</vxe-column>
<vxe-column field="doc" title="单证" :edit-render="{}" width="100">
<template #edit="{ row }">
<vxe-input v-model="row.doc" type="text"></vxe-input>
</template>
</vxe-column>
<vxe-column field="custservice" title="客服" :edit-render="{}" width="100">
<template #edit="{ row }">
<vxe-input v-model="row.custservice" type="text"></vxe-input>
</template>
</vxe-column>
<vxe-column field="portload" title="起运港" :edit-render="{}" width="100">
<template #edit="{ row }">
<!-- <vxe-input v-model="row.portload" type="text"></vxe-input> -->
<vxe-select v-model="row.portload" transfer>
<vxe-option
v-for="item in PortloadData"
:key="item.cnName"
:value="item.cnName"
:label="item.cnName"
></vxe-option>
</vxe-select>
</template>
</vxe-column>
<vxe-column field="destination" title="目的港" :edit-render="{}" width="100">
<template #edit="{ row }">
<!-- <vxe-input v-model="row.destination" type="text"></vxe-input> -->
<vxe-select v-model="row.destination" transfer>
<vxe-option
v-for="item in PortData"
:key="item.cnName"
:value="item.cnName"
:label="item.cnName"
></vxe-option>
</vxe-select>
</template>
</vxe-column>
<vxe-column field="carrier" title="船公司" :edit-render="{}" width="100">
<template #edit="{ row }">
<!-- <vxe-input v-model="row.carrier" type="text"></vxe-input> -->
<vxe-select v-model="row.carrier" transfer>
<vxe-option
v-for="item in CarrierData"
:key="item.cnName"
:value="item.cnName"
:label="item.cnName"
></vxe-option>
</vxe-select>
</template>
</vxe-column>
</vxe-table> </vxe-table>
</a-col> </a-col>
</a-row> </a-row>
@ -892,22 +744,8 @@ import {
commondbCodeProvinceList, commondbCodeProvinceList,
commondbCodeCityList commondbCodeCityList
} from '@/api/modular/main/ExpressModule' } from '@/api/modular/main/ExpressModule'
import { GetPortloadlist, GetCarrierlist, GetPortlist, GetVessellist } from '@/api/modular/main/BookingLedger' import { GetPortloadlist, GetCarrierlist, GetPortlist } from '@/api/modular/main/BookingLedger'
// import addForm from '../tmsCobLoadingPlace/addForm.vue' import { PageDataByBooking } from '@/api/modular/main/BookingLedger'
// import {
// BookingOrderSFSave,
// TmsForwarderOrderUpdate,
// TmsForwarderOrderConfirm,
// TmsForwarderOrderCancel,
// TmsForwarderOrderDelete,
// BookingOrderSFGet,
// listCarGroup,
// forwarderTransTime,
// forwarderRouterPath,
// imgList
// } from '@/api/modular/main/tmsaip/ExpressModule'
// import { DjyCustomerQuerytDjyCustomerInfo } from '@/api/modular/main/SendCar'
// import { tmsCobLoadingPlacelist } from '@/api/modular/main/tmsaip/tmsCobLoadingPlace'
import AAutoComplete from 'ant-design-vue/es/auto-complete' import AAutoComplete from 'ant-design-vue/es/auto-complete'
export default { export default {
components: { components: {
@ -1063,7 +901,7 @@ export default {
initTime: true, initTime: true,
AddSVisible: false, AddSVisible: false,
BusinessData: [], BusinessData: [],
BusinessDataBackup: [], BusinessLoading: false,
DetailData: [], DetailData: [],
ProvinceData: [], ProvinceData: [],
sjCityData: [], sjCityData: [],
@ -1109,48 +947,33 @@ export default {
}, },
methods: { methods: {
...mapActions(['setTmsAddData']), ...mapActions(['setTmsAddData']),
FnSearchData() { getListData() {
console.log(this.SearchData) this.BusinessLoading = true
let Data = [] PageDataByBooking({
multisort: [
this.BusinessDataBackup.forEach(item2 => { { sortField: 'bsstatusname', descSort: true },
let type = true { sortField: 'mblno', descSort: true }
Object.keys(this.SearchData).forEach(item => { ],
if (this.SearchData[item]) { PageNo: 1,
if (item == 'setd') { PageSize: 9999,
if (new Date(item2[this.SearchObj[item]]).getTime() < new Date(this.SearchData[item]).getTime()) { ...this.SearchData
type = false
}
} else if (item == 'eetd') {
if (new Date(item2[this.SearchObj[item]]).getTime() > new Date(this.SearchData[item]).getTime()) {
type = false
}
} else {
if (item2[this.SearchObj[item]]) {
if (item2[this.SearchObj[item]].indexOf(this.SearchData[item]) == -1) {
type = false
}
} else {
type = false
}
}
}
})
if (type == true) {
Data.push(item2)
}
// console.log(item2[this.SearchObj[item]], item2[this.SearchObj[item]].indexOf(this.SearchData[item]) != -1)
}) })
.then(res => {
setTimeout(() => { console.log('订舱数据', res)
this.BusinessData = Data this.BusinessData = res.data.items
}, 100) this.BusinessLoading = false
})
// BusinessDataBackup .catch(err => {
console.log('订舱数据', err)
this.BusinessLoading = false
})
},
FnSearchData() {
this.getListData()
}, },
FnClearData() { FnClearData() {
this.SearchData = {} this.SearchData = {}
this.BusinessData = this.BusinessDataBackup this.getListData()
}, },
FnChangeProvince(data, type) { FnChangeProvince(data, type) {
commondbCodeCityList({ Provincecode: data }).then(res => { commondbCodeCityList({ Provincecode: data }).then(res => {
@ -1365,8 +1188,6 @@ export default {
validateFields((errors, values) => { validateFields((errors, values) => {
if (!errors) { if (!errors) {
// dispatchTime // dispatchTime
// values.business = this.BusinessData
values.business = this.BusinessDataBackup
values.detail = this.DetailData values.detail = this.DetailData
this.ProvinceData.forEach(item => { this.ProvinceData.forEach(item => {
if (item.code == values.fjProvinceId) { if (item.code == values.fjProvinceId) {
@ -1522,10 +1343,9 @@ export default {
}) })
}, },
init() { init() {
this.BusinessData = []
this.SearchData = {} this.SearchData = {}
if (this.initTime) { if (this.initTime) {
this.BusinessData = []
this.BusinessDataBackup = []
this.DetailData = [] this.DetailData = []
this.form.resetFields() this.form.resetFields()
if (this.id) { if (this.id) {
@ -1557,8 +1377,6 @@ export default {
res.data.detail.forEach((item, index) => { res.data.detail.forEach((item, index) => {
item.WebKey = index + 1 item.WebKey = index + 1
}) })
this.BusinessData = res.data.business
this.BusinessDataBackup = res.data.business
this.DetailData = res.data.detail this.DetailData = res.data.detail
}, 100) }, 100)
} else { } else {
@ -1601,10 +1419,7 @@ export default {
console.log(res.data, '目的港') console.log(res.data, '目的港')
this.PortData = res.data this.PortData = res.data
}) })
// GetVessellist({ PageSize: 9999, PageNo: 1 }).then(res => { this.getListData()
// console.log(res.data, '船名')
// this.VesselData = res.data
// })
console.log('init') console.log('init')
setTimeout(() => { setTimeout(() => {
this.initTime = true this.initTime = true
@ -1644,20 +1459,30 @@ export default {
}) })
}, },
insertEvent2() { insertEvent2() {
if (!this.BusinessDataBackup) { console.log(this.BusinessData)
this.BusinessDataBackup = [] this.$refs.xTable2.selection.forEach(item => {
} delete item.id
console.log( this.DetailData.push({
this.BusinessDataBackup, WebKey: this.BusinessData.length ? this.BusinessData[this.BusinessData.length - 1].WebKey + 1 : 1,
this.BusinessDataBackup.length ? this.BusinessDataBackup[this.BusinessDataBackup.length - 1].WebKey + 1 : 1 ...item
) })
this.BusinessDataBackup.push({ console.log(item)
WebKey: this.BusinessDataBackup.length
? this.BusinessDataBackup[this.BusinessDataBackup.length - 1].WebKey + 1
: 1,
dispatchStatus: '0'
}) })
this.BusinessData = this.BusinessDataBackup console.log(this.DetailData)
// if (!this.BusinessDataBackup) {
// this.BusinessDataBackup = []
// }
// console.log(
// this.BusinessDataBackup,
// this.BusinessDataBackup.length ? this.BusinessDataBackup[this.BusinessDataBackup.length - 1].WebKey + 1 : 1
// )
// this.BusinessDataBackup.push({
// WebKey: this.BusinessDataBackup.length
// ? this.BusinessDataBackup[this.BusinessDataBackup.length - 1].WebKey + 1
// : 1,
// dispatchStatus: '0'
// })
// this.BusinessData = this.BusinessDataBackup
}, },
AddShandleSubmit() { AddShandleSubmit() {
console.log(this.AddsData) console.log(this.AddsData)

24
src/views/main/ExpressModule/index.vue
Unescape Escape View File

@ -139,9 +139,9 @@
</vxe-pager> </vxe-pager>
<check ref="check" @ok="handleOk" /> <check ref="check" @ok="handleOk" />
<edit-form ref="editForm" @ok="handleOk" /> <edit-form ref="editForm" @ok="handleOk" />
<a-modal title="顺丰运单号" :visible="visible"> <a-modal title="顺丰运单号" :visible="visible" @cancel="handleCancel">
<template slot="footer"><span></span></template> <template slot="footer"><span></span></template>
<a-table :columns="modalColumns" :data-source="KDtableData" bordered> <a-table :columns="modalColumns" :data-source="KDtableData" bordered :pagination="false">
<span slot="waybillType" slot-scope="text">{{ text == 1 ? '母单' : text == 2 ? '子单' : '签回单' }}</span> <span slot="waybillType" slot-scope="text">{{ text == 1 ? '母单' : text == 2 ? '子单' : '签回单' }}</span>
</a-table> </a-table>
</a-modal> </a-modal>
@ -267,7 +267,7 @@ export default {
title: '收件省份', title: '收件省份',
align: 'center', align: 'center',
width: '80', width: '80',
dataIndex: 'sjProvinceId' dataIndex: 'sjProvince'
}, },
{ {
title: '收件城市', title: '收件城市',
@ -291,7 +291,7 @@ export default {
title: '寄件省份', title: '寄件省份',
align: 'center', align: 'center',
width: '80', width: '80',
dataIndex: 'fjProvinceId' dataIndex: 'fjProvince'
}, },
{ {
title: '寄件城市', title: '寄件城市',
@ -342,15 +342,21 @@ export default {
} }
}) })
}, },
handleCancel() {
this.visible = false
this.KDtableData = []
},
FnKdSchedule(row) { FnKdSchedule(row) {
console.log(row)
this.visible = true
BookingOrderSFQueryKDSchedule({ Id: row.id }) BookingOrderSFQueryKDSchedule({ Id: row.id })
.then(res => { .then(res => {
if (res.code == 200) { if (res.code == 200) {
console.log(JSON.parse(JSON.parse(res.data))) if (JSON.parse(JSON.parse(res.data)).success) {
this.KDtableData = JSON.parse(JSON.parse(res.data)).msgData.waybillNoInfoList console.log(JSON.parse(JSON.parse(res.data)))
this.visible = true this.KDtableData = JSON.parse(JSON.parse(res.data)).msgData.waybillNoInfoList
this.visible = true
} else {
this.$message.warning(JSON.parse(JSON.parse(res.data)).errorMsg)
}
} else { } else {
this.$message.warning(res.message) this.$message.warning(res.message)
} }

Write Preview
Loading…
Cancel
Save