修改bug

This commit is contained in:
宋伟佳
2021-08-04 17:25:58 +08:00
parent 0c85334767
commit 2c6cd94f20
5 changed files with 663 additions and 66 deletions
@@ -451,6 +451,8 @@ export default {
listForm: {
standNumber: "", //标准编号
standName: "",//标准名称
XCXSSRQ: "", //新车型实施日期
ZCCSSRQ: "", //在产车实施日期
certifiedEngineer: "", //认证工程师
qualityEngineer: "", //质量工程师
breakdownList: [{
@@ -655,6 +657,7 @@ export default {
if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) {
this.$message.warning("请选择分发责任人");
} else {
this.isSubmit = true
var json = Object.assign(this.listForm, this.roleForm);
this.$refs["listForm"].validate((valid) => {
if (valid) {
@@ -708,9 +711,11 @@ export default {
//选择拆分标准确定事件
OkDrawer() {
if (this.selectedList.length == 1) {
if (this.selectedList.length === 1) {
this.listForm.standNumber = this.selectedList[0].standSortShow + '-' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ;
this.listForm.standName = this.selectedList[0].standName;
this.listForm.XCXSSRQ = this.selectedList[0].xcxssrqgj
this.listForm.ZCCSSRQ = this.selectedList[0].zccssrqgj
this.listForm.id = this.selectedList[0].id;
this.$http.get("SarStandItems/sar-stand-items/findAllItems", {
ids: this.listForm.id,
@@ -57,7 +57,7 @@
</process-title>
<div class="tableTitle">
<div class="tableButton">
<el-button plain class="common-button-primary" size="mini" @click="batchOperation">批量分发落实人</el-button>
<el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发落实人</el-button>
</div>
</div>
<el-table
@@ -116,14 +116,13 @@
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column label="落实人" prop="implementer" align="center">
<el-table-column
label="责任人"
width="170"
align="center">
<template slot-scope="scope">
<div v-if="scope.row.implementer == undefined">
{{ "请选择落实人" }}
</div>
<div v-else class="fileClass">
{{ scope.row.implementer || "-" }}
</div>
<el-input v-model="scope.row.implementerId" style="display: none;"/>
<el-input v-model="scope.row.implementer" placeholder="请选择落实人" @click.native="choiceZRRS(scope.row.implementerId, 1, scope.$index)"/>
</template>
</el-table-column>
</el-table>
@@ -260,6 +259,8 @@ export default {
tabValue: "listOfCountries",
selectedList: [], //选择清单的选择框
selectList: [], //选择标准的选择框
lsIndex: '',
lsType: '',
bringData: [],
commentText: "", //填写会签意见
page: 1,
@@ -346,7 +347,7 @@ export default {
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
console.log(res);
console.log(res.mesg)
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
@@ -355,11 +356,6 @@ export default {
});
});
},
createItemId() {
return Number(Math.random().toString().substr(3,18) + Date.now()).toString(36);
},
/**
* @description: 动态表单读取
*/
@@ -373,7 +369,6 @@ export default {
for (let i = 0; i < item.pepdtos.length; i++) {
for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) {
this.listForm.breakdownList.push({
itemId: this.createItemId(),
itemsName: item.pepdtos[i].breakdownList[j].itemsName,
itemNum: item.pepdtos[i].breakdownList[j].itemsNum,
responsibleEngineer: item.pepdtos[i].breakdownList[j].responsibleEngineer,
@@ -395,46 +390,47 @@ export default {
});
}
}
console.log(this.listForm.breakdownList);
},
//批量操作按钮
batchOperation(id) {
if (this.selectList.length === 0) {
this.$message.warning("请至少选择一条数据进行批量分发");
} else {
this.nodeList = [];
this.nodeList.push(id);
this.modalshowflag = true;
checkedRole (data) {
if (this.type === 1) {
this.listForm.breakdownList[this.lsIndex].implementerId = data[0].id
this.listForm.breakdownList[this.lsIndex].implementer = data[0].name
} else if(this.type === 2) {
this.listForm.breakdownList.forEach( item => {
this.selectList.forEach( items => {
if (item === items) {
item.implementerId = data[0].id
item.implementer = data[0].name
}
})
})
}
},
checkedRole(data) {
// 选取负责人时的操作
let mis = [];
let miss = [];
this.selectList.forEach(item => {
item.implementer = data[0].name;
item.implementerId = data[0].id;
mis.push(item.projectNumber);
miss.push(item.itemNum)
});
this.listForm.breakdownList.forEach(item => {
if (!mis.includes(item.projectNumber) && !miss.includes(item.itemsNum)) {
this.selectList.push(item);
}
});
this.listForm.breakdownList = this.selectList;
this.$refs.selection.clearSelection();
this.modalshowflag = false;
this.modalshowflag = false
},
cancleUserInfo() {
this.modalshowflag = false;
},
choiceZRRS(scope) {
if (scope != null) this.dsadadadsada = scope.$index;
this.nodeList = [];
if (this.roleForm.implementer.length > 0) {
this.nodeList = this.roleForm.implementer.split(",");
choiceZRRS (row, type, index) {
this.type = type
if (type === 1) {
this.drawerTitle = '选择责任人'
this.nodeList = []
this.lsIndex = index
this.lsType = type
this.nodeList.push(row)
this.modalshowflag = true
} else if (type === 2) {
// 批量
if (this.selectList.length > 0) {
this.lsType = type
this.nodeList = []
this.modalshowflag = true
this.drawerTitle = '批量选择责任人'
} else {
this.$message.warning('请选择要分发的数据')
}
}
this.modalshowflag2 = true;
},
getTree() {
this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => {
@@ -0,0 +1,595 @@
<!--项目评估流程 - 分发责任人进行任务分发 -->
<template>
<div class="xmpg-step3">
<ProcessHeader toggle>
<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 style="flex: auto; overflow: auto">
<process-title>
<template slot="title">基础信息</template>
</process-title>
<el-form
:model="listForm"
class="label-input-form prc-content-border"
label-width="150px"
>
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.standNumber"
placeholder="请输入标准编号"
disabled
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.standName"
placeholder="请输入标准名称"
disabled
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
disabled
></el-input>
</el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
disabled
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<process-title>
<template slot="title">填写信息</template>
</process-title>
<div class="tableTitle">
<div class="tableButton">
<el-button plain class="common-button-primary" size="mini" @click="batchOperation">批量分发落实人</el-button>
</div>
</div>
<el-table
ref="multipleTable"
:data="listForm.breakdownList"
tooltip-effect="dark"
style="width: 100%"
border
@selection-change="selectStandChange"
:height="sarProStateTableHeight"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="productLine"
align="center"
label="产品线">
</el-table-column>
<el-table-column
prop="projectNumber"
align="center"
label="项目编号">
</el-table-column>
<el-table-column
prop="projectName"
align="center"
label="项目名称">
</el-table-column>
<el-table-column
prop="itemNum"
align="center"
label="条款号">
</el-table-column>
<el-table-column
prop="itemsName"
align="center"
label="条款名称">
</el-table-column>
<el-table-column
prop="xCXSSRQ"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zCCSSRQ"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column label="落实人" prop="implementer" align="center">
<template slot-scope="scope">
<div v-if="scope.row.implementer == undefined">
{{ "请选择落实人" }}
</div>
<div v-else class="fileClass">
{{ scope.row.implementer || "-" }}
</div>
</template>
</el-table-column>
</el-table>
<!-- 选择责任人-->
<Role-tree
check-box
is-title="选择落实人"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list" style="height: 100%">
<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-save
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
>
</ProcessFooter>
</div>
</template>
<script>
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, queryDetail } from "api/process";
export default {
name: "test",
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle
},
data() {
return {
showColumn: true,
drawerTitle: "", //drawer标题
modalshowflag: false, // drawer开关
modalshowflag2: false,
treeData: [], // 人员数据
nodeList: [],
defaultProps: {
children: "children",
label: "name"
},
detailData: [],
sarProStateTableHeight: null, // 项目列表高度
// 当前流程类型(1待办/2已办)
processType: 1,
sarFlag: true,
loading: false,
// dataList: [],//清单里的标准数据
active: "1",
userId: this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
listType: "country", //选择的清单类型
isSubmit: false,
saveLoading: false,
tabValue: "listOfCountries",
selectedList: [], //选择清单的选择框
selectList: [], //选择标准的选择框
bringData: [],
commentText: "", //填写会签意见
page: 1,
total: 0,
pageSize: this.$store.getters.userInfo.configContent,
listForm: {
passFlag: "1", //1为审批通过 2 为驳回
standNumber: "", //标准编号
standName: "",//标准名称
certifiedEngineer: "", //认证工程师
qualityEngineer: "", //质量工程师
breakdownList: [{ //分解单数据
implementer: "",
implementerId:'',
applyArctic: "",
busStandCover: "",
claimType: "",
id: "",
itemsName: "",
itemsNum: "",
responsibleUnit: "",
standId: "",
svpps: ""
}],
dataList: [{
implementer: "",
implementerId:'',
projectLine: "", //产品线
uname: "",//产品线责任人
distributePerson: "", //分发责任人
distributePersonId: "", //分发责任人id
id: "",
sarStandProjectLibraries: [{
projectManager: "",
projectLevel: "",
projectNumber: "",
projectEndDate: "",
currentNode: "",
projectGroup: "",
productLine: "",
projectClassification: "",
projectStatus: "",
projectStartDate: "",
id: "",
projectName: "",
projectPlatfor: ""
}]
}]
},
roleForm: {
implementer: "",
implementerId: "",
},
choiceForm: {}, //选择标准清单列表
user1: "",
user2: "",
user3: "",
user4: "",
user5: "",
standMap: new Map()
};
},
methods: {
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 => {
});
},
//tab发生变化
handleTabs(name) {
this.active = name;
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
}
}).catch(e => {
});
});
},
createItemId() {
return Number(Math.random().toString().substr(3,18) + Date.now()).toString(36);
},
/**
* @description: 动态表单读取
*/
getFormFieldList(item) {
this.listForm = JSON.parse(JSON.stringify(item));
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm = JSON.parse(JSON.stringify(item.pepdtos[0]));
this.listForm.breakdownList = [];
for (let i = 0; i < item.pepdtos.length; i++) {
for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) {
this.listForm.breakdownList.push({
itemId: this.createItemId(),
itemsName: item.pepdtos[i].breakdownList[j].itemsName,
itemNum: item.pepdtos[i].breakdownList[j].itemsNum,
responsibleEngineer: item.pepdtos[i].breakdownList[j].responsibleEngineer,
responsibleUnit: item.pepdtos[i].breakdownList[j].responsibleUnit,
productLine: item.pepdtos[i].sarStandProjectLibraries.productLine,
projectNumber: item.pepdtos[i].sarStandProjectLibraries.projectNumber,
projectName: item.pepdtos[i].sarStandProjectLibraries.projectName,
implementer: item.pepdtos[i].breakdownList[j].implementer || null,
distributePerson: item.pepdtos[i].distributePerson,
distributePersonId: item.pepdtos[i].distributePersonId,
uname: item.pepdtos[i].uname,
projectManager: item.pepdtos[i].projectManager,
certifiedEngineerName: item.pepdtos[i].certifiedEngineerName,
qualityEngineerName: item.pepdtos[i].qualityEngineerName,
standNumber: item.pepdtos[i].standNumber,
standName: item.pepdtos[i].standName,
xCXSSRQ: item.pepdtos[i].xCXSSRQ,
zCCSSRQ: item.pepdtos[i].zCCSSRQ
});
}
}
},
//批量操作按钮
batchOperation(id) {
if (this.selectList.length === 0) {
this.$message.warning("请至少选择一条数据进行批量分发");
} else {
this.nodeList = [];
this.nodeList.push(id);
this.modalshowflag = true;
}
},
checkedRole(data) {
// 选取负责人时的操作
let mis = [];
let miss = [];
this.selectList.forEach(item => {
item.implementer = data[0].name;
item.implementerId = data[0].id;
mis.push(item.projectNumber);
miss.push(item.itemNum)
});
this.listForm.breakdownList.forEach(item => {
if (!mis.includes(item.projectNumber) && !miss.includes(item.itemsNum)) {
this.selectList.push(item);
}
});
this.listForm.breakdownList = this.selectList;
this.$refs.selection.clearSelection();
this.modalshowflag = false;
},
cancleUserInfo() {
this.modalshowflag = false;
},
choiceZRRS(scope) {
if (scope != null) this.dsadadadsada = scope.$index;
this.nodeList = [];
if (this.roleForm.implementer.length > 0) {
this.nodeList = this.roleForm.implementer.split(",");
}
this.modalshowflag2 = true;
},
getTree() {
this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => {
this.treeData = res.data;
});
},
//保存事件
handleSave() {
},
//提交事件
handleSubmit() {
this.listForm.breakdownList.forEach(item => {
if (item.implementer === null || item.implementer === "" || item.implementer === undefined) {
this.sarFlag = false;
} else {
this.sarFlag = true;
}
});
if (this.sarFlag === true) {
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
this.listForm.zrUserId = this.$store.getters.userInfo.userId;
this.listForm.commentText = this.commentText;
this.listForm.approvalOpinion = "";
this.listForm.signFlag = "";
const json = JSON.stringify(this.listForm.breakdownList);
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");
}
}, e => {
});
} else {
this.$message.warning("请选择落实人");
}
},
drawerCheck(data) {
var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
if (getlist.length == 1) {
this.roleRow = getlist[0];
} else {
this.$refs.tree.setCheckedKeys([data.id]);
this.roleRow = this.$refs.tree.getCheckedNodes()[0];
}
},
//标准表格选择框改变
selectStandChange(data) {
this.selectList = data
},
selectThree() {
},
pageChange(page) {
this.page = page;
this.searchData();
},
pageSizeChange(pageSize) {
this.pageSize = this.$store.getters.userInfo.configContent;
this.searchData();
}
},
computed: {
listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
}
},
mounted() {
this.getTree();
this.processTable();
this.getData();
}
};
</script>
<style lang="less" scoped>
@import '~@/assets/styles/style';
.xmpg-step3 {
/deep/ .el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
.choiceBtn {
.el-button--primary {
width: 150px;
}
}
position: relative;
height: 100%;
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
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;
}
}
.content {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
height: 30px;
line-height: 30px;
position: relative;
font-size: 13px;
font-weight: bold;
.tableButton {
position: absolute;
right: 0;
top: 0;
}
.accessStandardsAndRegulations {
height: 100%;
}
}
}
.demo-drawer-content {
margin-top: 10px;
}
}
</style>
@@ -178,6 +178,7 @@ export default {
let row = {...this.detailData[index]}
row.taskIds = row.id
row.taskInfo = row.name
console.log(row.name)
row.tabsName = this.$route.query.tabsName
let prcType = this.detailData[index].prcType // 流程类型
// 判断当前流程是否已全部办理完成
@@ -205,7 +206,7 @@ export default {
this.toProcessDetail('bzqdfbStep4',row)
}else if (prcType === '5'){
//标准项目合规评估 标准维度
if(row.taskInfo === '标准法规部部长审批'){
if(row.taskInfo === '标准法规部领导审核'){
this.toProcessDetail('xmpgStep7',row)
}else{
this.toProcessDetail('xmpgStep2',row)
@@ -4,22 +4,22 @@
<div class="search-area">
<el-form :inline="true" :model="searchForm" ref="processSearch" class="label-input-form">
<div class="search-area-item">
<el-form-item label="流程名称" class="search-item" @keyup.enter.native="selectProcessBtn">
<el-input
v-model.trim="searchForm.prcName"
placeholder="按流程名称查找"
:maxlength="100"
clearable
></el-input>
</el-form-item>
<el-form-item label="流程编号" class="search-item" @keyup.enter.native="selectProcessBtn">
<el-input
v-model.trim="searchForm.prcNum"
placeholder="按流程编号查找"
:maxlength="100"
clearable
></el-input>
</el-form-item>
<!-- <el-form-item label="流程名称" class="search-item" @keyup.enter.native="selectProcessBtn">-->
<!-- <el-input-->
<!-- v-model.trim="searchForm.prcName"-->
<!-- placeholder="按流程名称查找"-->
<!-- :maxlength="100"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="流程编号" class="search-item" @keyup.enter.native="selectProcessBtn">-->
<!-- <el-input-->
<!-- v-model.trim="searchForm.prcNum"-->
<!-- placeholder="按流程编号查找"-->
<!-- :maxlength="100"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="流程类型" class="search-item" @keyup.enter.native="selectProcessBtn">
<el-select
v-model="searchForm.prcType"