From 958ee855acb3431d2da10aa67e2e9453a268fcd4 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 26 十二月 2024 14:33:11 +0800
Subject: [PATCH] 修改cnasbug
---
src/components/tool/value-table.vue | 297 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 227 insertions(+), 70 deletions(-)
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index cf0b8b7..32d996a 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -52,6 +52,9 @@
.red{
color: red !important;
}
+ >>>.el-loading-parent--relative {
+ z-index: 1 !important;
+ }
</style>
<style>
/* .value-table .highlight-warning-row-border td {
@@ -104,22 +107,39 @@
display: inline-block;
margin-left: 200px;
}
+
</style>
<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.id"
- :current-row-key="data.currentId" :highlight-current-row="data.highlight===undefined||data.highlight"
- :span-method="spanMethod" :key="specialKey">
- <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="data.sort==false?false:'custom'" :isColumnWidth="isColumnWidth" :width="a.width"
+ <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">
@@ -130,7 +150,7 @@
</template>
</template>
<template v-else>
- <el-tag v-for="(b, bi) in data.tagField[a.label].select" :key="bi" v-if="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>
@@ -144,7 +164,8 @@
</el-table-column>
<el-table-column fixed="right" align="center" label="鎿嶄綔" :width="getWidth()" v-if="data.do.length > 0">
<template slot-scope="scope">
- <el-button v-for="(a, ai) in data.do" :key="ai" :type="a.type"
+ <el-button v-for="(a, ai) in data.do" :key="ai
+ +'qqqq'" :type="a.type"
:disabled="a.disabFun ? a.disabFun(scope.row,scope.$index) : false" @click="main(scope.row, a)"
class="handleBtn">
<span v-if="a.type!='upload'">{{a.font}}</span>
@@ -168,13 +189,13 @@
<el-dialog title="缂栬緫" :visible.sync="upDia" :width="data.row==1?'500px':540+data.row * 200 + 'px'" append-to-body>
<div class="body" style="max-height: 550px;overflow-y: auto;padding: 5px 10px 5px 0;">
<div v-if="data.row > 1">
- <div v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;">
+ <div v-for="(a, ai) in upHead" :key="ai+'ffff'" style="line-height: 50px;">
<el-col :span="6/data.row" style="text-align: right;" :offset="1">
<span class="required-span" v-if="showUpReq(a.label)">* </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)"
+ 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)"
@@ -196,17 +217,26 @@
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>
<div v-else>
- <el-row v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;">
+ <el-row v-for="(a, ai) in upHead" :key="ai+'ggggg'" style="line-height: 50px;">
<el-col :span="6" style="text-align: right;">
<span class="required-span" v-if="showUpReq(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)"
+ 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)"
@@ -225,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>
@@ -237,17 +276,17 @@
<el-dialog title="鏂板" :visible.sync="addDia" :width="data.row==1?'500px':540+data.row * 200 + 'px'" append-to-body>
<div class="body" v-if="addDia" style="max-height: 550px;overflow-y: auto;padding: 5px 10px 5px 0;">
<div v-if="data.row > 1">
- <div v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;">
+ <div v-for="(a, ai) in upHead" :key="ai+'yyyyy'" style="line-height: 50px;">
<el-col :span="6/data.row" style="text-align: right;" :offset="1"><span class="required-span"
v-if="showAddReq(a.label)">*
</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>
- <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
+ <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi+'hhhh'" :value="b.value"
:label="b.label"></el-option>
</el-select>
<el-upload :action="javaApi+data.addUploadConfig.url" v-if="showUpload(a.label)"
@@ -262,6 +301,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>
</div>
</div>
@@ -271,11 +319,11 @@
</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>
- <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
+ 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>
<el-upload :action="javaApi+data.addUploadConfig.url" v-if="showUpload(a.label)"
@@ -290,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>
@@ -327,14 +384,23 @@
</template>
<script>
- import {
- Page
- } from 'iview';
- import {
- data
- } from 'jquery';
+
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'
@@ -347,8 +413,18 @@
type: Boolean,
default: () => false
},
+ isShowZero: {
+ type: Boolean,
+ default: () => false
+ },
tableRowClassName: {
type: Function
+ },
+ rowKey: {
+ type: String,
+ default: ()=>{
+ return 'id'
+ }
},
url: {
type: String,
@@ -489,7 +565,21 @@
}
this.specialKey = this.specialKey+Math.random()*100;
},
+ watch: {
+ componentData: {
+ handler(newVal) {
+ this.data = newVal;
+ // this.selectList();
+ },
+ deep: true
+ },
+ },
methods: {
+ // 璁剧疆澶氶�夌姸鎬�
+ setSelect(row, index) {
+ let result = this.isSelectedList.includes(row.id)
+ return !result;
+ },
rowspan(spanArr, position, spanName) {
this.tableData.forEach((item, index) => {
if (index === 0) {
@@ -570,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) {
@@ -586,8 +679,8 @@
this.selectList('page')
},
selectList(val) {
- console.log('val---', val)
- console.log('this.page---', this.page)
+ // console.log('val---', val)
+ // console.log('this.page---', this.page)
this.loading = true
if(val===undefined){
this.page.current = 1;
@@ -609,33 +702,70 @@
'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 => {
+ if (item.label === this.data.needSort[i]) {
+ item.sort = 'custom'
+ }
+ })
+ }
+ }
+ if (this.isShowZero) {
+ this.tableData.map(item => {
+ Object.keys(item).forEach(val => {
+ if (item[val] === null && (val.includes('Hours') || val === 'total')) {
+ item[val] = 0
+ }
+ })
+ })
+ }
if (this.tableData.length === 0 && this.page.current > 1) {
this.selectList('lastPage')
}
- if (this.isColumnWidth) {
- this.tableHead.forEach(item => {
- if (item.value.length === 4) {
- item.width = 120
- } else if (item.value.length === 3){
- item.width = 100
- } else if (item.value.length === 5){
- item.width = 130
- } else if (item.value.length === 7){
- item.width = 160
- } else if (item.value.length === 6){
- item.width = 150
- } else {
- item.width = 86
- }
- })
- }
+ // if (this.isColumnWidth) {
+ // this.tableHead.forEach(item => {
+ // if(!item.width){
+ // if (item.value.length === 4) {
+ // item.width = 120
+ // } else if (item.value.length === 3){
+ // item.width = item.label.includes('Hours') ? 50 : 100
+ // } else if (item.value.length === 5){
+ // item.width = 130
+ // } else if (item.value.length === 7){
+ // item.width = 160
+ // } else if (item.value.length === 6){
+ // item.width = 150
+ // } else if (item.value.length === 2){
+ // item.width = item.label.includes('Hours') ? 52 : 86
+ // } else {
+ // item.width = item.label.includes('Hours') ? 46 : 86
+ // }
+ // }
+ // })
+ // }
+
// console.log(JSON.stringify(this.tableHead)+"---------"+JSON.stringify(this.tableData))
for (var a in this.data.selectField) {
if (this.data.selectField[a].choose == true) {
@@ -671,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('璇峰埛鏂伴〉闈㈠啀灏濊瘯')
})
@@ -735,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++) {
@@ -754,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]) {
@@ -812,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() {
@@ -916,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
}
@@ -1001,7 +1154,7 @@
eleLink.click()
document.body.removeChild(eleLink)
}).catch(e => {
- console.log(e);
+ // console.log(e);
this.loading = false
this.$message.error('璇峰埛鏂伴〉闈㈠啀灏濊瘯')
})
@@ -1134,7 +1287,7 @@
return
}
this.$message.success('鍒犻櫎鎴愬姛')
- this.selectList()
+ this.selectList('page')
}).catch(e => {
this.$message.error('鍒犻櫎澶辫触')
})
@@ -1149,20 +1302,24 @@
const list = JSON.parse(JSON.stringify(this.multipleSelection))
const url = e === 0 ? this.$api.auxiliaryWorkingHoursDay.check : this.$api.auxiliaryWorkingHoursDay.approve
const state = e === 0 ? '宸插鏍�' : '宸叉壒鍑�'
+ let auxiliaryWorkingHoursDays = []
list.forEach(item => {
- this.$axios.post(url, {id: item.id, state: state
- },{
- headers: {
- 'Content-Type': 'application/json'
- }
+ delete item.orderBy
+ item.state = state
+ auxiliaryWorkingHoursDays.push(item)
+ })
+ this.$axios.post(url, {auxiliaryWorkingHoursDays: auxiliaryWorkingHoursDays
+ },{
+ headers: {
+ 'Content-Type': 'application/json'
}
- ).then(res => {
- if (res.code === 201) {
- return
- }
- this.$parent.submitBatchCheckDialog()
- this.$message.success('鎿嶄綔鎴愬姛')
- })
+ }
+ ).then(res => {
+ if (res.code === 201) {
+ return
+ }
+ this.$parent.submitBatchCheckDialog()
+ this.$message.success('鎿嶄綔鎴愬姛')
})
} else {
this.$message.error('璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�')
@@ -1174,7 +1331,7 @@
}else{
return false
}
- }
+ },
}
}
</script>
--
Gitblit v1.9.3