From 59ef8ccfa6240c5fa3c823d773aab15930af4d41 Mon Sep 17 00:00:00 2001 From: 李林 <z1292839451@163.com> Date: 星期二, 19 三月 2024 17:13:20 +0800 Subject: [PATCH] 功能调整 --- src/components/tool/value-table.vue | 136 +++++++++++++++++++++++++++----------------- 1 files changed, 83 insertions(+), 53 deletions(-) diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue index 78fa5f5..c8bce0f 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: 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 .el-upload { width: 100%; } @@ -76,23 +82,31 @@ </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="data.sort==false?false:'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" + :disabled="a.disabFun ? a.disabFun(scope.row,scope.$index) : false" @click="main(scope.row, a)">{{a.font}}</el-button> </template> </el-table-column> @@ -105,19 +119,21 @@ </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> @@ -130,8 +146,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> @@ -216,9 +233,9 @@ } from 'iview'; export default { props: { - tableRowClassName:{ - type: Function - }, + tableRowClassName: { + type: Function + }, url: { type: String, default: () => null @@ -390,6 +407,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 @@ -414,10 +440,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 @@ -454,7 +480,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] @@ -496,7 +522,6 @@ } else { delete row.orderBy this.$parent[val.method](row) - // this.$emit(val.method, row) } }, saveUpData() { @@ -515,6 +540,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' @@ -729,16 +759,16 @@ }); return sums; }, - handleLinkEvent(row,val){ - if(val.method=='doDiy'){ - this.main(row,val) - }else{ + handleLinkEvent(row, val) { + if (val.method == 'doDiy') { + this.main(row, val) + } else { this.$parent[val.method](row) - } - }, - getWidth(){ + } + }, + 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