Merge remote-tracking branch 'origin/zhoulingpo' into lixuetao

# Conflicts:
#	vue.config.js
This commit is contained in:
xuetao.li
2023-04-25 21:20:29 +08:00
49 changed files with 6857 additions and 795 deletions
+1 -1
View File
@@ -81,7 +81,7 @@ export default {
this.menuData = this.addLevel(treeData, 1)
},
getSysMenu () {
this.$api.menu.getSysMenu({ roleId: this.$store.state.userInfo.roleIdList[0] }).then(({ data }) => {
this.$api.menu.getSysMenu({ roleId: this.$store.getters.userInfo.roleIdList[0] }).then(({ data }) => {
if (data === null) {
data = []
}
+3
View File
@@ -107,6 +107,9 @@ export default {
this.verifyCode()
return this.$message.error(res.data.message)
}
res.data.roleIdList=res.data.roleEOList.map(item=>{
return item.id
})
this.$message.success('登录成功')
this.$store.commit('saveUserInfo', res.data)
this.$router.push({ path: '/report/list', query: { id: 'AEHJB8YNJ3' } })
+166 -26
View File
@@ -5,9 +5,15 @@
</div>
<div class="tag-search">
<el-row>
<el-col :span="24">
<el-col :span="6">
<div class="tag-item">
<label class="tag-title">报告年份</label>
<label class="tag-title">关键词:</label>
<el-input v-model="q.keyContent" placeholder="请输入报告名称"></el-input>
</div>
</el-col>
<el-col :span="6">
<div class="tag-item">
<label class="tag-title">报告年份</label>
<el-select v-model="q.year" multiple collapse-tags placeholder="请选择报告年份">
<template v-for="item in yearList">
<el-option :label="item" :value="item" :key="item"></el-option>
@@ -15,7 +21,18 @@
</el-select>
</div>
</el-col>
<el-col :span="24">
<el-col :span="6">
<div class="tag-item">
<label class="tag-title">报告名称:</label>
<el-input v-model="q.name" placeholder="请输入报告名称"></el-input>
</div>
</el-col>
<el-col :span="6" align="right" class="tag-btns">
<el-button type="primary" @click="search">查询</el-button>
<el-button type="default" @click="reset">重置</el-button>
</el-col>
<!-- <el-col :span="24">
<div class="tag-item">
<el-tooltip :content="tagData[1].name" placement="top">
<label class="tag-title">{{ tagData[1].name }}</label>
@@ -34,8 +51,8 @@
:class="{'el-icon-arrow-down': !tagData[1].tagShow, 'el-icon-arrow-up': tagData[1].tagShow}"></i>
</div>
</div>
</el-col>
<el-col :span="24">
</el-col> -->
<!-- <el-col :span="24">
<div class="tag-item">
<el-tooltip :content="tagData[2].name" placement="top">
<label class="tag-title">{{ tagData[2].name }}</label>
@@ -54,8 +71,8 @@
:class="{'el-icon-arrow-down': !tagData[2].tagShow, 'el-icon-arrow-up': tagData[2].tagShow}"></i>
</div>
</div>
</el-col>
<el-col :span="24">
</el-col> -->
<!-- <el-col :span="24">
<div class="tag-item">
<el-tooltip :content="tagData[3].name" placement="top">
<label class="tag-title">{{ tagData[3].name }}</label>
@@ -74,22 +91,35 @@
:class="{'el-icon-arrow-down': !tagData[3].tagShow, 'el-icon-arrow-up': tagData[3].tagShow}"></i>
</div>
</div>
</el-col>
<el-col :span="12">
<div class="tag-item">
<label class="tag-title">搜索:</label>
<el-input v-model="q.keyContent" placeholder="请输入搜索内容"></el-input>
</div>
</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>
</el-col> -->
</el-row>
</div>
<el-row class="tag-btn">
<el-button @click="permissionApp">权限申请</el-button>
</el-row>
<div class="table">
<vxe-table :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe v-table-min-height="'calc(100vh - 420px)'">
<vxe-column show-overflow show-header-overflow type="seq" title="序号" width="77">
<el-row>
<el-col :span="4" class="treeList">
<el-input placeholder="输入关键字进行过滤" v-model="filterText">
</el-input>
<el-tree
class="filter-tree"
:data="treeData"
show-checkbox
node-key="id"
default-expand-all
:filter-node-method="filterNode"
ref="tree"
>
</el-tree>
</el-col>
<el-col :span="19">
<vxe-table ref="xTable" :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe v-table-min-height="'calc(100vh - 420px)'"
@checkbox-all="selectAllEvent" @checkbox-change="selectChangeEvent">
<vxe-column type="checkbox" width="60"></vxe-column>
<vxe-column show-overflow show-header-overflow type="seq" title="序号" width="77">
<template #default="{ row, rowIndex }">
{{ rowIndex + (q.pageNo - 1) * q.pageSize + 1 }}
</template>
@@ -111,12 +141,12 @@
<div class="tag-info">
<span class="icon-tag-item"><img src="@/assets/imgs/icon-time.png"
alt=""><span>{{row.year}}</span></span>
<span class="icon-tag-item"><img src="@/assets/imgs/icon-tag01.png"
<!-- <span class="icon-tag-item"><img src="@/assets/imgs/icon-tag01.png"
alt=""><span>{{row.labelOneName}}</span></span>
<span class="icon-tag-item"><img src="@/assets/imgs/icon-tag02.png"
alt=""><span>{{row.labelTwoName}}</span></span>
<span class="icon-tag-item"><img src="@/assets/imgs/icon-tag03.png"
alt=""><span>{{row.labelThreeName}}</span></span>
alt=""><span>{{row.labelThreeName}}</span></span> -->
<!--<span class="icon-tag-item"><span>{{(row.fileSize / 1024 / 1024).toFixed(2) }}MB</span></span>-->
</div>
</div>
@@ -125,10 +155,11 @@
</vxe-column>
<vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right">
<template #default="{ row }">
<el-button type="text" @click="previewRow(row)">预览</el-button>
<!-- <el-button type="text" @click="downloadRow(row)">下载</el-button>-->
<el-button type="text" v-if="row.power == 1" @click="previewRow(row)">预览</el-button>
<el-button type="text" v-if="row.power == 2" @click="downloadRow(row)">下载</el-button>
</template>
</vxe-column>
</vxe-table>
<el-pagination
@size-change="handleSizeChange"
@@ -138,6 +169,9 @@
:page-size="q.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="total"/>
</el-col>
</el-row>
</div>
<!--预览-->
@@ -208,10 +242,114 @@ export default {
}
},
dialogPreview: false, // 预览
content: ''
content: '',
filterText:'',
treeData: [
{
id: 0,
label: '根节点',
children: [
{
id: 1,
label: '一级 1',
children: [
{
id: 4,
label: '二级 1-1',
children: [
{
id: 9,
label: '三级 1-1-1'
},
{
id: 10,
label: '三级 1-1-2'
}
]
}
]
},
{
id: 2,
label: '一级 2',
children: [
{
id: 5,
label: '二级 2-1'
},
{
id: 6,
label: '二级 2-2'
}
]
},
{
id: 3,
label: '一级 3',
children: [
{
id: 7,
label: '二级 3-1'
},
{
id: 8,
label: '二级 3-2'
}
]
},
]
}
],
checkIds: [],
checkList: []
}
},
watch: {
filterText(val) {
this.$refs.tree.filter(val);
}
},
methods: {
filterNode(value, data) {
if (!value) return true;
return data.label.indexOf(value) !== -1;
},
selectAllEvent ({ checked }) {
const records = this.$refs.xTable.getCheckboxRecords()
this.checkList= records
this.checkIds = records.map(item => {
return item.id
})
},
selectChangeEvent ({ checked }) {
const records = this.$refs.xTable.getCheckboxRecords()
this.checkList= records
this.checkIds = records.map(item => {
return item.id
})
},
permissionApp () {
if(this.checkList.length <1){
this.$message.warning("至少选择一条报告进行权限申请")
return
}
// 有预览权限的时候是否还让继续申请
let temp=this.checkList.filter(item =>{
if(+item.power == 1 || +item.power == 2){
return item.name
}
})
if(temp.length>0) {
this.$message.warning("当前选择的"+temp.toString()+"已经有权限,无须申请!")
return
}
this.$router.push({
path: '/permission/launch',
query: { id: 'AEHJB8YNJ3', ids: this.checkIds.toString() }
})
},
init () {
this.labelList()
this.reportDateList()
@@ -354,7 +492,9 @@ export default {
color: #262626;
}
}
.tag-btn{
padding: 10px 13px;
}
.tag-search {
padding-top: 9px;
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,155 @@
<template>
<div>
<el-dialog title="新增/编辑标签" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
<div class="form">
<el-form ref="form" :model="form" label-width="80px" :rules="rule">
<el-form-item label="上级标签">
<el-cascader v-model="form.nodeLabel" placeholder="请选择上级标签" :options="cascaderOptions" filterable :props="{ checkStrictly: true }" clearable >
</el-cascader>
</el-form-item>
<el-form-item label="标签名称" prop="label">
<el-input v-model="form.label"></el-input>
</el-form-item>
<el-form-item label="排序">
<el-input v-model="form.orderNum"></el-input>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark"></el-input>
</el-form-item>
<el-form-item>
<el-button @click="cancel" class="btn">取消</el-button>
<el-button type="primary" @click="submitForm" class="btn">确定</el-button>
</el-form-item>
</el-form>
</div>
<!-- <span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false"> </el-button>
<el-button type="primary" @click=" submit"> </el-button>
</span> -->
</el-dialog>
</div>
</template>
<script>
export default {
name: 'labelModal',
data() {
return {
dialogVisible: false,
form: {
label:undefined,
name:'',
sort:'',
tip:''
},
cascaderOptions:[
],
rule: {
name: [
{ required: true, trigger: 'blur', message: '请输入标签名称' }
],
resource: [
{
required: true, trigger: 'change', message: '请选择标签属性'
}
]
},
};
},
methods: {
handleClose(done) {
// this.$confirm('确认关闭?')
// .then(_ => {
// done();
// })
// .catch(_ => {});
done();
},
open(node, data) {
this.dialogVisible = true
this.$api.report.labelList().then(res => {
console.log('666',res);
this.cascaderOptions=res.data
})
if (node && data) {
this.showAddOrUpdateLabel = true
this.form.nodeLabel = node.parent.data.label
this.form.label = data.label
this.form.orderNum = data.orderNum
this.form.remark = data.remark
this.form={...this.form}
this.$refs.form.clearValidate('name')
this.$forceUpdate()
} else {
this.form = {}
this.$forceUpdate()
}
},
cancel() {
this.dialogVisible = false
},
submitForm() {
this.$refs.form.validate((valid) => {
if (valid) {
this.form.parentId=this.form.nodeLabel[this.form.nodeLabel.length - 1]
delete this.form.nodeLabel
this.$api.report.labelAdd(this.form).then(res => {
})
this.dialogVisible = false
this.$bus.$emit('updataList')
}
})
}
}
}
</script>
<style lang="scss" scoped>
.form {
padding: 50px;
.btn {
margin-left: 40px;
width: 90px;
height: 40px;
border-radius: 30px;
margin-right: 30px;
}
}
.form ::v-deep .el-input__inner {
width: 90%
}
.form ::v-deep .el-select {
width: 90%;
}
.form ::v-deep .el-select .el-input__inner {
width: 100%;
}
::v-deep .el-form-item--mini .el-form-item__label {
line-height: 40px !important;
}
::v-deep .el-input__inner {
height: 40px;
line-height: 40px;
width: 80%;
}
::v-deep .el-cascader{
height: 40px !important;
line-height: 40px !important;
width: 90%;
}
::v-deep .el-cascader .el-input__inner {
height: 40px !important;
line-height: 40px !important;
width: 100%;
}
</style>
@@ -0,0 +1,137 @@
<template>
<div class="AuditOperationBox">
<el-form
ref="examineForm"
:model="examineForm"
:rules="examineFormRules"
size="medium"
class="label-input-form prc-content-border">
<!-- <el-row :gutter="24">-->
<!-- <el-col :span="9">-->
<!-- <el-form-item label="选择赋权时间:" prop="date"-->
<!-- label-width="132px" class="add-form-item"-->
<!-- :class="{'form-item-disabled': formdisableflag}">-->
<!-- <el-date-picker-->
<!-- v-model="examineForm.date"-->
<!-- type="date"-->
<!-- placeholder="选择赋权时间">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="审批结果:" prop="flag"
label-width="132px" class="add-form-item"
:class="{'form-item-disabled': formdisableflag}">
<el-radio-group :disabled="formdisableflag" v-model="examineForm.flag" >
<el-radio :label="'1'">同意</el-radio>
<el-radio :label="'2'">不同意</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="24">
<el-form-item :prop="!formdisableflag?'approvalOpinion':''" label-width="132px" class="add-form-item">
<template slot="label">审批意见:</template>
<el-input :disabled="formdisableflag" :maxlength='1000'
v-model="examineForm.approvalOpinion"
placeholder="请输入审批意见"
:autosize="{ minRows: 2, maxRows: 4}"
type="textarea"
/>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row :gutter="24">-->
<!-- <el-col :span="24">-->
<!-- <el-form-item label="附件" prop="entStandText" label-width="132px" class="add-form-item"-->
<!-- :class="{'form-item-disabled': formdisableflag}">-->
<!-- <el-button-->
<!-- size="small"-->
<!-- class="form-upload-btn"-->
<!-- icon="el-icon-upload"-->
<!-- @click="clickButtonToUpload('approvalFile')"-->
<!-- >-->
<!-- {{ examineForm.approvalFile === 'null' || examineForm.approvalFile === '' ||-->
<!-- examineForm.approvalFile == null ? '点击上传' : '查看已上传的文件' }}-->
<!-- </el-button>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
</el-form>
</div>
</template>
<script>
export default {
name: 'AuditOperation',
props: {
isDisable:{
type:Boolean,
default:false
},
examine:{
type:Object
}
},
data () {
return {
examineForm: {
planReasonFile: '',
oldName: '',
flag: '1',
approvalOpinion: ''
},
examineFormRules: {
flag: [
{ required: true, message: '审核结果不能为空', trigger: 'change' }
],
approvalOpinion: [
{ type: 'string', max: 1000, message: '审批意见不能超过1000个字符', trigger: 'blur' }
]
},
formdisableflag: false
}
},
created () {
// 判断穿过来的query里的参数 是不是查看
if (this.isDisable) {
this.examineForm = this.examine
this.formdisableflag = true
}
},
methods: {
/** 在提交表单的校验 通过继续执行 */
submit () {
this.isSubmit = false
this.$refs.examineForm.validate((valid) => {
if (valid) {
this.isSubmit = true
return true
} else {
this.$message.warning('请检查表单是否填写正确')
return false
}
})
}
}
}
</script>
<style scoped>
.AssignButton {
font-size: 18px;
}
.AssignButton:hover {
cursor: pointer;
}
</style>
@@ -0,0 +1,311 @@
<template>
<el-dialog
title="添加报告"
:visible.sync="dialogVisible"
width="50%"
class="addreport"
:before-close="handleClose">
<el-form
:model="searchForm "
inline
class="tag-search "
@keyup.enter.native="search">
<el-row>
<el-col :span="8">
<div class="tag-item">
<label class="tag-title">关键词:</label>
<el-input v-model="searchForm.keyContent" placeholder="请输入关键词"></el-input>
</div>
</el-col>
<el-col :span="8">
<div class="tag-item">
<label class="tag-title">报告年份:</label>
<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-col>
<el-col :span="8">
<div class="tag-item">
<label class="tag-title">报告名称:</label>
<el-input v-model="searchForm.name" placeholder="请输入报告名称"></el-input>
</div>
</el-col>
<el-col :span="24" align="right" class="tag-btns">
<el-button type="primary" @click="search">查询</el-button>
<el-button type="default" @click="reset">重置</el-button>
</el-col>
</el-row>
</el-form>
<div class="table">
<vxe-table :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe height="520px"
ref="xTable" @checkbox-all="selectAllEvent" @checkbox-change="selectChangeEvent">
<vxe-column type="checkbox" width="60"></vxe-column>
<vxe-column show-overflow show-header-overflow field="name" title="报告名称"></vxe-column>
<vxe-column show-overflow show-header-overflow field="year" title="报告年份"></vxe-column>
<vxe-column show-overflow show-header-overflow field="department" title="报告部门"></vxe-column>
<vxe-column show-overflow show-header-overflow field="confidentialLevel" title="涉密等级"></vxe-column>
<vxe-column show-overflow show-header-overflow field="privacyLevel" title="隐私等级"></vxe-column>
</vxe-table>
<el-pagination
class="pagination"
@size-change="handleLogSizeChange"
@current-change="handleLogCurrentChange"
:current-page="q.pageNo"
:page-sizes="[5, 10, 20]"
:page-size="q.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="total"/>
</div>
<div class="done">
<el-button type="primary" @click.native="savaCheck">确定</el-button>
<el-button type="default" @click.native="handleClose">取消</el-button>
</div>
</el-dialog>
</template>
<script>
export default {
name: 'reportDialog',
data () {
return {
processTable: [],
total: 0,
q: {
pageSize: 10,
pageNo: 1
},
searchForm: {
keyContent:null,
name:null,
year:null
},
checkIds: [],
dialogVisible: false,
tableData: [],
ids: [], // 存储已经存在的报告
checkList: [],
yearList: []
}
},
props: {
// 获取已有的数据 在查询全部数据时不展示已有的
alreadyData: {
type: Array
}
},
methods: {
search () {
this.q.pageNo = 1
this.reportList()
},
// 日期列表
reportDateList () {
this.$api.report.reportDateList().then(({ data }) => {
this.yearList = data.list
})
},
savaCheck () {
// 点击保存 需要把选中的数据传给父组件
const name = []
const ids = []
this.alreadyData.forEach(item => {
if (this.checkIds.indexOf(item.reportId) > -1) {
name.push(item.name)
ids.push(item.reportId)
}
})
this.checkList = this.checkList.filter(item => {
return ids.indexOf(item.reportId) === -1
})
if (name.length > 0) {
this.$alert(`报告${name.toString()}已经存在`, '提示', {
confirmButtonText: '确定'
})
}
// 找出已经存在的数据 用弹窗提示
this.$emit('confirm', this.checkList)
this.dialogVisible = false
},
show () {
// 调取接口获取数据
this.reset()
this.ids = this.alreadyData.map(item => item.id)
this.reportDateList()
},
// 重置
reset () {
this.q = {
pageNo: 1,
pageSize: 10
}
this.searchForm={
keyContent: null,
year: null,
name:null
}
this.total = 0
this.tableData = []
this.reportList()
},
// 列表
reportList () {
this.$api.permissionProcess.getReportLisy({ ...this.q, ...this.searchForm,usid:this.$store.getters.userInfo.USID }).then(({ data }) => {
this.tableData = data.records.map(item=>{
item.reportId=item['id']
delete item['id']
return item
})
this.total = data.total
this.q.pageNo = data.current
this.q.pageSize = data.size
if (!data.records.length && this.q.pageNo !== 1) {
this.q.pageNo = 1
this.reportList()
}
this.dialogVisible = true
})
},
handleClose () {
this.$refs.xTable.clearSelected()
this.dialogVisible = false
},
handleLogSizeChange (size) {
this.q.pageSize = size
this.reportList()
},
handleLogCurrentChange (page) {
this.q.pageNo = page
this.reportList()
},
selectAllEvent ({ checked }) {
const records = this.$refs.xTable.getCheckboxRecords()
this.checkList = records
this.checkIds = records.map(item => {
return item.reportId
})
},
selectChangeEvent ({ checked }) {
const records = this.$refs.xTable.getCheckboxRecords()
this.checkList = records
this.checkIds = records.map(item => {
return item.reportId
})
}
}
}
</script>
<style lang="scss" scoped>
.table{
padding: 10px 20px;
width: 100%;
}
.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: 10px 20px 10px;
text-align: right;
::v-deep .el-button {
width: 80px;
height: 36px;
padding: 0;
}
}
.tag-search {
padding-top: 9px;
::v-deep .el-date-picker,
::v-deep .el-input {
width: 200px;
}
.tag-item {
margin-bottom: 15px;
display: flex;
.year {
::v-deep .el-input__inner {
padding: 0 15px !important;
}
}
label.tag-title {
font-size: 14px;
font-weight: normal;
color: #646464;
display: inline-block;
width: 80px;
height: 19px;
line-height: 19px;
text-align: end;
margin-right: 10px;
margin-top: 2.5px;
}
.tag-show {
flex: 1;
margin-right: 28px;
height: 19px;
overflow: hidden;
position: relative;
&.active {
height: auto;
}
::v-deep .check-active{
.el-checkbox__label{
color: #434343;
}
}
::v-deep .el-checkbox {
margin-right: 15px;
color: #434343;
}
::v-deep .el-checkbox__label {
min-width: 80px;
}
::v-deep .el-checkbox-group {
display: inline;
}
.el-icon-arrow-down,
.el-icon-arrow-up {
color: #C0C4CC;
cursor: pointer;
position: absolute;
right: 0;
top: 2px;
}
}
}
.tag-btns {
padding-right: 15px;
}
}
</style>
@@ -0,0 +1,197 @@
<template>
<div class="reportTable">
<el-button v-if="!disabled" class="addbtn" size="small" @click="addReport">添加报告</el-button>
<el-button v-if="!disabled" class="delbtn" size="small" @click="deleteAll">批量删除</el-button>
<div class="table">
<vxe-table :data="processTable" :empty-render="{name: 'NotData'}" align="center" border stripe v-table-min-height="500"
ref="xTable" @checkbox-all="selectAllEvent" @checkbox-change="selectChangeEvent">
<vxe-column type="checkbox" width="60"></vxe-column>
<vxe-column show-overflow show-header-overflow field="name" title="报告名称"></vxe-column>
<!-- <vxe-column show-overflow show-header-overflow field="labelTwoName" :title="tagsForm.tags02.name"></vxe-column>-->
<!-- <vxe-column show-overflow show-header-overflow field="labelThreeName" :title="tagsForm.tags03.name"></vxe-column>-->
<vxe-column show-overflow show-header-overflow field="year" title="报告年份" width="200" ></vxe-column>
<vxe-column show-overflow show-header-overflow field="department" title="报告部门"></vxe-column>
<vxe-column show-overflow show-header-overflow field="confidentialLevel" title="涉密等级"></vxe-column>
<vxe-column show-overflow show-header-overflow field="privacyLevel" title="隐私等级"></vxe-column>
<vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right" v-if="!disabled">
<template #default="{ row }">
<el-button type="text" class="del-btn" @click="reportDelete(row.reportId)">删除</el-button>
<!-- <el-button type="text" @click="downloadRow(row)">下载</el-button>-->
</template>
</vxe-column>
</vxe-table>
<el-pagination
class="pagination"
@size-change="handleLogSizeChange"
@current-change="handleLogCurrentChange"
:current-page="qLog.pageNo"
:page-sizes="[5, 10, 20]"
:page-size="qLog.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="total"/>
<reportDialog ref="reportDialog" :tagsForm="tagsForm" :alreadyData="value" @confirm="addReportList"></reportDialog>
</div>
</div>
</template>
<script>
import reportDialog from './reportDialog'
export default {
name: 'reportTable',
props: {
value: {
type: Array,
default: new Array([]),
required: true
},
disabled: {
type: Boolean,
default: false
}
},
components: {
reportDialog
},
data () {
return {
processTable: [],
total: 0,
qLog: {
pageSize: 10,
pageNo: 1
},
copyTableData: [],
checkIds: [],
tagsForm: {
tags01: {
name: '',
parentId: '0',
type: '1',
id: '',
childList: [
// {name: '无', type: '1', id: '', parentId: ''},
]
},
tags02: {
name: '',
parentId: '0',
type: '2',
id: '',
childList: [
// {name: '无', type: '2', id: '', parentId: ''},
]
},
tags03: {
name: '',
parentId: '0',
type: '3',
id: '',
childList: [
// {name: '无', type: '3', id: '', parentId: ''},
]
}
}
}
},
watch: {
value () {
this.qLog.pageSize = 10
this.qLog.pageNo = 1
this.total = this.value.length
this.processTable = this.value.slice(0, 9)
this.pageChage(1)
}
},
created () {
// this.copyTableData = JSON.parse(JSON.stringify(this.tableData))
},
methods: {
addReportList (list) {
this.$nextTick(()=>{
this.$emit('updateTable', [...this.value , ...list])
})
},
pageChage (current) {
this.total = this.value.length
setTimeout(() => {
current = current || this.qLog.pageNo
this.qLog.pageNo = current
this.processTable = this.value.slice(this.qLog.pageSize * (current - 1), this.qLog.pageSize * current)
// console.log(this.pages.size, this.pages.size * (current - 1), this.pages.size * this.pages.current, this.list)
if (this.processTable.length < 1 && current > 1) {
this.pageChage(current - 1)
return false
}
})
},
handleLogSizeChange (val) {
this.qLog.pageSize = val
this.qLog.pageNo = 1
this.pageChage(1)
},
handleLogCurrentChange (val) {
this.qLog.pageNo = 1
this.pageChage(val)
},
selectAllEvent ({ checked }) {
const records = this.$refs.xTable.getCheckboxRecords()
this.checkIds = records.map(item => {
return item.reportId
})
},
selectChangeEvent ({ checked }) {
const records = this.$refs.xTable.getCheckboxRecords()
this.checkIds = records.map(item => {
return item.reportId
})
},
addReport () {
this.$refs.reportDialog.show()
},
deleteAll () {
this.reportDelete(this.checkIds)
},
reportDelete (id) {
// 删除报告 假删除
if (typeof id === 'string') {
this.$confirm('此操作将删除所选数据, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$emit('updateTable', this.value.filter(item => item.reportId !== id))
})
} else {
if (Array.isArray(id)) {
this.$confirm('此操作将删除所选数据, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$emit('updateTable', this.value.filter(item => id.indexOf(item.reportId) === -1))
})
}
}
}
}
}
</script>
<style lang="scss" scoped>
.table{
margin-top: 10px;
}
.reportTable{
margin-bottom: 20px;
}
.addbtn{
border: none;
background-color: #8400FF;
color: #fff;
}
.delbtn{
border: none;
background-color: #d9001b;
color: #fff;
}
</style>
+227
View File
@@ -0,0 +1,227 @@
<template>
<!-- 此页面主要展示审核和已完成-->
<div class="process">
<div class="process_box">
<process-header :title="'权限审批'" :proceesNum="prcNum"></process-header>
<div class="procedure">
<div class="process_content">
<span class="base_title">基础信息</span>
<el-form ref="processFormRef" :model="processForm" label-width="150px"
:rules="processFormRule" class="label-input-form" size="medium">
<el-row>
<el-col :span="9">
<el-form-item label="流程名称:" prop="prcName">
<el-input readonly :disabled="formControl " v-model="processForm.prcName" @click.native="handleCheck('spr1')"
placeholder="请输入流程名称"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-row>
<report-table v-model="tableData" @updateTable="(newValue)=>{tableData=newValue}" :disabled="formControl"></report-table>
</el-row>
<el-row>
<el-form ref="form" :model="applicationForm" label-width="150px"
class="label-input-form" size="medium" :rules="applicationFormRule"
:disabled="formControl">
<el-row>
<el-col :span="9">
<el-form-item label="申请原因:" prop="applyReason">
<el-input type="textarea" v-model="applicationForm.applyReason" placeholder="请输入申请原因"></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="6">
<el-form-item label="选择申请权限:" prop="power">
<el-select v-model="applicationForm.power" placeholder="请选择申请权限">
<el-option
v-for="item in PERMISSION"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-row>
</div>
<div class="process_content">
<span class="base_title">审批历史</span>
<process-approval-history :prcNum="prcNum"></process-approval-history>
</div>
<div class="process_content">
<span class="base_title">审核信息</span>
<audit-operation ref="operationRef" :examine="submitjson" :is-disable="disabled"></audit-operation>
</div>
</div>
<process-footer
v-if="!disabled"
showCancel
:show-transfer="isShowTran"
:show-submit="isShowSubmit"
:submitLoading="isSubmit"
:TransferLoading="tranLoading"
@transfer="handleTransfer"
@submit="handleSubmit"
></process-footer>
<process-choose-tree
dialog-model
:visible.sync="visibleTree"
:maxSelected="1"
:config="{value: '',valueName:''}"
@confirm="handleDblClick"
></process-choose-tree>
</div>
</div>
</template>
<script>
import processHeader from '@/components/ProcessHeader'
import processFooter from '@/components/ProcessFooter'
import processChooseTree from '../../components/ProcessChooseTree'
import processApprovalHistory from '@/components/ProcessApprovalHistory'
import auditOperation from './components/AuditOperation'
import reportTable from './components/reportTable'
import { PERMISSION } from '@/utils/Enum/enum'
import processMixin from "../../components/ProcessMixin";
export default {
name: 'launch',
mixins: [processMixin],
components: {
processHeader,
reportTable,
processFooter,
processApprovalHistory,
auditOperation,
processChooseTree
},
data () {
return {
applicationFormRule: {
applyReason: [{
max: 1000, message: '申请原因最多填写1000字符'
}],
power: [{
required: true,
message: '请选择申请权限'
}]
},
processFormRule: {
prcName: [{
required: true,
message: '请输入流程名称',
trigger: 'change'
},{
max: 100,
message: '申请原因最多填写100字符',
trigger: 'change'
}]
},
processForm: { prcName : ''},
visibleTree: false,
isSubmit: false,
tranLoading: false,
isShowTran: true,
isShowSubmit: true,
formControl: true,
disabled:false,
assignForm: {},
tableData: [],
applicationForm: {
power:'',
applyReason:''
},
q: {
pageSize: 10000,
pageNo: 1
},
PERMISSION,
submitjson:{},
prcType:1
}
},
created () {
this.taskId=this.$store.getters.handleProcess.taskId
this.prcNum=this.$store.getters.handleProcess.prcNum
this.prcId=this.$store.getters.handleProcess.prcId
this.prcName=this.$store.getters.handleProcess.prcName
let params={
prcId: this.prcId,
prcType: this.prcType
}
if(this.$route.query.type=='yiban'){
this.disabled=true
}
this.getProcessDetail(params).then(res=>{
this.tableData = JSON.parse(this.processOld.dataJson)
this.applicationForm.power = this.tableData[0].power
this.applicationForm.applyReason = this.tableData[0].applyReason
this.processForm.prcName = this.prcName
this.disabled=false
this.formControl= true
if(this.$route.query.type=='yiban'){
this.disabled=true
this.submitjson=JSON.parse(this.processOld.submitJson)
}else{
}
})
},
methods: {
// 获取表格列表 吧查询到的值传给子组件
reportList(ids) {
this.$api.report.reportList({id: ids}).then(({data}) => {
this.tableData = data.records
})
},
// 转办
handleTransfer() {
this.visibleTree = true
},
// 选择转办
handleDblClick(treeNode) {
// 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() {
// if (this.$refs.operationRef.submit()) {
// 通过了校验 需要整合参数 拿到原来的dataJson 再把新添加的增进去 在拼成dataJson
let submit = JSON.parse(this.processOld.submitJson)
let dataJson = this.processOld.dataJson
let submitJson = JSON.stringify({...submit, ...this.$refs.operationRef.examineForm})
this.completeProcess({
dataJson,
submitJson,
taskId: this.taskId,
userId: this.$store.getters.userInfo.usid,
prcType: this.prcType
})
}
}
}
</script>
<style scoped>
</style>
+394
View File
@@ -0,0 +1,394 @@
<template>
<div class="process">
<div class="process_box">
<process-header v-if="initShow" :title="'发起人修改'" :proceesNum="prcNum"></process-header>
<process-header v-else :title="'发起流程'"></process-header>
<div class="procedure">
<div class="process_content">
<span class="base_title">基础信息</span>
<el-form ref="processFormRef" :model="processForm" label-width="150px"
:rules="processFormRule" class="label-input-form" size="medium">
<el-row>
<el-col :span="9">
<el-form-item label="流程名称:" prop="prcName">
<el-input :disabled="formControl || formControlname" v-model="processForm.prcName"
placeholder="请输入流程名称"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-row>
<report-table v-model="tableData" @updateTable="(newValue)=>{tableData=newValue}" :disabled="showTableD"></report-table>
</el-row>
<el-row>
<el-form ref="applicationFormRef" :model="applicationForm" label-width="150px"
class="label-input-form" size="medium" :rules="applicationFormRule"
>
<el-row>
<el-col :span="9">
<el-form-item label="申请原因:" prop="applyReason">
<el-input :disabled="formControl" type="textarea" v-model="applicationForm.applyReason"
placeholder="请输入申请原因"></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="6">
<el-form-item label="选择申请权限:" prop="power">
<el-select :disabled="formControl" v-model="applicationForm.power" placeholder="请选择申请权限">
<el-option
v-for="item in PERMISSION"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-row>
</div>
<div class="process_content" v-if="initShow">
<span class="base_title">审批历史</span>
<process-approval-history :prcNum="prcNum"></process-approval-history>
</div>
<div class="process_content">
<span class="base_title">指派信息</span>
<el-form ref="assignFormRef" :model="assignForm" label-width="150px"
:rules="assignFormRules" class="label-input-form" size="medium">
<el-row>
<el-col :span="9">
<el-form-item label="选择一级审批人员:" prop="oneApprove">
<el-input readonly :disabled="formControl" v-model="assignForm.oneApproveName"
@click.native="handleCheck('spr1')"
placeholder="请选择一级审批人员"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
<el-form-item label="选择二级审批人员:" prop="twoApprove">
<el-input readonly :disabled="formControl" v-model="assignForm.twoApproveName"
@click.native="handleCheck('spr2')"
placeholder="请选择二级审批人员"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="说明:">
<el-input type="textarea" :disabled="formControl" v-model="assignForm.remark" placeholder="请输入说明"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
<process-footer
v-if="!formControl"
showCancel
:show-reset="isShowReset"
:show-submit="isShowSubmit"
:submitLoading="isSubmit"
:resetLoading="resetLoading"
@reset="handleReset"
@submit="handleSubmit"
></process-footer>
<orgTable :visible.sync="visibleOrgTable" title="人员列表" dialog-model :config="{
value: orgTableVal,
valueName: orgTableValName
}" :workNumFlag="true" :maxSelected="1" @confirm="isTreeOk"></orgTable>
</div>
</div>
</template>
<script>
import processHeader from '@/components/ProcessHeader'
import processFooter from '@/components/ProcessFooter'
import processApprovalHistory from '@/components/ProcessApprovalHistory'
import reportTable from './components/reportTable'
import {PERMISSION} from '@/utils/Enum/enum'
import orgTable from '../../components/OrgTable'
import processMixin from "../../components/ProcessMixin";
export default {
name: 'launch',
components: {
processHeader,
reportTable,
processFooter,
processApprovalHistory,
orgTable
},
mixins: [processMixin],
data() {
return {
showTableD: false,
initShow: false, // 控制审批历史是否显示 只有在不是第一次的时候才是true
treeType: '',
orgTableVal: '',
orgTableValName: '',
visibleOrgTable: false,
isSubmit: false,
resetLoading: false,
isShowReset: true,
isShowSubmit: true,
formControl: false,
formControlname: false,
assignForm: {
oneApprove: '',
twoApprove: '',
twoApproveName: '',
oneApproveName: '',
remark:''
},
tableData: [],
applicationForm: {
applyReason: '',
power: ''
},
q: {
pageSize: 10000,
pageNo: 1
},
PERMISSION,
processForm: {
prcName: ''
},
processFormRule: {
prcName: [{
required: true,
message: '请输入流程名称',
trigger: 'change'
}, {
max: 100,
message: '申请原因最多填写100字符',
trigger: 'change'
}]
},
applicationFormRule: {
applyReason: [{
max: 1000, message: '申请原因最多填写1000字符'
}],
power: [{
required: true,
message: '请选择申请权限'
}]
},
assignFormRules: {
oneApprove: [{
required: true,
message: '请选择一级审批人员',
trigger: 'change'
}],
twoApprove: [{
required: true,
message: '请选择二级审批人员',
trigger: 'change'
}],
remark: [{
max: 1000, message: '说明最多填写1000字符'
}]
},
prcType: 1,
prcName:''
}
},
created() {
// 第一次进入此页面 需要清楚校验
if (this.$route.query.ids) {
if (this.$route.query.ids.split(',').length > 0) {
this.reportList(this.$route.query.ids)
}
this.handleReset()
}
if (this.$store.getters.handleProcess.taskDefinitionKey == 'aid4') {
this.taskId = this.$store.getters.handleProcess.taskId
this.prcNum = this.$store.getters.handleProcess.prcNum
this.prcId = this.$store.getters.handleProcess.prcId
this.prcName = this.$store.getters.handleProcess.prcName
this.initShow = true
this.formControlname = true
this.getProcessDetail().then(res => {
//基础信息
this.tableData = JSON.parse(this.processOld.dataJson)
this.applicationForm.power = this.tableData[0].power
this.applicationForm.applyReason = this.tableData[0].applyReason
this.processForm.prcName = this.prcName
debugger
//指派信息
({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))
})
}
if (this.$route.query.type == 'yiban') {
this.taskId = this.$store.getters.handleProcess.taskId
this.prcNum = this.$store.getters.handleProcess.prcNum
this.prcId = this.$store.getters.handleProcess.prcId
this.prcName = this.$store.getters.handleProcess.prcName
this.formControl = true
this.initShow = true
this.showTableD = true
this.getProcessDetail().then(() => {
this.tableData = JSON.parse(this.processOld.dataJson)
this.applicationForm.power = this.tableData[0].power
this.applicationForm.applyReason = this.tableData[0].applyReason
this.processForm.prcName = this.prcName
//指派信息
// ({ name: a.name, age: a.age } = b)
this.assignForm = JSON.parse(this.processOld.submitJson)
})
}
console.log(this.PERMISSION, 'ddd')
},
methods: {
handleCheck(name) {
if (this.initShow) {
return false
}
this.treeType = name
this.orgTableVal = ''
this.orgTableValName = ''
if (name === 'spr1') {
this.orgTableVal = this.assignForm.oneApprove ? this.assignForm.oneApprove : ''
this.orgTableValName = this.assignForm.oneApproveName ? this.assignForm.oneApproveName : ''
} else {
this.orgTableVal = this.assignForm.twoApprove ? this.assignForm.twoApprove : ''
this.orgTableValName = this.assignForm.twoApproveName ? this.assignForm.twoApproveName : ''
}
this.visibleOrgTable = true
},
// 树点击
isTreeOk(checkedList) {
// console.log(checkedList)
const parts = []
const partsName = []
console.log(checkedList, '0009999')
checkedList.map((item, index) => {
parts.push(item.userId || item.USID)
partsName.push(item.uname)
})
this.qcrList = checkedList
if (this.treeType === 'spr1') {
this.assignForm.oneApprove = parts.toString()
this.assignForm.oneApproveName = partsName.toString()
} else if (this.treeType === 'spr2') {
this.assignForm.twoApprove = parts.toString()
this.assignForm.twoApproveName = partsName.toString()
}
// console.log(this.assignForm.name1Id, this.assignForm.name2Id)
},
// 获取表格列表 吧查询到的值传给子组件
reportList(ids) {
this.$api.permissionProcess.getReportLisy({
pageSize:1000,
pageNo:1,
ids: ids.split(',')
}).then(({data}) => {
this.tableData = data.records.map(item => {
item.reportId = item['id']
delete item['id']
return item
})
})
},
handleReset() {
this.processForm.prcName = ''
if(this.$route.query.taskDefinitionKey == 'aid4'){
this.processForm.prcName = this.prcName
}
this.applicationForm = {
applyReason: '',
power: ''
}
this.assignForm = {
oneApprove: '',
twoApprove: ''
}
this.$nextTick(() => {
this.$refs.applicationFormRef.clearValidate()
this.$refs.assignFormRef.clearValidate()
})
},
// 整理数据
organizeData() {
let userId = this.$store.getters.userInfo.usid
this.tableData = this.tableData.map(item => {
item = {...item, ...this.applicationForm, userId: userId}
return item
})
},
// 提交
handleSubmit() {
console.log(this.$store.getters.userInfo.usid, " this.$store.getters.userInfo.USID")
this.$refs.assignFormRef.validate(v => {
this.$refs.applicationFormRef.validate(m => {
this.$refs.processFormRef.validate(z => {
if (v && m && z) {
// 过了校验 需要把数据都整合 this.tableData this.applicationForm this.assignForm
// 表格数据没有不能提交 需要提示
if (this.tableData.length == 0) {
this.$message.warning('至少需要选择一条报告数据')
} else {
// 调用流程数据
console.log("发送数据")
// 处理表格数据
this.organizeData()
//如果不是第一次
if (this.initShow) {
let dataJson = JSON.stringify(this.tableData)
let submitJson = JSON.stringify({...this.assignForm, userId: this.$store.getters.userInfo.usid,approvalOpinion:this.assignForm.remark})
this.completeProcess({
dataJson,
submitJson,
taskId: this.taskId,
userId: this.$store.getters.userInfo.usid,
prcType: this.prcType
})
} else {
this.startProcess()
}
}
} else {
this.$message.warning('请检查表单填写完整')
}
})
})
})
},
//修改参数
changeParam() {
},
startProcess() {
//把表单都整合到form中
// dataJson与submitJson需要发到completeProcess
let form = {}
form = {
approveData: {
...this.applicationForm, ...this.processForm, ...this.assignForm,
userId: this.$store.getters.userInfo.usid
}, dataMsg: this.tableData
}
form.prcType = this.prcType
form.prcName = this.processForm.prcName
form.userId = this.$store.getters.userInfo.usid
//...this.applicationForm,...this.processForm,
let dataJson = JSON.stringify(this.tableData)
let submitJson = JSON.stringify({...this.assignForm, userId: this.$store.getters.userInfo.usid,approvalOpinion:this.assignForm.remark})
this.$api.process.startProcess(form).then(({data}) => {
this.completeProcess({dataJson, submitJson, taskId: data.result, userId: form.userId, prcType: this.prcType})
})
},
//获取流程详细信息
}
}
</script>
<style scoped>
</style>
+97 -43
View File
@@ -1,69 +1,85 @@
<template>
<div class="content">
<div class="content-height content-center">
<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">
<el-button type="primary" @click="search">查询</el-button>
<el-button type="" @click="reset">重置</el-button>
</div>
<div class="search">
<el-row>
<el-col :span="20">
<div class="search-box-left">
<label>流程编号</label>
<el-input v-model="form.prcNum" placeholder="请输入流程编号"></el-input>
<label>流程类型</label>
<el-select v-model="form.prcType" collapse-tags placeholder="请选择流程类型">
<template v-for="item in processTypeList">
<el-option :label="item.label" :value="item.value" :key="item.value"></el-option>
</template>
</el-select>
<label>流程名称</label>
<el-input v-model="form.prcName" placeholder="请输入流程名称"></el-input>
</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>
</el-col>
</el-row>
</div>
<div class="tabs">
<tabs :tableData="tableData"/>
<tabs @clearForm="reset"/>
</div>
</div>
</template>
<script>
import ProcessMixin from "../../components/ProcessMixin";
import tabs from '../userCenter/processCenter/tabs.vue'
export default {
name:'processCenter',
mixins: [ProcessMixin],
components:{
tabs
},
data() {
return {
form: {},
tableData:[]
form: {
prcNum:'',
prcName:''
},
}
},
created () {
;
},
mounted () {
;
this.$bus.$on('clearForm',()=>{
this.form={}
});
},
methods: {
//查询
search() {
console.log(this.form)
this.$bus.$emit('getSearchItem',this.form)
// this.$api.processCenter.search({})
this.tableData=[{createTime:'1999-10-1'}]
},
//重置
reset(){
this.form={}
this.tableData=[{createTime:'3000-10-1'}]
// this.$api.processCenter.reset({})
this.form= {
prcNum:'',
prcName:''
}
this.$bus.$emit('getSearchItem',this.form)
}
},
}
</script>
<style lang="scss" scoped>
.content{
min-height: calc(100vh - 60px - 20px);
box-shadow: 0 6px 11px 0 rgba(163, 163, 163, 0.2);
border-radius: 6px;
background: #FFFFFF;
.content-center{
.title {
border-bottom: 1px solid #EBEEF5;
height: 42px;
@@ -76,24 +92,62 @@ import tabs from '../userCenter/processCenter/tabs.vue'
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;
}
.year {
::v-deep .el-input__inner {
padding: 0 15px !important;
}
}
::v-deep .el-input {
width: 167px;
margin-right: 5px;
}
@media screen and (max-width: 1366px) {
::v-deep .el-input {
width: 135px;
margin-right: 5px;
}
}
::v-deep .el-button {
float: right;
}
}
.search-box-right {
padding-top: 20px;
display: flex;
justify-content: flex-end;
align-items: center;
padding-right: 14px;
}
.operate-box {
padding-left: 13px;
padding-bottom: 11px;
padding-top: 18px;
}
}
.tabs{
margin: 20px 0 0 13px;
}
}
::v-deep .el-input{
width: 200px;
}
</style>
</style>
@@ -1,77 +1,142 @@
<template>
<div>
<el-table :data="tableData" style="width: 100%" border
:header-cell-style="{ background: '#DFE6EC', fontWeight: '700', color: '#1F2D3D' }">
<el-table-column prop="processId" label="流程编号" align="center">
</el-table-column>
<el-table-column prop="processName" label="流程名称" align="center">
</el-table-column>
<el-table-column prop="processPerson" label="发起人" align="center">
</el-table-column>
<el-table-column prop="now" label="当前处理人" align="center">
</el-table-column>
<el-table-column prop="last" label="上一处理人" align="center">
</el-table-column>
<el-table-column prop="createTime" label="创建时间" sortable align="center">
</el-table-column>
<el-table-column prop="endTime" label="完成时间" sortable align="center">
</el-table-column>
<el-table-column prop="status" label="状态" align="center">
</el-table-column>
<el-table-column label="操作" width="120" align="center">
<template slot-scope="scope">
<el-button @click.native.prevent="view(scope.$index, tableData)" type="text" size="small">
查看
</el-button>
</template>
</el-table-column>
</el-table>
<div class="table">
<vxe-table ref="xTable" :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe v-table-min-height="'calc(100vh - 380px)'">
<vxe-column show-overflow show-header-overflow type="seq" title="号" width="77">
<template #default="{ row, rowIndex }">
{{ rowIndex + (q.current - 1) * q.size + 1 }}
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="prcNum" title="流程编号">
<template #default="{ row,index }">
<div class="blurcolor" @click="view(row)">{{row.prcNum}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="prcType"
title="流程类型">
<template #default="{ row,index }">
<div >{{getPrcName(row.prcType)}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="prcName" title="流程名称">
<template #default="{ row,index }">
<div class="blurcolor" @click="view(row)">{{row.prcName}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="creatUserName"
title="发起人"></vxe-column>
<vxe-column show-overflow show-header-overflow field="taskAssignee" title="当前处理人"></vxe-column>
<vxe-column show-overflow show-header-overflow field="taskBackAssignee"
title="上一处理人"></vxe-column>
<vxe-column show-overflow show-header-overflow field="creatTime" title="创建时间"></vxe-column>
<vxe-column show-overflow show-header-overflow field="endTime"
title="完成时间"></vxe-column>
<vxe-column show-overflow show-header-overflow field="status" title="状态">
<template #default="{ row }">
<span v-if="row.isEnd === '0'">未完成</span>
<span v-if="row.isEnd === '1'">已完成</span>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right">
<template #default="{ row }">
<el-button @click.native.prevent="view(row)" type="text" size="small">
查看
</el-button>
</template>
</vxe-column>
</vxe-table>
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="q.current"
:page-sizes="[5, 10, 20]" :page-size="q.size" layout="total, sizes, prev, pager, next, jumper"
:total="total" />
</div>
</div>
</template>
<script>
import ProcessMixin from "../../../components/ProcessMixin";
export default {
name: 'finishProcess',
mixins:[ProcessMixin],
data() {
return {
tableData: [{
processId: '2016-05-1',
processName: '王小虎',
processPerson: '上海市普陀区金沙江路 1518 弄',
createTime: '2023-1-1'
}, {
processId: '2016-05-2',
processName: '王小虎',
processPerson: '上海市普陀区金沙江路 1518 弄',
createTime: '2023-1-2'
}, {
processId: '2016-05-3',
processName: '王小虎',
processPerson: '上海市普陀区金沙江路 1518 弄',
createTime: '2023-1-3'
}, {
processId: '2016-05-4',
processName: '王小虎',
processPerson: '上海市普陀区金沙江路 1518 弄',
createTime: '2023-1-4'
}]
q:{
current:1,
size:10
},
total: 0,
tableData: []
}
},
props:{
secondData:{
type:Array,
default:[],
form:{
type:Object,
default:{},
}
},
watch: {
secondData(newValue, oldValue) {
this.tableData=newValue
}
},
watch:{
form:{
handler(){
console.log("我见他",this.form)
this.loadData()
},
deep:true
}
},
mounted () {
this.loadData()
},
methods: {
view() {
alert(111)
},
loadData() {
let userId=this.$store.getters.userInfo.usid
this.$api.processCenter.finishProcessPage({...this.q,...this.form,userId:userId}).then(res=>{
this.tableData = res.data.list
this.total = res.data.count
})
},
// 单页数据量
handleSizeChange(val) {
this.q.size = val;
this.q.current = 1;
this.loadData();
},
// 第几页
handleCurrentChange(val) {
this.q.current = val;
this.loadData();
},
view(row) {
let params={
id: this.$route.query.id,
taskId:row.taskId,
type:'yiban',
taskDefinitionKey: row.taskDefinitionKey,
prcNum: row.prcNum,
prcId: row.prcId,
prcName: row.prcName,
}
this.$store.commit('setHandleProcess',params)
switch (row.prcType) {
case '1' :
if (row.taskDefinitionKey == 'aid1' || row.taskDefinitionKey == 'aid3') {
this.$router.push({
path: '/permission/launch',
query: {
id: this.$route.query.id,
type:'yiban',
}
})
}else{
this.$router.push({
path: '/permission/examine',
query: {
id: this.$route.query.id,
type:'yiban',
}
})
}
}
},
}
}
</script>
@@ -79,6 +144,13 @@ export default {
<style lang="scss" scoped>
::v-deep .el-table__fixed, ::v-deep .el-table__fixed-right ::before{
height: 0px !important;
}
</style>
.table {
margin: 0 14px 0 13px;
::v-deep .el-pagination {
margin-top: 13px;
padding-left: 20px;
padding-bottom: 10px;
}
}
</style>
@@ -1,76 +1,129 @@
<template>
<div>
<el-table :data="tableData" style="width: 100%" border :header-cell-style="{
background: '#DFE6EC',
fontWeight: '700',
color: '#1F2D3D',
}">
<el-table-column prop="processId" label="流程编号" align="center">
</el-table-column>
<el-table-column prop="processName" label="流程名称" align="left">
</el-table-column>
<el-table-column prop="processPerson" label="发起人" align="center">
</el-table-column>
<el-table-column prop="createTime" label="创建时间" sortable align="center">
</el-table-column>
<el-table-column label="操作" width="120" align="center">
<template slot-scope="scope">
<el-button @click.native.prevent="handle(scope.$index, tableData)" type="text" size="small">
办理
</el-button>
</template>
</el-table-column>
</el-table>
<div class="table">
<vxe-table ref="xTable" :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe v-table-min-height="'calc(100vh - 380px)'">
<vxe-column show-overflow show-header-overflow type="seq" title="序号" width="77">
<template #default="{ row, rowIndex }">
{{ rowIndex + (q.current - 1) * q.size + 1 }}
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="prcNum"
title="流程编号">
<template #default="{ row,index }" >
<div class="blurcolor" @click="handle(row)">{{row.prcNum}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="prcType"
title="流程类型">
<template #default="{ row,index }">
<div>{{getPrcName(row.prcType)}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="prcName" title="流程名称">
<template #default="{ row,index }" >
<div class="blurcolor" @click="handle(row)">{{row.prcName}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="creatUserName"
title="发起人"></vxe-column>
<vxe-column show-overflow show-header-overflow field="creatTime" title="创建时间"></vxe-column>
<vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right">
<template #default="{ row }">
<el-button @click.native.prevent="handle(row)" type="text" size="small">
办理
</el-button>
</template>
</vxe-column>
</vxe-table>
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="q.current"
:page-sizes="[5, 10, 20]" :page-size="q.size" layout="total, sizes, prev, pager, next, jumper"
:total="total" />
</div>
</div>
</template>
<script>
import ProcessMixin from "../../../components/ProcessMixin";
export default {
name: "gencyProcess",
mixins:[ProcessMixin],
data() {
return {
tableData: [
{
processId: "2016-05-1",
processName: "王小虎",
processPerson: "上海市普陀区金沙江路 1518 弄",
createTime: "2023-1-1",
},
{
processId: "2016-05-2",
processName: "王小虎",
processPerson: "上海市普陀区金沙江路 1518 弄",
createTime: "2023-1-2",
},
{
processId: "2016-05-3",
processName: "王小虎",
processPerson: "上海市普陀区金沙江路 1518 弄",
createTime: "2023-1-3",
},
{
processId: "2016-05-4",
processName: "王小虎",
processPerson: "上海市普陀区金沙江路 1518 弄",
createTime: "2023-1-4",
},
],
q:{
current:1,
size:10
},
total: 0,
tableData: []
};
},
props:{
firstData:{
type:Array,
default:[],
form:{
type:Object,
default:{},
}
},
watch: {
firstData(newValue, oldValue) {
this.tableData=newValue
}
form:{
handler(){
console.log("我见他",this.form)
this.loadData()
},
deep:true
}
},
methods: {
handle() {
alert(111);
mounted () {
this.loadData()
},
methods: {
loadData() {
let userId=this.$store.getters.userInfo.usid
this.$api.processCenter.gencyProcessPage({...this.q,...this.form,userId:userId}).then(res=>{
this.tableData = res.data.list
this.total = res.data.count
})
},
// 单页数据量
handleSizeChange(val) {
this.q.size = val;
this.q.current = 1;
this.loadData();
},
// 第几页
handleCurrentChange(val) {
this.q.current = val;
this.loadData();
},
handle(row) {
let params={
id: this.$route.query.id,
taskId:row.taskId,
type:'yiban',
taskDefinitionKey: row.taskDefinitionKey,
prcNum: row.prcNum,
prcId: row.prcId,
prcName: row.prcName,
}
this.$store.commit('setHandleProcess',params)
switch (row.prcType) {
case '1' :
if (row.taskDefinitionKey == 'aid4') {
this.$router.push({
path: '/permission/launch',
query: {
id: this.$route.query.id
}
})
}else{
this.$router.push({
path: '/permission/examine',
query: {
id: this.$route.query.id
}
})
}
}
},
},
};
@@ -81,4 +134,12 @@ export default {
height: 0px !important;
}
</style>
.table {
margin: 0 14px 0 13px;
::v-deep .el-pagination {
margin-top: 13px;
padding-left: 20px;
padding-bottom: 10px;
}
}
</style>
@@ -1,75 +1,125 @@
<template>
<div>
<el-table :data="tableData" style="width: 100%" border
:header-cell-style="{ background: '#DFE6EC', fontWeight: '700', color: '#1F2D3D' }">
<el-table-column prop="processId" label="流程编号" align="center">
</el-table-column>
<el-table-column prop="processName" label="流程名称" align="center">
</el-table-column>
<el-table-column prop="processPerson" label="发起人" align="center">
</el-table-column>
<el-table-column prop="now" label="当前处理人" align="center">
</el-table-column>
<el-table-column prop="last" label="上一处理人" align="center">
</el-table-column>
<el-table-column prop="createTime" label="创建时间" sortable align="center">
</el-table-column>
<el-table-column prop="endTime" label="完成时间" sortable align="center">
</el-table-column>
<el-table-column prop="status" label="状态" align="center">
</el-table-column>
<el-table-column label="操作" width="120" align="center">
<template slot-scope="scope">
<el-button @click.native.prevent="view(scope.$index, tableData)" type="text" size="small">
查看
</el-button>
</template>
</el-table-column>
</el-table>
<div class="table">
<vxe-table ref="xTable" :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe v-table-min-height="'calc(100vh - 380px)'">
<vxe-column show-overflow show-header-overflow type="seq" title="号" width="77">
<template #default="{ row, rowIndex }">
{{ rowIndex + (q.current - 1) * q.size + 1 }}
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="prcNum"
title="流程编号">
<template #default="{ row }">
<div class="blurcolor" @click="view(row)"> {{row.prcNum}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow
title="流程类型">
<template #default="{ row,index }">
<div>{{getPrcName(row.prcType)}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow title="流程名称">
<template #default="{ row }" >
<div class="blurcolor" @click="view(row)">{{row.prcName}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="creatUserName"
title="发起人"></vxe-column>
<vxe-column show-overflow show-header-overflow field="taskAssignee" title="当前处理人"></vxe-column>
<vxe-column show-overflow show-header-overflow field="taskBackAssignee"
title="上一处理人"></vxe-column>
<vxe-column show-overflow show-header-overflow field="creatTime" title="创建时间"></vxe-column>
<vxe-column show-overflow show-header-overflow field="endTime"
title="完成时间"></vxe-column>
<vxe-column show-overflow show-header-overflow field="status" title="状态">
<template #default="{ row }">
<span v-if="row.isEnd === '0'">未完成</span>
<span v-if="row.isEnd === '1'">已完成</span>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right">
<template #default="{ row }">
<el-button @click.native.prevent="view(row)" type="text" size="small">
查看
</el-button>
</template>
</vxe-column>
</vxe-table>
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="q.current"
:page-sizes="[5, 10, 20]" :page-size="q.size" layout="total, sizes, prev, pager, next, jumper"
:total="total" />
</div>
</div>
</template>
<script>
import ProcessMixin from "../../../components/ProcessMixin";
export default {
name: 'monitorProcess',
mixins:[ProcessMixin],
data() {
return {
tableData: [{
processId: '2016-05-1',
processName: '王小虎',
processPerson: '上海市普陀区金沙江路 1518 弄',
createTime: '2023-1-1'
}, {
processId: '2016-05-2',
processName: '王小虎',
processPerson: '上海市普陀区金沙江路 1518 弄',
createTime: '2023-1-2'
}, {
processId: '2016-05-3',
processName: '王小虎',
processPerson: '上海市普陀区金沙江路 1518 弄',
createTime: '2023-1-3'
}, {
processId: '2016-05-4',
processName: '王小虎',
processPerson: '上海市普陀区金沙江路 1518 弄',
createTime: '2023-1-4'
}]
q:{
current:1,
size:10
},
total: 0,
tableData: []
}
},
props:{
fourthData:{
type:Array,
default:[],
form:{
type:Object,
default:{},
}
},
watch: {
fourthData(newValue, oldValue) {
this.tableData=newValue
}
watch:{
form:{
handler(){
console.log("我见他",this.form)
this.loadData()
},
deep:true
}
},
mounted () {
this.loadData()
},
methods: {
view() {
alert(111)
loadData() {
let userId=this.$store.getters.userInfo.usid
this.$api.processCenter.monitorProcessesPage({...this.q,...this.searchForm,userId:userId}).then(res=>{
this.tableData = res.data.list
this.total = res.data.count
})
},
// 单页数据量
handleSizeChange(val) {
this.q.size = val;
this.q.current = 1;
this.loadData();
},
// 第几页
handleCurrentChange(val) {
this.q.current = val;
this.loadData();
},
view(row) {
let params={
id: this.$route.query.id,
prcNum: row.prcNum,
prcType: row.prcType,
prcId: row.prcId,
}
this.$store.commit('setHandleProcess',params)
this.$router.push({
path: 'monitorViews',
query:{
id: this.$route.query.id,
tabsName: 'MonitorProcess'
}
})
}
}
}
@@ -78,6 +128,13 @@ export default {
<style lang="scss" scoped>
::v-deep .el-table__fixed,.el-table__fixed-right ::before{
height: 0px !important;
}
</style>
.table {
margin: 0 14px 0 13px;
::v-deep .el-pagination {
margin-top: 13px;
padding-left: 20px;
padding-bottom: 10px;
}
}
</style>
@@ -0,0 +1,362 @@
<!-- 流程详情 -->
<template>
<div id="processDetails" class="content-height" v-loading="loading">
<div class="flow-chart">
<div class="flow-header">
<div class="back" title="返回" @click="back">
<i class="el-icon-back"></i>
</div>
<!-- <span class="flow-chart-title">{{ $route.params.processNumber }} {{ $route.params.processTypeName }} 流程图</span>-->
</div>
<div v-loading="imgLoading" class="flow-group" style="overflow: auto;">
<img :src="processStep" class="process-img">
</div>
</div>
<div class="action-bar">
<div class="btn">
<el-button type="primary" class="inner-btn" @click="showDialog"
v-if="tabsName !=='AlreadyProcess'">
调整处理人
</el-button>
<!-- <div v-if="tabsName=='AlreadyProcess'" class="alreadbtn">-->
<!-- <el-button-->
<!-- type="primary" class="inner-btn"-->
<!-- @click="urgeRow"-->
<!-- >催办</el-button>-->
<!-- <el-button-->
<!-- type="primary" class="inner-btn"-->
<!-- @click="exportStandard"-->
<!-- >导出</el-button>-->
<!-- </div>-->
</div>
<!-- <el-button-->
<!-- v-if="urgeRowFlag"-->
<!-- class="common-button-default"-->
<!-- size="small"-->
<!-- @click="urgeRow"-->
<!-- >催办</el-button>-->
<!-- <el-button-->
<!-- class="common-button-default export-button"-->
<!-- size="small"-->
<!-- @click="exportStandard"-->
<!-- >导出</el-button>-->
</div>
<div class="flow-list">
<!-- <loading :loading="loading">流程列表加载中</loading>-->
<vxe-table ref="xTable" :data="detailData" :empty-render="{name: 'NotData'}" align="center" border stripe
v-table-min-height="'calc(100% - 50px)'" max-height="95%"
@checkbox-all="selectAllEvent" @checkbox-change="selectChangeEvent">
<vxe-column type="checkbox" width="60"></vxe-column>
<vxe-column show-overflow show-header-overflow field="name"
title="任务步骤"></vxe-column>
<vxe-column show-overflow show-header-overflow field="assignee" title="任务受理人"></vxe-column>
<vxe-column show-overflow show-header-overflow field="createTime"
title="创建时间">
<template #default="{ row,index }" >
{{formatDate(row.createTime,"yyyy-mm-dd hh:mm:ss")}}
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="endTime" title="完成时间">
<template #default="{ row,index }" >
{{formatDate(row.endTime?row.endTime:'',"yyyy-mm-dd hh:mm:ss")}}
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="approvalOpinion"
title="审批意见"></vxe-column>
<vxe-column show-overflow show-header-overflow field="status"
title="状态">
<template #default="{ row }">
<span v-if="row.endTime">已完成</span>
<span v-else>未完成</span>
</template>
</vxe-column>
</vxe-table>
</div>
<monitorModal ref="monitorModal" :prcId="prcId"></monitorModal>
</div>
</template>
<script>
import monitorModal from './monitorModal.vue'
import ProcessMixin from "@/components/ProcessMixin";
import { formatDate } from '@/utils/date'
export default {
name: 'processDetail',
mixins: [ProcessMixin],
data () {
return {
formatDate,
assigneeNewLoading: false, // 调整处理人确定loading
loginPeople: '',
// 调整处理人抽屉状态
drawerModal: false,
urgeRowFlag: true,
tasksName: '',
selectPeople: '',
// loading
loading: false,
imgLoading: false,
// 流程步骤
processStep: null,
// 当前节点
taskKey: 0,
// 当前流程类型
prcType: '',
// 流程列表
detailData: [],
taskNames: '',
userId: '',
tableRow: [], // 接受表格数据
completeFlagType: true, // 判断当前任务是否完成
processState: true, // 判断当前流程
detailsList: [],
shunxu: '',
paixu: '',
checkIds: [],
checkList: [],
tabsName:'',
prcNum:'',
prcId:''
}
},
methods: {
exportStandard (){
let exportName=''
let pramas={prcNum: this.$store.getters.handleProcess.prcNum,
sortWord: this.shunxu ? this.paixu : '',
shunxu: this.shunxu,
exportName: exportName}
this.processTypeList.some(item=>{
if(item.value == this.prcType){
exportName=item.label
}
})
this.$api.process.exportStandard(pramas,data=>{
const disposition = data.headers['content-disposition'];
let fileName = disposition.substring(disposition.indexOf('fileName=') + 9, disposition.length);
var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
var isOpera = userAgent.indexOf("Opera") > -1;
//判断是否IE浏览器
if (userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1 && !isOpera) {
fileName = decodeUtf8(fileName)
} else {
// iso8859-1的字符转换成中文
fileName = decodeURI(escape(fileName));
// 去掉双引号
fileName = fileName.replace(/\"/g, "");
}
// console.log(fileName, 666)
function decodeUtf8(bytes) {
var encoded = "";
for (var i = 0; i < bytes.length; i++) {
encoded += '%' + bytes[i].toString(16);
}
return decodeURIComponent(encoded);
}
if (!data.data || data.data.size === 0) {
this.$message.warning("文件下载失败")
return
}
if (typeof window.navigator.msSaveBlob !== 'undefined') {
window.navigator.msSaveBlob(new Blob([data.data], {type: 'application/zip'}), fileName)
} else {
let url = window.URL.createObjectURL(new Blob([data.data], {type: 'application/zip'}))
let link = document.createElement('a')
link.style.display = 'none'
link.href = url
link.setAttribute('download', fileName)
document.body.appendChild(link)
link.click()
document.body.removeChild(link) //下载完成移除元素
window.URL.revokeObjectURL(url) //释放掉blob对象
}
})
},
urgeRow (){
if (this.checkList.length === 1 && !this.checkList[0].endTime) {
this.$confirm('您确认要催办该任务吗', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
confirmButtonClass: 'common-button-primary',
}).then(() => {
this.urge(this.checkList[0])
})
} else {
this.$message.warning('请选择一条未完成的数据')
}
},
urge (row) {
let params= {
msgContent: '流程编号为' + row.prcNum + '的流程,请尽快办理。',
msgTitle: '流程编号' + row.prcNum,
userId: row.assigneeId,
msgType: 'TEXT'
}
this.$api.process.urgePerson(params,
res => {
this.processTable()
this.$message.success('催办成功')
}, e => {
})
},
selectAllEvent ({ checked }) {
const records = this.$refs.xTable.getCheckboxRecords()
this.checkIds = records.map(item => {
return item.id
})
this.checkList = records
},
selectChangeEvent ({ checked }) {
const records = this.$refs.xTable.getCheckboxRecords()
this.checkIds = records.map(item => {
return item.id
})
this.checkList = records
},
showDialog() {
if(this.checkList.length < 1){
this.$message.warning("请选择一条数据")
return
}else{
if(this.checkList.length > 2){
this.$message.warning("请选择一条数据")
return
}
let check=[]
check = this.checkList.filter(item=>{
if(item.endTime ){
return item
}
})
if(check.length > 0){
this.$message.warning("请选择状态为未完成的数据")
}else{
this.$refs.monitorModal.open(this.checkIds[0].taskId,this.prcId,this.checkList[0].assigneeId)
}
}
},
back () {
this.$store.commit('setActiveTabIndex',this.tabsName=='AlreadyProcess'?"third":"fourth" )
//要返回上一级
this.$router.back(-1)
},
// 请求转换流程图
processNum (row) {
this.imgLoading = true;
// axios.request({
// url: '/libary/api/model/getImg',
// responseType: 'blob',
// method: 'get',
// data: {
// modelId: row?row.id:'111s',
// }
// })
this.$api.processCenter.getMonitorImg({prcNum:this.prcNum})
.then(res => {
console.log(res)
// let blob = new Blob([res.data], {type: 'image/jpg'})
// let url = window.URL.createObjectURL(res.data)
this.processStep = window.URL.createObjectURL(res.data)
}).finally(_ => {
this.imgLoading = false;
})
},
// 请求列表
processTable (row) {
this.$api.processCenter.getMonitorPageList({
prcNum: this.prcNum,
sortWord: this.shunxu ? this.paixu : '',
shunxu: this.shunxu
}).then(res=>{
this.detailData = res.data
// res[res.length - 1].endTime ? this.urgeRowFlag = false : this.urgeRowFlag = true
})
},
},
components: {
monitorModal
},
props: {},
mounted () {
this.tabsName=this.$store.getters.handleProcess.tabsName
this.prcType=this.$store.getters.handleProcess.prcType
this.prcNum=this.$store.getters.handleProcess.prcNum
this.prcId=this.$store.getters.handleProcess.prcId
this.processNum()
this.processTable()
}
}
</script>
<style lang="scss" scoped>
//@import '~styles/mixins';
#processDetails{
height: 100%;
background-color: #fff;
.flow-chart{
width: 100%;
height: 45%;
background: #F0F0F0;
border: 1px solid #CCCDCE;
border-bottom: none;
padding: 10px;
overflow-x: hidden;
overflow-y: auto;
.flow-header{
height: 30px;
line-height: 30px;
//.flex();
align-items: center;
position: absolute;
.flow-chart-title{
font-size: 16px;
font-weight: bold;
padding: 0 20px;
//.ellipsis();
}
}
.flow-group{
width: 100%;
height: calc(100% - 30px);
.process-img{
height: auto;
overflow: auto;
max-width: 100%;
object-fit: none;
}
}
}
.flow-list{
width: 98%;
height: calc(55% - 80px);
position: relative;
margin: 0 auto;
}
}
.btn{
padding: 20px 13px;
.inner-btn{
width: 100px;
height: 40px;
display: flex;
justify-content: center;
align-items: center;
}
.alreadbtn{
display: flex;
}
}
.back{
width: 45px;
height: 45px;
background: #1890FF;
color: #fff;
text-align: center;
line-height: 45px;
font-size: 30px;
font-weight: 700;
cursor: pointer;
}
</style>
@@ -0,0 +1,158 @@
<template>
<div>
<el-dialog title="调整处理人" :visible.sync="dialogVisible" width="500px">
<div class="label-input-form addModel">
<el-form ref="form" :model="form" label-width="120px" :rules="rules" class="formData">
<!-- <el-form-item label="选择人员" prop="assignee" class="el-form-item">-->
<!-- <el-select v-model="form.assignee" class="icon-auth" collapse-tags-->
<!-- placeholder="请选择">-->
<!-- <template v-for="item in userList">-->
<!-- <el-option :label="item.USNAME" :value="item.USID" :key="item.USID"></el-option>-->
<!-- </template>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="选择人员:" prop="assignee">
<el-input readonly :disabled="diasbleds" v-model="form.assigneeName"
@click.native="handleCheck('clr')"
placeholder="请选择人员"></el-input>
</el-form-item>
</el-form>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false" class="btn"> </el-button>
<el-button type="primary" @click="submit" class="btn"> </el-button>
</span>
</el-dialog>
<orgTable :visible.sync="visibleOrgTable" title="人员列表":config="{
value: orgTableVal,
valueName: orgTableValName
}" dialog-model :workNumFlag="true" :maxSelected="1" @confirm="isTreeOk"></orgTable>
</div>
</template>
<script>
import orgTable from '@/components/OrgTable'
export default {
name: 'modal',
components:{
orgTable
},
data() {
return {
orgTableVal:'',
orgTableValName:'',
diasbleds:false,
visibleOrgTable: false,
userList: [],
dialogVisible: false,
form: {
assignee: '',
assigneeName: ''
},
rules: {
assignee: [
{
required: 'true',
trigger: 'change',
message: '请选择调整处理人'
}
]
},
taskId: '',
pId: ''
};
},
mounted() {
this.sysUserList()
},
methods: {
isTreeOk(checkedList){
const parts = []
const partsName = []
console.log(checkedList, '0009999')
checkedList.map((item, index) => {
parts.push(item.userId || item.USID)
partsName.push(item.uname)
})
this.form.assignee= parts.toString()
this.form.assigneeName = partsName.toString()
},
handleCheck(name) {
this.orgTableValName = this.form.assigneeName
this.orgTableVal = this.form.assignee
this.visibleOrgTable = true
},
changeSelect(val) {
this.checked = (val.length || this.reportF.reportUserIdList.length) === this.userList.length;
// this.$emit('update:updateMultipleSelect',this.reportF.reportUserIdList);
},
// 获取所有用户
sysUserList() {
this.$api.user.sysUserList({pageNo: 1, pageSize: 999999}).then(({data}) => {
this.userList = data.records;
})
},
open(taskId, pId,assigneeId) {
this.taskId = taskId
this.pId = pId
this.form.name = {
assignee: ''
}
this.assigneeId=assigneeId
this.dialogVisible = true
},
submit() {
this.$refs.form.validate((valid) => {
if (valid) {
let userId = this.form.assignee
let assignee = this.assigneeId
if (userId == assignee) {
this.$message.warning("当前任务受理人就是您选择的人员")
} else {
this.$api.process.changeAssignee({
taskId: this.taskId,
assignee: assignee,
userId: userId,
pId: this.pId
})
.then(res => {
//转办完应该跳到哪个页面?
//转办完这个人还能看到这个监控流程吗
this.dialogVisible = false
})
}
}
})
}
}
}
</script>
<style lang="scss" scoped>
.dialog-footer {
margin: 20px 20px;
.el-button {
width: 80px;
height: 36px;
padding: 0;
font-size: 14px;
}
}
::v-deep .el-dialog__footer {
padding-bottom: 20px;
}
.addModel {
padding: 20px;
}
.el-form-item {
::v-deep .el-select {
width: 300px;
vertical-align: center;
}
}
</style>
@@ -1,102 +1,199 @@
<template>
<div>
<el-table :data="tableData" style="width: 100%" border :header-cell-style="{
background: '#DFE6EC',
fontWeight: '700',
color: '#1F2D3D',
}">
<el-table-column prop="processId" label="流程编号" align="center">
</el-table-column>
<el-table-column prop="processName" label="流程名称" align="center">
</el-table-column>
<el-table-column prop="processPerson" label="发起人" align="center">
</el-table-column>
<el-table-column prop="now" label="当前处理人" align="center">
</el-table-column>
<el-table-column prop="last" label="上一处理人" align="center">
</el-table-column>
<el-table-column prop="createTime" label="创建时间" sortable align="center">
</el-table-column>
<el-table-column prop="endTime" label="完成时间" sortable align="center">
</el-table-column>
<el-table-column prop="status" label="状态" align="center">
</el-table-column>
<el-table-column label="操作" width="120" align="center">
<template slot-scope="scope">
<el-button @click.native.prevent="view(scope.$index, tableData)" type="text" size="small">
查看
</el-button>
<div>
<div class="table">
<vxe-table ref="xTable" :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe
v-table-min-height="'calc(100vh - 380px)'">
<vxe-column show-overflow show-header-overflow type="seq" title="序号" width="77">
<template #default="{ row, rowIndex }">
{{ rowIndex + (q.current - 1) * q.size + 1 }}
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="prcNum"
title="流程编号">
<template #default="{ row,index }">
<div class="blurcolor" @click="view(row)">{{row.prcNum}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="prcType"
title="流程类型">
<template #default="{ row,index }">
<div >{{getPrcName(row.prcType)}}</div>
</template>
</vxe-column>
<el-button :disabled="tableData[scope.$index].status=='已完成'" @click.native.prevent="back(scope.$index, tableData)" type="text" size="small"
>
<span style="color: rgb(236, 128, 141)">强制撤回</span>
</el-button>
</template>
</el-table-column>
</el-table>
<vxe-column show-overflow show-header-overflow field="prcName" title="流程名称">
<template #default="{ row,index }">
<div class="blurcolor" @click="view(row)">{{row.prcName}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="creatUserName"
title="发起人"></vxe-column>
<vxe-column show-overflow show-header-overflow field="taskAssignee" title="当前处理人"></vxe-column>
<vxe-column show-overflow show-header-overflow field="taskBackAssignee"
title="上一处理人"></vxe-column>
<vxe-column show-overflow show-header-overflow field="creatTime" title="创建时间"></vxe-column>
<vxe-column show-overflow show-header-overflow field="endTime"
title="完成时间"></vxe-column>
<vxe-column show-overflow show-header-overflow field="status" title="状态">
<template #default="{ row }">
<span v-if="row.isEnd === '0'">未完成</span>
<span v-if="row.isEnd === '1'">已完成</span>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right">
<template #default="{ row,index }">
<el-button type="text" size="small" @click="view(row)">
查看
</el-button>
<el-button type="text" size="small" @click="withdraw(row)" v-if="row.isEnd === '0'">
<span>强制撤回</span>
</el-button>
</template>
</vxe-column>
</vxe-table>
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="q.current"
:page-sizes="[5, 10, 20]" :page-size="q.size" layout="total, sizes, prev, pager, next, jumper"
:total="total"/>
</div>
</div>
</template>
<script>
import ProcessMixin from "../../../components/ProcessMixin";
export default {
name: "sentProcess",
data() {
return {
tableData: [
{
processId: "2016-05-1",
processName: "王小虎",
processPerson: "上海市普陀区金沙江路 1518 弄",
createTime: "2023-1-1",
status:'已完成'
},
{
processId: "2016-05-2",
processName: "王小虎",
processPerson: "上海市普陀区金沙江路 1518 弄",
createTime: "2023-1-2",
},
{
processId: "2016-05-3",
processName: "王小虎",
processPerson: "上海市普陀区金沙江路 1518 弄",
createTime: "2023-1-3",
},
{
processId: "2016-05-4",
processName: "王小虎",
processPerson: "上海市普陀区金沙江路 1518 弄",
createTime: "2023-1-4",
},
],
};
name: "sentProcess",
mixins: [ProcessMixin],
data() {
return {
color: 'rgb(236, 128, 141)',
icolor: 'rgb(119,136,153)',
q: {
current: 1,
size: 10
},
total: 0,
tableData: []
};
},
props: {
form:{
type:Object,
default:{},
}
},
watch:{
form:{
handler(){
console.log("我见他",this.form)
this.loadData()
},
deep:true
}
},
mounted () {
this.loadData()
},
methods: {
viewDetails(row) {
const prcType = row.prcType
console.log(prcType);
this.loading = true
this.$api.getAlreadData({taskId:row.taskId})
.then(res=>{
switch (prcType) {
case '1':
res.isViewDetails = 1
res.prcType = prcType
res.prcNum = row.prcNum
if (res.taskDefinitionKey == 'aid1' ||
res.taskDefinitionKey == 'aid4' ) {
this.$router.push({
path: '/permission/launch',
query: res,
})
return
}
else{
this.$router.push({
path: '/permission/examine',
query: res,
})
}
}
})
},
props:{
thirdData:{
type:Array,
default:[],
//撤回
withdraw(row){
this.$confirm('确认强制撤回该条数据?', '强制撤回', {
confirmButtonText: '确定',
cancelButtonText: '取消',
confirmButtonClass: 'common-button-primary',
type: 'warning'
}).then(() => {
this.$api.processCenter.getBack({prcId: row.prcId}).then(res => {
this.$message.success(res.data.message)
this.loadData()
}).catch(err => {
console.log(err)
})
})
},
loadData() {
let userId=this.$store.getters.userInfo.usid
this.$api.processCenter.sentProcessPage({...this.q,...this.form,userId:userId}).then(res=>{
this.tableData = res.data.list
this.total = res.data.count
}).catch(err=>{
})
},
// 单页数据量
handleSizeChange(val) {
this.q.size = val;
this.q.current = 1;
this.loadData();
},
// 第几页
handleCurrentChange(val) {
this.q.current = val;
this.loadData();
},
view(row) {
let params={
id: this.$route.query.id,
prcNum: row.prcNum,
prcType: row.prcType,
tabsName: 'AlreadyProcess'
}
},
watch: {
thirdData(newValue, oldValue) {
this.tableData=newValue
this.$store.commit('setHandleProcess',params)
this.$router.push({
path: 'monitorViews',
query: {
id: this.$route.query.id,
tabsName: 'AlreadyProcess'
}
})
},
methods: {
view() {
alert(111);
},
back(index,tableData) {
console.log('index',index);
console.log('tableData',tableData);
},
},
},
};
</script>
<style lang="scss" scoped>
::v-deep .el-table__fixed, ::v-deep .el-table__fixed-right ::before{
height: 0px !important;
::v-deep .el-table__fixed, ::v-deep .el-table__fixed-right ::before {
height: 0px !important;
}
</style>
.table {
margin: 0 14px 0 13px;
::v-deep .el-pagination {
margin-top: 13px;
padding-left: 20px;
padding-bottom: 10px;
}
}
</style>
+24 -27
View File
@@ -2,16 +2,16 @@
<div>
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="待办流程" name="first">
<gencyProcess :firstData="firstData"></gencyProcess>
<gencyProcess v-if="activeName == 'first'" :form="form"></gencyProcess>
</el-tab-pane>
<el-tab-pane label="已办流程" name="second">
<finishProcess :secondData="secondData"></finishProcess>
<finishProcess v-if="activeName=='second'" :form="form"></finishProcess>
</el-tab-pane>
<el-tab-pane label="已发流程" name="third">
<sentProcess :thirdData="thirdData"></sentProcess>
<sentProcess v-if="activeName=='third'" :form="form"></sentProcess>
</el-tab-pane>
<el-tab-pane label="监控流程" name="fourth">
<monitorProcesses :fourthData="fourthData"></monitorProcesses>
<monitorProcesses v-if="activeName=='fourth'" :form="form"></monitorProcesses>
</el-tab-pane>
</el-tabs>
</div>
@@ -30,12 +30,6 @@ export default {
monitorProcesses,
sentProcess
},
props:{
tableData:{
type:Array,
default:[],
}
},
data() {
return {
activeName: 'first',
@@ -43,35 +37,38 @@ export default {
secondData:[],
thirdData:[],
fourthData:[],
form:[]
};
},
watch: {
tableData(newValue, oldValue) {
if(this.activeName == 'first'){
this.firstData=newValue
}else if(this.activeName == 'second'){
this.secondData=newValue
}else if(this.activeName == 'third'){
this.thirdData=newValue
}else{
this.fourthData=newValue
}
}
},
created () {
;
},
mounted () {
;
this.$bus.$on('getSearchItem',(data)=>{
this.form = JSON.parse(JSON.stringify(data))
console.log(this.form,"hhh")
})
this.activeName=this.$store.getters.activeTab ?this.$store.getters.activeTab:'first'
},
methods: {
handleClick(tab, event) {
// console.log(tab, event);
this.$emit('clearForm')
this.$store.commit('setActiveTabIndex','')
}
},
beforeDestroy(){
console.log("我不监听了")
this.$bus.$off('getSearchItem')
}
}
</script>
<style lang="sass" scoped>
</style>
<style lang="scss" scoped>
::v-deep .el-tabs__header {
padding: 0;
position: relative;
margin: 0 14px 15px;
}
</style>
@@ -0,0 +1,52 @@
<template>
<div class="execution">
<basic-container>
<iframe class="iframe" :src="src"></iframe>
</basic-container>
</div>
</template>
<script>
import BasicContainer from './basic-container/index'
export default {
name: "ProcessMapping",
components: {
BasicContainer
},
data() {
return {
modelId : '',
name: '',
actUrl: 'http://10.0.10.173:7060/modeler.html?modelId='
}
},
created() {
this.modelId = this.$route.query.modelId
},
computed: {
src() {
return `${this.actUrl}${this.modelId}`
}
},
methods: {
breaks() {
this.$router.push({path: '/'})
}
}
}
</script>
<style scoped>
.execution{
width: 100%;
}
.iframe{
width: 100%;
height: auto;
min-height: 850px;
border: 0;
overflow: hidden;
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
</style>
@@ -0,0 +1,25 @@
<template>
<div class="basic-container"
:class="{'basic-container--block':block}">
<slot></slot>
</div>
</template>
<script>
export default {
name: "basicContainer",
props: {
block: {
type: Boolean,
default: false,
}
}
};
</script>
<style>
.basic-container{
width: 100%;
}
</style>
@@ -0,0 +1,125 @@
<template>
<el-dialog :close-on-click-modal="false"
:visible="visible"
:title="title"
@close="closeDialog"
width="400px"
>
<div>
<el-form
ref="form"
:model="formData"
:rules="formRules"
class="label-input-form"
label-width="100px"
inline
>
<el-form-item label="流程类型" prop="category" class="add-form-item">
<el-select v-model="formData.category" placeholder="请选择流程类型" clearable>
<el-option v-for="opt in typeList" :value="opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
</el-select>
</el-form-item>
</el-form>
</div>
<div slot="footer">
<el-button round class="common-button-default" icon="el-icon-close" @click="closeDialog">取消</el-button>
<el-button round class="common-button-primary" icon="el-icon-check" type="primary" @click="confirmDialog">确认</el-button>
</div>
</el-dialog>
</template>
<script>
const formData = {
category: '',
}
export default {
name: 'EditProcessClassification',
props: ['data', 'visible'],
data() {
return {
formData: {},
formRules: {},
typeList: [] // 类型下拉框
}
},
computed: {
title() {
return !!this.data ? '编辑' : '新增'
}
},
watch: {
data(newValue) {
this.formData = newValue || {...formData}
},
visible(newValue) {
this.formData = this.data || {...formData}
}
},
mounted() {
this.formData = this.data || {...formData}
},
created() {
// this.queryTablePage()
},
methods: {
// 查询、加载表格
queryTablePage () {
const formData = {
// page: this.pageNo,
// pageSize: this.$store.getters.userInfo.configContent,
// standNumber: this.searchForm.standardKey
}
this.$http.get('lawss/activiti/categoryList',
formData,
{
_this: this,
loading: 'tableDataLoading'
},
res => {
this.typeList = res.result.map(item => {
return {
label: item.type,
value: item.objectId
}
})
// this.total = res.data.count
}, e => {})
},
closeDialog() {
// this.visible = false
this.$emit('close')
this.formData = {}
},
confirmDialog() {
const url = !this.data ? 'lawss/activiti/addCategory' : 'lawss/activiti/updatModel'
const formData = {
modelId: this.formData.id,
categoryId: this.formData.category
}
this.$http.get(url, formData, {
_this: this
}, res => {
if (res.success) {
console.log('新增/编辑成功')
this.$emit('success')
this.$emit('close')
}
}, e => {
})
}
}
}
</script>
<style lang="" scoped>
</style>
@@ -0,0 +1,103 @@
<template>
<el-dialog :close-on-click-modal="false"
:visible="visible"
:title="title"
:before-close="closeDialog"
width="400px"
>
<div>
<el-form
ref="formData"
:model="formData"
:rules="formRules"
class="label-input-form"
label-width="100px"
inline
>
<el-form-item label="流程类型名称" prop="type" class="add-form-item">
<el-input v-model="formData.type" placeholder="请输入流程类型名称" ></el-input>
</el-form-item>
</el-form>
</div>
<div slot="footer">
<el-button round class="common-button-default" icon="el-icon-close" @click="closeDialog">{{$t('m.cancel')}}</el-button>
<el-button round class="common-button-primary" icon="el-icon-check" type="primary" @click="confirmDialog">{{$t('m.confirm')}}</el-button>
</div>
</el-dialog>
</template>
<script>
const formData = {
type: '',
}
export default {
name: 'EditProcessClassification',
props: ['data', 'visible'],
data() {
return {
formData: {},
formRules: {
type: [
{ required: true, message: '请输入流程类型名称', trigger: 'change' }
]
}
}
},
computed: {
title() {
return !!this.data ? '编辑' : '新增'
}
},
watch: {
data(newValue) {
this.formData = newValue || {...formData}
this.$refs['formData'].resetFields()
},
visible(newValue) {
this.formData = this.data || {...formData}
}
},
mounted() {
this.formData = this.data || {...formData}
},
methods: {
closeDialog() {
// this.visible = false
this.$refs['formData'].resetFields()
this.$emit('close')
this.formData = {}
},
confirmDialog() {
const url = !this.data ? 'lawss/activiti/addCategory' : 'lawss/activiti/editCategory'
const formData = {
objectId: this.formData.objectId,
type: this.formData.type
}
this.$refs['formData'].validate((valid) => {
if (valid) {
this.$http.postData(url, formData, {
_this: this
}, res => {
if (res.success) {
console.log('新增/编辑成功')
this.$emit('success')
this.$emit('close')
}
}, e => {
})
}
})
}
}
}
</script>
<style lang="" scoped>
</style>
@@ -0,0 +1,294 @@
<template>
<div class="content-height configBox">
<div class="title">
<span>流程配置</span>
</div>
<div class="search">
<el-row>
<!-- <el-col :span="5">-->
<!-- <div class="search-box-left">-->
<!-- <label>流程名称</label>-->
<!-- <el-input v-model="processForm.name" ></el-input>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="4" align="right">-->
<!-- <div class="search-box-right">-->
<!-- <el-button type="primary" @click="queryTablePage">查询</el-button>-->
<!-- <el-button type="" @click="clearAllSearchs">重置</el-button>-->
<!-- </div>-->
<!-- </el-col>-->
<el-col :span="24">
<div class="operate-box">
<el-button @click="addRow">新增</el-button>
</div>
</el-col>
</el-row>
</div>
<div class="table">
<vxe-table ref="xTable" :data="tableList" :empty-render="{name: 'NotData'}" align="center" border stripe v-table-min-height="'calc(100vh - 320px)'">
<vxe-column show-overflow show-header-overflow field="name" title="流程名称"></vxe-column>
<!-- <vxe-column show-overflow show-header-overflow field="categoryName" title="流程类型"></vxe-column>-->
<vxe-column show-overflow show-header-overflow field="createTime" title="创建时间">
<template #default="{ row }">
{{row.createTime?formatDate(row.createTime,"yyyy-mm-dd HH:mm:ss"):''}}
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow title="操作" width="250" fixed="right">
<template #default="{ row }">
<el-button type="text" @click="editRow(row)">编辑</el-button>
<el-button type="text" @click="deploy(row)">部署</el-button>
<el-button type="text" class="deleRed" @click="deleteRow(row)">删除</el-button>
</template>
</vxe-column>
</vxe-table>
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="q.current"
:page-sizes="[5, 10, 20]" :page-size="q.size" layout="total, sizes, prev, pager, next, jumper"
:total="total" />
<el-dialog :close-on-click-modal="false"
:visible="visible"
:title="title"
@close="closeDialog"
width="300px"
class="addDialog"
>
<el-form
ref="form"
:model="formData"
class="addform"
label-width="100px"
inline
>
<el-row>
<el-form-item label="模型名称" class="add-form-item">
<el-input
v-model="formData.name"
placeholder="请输入模型名称"
clearable
:maxlength="100"></el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="模型描述" class="add-form-item">
<el-input
v-model="formData.desc"
placeholder="请输入模型描述"
clearable
:maxlength="100"></el-input>
</el-form-item>
</el-row>
</el-form>
<div slot="footer" class="add-footer">
<el-button size="big" class="common-button-default" @click="closeDialog">
取消
</el-button>
<el-button size="big" class="common-button-primary" type="primary"
@click="confirmDialog">确认
</el-button>
</div>
</el-dialog>
</div>
</div>
</template>
<script>
import EditProcess from './components/EditProcess'
import { formatDate } from '@/utils/date'
export default {
name: 'ProcessClassification',
components: { EditProcess },
data () {
return {
formatDate,
formData: {
name: '',
desc: ''
},
total: 0,
q: {
current: 1,
size: 10
},
tableList: [{name:1}],
processForm: {
name: ''
},
visible:false,
title: '添加流程'
}
},
created() {
this.queryTablePage()
},
methods: {
deleteRow(row) {
this.$confirm('确认删除该条数据?', '删除', {
confirmButtonText: '确定',
cancelButtonText: '取消',
confirmButtonClass: 'common-button-primary',
type: 'warning'
}).then(() => {
this.$api.process.deleteModel({modelId: row.id}).then(res => {
this.$message.success(res.data.message)
this.queryTablePage()
})
})
},
handleCurrentChange(page) {
this.q.current = page
this.queryTablePage()
},
handleSizeChange(size) {
this.q.size = size
this.queryTablePage()
},
closeDialog() {
this.visible=false
},
editRow(row) {
window.open(`/processMapping?id=AEHJB8YNJ3&modelId=${row.id}`)
// this.$router.push({
// path: '/userCenter/processMapping',
// query: {id: 'AEHJB8YNJ3',modelId: row.id}
// })
},
//部署
deploy(row) {
this.$confirm('确认部署该条数据?', '确认部署', {
confirmButtonText: '确定',
cancelButtonText: '取消',
confirmButtonClass: 'common-button-primary',
type: 'warning'
}).then(() => {
this.$api.process.deploy({modelId: row.id}).then(res=>{
this.$message.success(res.data.message)
this.queryTablePage()
})
}).catch(() => {
})
},
queryTablePage() {
this.$api.process.getModelListPage({...this.q,...this.searchForm}).then(res=>{
this.tableList = res.data.result.records
this.total = res.data.result.total
}).catch(err=>{
})
},
addRow() {
this.formData = {
name: '',
desc: ''
}
this.visible = true
},
confirmDialog() {
this.$api.process.addModel(this.formData).then(res=> {
this.$message.success("新增成功")
this.visible = false
this.queryTablePage()
})
}
}
}
</script>
<style lang="scss" scoped>
.configBox{
.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;
}
.year {
::v-deep .el-input__inner {
padding: 0 15px !important;
}
}
::v-deep .el-input {
width: 167px;
margin-right: 5px;
}
@media screen and (max-width: 1366px) {
::v-deep .el-input {
width: 135px;
margin-right: 5px;
}
}
::v-deep .el-button {
float: right;
}
}
.search-box-right {
padding-top: 20px;
display: flex;
justify-content: flex-end;
align-items: center;
padding-right: 14px;
}
.operate-box {
padding-left: 13px;
padding-bottom: 11px;
padding-top: 18px;
}
}
.title {
border-bottom: 1px solid #EBEEF5;
height: 42px;
line-height: 42px;
margin: 0 18px 0 22px;
span {
font-size: 16px;
font-weight: 600;
color: #262626;
}
}
.table {
margin: 0 14px 0 13px;
::v-deep .el-pagination {
margin-top: 13px;
padding-left: 20px;
padding-bottom: 10px;
}
}
.addform{
padding: 50px 0;
.add-form-item {
::v-deep .el-input__inner {
padding: 0 15px !important;
width: 250px;
height: 40px;
}
}
}
.add-footer{
padding: 20px 20px;
}
}
.deleRed{
color: red !important;
}
</style>