From ff345ebb3fcece2ebafc3333b895d9481bd9435e Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 04 一月 2023 15:52:56 +0800
Subject: [PATCH] 1.列展示设置 功能基本实现，细节待优化
---
src/views/jcsz/zzjg.vue | 250 ++++++++++++++++++++++++++++++-----------
src/views/xtsz/bmgz.vue | 8
src/components/DndList/index.vue | 69 +++++++++--
src/components/TableColumnSettings/index.vue | 33 +---
4 files changed, 251 insertions(+), 109 deletions(-)
diff --git a/src/components/DndList/index.vue b/src/components/DndList/index.vue
index 5b95007..abb23e6 100644
--- a/src/components/DndList/index.vue
+++ b/src/components/DndList/index.vue
@@ -2,30 +2,32 @@
<div class="dndList">
<div :style="{width:'100%'}" class="dndList-list">
<div style="display: flex;justify-content: space-between;">
- <el-checkbox v-model="checkedAll" @change="checkedAllClick">鍒楀睍绀�</el-checkbox>
+ <el-checkbox v-model="checkedAll" @change="checkedAllChange">鍒楀睍绀�</el-checkbox>
<div style="cursor: pointer" :style="{color:$store.state.settings.theme}" @click="resetColumn">閲嶇疆</div>
</div>
- <el-checkbox-group v-model="checkedList">
+ <el-checkbox-group v-model="checkedList" @change="checkedListChange">
<draggable :set-data="setData" :list="list1" class="dragArea" animation="300" @end="draggableEnded">
<div v-for="item in list1" :key="item.id" class="list-complete-item">
<div style="display: flex">
<div style="width: 20px;height: 20px;margin-right: 4px;cursor:move"><i class="el-icon-rank" /></div>
- <el-checkbox :label="item.name" class="list-complete-item-handle" />
+ <el-checkbox :label="item.label" class="list-complete-item-handle" />
</div>
<div>
<el-tooltip class="item" effect="dark" content="鍥哄畾鍒板乏渚�" placement="bottom">
<i
- style="transform:rotate(90deg);cursor:pointer;"
+ style="transform:rotate(90deg);cursor:pointer;font-weight: bolder"
class="el-icon-download"
- @click="fixedToLeft(item.name)"
+ :style="{color:item.fixed==='left'?$store.state.settings.theme:''}"
+ @click="fixedToLeft(item.label)"
/>
</el-tooltip>
<el-divider direction="vertical" />
<el-tooltip class="item" effect="dark" content="鍥哄畾鍒板彸渚�" placement="bottom">
<i
- style="transform:rotate(-90deg);cursor:pointer"
+ style="transform:rotate(-90deg);cursor:pointer;font-weight: bolder"
class="el-icon-download"
- @click="fixedToRight(item.name)"
+ :style="{color:item.fixed==='right'?$store.state.settings.theme:''}"
+ @click="fixedToRight(item.label)"
/>
</el-tooltip>
</div>
@@ -51,12 +53,19 @@
return []
}
}
+
},
data() {
return {
- checkedList: ['妤兼潕淇�2'],
+ checkedList: this.list1.map(i => i.show ? i.label : '').filter(i => i !== ''), // 鍒楀睍绀哄��
+ checkedListDefaultLabel: this.list1.map(i => i.show ? i.label : '').filter(i => i !== ''), // 閲嶇疆榛樿鍊糽abel
+ // checkedListDefaultFixed: this.list1.map(i => i.show ? i.label : '').filter(i => i !== ''), // 閲嶇疆榛樿鍊糵ixed
checkedAll: true
}
+ },
+ created() {
+ },
+ mounted() {
},
methods: {
setData(dataTransfer) {
@@ -64,20 +73,54 @@
// Detail see : https://github.com/RubaXa/Sortable/issues/1012
dataTransfer.setData('Text', '')
},
+ // 閲嶇疆
resetColumn() {
- console.log('resetColumn')
+ this.checkedList = this.checkedListDefaultLabel
+ this.list1.forEach((i, j) => {
+ i.show = !!this.checkedListDefaultLabel.includes(i.label)
+ })
+ this.$emit('tableColumnUpdate', this.checkedListDefaultLabel)
},
- checkedAllClick() {
- console.log('checkedAllClick')
+ // 鍒楀睍绀�
+ checkedAllChange() {
+ this.list1.forEach(i => {
+ if (this.checkedAll) {
+ i.show = true
+ this.checkedList = this.list1.map(j => j.label)
+ } else {
+ i.show = false
+ this.checkedList = []
+ }
+ })
+ this.$emit('tableColumnUpdate', this.checkedList)
},
+ // 鍥哄畾鍒板乏渚�
fixedToLeft(val) {
console.log('fixedToLeft', val)
+ this.list1.find(i => i.label === val).fixed = this.list1.find(i => i.label === val).fixed !== 'left' ? 'left' : false
+ this.$emit('tableColumnUpdate', this.checkedList)
},
+ // 鍥哄畾鍒板彸渚�
fixedToRight(val) {
console.log('fixedToRight', val)
+ this.list1.find(i => i.label === val).fixed = this.list1.find(i => i.label === val).fixed !== 'right' ? 'right' : false
+ this.$emit('tableColumnUpdate', this.checkedList)
},
+ // 鎷栧姩缁撴潫浜嬩欢
draggableEnded({ to, from, item, clone, oldIndex, newIndex }) {
console.log(to, from, item, clone, oldIndex, newIndex)
+
+ // console.log(this.list1, 123456789)
+ this.$emit('tableColumnUpdate', this.list1, true)// 浼犵粰鐖风埛 isCopyTrue:澶嶅�肩粰鐖风埛
+ },
+ // 澶氶�夋鍊兼敼鍙樹簨浠�
+ checkedListChange(val) {
+ console.log(val, 1)
+ this.checkedAll = val.length !== 0
+ this.list1.forEach((i, j) => {
+ i.show = !!val.includes(i.label)
+ })
+ this.$emit('tableColumnUpdate', val)
}
}
}
@@ -86,7 +129,7 @@
<style lang="scss" scoped>
.dndList {
background: #fff;
- padding-bottom: 40px;
+ //padding-bottom: 40px;
&:after {
content: "";
@@ -96,7 +139,7 @@
.dndList-list {
float: left;
- padding-bottom: 30px;
+ //padding-bottom: 30px;
&:first-of-type {
margin-right: 2%;
diff --git a/src/components/TableColumnSettings/index.vue b/src/components/TableColumnSettings/index.vue
index daf1bf0..09f214e 100644
--- a/src/components/TableColumnSettings/index.vue
+++ b/src/components/TableColumnSettings/index.vue
@@ -5,8 +5,8 @@
width="265"
trigger="click"
>
- <dnd-list :list1="list1" />
-
+ <!-- <dnd-list :list1="list1" v-bind="$attrs" v-on="$listeners" />-->
+ <dnd-list v-bind="$attrs" v-on="$listeners" />
<el-button
slot="reference"
style="cursor: pointer;position: absolute;padding:0;top:11px;right: 60px;z-index: 99;"
@@ -24,26 +24,15 @@
export default {
name: 'Index',
- components: { DndList },
- props: {
- list1: {
- type: Array,
- default() {
- return []
- }
- }
- },
- data() {
- return {
- // list1: [
- // { id: 1, name: '棰勮瀹屽伐鏃堕棿' },
- // { id: 2, name: '妤兼潕淇�2' },
- // { id: 3, name: '妤兼潕淇�3' },
- // { id: 4, name: '妤兼潕淇�4' }
- // ]
- }
- },
- methods: {}
+ components: { DndList }
+ // props: {
+ // list1: {
+ // type: Array,
+ // default() {
+ // return []
+ // }
+ // }
+ // }
}
</script>
diff --git a/src/views/jcsz/zzjg.vue b/src/views/jcsz/zzjg.vue
index f7bce7a..543ab21 100644
--- a/src/views/jcsz/zzjg.vue
+++ b/src/views/jcsz/zzjg.vue
@@ -53,9 +53,13 @@
/>
</div>
<div class="elTableDiv">
- <TableColumnSettings :list1="list1" />
+ <TableColumnSettings
+ :list1="tableColumnSettingsArray"
+ @tableColumnUpdate="tableColumnUpdate"
+ />
<el-table
ref="tableDataRef"
+ :key="tableTimeStampKey"
class="tableFixed"
:data="tableData"
border
@@ -68,71 +72,87 @@
@sort-change="sortChange"
>
+ <el-table-column
+ v-for="item in tableColumnSettingsArray"
+ v-if="item.show"
+ :key="item.id"
+ :sortable="item.sortable"
+ :prop="item.prop"
+ :min-width="item.minWidth"
+ :label="item.label"
+ :width="item.width"
+ show-tooltip-when-overflow
+ :fixed="item.fixed?(item.fixed==='left'?'left':'right'):false"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row[item.prop]==='D'">閮ㄩ棬</div>
+ <div v-else-if="row[item.prop]==='W'">杞﹂棿</div>
+ <div v-else-if="row[item.prop]===null">/</div>
+ <div v-else>{{ row[item.prop] }}</div>
+ </template>
+ </el-table-column>
+
<!-- <el-table-column-->
- <!-- type="selection"-->
+ <!-- prop="RowNum"-->
<!-- width="50"-->
+ <!-- label="搴忓彿"-->
+ <!-- fixed-->
<!-- />-->
- <el-table-column
- prop="RowNum"
- width="50"
- label="搴忓彿"
- fixed
- />
- <el-table-column
- prop="org_code"
- label="缁勭粐缂栫爜"
- sortable="custom"
- show-tooltip-when-overflow
- min-width="110"
- />
- <el-table-column
- prop="org_name"
- label="缁勭粐鍚嶇О"
- sortable="custom"
- show-tooltip-when-overflow
- min-width="110"
- />
- <el-table-column
- prop="description"
- label="缁勭粐绫诲瀷"
- min-width="110"
- show-tooltip-when-overflow
- sortable="custom"
- >
- <template slot-scope="{row}">
- <!-- <div v-if="row.description==='F'">宸ュ巶</div>-->
- <div v-if="row.description==='D'">閮ㄩ棬</div>
- <div v-if="row.description==='W'">杞﹂棿</div>
- <!-- <div v-if="row.description==='K'">绉戝</div>-->
- <!-- <div v-if="row.description==='L'">鐢熶骇绾�</div>-->
- </template>
- </el-table-column>
- <el-table-column
- prop="parentorg_name"
- label="涓婄骇鍗曚綅"
- sortable="custom"
- show-tooltip-when-overflow
- min-widt="110"
- >
- <template slot-scope="{row}">
- <div v-if="row.parentorg_name===null">/</div>
- <div v-else>{{ row.parentorg_name }}</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="lm_user"
- label="鍒涘缓浜哄憳"
- width="110"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="lm_date"
- label="鍒涘缓鏃堕棿"
- width="160"
- show-tooltip-when-overflow
- sortable="custom"
- />
+ <!-- <el-table-column-->
+ <!-- prop="org_code"-->
+ <!-- label="缁勭粐缂栫爜"-->
+ <!-- sortable="custom"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- min-width="110"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="org_name"-->
+ <!-- label="缁勭粐鍚嶇О"-->
+ <!-- sortable="custom"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- min-width="110"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="description"-->
+ <!-- label="缁勭粐绫诲瀷"-->
+ <!-- min-width="110"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <!– <div v-if="row.description==='F'">宸ュ巶</div>–>-->
+ <!-- <div v-if="row.description==='D'">閮ㄩ棬</div>-->
+ <!-- <div v-if="row.description==='W'">杞﹂棿</div>-->
+ <!-- <!– <div v-if="row.description==='K'">绉戝</div>–>-->
+ <!-- <!– <div v-if="row.description==='L'">鐢熶骇绾�</div>–>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="parentorg_name"-->
+ <!-- label="涓婄骇鍗曚綅"-->
+ <!-- sortable="custom"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- min-widt="110"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.parentorg_name===null">/</div>-->
+ <!-- <div v-else>{{ row.parentorg_name }}</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="lm_user"-->
+ <!-- label="鍒涘缓浜哄憳"-->
+ <!-- width="110"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="lm_date"-->
+ <!-- label="鍒涘缓鏃堕棿"-->
+ <!-- width="160"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- />-->
<el-table-column
fixed="right"
label="鎿嶄綔"
@@ -246,6 +266,7 @@
components: {
Pagination, TableColumnSettings
},
+
data() {
// const validateName = (rule, value, callback) => {
// if (!value) {
@@ -288,14 +309,91 @@
// { label: '绉戝', value: 'K' },
// { label: '鐢熶骇绾�', value: 'L' }
],
-
- list1: [
- { name: '棰勮寮�宸ユ椂闂�', id: 1 },
- { name: '妤兼潕淇�1', id: 2 },
- { name: '妤兼潕淇�2', id: 3 },
- { name: '妤兼潕淇�3', id: 4 },
- { name: '妤兼潕淇�4', id: 5 }
+ tableColumnSettingsArray: [
+ { minWidth: 50, width: false, prop: 'id', label: 'id', id: 1, show: false, fixed: false, sortable: false }, // 闅愯棌鍒� show: false闅愯棌锛宼rue鏄剧ず
+ { minWidth: 25, width: 50, prop: 'RowNum', label: '搴忓彿', id: 2, show: true, fixed: 'left', sortable: false }, // custom
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'org_code',
+ label: '缁勭粐缂栫爜',
+ id: 3,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'org_name',
+ label: '缁勭粐鍚嶇О',
+ id: 4,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'description',
+ label: '缁勭粐绫诲瀷',
+ id: 5,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'parent_id',
+ label: '涓婄骇id',
+ id: 6,
+ show: false,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'parentorg_code',
+ label: '涓婄骇缂栫爜',
+ id: 7,
+ show: false,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'parentorg_name',
+ label: '涓婄骇鍗曚綅',
+ id: 8,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'lm_user',
+ label: '鍒涘缓浜哄憳',
+ id: 9,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'lm_date',
+ label: '鍒涘缓鏃堕棿',
+ id: 10,
+ show: true,
+ fixed: false,
+ sortable: true
+ }
],
+ tableTimeStampKey: new Date().getTime(), // 琛ㄦ牸key
total: 10,
tableData: [],
@@ -363,6 +461,18 @@
},
methods: {
+ tableColumnUpdate(val, isCopyTrue) {
+ console.log(val, isCopyTrue, 1111)
+ if (isCopyTrue) {
+ this.tableColumnSettingsArray = val
+ }
+
+ this.tableTimeStampKey = new Date().getTime()
+
+ // this.$nextTick(() => {
+ this.$refs.tableDataRef.doLayout()
+ // })
+ },
async getOrganizationSearch() {
const res = await OrganizationSearch(this.form)
this.tableData = res.data
diff --git a/src/views/xtsz/bmgz.vue b/src/views/xtsz/bmgz.vue
index 67021e0..ab4c052 100644
--- a/src/views/xtsz/bmgz.vue
+++ b/src/views/xtsz/bmgz.vue
@@ -98,7 +98,7 @@
</el-table-column>
<el-table-column
prop="filingdate"
- label="鎻愪氦鏃ユ湡"
+ label="缂栫爜鏍煎紡"
show-tooltip-when-overflow
sortable="custom"
>
@@ -148,7 +148,7 @@
</div>
<el-dialog
- :title="operation==='add'?'鏂板':'缂栫爜鏍煎紡'"
+ :title="operation==='add'?'鏂板':'缂栬緫鏍煎紡'"
:visible.sync="dialogVisible"
width="50%"
top="15vh"
@@ -161,7 +161,7 @@
<el-form-item label="鍥哄畾瀛楃" prop="prefix">
<el-input v-model="dialogForm.prefix" style="width: 220px" />
</el-form-item>
- <el-form-item prop="filingdate" label="鎻愪氦鏃ユ湡">
+ <el-form-item prop="filingdate" label="缂栫爜鏍煎紡">
<el-select
v-model="dialogForm.filingdate"
style="width: 220px"
@@ -248,7 +248,7 @@
rightcode: '', // 鍔熻兘缂栫爜
rightname: '', // 鍔熻兘鍚嶇О
prefix: '', // 鍥哄畾瀛楃
- filingdate: '', // 鎻愪氦鏃ユ湡
+ filingdate: '', // 缂栫爜鏍煎紡
incbit: '' // 鑷浣嶆暟
},
operation: '',
--
Gitblit v1.9.3