From 193bd433be6806ff917c24c63c109e79fd00a6da Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 25 三月 2024 16:02:49 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/tool/value-table.vue | 172 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 111 insertions(+), 61 deletions(-)
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index 5407b08..065c628 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -36,26 +36,32 @@
}
</style>
<style>
- .value-table .highlight-warning-row-border td{
- border-top: 2px solid #ffcd29;
- border-bottom: 2px solid #ffcd29;
- }
- .value-table .highlight-warning-row-border td:first-child{
- border-left: 2px solid #ffcd29;
- }
- .value-table .highlight-warning-row-border td:last-child{
- border-right: 2px solid #ffcd29;
- }
- .value-table .highlight-danger-row-border td{
- border-top: 2px solid red;
- border-bottom: 2px solid red;
- }
- .value-table .highlight-danger-row-border td:first-child{
- border-left: 2px solid red;
- }
- .value-table .highlight-danger-row-border td:last-child{
- border-right: 2px solid red;
- }
+ /* .value-table .highlight-warning-row-border td {
+ border-top: 2px solid #ffcd29;
+ border-bottom: 2px solid #ffcd29;
+ } */
+
+ .value-table .highlight-warning-row-border td:first-child {
+ border-left: 4px solid #ffcd29;
+ }
+
+ .value-table .highlight-warning-row-border td:last-child {
+ border-right: 4px solid #ffcd29;
+ }
+
+ /* .value-table .highlight-danger-row-border td {
+ border-top: 2px solid red;
+ border-bottom: 2px solid red;
+ } */
+
+ .value-table .highlight-danger-row-border td:first-child {
+ border-left: 4px solid #f56c6c;
+ }
+
+ .value-table .highlight-danger-row-border td:last-child {
+ border-right: 4px solid #f56c6c;
+ }
+
.value-table .el-upload {
width: 100%;
}
@@ -67,56 +73,68 @@
<template>
<div class="value-table">
- <div class="table">
- <el-table ref="eltable" :data="tableData" style="width: 100%;" height="100%" tooltip-effect="dark" border
+ <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" :key="Math.random()" :row-class-name="tableRowClassName">
+ :summary-method="getSummaries" :row-class-name="tableRowClassName">
<el-table-column type="selection" width="65" v-if="data.showSelect" :key="Math.random()">
</el-table-column>
<el-table-column type="index" align="center" label="搴忓彿" width="70" v-if="data.isIndex" :key="Math.random()">
</el-table-column>
- <el-table-column :prop="a.label" :label="a.value" sortable="custom" v-for="(a, ai) in tableHead" :key="ai"
- show-overflow-tooltip min-width="160">
+ <el-table-column :prop="a.label" :label="a.value" :sortable="data.sort==false?false:'custom'"
+ v-for="(a, ai) in tableHead" :key="ai" show-overflow-tooltip min-width="160">
<template slot-scope="scope">
<div v-if="showType(a.label, data.tagField) != null">
- <el-tag v-for="(b, bi) in data.tagField[a.label].select" :key="bi" v-if="b.value == scope.row[a.label]"
- :type="b.type" size="medium">{{b.label}}</el-tag>
+ <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" 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" v-if="b.value == scope.row[a.label]"
+ :type="b.type" size="medium">{{b.label}}</el-tag>
+ </template>
</div>
- <!-- 鍙搷浣滆杩涜鐐瑰嚮浜嬩欢 -->
- <span v-else-if="data.linkEvent&&showLink(a.label, data.linkEvent)" style="color:#409EFF;cursor: pointer;" @click="handleLinkEvent(scope.row,data.linkEvent[a.label])">{{scope.row[a.label]}}</span>
+ <!-- 鍙搷浣滆杩涜鐐瑰嚮浜嬩欢 -->
+ <span v-else-if="data.linkEvent&&showLink(a.label, data.linkEvent)" style="color:#409EFF;cursor: pointer;"
+ @click="handleLinkEvent(scope.row,data.linkEvent[a.label])">{{scope.row[a.label]}}</span>
<span v-else>{{scope.row[a.label]}}</span>
</template>
</el-table-column>
- <el-table-column fixed="right" align="center" label="鎿嶄綔" :width="getWidth()"
- v-if="data.do.length > 0">
+ <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"
+ :disabled="a.disabFun ? a.disabFun(scope.row,scope.$index) : false"
@click="main(scope.row, a)">{{a.font}}</el-button>
</template>
</el-table-column>
</el-table>
</div>
- <div class="page">
+ <div class="page" v-if="data.isPage==undefined||data.isPage">
<el-pagination @size-change="sizeChange" @current-change="currentChange" :current-page="page.current"
:page-sizes="[10, 20, 30, 50, 100]" :page-size="page.size" layout="total, sizes, prev, pager, next, jumper"
- :total="total">
+ :total="total" >
</el-pagination>
</div>
<el-dialog title="缂栬緫" :visible.sync="upDia" :width="data.row==1?'500px':500+data.row * 200 + 'px'">
- <div class="body" v-if="upDia" style="max-height: 550px;overflow-y: auto;padding: 5px 0;">
+ <div class="body" v-if="upDia" 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;">
- <el-col :span="6/data.row" style="text-align: right;">
+ <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" :offset="1">
+ <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" :disabled="isDisabled(a.label)"></el-input>
- <el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
- style="width: 100%;" :disabled="isDisabled(a.label)" clearable>
+ <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>
<el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
- :label="b.label"></el-option>
+ :label="b.label">
+ </el-option>
</el-select>
</el-col>
</div>
@@ -129,8 +147,9 @@
<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" :disabled="isDisabled(a.label)"></el-input>
- <el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
- style="width: 100%;" :disabled="isDisabled(a.label)" clearable>
+ <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>
<el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
:label="b.label"></el-option>
</el-select>
@@ -213,11 +232,12 @@
import {
Page
} from 'iview';
+import { data } from 'jquery';
export default {
props: {
- tableRowClassName:{
- type: Function
- },
+ tableRowClassName: {
+ type: Function
+ },
url: {
type: String,
default: () => null
@@ -293,6 +313,7 @@
showSelect: false,
select: true,
row: 1,
+ isPage:true,//
do: [{
font: '鍒犻櫎',
type: 'text'
@@ -322,6 +343,7 @@
uploadDia: false,
token: null,
fileList: [],
+ init: true
}
},
watch: {
@@ -337,7 +359,9 @@
mounted() {
this.data = this.componentData
this.dataCopy = this.HaveJson(this.componentData)
- this.selectList()
+ if(this.data.init===undefined||this.data.init===true){
+ this.selectList()
+ }
this.token = {
'token': sessionStorage.getItem('token')
}
@@ -349,6 +373,13 @@
} else {
this.multipleSelection = val[val.length - 1];
}
+ if(this.data.selectMethod!=undefined){
+ if(this.$parent.$el.className.indexOf('el-')==0){
+ this.$parent.$parent[this.data.selectMethod](val)
+ }else{
+ this.$parent[this.data.selectMethod](val)
+ }
+ }
},
select(val, row) {
if (!this.data.select) {
@@ -374,6 +405,12 @@
},
selectList() {
this.loading = true
+ if(this.data.isPage!=undefined&&this.data.isPage!=true){
+ this.page = {
+ current: -1,
+ size: -1,
+ }
+ }
this.$axios.post(this.url, {
page: this.page,
entity: this.data.entity
@@ -389,6 +426,15 @@
this.total = res.data.body.total
this.tableHead = res.data.head
this.tableData = res.data.body.records
+ for (var a in this.data.selectField) {
+ if (this.data.selectField[a].choose == true) {
+ this.tableData.map(b => {
+ try {
+ b[a] = JSON.parse(b[a])
+ } catch (e) {}
+ })
+ }
+ }
this.loading = false
}).catch(e => {
this.loading = false
@@ -413,10 +459,10 @@
var str = ob[val]
return str == undefined ? null : ob[val].select
},
- showLink(val, ob){
- var str = ob[val]
+ showLink(val, ob) {
+ var str = ob[val]
return str == undefined ? null : ob[val].method
- },
+ },
showAddReq(label) {
if (this.data.requiredAdd == undefined) {
return
@@ -453,7 +499,7 @@
delete this.upData.createUser
delete this.upData.updateUser
val.field.forEach(a => {
- if (this.upData[a] == undefined) {
+ if (this.upData[a] === undefined) {
this.upHead.push({
value: a.split('=')[0],
label: a.split('=')[1]
@@ -495,7 +541,6 @@
} else {
delete row.orderBy
this.$parent[val.method](row)
- // this.$emit(val.method, row)
}
},
saveUpData() {
@@ -504,7 +549,7 @@
return
}
for (var i = 0; i < this.data.requiredUp.length; i++) {
- if (this.upData[this.data.requiredUp[i]] == null || this.upData[this.data.requiredUp[i]] == '') {
+ if (this.upData[this.data.requiredUp[i]] === null || this.upData[this.data.requiredUp[i]] === '') {
var list = this.upHead.filter(a => {
if (a.label == this.data.requiredUp[i]) return a
})
@@ -514,6 +559,11 @@
}
}
this.upLoad = true
+ for (var a in this.data.selectField) {
+ if (this.data.selectField[a].choose == true) {
+ this.upData[a] = JSON.stringify(this.upData[a])
+ }
+ }
this.$axios.post(this.upUrl, this.upData, {
headers: {
'Content-Type': 'application/json'
@@ -552,7 +602,7 @@
}
}
val.field.forEach(a => {
- if (JSON.stringify(this.upData[a]) == undefined) {
+ if (JSON.stringify(this.upData[a]) === undefined) {
this.upHead.push({
value: a.split('=')[0],
label: a.split('=')[1]
@@ -728,16 +778,16 @@
});
return sums;
},
- handleLinkEvent(row,val){
- if(val.method=='doDiy'){
- this.main(row,val)
- }else{
- this.$emit(val.method,row)
- }
- },
- getWidth(){
+ handleLinkEvent(row, val) {
+ if (val.method == 'doDiy') {
+ this.main(row, val)
+ } else {
+ this.$parent[val.method](row)
+ }
+ },
+ getWidth() {
let count = 0
- this.data.do.forEach(a=>{
+ this.data.do.forEach(a => {
count += a.font.length
})
return count * 15 + 60 + 'px'
--
Gitblit v1.9.3