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-19 14:38:33 +08:00
parent 09260eb716
commit e4d9a33eb4
8 changed files with 214 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/css/common.scss
+47
View File
@@ -0,0 +1,47 @@
.tag-btns {
padding-right: 15px;
}
.search-area {
padding: 0;
.el-form-item__label {
line-height: 35px;
}
.el-form-item__content {
line-height: 35px;
.el-input__inner {
height: 25px;
line-height: 35px;
}
}
}
.search-new {
//width: 100%;
background: #FFF;
padding: 10px 10px 0;
.el-button + .el-button {
margin-left: 10px;
}
.el-form--inline .el-form-item {
display: flex;
margin-right: 0;
input.el-input__inner {
width: 100%;
}
.el-form-item__content {
//width: 100%;
flex: 1;
.el-select,
.el-range-editor {
width: 100% !important;
}
}
}
}
src/components/OrgTable.vue
+16 -66
View File
@@ -15,20 +15,10 @@
:model="searchForm"
inline
class="label-input-form"
label-width="100px"
@keyup.enter.native="handleSearch">
<el-row :gutter="24">
<el-col :xl="6" :lg="8">
<el-form-item label="用户名" class="search-item">
<!-- <el-input-->
<!-- v-model="searchForm.uname"-->
<!-- placeholder="根据姓名查询"-->
<!-- clearable></el-input>-->
<el-input :placeholder="'请输入用户名'" class="search-item" v-model="searchForm.account"/>
</el-form-item>
</el-col>
<el-col :xl="6" :lg="8">
<el-col :xl="8" :lg="8">
<el-form-item label="角色名" class="search-item">
<!-- <el-input :placeholder="'根据角色名查询'" class="search-item" v-model="searchForm.roleName"/>-->
<el-select v-model="searchForm.roleName" class="icon-auth" placeholder="请选择角色名">
@@ -39,18 +29,25 @@
</el-select>
</el-form-item>
</el-col>
<el-col :xl="6" :lg="24">
<el-form-item class="search-item btn-box">
<el-col :xl="8" :lg="8">
<el-form-item label="用户名" class="search-item">
<!-- <el-input-->
<!-- v-model="searchForm.uname"-->
<!-- placeholder="根据姓名查询"-->
<!-- clearable></el-input>-->
<el-input :placeholder="'请输入用户名'" v-model="searchForm.account"/>
</el-form-item>
</el-col>
<el-col :xl="8" :lg="24">
<el-form-item class="tag-btns">
<!-- :loading="loading.searching"-->
<el-button
:disabled="loading.searching"
type="primary"
class="common-button-primary img-button"
size="small"
@click="handleSearch">查询
</el-button>
<el-button
class="common-button-default img-button"
size="small"
@click="handleReset">重置
</el-button>
@@ -75,7 +72,7 @@
:cell-class-name="cellClassName"
@select="selectionRow"
@select-all="selectionRowAll">
<el-table-column v-if="maxSelected && maxSelected == 1" label="" width="55" align="center">
<el-table-column v-if="maxSelected && maxSelected == 1" label="" width="35" align="center">
<template slot-scope="scope">
<el-radio class="tableRadio" v-model="tableChecked" @change="radioChange(scope.row)"
:label="scope.row.USID">{{ null }}
@@ -849,27 +846,6 @@ export default {
padding: 15px 20px 20px 20px;
}
.search-area {
padding: 0;
::v-deep .el-form-item__label {
line-height: 35px;
}
::v-deep .el-form-item__content {
line-height: 35px;
.el-input__inner {
height: 35px;
line-height: 35px;
}
}
}
.pagination {
position: static;
}
.checked-user-list {
display: flex;
flex-flow: row wrap;
@@ -912,36 +888,8 @@ export default {
}
}
}
.search-new {
//width: 100%;
background: #FFF;
padding: 10px 10px 0;
.el-button + .el-button {
margin-left: 10px;
}
.el-form--inline .el-form-item {
display: flex;
margin-right: 0;
input.el-input__inner {
width: 100%;
}
.el-form-item__content {
//width: 100%;
flex: 1;
.el-select,
.el-range-editor {
width: 100% !important;
}
}
}
}
.dialog-footer{
margin-top: 10px;
::v-deep .el-button {
width: 80px;
height: 36px;
@@ -950,4 +898,6 @@ export default {
}
}
</style>
src/components/ProcessChooseTree.vue
+13 -16
View File
@@ -9,12 +9,15 @@
:close-on-click-modal="false"
class="org-table"
@close="handleClose">
<div class="search-area">
<div class="search-area search-new">
<el-form
:model="searchForm"
inline
class="label-input-form"
@keyup.enter.native="handleSearch">
<el-row :gutter="24">
<el-col :xl="8" :lg="8">
<el-form-item label="角色名" class="search-item">
<el-select v-model="searchForm.roleName" class="icon-auth" placeholder="请选择角色名">
<el-option label="全部" value=""></el-option>
@@ -23,25 +26,31 @@
</template>
</el-select>
</el-form-item>
</el-col>
<el-col :xl="8" :lg="8">
<el-form-item label="用户名" class="search-item">
<el-input :placeholder="'请输入用户名'" class="search-item" v-model="searchForm.account"/>
</el-form-item>
</el-col>
<el-col :xl="8" :lg="8">
<el-form-item class="search-item btn-box">
<el-button
:loading="loading.searching"
type="primary"
class="common-button-primary"
size="small" icon="el-icon-search"
size="small"
@click="handleSearch">查询
<!-- <img src="@/assets/images/btn/search.png" alt="">-->
</el-button>
<el-button
class="common-button-default"
size="small" icon="el-icon-refresh-left"
size="small"
@click="handleReset">重置
<!-- <img src="@/assets/images/btn/reset.png" alt="">-->
</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
@@ -703,19 +712,7 @@ export default {
::v-deep .el-dialog__body {
padding: 15px 20px 20px 20px;
}
.search-area {
padding: 0;
::v-deep .el-form-item__label {
line-height: 35px;
}
::v-deep .el-form-item__content {
line-height: 35px;
.el-input__inner {
height: 35px;
line-height: 35px;
}
}
}
.pagination {
position: static;
}
src/main.js
+1 -1
View File
@@ -4,7 +4,7 @@ import router from './router'
import store from './store'
// 流程公共样式
import './assets/css/process.scss'
import './assets/css/common.scss'
import config from '@/utils/config'
// VXETable
import 'xe-utils'
src/views/permissionApplication/components/reportDialog.vue
+35 -17
View File
@@ -4,26 +4,31 @@
title="添加报告"
:visible.sync="dialogVisible"
width="50%"
class="addreport"
:before-close="handleClose">
<div class="tag-search">
<el-row>
<el-col :span="12">
<div class="tag-item">
<label class="tag-title">报告年份</label>
<el-select v-model="q.year" multiple collapse-tags placeholder="请选择报告年份">
<el-form
:model="searchForm "
inline
class="search-area search-new "
@keyup.enter.native="search">
<el-row :gutter="24">
<el-col :xl="8" :lg="8">
<el-form-item label="报告年份" class="search-item">
<el-select v-model="searchForm.year" multiple collapse-tags placeholder="请选择报告年份">
<template v-for="item in yearList">
<el-option :label="item" :value="item" :key="item"></el-option>
</template>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="12" align="right" class="tag-btns">
<el-button type="primary" @click="search">查询</el-button>
<el-button type="default" @click="reset">重置</el-button>
<el-col :xl="8" :lg="8" align="right" class="tag-btns">
<el-button type="primary" size="small" @click="search">查询</el-button>
<el-button type="default" size="small" @click="reset">重置</el-button>
</el-col>
</el-row>
</div>
</el-form>
<div class="table">
<vxe-table :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe height="auto"
ref="xTable" @checkbox-all="selectAllEvent" @checkbox-change="selectChangeEvent">
@@ -63,10 +68,10 @@ export default {
total: 0,
q: {
pageSize: 10,
pageNo: 1,
labelOneId: [],
labelTwoId: [],
labelThreeId: []
pageNo: 1
},
searchForm: {
},
checkIds: [],
dialogVisible: false,
@@ -143,7 +148,7 @@ export default {
},
// 列表
reportList () {
this.$api.report.reportList(this.q).then(({ data }) => {
this.$api.report.reportList({ ...this.q, ...this.searchForm }).then(({ data }) => {
this.tableData = data.records
this.total = data.total
this.q.pageNo = data.current
@@ -191,6 +196,19 @@ export default {
width: 100%;
height: 550px;
}
.addreport{
::v-deep .el-dialog__header {
padding: 0 20px;
height: 50px;
display: flex;
align-items: center;
border-bottom: 1px solid #ddd;
}
::v-deep .el-dialog__body {
padding: 15px 20px 20px 20px;
}
}
.done {
margin: 30px 20px 10px;
text-align: right;
src/views/permissionApplication/components/reportTable.vue
+2
View File
@@ -201,10 +201,12 @@ export default {
margin-bottom: 20px;
}
.addbtn{
border: none;
background-color: #8400FF;
color: #fff;
}
.delbtn{
border: none;
background-color: #d9001b;
color: #fff;
}
src/views/permissionApplication/launch.vue
+11 -5
View File
@@ -94,7 +94,7 @@
<orgTable :visible.sync="visibleOrgTable" title="人员列表" dialog-model :config="{
value: orgTableVal,
valueName: orgTableValName
}" :workNumFlag="true" :maxSelected="100" @confirm="isTreeOk"></orgTable>
}" :workNumFlag="true" :maxSelected="1" @confirm="isTreeOk"></orgTable>
</div>
</div>
</template>
@@ -205,7 +205,7 @@ export default {
this.assignForm.name2Id = parts.toString()
this.assignForm.name2 = partsName.toString()
}
console.log(this.assignForm.name1Id,this.assignForm.name2Id)
console.log(this.assignForm.name1Id, this.assignForm.name2Id)
},
// 获取表格列表 吧查询到的值传给子组件
reportList (ids) {
@@ -229,7 +229,13 @@ export default {
this.$refs.applicationFormRef.validate(m => {
if (v && m) {
// 过了校验 需要把数据都整合 this.tableData this.applicationForm this.assignForm
// 表格数据没有不能提交 需要提示
if (this.tableData.length > 0) {
this.$message.warning('至少需要选择一条报告数据')
} else {
// 调用流程数据
console.log("发送数据")
}
} else {
this.$message.warning('请检查表单填写完整')
}
@@ -240,6 +246,6 @@ export default {
}
</script>
<style scoped>
<style scoped>
</style>
</style>
src/views/userCenter/processCenter.vue
+89 -58
View File
@@ -1,21 +1,29 @@
<template>
<div class="content">
<div class="centerBox content-height">
<div class="title">
<span>流程中心</span>
</div>
<div class="searchForm">
<div class="item">
<div>流程编号：</div>
<el-input v-model="form.id" ></el-input>
</div>
<div class="item">
<div>流程名称：</div>
<el-input v-model="form.name"></el-input>
</div>
<div class="item">
<div class="search">
<el-row>
<el-col :span="20">
<div class="search-box-left">
<div class="">
<label>流程编号:</label>
<el-input v-model="form.id" placeholder="请输入流程编号"></el-input>
</div>
<div class="">
<label>流程名称:</label>
<el-input v-model="form.name" placeholder="请输入流程名称"></el-input>
</div>
</div>
</el-col>
<el-col :span="4" align="right">
<div class="search-box-right">
<el-button type="primary" @click="search">查询</el-button>
<el-button type="" @click="reset">重置</el-button>
</div>
</div>
</el-col>
</el-row>
</div>
<div class="tabs">
<tabs />
@@ -25,68 +33,91 @@
<script>
import tabs from '../userCenter/processCenter/tabs.vue'
export default {
name:'processCenter',
components:{
tabs
},
data() {
return {
form: {}
}
},
created () {
;
},
mounted () {
;
},
methods: {
//查询
search() {
// this.$api.processCenter.search({})
},
//重置
reset(){
this.form={}
// this.$api.processCenter.reset({})
}
},
export default {
name: 'processCenter',
components: {
tabs
},
data () {
return {
form: {}
}
},
created () {
},
mounted () {
},
methods: {
// 查询
search () {
// this.$api.processCenter.search({})
},
// 重置
reset () {
this.form = {}
// this.$api.processCenter.reset({})
}
}
}
</script>
<style lang="scss" scoped>
.content{
.centerBox{
background-color: #fff;
height: 100%;
width: 100%;
.title {
border-bottom: 1px solid #EBEEF5;
height: 42px;
line-height: 42px;
margin: 0 18px 0 22px;
margin: 0 18px 0 22px;
span {
font-size: 16px;
font-weight: 600;
color: #262626;
}
}
.searchForm{
width: 1200px;
display: flex;
align-items: center;
margin: 20px 0 0 22px;
.item{
width: 300px;
display: flex;
align-items: center;
.search {
.search-box-left {
padding-top: 20px;
display: flex;
justify-content: flex-start;
align-items: center;
label {
font-size: 14px;
font-weight: 400;
color: #595959;
margin-right: 5px;
padding-left: 22px;
}
::v-deep .el-input {
width: 167px;
margin-right: 5px;
}
@media screen and (max-width: 1366px) {
::v-deep .el-input {
width: 135px;
margin-right: 5px;
}
}
}
.search-box-right {
padding-top: 20px;
display: flex;
justify-content: flex-end;
align-items: center;
padding-right: 14px;
}
}
.tabs{
margin: 20px 0 0 5px;
margin: 20px 20px 5px;
}
}
::v-deep .el-input{
width: 200px;
}
</style>
</style>