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
feature-JimuReport-1106-yjl
lijingjia 1 month ago
parent 5929bdaf8b 9199658fa5
commit c31c069381
23 changed files with 1880 additions and 1865 deletions
Show Stats Download Patch File Download Diff File

6
src/components/Print/printModal.vue
Unescape Escape View File

@ -1,8 +1,8 @@
<template>
<div>
<a-modal :footer="false" v-model:visible="visible" title="打印" width="1050px" :maskClosable="false">
<a-modal :footer="false" v-model:visible="visible" title="" width="1050px" :maskClosable="false">
<div style="padding-bottom: 20px">
<div style="margin-bottom: 15px;margin-top: 10px">
<div style="margin-bottom: 15px;">
<a-button type="primary" size="small" @click="print">打印</a-button>
<a-button type="primary" size="small" @click="downLoad" style="margin: 0 10px">下载</a-button>
<a-button type="primary" size="small" @click="openMail" >发送邮件</a-button>
@ -23,7 +23,7 @@
<a-button type="primary" size="small">分享</a-button>
</a-popover>
</div>
<iframe id="PrintPath" :src="fileURL" width="100%" height="600px"></iframe>
<iframe frameborder="0" id="PrintPath" :src="fileURL + '#scrollbars=0&toolbar=0&statusbar=0'" width="100%" height="600px"></iframe>
</div>
</a-modal>
<EmailModal :bookingData="bookingData" ref="EmailModalRef" ></EmailModal>

9
src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue
Unescape Escape View File

@ -658,9 +658,14 @@
data: 'mblno',
},
{
title: '船名航次',
title: '船名',
width: 120,
data: 'vesselVoyno',
data: 'vessel',
},
{
title: '航次',
width: 120,
data: 'voyno',
},
]
const settings = {

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

@ -30,14 +30,20 @@ export const columns: BasicColumn[] = [
sorter: true,
width: 150,
},
// {
// title: '序号',
// dataIndex: 'index',
// width: 50,
// },
{
title: '当前箱业务状态',
dataIndex: 'ctnBizState',
title: '序号',
dataIndex: 'index',
width: 50,
},
{
title: '箱状态',
dataIndex: 'ctnState',
sorter: true,
width: 200,
},
{
title: '箱流转状态',
dataIndex: 'ctnFlowState',
sorter: true,
width: 200,
},
@ -48,8 +54,14 @@ export const columns: BasicColumn[] = [
width: 200,
},
{
title: '船名航次',
dataIndex: 'vesselVoyno',
title: '船名',
dataIndex: 'vessel',
sorter: true,
width: 200,
},
{
title: '航次',
dataIndex: 'voyno',
sorter: true,
width: 200,
},
@ -60,7 +72,7 @@ export const columns: BasicColumn[] = [
width: 200,
},
{
title: '状态时间',
title: '发生日期',
dataIndex: 'stateTime',
sorter: true,
width: 200,
@ -115,94 +127,88 @@ export const columns: BasicColumn[] = [
sorter: true,
width: 200,
},
{
title: '新旧箱',
dataIndex: 'usedState',
sorter: true,
width: 200,
},
{
title: '箱主',
dataIndex: 'ctnOwner',
sorter: true,
width: 200,
},
// {
// title: '所属分部',
// dataIndex: 'orgid',
// title: '新旧箱',
// dataIndex: 'usedState',
// sorter: true,
// width: 200,
// },
// {
// title: '箱主',
// dataIndex: 'ctnOwner',
// sorter: true,
// width: 200,
// },
// {
// title: '箱来源',
// dataIndex: 'ctnSource',
// sorter: true,
// width: 200,
// },
{
title: '箱来源',
dataIndex: 'ctnSource',
sorter: true,
width: 200,
},
{
title: '箱业务编号',
dataIndex: 'billno',
sorter: true,
width: 200,
},
// {
// title: '箱业务编号',
// dataIndex: 'billno',
// sorter: true,
// width: 200,
// },
{
title: '箱状态',
dataIndex: 'ctnState',
sorter: true,
width: 200,
},
{
title: '箱损坏',
dataIndex: 'ctnBreakState',
sorter: true,
width: 200,
},
{
title: '是否上线',
dataIndex: 'isOnline',
sorter: true,
width: 200,
},
// {
// title: '箱状态',
// dataIndex: 'ctnState',
// sorter: true,
// width: 200,
// },
// {
// title: '箱损坏',
// dataIndex: 'ctnBreakState',
// sorter: true,
// width: 200,
// },
// {
// title: '是否上线',
// dataIndex: 'isOnline',
// sorter: true,
// width: 200,
// },
{
title: '当前港口',
dataIndex: 'port',
sorter: true,
width: 150,
},
// {
// title: '当前港口',
// dataIndex: 'port',
// sorter: true,
// width: 150,
// },
{
title: '业务委托单位',
dataIndex: 'customerName',
sorter: true,
width: 200,
},
{
title: 'ETD',
dataIndex: 'etd',
sorter: true,
width: 200,
},
{
title: 'ETA',
dataIndex: 'eta',
sorter: true,
width: 200,
},
{
title: '生产日期',
dataIndex: 'productionDate',
sorter: true,
width: 200,
},
{
title: '箱初期成本',
dataIndex: 'ctnValue_Base',
sorter: true,
width: 200,
},
// {
// title: '业务委托单位',
// dataIndex: 'customerName',
// sorter: true,
// width: 200,
// },
// {
// title: 'ETD',
// dataIndex: 'etd',
// sorter: true,
// width: 200,
// },
// {
// title: 'ETA',
// dataIndex: 'eta',
// sorter: true,
// width: 200,
// },
// {
// title: '生产日期',
// dataIndex: 'productionDate',
// sorter: true,
// width: 200,
// },
// {
// title: '箱初期成本',
// dataIndex: 'ctnValue_Base',
// sorter: true,
// width: 200,
// },
]
export const searchFormSchema: FormSchema[] = [
@ -277,8 +283,14 @@ export const searchFormSchema: FormSchema[] = [
},
},
{
field: 'vesselVoyno',
label: '船名航次',
field: 'vessel',
label: '船名',
component: 'Input',
colProps: { span: 4 },
},
{
field: 'Voyno',
label: '航次',
component: 'Input',
colProps: { span: 4 },
},
@ -849,8 +861,14 @@ export const formSchema: FormSchema[] = [
},
},
{
field: 'vesselVoyno',
label: '船名航次',
field: 'vessel',
label: '船名',
component: 'Input',
colProps: { span: 6 },
},
{
field: 'Voyno',
label: '航次',
component: 'Input',
colProps: { span: 6 },
},

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

@ -46,6 +46,9 @@
title: '集装箱信息列表',
api: async (p) => {
const res: API.DataResult = await ApiList(p)
res.data.forEach((item, index) => {
item.index = index + 1
})
return new Promise((resolve) => {
resolve({ data: [...res.data], total: res.count })
})

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

@ -902,9 +902,14 @@
data: 'mblno',
},
{
title: '船名航次',
title: '船名',
width: 120,
data: 'vesselVoyno',
data: 'vessel',
},
{
title: '航次',
width: 120,
data: 'voyno',
},
]
const Viewsettings = {

24
src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue
Unescape Escape View File

@ -3,7 +3,7 @@
v-bind="$attrs"
:use-wrapper="true"
title="租箱租入维护"
width="55%"
width="70%"
@register="registerModal"
@ok="handleSave"
>
@ -164,7 +164,7 @@
>
审核通过
</a-button>
<!-- <a-button
<a-button
pre-icon="ant-design:check-circle-outlined"
type="primary"
:loading="loading"
@ -181,7 +181,7 @@
v-if="!TotTableType"
>
取消执行
</a-button> -->
</a-button>
<a-button
pre-icon="ant-design:file-excel-outlined"
type="primary"
@ -775,9 +775,14 @@
data: 'mblno',
},
{
title: '船名航次',
title: '船名',
width: 120,
data: 'vessel',
},
{
title: '航次',
width: 120,
data: 'vesselVoyno',
data: 'voyno',
},
{
title: '合同号',
@ -1082,9 +1087,14 @@
data: 'mblno',
},
{
title: '船名航次',
title: '船名',
width: 120,
data: 'vessel',
},
{
title: '航次',
width: 120,
data: 'vesselVoyno',
data: 'voyno',
},
]
const settings2 = {

9
src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue
Unescape Escape View File

@ -760,9 +760,14 @@
data: 'mblno',
},
{
title: '船名航次',
title: '船名',
width: 120,
data: 'vesselVoyno',
data: 'vessel',
},
{
title: '航次',
width: 120,
data: 'voyno',
},
// {

9
src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue
Unescape Escape View File

@ -711,9 +711,14 @@
data: 'mblno',
},
{
title: '船名航次',
title: '船名',
width: 120,
data: 'vesselVoyno',
data: 'vessel',
},
{
title: '航次',
width: 120,
data: 'voyno',
},
// {

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

@ -3,7 +3,7 @@
v-bind="$attrs"
:use-wrapper="true"
title="租箱租出维护"
width="55%"
width="70%"
@register="registerModal"
@ok="handleSave"
>
@ -162,7 +162,7 @@
>
审核通过
</a-button>
<!-- <a-button
<a-button
pre-icon="ant-design:check-circle-outlined"
type="primary"
:loading="loading"
@ -177,7 +177,7 @@
@click="Cancel()"
>
取消执行
</a-button> -->
</a-button>
<a-button
pre-icon="ant-design:file-excel-outlined"
type="primary"
@ -810,9 +810,14 @@
data: 'mblno',
},
{
title: '船名航次',
title: '船名',
width: 120,
data: 'vessel',
},
{
title: '航次',
width: 120,
data: 'vesselVoyno',
data: 'voyno',
},
]
const settings = {
@ -1142,9 +1147,14 @@
data: 'mblno',
},
{
title: '船名航次',
title: '船名',
width: 120,
data: 'vesselVoyno',
data: 'vessel',
},
{
title: '航次',
width: 120,
data: 'voyno',
},
]
const settings2 = {
@ -1399,9 +1409,14 @@
data: 'mblno',
},
{
title: '船名航次',
title: '船名',
width: 120,
data: 'vessel',
},
{
title: '航次',
width: 120,
data: 'vesselVoyno',
data: 'voyno',
},
{
title: '状态时间',
@ -1587,9 +1602,14 @@
data: 'mblno',
},
{
title: '船名航次',
title: '船名',
width: 120,
data: 'vessel',
},
{
title: '航次',
width: 120,
data: 'vesselVoyno',
data: 'voyno',
},
{
title: '合同号',

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

@ -29,14 +29,20 @@ export const columns: BasicColumn[] = [
sorter: true,
width: 150,
},
// {
// title: '序号',
// dataIndex: 'index',
// width: 50,
// },
{
title: '箱业务状态',
dataIndex: 'ctnBizState',
title: '序号',
dataIndex: 'index',
width: 50,
},
{
title: '箱状态',
dataIndex: 'ctnState',
sorter: true,
width: 200,
},
{
title: '箱流转状态',
dataIndex: 'ctnFlowState',
sorter: true,
width: 200,
},
@ -47,8 +53,14 @@ export const columns: BasicColumn[] = [
width: 150,
},
{
title: '船名航次',
dataIndex: 'vesselVoyno',
title: '船名',
dataIndex: 'vessel',
sorter: true,
width: 200,
},
{
title: '航次',
dataIndex: 'voyno',
sorter: true,
width: 200,
},
@ -60,7 +72,7 @@ export const columns: BasicColumn[] = [
width: 200,
},
{
title: 'DATE',
title: '发生日期',
dataIndex: 'changeTime',
sorter: true,
width: 150,
@ -110,38 +122,44 @@ export const columns: BasicColumn[] = [
width: 150,
},
{
title: '当前港口',
dataIndex: 'port',
sorter: true,
width: 150,
},
{
title: '变动来源',
dataIndex: 'changeSource',
sorter: true,
width: 150,
},
{
title: '状态变动',
dataIndex: 'ctnFlowState',
title: '备注',
dataIndex: 'remark',
sorter: true,
width: 200,
},
// {
// title: '当前港口',
// dataIndex: 'port',
// sorter: true,
// width: 150,
// },
{
title: '新旧箱',
dataIndex: 'usedState',
sorter: true,
width: 200,
},
// {
// title: '变动来源',
// dataIndex: 'changeSource',
// sorter: true,
// width: 150,
// },
// {
// title: '状态变动',
// dataIndex: 'ctnFlowState',
// sorter: true,
// width: 200,
// },
{
title: '箱状态',
dataIndex: 'ctnState',
sorter: true,
width: 200,
},
// {
// title: '新旧箱',
// dataIndex: 'usedState',
// sorter: true,
// width: 200,
// },
// {
// title: '箱状态',
// dataIndex: 'ctnState',
// sorter: true,
// width: 200,
// },
]
export const searchFormSchema: FormSchema[] = [
@ -627,8 +645,14 @@ export const formSchema: FormSchema[] = [
},
},
{
field: 'vesselVoyno',
label: '船名航次',
field: 'vessel',
label: '船名',
component: 'Input',
colProps: { span: 6 },
},
{
field: 'Voyno',
label: '航次',
component: 'Input',
colProps: { span: 6 },
},

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

@ -41,6 +41,9 @@
notification.warning({ message: '请输入查询条件！', duration: 3 })
} else {
const res: API.DataResult = await ApiChangeList(p)
res.data.forEach((item, index) => {
item.index = index + 1
})
return new Promise((resolve) => {
resolve({ data: [...res.data], total: res.count })
})

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

@ -369,6 +369,11 @@
width: 200,
data: 'dealRemark',
},
{
title: '箱流转状态',
width: 120,
data: 'ctnFlowState',
},
{
title: '当前箱业务状态',
width: 120,
@ -405,9 +410,14 @@
data: 'depot',
},
{
title: '船名航次',
title: '船名',
width: 120,
data: 'vessel',
},
{
title: '航次',
width: 120,
data: 'vesselVoyno',
data: 'voyno',
},
{
title: '业务编号',

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

@ -94,8 +94,14 @@ export const columns: BasicColumn[] = [
width: 200,
},
{
title: '船名航次',
dataIndex: 'vesselVoyno',
title: '船名',
dataIndex: 'vessel',
sorter: true,
width: 200,
},
{
title: '航次',
dataIndex: 'voyno',
sorter: true,
width: 200,
},

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

@ -91,8 +91,14 @@ export const columns: BasicColumn[] = [
width: 200,
},
{
title: '船名航次',
dataIndex: 'vesselVoyno',
title: '船名',
dataIndex: 'vessel',
sorter: true,
width: 200,
},
{
title: '航次',
dataIndex: 'voyno',
sorter: true,
width: 200,
},
@ -407,8 +413,14 @@ export const formSchema: FormSchema[] = [
},
},
{
field: 'vesselVoyno',
label: '船名航次',
field: 'vessel',
label: '船名',
component: 'Input',
colProps: { span: 6 },
},
{
field: 'Voyno',
label: '航次',
component: 'Input',
colProps: { span: 6 },
},

4
src/views/baseinfo/ClientStakeholder/columns.tsx
Unescape Escape View File

@ -79,7 +79,7 @@ if (res.succeeded) {
export const columns: BasicColumn[] = [
{
title: '干系人姓名',
dataIndex: 'createByName',
dataIndex: 'userName',
sorter: true,
width: 150,
},
@ -105,7 +105,7 @@ export const columns: BasicColumn[] = [
export const searchFormSchema: FormSchema[] = [
{
field: 'createByName',
field: 'userName',
label: '干系人姓名',
component: 'Input',
colProps: { span: 4 },

9
src/views/baseinfo/infoclient/ClientStakeholder/api.ts
Unescape Escape View File

@ -6,6 +6,7 @@ enum Api {
Audit = '/mainApi/ClientStakeholder/Audit',
Get = '/mainApi/ClientStakeholder/Get',
edit = '/mainApi/ClientStakeholder/Edit',
Del = '/mainApi/ClientStakeholder/Delete',
}
// 列表 (Auth)
@ -40,3 +41,11 @@ export function ApiEdit(data) {
data,
})
}
// 删除干系人 (Auth)
export function ApiDel(data) {
return request<DataResult>({
url: Api.Del,
method: 'post',
data,
})
}

28
src/views/baseinfo/infoclient/ClientStakeholder/columns.tsx
Unescape Escape View File

@ -4,7 +4,7 @@ import { GetUserList } from '/@/api/common'
export const columns: BasicColumn[] = [
{
title: '干系人姓名',
dataIndex: 'createByName',
dataIndex: 'userName',
sorter: true,
width: 150,
},
@ -20,6 +20,18 @@ export const columns: BasicColumn[] = [
sorter: true,
width: 150,
},
{
title: '创建人',
dataIndex: 'createByName',
sorter: true,
width: 150,
},
{
title: '创建时间',
dataIndex: 'createTime',
sorter: true,
width: 150,
},
{
title: '备注',
dataIndex: 'remark',
@ -30,7 +42,7 @@ export const columns: BasicColumn[] = [
export const searchFormSchema: FormSchema[] = [
{
field: 'createByName',
field: 'userName',
label: '干系人姓名',
component: 'Input',
colProps: { span: 4 },
@ -59,13 +71,13 @@ export const formSchema: FormSchema[] = [
},
{
label: '干系人Name',
field: 'createByName',
field: 'userName',
component: 'Input',
show: false,
},
{
label: '干系人',
field: 'createBy',
field: 'userId',
component: 'ApiSelect',
required: false,
defaultValue: null,
@ -81,12 +93,12 @@ export const formSchema: FormSchema[] = [
onChange: (e, obj) => {
if (e && obj) {
console.log(e, obj)
formModel.createBy = obj.value
formModel.createByName = obj.label
formModel.userId = obj.value
formModel.userName = obj.label
}
if (!e && !obj) {
formModel.createBy = ''
formModel.createByName = ''
formModel.userId = ''
formModel.userName = ''
}
},
}

14
src/views/baseinfo/infoclient/ClientStakeholder/index.vue
Unescape Escape View File

@ -7,10 +7,10 @@
<span class="iconfont icon-new_document"></span>
添加
</a-button>
<!-- <a-button type="link" @click="handleDel">
<a-button type="link" @click="handleDel">
<span class="iconfont icon-shanchu2"></span>
删除
</a-button> -->
</a-button>
</template>
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'action'">
@ -41,7 +41,7 @@
<script lang="ts" setup>
import { ref } from 'vue'
import { BasicTable, useTable, TableAction } from '/@/components/Table'
import { ApiList, ApiClientStakeholderAudit } from './api'
import { ApiList, ApiClientStakeholderAudit, ApiDel } from './api'
import { columns, searchFormSchema } from './columns'
import { formatParams } from '/@/hooks/web/common'
import { useMessage } from '/@/hooks/web/useMessage'
@ -152,10 +152,10 @@
const removeArr = select.map((item) => {
return item.id
})
// ApiDel({ ids: removeArr }).then((res) => {
// notification.success({ message: res.message, duration: 3 })
// reload()
// })
ApiDel({ ids: removeArr }).then((res) => {
notification.success({ message: res.message, duration: 3 })
reload()
})
}
function handleSuccess() {
reload()

7
src/views/baseinfo/infoclient/EditColumns.tsx
Unescape Escape View File

@ -198,6 +198,9 @@ export const EditformSchema: FormSchema[] = [
colProps: { span: 4 },
componentProps: (e) => {
return {
min: '0',
step: '0.01',
stringMode: true,
onEdit: () => {
const { formActionType } = e
formActionType ? formActionType.linkageForm(e) : null
@ -213,6 +216,10 @@ export const EditformSchema: FormSchema[] = [
colProps: { span: 4 },
componentProps: (e) => {
return {
showTime: true,
allowClear: true,
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
onEdit: () => {
const { formActionType } = e
formActionType ? formActionType.linkageForm(e) : null

1
src/views/baseinfo/infoclient/TenantAuditStepModal.vue
Unescape Escape View File

@ -520,7 +520,6 @@
}
}
function ChangeCustomerOrSupplier() {
// setFieldsValue({ ArrclientTag: [] })
ChangeArrclientTag(true)
}
watch(activeKey, (nval, oval) => {

20
src/views/baseinfo/infoclient/columns.tsx
Unescape Escape View File

@ -645,27 +645,12 @@ export const formSchema: FormSchema[] = [
label: '注册资金',
component: 'InputNumber',
colProps: { span: 4 },
componentProps: () => {
return {
min: '0',
step: '0.01',
stringMode: true,
}
},
},
{
field: 'registrationTime',
label: '注册时间',
component: 'DatePicker',
colProps: { span: 4 },
componentProps: () => {
return {
showTime: true,
allowClear: true,
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
}
},
},
{
field: 'Divider1',
@ -680,14 +665,12 @@ export const formSchema: FormSchema[] = [
field: 'chief',
label: '法人',
component: 'Input',
colProps: { span: 4 },
},
{
field: 'tel',
label: '电话',
component: 'Input',
colProps: { span: 4 },
},
{
@ -700,7 +683,6 @@ export const formSchema: FormSchema[] = [
field: 'web',
label: '网址',
component: 'Input',
colProps: { span: 4 },
},
{
@ -1261,7 +1243,7 @@ export const formSchema: FormSchema[] = [
field: 'ArrclientTag',
component: 'ApiSelect',
colProps: { span: 12 },
defaultValue: 'isController',
defaultValue: ['isController'],
componentProps: ({ formModel }) => {
return {
api: () => {

27
src/views/operation/seaexport/detail/components/ladingInfo.tsx
Unescape Escape View File

@ -1335,6 +1335,16 @@ export const storageColumns: BasicColumn[] = [
dataIndex: 'bookingParty',
width: 210,
},
{
title: 'ETD',
dataIndex: 'etd',
width: 100,
},
{
title: '船司参考号',
width: 100,
dataIndex: 'carrierReferNo',
},
{
title: '订舱方式',
dataIndex: 'bookingSlotTypeName',
@ -1404,4 +1414,21 @@ export const storageSearchFormSchema: FormSchema[] = [
component: 'Input',
colProps: { span: 4 },
},
{
field: 'etd',
label: 'ETD',
component: 'RangePicker',
required: false,
dynamicDisabled: false,
colProps: { span: 4 },
componentProps: {
allowClear: true,
}
},
{
field: 'carrierReferNo',
label: '船司参考号',
component: 'Input',
colProps: { span: 4 },
},
]

713
src/views/taskmanage/index.vue
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save