From d3a25e467d1d63808c6864874a021ada79180e4d Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 26 十二月 2024 14:30:56 +0800
Subject: [PATCH] 完成cnas8.4迁移
---
src/components/tool/value-table.vue | 215 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 151 insertions(+), 64 deletions(-)
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index 4d7ee4a..32d996a 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -4,10 +4,6 @@
height: 100%;
overflow-y: auto;
}
- >>>.el-table__row {
- cursor: move;
- position: relative;
- }
.table {
width: 100%;
@@ -117,28 +113,44 @@
<template>
<div class="value-table">
<div class="table" :style="data.isPage!=undefined&&data.isPage!=true?'height:100%':''">
- <el-table ref="eltable" :data="tableData" style="width: 100%;" height="100%" tooltip-effect="dark" border
- @selection-change="selectChange" @select="select" v-loading="loading" @sort-change="sortChange"
- @row-click="rowClick" :show-summary="data.countFleid!=undefined && data.countFleid.length > 0"
- :summary-method="getSummaries" :row-class-name="tableRowClassName" :row-key="record=>record[rowKey]"
- :current-row-key="data.currentId" :highlight-current-row="data.highlight===undefined||data.highlight"
- :span-method="spanMethod" :key="specialKey" :class="{sortable:data.sortable}">
- <el-table-column type="selection" :width="selectionWidth" v-if="data.showSelect" :key="Math.random()">
+ <el-table
+ ref="eltable"
+ v-loading="loading"
+ :data="tableData"
+ style="width: 100%;"
+ height="100%"
+ tooltip-effect="dark"
+ element-loading-text="鍔犺浇涓�..."
+ :border="true"
+ :show-summary="data.countFleid!=undefined && data.countFleid.length > 0"
+ :summary-method="getSummaries"
+ :row-class-name="tableRowClassName"
+ :row-key="record=>record[rowKey]"
+ :current-row-key="data.currentId"
+ :highlight-current-row="data.highlight===undefined||data.highlight"
+ :span-method="spanMethod"
+ :key="specialKey"
+ @selection-change="selectChange"
+ @select="select"
+ @sort-change="sortChange"
+ @row-click="rowClick"
+ element-loading-spinner="el-icon-loading">
+ <el-table-column :reserve-selection="isReserveSelection" type="selection" :width="selectionWidth" v-if="data.showSelect" :key="Math.random()">
</el-table-column>
<el-table-column type="index" align="center" label="搴忓彿" :width="selectionWidth" v-if="data.isIndex" :key="Math.random()">
</el-table-column>
- <el-table-column :prop="a.label" :label="a.value" :sortable="a.sort === 'custom' ? 'custom' : false" :isColumnWidth="isColumnWidth" :isShowZero="isShowZero"
- v-for="(a, ai) in tableHead" :key="ai+'bbbbb'" show-overflow-tooltip :min-width="columnMinWidth" v-if="!data.headNoShow||(data.headNoShow&&data.headNoShow.length==0)||(data.headNoShow&&data.headNoShow.length>0&&!data.headNoShow.find(d=>d==a.label))">
+ <el-table-column :prop="a.label" :label="a.value" :width="a.width" :sortable="a.sort === 'custom' ? 'custom' : false" :isColumnWidth="isColumnWidth" :isShowZero="isShowZero"
+ v-for="(a, ai) in tableHead" :key="ai" show-overflow-tooltip :min-width="columnMinWidth" v-if="!data.headNoShow||(data.headNoShow&&data.headNoShow.length==0)||(data.headNoShow&&data.headNoShow.length>0&&!data.headNoShow.find(d=>d==a.label))">
<template slot-scope="scope">
<div v-if="showType(a.label, data.tagField) != null">
<template v-if="typeof(scope.row[a.label]) == 'object'">
<template v-for="(param, i) in scope.row[a.label]">
- <el-tag v-for="(b, bi) in data.tagField[a.label].select" :key="bi+'cccc'" v-if="b.value == param"
+ <el-tag v-for="(b, bi) in data.tagField[a.label].select" :key="bi" v-if="b.value == param"
:type="b.type" size="medium" style="margin-right: 5px;">{{b.label}}</el-tag>
</template>
</template>
<template v-else>
- <el-tag v-for="(b, bi) in data.tagField[a.label].select" :key="bi+'ddddd'" v-show="b.value == scope.row[a.label]"
+ <el-tag v-for="(b, bi) in data.tagField[a.label].select" :key="bi" v-show="b.value == scope.row[a.label]"
:type="b.type" size="medium">{{b.label}}</el-tag>
</template>
</div>
@@ -183,12 +195,12 @@
</el-col>
<el-col :span="16/data.row">
<el-input v-model="upData[a.label]" size="small" clearable :placeholder="`璇疯緭鍏�${a.value}`"
- v-if="showType(a.label, data.selectField) == null&&!showUpload(a.label)&&!showCascader(a.label)"
+ v-if="showType(a.label, data.selectField) == null&&!showUpload(a.label)&&!showCascader(a.label)&&!showDatePicker(a.label)"
:disabled="isDisabled(a.label)"></el-input>
<el-select v-model="upData[a.label]" :multiple="data.selectField[a.label].choose" size="small"
v-if="showType(a.label, data.selectField) != null" style="width: 100%;" :disabled="isDisabled(a.label)"
clearable filterable>
- <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi+'eeeee'" :value="b.value"
+ <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
:label="b.label">
</el-option>
</el-select>
@@ -205,6 +217,15 @@
v-if="showCascader(a.label)" :placeholder="`璇烽�夋嫨${a.value}`" clearable
:props="data.cascaderField.props" size="small" style="width: 100%;"
@change="m=>handleCascader(m,a.label)" filterable></el-cascader>
+ <el-date-picker
+ v-if="showDatePicker(a.label)"
+ v-model="upData[a.label]"
+ type="date"
+ size="small"
+ placeholder="閫夋嫨鏃ユ湡"
+ format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd" style="width: 100%;">
+ </el-date-picker>
</el-col>
</div>
</div>
@@ -215,12 +236,12 @@
</el-col>
<el-col :span="16" :offset="1">
<el-input v-model="upData[a.label]" size="small" clearable :placeholder="`璇疯緭鍏�${a.value}`"
- v-if="showType(a.label, data.selectField) == null&&!showUpload(a.label)&&!showCascader(a.label)"
+ v-if="showType(a.label, data.selectField) == null&&!showUpload(a.label)&&!showCascader(a.label)&&!showDatePicker(a.label)"
:disabled="isDisabled(a.label)"></el-input>
<el-select v-model="upData[a.label]" :multiple="data.selectField[a.label].choose" size="small"
v-if="showType(a.label, data.selectField) != null" style="width: 100%;" :disabled="isDisabled(a.label)"
clearable filterable>
- <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi+'fffff'" :value="b.value"
+ <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
:label="b.label"></el-option>
</el-select>
<el-upload :action="javaApi+data.addUploadConfig.url" v-if="showUpload(a.label)" :multiple="false"
@@ -234,6 +255,15 @@
<el-cascader :value="upData[a.label]" :options="data.cascaderField[a.label].tree" :show-all-levels="false"
:placeholder="`璇烽�夋嫨${a.value}`" v-if="showCascader(a.label)" clearable :props="data.cascaderField.props"
size="small" style="width: 100%;" @change="m=>handleCascader(m,a.label)" filterable></el-cascader>
+ <el-date-picker
+ v-if="showDatePicker(a.label)"
+ v-model="upData[a.label]"
+ type="date"
+ size="small"
+ placeholder="閫夋嫨鏃ユ湡"
+ format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd" style="width: 100%;">
+ </el-date-picker>
</el-col>
</el-row>
</div>
@@ -252,7 +282,7 @@
</span>{{a.value}}锛�</el-col>
<el-col :span="16/data.row">
<el-input v-model="upData[a.label]" size="small" clearable :placeholder="`璇疯緭鍏�${a.value}`"
- v-if="showType(a.label, data.selectField) == null&&!showUpload(a.label)&&!showCascader(a.label)"></el-input>
+ v-if="showType(a.label, data.selectField) == null&&!showUpload(a.label)&&!showCascader(a.label)&&!showDatePicker(a.label)"></el-input>
<el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
:multiple="data.selectField[a.label].choose"
style="width: 100%;" :placeholder="`璇烽�夋嫨${a.value}`" clearable filterable>
@@ -271,19 +301,28 @@
<el-cascader :options="data.cascaderField[a.label].tree" v-if="showCascader(a.label)" clearable
:placeholder="`璇烽�夋嫨${a.value}`" :props="data.cascaderField.props" size="small" style="width: 100%;"
@change="m=>handleCascader(m,a.label)" filterable :show-all-levels="false"></el-cascader>
+ <el-date-picker
+ v-if="showDatePicker(a.label)"
+ v-model="upData[a.label]"
+ type="date"
+ size="small"
+ placeholder="閫夋嫨鏃ユ湡"
+ format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd" style="width: 100%;">
+ </el-date-picker>
</el-col>
</div>
</div>
<div v-else>
- <el-row v-for="(a, ai) in upHead" :key="ai+'jjjjj'" style="line-height: 50px;">
+ <el-row v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;">
<el-col :span="6" style="text-align: right;"><span class="required-span" v-if="showAddReq(a.label)">*
</span>{{a.value}}锛�</el-col>
<el-col :span="16" :offset="1">
<el-input v-model="upData[a.label]" size="small" clearable :placeholder="`璇疯緭鍏�${a.value}`"
- v-if="showType(a.label, data.selectField) == null&&!showUpload(a.label)&&!showCascader(a.label)"></el-input>
+ v-if="showType(a.label, data.selectField) == null&&!showUpload(a.label)&&!showCascader(a.label)&&!showDatePicker(a.label)"></el-input>
<el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
:multiple="data.selectField[a.label].choose"
- style="width: 100%;" :placeholder="`璇烽�夋嫨${a.value}`" clearable>
+ style="width: 100%;" :placeholder="`璇烽�夋嫨${a.value}`" clearable filterable>
<el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi+'mmmmmm'" :value="b.value"
:label="b.label"></el-option>
</el-select>
@@ -299,6 +338,15 @@
<el-cascader :options="data.cascaderField[a.label].tree" v-if="showCascader(a.label)" clearable
:placeholder="`璇烽�夋嫨${a.value}`" :props="data.cascaderField.props" size="small" style="width: 100%;"
@change="m=>handleCascader(m,a.label)" filterable :show-all-levels="false"></el-cascader>
+ <el-date-picker
+ v-if="showDatePicker(a.label)"
+ v-model="upData[a.label]"
+ type="date"
+ size="small"
+ placeholder="閫夋嫨鏃ユ湡"
+ format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd" style="width: 100%;">
+ </el-date-picker>
</el-col>
</el-row>
</div>
@@ -336,9 +384,23 @@
</template>
<script>
- import Sortable from 'sortablejs';
+
export default {
props: {
+ isReserveSelection:{
+ type: Boolean,
+ default: ()=> false
+ },
+ dateFormat: {
+ type: String,
+ default: () => 'yyyy-MM-dd HH:mm:ss'
+ },
+ isSelectedList: {
+ type: Array,
+ default: ()=>{
+ return []
+ }
+ },
selectionWidth: {
type: String,
default: () => '65'
@@ -502,36 +564,21 @@
'token': sessionStorage.getItem('token')
}
this.specialKey = this.specialKey+Math.random()*100;
- // 鏄惁鍙嫋鍔ㄥ垪琛�--姝ゅ姛鑳芥殏鏃舵湭瀹炵幇
- if(this.data.sortable){
- this.$nextTick(() => {
- this.initializeSortable()
- })
- }
},
+ watch: {
+ componentData: {
+ handler(newVal) {
+ this.data = newVal;
+ // this.selectList();
+ },
+ deep: true
+ },
+ },
methods: {
- initializeSortable() {
- let className =".el-table__body-wrapper > table > tbody";
- const table= document.querySelector(className);
- const self = this
- Sortable.create(table, {
- animation: 150, //鍔ㄧ敾鏃堕暱
- handle: ".el-table__row", //鍙嫋鎷藉尯鍩焎lass
- onEnd({ newIndex, oldIndex }) {
- console.log(3333,newIndex, oldIndex)
- const movedItem = this.tableData[oldIndex];
- this.tableData.splice(oldIndex, 1);
- this.tableData.splice(newIndex, 0, movedItem);
- }
- })
- },
- getUpdatedOrder() {
- // 鏍规嵁鎷栨嫿鍚庣殑椤哄簭鑾峰彇鏇存柊鐨勬暟鎹�
- // 杩欓噷闇�瑕佸疄鐜颁綘鐨勯�昏緫
- },
- updateTableData(newOrder) {
- // 鏍规嵁鏂扮殑椤哄簭鏇存柊琛ㄦ牸鏁版嵁
- // 杩欓噷闇�瑕佸疄鐜颁綘鐨勯�昏緫
+ // 璁剧疆澶氶�夌姸鎬�
+ setSelect(row, index) {
+ let result = this.isSelectedList.includes(row.id)
+ return !result;
},
rowspan(spanArr, position, spanName) {
this.tableData.forEach((item, index) => {
@@ -613,11 +660,14 @@
}
},
rowClick(row, column, event) {
- if (this.data.select) {
- this.$refs['eltable'].toggleRowSelection(row)
- } else {
- this.$refs['eltable'].clearSelection()
- this.$refs['eltable'].toggleRowSelection(row, true)
+ let result = this.isSelectedList.includes(row.id)
+ if(!result) {
+ if (this.data.select) {
+ this.$refs['eltable'].toggleRowSelection(row)
+ } else {
+ this.$refs['eltable'].clearSelection()
+ this.$refs['eltable'].toggleRowSelection(row, true)
+ }
}
},
sizeChange(val) {
@@ -652,13 +702,27 @@
'Content-Type': 'application/json'
}
}).then(res => {
+ this.$nextTick();
if (res.code === 201) {
this.loading = false
return
}
this.total = res.data.body.total
this.tableHead = res.data.head
- this.tableData = res.data.body.records
+ this.tableData = res.data.body.records || res.data.body
+ if(res.data.body.records){
+ this.$emit("getTableData",res.data.body.records)
+ }
+ if(this.dateFormat.trim() == 'yyyy-MM-dd') {
+ const dateTimeRegex = /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/; //鏍煎紡鍖栨椂闂翠负'yyyy-MM-dd HH:mm:ss'
+ this.tableData.map(item => {
+ Object.keys(item).forEach(val => {
+ if ( typeof item[val] == 'string' && dateTimeRegex.test(item[val])) {
+ item[val] = item[val].split(' ')[0]
+ }
+ })
+ })
+ }
if (this.data.needSort !== undefined) {
for (var i = 0; i < this.data.needSort.length; i++) {
this.tableHead.forEach(item => {
@@ -737,8 +801,11 @@
.spanConfig.special.main);
})
}
- this.loading = false
+ this.$nextTick(()=>{
+ this.loading = false
+ })
}).catch(e => {
+ console.log(e);
this.loading = false
this.$message.error('璇峰埛鏂伴〉闈㈠啀灏濊瘯')
})
@@ -801,6 +868,13 @@
return false;
}
},
+ showDatePicker(label){
+ if (this.data.datePicker && this.data.datePicker.find(m=>m==label)) {
+ return true;
+ } else {
+ return false;
+ }
+ },
handleTree(arr, value) {
let label = ''
for (let i = 0; i < arr.length; i++) {
@@ -820,6 +894,11 @@
this.upDia = true,
this.upData = this.HaveJson(row)
this.upHead = this.HaveJson(this.tableHead)
+ if(this.data.noHead&&this.data.noHead.length>0){
+ for (let i =0; i < this.data.noHead.length; i++) {
+ this.upHead = this.upHead.filter(item => item.label != this.data.noHead[i])
+ }
+ }
this.upHead.forEach((item, index) => {
if (this.data.cascaderField && this.data.cascaderField[item.label]) {
if (this.upData[item.label]) {
@@ -878,7 +957,14 @@
}
} else {
delete row.orderBy
- this.$parent[val.method](row)
+ if(this.$parent[val.method]){
+ this.$parent[val.method](row)
+ }else if(this.$parent.$parent[val.method]){
+ this.$parent.$parent[val.method](row)
+ }else if(this.$parent.$parent.$parent[val.method]){
+ this.$parent.$parent.$parent[val.method](row)
+ }
+
}
},
saveUpData() {
@@ -982,12 +1068,13 @@
this.$message.error('璇风粰娣诲姞璇锋眰鍦板潃')
return
}
+
for (var i = 0; i < this.data.requiredAdd.length; i++) {
- if (this.upData[this.data.requiredAdd[i]] === null || this.upData[this.data.requiredAdd[i]] === '') {
+ if (this.upData[this.data.requiredAdd[i]] === null || this.upData[this.data.requiredAdd[i]] === '' || this.upData[this.data.requiredAdd[i]] === undefined) {
var list = this.upHead.filter(a => {
if (a.label == this.data.requiredAdd[i]) return a
})
- if (list[0].value == undefined) continue
+ if (list[0].value == undefined || list[0].value == null || list[0].value == '') continue
this.$message.error(list[0].value + '鏄繀濉」')
return
}
@@ -1067,7 +1154,7 @@
eleLink.click()
document.body.removeChild(eleLink)
}).catch(e => {
- console.log(e);
+ // console.log(e);
this.loading = false
this.$message.error('璇峰埛鏂伴〉闈㈠啀灏濊瘯')
})
@@ -1244,7 +1331,7 @@
}else{
return false
}
- }
+ },
}
}
</script>
--
Gitblit v1.9.3