FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix_foton_20231213' into 'master'

Browse Source 
Fix foton 20231213

See merge request laws-foton-slrs/foton-laws-system-front!145
This commit is contained in:
高嵩
2024-01-18 10:02:56 +00:00
parent b68470f146 10d0dc4295
commit c5049eb1a3
12 changed files with 3305 additions and 2488 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/localTool/standAutoSplit/index.vue
+462 -373
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+497 -346
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+526 -351
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+389 -318
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+550 -401
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
+518 -379
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
+104 -95
View File
@@ -2,134 +2,143 @@
<template> <template>
<div class="already-process v-class"> <div class="already-process v-class">
<div class="search-area"> <div class="search-area">
<el-form :inline="true" :model="searchForm" ref="processSearch" class="label-input-form"> <el-form ref="processSearch" :inline="true" :model="searchForm" class="label-input-form">
<div class="search-area-item"> <div class="search-area-item">
<el-form-item label="流程名称" class="search-item" @keyup.enter.native="selectProcessBtn"> <el-form-item label="流程名称" class="search-item" @keyup.enter.native="selectProcessBtn">
<el-input <el-input
v-model.trim="searchForm.prcName" v-model.trim="searchForm.prcName"
placeholder="按流程名称查找" placeholder="按流程名称查找"
:maxlength="100" :maxlength="100"
clearable clearable
></el-input> />
</el-form-item> </el-form-item>
<el-form-item label="流程编号" class="search-item" @keyup.enter.native="selectProcessBtn"> <el-form-item label="流程编号" class="search-item" @keyup.enter.native="selectProcessBtn">
<el-input <el-input
v-model.trim="searchForm.prcNum" v-model.trim="searchForm.prcNum"
placeholder="按流程编号查找" placeholder="按流程编号查找"
:maxlength="100" :maxlength="100"
clearable clearable
></el-input> />
</el-form-item> </el-form-item>
<el-form-item label="流程类型" class="search-item" @keyup.enter.native="selectProcessBtn"> <el-form-item label="流程类型" class="search-item" @keyup.enter.native="selectProcessBtn">
<el-select <el-select
v-model="searchForm.prcType" v-model="searchForm.prcType"
placeholder="按流程类型查找" placeholder="按流程类型查找"
filterable filterable
clearable clearable
> >
<el-option <el-option
v-for="item in processTypeList" v-for="item in processTypeList"
:value="item.value" :key="item.value"
:key="item.value" :value="item.value"
:label="item.label" :label="item.label"
></el-option> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
type="primary" v-btn-permission="'2c8041eb6226368ee6e6b975b4aa88f1'"
class="common-button-primary" type="primary"
size="mini" class="common-button-primary"
v-btn-permission="'2c8041eb6226368ee6e6b975b4aa88f1'" size="mini"
@click="selectProcessBtn">查询</el-button> @click="selectProcessBtn"
>
查询
</el-button>
<el-button <el-button
class="common-button-default" v-btn-permission="'4c674bc8b1a21ca17592f1b034444c57'"
size="mini" class="common-button-default"
v-btn-permission="'4c674bc8b1a21ca17592f1b034444c57'" size="mini"
@click="resetSelect">清空</el-button> @click="resetSelect"
>
清空
</el-button>
</el-form-item> </el-form-item>
</div> </div>
<div class="search-area-item"> <div class="search-area-item" />
</div>
</el-form> </el-form>
</div> </div>
<div class="content"> <div class="content">
<div class="table-wrap"> <div class="table-wrap">
<el-table <el-table
height="100%" ref="selection"
ref="selection" height="100%"
:data="processList" :data="processList"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%; flex: auto;" style="width: 100%; flex: auto;"
border border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange"
>
<el-table-column <el-table-column
type="selection" type="selection"
width="55" width="55"
align="center"> align="center"
</el-table-column> />
<el-table-column <el-table-column
type="index" type="index"
fixed="left" fixed="left"
width="55" width="55"
label="序号" label="序号"
align="center"> align="center"
>
<template slot-scope="{scope, column, $index}"> <template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (pageNo - 1) * pageSize }} {{ ($index + 1) + (pageNo - 1) * pageSize }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="prcNum" prop="prcNum"
label="流程编号" label="流程编号"
align="center" align="center"
width="150" width="150"
> />
</el-table-column>
<el-table-column <el-table-column
prop="prcType" prop="prcType"
label="流程类型" label="流程类型"
align="center" align="center"
width="180" width="180"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ getPrcName(scope.row.prcType,scope.row.taskInfo) }}</span> <span>{{ getPrcName(scope.row.prcType,scope.row.taskInfo) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="prcName" prop="prcName"
label="流程名称" label="流程名称"
show-overflow-tooltip show-overflow-tooltip
align="center" align="center"
min-width="250" min-width="250"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ getPrcNameFilter(scope.row) }}</span> <span>{{ getPrcNameFilter(scope.row) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="creatUserName" prop="creatUserName"
label="发起人" label="发起人"
align="center" align="center"
width="90" width="180"
> >
<template slot-scope="scope">
<span>{{ scope.row.creatUserName }}({{ scope.row.creatUser || '-' }})</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="creatTime" prop="creatTime"
label="创建日期" label="创建日期"
align="center" align="center"
width="150" width="150"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.creatTime ? $moment(scope.row.creatTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span> <span>{{ scope.row.creatTime ? $moment(scope.row.creatTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="overTime" prop="overTime"
label="完成日期" label="完成日期"
align="center" align="center"
width="150" width="150"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span> <span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
@@ -137,11 +146,11 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('m.operation')" align="center" width="50"> <el-table-column :label="$t('m.operation')" align="center" width="50">
<template slot-scope="scope"> <template slot-scope="scope">
<div @click.stop style="display: inline-block"> <div style="display: inline-block" @click.stop>
<el-dropdown trigger="click" @command="handleCommand"> <el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i> <i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'4f71b81686079ba2b7e3739d3994e0af'">查看</el-dropdown-item> <el-dropdown-item v-btn-permission="'4f71b81686079ba2b7e3739d3994e0af'" :command="[scope.row, '查看']">查看</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
@@ -151,22 +160,23 @@
</div> </div>
<!--分页--> <!--分页-->
<pagination <pagination
class="tabpagination" class="tabpagination"
:page="pageNo" :page="pageNo"
:total="total" :total="total"
@pageChange="pageChange" @pageChange="pageChange"
@pageSizeChange="pageSizeChange"></pagination> @pageSizeChange="pageSizeChange"
/>
<loading :loading="loading">数据获取中</loading> <loading :loading="loading">数据获取中</loading>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import {mapMutations, mapActions} from 'vuex' import { mapMutations, mapActions } from 'vuex'
import ProcessMixin from '../../../components/ProcessMixin' import ProcessMixin from '../../../components/ProcessMixin'
export default { export default {
name: 'AlreadyProcess', name: 'AlreadyProcess',
mixins: [ProcessMixin], mixins: [ ProcessMixin ],
data () { data () {
return { return {
searchForm: { searchForm: {
@@ -174,11 +184,11 @@ export default {
prcNum: '', prcNum: '',
prcType: '' prcType: ''
}, },
pageSize:this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
total: 0, total: 0,
pageNo: 1, pageNo: 1,
loading: false, loading: false,
processList: [],// 列表数据 processList: [], // 列表数据
processListSelect: [], // 列表选中数据 processListSelect: [], // 列表选中数据
} }
}, },
@@ -190,7 +200,7 @@ export default {
break break
} }
}, },
resetSelect () { //清空 resetSelect () { // 清空
this.searchForm.prcName = '' this.searchForm.prcName = ''
this.searchForm.prcNum = '' this.searchForm.prcNum = ''
this.searchForm.prcType = '' this.searchForm.prcType = ''
@@ -225,22 +235,21 @@ export default {
this.queryProcess() this.queryProcess()
}, },
pageSizeChange (pageSize) { // 数量改变 pageSizeChange (pageSize) { // 数量改变
this.pageSize=pageSize this.pageSize = pageSize
this.queryProcess() this.queryProcess()
}, },
dealWith (row) { // 查看 dealWith (row) { // 查看
let routeUrl =this.$router.resolve({ const routeUrl = this.$router.resolve({
name: 'ProcessDetail', name: 'ProcessDetail',
query: { query: {
prcNum: row.prcNum, prcNum: row.prcNum,
tabsName: 'AlreadyProcess' tabsName: 'AlreadyProcess'
} }
}) })
window.open(routeUrl.href, "_blank"); window.open(routeUrl.href, '_blank');
}, },
...mapMutations(['setProcess', 'setHandleInfo']), ...mapMutations([ 'setProcess', 'setHandleInfo' ]),
...mapActions(['setMenu']) ...mapActions([ 'setMenu' ])
}, },
mounted () { mounted () {
this.queryProcess() this.queryProcess()
src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
+121 -112
View File
@@ -2,134 +2,143 @@
<template> <template>
<div class="already-send v-class"> <div class="already-send v-class">
<div class="search-area"> <div class="search-area">
<el-form :inline="true" :model="searchForm" ref="processSearch" class="label-input-form"> <el-form ref="processSearch" :inline="true" :model="searchForm" class="label-input-form">
<div class="search-area-item"> <div class="search-area-item">
<el-form-item label="流程名称" class="search-item" @keyup.enter.native="selectProcessBtn"> <el-form-item label="流程名称" class="search-item" @keyup.enter.native="selectProcessBtn">
<el-input <el-input
v-model.trim="searchForm.prcName" v-model.trim="searchForm.prcName"
placeholder="按流程名称查找" placeholder="按流程名称查找"
:maxlength="100" :maxlength="100"
clearable clearable
></el-input> />
</el-form-item> </el-form-item>
<el-form-item label="流程编号" class="search-item" @keyup.enter.native="selectProcessBtn"> <el-form-item label="流程编号" class="search-item" @keyup.enter.native="selectProcessBtn">
<el-input <el-input
v-model.trim="searchForm.prcNum" v-model.trim="searchForm.prcNum"
placeholder="按流程编号查找" placeholder="按流程编号查找"
:maxlength="100" :maxlength="100"
clearable clearable
></el-input> />
</el-form-item> </el-form-item>
<el-form-item label="流程类型" class="search-item" @keyup.enter.native="selectProcessBtn"> <el-form-item label="流程类型" class="search-item" @keyup.enter.native="selectProcessBtn">
<el-select <el-select
v-model="searchForm.prcType" v-model="searchForm.prcType"
placeholder="按流程类型查找" placeholder="按流程类型查找"
filterable filterable
clearable clearable
> >
<el-option <el-option
v-for="item in processTypeList" v-for="item in processTypeList"
:value="item.value" :key="item.value"
:key="item.value" :value="item.value"
:label="item.label" :label="item.label"
></el-option> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
type="primary" v-btn-permission="'253fb387b97868c10434cc8fa3d87294'"
class="common-button-primary" type="primary"
size="mini" class="common-button-primary"
v-btn-permission="'253fb387b97868c10434cc8fa3d87294'" size="mini"
@click="selectProcessBtn">查询</el-button> @click="selectProcessBtn"
>
查询
</el-button>
<el-button <el-button
class="common-button-default" v-btn-permission="'dc9c8efc60be6ba8b78b68bf949e2f6b'"
size="mini" class="common-button-default"
v-btn-permission="'dc9c8efc60be6ba8b78b68bf949e2f6b'" size="mini"
@click="resetSelect">清空</el-button> @click="resetSelect"
>
清空
</el-button>
</el-form-item> </el-form-item>
</div> </div>
<div class="search-area-item"> <div class="search-area-item" />
</div>
</el-form> </el-form>
</div> </div>
<div class="content"> <div class="content">
<div class="table-wrap"> <div class="table-wrap">
<el-table <el-table
height="100%" ref="selection"
ref="selection" height="100%"
:data="processList" :data="processList"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%; flex: auto;" style="width: 100%; flex: auto;"
border border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange"
>
<el-table-column <el-table-column
type="selection" type="selection"
width="55" width="55"
align="center"> align="center"
</el-table-column> />
<el-table-column <el-table-column
type="index" type="index"
fixed="left" fixed="left"
width="55" width="55"
label="序号" label="序号"
align="center"> align="center"
>
<template slot-scope="{scope, column, $index}"> <template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (pageNo - 1) * pageSize }} {{ ($index + 1) + (pageNo - 1) * pageSize }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="prcNum" prop="prcNum"
label="流程编号" label="流程编号"
align="center" align="center"
width="150" width="150"
> />
</el-table-column>
<el-table-column <el-table-column
prop="prcType" prop="prcType"
label="流程类型" label="流程类型"
align="center" align="center"
width="180" width="180"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ getPrcName(scope.row.prcType,scope.row.taskInfo) }}</span> <span>{{ getPrcName(scope.row.prcType,scope.row.taskInfo) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="prcName" prop="prcName"
label="流程名称" label="流程名称"
show-overflow-tooltip show-overflow-tooltip
align="center" align="center"
min-width="250" min-width="250"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ getPrcNameFilter(scope.row) }}</span> <span>{{ getPrcNameFilter(scope.row) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="creatUserName" prop="creatUserName"
label="发起人" label="发起人"
align="center" align="center"
width="90" width="180"
> >
<template slot-scope="scope">
<span>{{ scope.row.creatUserName }}({{ scope.row.creatUser || '-' }})</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="creatTime" prop="creatTime"
label="创建日期" label="创建日期"
align="center" align="center"
width="150" width="150"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.creatTime ? $moment(scope.row.creatTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span> <span>{{ scope.row.creatTime ? $moment(scope.row.creatTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="overTime" prop="overTime"
label="完成日期" label="完成日期"
align="center" align="center"
width="150" width="150"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span> <span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
@@ -137,11 +146,11 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('m.operation')" align="center" width="50"> <el-table-column :label="$t('m.operation')" align="center" width="50">
<template slot-scope="scope"> <template slot-scope="scope">
<div @click.stop style="display: inline-block"> <div style="display: inline-block" @click.stop>
<el-dropdown trigger="click" @command="handleCommand"> <el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i> <i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'b9abd00768c8ed97be89547c2da3f0eb'">查看</el-dropdown-item> <el-dropdown-item v-btn-permission="'b9abd00768c8ed97be89547c2da3f0eb'" :command="[scope.row, '查看']">查看</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '强制撤回']">撤回</el-dropdown-item> <el-dropdown-item :command="[scope.row, '强制撤回']">撤回</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
@@ -152,22 +161,23 @@
</div> </div>
<!--分页--> <!--分页-->
<pagination <pagination
class="tabpagination" class="tabpagination"
:page="pageNo" :page="pageNo"
:total="total" :total="total"
@pageChange="pageChange" @pageChange="pageChange"
@pageSizeChange="pageSizeChange"></pagination> @pageSizeChange="pageSizeChange"
/>
<loading :loading="loading">数据获取中</loading> <loading :loading="loading">数据获取中</loading>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import {mapMutations, mapActions} from 'vuex' import { mapMutations, mapActions } from 'vuex'
import ProcessMixin from '../../../components/ProcessMixin' import ProcessMixin from '../../../components/ProcessMixin'
export default { export default {
name: 'AlreadySend', name: 'AlreadySend',
mixins: [ProcessMixin], mixins: [ ProcessMixin ],
data () { data () {
return { return {
searchForm: { searchForm: {
@@ -176,10 +186,10 @@ export default {
prcType: '' prcType: ''
}, },
total: 0, total: 0,
pageSize:this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
pageNo: 1, pageNo: 1,
loading: false, loading: false,
processList: [],// 列表数据 processList: [], // 列表数据
processListSelect: [], // 列表选中数据 processListSelect: [], // 列表选中数据
} }
}, },
@@ -218,7 +228,7 @@ export default {
this.$message.warning('当前流程数据已完成，请选择未完成的流程数据') this.$message.warning('当前流程数据已完成，请选择未完成的流程数据')
} }
}, },
resetSelect () { //清空 resetSelect () { // 清空
this.searchForm.prcName = '' this.searchForm.prcName = ''
this.searchForm.prcNum = '' this.searchForm.prcNum = ''
this.searchForm.prcType = '' this.searchForm.prcType = ''
@@ -226,22 +236,22 @@ export default {
}, },
queryProcess () { // 查询待办流程 queryProcess () { // 查询待办流程
this.$http.postData('lawss/activiti/IssuedProcess', this.$http.postData('lawss/activiti/IssuedProcess',
{ {
current: this.pageNo, current: this.pageNo,
size: this.$store.getters.userInfo.configContent, size: this.$store.getters.userInfo.configContent,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.userId,
prcName: this.searchForm.prcName, prcName: this.searchForm.prcName,
prcType: parseInt(this.searchForm.prcType) || this.searchForm.prcType ||'', prcType: parseInt(this.searchForm.prcType) || this.searchForm.prcType || '',
prcNum: this.searchForm.prcNum prcNum: this.searchForm.prcNum
}, },
{ {
loading: 'loading', loading: 'loading',
_this: this _this: this
}, res => { }, res => {
this.processList = res.list this.processList = res.list
this.total = res.count this.total = res.count
}, e => { }, e => {
}) })
}, },
selectProcessBtn () { // 搜索按钮 selectProcessBtn () { // 搜索按钮
this.pageNo = 1 this.pageNo = 1
@@ -255,22 +265,21 @@ export default {
this.queryProcess() this.queryProcess()
}, },
pageSizeChange (pageSize) { // 数量改变 pageSizeChange (pageSize) { // 数量改变
this.pageSize=pageSize this.pageSize = pageSize
this.queryProcess() this.queryProcess()
}, },
dealWith (row) { // 查看 dealWith (row) { // 查看
let routeUrl =this.$router.resolve({ const routeUrl = this.$router.resolve({
name: 'ProcessDetail', name: 'ProcessDetail',
query: { query: {
prcNum: row.prcNum, prcNum: row.prcNum,
tabsName: 'AlreadySend' tabsName: 'AlreadySend'
} }
}) })
window.open(routeUrl.href, "_blank"); window.open(routeUrl.href, '_blank');
}, },
...mapMutations(['setProcess', 'setHandleInfo']), ...mapMutations([ 'setProcess', 'setHandleInfo' ]),
...mapActions(['setMenu']) ...mapActions([ 'setMenu' ])
}, },
mounted () { mounted () {
this.queryProcess() this.queryProcess()
src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue
+119 -110
View File
@@ -2,134 +2,143 @@
<template> <template>
<div class="monitor-process v-class"> <div class="monitor-process v-class">
<div class="search-area"> <div class="search-area">
<el-form :inline="true" :model="searchForm" ref="processSearch" class="label-input-form"> <el-form ref="processSearch" :inline="true" :model="searchForm" class="label-input-form">
<div class="search-area-item"> <div class="search-area-item">
<el-form-item label="流程名称" class="search-item" @keyup.enter.native="selectProcessBtn"> <el-form-item label="流程名称" class="search-item" @keyup.enter.native="selectProcessBtn">
<el-input <el-input
v-model.trim="searchForm.prcName" v-model.trim="searchForm.prcName"
placeholder="按流程名称查找" placeholder="按流程名称查找"
:maxlength="100" :maxlength="100"
clearable clearable
></el-input> />
</el-form-item> </el-form-item>
<el-form-item label="流程编号" class="search-item" @keyup.enter.native="selectProcessBtn"> <el-form-item label="流程编号" class="search-item" @keyup.enter.native="selectProcessBtn">
<el-input <el-input
v-model.trim="searchForm.prcNum" v-model.trim="searchForm.prcNum"
placeholder="按流程编号查找" placeholder="按流程编号查找"
:maxlength="100" :maxlength="100"
clearable clearable
></el-input> />
</el-form-item> </el-form-item>
<el-form-item label="流程类型" class="search-item" @keyup.enter.native="selectProcessBtn"> <el-form-item label="流程类型" class="search-item" @keyup.enter.native="selectProcessBtn">
<el-select <el-select
v-model="searchForm.prcType" v-model="searchForm.prcType"
placeholder="按流程类型查找" placeholder="按流程类型查找"
filterable filterable
clearable clearable
> >
<el-option <el-option
v-for="item in processTypeList" v-for="item in processTypeList"
:value="item.value" :key="item.value"
:key="item.value" :value="item.value"
:label="item.label" :label="item.label"
></el-option> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
type="primary" v-btn-permission="'68d17445a13ff3f635c39291070985c3'"
class="common-button-primary" type="primary"
size="mini" class="common-button-primary"
v-btn-permission="'68d17445a13ff3f635c39291070985c3'" size="mini"
@click="selectProcessBtn">查询</el-button> @click="selectProcessBtn"
>
查询
</el-button>
<el-button <el-button
class="common-button-default" v-btn-permission="'2321e6eaaf6d89eb7c36a12aa5624396'"
size="mini" class="common-button-default"
v-btn-permission="'2321e6eaaf6d89eb7c36a12aa5624396'" size="mini"
@click="resetSelect">清空</el-button> @click="resetSelect"
>
清空
</el-button>
</el-form-item> </el-form-item>
</div> </div>
<div class="search-area-item"> <div class="search-area-item" />
</div>
</el-form> </el-form>
</div> </div>
<div class="content"> <div class="content">
<div class="table-wrap"> <div class="table-wrap">
<el-table <el-table
height="100%" ref="selection"
ref="selection" height="100%"
:data="processList" :data="processList"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%; flex: auto;" style="width: 100%; flex: auto;"
border border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange"
>
<el-table-column <el-table-column
type="selection" type="selection"
width="55" width="55"
align="center"> align="center"
</el-table-column> />
<el-table-column <el-table-column
type="index" type="index"
fixed="left" fixed="left"
width="55" width="55"
label="序号" label="序号"
align="center"> align="center"
>
<template slot-scope="{scope, column, $index}"> <template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (pageNo - 1) * pageSize }} {{ ($index + 1) + (pageNo - 1) * pageSize }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="prcNum" prop="prcNum"
label="流程编号" label="流程编号"
align="center" align="center"
width="150" width="150"
> />
</el-table-column>
<el-table-column <el-table-column
prop="prcType" prop="prcType"
label="流程类型" label="流程类型"
align="center" align="center"
width="180" width="180"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ getPrcName(scope.row.prcType,scope.row.taskInfo) }}</span> <span>{{ getPrcName(scope.row.prcType,scope.row.taskInfo) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="prcName" prop="prcName"
label="流程名称" label="流程名称"
show-overflow-tooltip show-overflow-tooltip
align="center" align="center"
min-width="250" min-width="250"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ getPrcNameFilter(scope.row) }}</span> <span>{{ getPrcNameFilter(scope.row) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="creatUserName" prop="creatUserName"
label="发起人" label="发起人"
align="center" align="center"
width="90" width="180"
> >
<template slot-scope="scope">
<span>{{ scope.row.creatUserName }}({{ scope.row.creatUser || '-' }})</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="creatTime" prop="creatTime"
label="创建日期" label="创建日期"
align="center" align="center"
width="150" width="150"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.creatTime ? $moment(scope.row.creatTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span> <span>{{ scope.row.creatTime ? $moment(scope.row.creatTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="overTime" prop="overTime"
label="完成日期" label="完成日期"
align="center" align="center"
width="150" width="150"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span> <span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
@@ -137,7 +146,7 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('m.operation')" align="center" width="50"> <el-table-column :label="$t('m.operation')" align="center" width="50">
<template slot-scope="scope"> <template slot-scope="scope">
<div @click.stop style="display: inline-block"> <div style="display: inline-block" @click.stop>
<el-dropdown trigger="click" @command="handleCommand"> <el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i> <i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
@@ -151,22 +160,23 @@
</div> </div>
<!--分页--> <!--分页-->
<pagination <pagination
class="tabpagination" class="tabpagination"
:page="pageNo" :page="pageNo"
:total="total" :total="total"
@pageChange="pageChange" @pageChange="pageChange"
@pageSizeChange="pageSizeChange"></pagination> @pageSizeChange="pageSizeChange"
/>
<loading :loading="loading">数据获取中</loading> <loading :loading="loading">数据获取中</loading>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import {mapMutations, mapActions} from 'vuex' import { mapMutations, mapActions } from 'vuex'
import ProcessMixin from '../../../components/ProcessMixin' import ProcessMixin from '../../../components/ProcessMixin'
export default { export default {
name: 'MonitorProcess', name: 'MonitorProcess',
mixins: [ProcessMixin], mixins: [ ProcessMixin ],
data () { data () {
return { return {
searchForm: { searchForm: {
@@ -175,10 +185,10 @@ export default {
prcType: '' prcType: ''
}, },
total: 0, total: 0,
pageSize:this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
pageNo: 1, pageNo: 1,
loading: false, loading: false,
processList: [],// 列表数据 processList: [], // 列表数据
processListSelect: [], // 列表选中数据 processListSelect: [], // 列表选中数据
} }
}, },
@@ -190,7 +200,7 @@ export default {
break break
} }
}, },
resetSelect () { //清空 resetSelect () { // 清空
this.searchForm.prcName = '' this.searchForm.prcName = ''
this.searchForm.prcNum = '' this.searchForm.prcNum = ''
this.searchForm.prcType = '' this.searchForm.prcType = ''
@@ -198,23 +208,23 @@ export default {
}, },
queryProcess () { // 查询待办流程 queryProcess () { // 查询待办流程
this.$http.postData('lawss/activiti/allProcess', this.$http.postData('lawss/activiti/allProcess',
{ {
current: this.pageNo, current: this.pageNo,
size: this.$store.getters.userInfo.configContent, size: this.$store.getters.userInfo.configContent,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.userId,
prcName: this.searchForm.prcName, prcName: this.searchForm.prcName,
prcType: this.searchForm.prcType || '', prcType: this.searchForm.prcType || '',
prcNum: this.searchForm.prcNum prcNum: this.searchForm.prcNum
}, },
{ {
loading: 'loading', loading: 'loading',
_this: this _this: this
}, res => { }, res => {
this.processList = res.list || [] this.processList = res.list || []
console.log(this.processList) console.log(this.processList)
this.total = res.count this.total = res.count
}, e => { }, e => {
}) })
}, },
selectProcessBtn () { // 搜索按钮 selectProcessBtn () { // 搜索按钮
this.pageNo = 1 this.pageNo = 1
@@ -232,7 +242,7 @@ export default {
this.queryProcess() this.queryProcess()
}, },
dealWith (row) { // 查看 dealWith (row) { // 查看
let routeUrl =this.$router.resolve({ const routeUrl = this.$router.resolve({
name: 'ProcessDetail', name: 'ProcessDetail',
query: { query: {
bpnId: row.id, bpnId: row.id,
@@ -240,11 +250,10 @@ export default {
tabsName: 'MonitorProcess' tabsName: 'MonitorProcess'
} }
}) })
window.open(routeUrl.href, "_blank"); window.open(routeUrl.href, '_blank');
}, },
...mapMutations(['setProcess', 'setHandleInfo']), ...mapMutations([ 'setProcess', 'setHandleInfo' ]),
...mapActions(['setMenu']) ...mapActions([ 'setMenu' ])
}, },
mounted () { mounted () {
this.queryProcess() this.queryProcess()
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+6 -2
View File
@@ -123,8 +123,12 @@
prop="creatUserName" prop="creatUserName"
label="发起人" label="发起人"
align="center" align="center"
width="90" width="180"
/> >
<template slot-scope="scope">
<span>{{ scope.row.creatUserName }}({{ scope.row.creatUser || '-' }})</span>
</template>
</el-table-column>
<el-table-column <el-table-column
prop="creatTime" prop="creatTime"
label="创建日期" label="创建日期"
src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+5 -1
View File
@@ -123,7 +123,11 @@
prop="creatUserName" prop="creatUserName"
label="发起人" label="发起人"
align="center" align="center"
/> >
<template slot-scope="scope">
<span>{{ scope.row.creatUserName }}({{ scope.row.creatUser || '-' }})</span>
</template>
</el-table-column>
<el-table-column <el-table-column
prop="creatTime" prop="creatTime"
label="创建日期" label="创建日期"
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+8
View File
@@ -4390,6 +4390,10 @@ export default {
this.drawerTitle = title this.drawerTitle = title
this.modalShowRoleFlag1 = true this.modalShowRoleFlag1 = true
}, },
unique (newArr) {
const res = new Map();
return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
},
checkedRole2 (data) { checkedRole2 (data) {
let idList = '' let idList = ''
let nameList = '' let nameList = ''
@@ -4411,7 +4415,11 @@ export default {
this.sarBussionessSearch['QCRBUSS'] = nameList this.sarBussionessSearch['QCRBUSS'] = nameList
} }
if (this.drawerTitle === '选择起草人') { if (this.drawerTitle === '选择起草人') {
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(',')
const institutionNameList = this.unique(data.map(item => item.institutionCascade)).join(',')
this.$set(this.sarBussionessStandEO, 'QCRBUSS', nameList) this.$set(this.sarBussionessStandEO, 'QCRBUSS', nameList)
this.$set(this.sarBussionessStandEO, 'QCDWId', institutionIdList)
this.$set(this.sarBussionessStandEO, 'QCDW', institutionNameList)
if (this.sarBussionessStandEO.QCRBUSS) { if (this.sarBussionessStandEO.QCRBUSS) {
this.$refs.sarBussionessStandForm.validateField('QCRBUSS') this.$refs.sarBussionessStandForm.validateField('QCRBUSS')
} }