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

This commit is contained in:
super_liu
2021-11-02 18:00:20 +08:00
9 changed files with 1302 additions and 51 deletions
@@ -89,6 +89,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessTitle from "process/components/ProcessTitle";
import ProcessFooter from "process/components/ProcessFooter";
import { queryTaskFirst, saveTaskFirst } from "api/process";
export default {
name: "cywbbzzxdStep1",
@@ -109,6 +110,8 @@ export default {
roleForm: {
prcCreateUserName: this.$store.getters.userInfo.userName,
prcCreateUser: this.$store.getters.userInfo.userId,
firstUserName: this.$store.getters.userInfo.userName,
firstUser: this.$store.getters.userInfo.userId,
dockUser: "",
directorUser: "",
dockUserName: "",
@@ -124,7 +127,21 @@ export default {
},
};
},
mounted() {
this.bpnId = this.$route.query.bpnId
if (this.bpnId !== undefined) {
this.getData()
}
},
methods:{
getData() {
queryTaskFirst({
bpnId: this.$route.query.bpnId
}).then(res => {
let mes = JSON.parse(res.mes)
this.roleForm = mes.roleForm
});
},
choiceZRR(type, title, id) {
this.nodeList = [];
this.nodeList.push(id);
@@ -194,7 +211,23 @@ export default {
},
handleSave(){
this.saveLoading = true;
let _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", "14");
_formData.append("json", JSON.stringify({
taskInfo: '责任部门对接人选择责任人',
roleForm: this.roleForm,
}));
saveTaskFirst(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false;
});
},
},
};
@@ -276,6 +276,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessTitle from "process/components/ProcessTitle";
import ProcessFooter from "process/components/ProcessFooter";
import { inboundLiaisonDetail } from "api/process";
export default {
name: "cywbbzzxdStep3",
@@ -330,7 +331,38 @@ export default {
}]
};
},
mounted() {
this.getData();
this.processTable();
},
methods: {
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId
}).then(res => {
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
}
}).catch(e => {
});
});
},
/**
* @description: 动态表单读取
*/
getFormFieldList(item) {
this.$nextTick(() => {
if(item.wbbzform !== undefined){
this.wbbzform = item.wbbzform
this.participantsData = item.participantsData
}else{
return
}
});
},
//审批历史信息
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
@@ -354,8 +386,23 @@ export default {
handleSave() {
},
//不备案
handleRecord(){
handleRecord() {
let json = {
signFlag: '2',
};
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
});
},
handleSubmit() {
if (this.participantsData.length < 1) {
@@ -370,7 +417,7 @@ export default {
let json = {
participantsData: this.participantsData,
wbbzform: this.wbbzform,
dlFlag: '1',
signFlag: '1',
};
this.$refs["wbbzForm"].validate((valid) => {
if (valid) {
@@ -133,49 +133,21 @@
prop="projectNumber"
label="项目编号"
align="center">
<template slot-scope="scope">
<el-input
v-model="scope.row.projectNumber"
placeholder="请输入项目编号"
>
</el-input>
</template>
</el-table-column>
<el-table-column
prop="projectName"
label="项目名称"
align="center">
<template slot-scope="scope">
<el-input
v-model="scope.row.projectName"
placeholder="请输入项目名称"
>
</el-input>
</template>
</el-table-column>
<el-table-column
prop="expenses"
label="费用支出项"
align="center">
<template slot-scope="scope">
<el-input
v-model="scope.row.expenses"
placeholder="请输入费用支出项"
>
</el-input>
</template>
</el-table-column>
<el-table-column
prop="costBudget"
label="费用预算"
align="center">
<template slot-scope="scope">
<el-input
v-model="scope.row.costBudget"
placeholder="请输入费用预算"
>
</el-input>
</template>
</el-table-column>
</el-table>
</div>
@@ -248,17 +220,26 @@
</div>
</div>
<ProcessFooter
show-save
show-back
show-transfer
show-submit
show-record
:recordLoading="recordLoading"
:submitLoading="isSubmit"
:transfer-loading="isTransfer"
:saveLoading="saveLoading"
@record="handleRecord"
@save="handleSave"
:approval="true"
@back="beforeBack"
@transfer="handleTransfer"
@submit="handleSubmit"
>
</ProcessFooter>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedTransferRole"
:nodeList="nodeList"
></Role-tree>
</div>
</template>
@@ -266,7 +247,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessTitle from "process/components/ProcessTitle";
import ProcessFooter from "process/components/ProcessFooter";
import { inboundLiaisonDetail } from "api/process";
import { changeAssigneeNew, inboundLiaisonDetail } from "api/process";
export default {
name: "cywbbzzxdStep4",
@@ -284,7 +265,11 @@ export default {
recordLoading: false,
saveLoading: false,
loading: false,
drawerModal: false,
isTransfer: false,
drawerTitle: '',
detailData: [], //审批历史信息
nodeList: [],
wbbzform: {
reportingUnit: "",
standNumber: "",
@@ -323,6 +308,7 @@ export default {
},
mounted() {
this.getData();
this.processTable();
},
methods: {
getData() {
@@ -345,6 +331,8 @@ export default {
getFormFieldList(item) {
console.log(item);
this.$nextTick(() => {
this.wbbzform = item.wbbzform
this.participantsData = item.participantsData
});
},
//审批历史信息
@@ -369,11 +357,8 @@ export default {
},
handleSave() {
},
//不备案
handleRecord(){
},
handleSubmit() {
//驳回
beforeBack(){
if (this.participantsData.length < 1) {
this.$message.warning("项目信息不能为空");
} else {
@@ -386,7 +371,7 @@ export default {
let json = {
participantsData: this.participantsData,
wbbzform: this.wbbzform,
dlFlag: '1',
signFlag: '2',
};
this.$refs["wbbzForm"].validate((valid) => {
if (valid) {
@@ -409,6 +394,69 @@ export default {
});
}
},
handleSubmit() {
this.isSubmit = true;
if (this.participantsData.length < 1) {
this.$message.warning("项目信息不能为空");
} else {
this.participantsData.forEach(item => {
if (item.projectNumber === undefined) {
this.$message.warning("请完善项目信息");
}
});
this.wbbzform.commentText = this.commentText;
let json = {
participantsData: this.participantsData,
wbbzform: this.wbbzform,
signFlag: '1',
};
this.$refs["wbbzForm"].validate((valid) => {
if (valid) {
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
});
} else {
return this.$message.warning("请完善基础信息");
}
});
}
},
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
},
//确认转办
checkedTransferRole (data) {
this.assigneeNewLoading = 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
if (res.success) {
this.drawerModal = false
this.$message.success('调整成功')
this.$router.push("/processCenter");
this.processNum()
} else {
this.$message.warning(res.message)
}
})
},
},
computed: {
listNoDataText() {
@@ -0,0 +1,525 @@
<!-- 参与外部标准制修订流程-->
<template>
<div class="wbbz-step1">
<ProcessHeader>
<template slot="proName">参与外部标准制修订信息提报流程</template>
<template slot="proNode">标准法规工程师审核</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '3' ? 'active' : '' " @click="handleTabs('3')">审批历史</div>
</div>
<div class="content" v-show="active === '1'">
<div>
<el-form
ref="wbbzForm"
:model="wbbzform"
:rules="formRules"
class="label-input-form"
label-width="210px"
>
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="prc-content-border" v-if="foldFormFlag">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="提报单位" prop="reportingUnit" class="add-form-item ">
<el-input
v-model="wbbzform.reportingUnit"
placeholder="请输入提报单位"
readonly
clearable>
</el-input>
</el-form-item>
<el-form-item label="标准编号" prop="standNumber" class="add-form-item ">
<el-input
v-model="wbbzform.standNumber"
readonly
placeholder="请输入标准编号"
clearable>
</el-input>
</el-form-item>
<el-form-item label="主持或参与" prop="hostOrTask" class="add-form-item ">
<el-input
v-model="wbbzform.hostOrTask"
readonly
placeholder="请选择主持或参与"
clearable>
</el-input>
</el-form-item>
<el-form-item label="参与人" prop="participants" class="add-form-item ">
<el-input
v-model="wbbzform.participants"
readonly
placeholder="请选择参与人"
clearable>
</el-input>
</el-form-item>
<el-form-item label="标准制定机构" prop="standMechanism" class="add-form-item ">
<el-input
v-model="wbbzform.standMechanism"
placeholder="请选择标准制定机构"
readonly
clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="参与时间" prop="partakeTime" class="add-form-item form-item-disabled">
<el-input
v-model="wbbzform.partakeTime"
readonly
placeholder="请选择参与时间"
clearable>
</el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item ">
<el-input
v-model="wbbzform.standName"
placeholder="请输入标准名称"
readonly
clearable>
</el-input>
</el-form-item>
<el-form-item label="标准类型" prop="standType" class="add-form-item ">
<el-input
v-model="wbbzform.standType"
readonly
placeholder="请选择标准类型"
clearable>
</el-input>
</el-form-item>
<el-form-item label="标准制修订" prop="standRevise" class="add-form-item ">
<el-input
v-model="wbbzform.standRevise"
readonly
placeholder="请选择标准制修订"
clearable>
</el-input>
</el-form-item>
<el-form-item label="标准(拟)发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
<el-input
v-model="wbbzform.releaseTime"
readonly
placeholder="请选择标准(拟)发布时间"
clearable>
</el-input>
</el-form-item>
</el-col>
</el-row>
</div>
<el-button style="width: 100%" :icon="foldFormFlag ? 'el-icon-caret-top' : 'el-icon-caret-bottom'"
@click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }}
</el-button>
</el-form>
<ProcessTitle>
<template slot="title">项目信息</template>
</ProcessTitle>
<div class="tableTitle">
<div class="tableButton">
</div>
</div>
<el-table border
ref="selection"
:data="participantsData"
tooltip-effect="dark"
style="width: 100%;"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
row-key="id">
<el-table-column type="selection" width="55" align="center" />
<el-table-column
prop="projectNumber"
label="项目编号"
align="center">
</el-table-column>
<el-table-column
prop="projectName"
label="项目名称"
align="center">
</el-table-column>
<el-table-column
prop="expenses"
label="费用支出项"
align="center">
</el-table-column>
<el-table-column
prop="costBudget"
label="费用预算"
align="center">
</el-table-column>
</el-table>
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
<el-table
height="100%"
ref="selection"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:no-data-text="listNoDataText"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<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="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="endTime"
label="完成时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="comment"
label="流程信息"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.commentText }}</span>
</template>
</el-table-column>
<el-table-column
prop="completeFlag"
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
</template>
</el-table-column>
</el-table>
<loading :loading="loading">流程列表加载中</loading>
</div>
</div>
<ProcessFooter
show-back
show-transfer
show-submit
:submitLoading="isSubmit"
:transfer-loading="isTransfer"
:saveLoading="saveLoading"
:approval="true"
@back="beforeBack"
@transfer="handleTransfer"
@submit="handleSubmit"
>
</ProcessFooter>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedTransferRole"
:nodeList="nodeList"
></Role-tree>
</div>
</template>
<script>
import ProcessHeader from "../../components/ProcessHeader";
import ProcessTitle from "process/components/ProcessTitle";
import ProcessFooter from "process/components/ProcessFooter";
import { changeAssigneeNew, inboundLiaisonDetail } from "api/process";
export default {
name: "cywbbzzxdStep5",
components: {
ProcessHeader,
ProcessTitle,
ProcessFooter
},
data() {
return {
//切换tab
active: "1",
foldFormFlag: true,
isSubmit: false,
recordLoading: false,
saveLoading: false,
isTransfer: false,
loading: false,
drawerModal: false,
drawerTitle: '',
nodeList: [],
detailData: [], //审批历史信息
wbbzform: {
reportingUnit: "",
standNumber: "",
hostOrTask: "",
participants: "",
standMechanism: "",
partakeTime: "",
standName: "",
standType: "",
standRevise: "",
releaseTime: ""
},
formRules: {
reportingUnit: [
{ required: true, message: "请输入提报单位", trigger: "change" }
]
},
participantsData: [],
// participantsData: [{
// projectNumber: '',
// projectName: '',
// expenses: '',
// costBudget:'',
// }], //参与人表格信息
associationOptions: [{
value: "选项1",
label: "1"
}, {
value: "选项2",
label: "2"
}, {
value: "选项3",
label: "3"
}]
};
},
mounted() {
this.getData();
this.processTable();
},
methods: {
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId
}).then(res => {
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
}
}).catch(e => {
});
});
},
/**
* @description: 动态表单读取
*/
getFormFieldList(item) {
console.log(item);
this.$nextTick(() => {
this.wbbzform = item.wbbzform
this.participantsData = item.participantsData
});
},
//审批历史信息
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum,
sortWord: this.shunxu ? this.paixu : "",
shunxu: this.shunxu
}, {
loading: "loading",
_this: this
}, res => {
this.detailData = res;
}, e => {
});
},
handleTabs(type) {
this.active = type;
},
foldForm() {
this.foldFormFlag = !this.foldFormFlag;
},
handleSave() {
},
//驳回
beforeBack(){
if (this.participantsData.length < 1) {
this.$message.warning("项目信息不能为空");
} else {
this.participantsData.forEach(item => {
if (item.projectNumber === undefined) {
this.$message.warning("请完善项目信息");
}
});
this.wbbzform.commentText = this.commentText;
let json = {
participantsData: this.participantsData,
wbbzform: this.wbbzform,
signFlag: '2',
};
this.$refs["wbbzForm"].validate((valid) => {
if (valid) {
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
});
} else {
return this.$message.warning("请完善基础信息");
}
});
}
},
handleSubmit() {
this.isSubmit = true
if (this.participantsData.length < 1) {
this.$message.warning("项目信息不能为空");
} else {
this.participantsData.forEach(item => {
if (item.projectNumber === undefined) {
this.$message.warning("请完善项目信息");
}
});
this.wbbzform.commentText = this.commentText;
let json = {
participantsData: this.participantsData,
wbbzform: this.wbbzform,
signFlag: '1',
};
this.$refs["wbbzForm"].validate((valid) => {
if (valid) {
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
});
} else {
return this.$message.warning("请完善基础信息");
}
});
}
},
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
},
//确认转办
checkedTransferRole (data) {
this.assigneeNewLoading = 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
if (res.success) {
this.drawerModal = false
this.$message.success('调整成功')
this.$router.push("/processCenter");
this.processNum()
} else {
this.$message.warning(res.message)
}
})
},
},
computed: {
listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
}
}
};
</script>
<style lang="less" scoped>
.wbbz-step1 {
height: 100%;
position: relative;
.content {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
overflow: auto;
.form-select {
display: flex;
}
.tableTitle {
margin-bottom: 10px;
height: 30px;
line-height: 30px;
position: relative;
font-size: 13px;
font-weight: bold;
.tableButton {
position: absolute;
right: 0;
top: 0;
}
}
}
.headerTabs {
display: flex;
align-items: center;
position: absolute;
height: 52px;
top: 0;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
}
</style>
@@ -0,0 +1,525 @@
<!-- 参与外部标准制修订流程-->
<template>
<div class="wbbz-step1">
<ProcessHeader>
<template slot="proName">参与外部标准制修订信息提报流程</template>
<template slot="proNode">标准法规部部长审核</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '3' ? 'active' : '' " @click="handleTabs('3')">审批历史</div>
</div>
<div class="content" v-show="active === '1'">
<div>
<el-form
ref="wbbzForm"
:model="wbbzform"
:rules="formRules"
class="label-input-form"
label-width="210px"
>
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="prc-content-border" v-if="foldFormFlag">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="提报单位" prop="reportingUnit" class="add-form-item ">
<el-input
v-model="wbbzform.reportingUnit"
placeholder="请输入提报单位"
readonly
clearable>
</el-input>
</el-form-item>
<el-form-item label="标准编号" prop="standNumber" class="add-form-item ">
<el-input
v-model="wbbzform.standNumber"
readonly
placeholder="请输入标准编号"
clearable>
</el-input>
</el-form-item>
<el-form-item label="主持或参与" prop="hostOrTask" class="add-form-item ">
<el-input
v-model="wbbzform.hostOrTask"
readonly
placeholder="请选择主持或参与"
clearable>
</el-input>
</el-form-item>
<el-form-item label="参与人" prop="participants" class="add-form-item ">
<el-input
v-model="wbbzform.participants"
readonly
placeholder="请选择参与人"
clearable>
</el-input>
</el-form-item>
<el-form-item label="标准制定机构" prop="standMechanism" class="add-form-item ">
<el-input
v-model="wbbzform.standMechanism"
placeholder="请选择标准制定机构"
readonly
clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="参与时间" prop="partakeTime" class="add-form-item form-item-disabled">
<el-input
v-model="wbbzform.partakeTime"
readonly
placeholder="请选择参与时间"
clearable>
</el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item ">
<el-input
v-model="wbbzform.standName"
placeholder="请输入标准名称"
readonly
clearable>
</el-input>
</el-form-item>
<el-form-item label="标准类型" prop="standType" class="add-form-item ">
<el-input
v-model="wbbzform.standType"
readonly
placeholder="请选择标准类型"
clearable>
</el-input>
</el-form-item>
<el-form-item label="标准制修订" prop="standRevise" class="add-form-item ">
<el-input
v-model="wbbzform.standRevise"
readonly
placeholder="请选择标准制修订"
clearable>
</el-input>
</el-form-item>
<el-form-item label="标准(拟)发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
<el-input
v-model="wbbzform.releaseTime"
readonly
placeholder="请选择标准(拟)发布时间"
clearable>
</el-input>
</el-form-item>
</el-col>
</el-row>
</div>
<el-button style="width: 100%" :icon="foldFormFlag ? 'el-icon-caret-top' : 'el-icon-caret-bottom'"
@click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }}
</el-button>
</el-form>
<ProcessTitle>
<template slot="title">项目信息</template>
</ProcessTitle>
<div class="tableTitle">
<div class="tableButton">
</div>
</div>
<el-table border
ref="selection"
:data="participantsData"
tooltip-effect="dark"
style="width: 100%;"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
row-key="id">
<el-table-column type="selection" width="55" align="center" />
<el-table-column
prop="projectNumber"
label="项目编号"
align="center">
</el-table-column>
<el-table-column
prop="projectName"
label="项目名称"
align="center">
</el-table-column>
<el-table-column
prop="expenses"
label="费用支出项"
align="center">
</el-table-column>
<el-table-column
prop="costBudget"
label="费用预算"
align="center">
</el-table-column>
</el-table>
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
<el-table
height="100%"
ref="selection"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:no-data-text="listNoDataText"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<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="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="endTime"
label="完成时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="comment"
label="流程信息"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.commentText }}</span>
</template>
</el-table-column>
<el-table-column
prop="completeFlag"
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
</template>
</el-table-column>
</el-table>
<loading :loading="loading">流程列表加载中</loading>
</div>
</div>
<ProcessFooter
show-back
show-transfer
show-submit
:submitLoading="isSubmit"
:transfer-loading="isTransfer"
:saveLoading="saveLoading"
:approval="true"
@back="beforeBack"
@transfer="handleTransfer"
@submit="handleSubmit"
>
</ProcessFooter>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedTransferRole"
:nodeList="nodeList"
></Role-tree>
</div>
</template>
<script>
import ProcessHeader from "../../components/ProcessHeader";
import ProcessTitle from "process/components/ProcessTitle";
import ProcessFooter from "process/components/ProcessFooter";
import { changeAssigneeNew, inboundLiaisonDetail } from "api/process";
export default {
name: "cywbbzzxdStep6",
components: {
ProcessHeader,
ProcessTitle,
ProcessFooter
},
data() {
return {
//切换tab
active: "1",
foldFormFlag: true,
isSubmit: false,
recordLoading: false,
saveLoading: false,
isTransfer: false,
loading: false,
drawerModal: false,
drawerTitle: '',
nodeList: [],
detailData: [], //审批历史信息
wbbzform: {
reportingUnit: "",
standNumber: "",
hostOrTask: "",
participants: "",
standMechanism: "",
partakeTime: "",
standName: "",
standType: "",
standRevise: "",
releaseTime: ""
},
formRules: {
reportingUnit: [
{ required: true, message: "请输入提报单位", trigger: "change" }
]
},
participantsData: [],
// participantsData: [{
// projectNumber: '',
// projectName: '',
// expenses: '',
// costBudget:'',
// }], //参与人表格信息
associationOptions: [{
value: "选项1",
label: "1"
}, {
value: "选项2",
label: "2"
}, {
value: "选项3",
label: "3"
}]
};
},
mounted() {
this.getData();
this.processTable();
},
methods: {
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId
}).then(res => {
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
}
}).catch(e => {
});
});
},
/**
* @description: 动态表单读取
*/
getFormFieldList(item) {
console.log(item);
this.$nextTick(() => {
this.wbbzform = item.wbbzform
this.participantsData = item.participantsData
});
},
//审批历史信息
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum,
sortWord: this.shunxu ? this.paixu : "",
shunxu: this.shunxu
}, {
loading: "loading",
_this: this
}, res => {
this.detailData = res;
}, e => {
});
},
handleTabs(type) {
this.active = type;
},
foldForm() {
this.foldFormFlag = !this.foldFormFlag;
},
handleSave() {
},
//驳回
beforeBack(){
if (this.participantsData.length < 1) {
this.$message.warning("项目信息不能为空");
} else {
this.participantsData.forEach(item => {
if (item.projectNumber === undefined) {
this.$message.warning("请完善项目信息");
}
});
this.wbbzform.commentText = this.commentText;
let json = {
participantsData: this.participantsData,
wbbzform: this.wbbzform,
bzFlag: '2',
};
this.$refs["wbbzForm"].validate((valid) => {
if (valid) {
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
});
} else {
return this.$message.warning("请完善基础信息");
}
});
}
},
handleSubmit() {
this.isSubmit = true
if (this.participantsData.length < 1) {
this.$message.warning("项目信息不能为空");
} else {
this.participantsData.forEach(item => {
if (item.projectNumber === undefined) {
this.$message.warning("请完善项目信息");
}
});
this.wbbzform.commentText = this.commentText;
let json = {
participantsData: this.participantsData,
wbbzform: this.wbbzform,
bzFlag: '1',
};
this.$refs["wbbzForm"].validate((valid) => {
if (valid) {
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
});
} else {
return this.$message.warning("请完善基础信息");
}
});
}
},
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
},
//确认转办
checkedTransferRole (data) {
this.assigneeNewLoading = 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
if (res.success) {
this.drawerModal = false
this.$message.success('调整成功')
this.$router.push("/processCenter");
this.processNum()
} else {
this.$message.warning(res.message)
}
})
},
},
computed: {
listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
}
}
};
</script>
<style lang="less" scoped>
.wbbz-step1 {
height: 100%;
position: relative;
.content {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
overflow: auto;
.form-select {
display: flex;
}
.tableTitle {
margin-bottom: 10px;
height: 30px;
line-height: 30px;
position: relative;
font-size: 13px;
font-weight: bold;
.tableButton {
position: absolute;
right: 0;
top: 0;
}
}
}
.headerTabs {
display: flex;
align-items: center;
position: absolute;
height: 52px;
top: 0;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
}
</style>
@@ -126,7 +126,7 @@
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" placeholder="选择署名人领导"
@click.native="choiceZRR('dockUser'), '选择署名人领导', roleForm.dockUser">
@click.native="choiceZRR('dockUser', '选择署名人领导', roleForm.dockUser)">
</el-input>
</div>
</el-form-item>
@@ -140,7 +140,7 @@
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
<el-input v-model="roleForm.ministerUserName" placeholder="选择标准法规部部长"
@click.native="choiceZRR('ministerUser'), '选择标准法规部部长', roleForm.ministerUser" ></el-input>
@click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -423,6 +423,10 @@ export default {
ProcessTitle
},
mounted() {
this.bpnId = this.$route.query.bpnId
if (this.bpnId !== undefined) {
this.getDatas()
}
this.getStandData()
this.getData()
//从数据库中查询下拉框数据
@@ -436,6 +440,16 @@ export default {
})
},
methods: {
getDatas(){
queryTaskFirst({
bpnId: this.$route.query.bpnId
}).then(res => {
let mes = JSON.parse(res.mes)
this.roleForm = mes.roleForm
this.dataList = mes.dataList
this.commentText = mes.commentText
});
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
@@ -618,7 +632,7 @@ export default {
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.userName)
_formData.append('prcType', '8')
_formData.append('prcType', '16')
_formData.append('json', JSON.stringify({
roleForm: this.roleForm,
dataList: this.dataList,
@@ -929,6 +929,28 @@ export default {
prcType: row.prcType
}
})
} else if(row.taskInfo === '标准法规工程师审核'){
this.$router.push({
name: 'cywbbzzxdStep5',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
} else if(row.taskInfo === '标准法规部部长批准'){
this.$router.push({
name: 'cywbbzzxdStep6',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
}
break
case '15':
@@ -409,6 +409,16 @@ export default {
}
})
break
case '14':
this.$router.push({
name: 'cywbbzzxdStep1',
query: {
type: '14',
processName: '参与外部标准制修订信息提报流程',
bpnId: id
}
})
break
case '15':
if(mes !== null && mes.taskInfo !== null){
if (mes.taskInfo === '备案任务下发') {
@@ -432,13 +442,22 @@ export default {
})
}
}else{
this.$router.push({
name: 'jrbzhxhStep1',
query: {
type: '15',
processName: '加入标准化协会信息提报流程',
bpnId: id
}
})
}
break
case '16':
this.$router.push({
name: 'jrbzhxhStep1',
name: 'wbsmStep1',
query: {
type: '15',
processName: '加入标准化协会信息提报流程',
type: '16',
processName: '外部署名推荐审批流程',
bpnId: id
}
})
+18
View File
@@ -1195,6 +1195,24 @@ const routes = [
title: '参与外部标准制修订信息提报流程'
}
},
{
path: '/cywbbzzxdStep5',
name: 'cywbbzzxdStep5',
component: () => import('@/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue'),
meta: {
requireAuth: true,
title: '参与外部标准制修订信息提报流程'
}
},
{
path: '/cywbbzzxdStep6',
name: 'cywbbzzxdStep6',
component: () => import('@/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue'),
meta: {
requireAuth: true,
title: '参与外部标准制修订信息提报流程'
}
},
{
path: '/jrbzhxhStep1',
name: 'jrbzhxhStep1',