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
+296 -207
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+457 -306
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+500 -325
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+284 -213
View File
@@ -6,12 +6,12 @@
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" v-if="approvalFlag" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
<div class="headerTabsItem" v-else :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
<div v-if="approvalFlag" class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
<div v-else class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
</div>
<div class="content" v-show="active === '1'">
<div v-show="active === '1'" class="content">
<div style="flex: auto; overflow: auto">
<!-- <process-title v-if="showFlag">-->
<!-- <process-title v-if="showFlag">-->
<process-title>
<template slot="title">基础信息</template>
</process-title>
@@ -22,23 +22,58 @@
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="调整类型" class="add-form-item form-item-disabled">
<el-button :disabled="disabledXX" size="small" type="primary" style="margin: 10px;" @click="toggleComName('establish')">立项
<el-button
:disabled="disabledXX"
size="small"
type="primary"
style="margin: 10px;"
@click="toggleComName('establish')"
>
立项
</el-button>
<el-button :disabled="disabledXX" size="small" type="primary" style="margin: 10px;" @click="toggleComName('merge')">合并
<el-button
:disabled="disabledXX"
size="small"
type="primary"
style="margin: 10px;"
@click="toggleComName('merge')"
>
合并
</el-button>
<el-button :disabled="disabledXX" size="small" type="primary" style="margin: 10px;" @click="toggleComName('delay')">延期
<el-button
:disabled="disabledXX"
size="small"
type="primary"
style="margin: 10px;"
@click="toggleComName('delay')"
>
延期
</el-button>
<el-button :disabled="disabledXX" size="small" type="primary" style="margin: 10px;" @click="toggleComName('cancel')">取消
<el-button
:disabled="disabledXX"
size="small"
type="primary"
style="margin: 10px;"
@click="toggleComName('cancel')"
>
取消
</el-button>
<el-button :disabled="disabledXX" size="small" type="primary" style="margin: 10px;" @click="toggleComName('rename')">更名
<el-button
:disabled="disabledXX"
size="small"
type="primary"
style="margin: 10px;"
@click="toggleComName('rename')"
>
更名
</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
<component ref="childForm" v-if="isWrite" :message="qbfsForm" :is="comName"></component>
<component ref="childForm" v-else :message="JSON.parse(JSON.stringify(qbfsForm))" :is="comName"></component>
<ReceiptDescription v-model="commentText"></ReceiptDescription>
<component :is="comName" v-if="isWrite" ref="childForm" :message="qbfsForm" />
<component :is="comName" v-else ref="childForm" :message="JSON.parse(JSON.stringify(qbfsForm))" />
<ReceiptDescription v-model="commentText" />
</div>
<!--<div>-->
<!-- <el-collapse accordion>-->
@@ -57,7 +92,7 @@
<!--</div>-->
</div>
<loading :loading="formLoading">数据加载中...</loading>
<div class="content" v-show="active === '2'">
<div v-show="active === '2'" class="content">
<div class="block" style="padding-top: 20px;">
<el-timeline>
<el-form
@@ -65,35 +100,50 @@
:roleMessage="roleForm"
:model="roleForm"
:rules="roleFormRules"
class="label-input-form">
class="label-input-form"
>
<el-timeline-item timestamp="起草" placement="top" :color="roleForm.prcCreateUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="prcCreateUserName" style="margin-bottom: 0">
<h4>标准立项申请人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input :disabled="disabledXX" v-model="roleForm.prcCreateUser" style="display: none;"></el-input>
<el-input :disabled="disabledXX" v-model="roleForm.prcCreateUserName" placeholder="标准立项申请人"
disabled></el-input>
<el-input v-model="roleForm.prcCreateUser" :disabled="disabledXX" style="display: none;" />
<el-input
v-model="roleForm.prcCreateUserName"
:disabled="disabledXX"
placeholder="标准立项申请人"
disabled
/>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="审核" placement="top"
:color="roleForm.dockUser ? '#66b1ff' : ''">
<el-timeline-item
timestamp="审核"
placement="top"
:color="roleForm.dockUser ? '#66b1ff' : ''"
>
<el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0">
<h4>标准立项单位整车/系统总工</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input :disabled="disabledXX" v-model="roleForm.dockUser" style="display: none;"></el-input>
<el-input :disabled="disabledXX" v-model="roleForm.dockUserName" readonly placeholder="选择标准立项单位整车/系统总工"
@click.native="choiceZRR('dockUser', '选择标准立项单位整车/系统总工', roleForm.dockUser)">
</el-input>
<el-input v-model="roleForm.dockUser" :disabled="disabledXX" style="display: none;" />
<el-input
v-model="roleForm.dockUserName"
:disabled="disabledXX"
readonly
placeholder="选择标准立项单位整车/系统总工"
@click.native="choiceZRR('dockUser', '选择标准立项单位整车/系统总工', roleForm.dockUser)"
/>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="会签" placement="top"
:color="roleForm.countersigner ? '#66b1ff' : ''">
<el-timeline-item
timestamp="会签"
placement="top"
:color="roleForm.countersigner ? '#66b1ff' : ''"
>
<el-card>
<el-form-item prop="countersignerName" style="margin-bottom: 0">
<h4>创新技术委员会成员/标准体系工作组成员(必选)</h4>
@@ -103,65 +153,83 @@
<h4>采购部相关人员(可选)</h4>
<h4>海外相关人员(可选)</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input :disabled="disabledXX" v-model="roleForm.countersigner" style="display: none;"></el-input>
<el-input :disabled="disabledXX" v-model="roleForm.countersignerName" readonly placeholder="选择会签人员"
@click.native="choiceZRRS">
</el-input>
<el-input v-model="roleForm.countersigner" :disabled="disabledXX" style="display: none;" />
<el-input
v-model="roleForm.countersignerName"
:disabled="disabledXX"
readonly
placeholder="选择会签人员"
@click.native="choiceZRRS"
/>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="审定" placement="top"
:color="roleForm.examine ? '#66b1ff' : ''">
<el-timeline-item
timestamp="审定"
placement="top"
:color="roleForm.examine ? '#66b1ff' : ''"
>
<el-card>
<el-form-item prop="examineName" style="margin-bottom: 0">
<h4>标准体系工作组组长</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input :disabled="disabledXX" v-model="roleForm.examine" style="display: none;"></el-input>
<el-input :disabled="disabledXX" v-model="roleForm.examineName" readonly placeholder="选择标准体系工作组组长"
@click.native="choiceZRR('examine', '选择标准体系工作组组长', roleForm.examine)">
</el-input>
<el-input v-model="roleForm.examine" :disabled="disabledXX" style="display: none;" />
<el-input
v-model="roleForm.examineName"
:disabled="disabledXX"
readonly
placeholder="选择标准体系工作组组长"
@click.native="choiceZRR('examine', '选择标准体系工作组组长', roleForm.examine)"
/>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="批准" placement="top"
:color="roleForm.approver ? '#66b1ff' : ''">
<el-timeline-item
timestamp="批准"
placement="top"
:color="roleForm.approver ? '#66b1ff' : ''"
>
<el-card>
<el-form-item prop="approverName" style="margin-bottom: 0">
<h4>标准法规部高级经理</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input :disabled="disabledXX" v-model="roleForm.approver" style="display: none;"></el-input>
<el-input :disabled="disabledXX" v-model="roleForm.approverName" readonly placeholder="选择标准法规部高级经理"
@click.native="choiceZRR('approver', '选择标准法规部高级经理', roleForm.approver)">
</el-input>
<el-input v-model="roleForm.approver" :disabled="disabledXX" style="display: none;" />
<el-input
v-model="roleForm.approverName"
:disabled="disabledXX"
readonly
placeholder="选择标准法规部高级经理"
@click.native="choiceZRR('approver', '选择标准法规部高级经理', roleForm.approver)"
/>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<!-- <el-timeline-item timestamp="抄送" placement="top"-->
<!-- :color="roleForm.engineer ? '#66b1ff' : ''">-->
<!-- <el-card>-->
<!-- <el-form-item prop="engineerName" style="margin-bottom: 0">-->
<!-- <h4>相关单位、工程研究总院标准法规部</h4>-->
<!-- <div style="margin-top: 10px;width: 300px;">-->
<!-- <el-input :disabled="disabledXX" v-model="roleForm.engineer" style="display: none;"></el-input>-->
<!-- <el-input :disabled="disabledXX" v-model="roleForm.engineerName" readonly placeholder="选择相关单位、工程研究总院标准法规部"-->
<!-- @click.native="choiceZRR('engineer', '选择相关单位、工程研究总院标准法规部', roleForm.engineer)">-->
<!-- </el-input>-->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- </el-card>-->
<!-- </el-timeline-item>-->
<!-- <el-timeline-item timestamp="抄送" placement="top"-->
<!-- :color="roleForm.engineer ? '#66b1ff' : ''">-->
<!-- <el-card>-->
<!-- <el-form-item prop="engineerName" style="margin-bottom: 0">-->
<!-- <h4>相关单位、工程研究总院标准法规部</h4>-->
<!-- <div style="margin-top: 10px;width: 300px;">-->
<!-- <el-input :disabled="disabledXX" v-model="roleForm.engineer" style="display: none;"></el-input>-->
<!-- <el-input :disabled="disabledXX" v-model="roleForm.engineerName" readonly placeholder="选择相关单位、工程研究总院标准法规部"-->
<!-- @click.native="choiceZRR('engineer', '选择相关单位、工程研究总院标准法规部', roleForm.engineer)">-->
<!-- </el-input>-->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- </el-card>-->
<!-- </el-timeline-item>-->
</el-form>
</el-timeline>
</div>
</div>
<div class="content" v-show="active === '3'">
<div v-show="active === '3'" class="content">
<div class="flow-list" style="height: 100%">
<el-table
height="100%"
ref="selection"
height="100%"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
@@ -172,30 +240,29 @@
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
align="center"
/>
<el-table-column
type="index"
width="55"
label="序号"
align="center">
</el-table-column>
align="center"
/>
<el-table-column
prop="name"
label="任务步骤"
align="center"
>
</el-table-column>
/>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
>
</el-table-column>
/>
<el-table-column
prop="createTime"
label="创建时间"
align="center">
align="center"
>
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
</template>
@@ -203,7 +270,8 @@
<el-table-column
prop="endTime"
label="完成时间"
align="center">
align="center"
>
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
</template>
@@ -211,7 +279,8 @@
<el-table-column
prop="comment"
label="流程信息"
align="center">
align="center"
>
<template slot-scope="scope">
<span>{{ scope.row.commentText }}</span>
</template>
@@ -219,7 +288,8 @@
<el-table-column
prop="completeFlag"
label="状态"
align="center">
align="center"
>
<template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}</span>
</template>
@@ -229,48 +299,50 @@
</div>
</div>
<ProcessFooter v-show="!disabledXX"
<ProcessFooter
v-show="!disabledXX"
show-save
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
>
</ProcessFooter>
/>
<!-- 多选择责任人-->
<Role-tree v-if="!disabledXX"
<Role-tree
v-if="!disabledXX"
is-title="选择责任部门对接人"
:is-visible.sync="modalshowflag2"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
></Role-tree>
@checkedRole="checkedRole2"
/>
<!-- 单选人-->
<Role-tree v-if="!disabledXX"
<Role-tree
v-if="!disabledXX"
check-box
:is-title="drawerTitle"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
@checkedRole="checkedRole"
/>
</div>
</template>
<script>
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import merge from "process/creatProcess/qbzxdjhgk/component/merge";
import rename from "process/creatProcess/qbzxdjhgk/component/rename";
import establish from "process/creatProcess/qbzxdjhgk/component/establish";
import delay from "process/creatProcess/qbzxdjhgk/component/delay";
import cancel from "process/creatProcess/qbzxdjhgk/component/cancel";
import ProcessHeader from '../../components/ProcessHeader';
import ProcessFooter from '../../components/ProcessFooter';
import ProcessTitle from '../../components/ProcessTitle';
import merge from 'process/creatProcess/qbzxdjhgk/component/merge';
import rename from 'process/creatProcess/qbzxdjhgk/component/rename';
import establish from 'process/creatProcess/qbzxdjhgk/component/establish';
import delay from 'process/creatProcess/qbzxdjhgk/component/delay';
import cancel from 'process/creatProcess/qbzxdjhgk/component/cancel';
import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
import axios from "axios";
import { saveTaskFirst, queryTaskFirst, inboundLiaisonDetail, taskDel, saveTaskForPub } from "api/process";
import axios from 'axios';
import { saveTaskFirst, queryTaskFirst, inboundLiaisonDetail, taskDel, saveTaskForPub } from 'api/process';
export default {
name: "qbzxdjhgkStep1",
name: 'QbzxdjhgkStep1',
components: {
ProcessHeader,
ProcessFooter,
@@ -282,25 +354,25 @@ export default {
delay,
cancel
},
data() {
data () {
return {
isWrite:!this.$route.query.taskIds,
disabledXX:!!this.$route.query.disabledXX,
isWrite: !this.$route.query.taskIds,
disabledXX: !!this.$route.query.disabledXX,
submitFlag: '',
toggleType: '5',
comFlag: 1,
active: "1",
commentText: "",
comName: "establish",
isTrue:true,
active: '1',
commentText: '',
comName: 'establish',
isTrue: true,
qbfsForm: {},
componentKey:1,
componentKey: 1,
formLoading: false,
approvalFlag: false,
showFlag: true,
taskIds: '',
bpnId: '',
drawerTitle: "",
drawerTitle: '',
nodeList: [],
nodeList2: [],
detailData: [],
@@ -312,75 +384,75 @@ export default {
roleForm: {
prcCreateUserName: this.$store.getters.userInfo.userName,
prcCreateUser: this.$store.getters.userInfo.userId,
dockUser: "",
dockUserName: "",
countersigner: "",
countersignerName: "",
approver: "",
approverName: "",
engineer: "",
engineerName: "",
examine: "",
examineName: ""
dockUser: '',
dockUserName: '',
countersigner: '',
countersignerName: '',
approver: '',
approverName: '',
engineer: '',
engineerName: '',
examine: '',
examineName: ''
},
//必填人员校验规则
// 必填人员校验规则
roleFormRules: {
dockUserName: [
{ required: true, message: "请选择标准立项单位整车/系统总工", trigger: "change" }
{ required: true, message: '请选择标准立项单位整车/系统总工', trigger: 'change' }
],
countersignerName:[
{required: true, message:'请选择会签人员', trigger: "change" }
countersignerName: [
{ required: true, message: '请选择会签人员', trigger: 'change' }
],
examineName:[
{required: true, message:'请选择标准体系工作组组长', trigger: "change" }
examineName: [
{ required: true, message: '请选择标准体系工作组组长', trigger: 'change' }
],
approverName:[
{required: true, message:'请选择总院技术委员会覆盖领域企业标准：专委会主任/总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长', trigger: "change" }
approverName: [
{ required: true, message: '请选择总院技术委员会覆盖领域企业标准：专委会主任/总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长', trigger: 'change' }
],
engineerName:[
{required: true, message:'请选择相关单位、工程研究总院标准法规部', trigger: "change" }
engineerName: [
{ required: true, message: '请选择相关单位、工程研究总院标准法规部', trigger: 'change' }
],
}
};
},
mounted() {
mounted () {
this.taskIds = this.$route.query.taskIds
this.bpnId = this.$route.query.bpnId
if (this.bpnId !== undefined) {
this.getData()
}
if(this.taskIds){
if(this.taskIds) {
this.approvalFlag = true
this.processTable()
//被驳回时调用
// 被驳回时调用
this.getHistoryData()
}
},
methods: {
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
processTable () {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
sortWord: this.shunxu ? this.paixu : "",
sortWord: this.shunxu ? this.paixu : '',
shunxu: this.shunxu
}, {
loading: "loading",
loading: 'loading',
_this: this
}, res => {
this.detailData = res
}, e => {
})
},
getData() {
getData () {
this.formLoading = true
this.showFlag = false
queryTaskFirst({
bpnId: this.$route.query.bpnId
}).then(res => {
let mes = JSON.parse(res.mes)
const mes = JSON.parse(res.mes)
this.getFormFieldList(mes);
});
},
getHistoryData() {
getHistoryData () {
this.submitFlag = '重新起草'
this.showFlag = false
this.formLoading = true
@@ -397,52 +469,52 @@ export default {
})
})
},
deepClone(orig) {
var copy = Object.create(Object.getPrototypeOf(orig))
this.copyOwnPropertiesFrom(copy,orig);
deepClone (orig) {
const copy = Object.create(Object.getPrototypeOf(orig))
this.copyOwnPropertiesFrom(copy, orig);
return copy;
},
copyOwnPropertiesFrom(target, source) {
copyOwnPropertiesFrom (target, source) {
Object.getOwnPropertyNames(source)
.forEach(ele =>{
.forEach(ele => {
// 获取到每个属性的所有描述，然后重新定义对象的属性并返回此对象。
var desc = Object.getOwnPropertyDescriptor(source,ele);
Object.defineProperty(target,ele,desc)
const desc = Object.getOwnPropertyDescriptor(source, ele);
Object.defineProperty(target, ele, desc)
});
return target;
},
getType(target){
return Object.prototype.toString.call(target).toLowerCase().slice(8,-1)
getType (target) {
return Object.prototype.toString.call(target).toLowerCase().slice(8, -1)
},
/**
* @description: 动态表单读取
*/
getFormFieldList(item) {
getFormFieldList (item) {
console.log(item);
this.toggleType= item.type || item.qbfsForm.type
this.toggleType = item.type || item.qbfsForm.type
this.$nextTick(() => {
switch (this.toggleType){
switch (this.toggleType) {
case '1':
this.comName = "merge"
this.comName = 'merge'
break
case '2':
this.comName = "delay"
this.comName = 'delay'
break
case '3':
this.comName = "cancel"
this.comName = 'cancel'
break
case '4':
this.comName = "rename"
this.comName = 'rename'
break
case '5':
this.comName = "establish"
this.comName = 'establish'
break
}
this.qbfsForm = item.qbfsForm || item
if(!this.qbfsForm.LXD || this.qbfsForm.LXD == ''){
if(!this.qbfsForm.LXD || this.qbfsForm.LXD == '') {
this.qbfsForm.LXD = this.qbfsForm.lxd
}
if(!this.qbfsForm.LXDName || this.qbfsForm.LXDName == ''){
if(!this.qbfsForm.LXDName || this.qbfsForm.LXDName == '') {
this.qbfsForm.LXDName = this.qbfsForm.lxdName
}
// this.isTrue = false
@@ -474,7 +546,7 @@ export default {
this.roleForm.dockUserName = item.dockUserName || item.roleForm.dockUserName;
this.roleForm.countersigner = item.countersigner || item.roleForm.countersigner;
this.roleForm.countersignerName = item.countersignerName || item.roleForm.countersignerName;
this.roleForm.approver = item.approver ||item.roleForm.approver;
this.roleForm.approver = item.approver || item.roleForm.approver;
this.roleForm.approverName = item.approverName || item.roleForm.approverName;
this.roleForm.engineer = item.engineer || item.roleForm.engineer;
this.roleForm.engineerName = item.engineerName || item.roleForm.engineerName;
@@ -482,39 +554,39 @@ export default {
this.roleForm.examineName = item.examineName || item.roleForm.examineName;
});
},
handleTabs(name) {
handleTabs (name) {
this.active = name;
this.isWrite = true
},
toggleComName(name) {
toggleComName (name) {
this.qbfsForm = {}
this.comName = name;
if(this.comName === 'merge'){
if(this.comName === 'merge') {
this.toggleType = '1'
}else if(this.comName === 'delay'){
}else if(this.comName === 'delay') {
this.toggleType = '2'
}else if(this.comName === 'cancel'){
}else if(this.comName === 'cancel') {
this.toggleType = '3'
}else if(this.comName === 'rename'){
}else if(this.comName === 'rename') {
this.toggleType = '4'
}else if(this.comName === 'establish'){
}else if(this.comName === 'establish') {
this.toggleType = '5'
this.$refs.childForm.saveEditFile()
}
},
//流程保存
handleSave() {
if(this.approvalFlag){
//被驳回后的保存
// 流程保存
handleSave () {
if(this.approvalFlag) {
// 被驳回后的保存
this.saveLoading = true;
this.isSubmit = true
let qbzxdFrom = this.$refs["childForm"].qbfsForm;
const qbzxdFrom = this.$refs['childForm'].qbfsForm;
qbzxdFrom.type = this.toggleType
qbzxdFrom.commentText = this.commentText
this.saveLoading = true
let _formData = new FormData()
_formData.append("id", this.bpnId || "");
_formData.append("taskIds", this.taskIds);
const _formData = new FormData()
_formData.append('id', this.bpnId || '');
_formData.append('taskIds', this.taskIds);
_formData.append('prcType', '25')
_formData.append('json', JSON.stringify({
roleForm: this.roleForm,
@@ -523,7 +595,7 @@ export default {
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
this.$message.success('保存成功');
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false;
@@ -532,13 +604,13 @@ export default {
this.isSubmit = false
});
}else{
//第一次正常保存
let qbzxdFrom = this.$refs["childForm"].qbfsForm;
// 第一次正常保存
const qbzxdFrom = this.$refs['childForm'].qbfsForm;
qbzxdFrom.type = this.toggleType
this.saveLoading = true
this.isSubmit = true
let _formData = new FormData()
_formData.append("id", this.bpnId || "");
const _formData = new FormData()
_formData.append('id', this.bpnId || '');
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.userName)
_formData.append('prcType', '25')
@@ -559,34 +631,34 @@ export default {
})
}
},
addLog(qbzxdFrom){
let json = Object.assign(qbzxdFrom);
this.$http.post("esRevisePlanLog/log/addLog", {
addLog (qbzxdFrom) {
const json = Object.assign(qbzxdFrom);
this.$http.post('esRevisePlanLog/log/addLog', {
json: JSON.stringify(json)
}, {
_this: this
}, res => {
});
},
//流程提交
handleSubmit() {
if(!this.$refs["childForm"].qbfsForm.type){
this.$refs["childForm"].qbfsForm.type = this.toggleType
// 流程提交
handleSubmit () {
if(!this.$refs['childForm'].qbfsForm.type) {
this.$refs['childForm'].qbfsForm.type = this.toggleType
}
if(this.comFlag === 0){
if(this.comFlag === 0) {
this.$message.warning('企标名称已存在,请更改!')
}else {
if (this.$route.query.prcNum === undefined) {
this.$refs["childForm"].validateForm(()=>{
let qbzxdFrom = this.$refs["childForm"].qbfsForm;
this.$refs["roleForm"].validate((valid) => {
this.$refs['childForm'].validateForm(() => {
const qbzxdFrom = this.$refs['childForm'].qbfsForm;
this.$refs['roleForm'].validate((valid) => {
if (valid) {
this.isSubmit = true;
this.saveLoading = true;
qbzxdFrom.commentText = this.commentText;
qbzxdFrom.addFlag = '0'
let json = Object.assign(qbzxdFrom, this.roleForm);
this.$http.post("lawss/activiti/startProcessRollBack", {
const json = Object.assign(qbzxdFrom, this.roleForm);
this.$http.post('lawss/activiti/startProcessRollBack', {
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '25',
@@ -599,7 +671,7 @@ export default {
_this: this
}, res => {
if (res.ok) {
this.$http.post("lawss/activiti/completeTask", {
this.$http.post('lawss/activiti/completeTask', {
taskIds: res.data,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
@@ -610,15 +682,15 @@ export default {
this.$message.success(res.message);
// this.addLog(qbzxdFrom)
if (this.bpnId !== '' && this.bpnId !== undefined) {
let taskId = {
const taskId = {
id: this.bpnId
}
taskDel(taskId).then(res=>{
taskDel(taskId).then(res => {
return res
})
}
this.isSubmit = false;
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
this.$router.push({ path: '/processCenter?tabsName=ProcessCenter' });
}
this.saveLoading = false;
this.isSubmit = false;
@@ -629,10 +701,9 @@ export default {
}
});
} else {
this.$message.warning("请完善人员信息");
this.$message.warning('请完善人员信息');
}
});
});
// if (flag) {
@@ -641,14 +712,14 @@ export default {
// this.$message.warning("请完善基础信息");
// }
} else {
let flag = this.$refs["childForm"].validateForm(() => {
let qbzxdFrom = this.$refs["childForm"].qbfsForm;
if(this.$route.query.taskInfo == '重新起草'){
const flag = this.$refs['childForm'].validateForm(() => {
const qbzxdFrom = this.$refs['childForm'].qbfsForm;
if(this.$route.query.taskInfo == '重新起草') {
this.isSubmit = true;
this.saveLoading = true;
qbzxdFrom.commentText = this.commentText;
qbzxdFrom.addFlag = '0'
let json = Object.assign(qbzxdFrom, this.roleForm);
const json = Object.assign(qbzxdFrom, this.roleForm);
// this.$http.post("lawss/activiti/startProcessRollBack", {
// createUser: this.$store.getters.userInfo.userId,
// createUserName: this.$store.getters.userInfo.userName,
@@ -662,7 +733,7 @@ export default {
// _this: this
// }, res => {
// if (res.ok) {
this.$http.post("lawss/activiti/completeTask", {
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
@@ -673,16 +744,16 @@ export default {
this.$message.success(res.message);
// this.addLog(qbzxdFrom)
if (this.bpnId !== '' && this.bpnId !== undefined) {
let taskId = {
const taskId = {
id: this.bpnId
}
taskDel(taskId).then(res=>{
taskDel(taskId).then(res => {
return res
})
}
this.isSubmit = false;
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
this.$router.push({ path: '/processCenter?tabsName=ProcessCenter' });
}
this.saveLoading = false;
this.isSubmit = false;
@@ -690,14 +761,14 @@ export default {
// }
// });
}else {
this.$refs["roleForm"].validate((valid) => {
this.$refs['roleForm'].validate((valid) => {
if (valid) {
this.isSubmit = true;
this.saveLoading = true;
qbzxdFrom.commentText = this.commentText;
qbzxdFrom.addFlag = '0'
var json = Object.assign(qbzxdFrom, this.roleForm);
this.$http.post("lawss/activiti/completeTask", {
const json = Object.assign(qbzxdFrom, this.roleForm);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
@@ -708,13 +779,13 @@ export default {
this.$message.success(res.message);
this.isSubmit = false;
// this.addLog(qbzxdFrom)
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
this.$router.push({ path: '/processCenter?tabsName=ProcessCenter' });
}
this.saveLoading = false;
this.isSubmit = false;
});
} else {
this.$message.warning("请完善人员信息");
this.$message.warning('请完善人员信息');
}
});
}
@@ -729,43 +800,43 @@ export default {
}
},
// 流程阶段负责人选择
choiceZRR(type, title, id) {
choiceZRR (type, title, id) {
this.nodeList = [];
this.nodeList.push(id);
this.type = type;
this.drawerTitle = title;
this.modalshowflag = true;
},
checkedRole(data) {
if (this.type === "dockUser") {
checkedRole (data) {
if (this.type === 'dockUser') {
this.roleForm.dockUser = data[0].id;
this.roleForm.dockUserName = data[0].name;
} else if (this.type === "examine") {
} else if (this.type === 'examine') {
this.roleForm.examine = data[0].id;
this.roleForm.examineName = data[0].name;
} else if (this.type === "approver") {
} else if (this.type === 'approver') {
this.roleForm.approver = data[0].id;
this.roleForm.approverName = data[0].name;
} else if (this.type === "engineer") {
} else if (this.type === 'engineer') {
this.roleForm.engineer = data[0].id;
this.roleForm.engineerName = data[0].name;
}
this.modalshowflag = false;
},
choiceZRRS() {
choiceZRRS () {
this.nodeList2 = [];
if (this.roleForm.countersigner.length > 0) {
this.nodeList2 = this.roleForm.countersigner.split(",");
this.nodeList2 = this.roleForm.countersigner.split(',');
}
this.modalshowflag2 = true;
},
checkedRole2(data) {
var idList = "";
var nameList = "";
checkedRole2 (data) {
let idList = '';
let nameList = '';
data.forEach(item => {
if (nameList.length > 0) {
nameList += ",";
idList += ",";
nameList += ',';
idList += ',';
}
idList += item.id;
nameList += item.name;
src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+442 -293
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
+497 -358
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
+43 -34
View File
@@ -2,7 +2,7 @@
<template>
<div class="already-process v-class">
<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">
<el-form-item label="流程名称" class="search-item" @keyup.enter.native="selectProcessBtn">
<el-input
@@ -10,7 +10,7 @@
placeholder="按流程名称查找"
:maxlength="100"
clearable
></el-input>
/>
</el-form-item>
<el-form-item label="流程编号" class="search-item" @keyup.enter.native="selectProcessBtn">
<el-input
@@ -18,7 +18,7 @@
placeholder="按流程编号查找"
:maxlength="100"
clearable
></el-input>
/>
</el-form-item>
<el-form-item label="流程类型" class="search-item" @keyup.enter.native="selectProcessBtn">
<el-select
@@ -29,53 +29,60 @@
>
<el-option
v-for="item in processTypeList"
:value="item.value"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
/>
</el-select>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
v-btn-permission="'2c8041eb6226368ee6e6b975b4aa88f1'"
type="primary"
class="common-button-primary"
size="mini"
v-btn-permission="'2c8041eb6226368ee6e6b975b4aa88f1'"
@click="selectProcessBtn">查询</el-button>
@click="selectProcessBtn"
>
查询
</el-button>
<el-button
v-btn-permission="'4c674bc8b1a21ca17592f1b034444c57'"
class="common-button-default"
size="mini"
v-btn-permission="'4c674bc8b1a21ca17592f1b034444c57'"
@click="resetSelect">清空</el-button>
@click="resetSelect"
>
清空
</el-button>
</el-form-item>
</div>
<div class="search-area-item">
</div>
<div class="search-area-item" />
</el-form>
</div>
<div class="content">
<div class="table-wrap">
<el-table
height="100%"
ref="selection"
height="100%"
:data="processList"
tooltip-effect="dark"
style="width: 100%; flex: auto;"
border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="handleSelectionChange">
@selection-change="handleSelectionChange"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
align="center"
/>
<el-table-column
type="index"
fixed="left"
width="55"
label="序号"
align="center">
align="center"
>
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (pageNo - 1) * pageSize }}
</template>
@@ -85,8 +92,7 @@
label="流程编号"
align="center"
width="150"
>
</el-table-column>
/>
<el-table-column
prop="prcType"
label="流程类型"
@@ -112,8 +118,11 @@
prop="creatUserName"
label="发起人"
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
prop="creatTime"
@@ -137,11 +146,11 @@
</el-table-column>
<el-table-column :label="$t('m.operation')" align="center" width="50">
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
<div style="display: inline-block" @click.stop>
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<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>
</div>
@@ -155,18 +164,19 @@
:page="pageNo"
:total="total"
@pageChange="pageChange"
@pageSizeChange="pageSizeChange"></pagination>
@pageSizeChange="pageSizeChange"
/>
<loading :loading="loading">数据获取中</loading>
</div>
</div>
</template>
<script>
import {mapMutations, mapActions} from 'vuex'
import ProcessMixin from '../../../components/ProcessMixin'
import { mapMutations, mapActions } from 'vuex'
import ProcessMixin from '../../../components/ProcessMixin'
export default {
name: 'AlreadyProcess',
mixins: [ProcessMixin],
mixins: [ ProcessMixin ],
data () {
return {
searchForm: {
@@ -174,11 +184,11 @@ export default {
prcNum: '',
prcType: ''
},
pageSize:this.$store.getters.userInfo.configContent,
pageSize: this.$store.getters.userInfo.configContent,
total: 0,
pageNo: 1,
loading: false,
processList: [],// 列表数据
processList: [], // 列表数据
processListSelect: [], // 列表选中数据
}
},
@@ -190,7 +200,7 @@ export default {
break
}
},
resetSelect () { //清空
resetSelect () { // 清空
this.searchForm.prcName = ''
this.searchForm.prcNum = ''
this.searchForm.prcType = ''
@@ -225,22 +235,21 @@ export default {
this.queryProcess()
},
pageSizeChange (pageSize) { // 数量改变
this.pageSize=pageSize
this.pageSize = pageSize
this.queryProcess()
},
dealWith (row) { // 查看
let routeUrl =this.$router.resolve({
const routeUrl = this.$router.resolve({
name: 'ProcessDetail',
query: {
prcNum: row.prcNum,
tabsName: 'AlreadyProcess'
}
})
window.open(routeUrl.href, "_blank");
window.open(routeUrl.href, '_blank');
},
...mapMutations(['setProcess', 'setHandleInfo']),
...mapActions(['setMenu'])
...mapMutations([ 'setProcess', 'setHandleInfo' ]),
...mapActions([ 'setMenu' ])
},
mounted () {
this.queryProcess()
src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
+44 -35
View File
@@ -2,7 +2,7 @@
<template>
<div class="already-send v-class">
<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">
<el-form-item label="流程名称" class="search-item" @keyup.enter.native="selectProcessBtn">
<el-input
@@ -10,7 +10,7 @@
placeholder="按流程名称查找"
:maxlength="100"
clearable
></el-input>
/>
</el-form-item>
<el-form-item label="流程编号" class="search-item" @keyup.enter.native="selectProcessBtn">
<el-input
@@ -18,7 +18,7 @@
placeholder="按流程编号查找"
:maxlength="100"
clearable
></el-input>
/>
</el-form-item>
<el-form-item label="流程类型" class="search-item" @keyup.enter.native="selectProcessBtn">
<el-select
@@ -29,53 +29,60 @@
>
<el-option
v-for="item in processTypeList"
:value="item.value"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
/>
</el-select>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
v-btn-permission="'253fb387b97868c10434cc8fa3d87294'"
type="primary"
class="common-button-primary"
size="mini"
v-btn-permission="'253fb387b97868c10434cc8fa3d87294'"
@click="selectProcessBtn">查询</el-button>
@click="selectProcessBtn"
>
查询
</el-button>
<el-button
v-btn-permission="'dc9c8efc60be6ba8b78b68bf949e2f6b'"
class="common-button-default"
size="mini"
v-btn-permission="'dc9c8efc60be6ba8b78b68bf949e2f6b'"
@click="resetSelect">清空</el-button>
@click="resetSelect"
>
清空
</el-button>
</el-form-item>
</div>
<div class="search-area-item">
</div>
<div class="search-area-item" />
</el-form>
</div>
<div class="content">
<div class="table-wrap">
<el-table
height="100%"
ref="selection"
height="100%"
:data="processList"
tooltip-effect="dark"
style="width: 100%; flex: auto;"
border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="handleSelectionChange">
@selection-change="handleSelectionChange"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
align="center"
/>
<el-table-column
type="index"
fixed="left"
width="55"
label="序号"
align="center">
align="center"
>
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (pageNo - 1) * pageSize }}
</template>
@@ -85,8 +92,7 @@
label="流程编号"
align="center"
width="150"
>
</el-table-column>
/>
<el-table-column
prop="prcType"
label="流程类型"
@@ -112,8 +118,11 @@
prop="creatUserName"
label="发起人"
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
prop="creatTime"
@@ -137,11 +146,11 @@
</el-table-column>
<el-table-column :label="$t('m.operation')" align="center" width="50">
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
<div style="display: inline-block" @click.stop>
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<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-menu>
</el-dropdown>
@@ -156,18 +165,19 @@
:page="pageNo"
:total="total"
@pageChange="pageChange"
@pageSizeChange="pageSizeChange"></pagination>
@pageSizeChange="pageSizeChange"
/>
<loading :loading="loading">数据获取中</loading>
</div>
</div>
</template>
<script>
import {mapMutations, mapActions} from 'vuex'
import ProcessMixin from '../../../components/ProcessMixin'
import { mapMutations, mapActions } from 'vuex'
import ProcessMixin from '../../../components/ProcessMixin'
export default {
name: 'AlreadySend',
mixins: [ProcessMixin],
mixins: [ ProcessMixin ],
data () {
return {
searchForm: {
@@ -176,10 +186,10 @@ export default {
prcType: ''
},
total: 0,
pageSize:this.$store.getters.userInfo.configContent,
pageSize: this.$store.getters.userInfo.configContent,
pageNo: 1,
loading: false,
processList: [],// 列表数据
processList: [], // 列表数据
processListSelect: [], // 列表选中数据
}
},
@@ -218,7 +228,7 @@ export default {
this.$message.warning('当前流程数据已完成，请选择未完成的流程数据')
}
},
resetSelect () { //清空
resetSelect () { // 清空
this.searchForm.prcName = ''
this.searchForm.prcNum = ''
this.searchForm.prcType = ''
@@ -231,7 +241,7 @@ export default {
size: this.$store.getters.userInfo.configContent,
userId: this.$store.getters.userInfo.userId,
prcName: this.searchForm.prcName,
prcType: parseInt(this.searchForm.prcType) || this.searchForm.prcType ||'',
prcType: parseInt(this.searchForm.prcType) || this.searchForm.prcType || '',
prcNum: this.searchForm.prcNum
},
{
@@ -255,22 +265,21 @@ export default {
this.queryProcess()
},
pageSizeChange (pageSize) { // 数量改变
this.pageSize=pageSize
this.pageSize = pageSize
this.queryProcess()
},
dealWith (row) { // 查看
let routeUrl =this.$router.resolve({
const routeUrl = this.$router.resolve({
name: 'ProcessDetail',
query: {
prcNum: row.prcNum,
tabsName: 'AlreadySend'
}
})
window.open(routeUrl.href, "_blank");
window.open(routeUrl.href, '_blank');
},
...mapMutations(['setProcess', 'setHandleInfo']),
...mapActions(['setMenu'])
...mapMutations([ 'setProcess', 'setHandleInfo' ]),
...mapActions([ 'setMenu' ])
},
mounted () {
this.queryProcess()
src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue
+41 -32
View File
@@ -2,7 +2,7 @@
<template>
<div class="monitor-process v-class">
<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">
<el-form-item label="流程名称" class="search-item" @keyup.enter.native="selectProcessBtn">
<el-input
@@ -10,7 +10,7 @@
placeholder="按流程名称查找"
:maxlength="100"
clearable
></el-input>
/>
</el-form-item>
<el-form-item label="流程编号" class="search-item" @keyup.enter.native="selectProcessBtn">
<el-input
@@ -18,7 +18,7 @@
placeholder="按流程编号查找"
:maxlength="100"
clearable
></el-input>
/>
</el-form-item>
<el-form-item label="流程类型" class="search-item" @keyup.enter.native="selectProcessBtn">
<el-select
@@ -29,53 +29,60 @@
>
<el-option
v-for="item in processTypeList"
:value="item.value"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
/>
</el-select>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
v-btn-permission="'68d17445a13ff3f635c39291070985c3'"
type="primary"
class="common-button-primary"
size="mini"
v-btn-permission="'68d17445a13ff3f635c39291070985c3'"
@click="selectProcessBtn">查询</el-button>
@click="selectProcessBtn"
>
查询
</el-button>
<el-button
v-btn-permission="'2321e6eaaf6d89eb7c36a12aa5624396'"
class="common-button-default"
size="mini"
v-btn-permission="'2321e6eaaf6d89eb7c36a12aa5624396'"
@click="resetSelect">清空</el-button>
@click="resetSelect"
>
清空
</el-button>
</el-form-item>
</div>
<div class="search-area-item">
</div>
<div class="search-area-item" />
</el-form>
</div>
<div class="content">
<div class="table-wrap">
<el-table
height="100%"
ref="selection"
height="100%"
:data="processList"
tooltip-effect="dark"
style="width: 100%; flex: auto;"
border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="handleSelectionChange">
@selection-change="handleSelectionChange"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
align="center"
/>
<el-table-column
type="index"
fixed="left"
width="55"
label="序号"
align="center">
align="center"
>
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (pageNo - 1) * pageSize }}
</template>
@@ -85,8 +92,7 @@
label="流程编号"
align="center"
width="150"
>
</el-table-column>
/>
<el-table-column
prop="prcType"
label="流程类型"
@@ -112,8 +118,11 @@
prop="creatUserName"
label="发起人"
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
prop="creatTime"
@@ -137,7 +146,7 @@
</el-table-column>
<el-table-column :label="$t('m.operation')" align="center" width="50">
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
<div style="display: inline-block" @click.stop>
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
@@ -155,18 +164,19 @@
:page="pageNo"
:total="total"
@pageChange="pageChange"
@pageSizeChange="pageSizeChange"></pagination>
@pageSizeChange="pageSizeChange"
/>
<loading :loading="loading">数据获取中</loading>
</div>
</div>
</template>
<script>
import {mapMutations, mapActions} from 'vuex'
import ProcessMixin from '../../../components/ProcessMixin'
import { mapMutations, mapActions } from 'vuex'
import ProcessMixin from '../../../components/ProcessMixin'
export default {
name: 'MonitorProcess',
mixins: [ProcessMixin],
mixins: [ ProcessMixin ],
data () {
return {
searchForm: {
@@ -175,10 +185,10 @@ export default {
prcType: ''
},
total: 0,
pageSize:this.$store.getters.userInfo.configContent,
pageSize: this.$store.getters.userInfo.configContent,
pageNo: 1,
loading: false,
processList: [],// 列表数据
processList: [], // 列表数据
processListSelect: [], // 列表选中数据
}
},
@@ -190,7 +200,7 @@ export default {
break
}
},
resetSelect () { //清空
resetSelect () { // 清空
this.searchForm.prcName = ''
this.searchForm.prcNum = ''
this.searchForm.prcType = ''
@@ -232,7 +242,7 @@ export default {
this.queryProcess()
},
dealWith (row) { // 查看
let routeUrl =this.$router.resolve({
const routeUrl = this.$router.resolve({
name: 'ProcessDetail',
query: {
bpnId: row.id,
@@ -240,11 +250,10 @@ export default {
tabsName: 'MonitorProcess'
}
})
window.open(routeUrl.href, "_blank");
window.open(routeUrl.href, '_blank');
},
...mapMutations(['setProcess', 'setHandleInfo']),
...mapActions(['setMenu'])
...mapMutations([ 'setProcess', 'setHandleInfo' ]),
...mapActions([ 'setMenu' ])
},
mounted () {
this.queryProcess()
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+6 -2
View File
@@ -123,8 +123,12 @@
prop="creatUserName"
label="发起人"
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
prop="creatTime"
label="创建日期"
src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+5 -1
View File
@@ -123,7 +123,11 @@
prop="creatUserName"
label="发起人"
align="center"
/>
>
<template slot-scope="scope">
<span>{{ scope.row.creatUserName }}({{ scope.row.creatUser || '-' }})</span>
</template>
</el-table-column>
<el-table-column
prop="creatTime"
label="创建日期"
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+8
View File
@@ -4390,6 +4390,10 @@ export default {
this.drawerTitle = title
this.modalShowRoleFlag1 = true
},
unique (newArr) {
const res = new Map();
return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
},
checkedRole2 (data) {
let idList = ''
let nameList = ''
@@ -4411,7 +4415,11 @@ export default {
this.sarBussionessSearch['QCRBUSS'] = nameList
}
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, 'QCDWId', institutionIdList)
this.$set(this.sarBussionessStandEO, 'QCDW', institutionNameList)
if (this.sarBussionessStandEO.QCRBUSS) {
this.$refs.sarBussionessStandForm.validateField('QCRBUSS')
}