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

Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into dev

Browse Source
zth
lijingjia 1 week ago
parent a02b4d95cf be3e336110
commit 5d6e00acd8
16 changed files with 57 additions and 54 deletions
Show Stats Download Patch File Download Diff File

2
src/views/ContainerManagement/CurrentState/TenantAuditStepModal.vue
Unescape Escape View File

@ -2,7 +2,7 @@
<BasicModal <BasicModal
v-bind="$attrs" v-bind="$attrs"
:use-wrapper="true" :use-wrapper="true"
title="箱状态批量维护" title="箱可用状态批量维护"
width="55%" width="55%"
@register="registerModal" @register="registerModal"
@ok="handleSave" @ok="handleSave"

24
src/views/ContainerManagement/CurrentState/columns.tsx
Unescape Escape View File

@ -32,7 +32,7 @@ export const columns: BasicColumn[] = [
title: '箱型', title: '箱型',
dataIndex: 'ctnall', dataIndex: 'ctnall',
sorter: true, sorter: true,
width: 150, width: 100,
}, },
{ {
title: '序号', title: '序号',
@ -40,13 +40,13 @@ export const columns: BasicColumn[] = [
width: 50, width: 50,
}, },
// { // {
// title: '箱状态', // title: '箱可用状态',
// dataIndex: 'ctnState', // dataIndex: 'ctnState',
// sorter: true, // sorter: true,
// width: 200, // width: 200,
// }, // },
{ {
title: '箱流转状态', title: '箱状态',
dataIndex: 'ctnFlowState', dataIndex: 'ctnFlowState',
sorter: true, sorter: true,
width: 200, width: 200,
@ -76,7 +76,7 @@ export const columns: BasicColumn[] = [
width: 200, width: 200,
}, },
{ {
title: '空重箱', title: '空重',
dataIndex: 'isHeavy', dataIndex: 'isHeavy',
sorter: true, sorter: true,
width: 80, width: 80,
@ -108,7 +108,7 @@ export const columns: BasicColumn[] = [
width: 150, width: 150,
}, },
{ {
title: '码头或场站', title: '场地',
dataIndex: 'depot', dataIndex: 'depot',
sorter: true, sorter: true,
width: 150, width: 150,
@ -159,7 +159,7 @@ export const columns: BasicColumn[] = [
// }, // },
// { // {
// title: '箱状态', // title: '箱可用状态',
// dataIndex: 'ctnState', // dataIndex: 'ctnState',
// sorter: true, // sorter: true,
// width: 200, // width: 200,
@ -649,7 +649,7 @@ export const formSchema: FormSchema[] = [
}, },
{ {
field: 'ctnStateId', field: 'ctnStateId',
label: '箱状态', label: '箱可用状态',
component: 'ApiSelect', component: 'ApiSelect',
colProps: { span: 6 }, colProps: { span: 6 },
defaultValue: '', defaultValue: '',
@ -721,7 +721,7 @@ export const formSchema: FormSchema[] = [
}, },
{ {
field: 'isHeavy', field: 'isHeavy',
label: '空重箱', label: '空重',
component: 'Switch', component: 'Switch',
defaultValue: false, defaultValue: false,
colProps: { span: 6 }, colProps: { span: 6 },
@ -879,7 +879,7 @@ export const formSchema: FormSchema[] = [
}, },
{ {
field: 'depot', field: 'depot',
label: '码头或场站', label: '场地',
component: 'ApiSelect', component: 'ApiSelect',
colProps: { span: 6 }, colProps: { span: 6 },
required: false, required: false,
@ -1071,13 +1071,13 @@ export const InfoColumns: BasicColumn[] = [
width: 150, width: 150,
}, },
{ {
title: '箱状态', title: '箱可用状态',
dataIndex: 'ctnState', dataIndex: 'ctnState',
sorter: true, sorter: true,
width: 150, width: 150,
}, },
{ {
title: '空重箱', title: '空重',
dataIndex: 'isHeavy', dataIndex: 'isHeavy',
sorter: true, sorter: true,
width: 80, width: 80,
@ -1097,7 +1097,7 @@ export const InfoColumns: BasicColumn[] = [
width: 150, width: 150,
}, },
{ {
title: '码头或场站', title: '场地',
dataIndex: 'depot', dataIndex: 'depot',
sorter: true, sorter: true,
width: 150, width: 150,

4
src/views/ContainerManagement/CurrentState/index.vue
Unescape Escape View File

@ -2,10 +2,10 @@
<div> <div>
<BasicTable class="ds-table" @register="registerTable"> <BasicTable class="ds-table" @register="registerTable">
<template #tableTitle> <template #tableTitle>
<a-button type="link" @click="handleCreate"> <!-- <a-button type="link" @click="handleCreate">
<span class="iconfont icon-piliangbianji"></span> <span class="iconfont icon-piliangbianji"></span>
批量维护 批量维护
</a-button> </a-button> -->
</template> </template>
<template #bodyCell="{ column, record }"> <template #bodyCell="{ column, record }">
<template v-if="column.key === 'action'"> <template v-if="column.key === 'action'">

2
src/views/ContainerManagement/CurrentState/infoModal.vue
Unescape Escape View File

@ -2,7 +2,7 @@
<BasicModal <BasicModal
v-bind="$attrs" v-bind="$attrs"
:use-wrapper="true" :use-wrapper="true"
title="箱状态详情" title="箱可用状态详情"
width="55%" width="55%"
@register="registerModal" @register="registerModal"
> >

2
src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue
Unescape Escape View File

@ -865,7 +865,7 @@
data: 'ctnstate', data: 'ctnstate',
}, },
{ {
title: '箱流转状态', title: '箱状态',
width: 120, width: 120,
data: 'ctnflowstate', data: 'ctnflowstate',
}, },

8
src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue
Unescape Escape View File

@ -1424,12 +1424,12 @@
data: 'ctnBizState', data: 'ctnBizState',
}, },
{ {
title: '箱状态', title: '箱可用状态',
width: 120, width: 120,
data: 'ctnState', data: 'ctnState',
}, },
{ {
title: '箱流转状态', title: '箱状态',
width: 120, width: 120,
data: 'ctnFlowState', data: 'ctnFlowState',
}, },
@ -1568,12 +1568,12 @@
data: 'ctnBizState', data: 'ctnBizState',
}, },
{ {
title: '箱状态', title: '箱可用状态',
width: 120, width: 120,
data: 'ctnState', data: 'ctnState',
}, },
{ {
title: '箱流转状态', title: '箱状态',
width: 120, width: 120,
data: 'ctnFlowState', data: 'ctnFlowState',
}, },

4
src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue
Unescape Escape View File

@ -651,7 +651,7 @@
data: 'ctnBizStateId', data: 'ctnBizStateId',
}, },
{ {
title: '箱状态ID', title: '箱可用状态ID',
width: 120, width: 120,
data: 'ctnStateId', data: 'ctnStateId',
}, },
@ -736,7 +736,7 @@
// }, // },
// }, // },
// { // {
// title: '箱状态', // title: '箱可用状态',
// width: 120, // width: 120,
// data: 'ctnState', // data: 'ctnState',
// type: 'dropdown', // type: 'dropdown',

16
src/views/ContainerManagement/StateChange/columns.tsx
Unescape Escape View File

@ -32,7 +32,7 @@ export const columns: BasicColumn[] = [
title: '箱型', title: '箱型',
dataIndex: 'ctnall', dataIndex: 'ctnall',
sorter: true, sorter: true,
width: 150, width: 100,
}, },
{ {
title: '序号', title: '序号',
@ -40,13 +40,13 @@ export const columns: BasicColumn[] = [
width: 50, width: 50,
}, },
// { // {
// title: '箱状态', // title: '箱可用状态',
// dataIndex: 'ctnState', // dataIndex: 'ctnState',
// sorter: true, // sorter: true,
// width: 200, // width: 200,
// }, // },
{ {
title: '箱流转状态', title: '箱状态',
dataIndex: 'ctnFlowState', dataIndex: 'ctnFlowState',
sorter: true, sorter: true,
width: 200, width: 200,
@ -76,7 +76,7 @@ export const columns: BasicColumn[] = [
width: 150, width: 150,
}, },
{ {
title: '空重箱', title: '空重',
dataIndex: 'isHeavy', dataIndex: 'isHeavy',
sorter: true, sorter: true,
width: 80, width: 80,
@ -108,7 +108,7 @@ export const columns: BasicColumn[] = [
width: 150, width: 150,
}, },
{ {
title: '码头或场站', title: '场地',
dataIndex: 'depot', dataIndex: 'depot',
sorter: true, sorter: true,
width: 150, width: 150,
@ -423,7 +423,7 @@ export const formSchema: FormSchema[] = [
}, },
{ {
field: 'ctnStateId', field: 'ctnStateId',
label: '箱状态', label: '箱可用状态',
component: 'ApiSelect', component: 'ApiSelect',
colProps: { span: 6 }, colProps: { span: 6 },
defaultValue: '', defaultValue: '',
@ -454,7 +454,7 @@ export const formSchema: FormSchema[] = [
}, },
{ {
field: 'isHeavy', field: 'isHeavy',
label: '空重箱', label: '空重',
component: 'Switch', component: 'Switch',
defaultValue: false, defaultValue: false,
colProps: { span: 6 }, colProps: { span: 6 },
@ -604,7 +604,7 @@ export const formSchema: FormSchema[] = [
}, },
{ {
field: 'depot', field: 'depot',
label: '码头或场站', label: '场地',
component: 'ApiSelect', component: 'ApiSelect',
colProps: { span: 6 }, colProps: { span: 6 },
required: false, required: false,

4
src/views/ContainerManagement/StateChange/index.vue
Unescape Escape View File

@ -2,10 +2,10 @@
<div> <div>
<BasicTable class="ds-table" @register="registerTable"> <BasicTable class="ds-table" @register="registerTable">
<template #tableTitle> <template #tableTitle>
<a-button type="link" @click="handleCreate"> <!-- <a-button type="link" @click="handleCreate">
<span class="iconfont icon-tianjia"></span> <span class="iconfont icon-tianjia"></span>
批量添加 批量添加
</a-button> </a-button> -->
<a-popconfirm <a-popconfirm
title="确定删除当前选中数据？" title="确定删除当前选中数据？"
ok-text="是" ok-text="是"

8
src/views/ContainerManagement/TemplatImport/TenantAuditStepModal.vue
Unescape Escape View File

@ -434,7 +434,7 @@
data: 'dealRemark', data: 'dealRemark',
}, },
{ {
title: '箱流转状态', title: '箱状态',
width: 120, width: 120,
data: 'ctnFlowState', data: 'ctnFlowState',
}, },
@ -474,7 +474,7 @@
data: 'portDischarge', data: 'portDischarge',
}, },
{ {
title: '场站/码头', title: '场地',
width: 120, width: 120,
data: 'depot', data: 'depot',
}, },
@ -522,12 +522,12 @@
// }, // },
// { // {
// title: '箱状态', // title: '箱可用状态',
// width: 120, // width: 120,
// data: 'ctnState', // data: 'ctnState',
// }, // },
// { // {
// title: '空重箱', // title: '空重',
// width: 120, // width: 120,
// data: 'isHeavy', // data: 'isHeavy',
// }, // },

6
src/views/ContainerManagement/TemplatImport/columns.tsx
Unescape Escape View File

@ -195,13 +195,13 @@ export const InfoColumns: BasicColumn[] = [
width: 150, width: 150,
}, },
{ {
title: '箱状态', title: '箱可用状态',
dataIndex: 'ctnState', dataIndex: 'ctnState',
sorter: true, sorter: true,
width: 150, width: 150,
}, },
{ {
title: '空重箱', title: '空重',
dataIndex: 'isHeavy', dataIndex: 'isHeavy',
sorter: true, sorter: true,
width: 80, width: 80,
@ -221,7 +221,7 @@ export const InfoColumns: BasicColumn[] = [
width: 150, width: 150,
}, },
{ {
title: '码头或场站', title: '场地',
dataIndex: 'depot', dataIndex: 'depot',
sorter: true, sorter: true,
width: 150, width: 150,

4
src/views/ContainerManagement/TemplatImport/index.vue
Unescape Escape View File

@ -145,7 +145,7 @@
data: 'dealRemark', data: 'dealRemark',
}, },
{ {
title: '箱流转状态', title: '箱状态',
width: 120, width: 120,
data: 'ctnFlowState', data: 'ctnFlowState',
}, },
@ -185,7 +185,7 @@
data: 'portDischarge', data: 'portDischarge',
}, },
{ {
title: '场站/码头', title: '场地',
width: 120, width: 120,
data: 'depot', data: 'depot',
}, },

6
src/views/ContainerManagement/dsxxcl/columns.tsx
Unescape Escape View File

@ -58,7 +58,7 @@ export const columns: BasicColumn[] = [
width: 200, width: 200,
}, },
{ {
title: '箱状态', title: '箱可用状态',
dataIndex: 'ctnState', dataIndex: 'ctnState',
sorter: true, sorter: true,
width: 200, width: 200,
@ -76,7 +76,7 @@ export const columns: BasicColumn[] = [
width: 200, width: 200,
}, },
{ {
title: '空重箱', title: '空重',
dataIndex: 'isHeavy', dataIndex: 'isHeavy',
sorter: true, sorter: true,
width: 200, width: 200,
@ -88,7 +88,7 @@ export const columns: BasicColumn[] = [
width: 150, width: 150,
}, },
{ {
title: '码头或场站', title: '场地',
dataIndex: 'depot', dataIndex: 'depot',
sorter: true, sorter: true,
width: 200, width: 200,

2
src/views/ContainerManagement/qbxdtbdrz/TenantAuditStepModal.vue
Unescape Escape View File

@ -2,7 +2,7 @@
<BasicModal <BasicModal
v-bind="$attrs" v-bind="$attrs"
:use-wrapper="true" :use-wrapper="true"
title="箱状态批量维护" title="箱可用状态批量维护"
width="55%" width="55%"
@register="registerModal" @register="registerModal"
@ok="handleSave" @ok="handleSave"

16
src/views/ContainerManagement/qbxdtbdrz/columns.tsx
Unescape Escape View File

@ -72,7 +72,7 @@ export const columns: BasicColumn[] = [
width: 200, width: 200,
}, },
{ {
title: '箱状态', title: '箱可用状态',
dataIndex: 'ctnState', dataIndex: 'ctnState',
sorter: true, sorter: true,
width: 200, width: 200,
@ -85,7 +85,7 @@ export const columns: BasicColumn[] = [
}, },
{ {
title: '码头或场站', title: '场地',
dataIndex: 'depot', dataIndex: 'depot',
sorter: true, sorter: true,
width: 200, width: 200,
@ -325,7 +325,7 @@ export const formSchema: FormSchema[] = [
}, },
{ {
field: 'ctnStateId', field: 'ctnStateId',
label: '箱状态', label: '箱可用状态',
component: 'ApiSelect', component: 'ApiSelect',
colProps: { span: 6 }, colProps: { span: 6 },
defaultValue: '', defaultValue: '',
@ -357,7 +357,7 @@ export const formSchema: FormSchema[] = [
{ {
field: 'isHeavy', field: 'isHeavy',
label: '空重箱', label: '空重',
component: 'Switch', component: 'Switch',
defaultValue: false, defaultValue: false,
colProps: { span: 6 }, colProps: { span: 6 },
@ -396,7 +396,7 @@ export const formSchema: FormSchema[] = [
}, },
{ {
field: 'depot', field: 'depot',
label: '码头或场站', label: '场地',
component: 'ApiSelect', component: 'ApiSelect',
colProps: { span: 6 }, colProps: { span: 6 },
required: false, required: false,
@ -553,13 +553,13 @@ export const InfoColumns: BasicColumn[] = [
width: 150, width: 150,
}, },
{ {
title: '箱状态', title: '箱可用状态',
dataIndex: 'ctnState', dataIndex: 'ctnState',
sorter: true, sorter: true,
width: 150, width: 150,
}, },
{ {
title: '空重箱', title: '空重',
dataIndex: 'isHeavy', dataIndex: 'isHeavy',
sorter: true, sorter: true,
width: 150, width: 150,
@ -571,7 +571,7 @@ export const InfoColumns: BasicColumn[] = [
width: 150, width: 150,
}, },
{ {
title: '码头或场站', title: '场地',
dataIndex: 'depot', dataIndex: 'depot',
sorter: true, sorter: true,
width: 150, width: 150,

3
src/views/operation/seaexport/detail/modules/aiRecognition.vue
Unescape Escape View File

@ -93,6 +93,9 @@ function uploadFile(file) {
formData.append('file', file.file) formData.append('file', file.file)
GetBookingAIResult(formData).then(res => { GetBookingAIResult(formData).then(res => {
if (res.succeeded) { if (res.succeeded) {
res.data.shipperContent = res.data.shipper
res.data.consigneeContent = res.data.consignee
res.data.notifyPartyContent = res.data.notifyParty
res.data.bookingRemark = res.data.remark res.data.bookingRemark = res.data.remark
setFieldsValue(res.data) setFieldsValue(res.data)
list.value = res.data.ctnInfo list.value = res.data.ctnInfo

Write Preview
Loading…
Cancel
Save