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

Merge branch 'zth' into dev

Browse Source
feature-JimuReport-1106-yjl
张同海 3 weeks ago
parent 5b1efd2e92 03c952b1e0
commit 987f21e86f
7 changed files with 196 additions and 19 deletions
Show Stats Download Patch File Download Diff File

1
src/components/File/index.vue
Unescape Escape View File

@ -224,7 +224,6 @@
}
async function ChangeUpload() {
let FnUp = (id) => {
console.log('FnUp', 1111111111)
const postData = new FormData()
const list = unref(upFileList)
// list.forEach((item) => {

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

@ -86,12 +86,26 @@
</div> -->
</a-tab-pane>
<a-tab-pane key="2" tab="电子文档">
<!-- <DsFile
ref="dsFile"
fileType="infoclient"
:TriggerSave="true"
:id="rowId"
@FnTriggerSave="FnTriggerSave"
:SetSelect="{
show: true,
}"
/> -->
<DsFile
ref="dsFile"
fileType="infoclient"
:dynamicDisabled="3"
:TriggerSave="true"
:succinct="true"
:id="rowId"
@FnTriggerSave="FnTriggerSave"
@FnUpload="FnUpload"
@handleSuccess="handleSuccess"
:SetSelect="{
show: true,
}"
@ -356,12 +370,34 @@
}
}
const dsFile = ref()
async function FnUpload(FnUp) {
if (!rowId.value) {
await handleSave(false)
}
FnUp(rowId.value)
}
async function FnTriggerSave() {
await handleSave(false, true)
if (rowId.value) {
dsFile.value.openFileModel()
}
}
function handleSuccess(data) {
const id = data.id.split('.')[0]
let ApiData: any = {
id: unref(rowId),
formName: 'CM_BuyCtn',
tableName: '',
fileId: id,
}
ApiDealExcel(ApiData).then((res) => {
if (res.succeeded) {
activeKey.value = '1'
refresh()
notification.success({ message: res.message, duration: 3 })
}
})
}
async function DealExcel() {
if (!rowId.value) {
await handleSave(false, false)
@ -374,9 +410,11 @@
fileId: dsFile.value.dsFileList.SelectId,
}
ApiDealExcel(ApiData).then((res) => {
activeKey.value = '1'
refresh()
notification.success({ message: res.message, duration: 3 })
if (res.succeeded) {
activeKey.value = '1'
refresh()
notification.success({ message: res.message, duration: 3 })
}
})
} else {
notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 })

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

@ -91,9 +91,13 @@
<DsFile
ref="dsFile"
fileType="infoclient"
:dynamicDisabled="3"
:TriggerSave="true"
:succinct="true"
:id="rowId"
@FnTriggerSave="FnTriggerSave"
@FnUpload="FnUpload"
@handleSuccess="handleSuccess"
:SetSelect="{
show: true,
}"
@ -418,12 +422,34 @@
}
}
const dsFile = ref()
async function FnUpload(FnUp) {
if (!rowId.value) {
await handleSave(false)
}
FnUp(rowId.value)
}
async function FnTriggerSave() {
await handleSave(false, true)
if (rowId.value) {
dsFile.value.openFileModel()
}
}
function handleSuccess(data) {
const id = data.id.split('.')[0]
let ApiData: any = {
id: unref(rowId),
formName: 'CM_RentIn',
tableName: '',
fileId: id,
}
ApiDealExcel(ApiData).then((res) => {
if (res.succeeded) {
activeKey.value = '1'
refresh(true)
notification.success({ message: res.message, duration: 3 })
}
})
}
async function DealExcel() {
if (!rowId.value) {
await handleSave(false, false)
@ -436,9 +462,11 @@
fileId: dsFile.value.dsFileList.SelectId,
}
ApiDealExcel(ApiData).then((res) => {
activeKey.value = '1'
refresh()
notification.success({ message: res.message, duration: 3 })
if (res.succeeded) {
activeKey.value = '1'
refresh()
notification.success({ message: res.message, duration: 3 })
}
})
} else {
notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 })

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

@ -90,9 +90,13 @@
<DsFile
ref="dsFile"
fileType="infoclient"
:dynamicDisabled="3"
:TriggerSave="true"
:succinct="true"
:id="rowId"
@FnTriggerSave="FnTriggerSave"
@FnUpload="FnUpload"
@handleSuccess="handleSuccess"
:SetSelect="{
show: true,
}"
@ -355,12 +359,34 @@
}
}
const dsFile = ref()
async function FnUpload(FnUp) {
if (!rowId.value) {
await handleSave(false)
}
FnUp(rowId.value)
}
async function FnTriggerSave() {
await handleSave(false)
if (rowId.value) {
dsFile.value.openFileModel()
}
}
function handleSuccess(data) {
const id = data.id.split('.')[0]
let ApiData: any = {
id: unref(rowId),
formName: 'CM_RentOneWay',
tableName: '',
fileId: id,
}
ApiDealExcel(ApiData).then((res) => {
if (res.succeeded) {
activeKey.value = '1'
refresh(true)
notification.success({ message: res.message, duration: 3 })
}
})
}
async function DealExcel() {
if (!rowId.value) {
await handleSave(false)
@ -374,9 +400,11 @@
fileId: dsFile.value.dsFileList.SelectId,
}
ApiDealExcel(ApiData).then((res) => {
activeKey.value = '1'
refresh()
notification.success({ message: res.message, duration: 3 })
if (res.succeeded) {
activeKey.value = '1'
refresh()
notification.success({ message: res.message, duration: 3 })
}
})
} else {
notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 })

34
src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue
Unescape Escape View File

@ -55,9 +55,13 @@
<DsFile
ref="dsFile"
fileType="infoclient"
:dynamicDisabled="3"
:TriggerSave="true"
:succinct="true"
:id="rowId"
@FnTriggerSave="FnTriggerSave"
@FnUpload="FnUpload"
@handleSuccess="handleSuccess"
:SetSelect="{
show: true,
}"
@ -301,12 +305,34 @@
}
}
const dsFile = ref()
async function FnUpload(FnUp) {
if (!rowId.value) {
await handleSave(false)
}
FnUp(rowId.value)
}
async function FnTriggerSave() {
await handleSave(false)
if (rowId.value) {
dsFile.value.openFileModel()
}
}
function handleSuccess(data) {
const id = data.id.split('.')[0]
let ApiData: any = {
id: unref(rowId),
formName: 'CM_RentOneWay',
tableName: '',
fileId: id,
}
ApiDealExcel(ApiData).then((res) => {
if (res.succeeded) {
activeKey.value = '1'
refresh(true)
notification.success({ message: res.message, duration: 3 })
}
})
}
async function DealExcel() {
if (!rowId.value) {
await handleSave(false)
@ -319,9 +345,11 @@
fileId: dsFile.value.dsFileList.SelectId,
}
ApiDealExcel(ApiData).then((res) => {
activeKey.value = '1'
refresh()
notification.success({ message: res.message, duration: 3 })
if (res.succeeded) {
activeKey.value = '1'
refresh()
notification.success({ message: res.message, duration: 3 })
}
})
} else {
notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 })

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

@ -92,9 +92,13 @@
<DsFile
ref="dsFile"
fileType="infoclient"
:dynamicDisabled="3"
:TriggerSave="true"
:succinct="true"
:id="rowId"
@FnTriggerSave="FnTriggerSave"
@FnUpload="FnUpload"
@handleSuccess="handleSuccess"
:SetSelect="{
show: true,
}"
@ -430,12 +434,34 @@
}
}
const dsFile = ref()
async function FnUpload(FnUp) {
if (!rowId.value) {
await handleSave(false, true)
}
FnUp(rowId.value)
}
async function FnTriggerSave() {
await handleSave(false, true)
if (rowId.value) {
dsFile.value.openFileModel()
}
}
function handleSuccess(data) {
const id = data.id.split('.')[0]
let ApiData: any = {
id: unref(rowId),
formName: 'CM_RentOut',
tableName: '',
fileId: id,
}
ApiDealExcel(ApiData).then((res) => {
if (res.succeeded) {
activeKey.value = '1'
refresh()
notification.success({ message: res.message, duration: 3 })
}
})
}
async function DealExcel() {
if (!rowId.value) {
await handleSave(false, false)
@ -448,9 +474,11 @@
fileId: dsFile.value.dsFileList.SelectId,
}
ApiDealExcel(ApiData).then((res) => {
activeKey.value = '1'
refresh()
notification.success({ message: res.message, duration: 3 })
if (res.succeeded) {
activeKey.value = '1'
refresh()
notification.success({ message: res.message, duration: 3 })
}
})
} else {
notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 })

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

@ -90,9 +90,13 @@
<DsFile
ref="dsFile"
fileType="infoclient"
:dynamicDisabled="3"
:TriggerSave="true"
:succinct="true"
:id="rowId"
@FnTriggerSave="FnTriggerSave"
@FnUpload="FnUpload"
@handleSuccess="handleSuccess"
:SetSelect="{
show: true,
}"
@ -406,12 +410,34 @@
}
}
const dsFile = ref()
async function FnUpload(FnUp) {
if (!rowId.value) {
await handleSave(false)
}
FnUp(rowId.value)
}
async function FnTriggerSave() {
await handleSave(false, true)
if (rowId.value) {
dsFile.value.openFileModel()
}
}
function handleSuccess(data) {
const id = data.id.split('.')[0]
let ApiData: any = {
id: unref(rowId),
formName: 'CM_SellCtn',
tableName: '',
fileId: id,
}
ApiDealExcel(ApiData).then((res) => {
if (res.succeeded) {
activeKey.value = '1'
refresh(true)
notification.success({ message: res.message, duration: 3 })
}
})
}
async function DealExcel() {
if (!rowId.value) {
await handleSave(false, false)
@ -424,9 +450,11 @@
fileId: dsFile.value.dsFileList.SelectId,
}
ApiDealExcel(ApiData).then((res) => {
activeKey.value = '1'
refresh()
notification.success({ message: res.message, duration: 3 })
if (res.succeeded) {
activeKey.value = '1'
refresh()
notification.success({ message: res.message, duration: 3 })
}
})
} else {
notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 })

Write Preview
Loading…
Cancel
Save