|
|
@@ -213,7 +213,7 @@
|
|
|
<!-- <p v-else-if=" scope.row.completion == 100">已完成</p>-->
|
|
|
<!-- <el-progress :percentage="scope.row.completion" v-else></el-progress>-->
|
|
|
<!-- </template>-->
|
|
|
- <template v-if="columnData.type != 5" #operate="scope">
|
|
|
+ <template v-if="columnData.type != 5 && columnData.type != 6" #operate="scope">
|
|
|
<template v-for="(item, i) in columnData.columnBtnsList">
|
|
|
<template v-if="item.value == 'edit'">
|
|
|
<el-button size="mini" type="text" :key="i" :disabled="config.webType == 3 && [1, 2, 5].indexOf(scope.row.flowState) > -1" @click="columnBtnsHandel(item.value, scope.row)"
|
|
|
@@ -348,7 +348,7 @@
|
|
|
</vxe-grid>
|
|
|
</div>
|
|
|
|
|
|
- <div v-loading="loading" v-if="columnData.type == 6" class="box-content" style="margin-left: 0; position: relative; padding-bottom: 60px">
|
|
|
+ <div v-loading="loading" v-else-if="columnData.type == 6" class="box-content" style="margin-left: 0; position: relative; padding-bottom: 60px">
|
|
|
<div style="padding: 15px 10px; display: flex; algin-items: center">
|
|
|
<div v-for="(item, i) in columnData.btnsList" :key="i" style="margin-left: 10px; height: 20px; display: flex; align-items: center">
|
|
|
<el-button size="mini" v-if="item.value !== 'journal'" :type="i === 0 ? 'primary' : 'text'" :icon="item.icon" @click="headBtnsHandel(item.value, item.importStatus)" :key="i">
|
|
|
@@ -368,7 +368,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<CardTemplate
|
|
|
- v-if="cardData.length > 0 && loading == false"
|
|
|
+ v-if="cardData.length > 0"
|
|
|
:columnList="columnData.columnList"
|
|
|
:cardInfo="columnData.cardTypeStyle"
|
|
|
:btnList="columnData.columnBtnsList"
|
|
|
@@ -2557,12 +2557,8 @@ export default {
|
|
|
// 重新渲染表格
|
|
|
async refreshTableLayout(foreignTableId = [], isRefresh = false) {
|
|
|
// eslint-disable-next-line no-unused-vars
|
|
|
- if ((this.columnData.type = 6)) {
|
|
|
+ if (this.columnData.type == 6) {
|
|
|
this.cardData = []
|
|
|
- this.loading = true
|
|
|
- setTimeout(() => {
|
|
|
- this.loading = false
|
|
|
- }, 1000)
|
|
|
}
|
|
|
await this.initData((foreignTableId = []), (isRefresh = false))
|
|
|
|
