From 28f428180885b4718c676f4815c8d8f96c6add43 Mon Sep 17 00:00:00 2001 From: 李林 <z1292839451@163.com> Date: 星期五, 22 三月 2024 14:20:29 +0800 Subject: [PATCH] 功能调整 --- src/components/tool/value-table.vue | 301 ++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 229 insertions(+), 72 deletions(-) diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue index fadc898..889071c 100644 --- a/src/components/tool/value-table.vue +++ b/src/components/tool/value-table.vue @@ -30,12 +30,42 @@ align-items: center; justify-content: center; } + + .body { + overflow-x: hidden; + } </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: 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 red; + } + + .value-table .highlight-danger-row-border td:last-child { + border-right: 4px solid red; + } + .value-table .el-upload { width: 100%; } - + .value-table .el-upload-dragger { width: 100%; } @@ -46,25 +76,37 @@ <div class="table"> <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"> - <el-table-column type="selection" width="50" v-if="data.showSelect"> + @row-click="rowClick" :show-summary="data.countFleid!=undefined && data.countFleid.length > 0" + :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 align="center" type="index" label="搴忓彿" width="70" v-if="data.isIndex"> + <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>{{scope.row[a.label]}}</span> </template> </el-table-column> - <el-table-column fixed="right" align="center" label="鎿嶄綔" :width="50 + data.do.length * 30" - 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> @@ -76,42 +118,82 @@ :total="total"> </el-pagination> </div> - <el-dialog title="缂栬緫" :visible.sync="upDia" width="500px"> - <div class="body" v-if="upDia"> - <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="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" :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)"> - <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-col> - </el-row> + <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 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"> + <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" :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> + <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-col> + </div> + </div> + <div v-else> + <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="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" :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> + <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-col> + </el-row> + </div> </div> <span slot="footer" class="dialog-footer"> <el-button @click="upDia = false">鍙� 娑�</el-button> <el-button type="primary" @click="saveUpData" :loading="upLoad">纭� 瀹�</el-button> </span> </el-dialog> - <el-dialog title="鏂板" :visible.sync="addDia" width="500px"> - <div class="body" v-if="addDia" style="max-height: 600px;overflow-y: auto;padding: 5px 0;"> - <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"></el-input> - <el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null" - style="width: 100%;" :placeholder="`璇烽�夋嫨${a.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-col> - </el-row> + <el-dialog title="鏂板" :visible.sync="addDia" :width="data.row==1?'500px':500+data.row * 200 + 'px'"> + <div class="body" v-if="addDia" style="max-height: 550px;overflow-y: auto;padding: 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;"><span class="required-span" + v-if="showAddReq(a.label)">* + </span>{{a.value}}锛�</el-col> + <el-col :span="16/data.row" :offset="1"> + <el-input v-model="upData[a.label]" size="small" clearable :placeholder="`璇疯緭鍏�${a.value}`" + v-if="showType(a.label, data.selectField) == null"></el-input> + <el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null" + 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> + </el-select> + </el-col> + </div> + </div> + <div v-else> + <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"></el-input> + <el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null" + 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> + </el-select> + </el-col> + </el-row> + </div> </div> <span slot="footer" class="dialog-footer"> <el-button @click="addDia = false">鍙� 娑�</el-button> @@ -130,9 +212,9 @@ </el-dialog> <el-dialog title="鏁版嵁瀵煎叆" :visible.sync="uploadDia" width="500px"> <div style="margin: 0 auto;"> - <el-upload ref="upload" drag :action="javaApi + inputUrl" :headers="token" - :file-list="fileList" name="file" :auto-upload="false" accept=".csv" :limit="1" :on-change="beforeUpload" - :on-success="onSuccess" :on-error="onError"> + <el-upload ref="upload" drag :action="javaApi + inputUrl" :headers="token" :file-list="fileList" name="file" + :auto-upload="false" accept=".csv" :limit="1" :on-change="beforeUpload" :on-success="onSuccess" + :on-error="onError" :data="{param: data.uploadStr}"> <i class="el-icon-upload"></i> <div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div> </el-upload> @@ -151,6 +233,9 @@ } from 'iview'; export default { props: { + tableRowClassName: { + type: Function + }, url: { type: String, default: () => null @@ -181,9 +266,10 @@ order: 'asc' } }, - isIndex: true, - showSelect: true, + isIndex: false, + showSelect: false, select: true, + row: 1, do: [{ id: 'update', font: '缂栬緫', @@ -221,14 +307,16 @@ order: 'asc' } }, - isIndex: true, - showSelect: true, + isIndex: false, + showSelect: false, select: true, + row: 1, do: [{ font: '鍒犻櫎', type: 'text' }], - type: [] + type: [], + uploadStr: "" }, tableHead: [], tableData: [], @@ -252,6 +340,7 @@ uploadDia: false, token: null, fileList: [], + init: true } }, watch: { @@ -267,7 +356,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') } @@ -319,6 +410,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 @@ -343,23 +443,27 @@ var str = ob[val] return str == undefined ? null : ob[val].select }, - showAddReq(label){ - if(this.data.requiredAdd==undefined){ + showLink(val, ob) { + var str = ob[val] + return str == undefined ? null : ob[val].method + }, + showAddReq(label) { + if (this.data.requiredAdd == undefined) { return } for (var i = 0; i < this.data.requiredAdd.length; i++) { - if(label == this.data.requiredAdd[i]){ + if (label == this.data.requiredAdd[i]) { return true } } return false }, - showUpReq(label){ - if(this.data.requiredUp==undefined){ + showUpReq(label) { + if (this.data.requiredUp == undefined) { return } for (var i = 0; i < this.data.requiredUp.length; i++) { - if(label == this.data.requiredUp[i]){ + if (label == this.data.requiredUp[i]) { return true } } @@ -370,7 +474,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 = this.upHead.filter(a => a.label != 'createTime' && a.label != 'updateTime') delete this.upData.orderBy @@ -379,7 +483,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] @@ -420,7 +524,7 @@ } } else { delete row.orderBy - this.$emit(val.method, row) + this.$parent[val.method](row) } }, saveUpData() { @@ -429,16 +533,21 @@ 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]]==''){ - var list = this.upHead.filter(a=>{ - if(a.label == this.data.requiredUp[i]) return a + 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 }) - if(list[0].value == undefined) continue + if (list[0].value == undefined) continue this.$message.error(list[0].value + '鏄繀濉」') return } } 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' @@ -477,7 +586,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] @@ -500,11 +609,11 @@ 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]]==''){ - var list = this.upHead.filter(a=>{ - if(a.label == this.data.requiredAdd[i]) return a + if (this.upData[this.data.requiredAdd[i]] === null || this.upData[this.data.requiredAdd[i]] === '') { + 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) continue this.$message.error(list[0].value + '鏄繀濉」') return } @@ -596,7 +705,7 @@ this.$refs.upload.clearFiles() this.uploadDia = false this.uploading = false - if(response.code==201){ + if (response.code == 201) { this.$message.error(response.message) return } @@ -608,17 +717,65 @@ this.$refs.upload.clearFiles() this.uploading = false }, - isDisabled(label){ - if(this.data.disabledUp==undefined){ + isDisabled(label) { + if (this.data.disabledUp == undefined) { return } for (var i = 0; i < this.data.disabledUp.length; i++) { - if(label == this.data.disabledUp[i]){ + if (label == this.data.disabledUp[i]) { return true } } return false + }, + getSummaries(param) { + const { + columns, + data + } = param; + const sums = []; + columns.forEach((column, index) => { + if (index === 0) { + sums[index] = '鍚堣'; + return; + } + const values = data.map(item => Number(item[column.property])); + if (this.data.countFleid == undefined) { + sums[index] = '' + return + } + if (this.data.countFleid.filter(str => { + return str === column.property + }).length > 0) { + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr); + if (!isNaN(value)) { + return prev + curr; + } else { + return prev; + } + }, 0); + sums[index] += ''; + } else { + sums[index] = ''; + } + }); + return sums; + }, + 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 => { + count += a.font.length + }) + return count * 15 + 60 + 'px' } } } -</script> \ No newline at end of file +</script> -- Gitblit v1.9.3