From cd0252da419d4065e322b945da2d836796bc0e1f Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 29 四月 2024 11:23:46 +0800
Subject: [PATCH] 合并冲突
---
src/components/tool/value-table.vue | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index 593b320..6e40efb 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -85,11 +85,11 @@
width: 100%;
}
- .handleBtn.is-disabled .el-upload:focus {
+ .value-table .handleBtn.is-disabled .el-upload:focus {
color: #C0C4CC !important;
}
- .avatar-uploader .el-upload {
+ .value-table .avatar-uploader .el-upload {
height: 80px;
display: flex;
align-items: center;
@@ -105,7 +105,7 @@
@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">
+ :span-method="spanMethod" :key="specialKey">
<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="65" v-if="data.isIndex" :key="Math.random()">
@@ -157,7 +157,7 @@
</el-pagination>
</div>
<el-dialog title="缂栬緫" :visible.sync="upDia" :width="data.row==1?'500px':500+data.row * 200 + 'px'" append-to-body>
- <div class="body" v-if="upDia" style="max-height: 550px;overflow-y: auto;padding: 5px 10px 5px 0;">
+ <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;">
<el-col :span="6/data.row" style="text-align: right;" :offset="1">
@@ -183,7 +183,7 @@
style="width: 80px;height: 80px;border-radius: 6px;">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
- <el-cascader :value="upData[a.label]" :options="data.cascaderField[a.label].tree"
+ <el-cascader :value="upData[a.label]" :options="data.cascaderField[a.label].tree" :show-all-levels="false"
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>
@@ -236,6 +236,7 @@
<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>
<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"
:label="b.label"></el-option>
@@ -251,7 +252,7 @@
</el-upload>
<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></el-cascader>
+ @change="m=>handleCascader(m,a.label)" filterable :show-all-levels="false"></el-cascader>
</el-col>
</div>
</div>
@@ -263,6 +264,7 @@
<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>
<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"
:label="b.label"></el-option>
@@ -278,7 +280,7 @@
</el-upload>
<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></el-cascader>
+ @change="m=>handleCascader(m,a.label)" filterable :show-all-levels="false"></el-cascader>
</el-col>
</el-row>
</div>
@@ -446,18 +448,9 @@
// position:0
// }
],
- param: {}
+ param: {},
+ specialKey:'table-'
}
- },
- watch: {
- tableData: {
- deep: true,
- handler: function() {
- this.$nextTick(() => {
- this.$refs.eltable.doLayout()
- })
- }
- },
},
beforeUpdate() {
this.$nextTick(() => {
@@ -473,6 +466,7 @@
this.token = {
'token': sessionStorage.getItem('token')
}
+ this.specialKey = this.specialKey+Math.random()*100;
},
methods: {
rowspan(spanArr, position, spanName) {
@@ -708,7 +702,7 @@
else if (val.method == 'doDiy') {
if (val.id == 'update') {
this.upDia = true,
- this.upData = this.HaveJson(row)
+ this.upData = this.HaveJson(row)
this.upHead = this.HaveJson(this.tableHead)
this.upHead.forEach((item, index) => {
if (this.data.cascaderField && this.data.cascaderField[item.label]) {
@@ -873,6 +867,11 @@
}
}
this.addLoad = true
+ for (var a in this.data.selectField) {
+ if (this.data.selectField[a].choose == true) {
+ this.upData[a] = JSON.stringify(this.upData[a])
+ }
+ }
this.upHead.forEach((item, index) => {
if (this.data.cascaderField && this.data.cascaderField[item.label]) {
if (this.upData[item.label]) {
--
Gitblit v1.9.3