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

退舱

Browse Source
feature-JimuReport-1106-yjl
lijingjia 4 weeks ago
parent e04e18761b
commit 7e4f1378bc
10 changed files with 59 additions and 44 deletions
Show Stats Download Patch File Download Diff File

3
src/components/CostEntry/feeTable.vue
Unescape Escape View File

@ -670,6 +670,9 @@
}) })
if (item) dict = item[0] if (item) dict = item[0]
list.value[changes[0][0]]['unit'] = dict?.value list.value[changes[0][0]]['unit'] = dict?.value
if (changes[0][3].indexOf('-') > -1) {
changes[0][3] = changes[0][3].split('-')[0]
}
list.value[changes[0][0]]['unitText'] = changes[0][3] list.value[changes[0][0]]['unitText'] = changes[0][3]
if (dict && dict?.value && dict.isCtn) { if (dict && dict?.value && dict.isCtn) {
// 箱型带出指定的箱量 // 箱型带出指定的箱量

2
src/components/Print/index.vue
Unescape Escape View File

@ -233,7 +233,7 @@
}) })
GetPrintInfo({ businessType: 1, ids, id: props.bookingData.id, value: 'ProfitAccountingReport' }).then(res => { GetPrintInfo({ businessType: 1, ids, id: props.bookingData.id, value: 'ProfitAccountingReport' }).then(res => {
const postData = { const postData = {
jsonDataStr: JSON.stringify(res.data.details) || '', jsonDataStr: JSON.stringify(res.data) || '',
printType: type, printType: type,
templateId: item.id templateId: item.id
} }

1
src/design/public.less
Unescape Escape View File

@ -202,6 +202,7 @@ h5 {
.YFD, .YFD,
.YFC, .YFC,
.YSDBC, .YSDBC,
.WTJ,
.YDC { .YDC {
padding: 4px 13px; padding: 4px 13px;
border-radius: 30px; border-radius: 30px;

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

@ -6,7 +6,7 @@
import { ref } from 'vue' import { ref } from 'vue'
import { BasicColumn, FormSchema } from '/@/components/Table' import { BasicColumn, FormSchema } from '/@/components/Table'
// 下拉框数据接口 // 下拉框数据接口
import { GetClientListByCode, GetCarrierSelectList } from '/@/api/common' import { GetClientListByCode, GetCarrierSelectList, GetSupplierListByCode } from '/@/api/common'
// 接口 // 接口
import { import {
GetControllerClientList, GetControllerClientList,
@ -116,6 +116,17 @@ export const searchFormSchema: FormSchema[] = [
allowClear: true, allowClear: true,
}, },
}, },
{
field: 'closeDocDate',
label: '截单时间',
component: 'RangePicker',
required: false,
dynamicDisabled: false,
colProps: { span: 4 },
componentProps: {
allowClear: true,
},
},
{ {
label: '操作', label: '操作',
field: 'operatorId', field: 'operatorId',
@ -512,12 +523,12 @@ export const columns: BasicColumn[] = [
{ {
dataIndex: 'lstDraftCompareRlt', dataIndex: 'lstDraftCompareRlt',
title: '格式单比对', title: '格式单比对',
width: 120, width: 100,
}, },
{ {
dataIndex: 'lstShipOrderCompareRlt', dataIndex: 'lstShipOrderCompareRlt',
title: '下货纸比对', title: '下货纸比对',
width: 120, width: 100,
}, },
{ {
dataIndex: 'arFeeStatus', dataIndex: 'arFeeStatus',
@ -565,7 +576,7 @@ export const columns: BasicColumn[] = [
value: '9', value: '9',
}, },
], ],
width: 120, width: 100,
}, },
{ {
dataIndex: 'apFeeStatus', dataIndex: 'apFeeStatus',
@ -613,36 +624,36 @@ export const columns: BasicColumn[] = [
value: '9', value: '9',
}, },
], ],
width: 120, width: 100,
}, },
{ {
dataIndex: 'arInvoiceStatus', dataIndex: 'arInvoiceStatus',
title: '应收开票', title: '应收开票',
sorter: true, sorter: true,
width: 120, width: 100,
}, },
{ {
dataIndex: 'apInvoiceStatus', dataIndex: 'apInvoiceStatus',
title: '应付开票', title: '应付开票',
sorter: true, sorter: true,
width: 120, width: 100,
}, },
{ {
dataIndex: 'arCheckStatus', dataIndex: 'arCheckStatus',
title: '应收对账', title: '应收对账',
sorter: true, sorter: true,
width: 120, width: 100,
}, },
{ {
dataIndex: 'isBusinessLocking', dataIndex: 'isBusinessLocking',
title: '业务锁定', title: '业务锁定',
sorter: true, sorter: true,
width: 100 width: 80
}, },
{ {
dataIndex: 'isFeeLocking', dataIndex: 'isFeeLocking',
title: '费用锁定', title: '费用锁定',
width: 100, width: 80,
sorter: true sorter: true
}, },
{ {
@ -688,7 +699,7 @@ export const columns: BasicColumn[] = [
width: 130, width: 130,
}, },
{ {
title: '截单日期', title: '截单时间',
sorter: true, sorter: true,
dataIndex: 'closeDocDate', dataIndex: 'closeDocDate',
width: 90, width: 90,
@ -703,25 +714,25 @@ export const columns: BasicColumn[] = [
title: '中转港', title: '中转港',
dataIndex: 'transport', dataIndex: 'transport',
sorter: true, sorter: true,
width: 130, width: 120,
}, },
{ {
dataIndex: 'yard', dataIndex: 'yard',
title: '场站', title: '场站',
sorter: true, sorter: true,
width: 130 width: 120
}, },
{ {
dataIndex: 'customser', dataIndex: 'customser',
title: '报关行', title: '报关行',
sorter: true, sorter: true,
width: 130 width: 120
}, },
{ {
dataIndex: 'trucker', dataIndex: 'trucker',
title: '承运车队', title: '承运车队',
sorter: true, sorter: true,
width: 130 width: 120
}, },
// { // {
// dataIndex: 'termDelivery', // dataIndex: 'termDelivery',
@ -739,31 +750,31 @@ export const columns: BasicColumn[] = [
dataIndex: 'shipper', dataIndex: 'shipper',
title: '发货人', title: '发货人',
sorter: true, sorter: true,
width: 150 width: 120
}, },
{ {
dataIndex: 'consignee', dataIndex: 'consignee',
title: '收货人', title: '收货人',
sorter: true, sorter: true,
width: 150 width: 120
}, },
{ {
dataIndex: 'notifyParty', dataIndex: 'notifyParty',
title: '通知人', title: '通知人',
width: 150, width: 120,
sorter: true sorter: true
}, },
{ {
title: '收货地', title: '收货地',
dataIndex: 'receiptPlace', dataIndex: 'receiptPlace',
sorter: true, sorter: true,
width: 150, width: 120,
}, },
{ {
dataIndex: 'kindPkgsName', dataIndex: 'kindPkgsName',
title: '包装', title: '包装',
sorter: true, sorter: true,
width: 150 width: 120
}, },
{ {
title: '件数', title: '件数',
@ -787,7 +798,7 @@ export const columns: BasicColumn[] = [
dataIndex: 'marks', dataIndex: 'marks',
title: `唛头`, title: `唛头`,
sorter: true, sorter: true,
width: 100, width: 80,
}, },
{ {
dataIndex: 'description', dataIndex: 'description',
@ -840,13 +851,13 @@ export const columns: BasicColumn[] = [
title: '签单地点', title: '签单地点',
sorter: true, sorter: true,
dataIndex: 'issuePlace', dataIndex: 'issuePlace',
width: 150, width: 120,
}, },
{ {
dataIndex: 'noBill', dataIndex: 'noBill',
sorter: true, sorter: true,
title: '提单份数', title: '提单份数',
width: 150, width: 80,
customRender: ({ record }) => { customRender: ({ record }) => {
let name = '' let name = ''
FnnoBill.value.some((item) => { FnnoBill.value.some((item) => {
@ -862,7 +873,7 @@ export const columns: BasicColumn[] = [
dataIndex: 'copyNoBill', dataIndex: 'copyNoBill',
title: '副本份数', title: '副本份数',
sorter: true, sorter: true,
width: 150, width: 80,
customRender: ({ record }) => { customRender: ({ record }) => {
let name = '' let name = ''
FncopyNoBill.value.some((item) => { FncopyNoBill.value.some((item) => {
@ -878,13 +889,13 @@ export const columns: BasicColumn[] = [
dataIndex: 'mblFrt', dataIndex: 'mblFrt',
title: '付费方式', title: '付费方式',
sorter: true, sorter: true,
width: 150 width: 100
}, },
{ {
dataIndex: 'prepareAt', dataIndex: 'prepareAt',
title: '预付地点', title: '预付地点',
sorter: true, sorter: true,
width: 150 width: 120
}, },
{ {
dataIndex: 'note', dataIndex: 'note',
@ -1199,7 +1210,7 @@ export const BatchModificationFormSchema: FormSchema[] = [
colProps: { span: 4 }, colProps: { span: 4 },
componentProps: () => { componentProps: () => {
return { return {
api: GetCustomClientList, api: GetSupplierListByCode,
labelField: 'shortName', labelField: 'shortName',
valueField: 'id', valueField: 'id',
resultField: 'data', resultField: 'data',

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

@ -99,12 +99,12 @@
rejectText="驳回任务" rejectText="驳回任务"
:approve="approveDc" :approve="approveDc"
:source="source" :source="source"
:status="route.query.status == 'WAIT_SI' ? 'WAIT_SI' : undefined" :status="route.query.status == 'WAIT_SI' ? 'WAIT_SI' : (route.query.status == 'RETURN_CABIN_AUDIT' ? 'RETURN_CABIN_AUDIT' : undefined)"
:id="id" :id="id"
businessType="1" businessType="1"
> >
<span> <span>
<a-button class="ml10" v-repeat v-if="refreshFlag && route.query.status != 'RETURN_CABIN_POOL' && route.query.status != 'WAIT_ORDER_AUDIT' && route.query.source != 'Complete'" @click="save(true)" type="primary"> <a-button class="ml10" v-repeat v-if="refreshFlag && route.query.status != 'RETURN_CABIN_POOL' && route.query.status != 'WAIT_ORDER_AUDIT' && route.query.status != 'RETURN_CABIN_AUDIT' && route.query.source != 'Complete'" @click="save(true)" type="primary">
{{ completeText }} {{ completeText }}
</a-button> </a-button>
<a-button class="ml10" v-repeat v-if="route.query.status == 'RETURN_CABIN_POOL' && route.query.source != 'Complete'" @click="save('cjtc')" type="primary"> <a-button class="ml10" v-repeat v-if="route.query.status == 'RETURN_CABIN_POOL' && route.query.source != 'Complete'" @click="save('cjtc')" type="primary">
@ -1152,7 +1152,7 @@
// } // }
// // cvisible.value = false // // cvisible.value = false
// } // }
// 订舱审核 // 审核***(审单、SI、退舱)
const approveDc = async (remark) => { const approveDc = async (remark) => {
if (!remark) { if (!remark) {
// 审批通过判断是否是最后一个审批人 // 审批通过判断是否是最后一个审批人

11
src/views/operation/seaexport/detail/modules/Letter/OpBusinessYardColumns.tsx
Unescape Escape View File

@ -2,7 +2,7 @@ import { BasicColumn, FormSchema } from '/@/components/Table'
import Space from '/@/views/operation/seaexport/components/Space.vue' import Space from '/@/views/operation/seaexport/components/Space.vue'
import { useComponentRegister } from '/@/components/Form' import { useComponentRegister } from '/@/components/Form'
// 下拉框数据接口 // 下拉框数据接口
import { GetClientListByCode } from '/@/api/common' import { GetClientListByCode, GetSupplierListByCode } from '/@/api/common'
import { t } from '/@/hooks/web/useI18n' import { t } from '/@/hooks/web/useI18n'
useComponentRegister('Space', Space) useComponentRegister('Space', Space)
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
@ -436,7 +436,7 @@ export const formSchema: FormSchema[] = [
colProps: { span: 8 }, colProps: { span: 8 },
componentProps: ({ formModel }) => { componentProps: ({ formModel }) => {
return { return {
api: GetClientListByCode, api: GetSupplierListByCode,
params: { code: 'yard' }, params: { code: 'yard' },
labelField: 'pinYinCode', labelField: 'pinYinCode',
showName: 'shortName', showName: 'shortName',
@ -468,13 +468,6 @@ export const formSchema: FormSchema[] = [
field: 'yardTel', field: 'yardTel',
component: 'Input', component: 'Input',
defaultValue: null, defaultValue: null,
rules: [
{
pattern: /^1\d{10}$/,
message: '请输入正确格式的手机号',
trigger: 'blur',
},
],
colProps: { colProps: {
span: 8 span: 8
} }

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

@ -2828,7 +2828,7 @@ export const otherInfoFormSchema: FormSchema[] = [
componentProps: ({ formModel }) => { componentProps: ({ formModel }) => {
return { return {
api: GetSupplierListByCode, api: GetSupplierListByCode,
params: { code: 'isShipAgency' }, params: { code: 'shipagency' },
labelField: 'pinYinCode', labelField: 'pinYinCode',
showName: 'description', showName: 'description',
valueField: 'shortName', valueField: 'shortName',

2
src/views/operation/seaexport/detail/modules/operationArea.vue
Unescape Escape View File

@ -1683,6 +1683,8 @@
console.log('Cancel') console.log('Cancel')
} }
}) })
} else {
createMessage.success(res.message)
} }
}).catch(() => { }).catch(() => {
cabinLoad.value = false cabinLoad.value = false

4
src/views/operation/seaexport/detail/modules/preOrder.tsx
Unescape Escape View File

@ -9,7 +9,7 @@ import {
GetVoynoSelectList, GetVoynoSelectList,
GetVesselSelectList, GetVesselSelectList,
} from '/@/views/operation/seaexport/api/BookingLedger' } from '/@/views/operation/seaexport/api/BookingLedger'
import { GetClientListByCode, GetCarrierSelectList } from '/@/api/common' import { GetClientListByCode, GetCarrierSelectList, GetSupplierListByCode } from '/@/api/common'
import { pl } from 'element-plus/es/locales.mjs' import { pl } from 'element-plus/es/locales.mjs'
let countryList = [] let countryList = []
// 基础信息表单 // 基础信息表单
@ -616,7 +616,7 @@ export const yardSchema: FormSchema[] = [
colProps: { span: 12 }, colProps: { span: 12 },
componentProps: ({ formModel }) => { componentProps: ({ formModel }) => {
return { return {
api: GetClientListByCode, api: GetSupplierListByCode,
params: { code: 'yard' }, params: { code: 'yard' },
labelField: 'pinYinCode', labelField: 'pinYinCode',
placeholder: '场站', placeholder: '场站',

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

@ -18,7 +18,7 @@
<span v-else-if="record.businessStatusName == '已放舱'" class="YFC">{{ record.businessStatusName }}</span> <span v-else-if="record.businessStatusName == '已放舱'" class="YFC">{{ record.businessStatusName }}</span>
<span v-else-if="record.businessStatusName == '已收到BC'" class="YSDBC">{{ record.businessStatusName }}</span> <span v-else-if="record.businessStatusName == '已收到BC'" class="YSDBC">{{ record.businessStatusName }}</span>
<span v-else-if="record.businessStatusName == '已订舱'" class="YDC">{{ record.businessStatusName }}</span> <span v-else-if="record.businessStatusName == '已订舱'" class="YDC">{{ record.businessStatusName }}</span>
<span v-else>{{ record.businessStatusName }}</span> <span v-else class="WTJ">{{ record.businessStatusName || '未提交' }}</span>
</template> </template>
<!-- 委托编号 --> <!-- 委托编号 -->
<template v-if="column.dataIndex == 'customerNo'"> <template v-if="column.dataIndex == 'customerNo'">
@ -722,6 +722,11 @@ onMounted(() => {
background: #F2FAE8; background: #F2FAE8;
} }
.WTJ {
color: #8C8C8C;
background: #F0F0F0;
}
.YSDAN { .YSDAN {
color: #007D75; color: #007D75;
background: #EDFAED; background: #EDFAED;

Write Preview
Loading…
Cancel
Save