lijingjia
/
ds-wms-client-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

海运出口详情bug

Browse Source
szh-new
lijingjia 3 months ago
parent bdf7624e97
commit b288d20fe9
7 changed files with 143 additions and 389 deletions
Show Stats Download Patch File Download Diff File

51
src/components/Form/src/components/InputTextArea.vue
Unescape Escape View File

@ -73,35 +73,40 @@
// }
// 切割字符
const changeCode = (len) => {
const value = state.value
var textArr: any = value.match(/.+[\n]*/g)
var subValue = ''
for (var j = 0; j < textArr.length; j++) {
var subArr = textArr[j].match(/[\w]+[ ]*[\n]*|[\d]+[ ]*[\n]*|[^\w\d]+[ ]*[\n]*/g)
var count = 0
for (var i = 0; i < subArr.length; i++) {
count += subArr[i].replace(/\n/g, '').length
while (count > len) {
subValue += '\n'
count = subArr[i].replace(/\n/g, '').length
if (count > len) {
subValue += subArr[i].substring(0, len)
if (len == '*') {
} else {
const value = state.value
var textArr: any = value.match(/.+[\n]*/g)
var subValue = ''
for (var j = 0; j < textArr.length; j++) {
var subArr = textArr[j].match(/[\w]+[ ]*[\n]*|[\d]+[ ]*[\n]*|[^\w\d]+[ ]*[\n]*/g)
var count = 0
for (var i = 0; i < subArr.length; i++) {
count += subArr[i].replace(/\n/g, '').length
while (count > len) {
subValue += '\n'
subArr[i] = subArr[i].substring(len)
count = subArr[i].replace(/\n/g, '').length
if (count > len) {
subValue += subArr[i].substring(0, len)
subValue += '\n'
subArr[i] = subArr[i].substring(len)
count = subArr[i].replace(/\n/g, '').length
}
}
subValue += subArr[i]
}
if (j + 1 < textArr.length) {
subValue += '\n'
}
subValue += subArr[i]
}
if (j + 1 < textArr.length) {
subValue += '\n'
}
subValue = subValue.replace(/[\n]+/g, '\n')
subValue = subValue.replace(/[ ]+[\n]+/g, '\n')
subValue = subValue.replace(/[ ]+$/g, '')
subValue = subValue.replace(/^\s+/, '')
state.value = subValue
}
subValue = subValue.replace(/[\n]+/g, '\n')
subValue = subValue.replace(/[ ]+[\n]+/g, '\n')
subValue = subValue.replace(/[ ]+$/g, '')
subValue = subValue.replace(/^\s+/, '')
state.value = subValue
}
function ToCDB(str) {
if (!str) return

27
src/views/mapping/carrier/columns.tsx
Unescape Escape View File

@ -8,7 +8,7 @@ import { GetCarrierlist } from '/@/views/operation/seaexport/api/BookingLedger'
// 引入字典数据
import { getDictOption } from '/@/utils/dictUtil'
// 下拉数据
import { GetIssueTypeSelectList } from '/@/api/common'
import { GetIssueTypeSelectList, GetCarrierSelectList } from '/@/api/common'
// 模块字典
const modulesDict = await getDictOption('modules')
export const columns: BasicColumn[] = [
@ -81,25 +81,30 @@ export const formSchema: FormSchema[] = [
show: false,
},
{
field: 'code',
label: '船公司',
field: 'code',
component: 'ApiSelect',
required: false,
dynamicDisabled: false,
colProps: { span: 20 },
required: true,
componentProps: ({ formModel }) => {
return {
api: GetCarrierlist,
labelField: 'shortName',
valueField: 'codeName',
showSearch: true,
api: GetCarrierSelectList,
labelField: 'pinYinCode',
showName: 'cnName',
valueField: 'cnName',
resultField: 'data',
onChange: (v, obj) => {
if (obj) {
immediate: false,
onChange: (e, obj) => {
if (e && obj) {
formModel['linkId'] = obj.id
}
},
if (!e && !obj) {
formModel['linkId'] = null
}
}
}
},
}
},
{
field: 'module',

8
src/views/operation/seaexport/api/BookingLedger.js
Unescape Escape View File

@ -2046,6 +2046,14 @@ export function SeaExportTaskAudit(data) {
})
}
// 刷新运踪
export function RefreshYGT(data) {
return request({
url: '/opApi/SeaExport/RefreshYGT',
method: 'post',
data
})
}
// 获取商品下拉列表 (Auth)
export function GetClientGoodsList(params) {

393
src/views/operation/seaexport/columns.tsx
Unescape Escape View File

@ -298,7 +298,25 @@ export const searchFormSchema: FormSchema[] = [
field: 'yard',
component: 'Input',
show: false
}
},
{
label: '订舱口',
field: 'forwarder',
component: 'Input',
show: false
},
{
field: 'contractNo',
label: '运费协议号',
component: 'Input',
show: false
},
{
field: 'serviceContractNo',
label: '服务合同号',
component: 'Input',
show: false
},
]
// 费用状态
export const FeeStatus = [
@ -467,12 +485,12 @@ export const columns: BasicColumn[] = [
sorter: true,
width: 110,
},
{
title: '所属分部',
dataIndex: 'saleOrgName',
sorter: true,
width: 150,
},
// {
// title: '所属分部',
// dataIndex: 'saleOrgName',
// sorter: true,
// width: 150,
// },
{
title: '委托单位',
dataIndex: 'customerName',
@ -572,7 +590,7 @@ export const columns: BasicColumn[] = [
{
title: '船司航线',
sorter: true,
dataIndex: 'Lane',
dataIndex: 'carrierLane',
width: 150,
},
{
@ -589,7 +607,7 @@ export const columns: BasicColumn[] = [
},
{
title: '客服员',
title: '客服',
sorter: true,
dataIndex: 'customerServiceName',
width: 150,
@ -606,25 +624,6 @@ export const columns: BasicColumn[] = [
dataIndex: 'docName',
width: 150,
},
{
title: '所属部门',
sorter: true,
dataIndex: 'saleDeptName',
width: 150,
},
{
dataIndex: 'czRemark',
sorter: true,
title: '操作备注',
width: 150,
},
{
dataIndex: 'dzRemark',
sorter: true,
title: '单证备注',
width: 150,
},
{
dataIndex: 'shipper',
title: '发货人',
@ -643,11 +642,6 @@ export const columns: BasicColumn[] = [
width: 150,
sorter: true
},
// {
// title: '收货地代码',
// dataIndex: 'receiptPlaceId',
// width: 150,
// },
{
title: '收货地',
dataIndex: 'receiptPlace',
@ -660,29 +654,6 @@ export const columns: BasicColumn[] = [
sorter: true,
width: 150
},
// {
// dataIndex: 'financialStaffCode',
// title: '场站费自结',
// width: 150,
// customRender: ({ record }) => {
// let Arr = [
// { label: '是', value: true },
// { label: '否', value: false },
// ]
// let RData = ''
// Arr.forEach((item) => {
// if (item.value == record.financialStaffCode) {
// RData = item.label
// }
// })
// return RData
// },
// },
// {
// title: '装货港代码',
// dataIndex: 'loadPortId',
// width: 150,
// },
{
title: '装货港',
dataIndex: 'loadPort',
@ -695,16 +666,6 @@ export const columns: BasicColumn[] = [
sorter: true,
width: 150,
},
// {
// dataIndex: 'closeDocDate',
// title: '截单日期',
// width: 150,
// },
// {
// title: '中转港代码',
// dataIndex: 'transportid',
// width: 150,
// },
{
title: '中转港',
dataIndex: 'transport',
@ -723,121 +684,47 @@ export const columns: BasicColumn[] = [
sorter: true,
width: 150
},
// {
// title: '外国客服',
// dataIndex: 'foreignCustomerService',
// width: 150,
// },
// {
// dataIndex: 'deliveryDate',
// title: '交货日期',
// width: 150,
// },
{
dataIndex: 'termDelivery',
title: '贸易方式',
sorter: true,
width: 150,
customRender: ({ record }) => {
let name = ''
termDict.value.some((item) => {
if (record.termDelivery == item.value) {
name = item.name
return true
}
})
return name
},
},
{
dataIndex: 'wareHouse',
title: '仓库',
sorter: true,
width: 150,
customRender: ({ record }) => {
let RData = ''
// ListData.wareHouse.forEach((item) => {
// if (item.value == record.wareHouse) {
// RData = item.label
// }
// })
return RData
},
width: 150
},
{
dataIndex: 'agentId',
dataIndex: 'agent',
title: '国外代理',
sorter: true,
width: 150,
customRender: ({ record }) => {
let RData = ''
// ListData.agentId.forEach((item) => {
// if (item.value == record.agentId) {
// RData = item.label
// }
// })
return RData
},
width: 150
},
{
dataIndex: 'agent',
dataIndex: 'agentContent',
title: 'AGENT',
width: 150,
sorter: true,
sorter: true
},
// {
// title: '卸货港代码',
// dataIndex: 'dischargePortId',
// width: 150,
// },
{
title: '卸货港',
dataIndex: 'dischargePort',
width: 150,
sorter: true,
customRender: ({ record }) => {
let RData = ''
// ListData.receiptPlaceId.forEach((item) => {
// if (item.value == record.dischargePort) {
// RData = item.label
// }
// })
return RData
},
sorter: true
},
{
dataIndex: 'atd',
title: 'ATD',
sorter: true,
width: 150,
width: 150
},
{
dataIndex: 'eta',
title: '预抵日期',
sorter: true,
width: 150,
width: 150
},
// {
// title: '交货地代码',
// dataIndex: 'deliveryPlaceId',
// width: 150,
// },
{
title: '交货地',
sorter: true,
dataIndex: 'deliveryPlace',
width: 150,
customRender: ({ record }) => {
let RData = ''
// ListData.receiptPlaceId.forEach((item) => {
// if (item.value == record.deliveryPlace) {
// RData = item.label
// }
// })
return RData
},
width: 150
},
{
dataIndex: 'issueDate',
@ -849,43 +736,9 @@ export const columns: BasicColumn[] = [
dataIndex: 'issueType',
title: '签单方式',
sorter: true,
width: 150,
customRender: ({ record }) => {
let RData = ''
// ListData.issueType.forEach((item) => {
// if (item.value == record.issueType) {
// RData = item.label
// }
// })
return RData
},
},
// {
// title: '目的地代码',
// dataIndex: 'destinationId',
// width: 150,
// },
{
title: '目的地',
sorter: true,
dataIndex: 'destination',
width: 150,
customRender: ({ record }) => {
let RData = ''
// ListData.receiptPlaceId.forEach((item) => {
// if (item.value == record.destination) {
// RData = item.label
// }
// })
return RData
},
width: 150
},
...CtnMapArr,
// {
// title: '签单地代码',
// dataIndex: 'issuePlaceId',
// width: 150,
// },
{
title: '签单地点',
sorter: true,
@ -928,61 +781,19 @@ export const columns: BasicColumn[] = [
dataIndex: 'mblFrt',
title: '付费方式',
sorter: true,
width: 150,
customRender: ({ record }) => {
let RData = ''
// ListData.mblFrt.forEach((item) => {
// if (item.value == record.mblFrt) {
// RData = item.label
// }
// })
return RData
},
width: 150
},
{
dataIndex: 'prepareAt',
title: '预付地点',
sorter: true,
width: 150,
customRender: ({ record }) => {
let RData = ''
// ListData.prepareAt.forEach((item) => {
// if (item.value == record.prepareAt) {
// RData = item.label
// }
// })
return RData
},
},
{
dataIndex: 'payableAt',
title: '到付地点',
sorter: true,
width: 150,
customRender: ({ record }) => {
let RData = ''
// ListData.payableAt.forEach((item) => {
// if (item.value == record.payableAt) {
// RData = item.label
// }
// })
return RData
},
width: 150
},
{
dataIndex: 'service',
title: '运输条款',
sorter: true,
width: 150,
customRender: ({ record }) => {
let RData = ''
// ListData.service.forEach((item) => {
// if (item.value == record.service) {
// RData = item.label
// }
// })
return RData
},
width: 150
},
{
dataIndex: 'tradeTerm',
@ -1010,16 +821,7 @@ export const columns: BasicColumn[] = [
dataIndex: 'goodsName',
title: '品名',
width: 150,
sorter: true,
customRender: ({ record }) => {
let RData = ''
// ListData.goodsName.forEach((item) => {
// if (item.value == record.goodsName) {
// RData = item.label
// }
// })
return RData
},
sorter: true
},
{
dataIndex: 'cargoId',
@ -1045,19 +847,10 @@ export const columns: BasicColumn[] = [
},
{
dataIndex: 'kindPkgs',
dataIndex: 'kindPkgsName',
title: '包装',
sorter: true,
width: 150,
customRender: ({ record }) => {
let RData = ''
// ListData.goodsName.forEach((item) => {
// if (item.value == record.kindPkgs) {
// RData = item.label
// }
// })
return RData
},
width: 150
},
{
title: '件数',
@ -1113,12 +906,6 @@ export const columns: BasicColumn[] = [
// sorter: true,
// width: 150,
// },
{
title: 'EDI备注',
dataIndex: 'ediRemark',
sorter: true,
width: 150,
},
// { 先去掉，别删，后期可能要
// dataIndex: 'enterprise',
// title: '单位',
@ -1142,50 +929,15 @@ export const columns: BasicColumn[] = [
// width: 150,
// },
{
title: '预录',
sorter: true,
dataIndex: 'preRecord',
width: 150,
},
{
dataIndex: 'isMoreGood',
sorter: true,
title: '是否多品名',
width: 150,
customRender: ({ record }) => {
let Arr = [
{ label: '是', value: 'true' },
{ label: '否', value: 'false' },
]
let RData = ''
Arr.forEach((item) => {
if (item.value == record.isMoreGood) {
RData = item.label
}
})
return RData
},
},
{
dataIndex: 'insperctService',
title: '报检项目',
title: '业务状态',
dataIndex: 'businessStatusName',
width: 110,
sorter: true,
width: 150,
customRender: ({ record }) => {
let RData = ''
// ListData.insperctService.forEach((item) => {
// if (item.value == record.insperctService) {
// RData = item.label
// }
// })
return RData
},
},
{
title: '二程航次',
dataIndex: 'voyno2N',
width: 150,
sorter: true,
title: '运踪',
dataIndex: 'bookStatus',
width: 200
},
// {
// title: '发送方EDI代码',
@ -1251,49 +1003,12 @@ export const columns: BasicColumn[] = [
dataIndex: 'goodsName',
width: 150,
},
{
dataIndex: 'isContainerSoc',
title: '是否SOC箱',
width: 150,
sorter: true,
customRender: ({ record }) => {
let Arr = [
{ label: '是', value: true },
{ label: '否', value: false },
]
let RData = ''
Arr.forEach((item) => {
if (item.value == record.isContainerSoc) {
RData = item.label
}
})
return RData
},
},
{
title: 'SCAC代码',
dataIndex: 'scaccode',
sorter: true,
width: 150,
},
{
title: 'ITN编号',
dataIndex: 'itncode',
sorter: true,
width: 150,
},
{
title: '订舱人说明',
dataIndex: 'orderRemark',
sorter: true,
width: 150,
},
{
title: '付款方',
dataIndex: 'freightpayer',
sorter: true,
width: 150,
},
{
title: '第一层包装皮重',
dataIndex: 'kingTareweight',
@ -1301,17 +1016,11 @@ export const columns: BasicColumn[] = [
width: 150,
},
{
title: '指定业务员',
title: '箱满仓业务员',
dataIndex: 'xmcywy',
sorter: true,
width: 150,
},
{
dataIndex: 'weiTuoFang',
title: '委托方',
sorter: true,
width: 150,
},
}
]
// BatchModification表单

16
src/views/operation/seaexport/detail/modules/baseInfo.tsx
Unescape Escape View File

@ -218,7 +218,7 @@ export const basicInfoFormSchema: FormSchema[] = [
}
}
},
{
{
label: '',
field: 'carrierId',
component: 'Input',
@ -544,7 +544,7 @@ export const mailingInfoFormSchemaL: FormSchema[] = [
component: 'InputTextArea',
colProps: { span: 8 },
componentProps: {
slice: [30, 35, 40]
slice: ['*', 30, 35, 40]
}
},
{
@ -2288,6 +2288,12 @@ export const otherInfoFormSchema: FormSchema[] = [
field: 'sourceCode',
show: false
},
{
label: '',
component: 'Input',
field: 'sourceName',
show: false
},
{
label: '业务来源',
field: 'sourceId',
@ -2306,12 +2312,14 @@ export const otherInfoFormSchema: FormSchema[] = [
onChange: async (e, obj) => {
if (e && obj) {
formModel.sourceCode = obj.sourceCode
formModel.sourceDetailId = null
formModel.sourceDetailName = null
formModel.sourceCode = obj.sourceName
}
if (!e && !obj) {
formModel.sourceCode = null
formModel.sourceCode = null
}
formModel.sourceDetailId = null
formModel.sourceDetailName = null
},
}
},

12
src/views/operation/seaexport/detail/modules/goodsTable.vue
Unescape Escape View File

@ -15,7 +15,7 @@
<a-upload name="file" :before-upload="UpExcel" :show-upload-list="false">
<a-button type="link" v-repeat size="mini">
<span class="iconfont icon-a-17Fdaoru"></span>
EXCEL导入
导入
</a-button>
</a-upload>
<a-button
@ -26,15 +26,15 @@
v-show="list.length !== 0"
>
<span class="iconfont icon-a-17Btuichu"></span>
EXCEL导出
导出
</a-button>
<a-button type="link" v-repeat size="mini" @click="importYarn">
<span class="iconfont icon-liebiao"></span>
引入场站数据
引入数据
</a-button>
<a-button type="link" v-repeat size="mini" @click="importsealno">
<span class="iconfont icon-a-fahuodaifahuo"></span>
引入场站箱封号
引入箱封号
</a-button>
<a-button type="link" v-repeat size="mini" @click="importWeight">
<span class="iconfont icon-xiangzi"></span>
@ -42,7 +42,7 @@
</a-button>
<a-button type="link" v-repeat size="mini" @click="arrowsWeight">
<span class="iconfont icon-cengji"></span>
展开箱量
展开
</a-button>
</div>
<div>
@ -1179,7 +1179,7 @@
// 创建a标签模拟点击进行下载
const a = document.createElement('a')
a.href = url
a.download = 'data.xlsx'
a.download = `${(props.details.mblno + '--装箱数据') || 'ds-file'}.xlsx`
document.body.appendChild(a)
a.click()

25
src/views/operation/seaexport/index.vue
Unescape Escape View File

@ -78,14 +78,24 @@
<span v-if="record.isBusinessLocking">
<i class="iconfont icon-locksuo"></i>
</span>
<span v-else> <i class="iconfont icon-lock-openkaisuo"></i> </span>
<span v-else> <i class="iconfont icon-a-jiesuo1_jiesuo"></i> </span>
</template>
<!-- 费用锁定 -->
<template v-if="column.dataIndex == 'isFeeLocking'">
<span v-if="record.isFeeLocking">
<i class="iconfont icon-locksuo"></i>
</span>
<span v-else> <i class="iconfont icon-lock-openkaisuo"></i> </span>
<span v-else> <i class="iconfont icon-a-jiesuo1_jiesuo"></i> </span>
</template>
<!-- 运踪 -->
<template v-if="column.dataIndex == 'bookStatus'">
<a-spin :spinning="bsloading">
<div @click="checkBookStatus(record.id)">
<div >
<span class="iconfont icon-refresh-1-copy"></span> 舱单-海放-装载-码放-装船-离港
</div>
</div>
</a-spin>
</template>
<!-- 格式单比对 -->
<template v-if="column.dataIndex == 'lstDraftCompareRlt'">
@ -253,7 +263,6 @@
<script lang="ts" setup name="订单管理">
import TableActionBar from './components/tableActionBar.vue'
import tableActionBarRight from './components/tableActionBarRight.vue'
import { CheckCircleFilled,CloseCircleFilled,RedoOutlined } from '@ant-design/icons-vue';
import { onMounted, ref } from 'vue'
import { BasicTable, useTable, TableAction } from '/@/components/Table'
import { PageDataByBooking, SeaExportCopy } from './api/BookingLedger.js'
@ -266,6 +275,7 @@ import { formatTableData } from '/@/hooks/web/common'
import { Field } from '/@/components/Render/interface'
import { useOptionsStore } from '/@/store/modules/options'
import lstDraftCompareRlt from '../../../components/lstDraftCompareRlt/index.vue'
import { RefreshYGT } from './api/BookingLedger.js'
const optionsStore = useOptionsStore()
import { usePermissionStore } from '/@/store/modules/permission'
import { useI18n } from '/@/hooks/web/useI18n'
@ -478,6 +488,15 @@ function moreNumSubmit() {
function moreNumCancel() {
moreNumVisible.value = false
}
const bsloading = ref(false)
// 校验运踪状态
const checkBookStatus = (id) => {
bsloading.value = true
RefreshYGT({ ids: [id], businessType: 1 }).then(res => {
bsloading.value = false
console.log(res)
})
}
const isAdvancedQuery = ref(false)
const showColumns = ref({})
const formAllData = ref([])

Write Preview
Loading…
Cancel
Save