提交代码

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/list_import.vue

@@ -42,7 +42,7 @@
                     <el-button @click="approveAll" style="margin-left:10px;" :disabled="list.length==0" size="small">{{ $t('throughwithoneclick') }}</el-button>
                 </el-form-item>
                 <el-form-item style="margin-left:20px;" v-if="permissions.importAudit">
-                   <el-link type="primary" @click="recordList(),recordDialogVisible = true,pageIndexList = 1,pageSizeList = 20">{{ $t('Auditrecords') }}</el-link>
+                   <el-link type="primary" @click="recordList(),showRecordDialogVisible()">{{ $t('Auditrecords') }}</el-link>
                 </el-form-item>
             </el-form>
         </el-col>
@@ -167,9 +167,9 @@
         </el-col>
 
         <!-- 审核记录弹窗 -->
-        <el-dialog :title="$t('Auditrecords')" :visible.sync="recordDialogVisible" width="800px" :before-close="handleClose">
-            <div style="height: 430px">
-                <el-table :data="recordLists" style="width: 100%" height="400" v-loading="recordLoading">
+        <el-dialog :title="$t('Auditrecords')" :visible.sync="recordDialogVisible" width="80vw" top="7.8vh" :before-close="handleClose">
+            <div style="height: 65vh" ref="recordListsDivRef" v-loading="recordLoading">
+                <el-table :data="recordLists" style="width: 100%;" :height="recordListsTableHeight">
                     <el-table-column prop="userName" :label="$t('other.operator')" width="150">
                         <template slot-scope="scope">
                             <div>
@@ -184,21 +184,21 @@
                         <template slot-scope="scope">
                             <div>
                                 <div v-if="scope.row.membdateList.length > 1">
-                                    <el-popover placement="top" width="400" trigger="hover">
-                                    <div>
-                                        <span v-for="(item, index) in scope.row.membdateList" :key="index">
-                                            <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.userName'></TranslationOpenDataText></span>
-                                            <span v-if="user.userNameNeedTranslate != '1'">{{item.userName}}</span>
-                                            /{{item.createDate}} <span v-if="scope.row.membdateList.length > 1 && scope.row.membdateList.length - 1 != index">,</span>
-                                        </span>
-                                    </div>
-                                    <div slot="reference" style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width: 180px;">
-                                        <span v-for="(item, index) in scope.row.membdateList" :key="index">
-                                            <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.userName'></TranslationOpenDataText></span>
-                                            <span v-if="user.userNameNeedTranslate != '1'">{{item.userName}}</span>
-                                            /{{item.createDate}} <span v-if="scope.row.membdateList.length > 1 && scope.row.membdateList.length - 1 != index">,</span>
-                                        </span>
-                                    </div>
+                                    <el-popover placement="top" width="500" trigger="hover">
+                                        <div class="popoverDiv">
+                                            <div v-for="(item, index) in scope.row.membdateList" :key="index" class="popoverDivItem">
+                                                <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.userName'></TranslationOpenDataText></span>
+                                                <span v-if="user.userNameNeedTranslate != '1'">{{item.userName}}</span>
+                                                /{{item.createDate}}
+                                            </div>
+                                        </div>
+                                        <div slot="reference" style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width: 180px;">
+                                            <span v-for="(item, index) in scope.row.membdateList" :key="index">
+                                                <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.userName'></TranslationOpenDataText></span>
+                                                <span v-if="user.userNameNeedTranslate != '1'">{{item.userName}}</span>
+                                                /{{item.createDate}} <span v-if="scope.row.membdateList.length > 1 && scope.row.membdateList.length - 1 != index">,</span>
+                                            </span>
+                                        </div>
                                     </el-popover>
                                 </div>
                                 <div style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width: 180px;" v-else>
@@ -272,11 +272,23 @@
                 totals: 0,
                 pageIndexList: 1,
                 pageSizeList: 20,
-                recordLoading: false
+                recordLoading: false,
+                recordListsTableHeight: '400'
 
             };
         },
         methods: {
+            showRecordDialogVisible() {
+                this.recordDialogVisible = true
+                this.pageIndexList = 1
+                this.pageSizeList = 20
+                setTimeout(() => {
+                    let element = this.$refs.recordListsDivRef.offsetHeight
+                    this.recordListsTableHeight = element - 55
+                    console.log(this.recordListsTableHeight, '<=== 高度')
+                }, 1000)
+                
+            },
             // 获取审核记录
             recordList() {
                 // this.recordDialogVisible = true
@@ -287,7 +299,9 @@
                     pageSize: this.pageSizeList
                 },
                 res => {
-                    this.recordLoading = false
+                    setTimeout(() => {
+                        this.recordLoading = false
+                    }, 1000)
                     if (res.code == "ok") {
                         console.log(res.data, '数据')
                         this.recordLists = res.data.records
@@ -300,7 +314,9 @@
                     }
                 },
                 error => {
-                    this.recordLoading = false
+                    setTimeout(() => {
+                        this.recordLoading = false
+                    }, 1000)
                     this.$message({
                         message: error,
                         type: "error"
@@ -629,4 +645,15 @@
     padding-left: 20px;
 }
 
+.popoverDiv {
+    display: flex;
+    flex-wrap: wrap;
+    max-height: 400px;
+    overflow-y: auto;
+    .popoverDivItem {
+        width: 33%;
+        text-align: center;
+    }
+}
+
 </style>