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 4 weeks ago
parent db0ea8d415 52e26cd4d1
commit e04e18761b
8 changed files with 188 additions and 60 deletions
Show Stats Download Patch File Download Diff File

2
src/design/theme.less
Unescape Escape View File

@ -52,5 +52,5 @@ html[data-theme='light'] {
} }
.ant-popover-inner-content { .ant-popover-inner-content {
width: 230px min-width: 230px
} }

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

@ -27,7 +27,7 @@
删除 删除
</a-button> </a-button>
</a-popconfirm> </a-popconfirm>
<a-button type="link" @click="handleSave(false)" class="pl0"> <a-button type="link" @click="handleSave(false, true)" class="pl0">
<span class="iconfont icon-baocun" v-repeat></span> <span class="iconfont icon-baocun" v-repeat></span>
保存 保存
</a-button> </a-button>
@ -161,7 +161,7 @@
:loading="loading" :loading="loading"
pre-icon="ant-design:check-outlined" pre-icon="ant-design:check-outlined"
style="margin-right: 0.8rem" style="margin-right: 0.8rem"
@click="handleSave(false)" @click="handleSave(false, true)"
>仅保存</a-button >仅保存</a-button
> >
<a-button <a-button
@ -169,7 +169,7 @@
type="primary" type="primary"
:loading="loading" :loading="loading"
style="margin-right: 0.8rem" style="margin-right: 0.8rem"
@click="handleSave(true)" @click="handleSave(true, true)"
>保存并关闭</a-button >保存并关闭</a-button
> >
<a-button <a-button
@ -297,14 +297,14 @@
}) })
} }
async function MakeFee() { async function MakeFee() {
await handleSave(false) await handleSave(false, true)
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 })
emit('success') emit('success')
}) })
} }
async function Confirm() { async function Confirm() {
await handleSave(false) await handleSave(false, false)
let type: boolean = true let type: boolean = true
let ApiData: any = { let ApiData: any = {
id: rowId.value, id: rowId.value,
@ -322,6 +322,7 @@
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 })
refresh()
emit('success') emit('success')
}) })
} else { } else {
@ -329,7 +330,7 @@
} }
} }
async function Cancel() { async function Cancel() {
// await handleSave(false) // await handleSave(false,false)
let type: boolean = true let type: boolean = true
let ApiData: any = { let ApiData: any = {
id: rowId.value, id: rowId.value,
@ -347,6 +348,7 @@
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 })
refresh()
emit('success') emit('success')
}) })
} else { } else {
@ -355,14 +357,14 @@
} }
const dsFile = ref() const dsFile = ref()
async function FnTriggerSave() { async function FnTriggerSave() {
await handleSave(false) await handleSave(false, true)
if (rowId.value) { if (rowId.value) {
dsFile.value.openFileModel() dsFile.value.openFileModel()
} }
} }
async function DealExcel() { async function DealExcel() {
if (!rowId.value) { if (!rowId.value) {
await handleSave(false) await handleSave(false, false)
} }
if (dsFile.value.dsFileList.SelectId) { if (dsFile.value.dsFileList.SelectId) {
let ApiData: any = { let ApiData: any = {
@ -380,7 +382,7 @@
notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 }) notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 })
} }
} }
async function handleSave(exit) { async function handleSave(exit, GetType) {
try { try {
const values = await validate() const values = await validate()
setModalProps({ confirmLoading: true, loading: true }) setModalProps({ confirmLoading: true, loading: true })
@ -411,13 +413,17 @@
//刷新页面 //刷新页面
if (!exit) { if (!exit) {
if (unref(isUpdate)) { if (unref(isUpdate)) {
if (GetType) {
await refresh() await refresh()
}
} else { } else {
rowId.value = res.data rowId.value = res.data
isUpdate.value = true isUpdate.value = true
if (GetType) {
await refresh() await refresh()
} }
} }
}
} else { } else {
notification.error({ message: res.message, duration: 3 }) notification.error({ message: res.message, duration: 3 })
} }

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

@ -27,7 +27,7 @@
删除 删除
</a-button> </a-button>
</a-popconfirm> </a-popconfirm>
<a-button type="link" @click="handleSave(false)" class="pl0"> <a-button type="link" @click="handleSave(false, true)" class="pl0">
<span class="iconfont icon-baocun" v-repeat></span> <span class="iconfont icon-baocun" v-repeat></span>
保存 保存
</a-button> </a-button>
@ -204,7 +204,7 @@
:loading="loading" :loading="loading"
pre-icon="ant-design:check-outlined" pre-icon="ant-design:check-outlined"
style="margin-right: 0.8rem" style="margin-right: 0.8rem"
@click="handleSave(false)" @click="handleSave(false, true)"
>仅保存</a-button >仅保存</a-button
> >
<a-button <a-button
@ -212,7 +212,7 @@
type="primary" type="primary"
:loading="loading" :loading="loading"
style="margin-right: 0.8rem" style="margin-right: 0.8rem"
@click="handleSave(true)" @click="handleSave(true, true)"
>保存并关闭</a-button >保存并关闭</a-button
> >
<a-button <a-button
@ -359,14 +359,14 @@
}) })
} }
async function MakeFee() { async function MakeFee() {
await handleSave(false) await handleSave(false, true)
ApiMakeFee({ id: rowId.value }).then((res) => { ApiMakeFee({ id: rowId.value }).then((res) => {
emit('success') emit('success')
notification.success({ message: res.message, duration: 3 }) notification.success({ message: res.message, duration: 3 })
}) })
} }
async function Confirm() { async function Confirm() {
await handleSave(false) await handleSave(false, false)
let type: boolean = true let type: boolean = true
let ApiData: any = { let ApiData: any = {
id: rowId.value, id: rowId.value,
@ -384,6 +384,7 @@
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 })
refresh()
emit('success') emit('success')
}) })
} else { } else {
@ -391,7 +392,7 @@
} }
} }
async function Cancel() { async function Cancel() {
// await handleSave(false) // await handleSave(false, false)
let type: boolean = true let type: boolean = true
let ApiData: any = { let ApiData: any = {
id: rowId.value, id: rowId.value,
@ -409,6 +410,7 @@
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 })
refresh()
emit('success') emit('success')
}) })
} else { } else {
@ -417,14 +419,14 @@
} }
const dsFile = ref() const dsFile = ref()
async function FnTriggerSave() { async function FnTriggerSave() {
await handleSave(false) await handleSave(false, true)
if (rowId.value) { if (rowId.value) {
dsFile.value.openFileModel() dsFile.value.openFileModel()
} }
} }
async function DealExcel() { async function DealExcel() {
if (!rowId.value) { if (!rowId.value) {
await handleSave(false) await handleSave(false, false)
} }
if (dsFile.value.dsFileList.SelectId) { if (dsFile.value.dsFileList.SelectId) {
let ApiData: any = { let ApiData: any = {
@ -442,7 +444,7 @@
notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 }) notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 })
} }
} }
async function handleSave(exit) { async function handleSave(exit, GetType) {
try { try {
const values = await validate() const values = await validate()
setModalProps({ confirmLoading: true, loading: true }) setModalProps({ confirmLoading: true, loading: true })
@ -473,13 +475,17 @@
//刷新页面 //刷新页面
if (!exit) { if (!exit) {
if (unref(isUpdate)) { if (unref(isUpdate)) {
if (GetType) {
await refresh() await refresh()
}
} else { } else {
rowId.value = res.data rowId.value = res.data
isUpdate.value = true isUpdate.value = true
if (GetType) {
await refresh() await refresh()
} }
} }
}
} else { } else {
notification.error({ message: res.message, duration: 3 }) notification.error({ message: res.message, duration: 3 })
} }
@ -1303,7 +1309,7 @@
} }
async function ViewTableAdd() { async function ViewTableAdd() {
if (!rowId.value) { if (!rowId.value) {
await handleSave(false) await handleSave(false, true)
} }
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) => {
@ -1350,7 +1356,9 @@
const reason = ref('') const reason = ref('')
async function PushFormStatus(execution) { async function PushFormStatus(execution) {
try { try {
await handleSave(false) if (execution != 10001 && execution != 1100) {
await handleSave(false, false)
}
// 租入(退租)、租出(租出)、卖箱 传 CM_RentIn CM_RentOut CM_SellCtn // 租入(退租)、租出(租出)、卖箱 传 CM_RentIn CM_RentOut CM_SellCtn
let ApiData: any = { let ApiData: any = {
id: rowId.value, id: rowId.value,
@ -1363,6 +1371,7 @@
notification.success({ message: res.message, duration: 3 }) notification.success({ message: res.message, duration: 3 })
reason.value = '' reason.value = ''
visible.value = false visible.value = false
refresh()
} }
}) })
} }

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

@ -27,7 +27,7 @@
删除 删除
</a-button> </a-button>
</a-popconfirm> </a-popconfirm>
<a-button type="link" @click="handleSave(false)" class="pl0"> <a-button type="link" @click="handleSave(false, true)" class="pl0">
<span class="iconfont icon-baocun" v-repeat></span> <span class="iconfont icon-baocun" v-repeat></span>
保存 保存
</a-button> </a-button>
@ -131,7 +131,7 @@
type="primary" type="primary"
:loading="loading" :loading="loading"
@click="PushFormStatus(1001)" @click="PushFormStatus(1001)"
v-if="!checkPermissions('op:RentIn:submitted')" v-if="rentDirectId == 2 && !checkPermissions('op:RentIn:submitted')"
> >
提交审核 提交审核
</a-button> </a-button>
@ -140,7 +140,7 @@
type="primary" type="primary"
:loading="loading" :loading="loading"
@click="PushFormStatus(1000)" @click="PushFormStatus(1000)"
v-if="!checkPermissions('op:RentIn:submitted')" v-if="rentDirectId == 2 && !checkPermissions('op:RentIn:submitted')"
> >
撤回提交 撤回提交
</a-button> </a-button>
@ -149,7 +149,7 @@
type="primary" type="primary"
:loading="loading" :loading="loading"
@click="PushFormStatus(10001)" @click="PushFormStatus(10001)"
v-if="!checkPermissions('op:RentIn:audit')" v-if="rentDirectId == 2 && !checkPermissions('op:RentIn:audit')"
> >
驳回提交 驳回提交
</a-button> </a-button>
@ -158,7 +158,7 @@
type="primary" type="primary"
:loading="loading" :loading="loading"
@click="PushFormStatus(1100)" @click="PushFormStatus(1100)"
v-if="!checkPermissions('op:RentIn:audit')" v-if="rentDirectId == 2 && !checkPermissions('op:RentIn:audit')"
> >
审核通过 审核通过
</a-button> </a-button>
@ -167,6 +167,7 @@
type="primary" type="primary"
:loading="loading" :loading="loading"
@click="Confirm()" @click="Confirm()"
v-if="rentDirectId !== 2"
> >
确认执行 确认执行
</a-button> </a-button>
@ -175,6 +176,7 @@
type="primary" type="primary"
:loading="loading" :loading="loading"
@click="Cancel()" @click="Cancel()"
v-if="rentDirectId !== 2"
> >
取消执行 取消执行
</a-button> </a-button>
@ -200,7 +202,7 @@
:loading="loading" :loading="loading"
pre-icon="ant-design:check-outlined" pre-icon="ant-design:check-outlined"
style="margin-right: 0.8rem" style="margin-right: 0.8rem"
@click="handleSave(false)" @click="handleSave(false, true)"
>仅保存</a-button >仅保存</a-button
> >
<a-button <a-button
@ -208,7 +210,7 @@
type="primary" type="primary"
:loading="loading" :loading="loading"
style="margin-right: 0.8rem" style="margin-right: 0.8rem"
@click="handleSave(true)" @click="handleSave(true, true)"
>保存并关闭</a-button >保存并关闭</a-button
> >
<a-button <a-button
@ -369,14 +371,14 @@
}) })
} }
async function MakeFee() { async function MakeFee() {
await handleSave(false) await handleSave(false, true)
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 })
emit('success') emit('success')
}) })
} }
async function Confirm() { async function Confirm() {
await handleSave(false) await handleSave(false, false)
let type: boolean = true let type: boolean = true
let ApiData: any = { let ApiData: any = {
id: rowId.value, id: rowId.value,
@ -394,6 +396,7 @@
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 })
refresh()
emit('success') emit('success')
}) })
} else { } else {
@ -401,7 +404,7 @@
} }
} }
async function Cancel() { async function Cancel() {
// await handleSave(false) // await handleSave(false,false)
let type: boolean = true let type: boolean = true
let ApiData: any = { let ApiData: any = {
id: rowId.value, id: rowId.value,
@ -419,6 +422,7 @@
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 })
refresh()
emit('success') emit('success')
}) })
} else { } else {
@ -427,14 +431,14 @@
} }
const dsFile = ref() const dsFile = ref()
async function FnTriggerSave() { async function FnTriggerSave() {
await handleSave(false) await handleSave(false, true)
if (rowId.value) { if (rowId.value) {
dsFile.value.openFileModel() dsFile.value.openFileModel()
} }
} }
async function DealExcel() { async function DealExcel() {
if (!rowId.value) { if (!rowId.value) {
await handleSave(false) await handleSave(false, false)
} }
if (dsFile.value.dsFileList.SelectId) { if (dsFile.value.dsFileList.SelectId) {
let ApiData: any = { let ApiData: any = {
@ -452,7 +456,7 @@
notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 }) notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 })
} }
} }
async function handleSave(exit) { async function handleSave(exit, GetType) {
try { try {
const values = await validate() const values = await validate()
setModalProps({ confirmLoading: true, loading: true }) setModalProps({ confirmLoading: true, loading: true })
@ -485,13 +489,17 @@
//刷新页面 //刷新页面
if (!exit) { if (!exit) {
if (unref(isUpdate)) { if (unref(isUpdate)) {
if (GetType) {
await refresh() await refresh()
}
} else { } else {
rowId.value = res.data rowId.value = res.data
isUpdate.value = true isUpdate.value = true
if (GetType) {
await refresh() await refresh()
} }
} }
}
} else { } else {
notification.error({ message: res.message, duration: 3 }) notification.error({ message: res.message, duration: 3 })
} }
@ -1662,7 +1670,7 @@
} }
async function ViewTableAdd() { async function ViewTableAdd() {
if (!rowId.value) { if (!rowId.value) {
await handleSave(false) await handleSave(false, true)
} }
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) => {
@ -1713,7 +1721,9 @@
const reason = ref('') const reason = ref('')
async function PushFormStatus(execution) { async function PushFormStatus(execution) {
try { try {
await handleSave(false) if (execution != 10001 && execution != 1100) {
await handleSave(false, false)
}
// 租入(退租)、租出(租出)、卖箱 传 CM_RentIn CM_RentOut CM_SellCtn // 租入(退租)、租出(租出)、卖箱 传 CM_RentIn CM_RentOut CM_SellCtn
let ApiData: any = { let ApiData: any = {
id: rowId.value, id: rowId.value,
@ -1726,6 +1736,7 @@
notification.success({ message: res.message, duration: 3 }) notification.success({ message: res.message, duration: 3 })
reason.value = '' reason.value = ''
visible.value = false visible.value = false
refresh()
} }
}) })
} }

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

@ -3,7 +3,7 @@
v-bind="$attrs" v-bind="$attrs"
:use-wrapper="true" :use-wrapper="true"
title="卖箱维护" title="卖箱维护"
width="55%" width="70%"
@register="registerModal" @register="registerModal"
@ok="handleSave" @ok="handleSave"
> >
@ -27,7 +27,7 @@
删除 删除
</a-button> </a-button>
</a-popconfirm> </a-popconfirm>
<a-button type="link" @click="handleSave(false)" class="pl0"> <a-button type="link" @click="handleSave(false, true)" class="pl0">
<span class="iconfont icon-baocun" v-repeat></span> <span class="iconfont icon-baocun" v-repeat></span>
保存 保存
</a-button> </a-button>
@ -198,7 +198,7 @@
:loading="loading" :loading="loading"
pre-icon="ant-design:check-outlined" pre-icon="ant-design:check-outlined"
style="margin-right: 0.8rem" style="margin-right: 0.8rem"
@click="handleSave(false)" @click="handleSave(false, true)"
>仅保存</a-button >仅保存</a-button
> >
<a-button <a-button
@ -206,7 +206,7 @@
type="primary" type="primary"
:loading="loading" :loading="loading"
style="margin-right: 0.8rem" style="margin-right: 0.8rem"
@click="handleSave(true)" @click="handleSave(true, true)"
>保存并关闭</a-button >保存并关闭</a-button
> >
<a-button <a-button
@ -346,14 +346,14 @@
}) })
} }
async function MakeFee() { async function MakeFee() {
await handleSave(false) await handleSave(false, true)
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 })
emit('success') emit('success')
}) })
} }
async function Confirm() { async function Confirm() {
await handleSave(false) await handleSave(false, false)
let type: boolean = true let type: boolean = true
let ApiData: any = { let ApiData: any = {
id: rowId.value, id: rowId.value,
@ -378,7 +378,7 @@
} }
} }
async function Cancel() { async function Cancel() {
// await handleSave(false) // await handleSave(false,false)
let type: boolean = true let type: boolean = true
let ApiData: any = { let ApiData: any = {
id: rowId.value, id: rowId.value,
@ -404,14 +404,14 @@
} }
const dsFile = ref() const dsFile = ref()
async function FnTriggerSave() { async function FnTriggerSave() {
await handleSave(false) await handleSave(false, true)
if (rowId.value) { if (rowId.value) {
dsFile.value.openFileModel() dsFile.value.openFileModel()
} }
} }
async function DealExcel() { async function DealExcel() {
if (!rowId.value) { if (!rowId.value) {
await handleSave(false) await handleSave(false, false)
} }
if (dsFile.value.dsFileList.SelectId) { if (dsFile.value.dsFileList.SelectId) {
let ApiData: any = { let ApiData: any = {
@ -429,7 +429,7 @@
notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 }) notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 })
} }
} }
async function handleSave(exit) { async function handleSave(exit, GetType) {
try { try {
const values = await validate() const values = await validate()
setModalProps({ confirmLoading: true, loading: true }) setModalProps({ confirmLoading: true, loading: true })
@ -462,13 +462,17 @@
//刷新页面 //刷新页面
if (!exit) { if (!exit) {
if (unref(isUpdate)) { if (unref(isUpdate)) {
if (GetType) {
await refresh() await refresh()
}
} else { } else {
rowId.value = res.data rowId.value = res.data
isUpdate.value = true isUpdate.value = true
if (GetType) {
await refresh() await refresh()
} }
} }
}
} else { } else {
notification.error({ message: res.message, duration: 3 }) notification.error({ message: res.message, duration: 3 })
} }
@ -1095,7 +1099,7 @@
} }
async function ViewTableAdd() { async function ViewTableAdd() {
if (!rowId.value) { if (!rowId.value) {
await handleSave(false) await handleSave(false, true)
} }
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) => {
@ -1142,7 +1146,9 @@
const reason = ref('') const reason = ref('')
async function PushFormStatus(execution) { async function PushFormStatus(execution) {
try { try {
await handleSave(false) if (execution != 10001 && execution != 1100) {
await handleSave(false, false)
}
// 租入(退租)、租出(租出)、卖箱 传 CM_RentIn CM_RentOut CM_SellCtn // 租入(退租)、租出(租出)、卖箱 传 CM_RentIn CM_RentOut CM_SellCtn
let ApiData: any = { let ApiData: any = {
id: rowId.value, id: rowId.value,
@ -1155,6 +1161,7 @@
notification.success({ message: res.message, duration: 3 }) notification.success({ message: res.message, duration: 3 })
reason.value = '' reason.value = ''
visible.value = false visible.value = false
refresh()
} }
}) })
} }

9
src/views/operation/seaexport/api/BookingLedger.js
Unescape Escape View File

@ -2092,6 +2092,15 @@ export function RefreshYGT(data) {
}) })
} }
// 刷新提箱返场
export function RefreshYard(data) {
return request({
url: '/opApi/SeaExport/RefreshYard',
method: 'post',
data,
})
}
// 获取商品下拉列表 (Auth) // 获取商品下拉列表 (Auth)
export function GetClientGoodsList(params) { export function GetClientGoodsList(params) {
return request({ return request({

5
src/views/operation/seaexport/columns.tsx
Unescape Escape View File

@ -462,6 +462,11 @@ export const columns: BasicColumn[] = [
dataIndex: 'bookStatus', dataIndex: 'bookStatus',
width: 200 width: 200
}, },
{
title: '提箱返场',
dataIndex: 'statusLog',
width: 140
},
{ {
title: '揽货人', title: '揽货人',
sorter: true, sorter: true,

89
src/views/operation/seaexport/index.vue
Unescape Escape View File

@ -109,10 +109,8 @@
</template> </template>
<!-- 运踪 --> <!-- 运踪 -->
<template v-if="column.dataIndex == 'bookStatus'"> <template v-if="column.dataIndex == 'bookStatus'">
<div @click="checkBookStatus(record.id)">
</div>
<div> <div>
<span class="iconfont icon-refresh-1-copy"></span> <span @click="checkBookStatus(record.id)" style="cursor: pointer; color: rgb(7, 231, 56);" class="iconfont icon-refresh-1-copy"></span>
<span v-for="(item, index) in record.bookingStatus" :key="item.id"> <span v-for="(item, index) in record.bookingStatus" :key="item.id">
<a-tooltip placement="top" v-if="item.statusTime"> <a-tooltip placement="top" v-if="item.statusTime">
<template #title>{{ item.statusTime }}</template> <template #title>{{ item.statusTime }}</template>
@ -126,6 +124,38 @@
</span> </span>
</div> </div>
</template> </template>
<!-- 提箱返场 -->
<template v-if="column.dataIndex == 'statusLog'">
<div v-if="record.statusLog" class="txfc">
<div v-if="record.statusLog.length > 0">
<div class="billtrace-btn1 txfc" style="display: flex; align-items: center">
<i style="cursor: pointer; color: rgb(7, 231, 56); margin-right: 5px" @click="handleRefshYard(record.id)"
class="iconfont icon-refresh-1-copy"></i>
<a-popover trigger="click">
<template #content>
<div>
<span class="txfcSpan" style="width: 120px">箱号</span>
<span @click="handleGetWebData(record, 'YARD')" class="txfcSpan">提箱</span>
<span @click="handleGetWebData(record, 'YARD')" class="txfcSpan">返场</span>
</div>
<div v-for="(item, index) in record.statusLog" :key="index">
<span class="txfcSpan" style="width: 120px">{{ item.cntrno }}</span>
<span class="txfcSpan">{{ item.txOpTime }}</span>
<span class="txfcSpan">{{ item.fcOpTime }}</span>
</div>
</template>
<span @click="handleGetWebData(record, 'YARD')" :class="{ active: record.statusLog[0].txOpTime }">
提箱
</span>
<span @click="handleGetWebData(record, 'YARD')" :class="{ active: record.statusLog[0].fcOpTime }">
返场
</span>
</a-popover>
<span style="margin-left: 5px">未提：{{ record.txOpNumber }}/{{ record.statusLog.length }}</span>
</div>
</div>
</div>
</template>
<!-- 格式单比对 --> <!-- 格式单比对 -->
<template v-if="column.dataIndex == 'lstDraftCompareRlt'"> <template v-if="column.dataIndex == 'lstDraftCompareRlt'">
<div class="goods-status"> <div class="goods-status">
@ -305,7 +335,7 @@ import { useMessage } from '/@/hooks/web/useMessage'
import { formatTableData } from '/@/hooks/web/common' import { formatTableData } from '/@/hooks/web/common'
import { updateTableField } from '/@/hooks/component/costomForm' import { updateTableField } from '/@/hooks/component/costomForm'
const lstDraftCompareRlt = defineAsyncComponent(() => import("../../../components/lstDraftCompareRlt/index.vue")) const lstDraftCompareRlt = defineAsyncComponent(() => import("../../../components/lstDraftCompareRlt/index.vue"))
import { RefreshYGT } from './api/BookingLedger.js' import { RefreshYGT,RefreshYard } from './api/BookingLedger.js'
import { useI18n } from '/@/hooks/web/useI18n' import { useI18n } from '/@/hooks/web/useI18n'
const { t } = useI18n() const { t } = useI18n()
import { useAppStore } from '/@/store/modules/app' import { useAppStore } from '/@/store/modules/app'
@ -549,6 +579,26 @@ function handleGetWebDataYZ(row, code) {
setLoading(false) setLoading(false)
}) })
} }
function handleGetWebData(row, code) {
const data = {
bookingId: row.id,
webCode: code
}
webData.value = ''
webDataTitle.value = '场站数据'
setLoading(true)
GetWebData(data).then((res) => {
if (res.code === 200) {
webData.value = res.data
webDataFlag.value = true
} else {
createMessage.error(res.message)
}
setLoading(false)
}).catch(() => {
setLoading(false)
})
}
const bsloading = ref(false) const bsloading = ref(false)
// 校验运踪状态 // 校验运踪状态
const checkBookStatus = (id) => { const checkBookStatus = (id) => {
@ -558,6 +608,13 @@ const checkBookStatus = (id) => {
reload() reload()
}) })
} }
const handleRefshYard = (id) => {
setLoading(true)
RefreshYard({ ids: [id], businessType: 1 }).then(res => {
reload()
setLoading(false)
})
}
const isAdvancedQuery = ref(false) const isAdvancedQuery = ref(false)
// const showColumns = ref({}) // const showColumns = ref({})
// const formAllData = ref([]) // const formAllData = ref([])
@ -659,30 +716,37 @@ onMounted(() => {
<style lang="less"> <style lang="less">
.ds-sea-export-table { .ds-sea-export-table {
height: 100%; height: 100%;
.TIJIAO { .TIJIAO {
color: #47AB00; color: #47AB00;
background: #F2FAE8; background: #F2FAE8;
} }
.YSDAN { .YSDAN {
color: #007D75; color: #007D75;
background: #EDFAED; background: #EDFAED;
} }
.YFD { .YFD {
color: #004445; color: #004445;
background: #EDFAED; background: #EDFAED;
} }
.YFC { .YFC {
color: #257AFA; color: #257AFA;
background: #E6F5FF; background: #E6F5FF;
} }
.YSDBC { .YSDBC {
color: #8100D6; color: #8100D6;
background: #F8EDFF; background: #F8EDFF;
} }
.YDC { .YDC {
color: #2525BA; color: #2525BA;
background: #F3EDFF; background: #F3EDFF;
} }
.ant-table-footer { .ant-table-footer {
display: none; display: none;
} }
@ -720,4 +784,21 @@ onMounted(() => {
font-weight: bold; font-weight: bold;
font-size: 12px; font-size: 12px;
} }
.billtrace-btn1 {
font-size: 12px;
.active {
cursor: pointer;
color: #ff9702 !important;
font-weight: bold;
font-size: 12px;
}
}
.txfcSpan {
width: 140px;
color: black;
display: inline-block;
}
</style> </style>

Write Preview
Loading…
Cancel
Save