diff --git a/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue b/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue
index 71281aa9..e2847185 100644
--- a/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue
@@ -27,7 +27,7 @@
删除
-
+
保存
@@ -161,7 +161,7 @@
:loading="loading"
pre-icon="ant-design:check-outlined"
style="margin-right: 0.8rem"
- @click="handleSave(false)"
+ @click="handleSave(false, true)"
>仅保存
保存并关闭
{
notification.success({ message: res.message, duration: 3 })
emit('success')
})
}
async function Confirm() {
- await handleSave(false)
+ await handleSave(false, false)
let type: boolean = true
let ApiData: any = {
id: rowId.value,
@@ -322,6 +322,7 @@
if (type) {
ApiConfirm(ApiData).then((res) => {
notification.success({ message: res.message, duration: 3 })
+ refresh()
emit('success')
})
} else {
@@ -329,7 +330,7 @@
}
}
async function Cancel() {
- // await handleSave(false)
+ // await handleSave(false,false)
let type: boolean = true
let ApiData: any = {
id: rowId.value,
@@ -347,6 +348,7 @@
if (type) {
ApiCancel(ApiData).then((res) => {
notification.success({ message: res.message, duration: 3 })
+ refresh()
emit('success')
})
} else {
@@ -355,14 +357,14 @@
}
const dsFile = ref()
async function FnTriggerSave() {
- await handleSave(false)
+ await handleSave(false, true)
if (rowId.value) {
dsFile.value.openFileModel()
}
}
async function DealExcel() {
if (!rowId.value) {
- await handleSave(false)
+ await handleSave(false, false)
}
if (dsFile.value.dsFileList.SelectId) {
let ApiData: any = {
@@ -380,7 +382,7 @@
notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 })
}
}
- async function handleSave(exit) {
+ async function handleSave(exit, GetType) {
try {
const values = await validate()
setModalProps({ confirmLoading: true, loading: true })
@@ -411,11 +413,15 @@
//刷新页面
if (!exit) {
if (unref(isUpdate)) {
- await refresh()
+ if (GetType) {
+ await refresh()
+ }
} else {
rowId.value = res.data
isUpdate.value = true
- await refresh()
+ if (GetType) {
+ await refresh()
+ }
}
}
} else {
diff --git a/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue
index 8e93c8ff..a5851984 100644
--- a/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue
@@ -27,7 +27,7 @@
删除
-
+
保存
@@ -204,7 +204,7 @@
:loading="loading"
pre-icon="ant-design:check-outlined"
style="margin-right: 0.8rem"
- @click="handleSave(false)"
+ @click="handleSave(false, true)"
>仅保存
保存并关闭
{
emit('success')
notification.success({ message: res.message, duration: 3 })
})
}
async function Confirm() {
- await handleSave(false)
+ await handleSave(false, false)
let type: boolean = true
let ApiData: any = {
id: rowId.value,
@@ -384,6 +384,7 @@
if (type) {
ApiConfirm(ApiData).then((res) => {
notification.success({ message: res.message, duration: 3 })
+ refresh()
emit('success')
})
} else {
@@ -391,7 +392,7 @@
}
}
async function Cancel() {
- // await handleSave(false)
+ // await handleSave(false, false)
let type: boolean = true
let ApiData: any = {
id: rowId.value,
@@ -409,6 +410,7 @@
if (type) {
ApiCancel(ApiData).then((res) => {
notification.success({ message: res.message, duration: 3 })
+ refresh()
emit('success')
})
} else {
@@ -417,14 +419,14 @@
}
const dsFile = ref()
async function FnTriggerSave() {
- await handleSave(false)
+ await handleSave(false, true)
if (rowId.value) {
dsFile.value.openFileModel()
}
}
async function DealExcel() {
if (!rowId.value) {
- await handleSave(false)
+ await handleSave(false, false)
}
if (dsFile.value.dsFileList.SelectId) {
let ApiData: any = {
@@ -442,7 +444,7 @@
notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 })
}
}
- async function handleSave(exit) {
+ async function handleSave(exit, GetType) {
try {
const values = await validate()
setModalProps({ confirmLoading: true, loading: true })
@@ -473,11 +475,15 @@
//刷新页面
if (!exit) {
if (unref(isUpdate)) {
- await refresh()
+ if (GetType) {
+ await refresh()
+ }
} else {
rowId.value = res.data
isUpdate.value = true
- await refresh()
+ if (GetType) {
+ await refresh()
+ }
}
}
} else {
@@ -1303,7 +1309,7 @@
}
async function ViewTableAdd() {
if (!rowId.value) {
- await handleSave(false)
+ await handleSave(false, true)
}
let ApiData: any = { id: rowId.value, ids: [] }
Viewlist.value.forEach((e: any, i) => {
@@ -1350,7 +1356,9 @@
const reason = ref('')
async function PushFormStatus(execution) {
try {
- await handleSave(false)
+ if (execution != 10001 && execution != 1100) {
+ await handleSave(false, false)
+ }
// 租入(退租)、租出(租出)、卖箱 传 CM_RentIn CM_RentOut CM_SellCtn
let ApiData: any = {
id: rowId.value,
@@ -1363,6 +1371,7 @@
notification.success({ message: res.message, duration: 3 })
reason.value = ''
visible.value = false
+ refresh()
}
})
}
diff --git a/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue
index 460f3c6e..a6ffabd5 100644
--- a/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue
@@ -27,7 +27,7 @@
删除
-
+
保存
@@ -131,7 +131,7 @@
type="primary"
:loading="loading"
@click="PushFormStatus(1001)"
- v-if="!checkPermissions('op:RentIn:submitted')"
+ v-if="rentDirectId == 2 && !checkPermissions('op:RentIn:submitted')"
>
提交审核
@@ -140,7 +140,7 @@
type="primary"
:loading="loading"
@click="PushFormStatus(1000)"
- v-if="!checkPermissions('op:RentIn:submitted')"
+ v-if="rentDirectId == 2 && !checkPermissions('op:RentIn:submitted')"
>
撤回提交
@@ -149,7 +149,7 @@
type="primary"
:loading="loading"
@click="PushFormStatus(10001)"
- v-if="!checkPermissions('op:RentIn:audit')"
+ v-if="rentDirectId == 2 && !checkPermissions('op:RentIn:audit')"
>
驳回提交
@@ -158,7 +158,7 @@
type="primary"
:loading="loading"
@click="PushFormStatus(1100)"
- v-if="!checkPermissions('op:RentIn:audit')"
+ v-if="rentDirectId == 2 && !checkPermissions('op:RentIn:audit')"
>
审核通过
@@ -167,6 +167,7 @@
type="primary"
:loading="loading"
@click="Confirm()"
+ v-if="rentDirectId !== 2"
>
确认执行
@@ -175,6 +176,7 @@
type="primary"
:loading="loading"
@click="Cancel()"
+ v-if="rentDirectId !== 2"
>
取消执行
@@ -200,7 +202,7 @@
:loading="loading"
pre-icon="ant-design:check-outlined"
style="margin-right: 0.8rem"
- @click="handleSave(false)"
+ @click="handleSave(false, true)"
>仅保存
保存并关闭
{
notification.success({ message: res.message, duration: 3 })
emit('success')
})
}
async function Confirm() {
- await handleSave(false)
+ await handleSave(false, false)
let type: boolean = true
let ApiData: any = {
id: rowId.value,
@@ -394,6 +396,7 @@
if (type) {
ApiConfirm(ApiData).then((res) => {
notification.success({ message: res.message, duration: 3 })
+ refresh()
emit('success')
})
} else {
@@ -401,7 +404,7 @@
}
}
async function Cancel() {
- // await handleSave(false)
+ // await handleSave(false,false)
let type: boolean = true
let ApiData: any = {
id: rowId.value,
@@ -419,6 +422,7 @@
if (type) {
ApiCancel(ApiData).then((res) => {
notification.success({ message: res.message, duration: 3 })
+ refresh()
emit('success')
})
} else {
@@ -427,14 +431,14 @@
}
const dsFile = ref()
async function FnTriggerSave() {
- await handleSave(false)
+ await handleSave(false, true)
if (rowId.value) {
dsFile.value.openFileModel()
}
}
async function DealExcel() {
if (!rowId.value) {
- await handleSave(false)
+ await handleSave(false, false)
}
if (dsFile.value.dsFileList.SelectId) {
let ApiData: any = {
@@ -452,7 +456,7 @@
notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 })
}
}
- async function handleSave(exit) {
+ async function handleSave(exit, GetType) {
try {
const values = await validate()
setModalProps({ confirmLoading: true, loading: true })
@@ -485,11 +489,15 @@
//刷新页面
if (!exit) {
if (unref(isUpdate)) {
- await refresh()
+ if (GetType) {
+ await refresh()
+ }
} else {
rowId.value = res.data
isUpdate.value = true
- await refresh()
+ if (GetType) {
+ await refresh()
+ }
}
}
} else {
@@ -1662,7 +1670,7 @@
}
async function ViewTableAdd() {
if (!rowId.value) {
- await handleSave(false)
+ await handleSave(false, true)
}
let ApiData: any = { id: rowId.value, ids: [] }
Viewlist.value.forEach((e: any, i) => {
@@ -1713,7 +1721,9 @@
const reason = ref('')
async function PushFormStatus(execution) {
try {
- await handleSave(false)
+ if (execution != 10001 && execution != 1100) {
+ await handleSave(false, false)
+ }
// 租入(退租)、租出(租出)、卖箱 传 CM_RentIn CM_RentOut CM_SellCtn
let ApiData: any = {
id: rowId.value,
@@ -1726,6 +1736,7 @@
notification.success({ message: res.message, duration: 3 })
reason.value = ''
visible.value = false
+ refresh()
}
})
}
diff --git a/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue b/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue
index 6aaf7872..3006c9b1 100644
--- a/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue
@@ -3,7 +3,7 @@
v-bind="$attrs"
:use-wrapper="true"
title="卖箱维护"
- width="55%"
+ width="70%"
@register="registerModal"
@ok="handleSave"
>
@@ -27,7 +27,7 @@
删除
-
+
保存
@@ -198,7 +198,7 @@
:loading="loading"
pre-icon="ant-design:check-outlined"
style="margin-right: 0.8rem"
- @click="handleSave(false)"
+ @click="handleSave(false, true)"
>仅保存
保存并关闭
{
notification.success({ message: res.message, duration: 3 })
emit('success')
})
}
async function Confirm() {
- await handleSave(false)
+ await handleSave(false, false)
let type: boolean = true
let ApiData: any = {
id: rowId.value,
@@ -378,7 +378,7 @@
}
}
async function Cancel() {
- // await handleSave(false)
+ // await handleSave(false,false)
let type: boolean = true
let ApiData: any = {
id: rowId.value,
@@ -404,14 +404,14 @@
}
const dsFile = ref()
async function FnTriggerSave() {
- await handleSave(false)
+ await handleSave(false, true)
if (rowId.value) {
dsFile.value.openFileModel()
}
}
async function DealExcel() {
if (!rowId.value) {
- await handleSave(false)
+ await handleSave(false, false)
}
if (dsFile.value.dsFileList.SelectId) {
let ApiData: any = {
@@ -429,7 +429,7 @@
notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 })
}
}
- async function handleSave(exit) {
+ async function handleSave(exit, GetType) {
try {
const values = await validate()
setModalProps({ confirmLoading: true, loading: true })
@@ -462,11 +462,15 @@
//刷新页面
if (!exit) {
if (unref(isUpdate)) {
- await refresh()
+ if (GetType) {
+ await refresh()
+ }
} else {
rowId.value = res.data
isUpdate.value = true
- await refresh()
+ if (GetType) {
+ await refresh()
+ }
}
}
} else {
@@ -1095,7 +1099,7 @@
}
async function ViewTableAdd() {
if (!rowId.value) {
- await handleSave(false)
+ await handleSave(false, true)
}
let ApiData: any = { id: rowId.value, ids: [] }
Viewlist.value.forEach((e: any, i) => {
@@ -1142,7 +1146,9 @@
const reason = ref('')
async function PushFormStatus(execution) {
try {
- await handleSave(false)
+ if (execution != 10001 && execution != 1100) {
+ await handleSave(false, false)
+ }
// 租入(退租)、租出(租出)、卖箱 传 CM_RentIn CM_RentOut CM_SellCtn
let ApiData: any = {
id: rowId.value,
@@ -1155,6 +1161,7 @@
notification.success({ message: res.message, duration: 3 })
reason.value = ''
visible.value = false
+ refresh()
}
})
}