DZ/faw-report-library-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【修改】修改样式

Browse Source
This commit is contained in:
zhoulingpo
2023-04-28 16:00:33 +08:00
parent 18de24f378
commit 15819f2b1c
6 changed files with 73 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/css/common.scss
+11
View File
@@ -52,6 +52,17 @@
/* 自定义滚动条的样式 */
.scroll-wrap {
background-color: #fff;
//.el-tree-node > .el-tree-node__children{
// overflow: auto;
//}
}
.lef-tree {
overflow: auto;
.el-scrollbar__wrap{
width: fit-content;
overflow: auto;
}
}
.scroll-view::-webkit-scrollbar {
src/views/Report/ReportList.vue
+11 -1
View File
@@ -104,7 +104,8 @@
<el-col :span="4" class="treeList">
<el-input placeholder="输入关键字进行过滤" v-model="filterText">
</el-input>
<el-scrollbar wrap-class="scroll-wrap" view-class="scroll-view">
<el-scrollbar wrap-class="scroll-wrap" view-class="scroll-view"
class="lef-tree">
<el-tree
class="filter-tree"
:data="treeData"
@@ -114,7 +115,16 @@
:filter-node-method="filterNode"
ref="tree"
@check="getHalfCheckedNode"
>
<template slot-scope="{node}">
<!-- <span v-if="node.label.length <= 10">{{ node.label }}</span>-->
<!-- <el-tooltip :content="node.label" placement="top">-->
<div :title="node.label" style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis; width: 50px">
{{ node.label }}
</div>
<!-- </el-tooltip>-->
</template>
</el-tree>
</el-scrollbar>
</el-col>
src/views/Report/ReportManager.vue
+11 -5
View File
@@ -57,12 +57,12 @@
@check="getHalfCheckedNode"
>
<template slot-scope="{node}">
<span v-if="node.label.length <= 10">{{ node.label }}</span>
<el-tooltip v-else :content="node.label" placement="top">
<div style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">
<!-- <span v-if="node.label.length <= 10">{{ // node.label }}</span>-->
<!-- <el-tooltip v-else :content="node.label" placement="top">-->
<div :title="node.label" style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">
{{ node.label }}
</div>
</el-tooltip>
<!-- </el-tooltip>-->
</template>
</el-tree>
</el-scrollbar>
@@ -163,7 +163,10 @@
<div class="tree">
<el-tree class="filter-tree" :data="treeData" default-expand-all :filter-node-method="filterNode" ref="tree">
<span class="custom-tree-node" slot-scope="{ node,data}">
<span class="textover">{{ node.label }}</span>
<!-- <span v-if="node.label.length <= 10">{{ node.label }}</span>-->
<!-- <el-tooltip v-else :content="node.label" placement="top">-->
<span :title="node.label" class="textover" >{{ node.label }}</span>
<!-- </el-tooltip>-->
<span class="btnover">
<!-- <el-button type="text" @click.stop="add">新建</el-button> -->
<el-button type="text" v-if="data.parentId != '0'"
@@ -245,6 +248,9 @@
<el-form-item label="标签:" required>
<el-cascader width="100%" v-model="reportF.labelList" :options="cascaderOptions" filterable
:props="{ checkStrictly: true }" clearable>
<template slot-scope="{ node, data }">
<span :title="data.label">{{ data.label }}</span>
</template>
</el-cascader>
</el-form-item>
<el-form-item label="权限设置:" required>
src/views/Report/reportManager/labelModal.vue
+3 -1
View File
@@ -6,6 +6,9 @@
<el-form-item label="上级标签" required>
<el-cascader v-model="form.nodeLabel" placeholder="请选择上级标签" :options="cascaderOptions" filterable
:props="{ checkStrictly: true }" clearable >
<template slot-scope="{ node, data }">
<span :title="data.label">{{ data.label }}</span>
</template>
</el-cascader>
</el-form-item>
@@ -209,7 +212,6 @@ export default {
line-height: 40px !important;
width: 100%;
}
::v-deep .el-popper .el-cascader-menu .el-cascader-node__label {
width: 160px !important;
overflow: hidden;
src/views/permissionApplication/examine.vue
+17 -16
View File
@@ -191,27 +191,28 @@ export default {
// 选择转办
handleDblClick(treeNode) {
this.JuggleSub(this.taskId).then(res=> {
if(res){
if( treeNode[0].USID == this.$store.getters.userInfo.usid){
this.$message.warning("您不能转办给自己")
}else{
this.$api.process.changeAssignee({
taskId: this.taskId,
assignee: treeNode[0].USID,
userId: this.$store.getters.userInfo.usid,
pId: this.prcId
}).then(() => {
this.$message.success('转办成功')
this.$router.push({path: '/userCenter/processCenter', query: {id: this.$route.query.id}})
this.visibleTree = false
})
}
}
})
return
// taskId: this.$store.getters.getHandleInfo.taskId, // 任务id
// assignee: treeNode[0].userId, // 转办人
// userId: this.$store.getters.userInfo.userId, // dangqian人
// pId: this.$store.getters.getHandleInfo.prcId // 流程实例
if( treeNode[0].USID == this.$store.getters.userInfo.usid){
this.$message.warning("您不能转办给自己")
}else{
this.$api.process.changeAssignee({
taskId: this.taskId,
assignee: treeNode[0].USID,
userId: this.$store.getters.userInfo.usid,
pId: this.prcId
}).then(() => {
this.$message.success('转办成功')
this.$router.push({path: '/userCenter/processCenter', query: {id: this.$route.query.id}})
this.visibleTree = false
})
}
},
handleSubmit() {
src/views/permissionApplication/launch.vue
+20 -10
View File
@@ -194,7 +194,7 @@ export default {
prcName:''
}
},
created() {
async created() {
// 第一次进入此页面 需要清楚校验
if (this.$route.query.isBegin) {
// if (this.$route.query.ids.split(',').length > 0) {
@@ -240,16 +240,26 @@ export default {
this.formControlname = true
this.processForm.prcName = this.$route.query.prcName
console.log("122")
this.getProcessDetail().then(res => {
//基础信息
console.log(res.prcName)
this.tableData = JSON.parse(res.processOld.dataJson)
this.applicationForm.power = res.tableData[0].power
this.applicationForm.applyReason = this.tableData[0].applyReason
await this.getProcessDetail()
let applyReason = JSON.parse(this.processOld.dataJson)
this.tableData = JSON.parse(this.processOld.dataJson)
this.applicationForm.power = this.tableData[0].power
debugger
this.applicationForm.applyReason = applyReason[0].applyReason
//指派信息
({oneApprove:this.assignForm.oneApprove,oneApproveName:this.assignForm.oneApproveName,twoApprove:this.assignForm.twoApprove,twoApproveName:this.assignForm.twoApproveName,remark:this.assignForm.remark}= JSON.parse(this.processOld.submitJson))
})
//指派信息
({oneApprove:this.assignForm.oneApprove,oneApproveName:this.assignForm.oneApproveName,twoApprove:this.assignForm.twoApprove,twoApproveName:this.assignForm.twoApproveName,remark:this.assignForm.remark}= JSON.parse(this.processOld.submitJson))
// this.getProcessDetail().then(res => {
// //基础信息
// let applyReason = JSON.parse(res.processOld.dataJson)
// res.tableData = JSON.parse(res.processOld.dataJson)
// res.applicationForm.power = res.tableData[0].power
// debugger
// res.applicationForm.applyReason = applyReason[0]?.applyReason
//
// //指派信息
// ({oneApprove:res.assignForm.oneApprove,oneApproveName:res.assignForm.oneApproveName,twoApprove:res.assignForm.twoApprove,twoApproveName:res.assignForm.twoApproveName,remark:res.assignForm.remark}= JSON.parse(res.processOld.submitJson))
// })
}
if (this.$route.query.type == 'yiban') {
this.taskId = this.$store.getters.handleProcess.taskId