|
|
|
@ -196,7 +196,7 @@
|
|
|
|
|
class="w100" |
|
|
|
|
ref="oldColumnListNode" |
|
|
|
|
:columnList="details.detailsColumnList" |
|
|
|
|
:tableData="details.renderData" |
|
|
|
|
:tableData="detailsRenderData" |
|
|
|
|
:loading="loadingObj.oldListLoading" |
|
|
|
|
@inputTxt="inputsc" |
|
|
|
|
@timeCheck="timesc" |
|
|
|
@ -230,7 +230,7 @@
|
|
|
|
|
class="w100" |
|
|
|
|
ref="oldColumnListNode" |
|
|
|
|
:columnList="details.detailsColumnList" |
|
|
|
|
:tableData="details.renderData" |
|
|
|
|
:tableData="detailsRenderData" |
|
|
|
|
:loading="loadingObj.oldListLoading" |
|
|
|
|
@inputTxt="inputsc" |
|
|
|
|
@timeCheck="timesc" |
|
|
|
@ -445,7 +445,7 @@
|
|
|
|
|
<el-dialog v-model="tcTableexport" title="导出" width="40%"> |
|
|
|
|
<Tableexportcomponent |
|
|
|
|
:menuData="details.detailsColumnList" |
|
|
|
|
:data="details.renderData" |
|
|
|
|
:data="detailsRenderData" |
|
|
|
|
></Tableexportcomponent> |
|
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
|
@ -468,6 +468,7 @@ import {
|
|
|
|
|
nextTick, |
|
|
|
|
watch, |
|
|
|
|
defineAsyncComponent, |
|
|
|
|
shallowRef, |
|
|
|
|
} from 'vue'; |
|
|
|
|
import functions from '@/utils/functions'; |
|
|
|
|
import dayjs from 'dayjs'; |
|
|
|
@ -662,6 +663,8 @@ const details = reactive<any>({
|
|
|
|
|
abnormalSelectionList: [], |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
const detailsRenderData = shallowRef([]); |
|
|
|
|
|
|
|
|
|
const { search, query, shortcuts, data, loadingObj, selectionList, drawerShow, popUpShow, form } = |
|
|
|
|
toRefs(details); |
|
|
|
|
|
|
|
|
@ -915,7 +918,7 @@ const handleData = async () => {
|
|
|
|
|
|
|
|
|
|
console.log('_data :>> ', _data); |
|
|
|
|
|
|
|
|
|
if (_data.length === 0) return (details.renderData = []); |
|
|
|
|
if (_data.length === 0) return (detailsRenderData.value = []); |
|
|
|
|
|
|
|
|
|
// 合并起始索引 |
|
|
|
|
let mergeStartIndex = 0; |
|
|
|
@ -944,9 +947,9 @@ const handleData = async () => {
|
|
|
|
|
|
|
|
|
|
console.log('_data :>> ', _data); |
|
|
|
|
|
|
|
|
|
details.renderData = _data; |
|
|
|
|
handleTranslationDataSeclect(details.renderData, details.detailsColumnList); |
|
|
|
|
console.log('details.renderData :>> ', details.renderData); |
|
|
|
|
detailsRenderData.value = _data; |
|
|
|
|
handleTranslationDataSeclect(detailsRenderData.value, details.detailsColumnList); |
|
|
|
|
console.log('detailsRenderData.value :>> ', detailsRenderData.value); |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
/** 表格表头输入框搜索 */ |
|
|
|
|