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

箱管调整

Browse Source
szh-new
张同海 3 months ago
parent c5634f06a1
commit dae022822e
12 changed files with 141 additions and 99 deletions
Show Stats Download Patch File Download Diff File

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

@ -2,7 +2,7 @@
<BasicModal
v-bind="$attrs"
:use-wrapper="true"
title="箱状态批量维护"
title="箱基本信息维护"
width="30%"
:height="600"
@register="registerModal"

27
src/views/ContainerManagement/BaseInfo/columns.tsx
Unescape Escape View File

@ -53,29 +53,28 @@ export const searchFormSchema: FormSchema[] = [
colProps: { span: 4 },
},
{
field: 'ctnOwner',
label: '箱主',
field: 'ctnCode',
label: '箱型',
component: 'ApiSelect',
required: false,
dynamicDisabled: false,
colProps: { span: 4 },
componentProps: ({ formModel }) => {
return {
allowClear: true,
showSearch: true,
api: GetClientListByCode,
params: { code: 'leasing' },
labelField: 'pinYinCode',
showName: 'shortName',
valueField: 'shortName',
api: GetCtnSelectList,
labelField: 'ctnName',
valueField: 'ediCode',
resultField: 'data',
immediate: false,
filterOption: (input: string, option: any) => {
return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
onChange: (v, obj) => {
formModel.ctnall = obj.label
},
}
},
},
{
field: 'ctnWeight',
label: '箱皮重',
component: 'InputNumber',
colProps: { span: 4 },
},
]
export const formSchema: FormSchema[] = [
{

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

@ -303,8 +303,9 @@ export const searchFormSchema: FormSchema[] = [
colProps: { span: 4 },
defaultValue: '',
componentProps: {
showTime: true,
showTime: false,
style: 'width:100%',
valueFormat: 'YYYY-MM-DD 00:00:00',
},
},
{
@ -314,8 +315,9 @@ export const searchFormSchema: FormSchema[] = [
colProps: { span: 4 },
defaultValue: '',
componentProps: {
showTime: true,
showTime: false,
style: 'width:100%',
valueFormat: 'YYYY-MM-DD 00:00:00',
},
},
]
@ -697,8 +699,9 @@ export const formSchema: FormSchema[] = [
colProps: { span: 6 },
defaultValue: '',
componentProps: {
showTime: true,
showTime: false,
style: 'width:100%',
valueFormat: 'YYYY-MM-DD 00:00:00',
},
},
{
@ -708,8 +711,9 @@ export const formSchema: FormSchema[] = [
colProps: { span: 6 },
defaultValue: '',
componentProps: {
showTime: true,
showTime: false,
style: 'width:100%',
valueFormat: 'YYYY-MM-DD 00:00:00',
},
},
{
@ -720,8 +724,9 @@ export const formSchema: FormSchema[] = [
colProps: { span: 6 },
defaultValue: '',
componentProps: {
showTime: true,
showTime: false,
style: 'width:100%',
valueFormat: 'YYYY-MM-DD 00:00:00',
},
},
{
@ -747,7 +752,7 @@ export const InfoColumns: BasicColumn[] = [
},
{
title: '箱来源',
dataIndex: 'ctnSourceId',
dataIndex: 'ctnSource',
sorter: true,
width: 150,
},

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

@ -34,6 +34,7 @@
import { useModal } from '/@/components/Modal'
import TenantAuditStepModal from './TenantAuditStepModal.vue'
import { columns, searchFormSchema } from './columns'
import { formatParams } from '/@/hooks/web/common'
import { useMessage } from '/@/hooks/web/useMessage'
const { notification } = useMessage()
const refInfoModal = ref()
@ -49,36 +50,39 @@
})
},
beforeFetch: (p) => {
var data = getForm().getFieldsValue()
const postParam: API.PageRequest = {
queryCondition: '',
pageCondition: {
pageIndex: p.page,
pageSize: p.pageSize,
sortConditions: [],
},
}
if (p.field) {
postParam.pageCondition.sortConditions = [
{
sortField: p.field,
listSortDirection: p.order == 'ascend' ? 0 : 1,
},
]
} else {
postParam.pageCondition.sortConditions = []
}
let condition: API.ConditionItem[] = []
if (!!data.CtnName) {
condition.push({
FieldName: 'CtnName',
FieldValue: data.CtnName,
ConditionalType: 1,
})
}
postParam.queryCondition = JSON.stringify(condition)
return postParam
return formatParams(p)
},
// beforeFetch: (p) => {
// var data = getForm().getFieldsValue()
// const postParam: API.PageRequest = {
// queryCondition: '',
// pageCondition: {
// pageIndex: p.page,
// pageSize: p.pageSize,
// sortConditions: [],
// },
// }
// if (p.field) {
// postParam.pageCondition.sortConditions = [
// {
// sortField: p.field,
// listSortDirection: p.order == 'ascend' ? 0 : 1,
// },
// ]
// } else {
// postParam.pageCondition.sortConditions = []
// }
// let condition: API.ConditionItem[] = []
// if (!!data.CtnName) {
// condition.push({
// FieldName: 'CtnName',
// FieldValue: data.CtnName,
// ConditionalType: 1,
// })
// }
// postParam.queryCondition = JSON.stringify(condition)
// return postParam
// },
columns,
formConfig: {
labelWidth: 120,

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

@ -2,7 +2,7 @@
<BasicModal
v-bind="$attrs"
:use-wrapper="true"
title="箱状态批量维护"
title="租箱月结账单维护"
width="55%"
@register="registerModal"
@ok="handleSave"
@ -47,20 +47,14 @@
<!-- <BasicForm class="Form" @register="registerSearchBoxForm" :disabledDate="disabledDate" /> -->
<div class="ButtonBox">
<!-- <a-button size="default" @click="handleReset" :disabled="!rowId"> 重置 </a-button> -->
<a-button
type="primary"
size="default"
class="mt-4"
@click="GetViewListDetail(null)"
:disabled="!rowId"
>
<a-button type="primary" size="default" class="mt-4" @click="GetViewListDetail(null)">
查询
</a-button>
</div>
</div>
<div class="HotTable">
<div>
<a-button type="link" @click="ViewTableAdd" class="pl0" :disabled="!rowId">
<a-button type="link" @click="ViewTableAdd" class="pl0">
<span class="iconfont icon-new_document"></span>
加入账单
</a-button>
@ -292,10 +286,8 @@
queryCondition: JSON.stringify(queryCondition),
pageCondition: { pageIndex: 1, pageSize: 999, sortConditions: [] },
}).then((res) => {
// Viewlist.value.splice(0)
// res.data.forEach((item) => {
// Viewlist.value.push(item)
// })
ViewlallCheck.value = false
ViewlsomeCheck.value = false
Viewlist.value.splice(0)
let Arr = ['feeStartDate', 'dropoffDate', 'billEndDate', 'bsdate']
res.data.forEach((item) => {
@ -533,7 +525,7 @@
{
title: '收付方向',
width: 120,
data: 'ctnReleaseNo',
data: 'feetype',
},
{
title: '币别',
@ -863,31 +855,36 @@
GetViewListDetail(null)
}
function ViewTableAdd() {
let ApiData: any = { id: rowId.value, ids: [] }
Viewlist.value.forEach((e: any, i) => {
if (e.selected) {
ApiData.ids.push(e.id)
}
})
console.log(ApiData.ids)
if (ApiData.ids.length) {
ApiAddCtn(ApiData).then(async (res) => {
if (res.succeeded) {
const res: API.DataResult = await ApiInfo({ id: unref(rowId) })
if (res.succeeded) {
allCheck.value = false
someCheck.value = false
ViewlallCheck.value = false
ViewlsomeCheck.value = false
GetListDetail()
resetSearchBoxFields()
GetViewListDetail(null)
}
// getData(false)
notification.success({ message: res.message, duration: 3 })
async function ViewTableAdd() {
if (rowId.value) {
let ApiData: any = { id: rowId.value, ids: [] }
Viewlist.value.forEach((e: any, i) => {
if (e.selected) {
ApiData.ids.push(e.id)
}
})
console.log(ApiData.ids)
if (ApiData.ids.length) {
ApiAddCtn(ApiData).then(async (res) => {
if (res.succeeded) {
const res: API.DataResult = await ApiInfo({ id: unref(rowId) })
if (res.succeeded) {
allCheck.value = false
someCheck.value = false
ViewlallCheck.value = false
ViewlsomeCheck.value = false
GetListDetail()
resetSearchBoxFields()
GetViewListDetail(null)
}
// getData(false)
notification.success({ message: res.message, duration: 3 })
}
})
}
} else {
await handleSave(false)
ViewTableAdd()
}
}
//--------------------------------------- tab2 ---------------------------------------

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

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

45
src/views/ContainerManagement/RentIn/columns.tsx
Unescape Escape View File

@ -199,27 +199,52 @@ export const searchFormSchema: FormSchema[] = [
},
},
{
field: 'etd',
label: 'ETD',
field: 'bsdate',
label: '业务日期',
component: 'DatePicker',
colProps: { span: 4 },
defaultValue: '',
componentProps: {
showTime: true,
allowClear: true,
valueFormat: 'YYYY-MM-DD 00:00:00',
style: 'width:100%',
},
},
{
field: 'eta',
label: 'ETA',
component: 'DatePicker',
field: 'accdate',
label: '会计期间',
component: 'MonthPicker',
colProps: { span: 4 },
defaultValue: '',
componentProps: {
showTime: true,
style: 'width:100%',
allowClear: true,
valueFormat: 'YYYY-MM',
format: 'YYYY-MM',
},
},
// {
// field: 'etd',
// label: 'ETD',
// component: 'DatePicker',
// colProps: { span: 4 },
// defaultValue: '',
// componentProps: {
// showTime: true,
// style: 'width:100%',
// },
// },
// {
// field: 'eta',
// label: 'ETA',
// component: 'DatePicker',
// colProps: { span: 4 },
// defaultValue: '',
// componentProps: {
// showTime: true,
// style: 'width:100%',
// },
// },
]
export const formSchema: FormSchema[] = [
{
@ -415,6 +440,9 @@ export const formSchema: FormSchema[] = [
checkedChildren: '是',
unCheckedChildren: '否',
},
dynamicDisabled: ({}) => {
return true
},
},
{
field: 'isFeeLocking',
@ -426,6 +454,9 @@ export const formSchema: FormSchema[] = [
checkedChildren: '是',
unCheckedChildren: '否',
},
dynamicDisabled: ({}) => {
return true
},
},
{
field: 'remark',

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

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

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

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

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

@ -421,6 +421,9 @@ export const formSchema: FormSchema[] = [
checkedChildren: '是',
unCheckedChildren: '否',
},
dynamicDisabled: ({}) => {
return true
},
},
{
field: 'isFeeLocking',
@ -432,6 +435,9 @@ export const formSchema: FormSchema[] = [
checkedChildren: '是',
unCheckedChildren: '否',
},
dynamicDisabled: ({}) => {
return true
},
},
{
field: 'remark',

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

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

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

@ -37,7 +37,7 @@ export const columns: BasicColumn[] = [
},
{
title: '变动来源',
dataIndex: 'changeSourceId',
dataIndex: 'changeSource',
sorter: true,
width: 150,
},

Write Preview
Loading…
Cancel
Save