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

10/23 部分问题

Browse Source
feature-JimuReport-1106-yjl
张同海 1 month ago
parent 594ff9b94a
commit d9ae6c42a8
18 changed files with 312 additions and 188 deletions
Show Stats Download Patch File Download Diff File

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

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

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

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

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

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

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

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

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

@ -775,9 +775,14 @@
data: 'mblno', data: 'mblno',
}, },
{ {
title: '船名航次', title: '船名',
width: 120, width: 120,
data: 'vesselVoyno', data: 'vessel',
},
{
title: '航次',
width: 120,
data: 'voyno',
}, },
{ {
title: '合同号', title: '合同号',
@ -1082,9 +1087,14 @@
data: 'mblno', data: 'mblno',
}, },
{ {
title: '船名航次', title: '船名',
width: 120,
data: 'vessel',
},
{
title: '航次',
width: 120, width: 120,
data: 'vesselVoyno', data: 'voyno',
}, },
] ]
const settings2 = { const settings2 = {

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

@ -760,9 +760,14 @@
data: 'mblno', data: 'mblno',
}, },
{ {
title: '船名航次', title: '船名',
width: 120, 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', data: 'mblno',
}, },
{ {
title: '船名航次', title: '船名',
width: 120, width: 120,
data: 'vesselVoyno', data: 'vessel',
},
{
title: '航次',
width: 120,
data: 'voyno',
}, },
// { // {

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

@ -810,9 +810,14 @@
data: 'mblno', data: 'mblno',
}, },
{ {
title: '船名航次', title: '船名',
width: 120, width: 120,
data: 'vesselVoyno', data: 'vessel',
},
{
title: '航次',
width: 120,
data: 'voyno',
}, },
] ]
const settings = { const settings = {
@ -1142,9 +1147,14 @@
data: 'mblno', data: 'mblno',
}, },
{ {
title: '船名航次', title: '船名',
width: 120,
data: 'vessel',
},
{
title: '航次',
width: 120, width: 120,
data: 'vesselVoyno', data: 'voyno',
}, },
] ]
const settings2 = { const settings2 = {
@ -1399,9 +1409,14 @@
data: 'mblno', data: 'mblno',
}, },
{ {
title: '船名航次', title: '船名',
width: 120, width: 120,
data: 'vesselVoyno', data: 'vessel',
},
{
title: '航次',
width: 120,
data: 'voyno',
}, },
{ {
title: '状态时间', title: '状态时间',
@ -1587,9 +1602,14 @@
data: 'mblno', data: 'mblno',
}, },
{ {
title: '船名航次', title: '船名',
width: 120,
data: 'vessel',
},
{
title: '航次',
width: 120, width: 120,
data: 'vesselVoyno', data: 'voyno',
}, },
{ {
title: '合同号', title: '合同号',

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

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

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

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

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

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

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

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

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

@ -91,8 +91,14 @@ export const columns: BasicColumn[] = [
width: 200, width: 200,
}, },
{ {
title: '船名航次', title: '船名',
dataIndex: 'vesselVoyno', dataIndex: 'vessel',
sorter: true,
width: 200,
},
{
title: '航次',
dataIndex: 'voyno',
sorter: true, sorter: true,
width: 200, width: 200,
}, },
@ -407,8 +413,14 @@ export const formSchema: FormSchema[] = [
}, },
}, },
{ {
field: 'vesselVoyno', field: 'vessel',
label: '船名航次', label: '船名',
component: 'Input',
colProps: { span: 6 },
},
{
field: 'Voyno',
label: '航次',
component: 'Input', component: 'Input',
colProps: { span: 6 }, 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[] = [ export const columns: BasicColumn[] = [
{ {
title: '干系人姓名', title: '干系人姓名',
dataIndex: 'createByName', dataIndex: 'userName',
sorter: true, sorter: true,
width: 150, width: 150,
}, },
@ -105,7 +105,7 @@ export const columns: BasicColumn[] = [
export const searchFormSchema: FormSchema[] = [ export const searchFormSchema: FormSchema[] = [
{ {
field: 'createByName', field: 'userName',
label: '干系人姓名', label: '干系人姓名',
component: 'Input', component: 'Input',
colProps: { span: 4 }, 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', Audit = '/mainApi/ClientStakeholder/Audit',
Get = '/mainApi/ClientStakeholder/Get', Get = '/mainApi/ClientStakeholder/Get',
edit = '/mainApi/ClientStakeholder/Edit', edit = '/mainApi/ClientStakeholder/Edit',
Del = '/mainApi/ClientStakeholder/Delete',
} }
// 列表 (Auth) // 列表 (Auth)
@ -40,3 +41,11 @@ export function ApiEdit(data) {
data, data,
}) })
} }
// 删除干系人 (Auth)
export function ApiDel(data) {
return request<DataResult>({
url: Api.Del,
method: 'post',
data,
})
}

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

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

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

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

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

@ -645,27 +645,12 @@ export const formSchema: FormSchema[] = [
label: '注册资金', label: '注册资金',
component: 'InputNumber', component: 'InputNumber',
colProps: { span: 4 }, colProps: { span: 4 },
componentProps: () => {
return {
min: '0',
step: '0.01',
stringMode: true,
}
},
}, },
{ {
field: 'registrationTime', field: 'registrationTime',
label: '注册时间', label: '注册时间',
component: 'DatePicker', component: 'DatePicker',
colProps: { span: 4 }, 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', field: 'Divider1',
@ -680,14 +665,12 @@ export const formSchema: FormSchema[] = [
field: 'chief', field: 'chief',
label: '法人', label: '法人',
component: 'Input', component: 'Input',
colProps: { span: 4 }, colProps: { span: 4 },
}, },
{ {
field: 'tel', field: 'tel',
label: '电话', label: '电话',
component: 'Input', component: 'Input',
colProps: { span: 4 }, colProps: { span: 4 },
}, },
{ {
@ -700,7 +683,6 @@ export const formSchema: FormSchema[] = [
field: 'web', field: 'web',
label: '网址', label: '网址',
component: 'Input', component: 'Input',
colProps: { span: 4 }, colProps: { span: 4 },
}, },
{ {

Write Preview
Loading…
Cancel
Save