From 82a0439f46b893e008ce9156ab172fb3de7f1060 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 12 四月 2024 14:15:39 +0800
Subject: [PATCH] 表单修改
---
src/views/common/ztt-table.vue | 98 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 73 insertions(+), 25 deletions(-)
diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue
index fb445e3..794915e 100644
--- a/src/views/common/ztt-table.vue
+++ b/src/views/common/ztt-table.vue
@@ -150,6 +150,7 @@
v-on="$listeners"
:highlight-current-row="true"
:row-key="rowKey"
+ :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
@row-dblclick="dbClickRow"
@row-contextmenu="contextMenu"
@header-click="headClick"
@@ -164,7 +165,7 @@
:span-method="objectSpanMethod"
:header-cell-style="tableHeaderStyle"
v-adaptive="{ bottomOffset: bottomOffset, fixedHeight: fixedHeight }"
- height="100px"
+ height="300px"
:class="[
'commonTable',
isGeneralSearch && !isEdit
@@ -174,6 +175,7 @@
v-loading="dataListLoading"
element-loading-text="鍔犺浇涓�..."
element-loading-spinner="el-icon-loading"
+ :expand-row-keys="expandRowKeys"
>
<!--澶氶�夋嫨妗�-->
<el-table-column
@@ -182,6 +184,7 @@
v-if="options.multiSelect && !isEdit"
style="width: 55px;"
:selectable="selectHandle"
+
>
</el-table-column>
<!--鍗曢�夋-->
@@ -324,8 +327,13 @@
<template v-else>
<template v-if="!item.render">
<template v-if="item.formatter">
- <span v-if="item.isTag" style="text-align: center;">
+ <span v-if="item.isTag&&scope.row[item.prop]!=null" style="text-align: center;">
<el-tag style="width:60px;margin: 3px;" :type="scope.row[item.prop] == 0 ? 'success' : 'info'">
+ <span v-html="item.formatter(scope.row, item, scope.row[item.prop])"></span>
+ </el-tag>
+ </span>
+ <span v-if="item.isTags&&scope.row[item.prop]!=null" style="text-align: center;">
+ <el-tag style="width:60px;margin: 3px;" :type="scope.row[item.prop] == '姝ｅ父' ? 'success' : (scope.row[item.prop] == '寮傚父'?'warning':(scope.row[item.prop] == '杩斾慨'?'danger':'info'))">
<span v-html="item.formatter(scope.row, item, scope.row[item.prop])"></span>
</el-tag>
</span>
@@ -508,8 +516,9 @@
<div class="el-upload__tip" slot="tip" >
鍙兘涓婁紶xlsx/xls鏂囦欢锛屼笖涓嶈秴杩�10M<el-button
type="text"
- style="font-size:12px;"
- @click="downDataTemplate" v-if="uploadInfo.Download"
+ style="font-size:14px;text-decoration: underline;"
+ @click="downDataTemplate(uploadInfo.fileName)"
+ v-if="uploadInfo.download"
>涓嬭浇妯℃澘</el-button
>
</div>
@@ -546,6 +555,10 @@
column: {
type: Object,
default: null
+ },
+ expandRowKeys: {
+ type: Array,
+ default: ()=>[]
}
},
render: (h, data) => {
@@ -566,6 +579,17 @@
default: ()=>{
return 'id'
}
+ },
+ //闇�瑕佸悎骞剁殑瀛楁闆嗗悎
+ mergeSpanArr: {
+ type: Array,
+ default: ()=>{
+ return []
+ }
+ },
+ toolbarMaxLength: {
+ type: Number,
+ default: 5,
},
// 琛ㄦ牸鍨嬪彿锛歮ini,medium,small
tableSize: { type: String, default: 'small' },
@@ -754,11 +778,11 @@
return colList
},
getToolBarBtn() {
- return this.table.toolbar ? this.table.toolbar.slice(0, 5) : []
+ return this.table.toolbar ? this.table.toolbar.slice(0, this.toolbarMaxLength) : []
},
getToolbarDown() {
- return this.getToolBarBtn.length === 5
- ? this.table.toolbar.slice(5, this.table.toolbar.length)
+ return this.getToolBarBtn.length == this.toolbarMaxLength
+ ? this.table.toolbar.slice(this.toolbarMaxLength, this.table.toolbar.length)
: []
},
isRefreshBtn() {
@@ -923,27 +947,45 @@
},
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
if (this.options.tableCellMerge) {
- let result = ''
- this.$emit(
- 'objectSpanMethod',
- row,
- column,
- rowIndex,
- columnIndex,
- (val) => {
- if (val) {
- result = val
+ const propName = column.property
+ if (propName) {
+ if(this.mergeSpanArr.includes(propName)){
+ if (rowIndex > 0 && row[propName] === this.tableData[rowIndex - 1][propName]) {
+ return { rowspan: 0, colspan: 0 };
+ } else {
+ let rowspan = 1;
+ for (let i = rowIndex + 1; i < this.tableData.length; i++) {
+ if (this.tableData[i][propName] === row[propName]) {
+ rowspan++;
+ } else {
+ break;
+ }
+ }
+ return { rowspan: rowspan, colspan: 1 };
+ }
}
- }
- )
- if (result) {
- return result
}
+ // let result = ''
+ // this.$emit(
+ // 'objectSpanMethod',
+ // row,
+ // column,
+ // rowIndex,
+ // columnIndex,
+ // (val) => {
+ // console.log(val);
+ // if (val) {
+ // result = val
+ // }
+ // }
+ // )
+ // if (result) {
+ // return result
+ // }
}
},
getDataList(selectedId) {
- // this.dataListLoading = true
- this.dataListLoading = false
+ this.dataListLoading = true
var criteria = {}
criteria.dateTimeFilters = this.dateTimeFilters
criteria.multiSearchFilter = this.multiSearchFilter
@@ -969,6 +1011,7 @@
return this.doCallback(this.ajaxFun, arr, selectedId)
},
doCallback(fn, args, selectedId) {
+ this.tableData=[]
return fn
.apply(this, args)
.then((response) => {
@@ -1582,7 +1625,8 @@
if(response.data!=""&&response.data!=[]&&response.data!=null){
this.$message({
message: response.data,
- type: 'success'
+ type: 'success',
+ dangerouslyUseHTMLString: true,
})
}else{
this.$message({
@@ -1614,7 +1658,11 @@
const blob = new Blob([response.data], {
type: 'application/force-download'
})
- const filename = decodeURI('妯℃澘鏂囦欢.xlsx')
+ let fileName="妯℃澘鏂囦欢";
+ if(this.uploadInfo.fileName!=undefined&&this.uploadInfo.fileName!=''&&this.uploadInfo.fileName!=null){
+ fileName=this.uploadInfo.fileName
+ }
+ const filename = decodeURI(fileName+'.xlsx')
// 鍒涘缓涓�涓秴閾炬帴锛屽皢鏂囦欢娴佽祴杩涘幓锛岀劧鍚庡疄鐜拌繖涓秴閾炬帴鐨勫崟鍑讳簨浠�
const elink = document.createElement('a')
elink.download = filename
--
Gitblit v1.9.3