Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
super_liu
2021-12-22 18:07:01 +08:00
18 changed files with 831 additions and 518 deletions
@@ -656,6 +656,12 @@
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
>关联条款
</el-button>
<el-button
size="mini"
type="primary"
class="common-button-primary"
@click="editResolveList"
>编辑</el-button>
</div>
<div class="content">
<el-table
@@ -668,13 +674,14 @@
:height="tableHeight"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@select="select"
@selection-change="selectAllStand">
<!-- <el-table-column-->
<!-- type="selection"-->
<!-- fixed="left"-->
<!-- width="60"-->
<!-- >-->
<!-- </el-table-column>-->
<el-table-column
type="selection"
fixed="left"
width="60"
>
</el-table-column>
<el-table-column
sortable="custom"
show-overflow-tooltip
@@ -796,6 +803,168 @@
<!-- @pageSizeChange="pageSizeChange"></pagination>-->
</el-drawer>
<!-- 编辑分解单的条款-->
<el-drawer
title="编辑"
:visible.sync="editResolveListShowflag"
class="label-input-form"
:before-close="resetEditResolveListForm"
size="800px"
:wrapperClosable="false"
>
<el-form :model="resolveListForm" ref="resolveListForm">
<el-input
v-show="false"
v-model="resolveListForm.id"
/>
<el-form-item
label="条款号"
class="add-form-item"
>
<el-input
style="width: 45%"
v-model="resolveListForm.itemsNum"
disabled
/>
</el-form-item>
<el-form-item
label="条款名称"
class="add-form-item"
>
<el-input
style="width: 45%"
v-model="resolveListForm.itemsName"
disabled
/>
</el-form-item>
<el-form-item
label="条款内容"
class="add-form-item"
>
<el-input
style="width: 45%"
v-model="resolveListForm.termsConditions"
disabled
/>
</el-form-item>
<el-form-item
label="核心技术要求/变化点"
class="add-form-item"
>
<el-input
style="width: 45%"
v-model="resolveListForm.readContent"
clearable
/>
</el-form-item>
<el-form-item
label="基于上一版本差异"
class="add-form-item"
>
<el-input
style="width: 45%"
v-model="resolveListForm.comparedWithPrevious"
clearable
/>
</el-form-item>
<el-form-item
label="新车型实施日期(文本)"
class="add-form-item"
>
<el-date-picker
type="dates"
value-format="yyyy-MM-dd"
style="width: 45%"
v-model="resolveListForm.xccssrq"
placeholder="选择一个或多个日期">
</el-date-picker>
<!-- <el-input-->
<!-- style="width: 45%"-->
<!-- v-model.trim="resolveListForm.xccssrq"-->
<!-- clearable-->
<!-- />-->
</el-form-item>
<el-form-item
label="在产车实施日期(文本)"
class="add-form-item"
>
<el-date-picker
type="dates"
value-format="yyyy-MM-dd"
style="width: 45%"
v-model="resolveListForm.zccssrq"
placeholder="选择一个或多个日期">
</el-date-picker>
<!-- <el-input-->
<!-- style="width: 45%"-->
<!-- v-model.trim="resolveListForm.zccssrq"-->
<!-- clearable-->
<!-- />-->
</el-form-item>
<el-form-item
label="适用车型"
class="add-form-item"
>
<el-input
style="width: 45%"
v-model="resolveListForm.applyArctic"
clearable
/>
</el-form-item>
<el-form-item
label="责任工程师"
class="add-form-item"
>
<el-input
style="width: 45%"
v-model="resolveListForm.dutyEngineer"
clearable
/>
</el-form-item>
<el-form-item
label="符合性状态"
class="add-form-item"
>
<template>
<el-radio v-model="resolveListForm.complianceRequire" label="1">符合</el-radio>
<el-radio v-model="resolveListForm.complianceRequire" label="2">不符合</el-radio>
</template>
<!-- <el-input-->
<!-- style="width: 45%"-->
<!-- v-model="resolveListForm.complianceRequire"-->
<!-- clearable-->
<!-- />-->
</el-form-item>
<el-form-item
label="合规性分析"
class="add-form-item"
>
<el-input
style="width: 45%"
v-model="resolveListForm.complianceState"
clearable
/>
</el-form-item>
</el-form>
<div id="roleFormButton" class="demo-drawer-footer">
<el-button
type="primary"
class="common-button-primary"
size="mini"
:loading="editLoading"
icon="el-icon-check"
@click="saveEditInfo"
>提交</el-button
>
<el-button
size="mini"
icon="el-icon-close"
class="common-button-default"
@click="resetEditResolveListForm"
>取消</el-button
>
</div>
</el-drawer>
<!--新增标准条款-->
<el-drawer
:title="itemModalTitle"
@@ -1597,6 +1766,22 @@ export default {
BZFGGXOUIUJ: [], // 企标覆盖关系
itemModalTitle: '',
modalItemaddShowflag: false,
editResolveListShowflag: false,
resolveListForm:{
id:'',
itemsNum:'',
itemsName:'',
termsConditions:'',
readContent:'',
comparedWithPrevious:'',
xccssrq:'',
zccssrq:'',
applyArctic:'',
dutyEngineer:'',
complianceRequire:'',
complianceState:'',
},
editLoading:false,
itemAddOrUPdateFlag: '',
itemFormdisableflag: false, // 查看标准条款不可编辑
recommendList: [],
@@ -2312,12 +2497,54 @@ export default {
})
this.modalItemaddShowflag = false
},
select(selection, row) {
// 清除 所有勾选项
this.$refs.multipleTable.clearSelection()
// 当表格数据都没有被勾选的时候 就返回
// 主要用于将当前勾选的表格状态清除
if(selection.length === 0) return
this.$refs.multipleTable.toggleRowSelection(row, true)
},
selectAllStand(alldata) {
this.selectedItemList = []
for (let i = 0; i < alldata.length; i++) {
this.selectedItemList.push(alldata[i].id)
this.selectedItemList.push(alldata[alldata.length - 1])
console.log('2333',this.selectedItemList)
},
editResolveList(){
console.log('2337',this.selectedItemList)
if (this.selectedItemList.length>0){
this.editResolveListShowflag = true
let editItem = JSON.parse(JSON.stringify(this.selectedItemList[0]))
this.resolveListForm = editItem
this.resolveListForm.termsConditions = this.resolveListForm.termsConditions?this.resolveListForm.termsConditions.replace(/<.*?>/ig, ' '):''
// this.resolveListForm.readContent = this.readContent?this.readContent.replace(/<.*?>/ig, ' '):''
}else {
this.$message.warning('请选择一条数据')
}
},
saveEditInfo(){
console.log('2530',this.resolveListForm)
this.resolveListForm.xccssrq = this.resolveListForm.xccssrq.join(',')
this.resolveListForm.zccssrq = this.resolveListForm.zccssrq.join(',')
this.$http.putData(
'SarStandItems/sar-stand-items/updateSarItemAndInterpretation',
this.resolveListForm,
{
_this: this,
},
(res) => {
console.log(res)
if (res.ok){
this.$message.success('修改成功')
this.resetEditResolveListForm()
this.showItemsModel()
}
}
)
},
resetEditResolveListForm(){
this.editResolveListShowflag = false
},
// 分页点击后方法
pageChange(page) {
this.standItemSearch.page = page
@@ -3298,6 +3525,16 @@ export default {
<style lang="less" scoped>
@import '~@/assets/styles/mixins';
@import '~@/assets/styles/style';
/deep/.el-icon-circle-close:before{
margin-left: 300px;
}
/deep/.label-input-form .add-form-item .el-form-item__content .el-input .el-input__inner{
width: 650px;
margin-left: 20px;
}
/deep/.label-input-form .add-form-item .el-form-item__label{
width: 150px;
}
/deep/.el-collapse-item__header {
border-bottom: none !important;
}
@@ -168,7 +168,7 @@
<el-table
height="100%"
ref="selection"
:data="histortData"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
@@ -1,6 +1,6 @@
<!-- 加入标准化协会信息备案流程-->
<template>
<div class="phoneGrbzhxhStep3 phoneBox">
<div class="phoneJrbzhxhStep3 phoneBox">
<ProcessHeaderPhone toggle>
<template slot="proName">加入标准化协会备案流程</template>
<template slot="proNode">标准法规工程师审核</template>
@@ -16,7 +16,7 @@
:model="wbbzform"
:rules="formRules"
class="label-input-form"
label-width="210px"
label-width="150px"
>
<ProcessTitle>
<template slot="title">基础信息</template>
@@ -198,7 +198,7 @@
</el-table>
</div>
<el-collapse accordion>
<el-collapse-item title="回执说明">
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
@@ -215,7 +215,7 @@
<el-table
height="100%"
ref="selection"
:data="histortData"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
@@ -273,6 +273,7 @@
</el-table>
</div>
<ProcessFooter
show-transfer
show-back
show-submit
:submitLoading="isSubmit"
@@ -299,19 +300,24 @@
@checkedRole="checkedTransferRole"
:nodeList="nodeList"
></Role-tree>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
<script>
import { Dialog } from 'vant';
import ProcessHeaderPhone from '../../components/ProcessHeaderPhone'
import ProcessHeaderPhone from "../../components/ProcessHeaderPhone";
import ProcessHeader from "../../components/ProcessHeader";
import ProcessTitle from "process/components/ProcessTitle";
import ProcessFooter from "process/components/ProcessFooter";
import { changeAssigneeNew,inboundLiaisonDetail } from "api/process";
import { changeAssigneeNew, inboundLiaisonDetail } from "api/process";
export default {
name: "phoneGrbzhxhStep3",
name: "phoneJrbzhxhStep3",
components: {
ProcessHeader,
ProcessTitle,
@@ -320,6 +326,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: "",
//切换tab
active: "1",
foldFormFlag: true,
@@ -329,7 +338,7 @@ export default {
loading: false,
modalshowflag: false,
drawerModal: false,
drawerTitle: '',
drawerTitle: "",
nodeList: [],
fileList:[],
commentText: '',
@@ -544,21 +553,42 @@ export default {
}
}
},
//流程转办
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
//转办按钮
handleTransfer() {
this.phoneshowflag = true;
this.phoneRoleList = this.roleTransfer;
this.phoneDrawerTitle = "转办处理人";
},
//确认转办
drawerCheck(data) {
this.roleTransfer = data;
this.phoneRoleList = this.roleTransfer;
this.turnLoading = true;
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
if (res.success) {
this.turnLoading = false;
this.$message.success("调整成功");
this.$router.push("/processCenter");
} else {
this.$message.warning(res.message);
}
});
this.modalshowflag = false;
},
//流程提交
handleSubmit() {
this.isSubmit = true
this.wbbzform.signFlag = '1',
this.isSubmit = true;
this.wbbzform.signFlag = "1",
this.wbbzform.passUser = this.$store.getters.userInfo.userId,
this.wbbzform.commentText = this.commentText;
this.wbbzform.participantsData = this.participantsData
this.wbbzform.associationData = this.associationData
var json = JSON.stringify( this.wbbzform)
this.wbbzform.participantsData = this.participantsData;
this.wbbzform.associationData = this.associationData;
var json = JSON.stringify(this.wbbzform);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
@@ -576,29 +606,33 @@ export default {
});
},
//流程驳回
beforeBack(){
this.isSubmit = true
this.wbbzform.signFlag = '0',
this.wbbzform.passUser = this.$store.getters.userInfo.userId,
this.wbbzform.commentText = this.commentText;
this.wbbzform.participantsData = this.participantsData
this.wbbzform.associationData = this.associationData
var json = JSON.stringify( this.wbbzform)
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
}, e => {
beforeBack() {
if (!this.commentText) {
this.$message.warning("请填写审批意见");
} else {
this.isSubmit = true;
this.wbbzform.signFlag = "0",
this.wbbzform.passUser = this.$store.getters.userInfo.userId,
this.wbbzform.commentText = this.commentText;
this.wbbzform.participantsData = this.participantsData;
this.wbbzform.associationData = this.associationData;
var json = JSON.stringify(this.wbbzform);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false;
}, e => {
});
});
}
},
},
mounted() {
@@ -615,7 +649,7 @@ export default {
<style lang="less" scoped>
@import '~@/assets/styles/phone';
.phoneGrbzhxhStep3 {
.phoneJrbzhxhStep3 {
/deep/.van-dialog__content {
min-height: 300px;
padding: 10px;
@@ -1,6 +1,6 @@
<!-- 加入标准化协会信息备案流程-->
<template>
<div class="phoneGrbzhxhStep4 phoneBox">
<div class="phoneJrbzhxhStep4 phoneBox">
<ProcessHeaderPhone toggle>
<template slot="proName">加入标准化协会备案流程</template>
<template slot="proNode">标准法规工程师审核</template>
@@ -16,7 +16,7 @@
:model="wbbzform"
:rules="formRules"
class="label-input-form"
label-width="210px"
label-width="150px"
>
<ProcessTitle>
<template slot="title">基础信息</template>
@@ -198,7 +198,7 @@
</el-table>
</div>
<el-collapse accordion>
<el-collapse-item title="回执说明">
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
@@ -215,7 +215,7 @@
<el-table
height="100%"
ref="selection"
:data="histortData"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
@@ -273,6 +273,7 @@
</el-table>
</div>
<ProcessFooter
show-transfer
show-back
show-submit
:submitLoading="isSubmit"
@@ -299,6 +300,12 @@
@checkedRole="checkedTransferRole"
:nodeList="nodeList"
></Role-tree>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -311,7 +318,7 @@ import ProcessFooter from "process/components/ProcessFooter";
import { changeAssigneeNew,inboundLiaisonDetail } from "api/process";
export default {
name: "phoneGrbzhxhStep4",
name: "phoneJrbzhxhStep4",
components: {
ProcessHeader,
ProcessTitle,
@@ -320,6 +327,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
//切换tab
active: "1",
foldFormFlag: true,
@@ -529,11 +539,32 @@ export default {
}
}
},
//流程转办
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res =>{
if (res.success) {
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
//流程提交
handleSubmit() {
@@ -600,7 +631,7 @@ export default {
<style lang="less" scoped>
@import '~@/assets/styles/phone';
.phoneGrbzhxhStep4 {
.phoneJrbzhxhStep4 {
/deep/.van-dialog__content {
min-height: 300px;
padding: 10px;
+151 -147
View File
@@ -10,130 +10,132 @@
<div class="headerTabsItem" :class="active === '3' ? 'active' : '' " @click="handleTabs('3')">审批历史</div>
</div>
<div class="content" v-show="active === '1'">
<div>
<el-form
ref="qbfsForm"
:model="qbfsForm"
:rules="formRules"
class="label-input-form"
label-width="150px"
>
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<div style="overflow: auto">
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<el-collapse-transition>
<div class="prc-content-border" v-if="foldFormFlag">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="企标编号" prop="entNumber" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.entNumber"
placeholder="请输入企标编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="中文名称" prop="cnName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.cnName"
placeholder="请输入中文名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.enName"
placeholder="请输入英文名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="企标类别" prop="entCategory" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.entCategory"
placeholder="请输入企标类别"
clearable
></el-input>
</el-form-item>
<el-form-item label="代替企标编号" prop="replaceNumber" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.replaceNumber"
placeholder="请输入代替企标编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="下一步状态" prop="nextStatus" class="add-form-item ">
<el-select v-model="qbfsForm.nextStatus" placeholder="请选择下一步状态">
<el-option
v-for="item in associationOptions"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="被代替企标编号" prop="replacedNumber" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.replacedNumber"
placeholder="请输入被代替企标编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="发布日期" prop="releaseDate" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.releaseDate"
placeholder="请输入发布日期"
clearable
></el-input>
</el-form-item>
<el-form-item label="实施日期" prop="implementDate" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.implementDate"
placeholder="请输入实施日期"
clearable
></el-input>
</el-form-item>
<el-form-item label="复审日期" prop="reviewDate" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.reviewDate"
placeholder="请输入复审日期"
clearable
></el-input>
</el-form-item>
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
<div class="file-box" v-if="fileList.length > 0">
<p v-for="item in fileList"
:key="item.id"> {{ item.oldFileName }}
<i
title="下载"
@click="downloadFile(item.id)"
class="icon-download"
v-btn-permission="''"
/>
<i
title="下载带水印"
@click="downloadFileByWater(item.id, item.name)"
class="icon-download2"
v-btn-permission="''"
/>
</p>
</div>
<div v-else>
暂无数据
</div>
</el-form-item>
<el-form-item class="add-form-item ">
</el-form-item>
</el-col>
</el-row>
<el-form
ref="qbfsForm"
:model="qbfsForm"
:rules="formRules"
class="label-input-form"
label-width="150px"
>
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="企标编号" prop="entNumber" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.entNumber"
placeholder="请输入企标编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="中文名称" prop="cnName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.cnName"
placeholder="请输入中文名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.enName"
placeholder="请输入英文名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="企标类别" prop="entCategory" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.entCategory"
placeholder="请输入企标类别"
clearable
></el-input>
</el-form-item>
<el-form-item label="代替企标编号" prop="replaceNumber" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.replaceNumber"
placeholder="请输入代替企标编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="下一步状态" prop="nextStatus" class="add-form-item ">
<el-select v-model="qbfsForm.nextStatus" placeholder="请选择下一步状态">
<el-option
v-for="item in associationOptions"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="被代替企标编号" prop="replacedNumber" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.replacedNumber"
placeholder="请输入被代替企标编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="发布日期" prop="releaseDate" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.releaseDate"
placeholder="请输入发布日期"
clearable
></el-input>
</el-form-item>
<el-form-item label="实施日期" prop="implementDate" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.implementDate"
placeholder="请输入实施日期"
clearable
></el-input>
</el-form-item>
<el-form-item label="复审日期" prop="reviewDate" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.reviewDate"
placeholder="请输入复审日期"
clearable
></el-input>
</el-form-item>
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
<div class="file-box" v-if="fileList.length > 0">
<p v-for="item in fileList"
:key="item.id"> {{ item.oldFileName }}
<i
title="下载"
@click="downloadFile(item.id)"
class="icon-download"
v-btn-permission="''"
/>
<i
title="下载带水印"
@click="downloadFileByWater(item.id, item.name)"
class="icon-download2"
v-btn-permission="''"
/>
</p>
</div>
<div v-else>
暂无数据
</div>
</el-form-item>
<el-form-item class="add-form-item ">
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</el-form>
</el-collapse-transition>
<el-button style="width: 100%" :icon=" foldFormFlag ? 'el-icon-caret-top': 'el-icon-caret-bottom'" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
<ProcessTitle>
<template slot="title">审核信息</template>
@@ -141,7 +143,7 @@
<el-table
:data="dataList"
border
height="52%"
height="100%"
style="width: 100%;"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
@@ -180,7 +182,7 @@
<el-table
height="100%"
ref="selection"
:data="histortData"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
@@ -248,14 +250,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -277,6 +277,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
active: "1",
isTransfer: false,
isSubmit: false,
@@ -419,31 +422,32 @@ export default {
foldForm() {
this.foldFormFlag = !this.foldFormFlag;
},
//转办事件
handleTransfer() {
this.drawerModal = true;
this.drawerTitle = "转办处理人";
this.selectPeople = row;
//转办按钮
handleTransfer(){
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
checkedRole(data) {
this.assigneeNewLoading = true;
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false;
}).then(res =>{
if (res.success) {
this.drawerModal = false;
this.$message.success("调整成功");
this.$router.push("/processCenter");
this.processNum();
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message);
this.$message.warning(res.message)
}
});
})
this.modalshowflag = false
},
// 请求转换流程图
processNum(row) {
@@ -183,14 +183,6 @@
@submit="handleSubmit"
>
</ProcessFooter>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedRoles"
:nodeList="nodeList"
></Role-tree>
<!-- 选择责任人-->
<Role-tree
:is-title="drawerTitle"
@@ -198,6 +190,12 @@
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -219,6 +217,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
active: '1',
fileList: [],
commentText: '',
@@ -345,31 +346,32 @@ export default {
}, e => {
});
},
//转办事件
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
checkedRoles (data) {
this.assigneeNewLoading = true
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false
}).then(res =>{
if (res.success) {
this.drawerModal = false
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter");
this.processNum()
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
// 请求转换流程图
processNum (row) {
@@ -319,14 +319,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -349,6 +347,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
active: "1",
isTransfer: false,
isSubmit: false,
@@ -502,31 +503,32 @@ export default {
foldForm() {
this.foldFormFlag = !this.foldFormFlag;
},
//转办事件
handleTransfer() {
this.drawerModal = true;
this.drawerTitle = "转办处理人";
this.selectPeople = row;
//转办按钮
handleTransfer(){
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
checkedRole(data) {
this.assigneeNewLoading = true;
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false;
}).then(res =>{
if (res.success) {
this.drawerModal = false;
this.$message.success("调整成功");
this.$router.push("/processCenter");
this.processNum();
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message);
this.$message.warning(res.message)
}
});
})
this.modalshowflag = false
},
// 请求转换流程图
processNum(row) {
@@ -319,14 +319,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -349,6 +347,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
active: "1",
isTransfer: false,
isSubmit: false,
@@ -502,31 +503,32 @@ export default {
foldForm() {
this.foldFormFlag = !this.foldFormFlag;
},
//转办事件
handleTransfer() {
this.drawerModal = true;
this.drawerTitle = "转办处理人";
this.selectPeople = row;
//转办按钮
handleTransfer(){
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
checkedRole(data) {
this.assigneeNewLoading = true;
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false;
}).then(res =>{
if (res.success) {
this.drawerModal = false;
this.$message.success("调整成功");
this.$router.push("/processCenter");
this.processNum();
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message);
this.$message.warning(res.message)
}
});
})
this.modalshowflag = false
},
// 请求转换流程图
processNum(row) {
@@ -319,14 +319,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -349,6 +347,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
active: "1",
isTransfer: false,
isSubmit: false,
@@ -502,31 +503,32 @@ export default {
foldForm() {
this.foldFormFlag = !this.foldFormFlag;
},
//转办事件
handleTransfer() {
this.drawerModal = true;
this.drawerTitle = "转办处理人";
this.selectPeople = row;
//转办按钮
handleTransfer(){
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
checkedRole(data) {
this.assigneeNewLoading = true;
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false;
}).then(res =>{
if (res.success) {
this.drawerModal = false;
this.$message.success("调整成功");
this.$router.push("/processCenter");
this.processNum();
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message);
this.$message.warning(res.message)
}
});
})
this.modalshowflag = false
},
// 请求转换流程图
processNum(row) {
@@ -249,14 +249,12 @@
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedTransferRole"
:nodeList="nodeList"
></Role-tree>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -278,6 +276,9 @@ export default {
},
data(){
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
active: '1',
type: '',
commentText: '',
@@ -339,31 +340,32 @@ export default {
handleTabs(name){
this.active = name
},
//转办事件
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
checkedRole (data) {
this.assigneeNewLoading = true
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false
}).then(res =>{
if (res.success) {
this.drawerModal = false
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter");
this.processNum()
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
// 请求转换流程图
processNum (row) {
@@ -242,21 +242,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedTransferRole"
:nodeList="nodeList"
></Role-tree>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -278,6 +269,9 @@ export default {
},
data(){
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
active: '1',
type: '',
commentText: '',
@@ -339,31 +333,32 @@ export default {
handleTabs(name){
this.active = name
},
//转办事件
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
checkedRole (data) {
this.assigneeNewLoading = true
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false
}).then(res =>{
if (res.success) {
this.drawerModal = false
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter");
this.processNum()
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
// 请求转换流程图
processNum (row) {
@@ -242,21 +242,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedTransferRole"
:nodeList="nodeList"
></Role-tree>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -278,6 +269,9 @@ export default {
},
data(){
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
active: '1',
type: '',
commentText: '',
@@ -339,31 +333,32 @@ export default {
handleTabs(name){
this.active = name
},
//转办事件
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
checkedRole (data) {
this.assigneeNewLoading = true
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false
}).then(res =>{
if (res.success) {
this.drawerModal = false
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter");
this.processNum()
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
// 请求转换流程图
processNum (row) {
@@ -242,21 +242,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedTransferRole"
:nodeList="nodeList"
></Role-tree>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -278,6 +269,9 @@ export default {
},
data(){
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
active: '1',
type: '',
commentText: '',
@@ -339,31 +333,32 @@ export default {
handleTabs(name){
this.active = name
},
//转办事件
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
checkedRole (data) {
this.assigneeNewLoading = true
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false
}).then(res =>{
if (res.success) {
this.drawerModal = false
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter");
this.processNum()
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
// 请求转换流程图
processNum (row) {
@@ -146,6 +146,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -168,6 +174,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
passInfo: 0,
detailData: [],
loading: false,
@@ -396,9 +405,30 @@ export default {
},
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res =>{
if (res.success) {
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
// 流程阶段负责人选择
choiceZRR (type, title, id) {
@@ -408,42 +438,6 @@ export default {
this.drawerTitle = title
this.modalshowflag = true
},
drawerCheck (data) {
if (this.drawerTitle === '转办处理人') {
this.turnLoading = true
changeAssigneeNew({
taskId: this.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.userId, // 委托人
pId: this.pId // 流程实例
}).then(res =>{
if (res.success) {
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
} else {
this.roleRow = data[0]
// 选取负责人时的操作
if (this.multipleSelection.length === 0) {
this.rowDutyPeople.dutyPeopleInfo = this.roleRow.name
this.rowDutyPeople.dutyPeopleInfoId = this.roleRow.id
}else {
this.multipleSelection.forEach(item => {
item.dutyPeopleInfo = this.roleRow.name
item.dutyPeopleInfoId = this.roleRow.id
})
this.$refs.multipleTable.clearSelection()
}
this.lastDataList = this.dataList
// 选取流程信息完成
// this.roleForm.dutyUserInfoName = this.roleRow.name
}
this.modalshowflag = false
},
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
@@ -146,6 +146,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -168,6 +174,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
passInfo: 0,
detailData: [],
loading: false,
@@ -396,9 +405,30 @@ export default {
},
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res =>{
if (res.success) {
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
// 流程阶段负责人选择
choiceZRR (type, title, id) {
@@ -408,42 +438,6 @@ export default {
this.drawerTitle = title
this.modalshowflag = true
},
drawerCheck (data) {
if (this.drawerTitle === '转办处理人') {
this.turnLoading = true
changeAssigneeNew({
taskId: this.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.userId, // 委托人
pId: this.pId // 流程实例
}).then(res =>{
if (res.success) {
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
} else {
this.roleRow = data[0]
// 选取负责人时的操作
if (this.multipleSelection.length === 0) {
this.rowDutyPeople.dutyPeopleInfo = this.roleRow.name
this.rowDutyPeople.dutyPeopleInfoId = this.roleRow.id
}else {
this.multipleSelection.forEach(item => {
item.dutyPeopleInfo = this.roleRow.name
item.dutyPeopleInfoId = this.roleRow.id
})
this.$refs.multipleTable.clearSelection()
}
this.lastDataList = this.dataList
// 选取流程信息完成
// this.roleForm.dutyUserInfoName = this.roleRow.name
}
this.modalshowflag = false
},
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
@@ -146,6 +146,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -168,6 +174,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
passInfo: 0,
detailData: [],
loading: false,
@@ -396,9 +405,30 @@ export default {
},
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res =>{
if (res.success) {
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
// 流程阶段负责人选择
choiceZRR (type, title, id) {
@@ -408,42 +438,6 @@ export default {
this.drawerTitle = title
this.modalshowflag = true
},
drawerCheck (data) {
if (this.drawerTitle === '转办处理人') {
this.turnLoading = true
changeAssigneeNew({
taskId: this.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.userId, // 委托人
pId: this.pId // 流程实例
}).then(res =>{
if (res.success) {
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
} else {
this.roleRow = data[0]
// 选取负责人时的操作
if (this.multipleSelection.length === 0) {
this.rowDutyPeople.dutyPeopleInfo = this.roleRow.name
this.rowDutyPeople.dutyPeopleInfoId = this.roleRow.id
}else {
this.multipleSelection.forEach(item => {
item.dutyPeopleInfo = this.roleRow.name
item.dutyPeopleInfoId = this.roleRow.id
})
this.$refs.multipleTable.clearSelection()
}
this.lastDataList = this.dataList
// 选取流程信息完成
// this.roleForm.dutyUserInfoName = this.roleRow.name
}
this.modalshowflag = false
},
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
@@ -262,6 +262,12 @@
@submit="handleSubmit"
>
</ProcessFooter>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -284,6 +290,9 @@ export default {
},
data() {
return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
//折叠的标志,true为折叠,false为不折叠
foldFormFlag: false,
lawInfoTableLoading: true,
@@ -403,11 +412,32 @@ export default {
this.processStep = window.URL.createObjectURL(res.data)
})
},
//转办事件
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
this.phoneshowflag = true
this.phoneRoleList = this.roleTransfer
this.phoneDrawerTitle = '转办处理人'
},
//确认转办
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res =>{
if (res.success) {
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
},
// 将文本状态的id与name对应
setMap(data) {
+4 -4
View File
@@ -2256,8 +2256,8 @@ const routes = [
}
},
{
path: '/phoneGrbzhxhStep3',
name: 'phoneGrbzhxhStep3',
path: '/phoneJrbzhxhStep3',
name: 'phoneJrbzhxhStep3',
component: () => import('@/pages/processCenter/pages/phone/jrbzhxh/step3.vue'),
meta: {
isBoolean: true,
@@ -2266,8 +2266,8 @@ const routes = [
}
},
{
path: '/phoneGrbzhxhStep4',
name: 'phoneGrbzhxhStep4',
path: '/phoneJrbzhxhStep4',
name: 'phoneJrbzhxhStep4',
component: () => import('@/pages/processCenter/pages/phone/jrbzhxh/step4.vue'),
meta: {
isBoolean: true,