|
@@ -67,9 +67,13 @@ watch(
|
|
|
}
|
|
}
|
|
|
)
|
|
)
|
|
|
|
|
|
|
|
|
|
+const tableLoadingColumn = ref(false)
|
|
|
|
|
+const tableLoadingTableData = ref(false)
|
|
|
|
|
+
|
|
|
const tableOriginColumnsField = ref()
|
|
const tableOriginColumnsField = ref()
|
|
|
// 获取表格列
|
|
// 获取表格列
|
|
|
const getTableColumns = async () => {
|
|
const getTableColumns = async () => {
|
|
|
|
|
+ tableLoadingColumn.value = true
|
|
|
await $api.getOperationTableColumns().then((res: any) => {
|
|
await $api.getOperationTableColumns().then((res: any) => {
|
|
|
if (res.code === 200) {
|
|
if (res.code === 200) {
|
|
|
tableData.value.columns = [
|
|
tableData.value.columns = [
|
|
@@ -87,6 +91,8 @@ const getTableColumns = async () => {
|
|
|
})
|
|
})
|
|
|
}
|
|
}
|
|
|
tableOriginColumnsField.value = res.data.OperationTableColumns
|
|
tableOriginColumnsField.value = res.data.OperationTableColumns
|
|
|
|
|
+
|
|
|
|
|
+ tableLoadingColumn.value = false
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
}
|
|
}
|
|
@@ -111,6 +117,7 @@ const assignTableData = (data: any) => {
|
|
|
// 获取表格数据
|
|
// 获取表格数据
|
|
|
const getTableData = async () => {
|
|
const getTableData = async () => {
|
|
|
const rc = -1
|
|
const rc = -1
|
|
|
|
|
+ tableLoadingTableData.value = true
|
|
|
await $api
|
|
await $api
|
|
|
.SearchOperationLog({
|
|
.SearchOperationLog({
|
|
|
cp: 1,
|
|
cp: 1,
|
|
@@ -123,6 +130,9 @@ const getTableData = async () => {
|
|
|
assignTableData(res.data)
|
|
assignTableData(res.data)
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
|
|
+ .finally(() => {
|
|
|
|
|
+ tableLoadingTableData.value = false
|
|
|
|
|
+ })
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
onMounted(() => {
|
|
onMounted(() => {
|
|
@@ -135,8 +145,13 @@ useRowClickStyle(tableRef)
|
|
|
<template>
|
|
<template>
|
|
|
<div class="shipment-table">
|
|
<div class="shipment-table">
|
|
|
<div class="label">*Select Shipments</div>
|
|
<div class="label">*Select Shipments</div>
|
|
|
- <vxe-grid ref="tableRef" v-bind="tableData" height="240">
|
|
|
|
|
- <template #empty>
|
|
|
|
|
|
|
+ <vxe-grid
|
|
|
|
|
+ ref="tableRef"
|
|
|
|
|
+ v-vloading="tableLoadingTableData || tableLoadingColumn"
|
|
|
|
|
+ v-bind="tableData"
|
|
|
|
|
+ height="240"
|
|
|
|
|
+ >
|
|
|
|
|
+ <template #empty v-if="!tableLoadingTableData && tableData.data.length === 0">
|
|
|
<div class="empty">No data</div>
|
|
<div class="empty">No data</div>
|
|
|
</template>
|
|
</template>
|
|
|
</vxe-grid>
|
|
</vxe-grid>
|