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

合并冲突

Browse Source
szh-new
sunzehua 3 months ago
parent 7aee014790 30686e235b
commit 2a15941595
14 changed files with 555 additions and 358 deletions
Show Stats Download Patch File Download Diff File

105
src/views/ContainerManagement/BuyCtn/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"
@ -292,57 +292,57 @@
}) })
}) })
} }
// function MakeFee() { function MakeFee() {
// ApiMakeFee({ id: rowId.value }).then((res) => { ApiMakeFee({ id: rowId.value }).then((res) => {
// notification.success({ message: res.message, duration: 3 }) notification.success({ message: res.message, duration: 3 })
// }) })
// } }
// function Confirm() { function Confirm() {
// let type: boolean = true let type: boolean = true
// let ApiData: any = { let ApiData: any = {
// id: rowId.value, id: rowId.value,
// ids: [], ids: [],
// } }
// list.value.forEach((e: any, i) => { list.value.forEach((e: any, i) => {
// if (e.selected) { if (e.selected) {
// if (e.id) { if (e.id) {
// ApiData.ids.push(e.id) ApiData.ids.push(e.id)
// } else { } else {
// type = false type = false
// } }
// } }
// }) })
// if (type) { if (type) {
// ApiConfirm(ApiData).then((res) => { ApiConfirm(ApiData).then((res) => {
// notification.success({ message: res.message, duration: 3 }) notification.success({ message: res.message, duration: 3 })
// }) })
// } else { } else {
// notification.success({ message: '请先保存明细表', duration: 3 }) notification.success({ message: '请先保存明细表', duration: 3 })
// } }
// } }
// function Cancel() { function Cancel() {
// let type: boolean = true let type: boolean = true
// let ApiData: any = { let ApiData: any = {
// id: rowId.value, id: rowId.value,
// ids: [], ids: [],
// } }
// list.value.forEach((e: any, i) => { list.value.forEach((e: any, i) => {
// if (e.selected) { if (e.selected) {
// if (e.id) { if (e.id) {
// ApiData.ids.push(e.id) ApiData.ids.push(e.id)
// } else { } else {
// type = false type = false
// } }
// } }
// }) })
// if (type) { if (type) {
// ApiCancel(ApiData).then((res) => { ApiCancel(ApiData).then((res) => {
// notification.success({ message: res.message, duration: 3 }) notification.success({ message: res.message, duration: 3 })
// }) })
// } else { } else {
// notification.success({ message: '请先保存明细表', duration: 3 }) notification.success({ message: '请先保存明细表', duration: 3 })
// } }
// } }
async function handleSave(exit) { async function handleSave(exit) {
try { try {
const values = await validate() const values = await validate()
@ -391,6 +391,7 @@
await setFieldsValue({ await setFieldsValue({
...res.data, ...res.data,
}) })
GetListDetail()
} }
} }
const activeKey = ref('1') const activeKey = ref('1')

9
src/views/ContainerManagement/BuyCtn/columns.tsx
Unescape Escape View File

@ -64,6 +64,12 @@ export const columns: BasicColumn[] = [
sorter: true, sorter: true,
width: 150, width: 150,
}, },
{
title: '箱型箱量',
dataIndex: 'ctntotal',
sorter: true,
width: 200,
},
{ {
title: '已提箱', title: '已提箱',
dataIndex: 'pickupCtntotal', dataIndex: 'pickupCtntotal',
@ -271,6 +277,9 @@ export const formSchema: FormSchema[] = [
label: '箱型箱量', label: '箱型箱量',
component: 'Input', component: 'Input',
colProps: { span: 6 }, colProps: { span: 6 },
dynamicDisabled: ({}) => {
return true
},
}, },
{ {
field: 'accdate', field: 'accdate',

59
src/views/ContainerManagement/CtnScrap/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"
@ -391,6 +391,7 @@
await setFieldsValue({ await setFieldsValue({
...res.data, ...res.data,
}) })
GetListDetail()
} }
} }
const activeKey = ref('1') const activeKey = ref('1')
@ -408,6 +409,7 @@
// 港口字段 // 港口字段
const PortDict = ref([]) const PortDict = ref([])
const CtnFlowStateDict = ref([]) const CtnFlowStateDict = ref([])
const ctnsourceDict = ref([])
// // 币别字段 // // 币别字段
// const currencyDict = ref([]) // const currencyDict = ref([])
watchEffect(() => { watchEffect(() => {
@ -492,6 +494,11 @@
width: 120, width: 120,
data: 'CtnFlowStateId', data: 'CtnFlowStateId',
}, },
{
title: '箱来源ID',
width: 120,
data: 'ctnSourceId',
},
// ----------------- // -----------------
// { // {
// title: '租箱业务号', // title: '租箱业务号',
@ -521,9 +528,21 @@
}, },
}, },
{ {
title: '箱来源？？', title: '箱来源',
width: 120, width: 120,
data: 'ctnSourceId', data: 'ctnsource',
type: 'dropdown',
// 下拉框数据，可以同步或者异步返回(异步需要process返回)
source: async (query, process) => {
const res = ctnsourceDict.value.length
? ctnsourceDict.value
: await getDictOption('CM_CtnSource')
if (!ctnsourceDict.value.length) ctnsourceDict.value = res
const dict = res.map((res) => {
return res.label
})
process(dict)
},
}, },
{ {
title: '放箱单号', title: '放箱单号',
@ -533,14 +552,14 @@
{ {
title: '报废日期', title: '报废日期',
width: 120, width: 120,
data: 'bsdate', data: 'pickupDate',
type: 'date', type: 'date',
dateFormat: 'YYYY-MM-DD', dateFormat: 'YYYY-MM-DD',
}, },
{ {
title: '当前状态??', title: '当前状态',
width: 120, width: 120,
data: 'CtnFlowState', data: 'ctnFlowState',
type: 'dropdown', type: 'dropdown',
// 下拉框数据，可以同步或者异步返回(异步需要process返回) // 下拉框数据，可以同步或者异步返回(异步需要process返回)
source: async (query, process) => { source: async (query, process) => {
@ -624,7 +643,7 @@
fixedColumnsLeft: 1, fixedColumnsLeft: 1,
// 需要隐藏的列 // 需要隐藏的列
hiddenColumns: { hiddenColumns: {
columns: [1, 2, 3, 4, 5, 6], columns: [1, 2, 3, 4, 5, 6, 7],
indicators: true, indicators: true,
}, },
// 控制回车移动 // 控制回车移动
@ -669,6 +688,30 @@
list.value[changes[0][0]]['pickupPortCode'] = dict?.ediCode list.value[changes[0][0]]['pickupPortCode'] = dict?.ediCode
} }
} }
if (changes[0][1] === 'ctnsource') {
const res = ctnsourceDict.value.length
? ctnsourceDict.value
: await getDictOption('CM_CtnSource')
if (!ctnsourceDict.value.length) ctnsourceDict.value = res
const item = res.filter((item) => {
return item.label === changes[0][3]
})
if (item) dict = item[0]
list.value[changes[0][0]]['ctnsource'] = dict?.label
list.value[changes[0][0]]['ctnSourceId'] = dict?.value
}
if (changes[0][1] === 'ctnFlowState') {
const res = CtnFlowStateDict.value.length
? CtnFlowStateDict.value
: await getDictOption('CM_CtnFlowState')
if (!CtnFlowStateDict.value.length) CtnFlowStateDict.value = res
const item = res.filter((item) => {
return item.label === changes[0][3]
})
if (item) dict = item[0]
list.value[changes[0][0]]['ctnFlowState'] = dict?.label
list.value[changes[0][0]]['ctnFlowStateId'] = dict?.value
}
} }
}, },
} }
@ -761,7 +804,7 @@
fixedColumnsLeft: 1, fixedColumnsLeft: 1,
// 需要隐藏的列 // 需要隐藏的列
hiddenColumns: { hiddenColumns: {
columns: [1, 2, 3, 4, 5, 6], columns: [1, 2, 3, 4, 5, 6, 7],
indicators: true, indicators: true,
}, },
// // 控制回车移动 // // 控制回车移动

12
src/views/ContainerManagement/CtnScrap/columns.tsx
Unescape Escape View File

@ -58,6 +58,18 @@ export const columns: BasicColumn[] = [
sorter: true, sorter: true,
width: 200, width: 200,
}, },
{
title: '已提箱',
dataIndex: 'pickupCtntotal',
sorter: true,
width: 150,
},
{
title: '未提箱',
dataIndex: 'remainCtntotal',
sorter: true,
width: 150,
},
{ {
title: '业务状态', title: '业务状态',
dataIndex: 'billState', dataIndex: 'billState',

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

@ -377,6 +377,7 @@
await setFieldsValue({ await setFieldsValue({
...res.data, ...res.data,
}) })
GetListDetail()
} }
} }
const activeKey = ref('1') const activeKey = ref('1')

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

@ -82,6 +82,36 @@ export const columns: BasicColumn[] = [
sorter: true, sorter: true,
width: 200, width: 200,
}, },
{
title: '箱型箱量',
dataIndex: 'ctntotal',
sorter: true,
width: 200,
},
{
title: '已提箱',
dataIndex: 'pickupCtntotal',
sorter: true,
width: 150,
},
{
title: '未提箱',
dataIndex: 'remainCtntotal',
sorter: true,
width: 150,
},
{
title: '已还箱',
dataIndex: 'dropoffCtntotal',
sorter: true,
width: 200,
},
{
title: '未还箱',
dataIndex: 'dropoffRemainCtntotal',
sorter: true,
width: 200,
},
{ {
title: '原箱主', title: '原箱主',
dataIndex: 'oldContainerOwner', dataIndex: 'oldContainerOwner',

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

@ -50,7 +50,7 @@
</hot-table> </hot-table>
</div> </div>
</div> </div>
<!-- <div class="SearchBox" v-if="TotTableType"> <div class="SearchBox">
<BasicForm class="Form" @register="registerSearchBoxForm" /> <BasicForm class="Form" @register="registerSearchBoxForm" />
<div class="ButtonBox"> <div class="ButtonBox">
<a-button size="default" @click="handleReset"> 重置 </a-button> <a-button size="default" @click="handleReset"> 重置 </a-button>
@ -59,7 +59,7 @@
</a-button> </a-button>
</div> </div>
</div> </div>
<div class="HotTable" v-if="TotTableType"> <div class="HotTable">
<div> <div>
<a-button type="link" @click="ViewTableAdd" class="pl0"> <a-button type="link" @click="ViewTableAdd" class="pl0">
<span class="iconfont icon-new_document"></span> <span class="iconfont icon-new_document"></span>
@ -83,7 +83,7 @@
/> />
</hot-table> </hot-table>
</div> </div>
</div> --> </div>
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="2" tab="电子文档" :disabled="!rowId"> <a-tab-pane key="2" tab="电子文档" :disabled="!rowId">
<DsFile ref="dsFile" fileType="infoclient" :id="rowId" /> <DsFile ref="dsFile" fileType="infoclient" :id="rowId" />
@ -114,7 +114,7 @@
</a-tabs> </a-tabs>
<!--右下角按钮--> <!--右下角按钮-->
<template #footer> <template #footer>
<!-- <a-button <a-button
pre-icon="ant-design:check-circle-outlined" pre-icon="ant-design:check-circle-outlined"
type="primary" type="primary"
:loading="loading" :loading="loading"
@ -122,8 +122,8 @@
@click="Confirm()" @click="Confirm()"
> >
确认执行 确认执行
</a-button> --> </a-button>
<!-- <a-button <a-button
pre-icon="ant-design:check-circle-outlined" pre-icon="ant-design:check-circle-outlined"
type="primary" type="primary"
:loading="loading" :loading="loading"
@ -131,7 +131,7 @@
@click="Cancel()" @click="Cancel()"
> >
取消执行 取消执行
</a-button> --> </a-button>
<a-button <a-button
pre-icon="ant-design:close-outlined" pre-icon="ant-design:close-outlined"
type="warning" type="warning"
@ -188,10 +188,10 @@
ApiListDetail, ApiListDetail,
ApiDelDetail, ApiDelDetail,
// ApiMakeFee, // ApiMakeFee,
// ApiDetailView, ApiDetailView,
// ApiAddCtn, ApiAddCtn,
// ApiConfirm, ApiConfirm,
// ApiCancel, ApiCancel,
} from './api' } from './api'
import { GetClientListByCode } from '/@/api/common' import { GetClientListByCode } from '/@/api/common'
import { useMessage } from '/@/hooks/web/useMessage' import { useMessage } from '/@/hooks/web/useMessage'
@ -211,24 +211,14 @@
labelWidth: 100, labelWidth: 100,
schemas: formSchema, schemas: formSchema,
showActionButtonGroup: false, showActionButtonGroup: false,
submitFunc: submit,
}) })
const TotTableType = ref(false)
async function submit() {
const values = await validate()
if (values.rentDirectId == 1) {
TotTableType.value = true
} else {
TotTableType.value = false
}
}
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => { const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
resetFields() resetFields()
setModalProps({ confirmLoading: false, loading: true }) setModalProps({ confirmLoading: false, loading: true })
isUpdate.value = !!data?.isUpdate isUpdate.value = !!data?.isUpdate
activeKey.value = '1' activeKey.value = '1'
TotTableType.value = false
// Viewlist.value.splice(0) // Viewlist.value.splice(0)
list.value.splice(0) list.value.splice(0)
if (unref(isUpdate)) { if (unref(isUpdate)) {
@ -241,12 +231,12 @@
setFieldsValue({ setFieldsValue({
...res.data, ...res.data,
}) })
submit()
GetListDetail() GetListDetail()
// ViewlallCheck.value = false ViewlallCheck.value = false
// ViewlsomeCheck.value = false ViewlsomeCheck.value = false
// handleReset() handleReset()
// GetViewListDetail('[]') GetViewListDetail('[]')
} }
} else { } else {
rowId.value = '' rowId.value = ''
@ -254,17 +244,17 @@
setModalProps({ loading: false }) setModalProps({ loading: false })
}) })
// function GetViewListDetail(queryCondition) { function GetViewListDetail(queryCondition) {
// ApiDetailView({ ApiDetailView({
// queryCondition, queryCondition,
// pageCondition: { pageIndex: 1, pageSize: 999, sortConditions: [] }, pageCondition: { pageIndex: 1, pageSize: 999, sortConditions: [] },
// }).then((res) => { }).then((res) => {
// Viewlist.value.splice(0) Viewlist.value.splice(0)
// res.data.forEach((item) => { res.data.forEach((item) => {
// Viewlist.value.push(item) Viewlist.value.push(item)
// }) })
// }) })
// } }
function GetListDetail() { function GetListDetail() {
ApiListDetail({ ApiListDetail({
queryCondition: `[{ FieldName: 'Pid', FieldValue: '${rowId.value}', ConditionalType: 1 }]`, queryCondition: `[{ FieldName: 'Pid', FieldValue: '${rowId.value}', ConditionalType: 1 }]`,
@ -295,52 +285,52 @@
// notification.success({ message: res.message, duration: 3 }) // notification.success({ message: res.message, duration: 3 })
// }) // })
// } // }
// function Confirm() { function Confirm() {
// let type: boolean = true let type: boolean = true
// let ApiData: any = { let ApiData: any = {
// id: rowId.value, id: rowId.value,
// ids: [], ids: [],
// } }
// list.value.forEach((e: any, i) => { list.value.forEach((e: any, i) => {
// if (e.selected) { if (e.selected) {
// if (e.id) { if (e.id) {
// ApiData.ids.push(e.id) ApiData.ids.push(e.id)
// } else { } else {
// type = false type = false
// } }
// } }
// }) })
// if (type) { if (type) {
// ApiConfirm(ApiData).then((res) => { ApiConfirm(ApiData).then((res) => {
// notification.success({ message: res.message, duration: 3 }) notification.success({ message: res.message, duration: 3 })
// }) })
// } else { } else {
// notification.success({ message: '请先保存明细表', duration: 3 }) notification.success({ message: '请先保存明细表', duration: 3 })
// } }
// } }
// function Cancel() { function Cancel() {
// let type: boolean = true let type: boolean = true
// let ApiData: any = { let ApiData: any = {
// id: rowId.value, id: rowId.value,
// ids: [], ids: [],
// } }
// list.value.forEach((e: any, i) => { list.value.forEach((e: any, i) => {
// if (e.selected) { if (e.selected) {
// if (e.id) { if (e.id) {
// ApiData.ids.push(e.id) ApiData.ids.push(e.id)
// } else { } else {
// type = false type = false
// } }
// } }
// }) })
// if (type) { if (type) {
// ApiCancel(ApiData).then((res) => { ApiCancel(ApiData).then((res) => {
// notification.success({ message: res.message, duration: 3 }) notification.success({ message: res.message, duration: 3 })
// }) })
// } else { } else {
// notification.success({ message: '请先保存明细表', duration: 3 }) notification.success({ message: '请先保存明细表', duration: 3 })
// } }
// } }
async function handleSave(exit) { async function handleSave(exit) {
try { try {
const values = await validate() const values = await validate()
@ -389,6 +379,7 @@
await setFieldsValue({ await setFieldsValue({
...res.data, ...res.data,
}) })
GetListDetail()
} }
} }
const activeKey = ref('1') const activeKey = ref('1')
@ -796,138 +787,136 @@
} }
} }
//--------------------------------------- tab1 View --------------------------------------- //--------------------------------------- tab1 View ---------------------------------------
// const [ const [
// registerSearchBoxForm, registerSearchBoxForm,
// { resetFields: resetSearchBoxFields, validate: validateSearchBox }, { resetFields: resetSearchBoxFields, validate: validateSearchBox },
// ] = useForm({ ] = useForm({
// labelWidth: 100, labelWidth: 100,
// schemas: formSearchBoxSchema, schemas: formSearchBoxSchema,
// showActionButtonGroup: false, showActionButtonGroup: false,
// submitFunc: submit, })
// }) const Viewlist = ref<any>([])
// const Viewlist = ref<any>([]) // 全部勾选
// // 全部勾选 const ViewlallCheck = ref(false)
// const ViewlallCheck = ref(false)
// 部分勾选 // 部分勾选
// const ViewlsomeCheck = ref(false) const ViewlsomeCheck = ref(false)
// watchEffect(() => { watchEffect(() => {
// // 全选 // 全选
// if (ViewlallCheck.value) { if (ViewlallCheck.value) {
// Viewlist.value.forEach((item: any) => { Viewlist.value.forEach((item: any) => {
// item.selected = true item.selected = true
// }) })
// } else { } else {
// // 取消全选 // 取消全选
// Viewlist.value.forEach((item: any) => { Viewlist.value.forEach((item: any) => {
// item.selected = false item.selected = false
// }) })
// } }
// }) })
// watch( watch(
// Viewlist.value, Viewlist.value,
// (val) => { (val) => {
// let a = 0 let a = 0
// let b = 0 let b = 0
// val.forEach((item: any) => { val.forEach((item: any) => {
// if (item.selected) { if (item.selected) {
// a += 1 a += 1
// } else { } else {
// b += 1 b += 1
// } }
// }) })
// if (a == 0) { if (a == 0) {
// ViewlallCheck.value = false ViewlallCheck.value = false
// } }
// if (b == 0) { if (b == 0) {
// ViewlallCheck.value = true ViewlallCheck.value = true
// } }
// if (a != 0 && b != 0) { if (a != 0 && b != 0) {
// ViewlsomeCheck.value = true ViewlsomeCheck.value = true
// } else { } else {
// ViewlsomeCheck.value = false ViewlsomeCheck.value = false
// } }
// }, },
// { {
// deep: true, deep: true,
// }, },
// ) )
// const Viewsettings = { const Viewsettings = {
// height: '163', height: '163',
// readOnly: true, readOnly: true,
// // autoWrapRow: true, // autoWrapRow: true,
// // autoWrapCol: true, // autoWrapCol: true,
// // 每行的高度 // 每行的高度
// rowHeights: 26, rowHeights: 26,
// fixedColumnsLeft: 1, fixedColumnsLeft: 1,
// // 需要隐藏的列 // 需要隐藏的列
// hiddenColumns: { hiddenColumns: {
// columns: [1, 2, 3, 4, 5, 6, 7, 8], columns: [1, 2, 3, 4, 5, 6, 7, 8],
// indicators: true, indicators: true,
// }, },
// // // 控制回车移动 // // 控制回车移动
// // enterMoves: 'row', // enterMoves: 'row',
// // columnSorting: false, // columnSorting: false,
// // // 如果通过复制或者填写校验出现错误，清空输入框 // // 如果通过复制或者填写校验出现错误，清空输入框
// // afterValidate: function (isValid, value, row, prop, source) { // afterValidate: function (isValid, value, row, prop, source) {
// // if (!isValid) { // if (!isValid) {
// // hotTb.value.hotInstance.setDataAtRowProp(row, prop, '') // hotTb.value.hotInstance.setDataAtRowProp(row, prop, '')
// // } // }
// // }, // },
// columns: columns, columns: columns,
// // 此行直接复制，必须(非商用) // 此行直接复制，必须(非商用)
// licenseKey: 'non-commercial-and-evaluation', licenseKey: 'non-commercial-and-evaluation',
// // // 定义所有单元格发生变化的回调处理 // // 定义所有单元格发生变化的回调处理
// // async afterChange(changes, source) {}, // async afterChange(changes, source) {},
// } }
// function handleReset() { function handleReset() {
// resetSearchBoxFields() resetSearchBoxFields()
// handleSearch() handleSearch()
// } }
// async function handleSearch() { async function handleSearch() {
// const values = await validateSearchBox() const values = await validateSearchBox()
// console.log(values) console.log(values)
// let ApiData: any = [] let ApiData: any = []
// Object.keys(values).forEach((item) => { Object.keys(values).forEach((item) => {
// if (values[item]) { if (values[item]) {
// console.log(values[item].split(',')) console.log(values[item].split(','))
// if (item == 'cntrno') { if (item == 'cntrno') {
// ApiData.push({ FieldName: item, FieldValue: values[item], ConditionalType: 15 }) ApiData.push({ FieldName: item, FieldValue: values[item], ConditionalType: 15 })
// } else { } else {
// ApiData.push({ FieldName: item, FieldValue: values[item], ConditionalType: 1 }) ApiData.push({ FieldName: item, FieldValue: values[item], ConditionalType: 1 })
// } }
// } }
// }) })
// GetViewListDetail(JSON.stringify(ApiData)) GetViewListDetail(JSON.stringify(ApiData))
// } }
// function ViewTableAdd() { function ViewTableAdd() {
// let ApiData: any = { id: rowId.value, ids: [] } let ApiData: any = { id: rowId.value, ids: [] }
// Viewlist.value.forEach((e: any, i) => { Viewlist.value.forEach((e: any, i) => {
// if (e.selected) { if (e.selected) {
// ApiData.ids.push(e.id) ApiData.ids.push(e.id)
// } }
// }) })
// console.log(ApiData.ids) console.log(ApiData.ids)
// if (ApiData.ids.length) { if (ApiData.ids.length) {
// ApiAddCtn(ApiData).then(async (res) => { ApiAddCtn(ApiData).then(async (res) => {
// if (res.succeeded) { if (res.succeeded) {
// const res: API.DataResult = await ApiInfo({ id: unref(rowId) }) const res: API.DataResult = await ApiInfo({ id: unref(rowId) })
// if (res.succeeded) { if (res.succeeded) {
// allCheck.value = false allCheck.value = false
// someCheck.value = false someCheck.value = false
// ViewlallCheck.value = false ViewlallCheck.value = false
// ViewlsomeCheck.value = false ViewlsomeCheck.value = false
// submit() GetListDetail()
// GetListDetail() handleReset()
// handleReset() GetViewListDetail('[]')
// GetViewListDetail('[]') }
// } // getData(false)
// // getData(false) notification.success({ message: res.message, duration: 3 })
// notification.success({ message: res.message, duration: 3 }) }
// } })
// }) }
// } }
// }
//--------------------------------------- tab3 --------------------------------------- //--------------------------------------- tab3 ---------------------------------------
// 应收传到应付的数据 // 应收传到应付的数据
const broReceiveData = ref([]) const broReceiveData = ref([])
@ -947,13 +936,14 @@
position: absolute; position: absolute;
left: 15px; left: 15px;
} }
// .SearchBox { .SearchBox {
// display: flex; display: flex;
// .Form { .Form {
// flex: 1; flex: 1;
// } margin-right: 10px;
// .mt-4 { }
// margin-left: 10px; .mt-4 {
// } margin-left: 10px;
// } }
}
</style> </style>

38
src/views/ContainerManagement/RentOneWay/api.ts
Unescape Escape View File

@ -11,6 +11,11 @@ enum Api {
editDetail = '/containerManagementApi/CM_RentOneWay_Detail/EditCM_RentOneWay_Detail', editDetail = '/containerManagementApi/CM_RentOneWay_Detail/EditCM_RentOneWay_Detail',
delDetail = '/containerManagementApi/CM_RentOneWay_Detail/DeleteCM_RentOneWay_Detail', delDetail = '/containerManagementApi/CM_RentOneWay_Detail/DeleteCM_RentOneWay_Detail',
Confirm = '/containerManagementApi/CM_RentOneWay/CM_RentOneWay_Confirm',
Cancel = '/containerManagementApi/CM_RentOneWay/CM_RentOneWay_Cancel',
DetailView = '/containerManagementApi/CM_RentOut/CM_RentOut_NeedRent_View',
AddCtn = '/containerManagementApi/CM_RentOneWay/CM_RentOneWay_AddCtn',
} }
// 列表 (Auth) // 列表 (Auth)
export function ApiList(data: PageRequest) { export function ApiList(data: PageRequest) {
@ -70,3 +75,36 @@ export function ApiDelDetail(data: PageRequest) {
}) })
} }
// _确认 (Auth)
export function ApiConfirm(data: PageRequest) {
return request<DataResult>({
url: Api.Confirm,
method: 'post',
data,
})
}
// _取消 (Auth)
export function ApiCancel(data: PageRequest) {
return request<DataResult>({
url: Api.Cancel,
method: 'post',
data,
})
}
// 租箱租入明细视图 (Auth)
export function ApiDetailView(data: PageRequest) {
return request<DataResult>({
url: Api.DetailView,
method: 'post',
data,
})
}
// 租箱租入退租_添加 (Auth)
export function ApiAddCtn(data: PageRequest) {
return request<DataResult>({
url: Api.AddCtn,
method: 'post',
data,
})
}

82
src/views/ContainerManagement/RentOneWay/index.vue
Unescape Escape View File

@ -17,14 +17,14 @@
删除 删除
</a-button> </a-button>
</a-popconfirm> </a-popconfirm>
<!-- <a-button type="link" @click="Confirm"> <a-button type="link" @click="Confirm">
<span class="iconfont icon-yiwancheng2"></span> <span class="iconfont icon-yiwancheng2"></span>
确认执行 确认执行
</a-button> </a-button>
<a-button type="link" @click="Cancel"> <a-button type="link" @click="Cancel">
<span class="iconfont icon-weiwancheng"></span> <span class="iconfont icon-weiwancheng"></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'">
@ -47,11 +47,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 { import { ApiList, ApiDel, ApiConfirm, ApiCancel } from './api'
ApiList,
ApiDel,
// , ApiConfirm, ApiCancel
} from './api'
import { useModal } from '/@/components/Modal' import { useModal } from '/@/components/Modal'
import TenantAuditStepModal from './TenantAuditStepModal.vue' import TenantAuditStepModal from './TenantAuditStepModal.vue'
import { columns, searchFormSchema } from './columns' import { columns, searchFormSchema } from './columns'
@ -102,42 +98,42 @@
isUpdate: false, isUpdate: false,
}) })
} }
// function Confirm() { function Confirm() {
// const select = getSelectRows() const select = getSelectRows()
// let ApiData: any = { let ApiData: any = {
// id: '', id: '',
// ids: [], ids: [],
// } }
// if (select.length === 0) { if (select.length === 0) {
// notification.warning({ message: '请至少选择一条数据', duration: 3 }) notification.warning({ message: '请至少选择一条数据', duration: 3 })
// return false return false
// } else { } else {
// ApiData.ids = select.map((item) => { ApiData.ids = select.map((item) => {
// return item.id return item.id
// }) })
// } }
// ApiConfirm(ApiData).then((res) => { ApiConfirm(ApiData).then((res) => {
// notification.success({ message: res.message, duration: 3 }) notification.success({ message: res.message, duration: 3 })
// }) })
// } }
// function Cancel() { function Cancel() {
// const select = getSelectRows() const select = getSelectRows()
// let ApiData: any = { let ApiData: any = {
// id: '', id: '',
// ids: [], ids: [],
// } }
// if (select.length === 0) { if (select.length === 0) {
// notification.warning({ message: '请至少选择一条数据', duration: 3 }) notification.warning({ message: '请至少选择一条数据', duration: 3 })
// return false return false
// } else { } else {
// ApiData.ids = select.map((item) => { ApiData.ids = select.map((item) => {
// return item.id return item.id
// }) })
// } }
// ApiCancel(ApiData).then((res) => { ApiCancel(ApiData).then((res) => {
// notification.success({ message: res.message, duration: 3 }) notification.success({ message: res.message, duration: 3 })
// }) })
// } }
function handleDel() { function handleDel() {
const select = getSelectRows() const select = getSelectRows()

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

@ -410,6 +410,7 @@
await setFieldsValue({ await setFieldsValue({
...res.data, ...res.data,
}) })
GetListDetail()
} }
} }
const activeKey = ref('1') const activeKey = ref('1')

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

@ -85,6 +85,36 @@ export const columns: BasicColumn[] = [
sorter: true, sorter: true,
width: 200, width: 200,
}, },
{
title: '箱型箱量',
dataIndex: 'ctntotal',
sorter: true,
width: 200,
},
{
title: '已提箱',
dataIndex: 'pickupCtntotal',
sorter: true,
width: 150,
},
{
title: '未提箱',
dataIndex: 'remainCtntotal',
sorter: true,
width: 150,
},
{
title: '已还箱',
dataIndex: 'dropoffCtntotal',
sorter: true,
width: 200,
},
{
title: '未还箱',
dataIndex: 'dropoffRemainCtntotal',
sorter: true,
width: 200,
},
{ {
title: '租箱客户', title: '租箱客户',
dataIndex: 'rentCustomerName', dataIndex: 'rentCustomerName',

59
src/views/ContainerManagement/SellCtn/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"
@ -409,6 +409,7 @@
// 港口字段 // 港口字段
const PortDict = ref([]) const PortDict = ref([])
const CtnFlowStateDict = ref([]) const CtnFlowStateDict = ref([])
const ctnsourceDict = ref([])
// // 币别字段 // // 币别字段
// const currencyDict = ref([]) // const currencyDict = ref([])
watchEffect(() => { watchEffect(() => {
@ -493,6 +494,12 @@
width: 120, width: 120,
data: 'CtnFlowStateId', data: 'CtnFlowStateId',
}, },
{
title: '箱来源ID',
width: 120,
data: 'ctnSourceId',
},
// ----------------- // -----------------
// { // {
// title: '租箱业务号', // title: '租箱业务号',
@ -522,9 +529,21 @@
}, },
}, },
{ {
title: '箱来源？？', title: '箱来源',
width: 120, width: 120,
data: 'ctnSourceId', data: 'ctnsource',
type: 'dropdown',
// 下拉框数据，可以同步或者异步返回(异步需要process返回)
source: async (query, process) => {
const res = ctnsourceDict.value.length
? ctnsourceDict.value
: await getDictOption('CM_CtnSource')
if (!ctnsourceDict.value.length) ctnsourceDict.value = res
const dict = res.map((res) => {
return res.label
})
process(dict)
},
}, },
{ {
title: '放箱单号', title: '放箱单号',
@ -532,16 +551,16 @@
data: 'ctnReleaseNo', data: 'ctnReleaseNo',
}, },
{ {
title: '报废日期', title: '提箱日期',
width: 120, width: 120,
data: 'bsdate', data: 'bsdate',
type: 'date', type: 'date',
dateFormat: 'YYYY-MM-DD', dateFormat: 'YYYY-MM-DD',
}, },
{ {
title: '当前状态??', title: '当前状态',
width: 120, width: 120,
data: 'CtnFlowState', data: 'ctnFlowState',
type: 'dropdown', type: 'dropdown',
// 下拉框数据，可以同步或者异步返回(异步需要process返回) // 下拉框数据，可以同步或者异步返回(异步需要process返回)
source: async (query, process) => { source: async (query, process) => {
@ -625,7 +644,7 @@
fixedColumnsLeft: 1, fixedColumnsLeft: 1,
// 需要隐藏的列 // 需要隐藏的列
hiddenColumns: { hiddenColumns: {
columns: [1, 2, 3, 4, 5, 6], columns: [1, 2, 3, 4, 5, 6, 7],
indicators: true, indicators: true,
}, },
// 控制回车移动 // 控制回车移动
@ -670,6 +689,30 @@
list.value[changes[0][0]]['pickupPortCode'] = dict?.ediCode list.value[changes[0][0]]['pickupPortCode'] = dict?.ediCode
} }
} }
if (changes[0][1] === 'ctnsource') {
const res = ctnsourceDict.value.length
? ctnsourceDict.value
: await getDictOption('CM_CtnSource')
if (!ctnsourceDict.value.length) ctnsourceDict.value = res
const item = res.filter((item) => {
return item.label === changes[0][3]
})
if (item) dict = item[0]
list.value[changes[0][0]]['ctnsource'] = dict?.label
list.value[changes[0][0]]['ctnSourceId'] = dict?.value
}
if (changes[0][1] === 'ctnFlowState') {
const res = CtnFlowStateDict.value.length
? CtnFlowStateDict.value
: await getDictOption('CM_CtnFlowState')
if (!CtnFlowStateDict.value.length) CtnFlowStateDict.value = res
const item = res.filter((item) => {
return item.label === changes[0][3]
})
if (item) dict = item[0]
list.value[changes[0][0]]['ctnFlowState'] = dict?.label
list.value[changes[0][0]]['ctnFlowStateId'] = dict?.value
}
} }
}, },
} }
@ -762,7 +805,7 @@
fixedColumnsLeft: 1, fixedColumnsLeft: 1,
// 需要隐藏的列 // 需要隐藏的列
hiddenColumns: { hiddenColumns: {
columns: [1, 2, 3, 4, 5, 6], columns: [1, 2, 3, 4, 5, 6, 7],
indicators: true, indicators: true,
}, },
// // 控制回车移动 // // 控制回车移动

15
src/views/ContainerManagement/SellCtn/columns.tsx
Unescape Escape View File

@ -47,14 +47,14 @@ export const columns: BasicColumn[] = [
width: 200, width: 200,
}, },
{ {
title: '箱型箱量', title: '卖箱日期',
dataIndex: 'ctntotal', dataIndex: 'bsdate',
sorter: true, sorter: true,
width: 200, width: 200,
}, },
{ {
title: '卖箱日期', title: '箱型箱量',
dataIndex: 'bsdate', dataIndex: 'ctntotal',
sorter: true, sorter: true,
width: 200, width: 200,
}, },
@ -62,13 +62,13 @@ export const columns: BasicColumn[] = [
title: '已提箱', title: '已提箱',
dataIndex: 'pickupCtntotal', dataIndex: 'pickupCtntotal',
sorter: true, sorter: true,
width: 200, width: 150,
}, },
{ {
title: '未提箱', title: '未提箱',
dataIndex: 'remainCtntotal', dataIndex: 'remainCtntotal',
sorter: true, sorter: true,
width: 200, width: 150,
}, },
{ {
title: '业务锁定', title: '业务锁定',
@ -212,6 +212,9 @@ export const formSchema: FormSchema[] = [
label: '箱型箱量', label: '箱型箱量',
component: 'Input', component: 'Input',
colProps: { span: 6 }, colProps: { span: 6 },
dynamicDisabled: ({}) => {
return true
},
}, },
{ {
field: 'accdate', field: 'accdate',

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

@ -1071,24 +1071,24 @@ export const formSchema: FormSchema[] = [
return !values.isOverdueDeduction return !values.isOverdueDeduction
}, },
}, },
{ // {
field: 'auditStatus', // field: 'auditStatus',
label: '审批状态', // label: '审批状态',
component: 'Input', // component: 'Input',
colProps: { span: 4 }, // colProps: { span: 4 },
defaultValue: -1, // defaultValue: -1,
show: false, // show: false,
}, // },
{ // {
field: 'auditStatusText', // field: 'auditStatusText',
label: '审批状态', // label: '审批状态',
component: 'Input', // component: 'Input',
colProps: { span: 4 }, // colProps: { span: 4 },
defaultValue: '', // defaultValue: '',
dynamicDisabled: ({}) => { // dynamicDisabled: ({}) => {
return true // return true
}, // },
}, // },
// { // {
// field: 'status', // field: 'status',
// label: '是否可用', // label: '是否可用',

Write Preview
Loading…
Cancel
Save