From 00c9c554fcfbb1755af6c41f19dc5ae6f8294075 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 18 七月 2024 18:05:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/tool/value-table.vue | 180 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 136 insertions(+), 44 deletions(-)
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index 593b320..cf0b8b7 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -49,6 +49,9 @@
.handleBtn.is-disabled {
color: #C0C4CC;
}
+ .red{
+ color: red !important;
+ }
</style>
<style>
/* .value-table .highlight-warning-row-border td {
@@ -85,15 +88,21 @@
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;
justify-content: center;
+ }
+ .el-table__empty-text{
+ text-align: left;
+ width: 100%;
+ display: inline-block;
+ margin-left: 200px;
}
</style>
@@ -105,13 +114,13 @@
@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">
- <el-table-column type="selection" width="65" v-if="data.showSelect" :key="Math.random()">
+ :span-method="spanMethod" :key="specialKey">
+ <el-table-column type="selection" :width="selectionWidth" 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()">
+ <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'"
- v-for="(a, ai) in tableHead" :key="ai" show-overflow-tooltip min-width="155">
+ <el-table-column :prop="a.label" :label="a.value" :sortable="data.sort==false?false:'custom'" :isColumnWidth="isColumnWidth" :width="a.width"
+ 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">
<template v-if="typeof(scope.row[a.label]) == 'object'">
@@ -130,7 +139,7 @@
@click="handleLinkEvent(scope.row,data.linkEvent[a.label])">{{scope.row[a.label]}}</span>
<img style="width: 40px;height: 40px;margin-top: 10px;" :src="javaApi+'/img/'+scope.row[a.label]"
v-else-if="showUpload(a.label)&&scope.row[a.label]" alt="">
- <span v-else>{{scope.row[a.label]}}</span>
+ <span v-else :class="{red:getRedColor(a.label,scope.row)}" >{{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">
@@ -156,8 +165,8 @@
:total="total">
</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;">
+ <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;">
<el-col :span="6/data.row" style="text-align: right;" :offset="1">
@@ -183,7 +192,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>
@@ -225,17 +234,18 @@
<el-button type="primary" @click="saveUpData" :loading="upLoad">纭� 瀹�</el-button>
</span>
</el-dialog>
- <el-dialog title="鏂板" :visible.sync="addDia" :width="data.row==1?'500px':500+data.row * 200 + 'px'" append-to-body>
+ <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;">
- <el-col :span="6/data.row" style="text-align: right;"><span class="required-span"
+ <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" :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&&!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 +261,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 +273,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 +289,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>
@@ -301,7 +312,7 @@
<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"
+ :auto-upload="false" :accept="data.accept===undefined?'.csv':data.accept" :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>
@@ -324,6 +335,18 @@
} from 'jquery';
export default {
props: {
+ selectionWidth: {
+ type: String,
+ default: () => '65'
+ },
+ columnMinWidth: {
+ type: String,
+ default: () => '155'
+ },
+ isColumnWidth: {
+ type: Boolean,
+ default: () => false
+ },
tableRowClassName: {
type: Function
},
@@ -446,18 +469,9 @@
// position:0
// }
],
- param: {}
+ param: {},
+ specialKey:'table-'
}
- },
- watch: {
- tableData: {
- deep: true,
- handler: function() {
- this.$nextTick(() => {
- this.$refs.eltable.doLayout()
- })
- }
- },
},
beforeUpdate() {
this.$nextTick(() => {
@@ -473,6 +487,7 @@
this.token = {
'token': sessionStorage.getItem('token')
}
+ this.specialKey = this.specialKey+Math.random()*100;
},
methods: {
rowspan(spanArr, position, spanName) {
@@ -564,14 +579,22 @@
},
sizeChange(val) {
this.page.size = val
- this.selectList()
+ this.selectList('page')
},
currentChange(val) {
this.page.current = val
- this.selectList()
+ this.selectList('page')
},
- selectList() {
+ selectList(val) {
+ console.log('val---', val)
+ console.log('this.page---', this.page)
this.loading = true
+ if(val===undefined){
+ this.page.current = 1;
+ }
+ if (val === 'lastPage') {
+ this.page.current = this.page.current - 1 // 渚嬪鍒犻櫎鏈〉鏈�鍚庝竴鏉℃暟鎹紝灏嗗綋鍓嶉〉闈㈠畾涓轰笂涓�椤碉紝闄ょ涓�椤靛
+ }
if (this.data.isPage != undefined && this.data.isPage != true) {
this.page = {
current: -1,
@@ -593,6 +616,27 @@
this.total = res.data.body.total
this.tableHead = res.data.head
this.tableData = res.data.body.records
+ 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
+ }
+ })
+ }
+ // console.log(JSON.stringify(this.tableHead)+"---------"+JSON.stringify(this.tableData))
for (var a in this.data.selectField) {
if (this.data.selectField[a].choose == true) {
this.tableData.map(b => {
@@ -708,7 +752,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]) {
@@ -759,7 +803,8 @@
return
}
this.$message.success('鍒犻櫎鎴愬姛')
- this.selectList()
+ this.selectList('page')
+ this.$emit('delete')
}).catch(e => {
this.$message.error('鍒犻櫎澶辫触')
})
@@ -785,21 +830,30 @@
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.upHead.forEach((item, index) => {
- if (this.data.cascaderField && this.data.cascaderField[item.label]) {
- if (this.upData[item.label]) {
- this.upData[item.label] = JSON.stringify(this.upData[item.label])
- } else {
- this.upData[item.label] = ''
+ for (var i = 0; i < this.upHead.length; i++) {
+ if(this.upHead[i].label == 'password'){
+ if(this.upData[this.upHead[i].label]){
+ const reg2 =/^(?=.*?[a-z])(?=.*?[A-Z])(?=.*?\d)(?=.*?[~!#@$%^*&()_+{}\[\]|\\;:'",<.>\/?])[a-zA-Z\d~!#@$%^*&()_+{}\[\]|\\;:'",<.>\/?]*$/;
+ if (!reg2.test(this.upData[this.upHead[i].label])) {
+ this.$message.error('瀵嗙爜蹇呴』鍖呮嫭鏁板瓧銆佸ぇ灏忓啓瀛楁瘝浠ュ強鐗规畩瀛楃')
+ return
+ }
}
}
- })
+ if (this.data.cascaderField && this.data.cascaderField[this.upHead[i].label]) {
+ if (this.upData[this.upHead[i].label]) {
+ this.upData[this.upHead[i].label] = JSON.stringify(this.upData[this.upHead[i].label])
+ } else {
+ this.upData[this.upHead[i].label] = ''
+ }
+ }
+ }
+ this.upLoad = true
this.$axios.post(this.upUrl, this.upData, {
headers: {
'Content-Type': 'application/json'
@@ -811,7 +865,7 @@
}
this.$message.success('淇敼鎴愬姛')
this.upDia = false
- this.selectList()
+ this.selectList('page')
this.$refs.eltable.doLayout();
this.upLoad = false
}).catch(e => {
@@ -873,6 +927,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]) {
@@ -898,7 +957,7 @@
}
this.$message.success('娣诲姞鎴愬姛')
this.addDia = false
- this.selectList()
+ this.selectList('page')
this.addLoad = false
}).catch(e => {
this.addDia = false
@@ -955,7 +1014,8 @@
this.uploadDia = true
},
beforeUpload(file, fileList) {
- if (file.raw.type != 'text/csv') {
+ console.log(file.raw.type);
+ if (file.raw.type != (this.data.inputType===undefined?'text/csv':this.data.inputType)) {
this.$message.error('涓婁紶鏂囦欢鏍煎紡涓嶆纭�');
this.$refs.upload.clearFiles()
return false;
@@ -1083,6 +1143,38 @@
this.$message.error('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁')
}
},
+ // 鏃ュ伐鏃剁鐞嗚緟鍔╁伐鏃�--鎵归噺瀹℃牳鍜屾壒鍑�
+ batchCheck(e) {
+ if (this.multipleSelection && this.multipleSelection.length > 0) {
+ const list = JSON.parse(JSON.stringify(this.multipleSelection))
+ const url = e === 0 ? this.$api.auxiliaryWorkingHoursDay.check : this.$api.auxiliaryWorkingHoursDay.approve
+ const state = e === 0 ? '宸插鏍�' : '宸叉壒鍑�'
+ list.forEach(item => {
+ this.$axios.post(url, {id: item.id, state: state
+ },{
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }
+ ).then(res => {
+ if (res.code === 201) {
+ return
+ }
+ this.$parent.submitBatchCheckDialog()
+ this.$message.success('鎿嶄綔鎴愬姛')
+ })
+ })
+ } else {
+ this.$message.error('璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�')
+ }
+ },
+ getRedColor(label,row){
+ if(this.data.cellSpecialStyle&&this.data.cellSpecialStyle.redColorByKey&&label.includes(this.data.cellSpecialStyle.redColorByKey)&&row[(label.replace(this.data.cellSpecialStyle.redColorByKey, ""))]){
+ return true
+ }else{
+ return false
+ }
+ }
}
}
</script>
--
Gitblit v1.9.3