From 2b4272b2372187107f0fbdb2dbe8d0cd50ea4060 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 09 四月 2024 10:31:20 +0800
Subject: [PATCH] 完成多行动态合并功能
---
src/components/view/enums.vue | 14 +++-
src/components/tool/value-table.vue | 79 +++++++++++++++++++++++---
src/components/view/b1-report-preparation.vue | 64 +++++++++++++++++----
src/assets/api/controller.js | 2
4 files changed, 134 insertions(+), 25 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 3616019..978cbcf 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -184,6 +184,8 @@
const insReport = {
pageInsReport: "/insReport/pageInsReport", //鏌ヨ妫�楠屾姤鍛婃暟鎹�
wordToHtml: "/insReport/wordToHtml", //Word杞琀TML
+ inReport: "/insReport/inReport", //鎶ュ憡涓婁紶
+ upReportUrl: "/insReport/upReportUrl", //鎶ュ憡杩樺師
}
const warehouse = {
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index f6674cc..d13d1f4 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -34,6 +34,22 @@
.body {
overflow-x: hidden;
}
+
+ .handleBtn{
+ border: none;
+ padding: 0;
+ color: #409EFF;
+ background: transparent;
+ }
+
+ .handleBtn:hover{
+ background: transparent;
+ }
+
+ .handleBtn.is-disabled{
+ color: #C0C4CC;
+ }
+
</style>
<style>
/* .value-table .highlight-warning-row-border td {
@@ -69,6 +85,10 @@
.value-table .el-upload-dragger {
width: 100%;
}
+
+ .handleBtn.is-disabled .el-upload:focus{
+ color: #C0C4CC !important;
+ }
</style>
<template>
@@ -111,7 +131,23 @@
<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>
+ @click="main(scope.row, a)" class="handleBtn">
+ <span v-if="a.type!='upload'">{{a.font}}</span>
+ <el-upload
+ :action="javaApi+a.uploadConfig.url+'?id='+scope.row.id"
+ v-else
+ :disabled="a.disabFun ? a.disabFun(scope.row,scope.$index) : false"
+ :on-success="handleSuccessUp"
+ :show-file-list="false"
+ :headers="token"
+ name="file"
+ :accept='a.uploadConfig.accept'
+ :on-error="onError"
+ ref='upload'
+ style="background: transparent;">
+ <span>{{a.font}}</span>
+ </el-upload>
+ </el-button>
</template>
</el-table-column>
</el-table>
@@ -348,6 +384,12 @@
token: null,
fileList: [],
init: true,
+ spanList:[
+ // {
+ // arr:[],
+ // position:0
+ // }
+ ],
testArr: [],
testPosition: 0,
}
@@ -393,9 +435,14 @@
});
},
spanMethod({ row, column, rowIndex, columnIndex }){
- if(this.data.spanConfig!=undefined&&this.data.spanConfig.rows){
- if (columnIndex === this.data.spanConfig.rows.index) {
- const _row = this.testArr[rowIndex];
+ if(this.data.spanConfig!=undefined&&this.data.spanConfig.rows&&this.data.spanConfig.rows.length>0){
+ let i = null;
+ let obj = this.data.spanConfig.rows.find((item,index)=>{
+ i = index;
+ return item.index==columnIndex
+ })
+ if(obj){
+ const _row = this.spanList[i].arr[rowIndex];
const _col = _row > 0 ? 1 : 0;
return {
rowspan: _row,
@@ -472,10 +519,18 @@
})
}
}
- if(this.data.spanConfig!=undefined&&this.data.spanConfig.rows){
- this.testArr = []
- this.testPosition = 0
- this.rowspan(this.testArr, this.testPosition, this.data.spanConfig.rows.name);
+ if(this.data.spanConfig!=undefined&&this.data.spanConfig.rows&&this.data.spanConfig.rows.length>0){
+ this.spanList = [];
+ this.data.spanConfig.rows.forEach((item,index)=>{
+ this.spanList.push({
+ arr:[],
+ position:0
+ })
+ this.rowspan(this.spanList[index].arr, this.spanList[index].position, item.name);
+ })
+ // this.testArr = []
+ // this.testPosition = 0
+ // this.rowspan(this.testArr, this.testPosition, this.data.spanConfig.rows.name);
}
this.loading = false
}).catch(e => {
@@ -833,7 +888,13 @@
count += a.font.length
})
return count * 15 + 60 + 'px'
- }
+ },
+ handleSuccessUp(response){
+ if(response.code==200){
+ this.$message.success('涓婁紶鎴愬姛')
+ this.selectList()
+ }
+ }
}
}
</script>
diff --git a/src/components/view/b1-report-preparation.vue b/src/components/view/b1-report-preparation.vue
index d56cb4d..a2cd4a1 100644
--- a/src/components/view/b1-report-preparation.vue
+++ b/src/components/view/b1-report-preparation.vue
@@ -78,7 +78,7 @@
:key="upIndex"/>
</div>
</div>
- <el-dialog title="鍦ㄧ嚎缂栧埗" :visible.sync="claimVisible" width="25cm" :modal-append-to-body="false" :fullscreen="fullscreen">
+ <el-dialog title="鍦ㄧ嚎缂栧埗" :visible.sync="claimVisible" width="22cm" :modal-append-to-body="false" :fullscreen="fullscreen">
<div class="full-screen">
<i class="el-icon-full-screen" style="cursor: pointer;font-size: 18px" @click="fullscreen=true;" v-if="!fullscreen"></i>
<img src="../../../static/img/no-full.svg" alt="" v-else style="cursor: pointer;" @click="fullscreen=false;" >
@@ -132,13 +132,17 @@
}, {
id: 'handleUpload',
font: '涓婁紶',
- type: 'text',
+ type: 'upload',
+ uploadConfig:{
+ url:this.$api.insReport.inReport,
+ accept:'.docx'
+ },
method: 'handleUpload',
disabFun: (row, index) => {
return row.isExamine != null
}
}, {
- id: 'handlRestore',
+ id: 'handleRestore',
font: '杩樺師',
type: 'text',
method: 'handleRestore',
@@ -246,12 +250,14 @@
// this.value = await file.convertFileToHtml(row.url)
// this.claimVisible = true;
this.$axios.post(this.$api.insReport.wordToHtml, {
- path:row.url
+ path:row.urlS?row.urlS:row.url
}).then(res => {
if (res.code === 200) {
// console.log(11111111,res.data)
- this.value = res.data.replace(/<a [^>]*>/g, "")
- .replace(/<\/a>/g, "").replace(/ /g, " ");
+ this.value = res.data
+ .replace(/<a [^>]*>/g, "")
+ .replace(/<\/a>/g, "")
+ .replace(/ /g, " ");
this.claimVisible = true;
}
@@ -262,19 +268,36 @@
// 鏉冮檺鍒嗛厤
getPower(radio) {
let power = JSON.parse(sessionStorage.getItem('power'))
+ let edit = false
let up = false
- let del = false
- let add = false
+ let res = false
+ let issued = false
+ let approve = false
for (var i = 0; i < power.length; i++) {
- if (power[i].menuMethod == 'upInsOrder') {
+ if (power[i].menuMethod == 'upReportFile') {
+ edit = true
+ }
+ if (power[i].menuMethod == 'inReport') {
up = true
}
- if (power[i].menuMethod == 'addInsOrder') {
- add = true
+ if (power[i].menuMethod == 'upReportUrl') {
+ res = true
}
}
- if (!up) {
+ if (!approve) {
+ this.componentData.do.splice(5, 1)
+ }
+ if (!issued) {
this.componentData.do.splice(4, 1)
+ }
+ if (!res) {
+ this.componentData.do.splice(3, 1)
+ }
+ if (!up) {
+ this.componentData.do.splice(2, 1)
+ }
+ if (!edit) {
+ this.componentData.do.splice(0, 1)
}
},
handleClose() {
@@ -285,6 +308,23 @@
},
async selectAllByOne(row){
console.log(row,await file.convertFileToHtml(row.url));
+ },
+ download(row){
+ let url = row.urlS?row.urlS:row.url;
+ const link = document.createElement('a');
+ link.href = this.javaApi + url;
+ document.body.appendChild(link);
+ link.click();
+ },
+ handleRestore(row){
+ this.$axios.post(this.$api.insReport.upReportUrl, {
+ id:row.id
+ }).then(res => {
+ if (res.code === 200) {
+ this.$message.success('鎿嶄綔鎴愬姛')
+ this.refreshTable()
+ }
+ })
}
}
}
diff --git a/src/components/view/enums.vue b/src/components/view/enums.vue
index 2084cb7..dc63693 100644
--- a/src/components/view/enums.vue
+++ b/src/components/view/enums.vue
@@ -103,10 +103,16 @@
tagField: {},
selectField: {},
spanConfig:{
- rows:{
- name:'category',
- index:1
- },//鍚堝苟琛�,閫氬父娑夊強涓�涓瓧娈�
+ rows:[
+ {
+ name:'category',
+ index:1
+ },
+ // {
+ // name:'createUserName',
+ // index:5
+ // }
+ ],//鍚堝苟琛�,閫氬父娑夊強涓�涓瓧娈�
},
requiredAdd:['category','label','value'],
requiredUp:['category','label','value']
--
Gitblit v1.9.3