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

箱管调整

Browse Source
feature-JimuReport-1106-yjl
张同海 4 weeks ago
parent 7cf1846689
commit 3f92ab7c26
4 changed files with 88 additions and 55 deletions
Show Stats Download Patch File Download Diff File

28
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,11 +413,15 @@
//刷新页面 //刷新页面
if (!exit) { if (!exit) {
if (unref(isUpdate)) { if (unref(isUpdate)) {
await refresh() if (GetType) {
await refresh()
}
} else { } else {
rowId.value = res.data rowId.value = res.data
isUpdate.value = true isUpdate.value = true
await refresh() if (GetType) {
await refresh()
}
} }
} }
} else { } else {

35
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,11 +475,15 @@
//刷新页面 //刷新页面
if (!exit) { if (!exit) {
if (unref(isUpdate)) { if (unref(isUpdate)) {
await refresh() if (GetType) {
await refresh()
}
} else { } else {
rowId.value = res.data rowId.value = res.data
isUpdate.value = true isUpdate.value = true
await refresh() if (GetType) {
await refresh()
}
} }
} }
} else { } else {
@ -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()
} }
}) })
} }

45
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,11 +489,15 @@
//刷新页面 //刷新页面
if (!exit) { if (!exit) {
if (unref(isUpdate)) { if (unref(isUpdate)) {
await refresh() if (GetType) {
await refresh()
}
} else { } else {
rowId.value = res.data rowId.value = res.data
isUpdate.value = true isUpdate.value = true
await refresh() if (GetType) {
await refresh()
}
} }
} }
} else { } else {
@ -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()
} }
}) })
} }

35
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,11 +462,15 @@
//刷新页面 //刷新页面
if (!exit) { if (!exit) {
if (unref(isUpdate)) { if (unref(isUpdate)) {
await refresh() if (GetType) {
await refresh()
}
} else { } else {
rowId.value = res.data rowId.value = res.data
isUpdate.value = true isUpdate.value = true
await refresh() if (GetType) {
await refresh()
}
} }
} }
} else { } else {
@ -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()
} }
}) })
} }

Write Preview
Loading…
Cancel
Save