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

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

Browse Source
This commit is contained in:
fanlin
2021-07-24 13:42:47 +08:00
parent a3d029a624 a09dd2a796
commit 72e1376193
9 changed files with 245 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+13
View File
@@ -0,0 +1,13 @@
<template>
</template>
<script>
export default {
name: "xmpg2Step10"
};
</script>
<style scoped>
</style>
src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+13
View File
@@ -0,0 +1,13 @@
<template>
</template>
<script>
export default {
name: "xmpg2Step11"
};
</script>
<style scoped>
</style>
src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+13
View File
@@ -0,0 +1,13 @@
<template>
</template>
<script>
export default {
name: "xmpg2Step12"
};
</script>
<style scoped>
</style>
src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+54 -50
View File
@@ -48,12 +48,12 @@
<el-table
:data="dataList"
style="width: 100%"
row-key= "standId"
row-key="standId"
height="70%"
border
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
fontWeight: 'bold', height: '48px'}"
>
<el-table-column
type="selection"
@@ -61,7 +61,7 @@
align="center">
</el-table-column>
<el-table-column
prop="standId"
prop="standEnName"
label="标准编号"
>
</el-table-column>
@@ -70,6 +70,16 @@
label="标准名称"
>
</el-table-column>
<el-table-column
prop="itemsNum"
label="条款号"
>
</el-table-column>
<el-table-column
prop="itemsName"
label="条款名称"
>
</el-table-column>
<el-table-column label="责任人" prop="workPeople" align="center">
<template slot-scope="scope">
<div v-if="scope.row.workPeople == undefined">
@@ -211,7 +221,7 @@ export default {
projectNumber: "", //项目编号
projectName: "", //项目名称
dataList: [], //项目下的标准数据
children: [], //标准下的分解单数据
children: [] //标准下的分解单数据
},
dataList: [], //展示的标准数据
commentText: "", //审批意见
@@ -222,13 +232,6 @@ export default {
};
},
methods: {
// load(tree, treeNode, resolve) {
// setTimeout(() => {
// resolve(
// this.listForm.children
// )
// }, 1000)
// },
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum,
@@ -271,34 +274,32 @@ export default {
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.dataList = item.dataList;
this.dataList.distributePerson = item.dataList[0].distributePerson;
this.listForm.breakdownList = item.breakdownList;
this.listForm.children = item.breakdownList;
let children = []
let children = [];
item.breakdownList.forEach(
item => {
let aa = {
key: item.standId,
id:item.id,
standId:'条款号: '+ item.itemsNum,
standName:'条款名称: '+ item.itemsName,
workPeople: '请选择责任人'
}
children.push(aa)
id: item.id,
standId: item.itemsNum,
itemsNum: item.itemsNum,
itemsName: item.itemsName,
workPeople: "请选择责任人"
};
children.push(aa);
}
)
);
this.dataList.forEach(key => {
key['children'] = []
key["children"] = [];
children.forEach(breakDown => {
if (key.standId === breakDown.key) {
key['children'].push(breakDown)
key["children"].push(breakDown);
}
})
if( key['children'].length === 0) {
delete key['children']
});
if (key["children"].length === 0) {
delete key["children"];
}
})
console.log(this.dataList)
});
console.log(this.dataList);
this.listForm.children = children;
});
},
@@ -333,7 +334,6 @@ export default {
},
//批量分发按钮
batchOperation(id) {
console.log(this.selectList);
if (this.selectList.length === 0) {
this.$message.warning("请至少选择一条数据进行批量分发");
} else {
@@ -367,28 +367,32 @@ export default {
this.selectList.forEach(item => {
item.workPeople = data[0].name;
item.workPeopleId = data[0].id;
mis2.set(item.standId,item)
if (item.children !== undefined ){
item.children.forEach(items =>{
deposit.set(items.standId,items)
})
if (item.children !== undefined) {
item.children.forEach(items => {
deposit.set(items.standId, items);
});
}
mis2.set(item.standId, item);
});
this.dataList.forEach(item => {
if (undefined !== mis2.get(item.standId)) {
if (undefined !== item.children) {
item.children.forEach(i => {
i.workPeopleId = undefined;
i.workPeople = undefined;
});
}
} else {
if (item.children !== undefined) {
item.children.forEach(items => {
if (undefined !== deposit.get(items.standId)) {
items = deposit.get(items.standId);
}
});
}
}
});
this.dataList.forEach(item => {
if (undefined!==mis2.get(item.standId)){
item=deposit.get(item.standId)
} else {
if (item.children !== undefined && mis2.get(item.standId)===undefined) {
item.children.forEach(items => {
if (undefined !== deposit.get(items.standId)) {
items = deposit.get(items.standId)
}
})
}
}
});
console.log(this.dataList);
// this.dataList = this.selectList;
this.$refs.selection.clearSelection();
this.modalshowflag = false;
},
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+59 -80
View File
@@ -2,7 +2,7 @@
<div class="xmpg-step3">
<ProcessHeader toggle>
<template slot="proName">项目合规评估流程-项目</template>
<template slot="proNode">责任人填写评估反馈</template>
<template slot="proNode">选择分发责任人</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -42,29 +42,34 @@
</process-title>
<el-table
:data="dataList"
border
ref="selection"
style="width: 100%; border: 1px solid #cccccc"
row-key="standId"
height="70%"
style="width: 100%; border:1px solid #ccc"
border
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
fontWeight: 'bold', height: '48px'}"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="standId"
prop="standEnName"
label="标准编号"
width="180"
fixed="left"
align="center"
width="200"
label="标准编号">
>
</el-table-column>
<el-table-column
prop="standName"
fixed="left"
width="180"
align="center"
width="200"
label="标准名称">
label="标准名称"
>
</el-table-column>
<el-table-column
prop="itemNum"
@@ -220,13 +225,6 @@
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="implementer"
label="落实人">
</el-table-column>
</el-table>
</div>
</div>
@@ -306,14 +304,6 @@
@submit="handleSubmit"
>
</ProcessFooter>
<!-- 选择责任人-->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
</div>
</template>
@@ -345,22 +335,34 @@ export default {
selectList: [],
treeData: [], // 人员数据
roleForm: {
liablePeople: ""
workPeople: ""
},
itemFlag: true,
peopleFlag: true,
nodeList: [],
defaultProps: {
children: "children",
label: "name"
},
complianceReasons:'',
zcComplianceReasons:'',
//表单的数据
listForm: {
projectNumber: "", //项目编号
projectName: "", //项目名称
dataList: [], //项目下的标准数据
children: [], //标准下的分解单数据
dataList: [
{
complianceReasons:'',
zcComplianceReasons:'',
}
], //项目下的标准数据
children: [] //标准下的分解单数据
},
dataList: [], //展示的标准数据
dataList: [
{
complianceReasons:'',
zcComplianceReasons:'',
}
], //展示的标准数据
commentText: "", //审批意见
detailData: [], //流程历史数据
userId: this.$store.getters.userInfo.userId,
@@ -410,10 +412,33 @@ export default {
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
console.log(item.dataList);
this.dataList = item.dataList;
this.dataList.distributePerson = item.dataList[0].distributePerson;
this.listForm.breakdownList = item.breakdownList;
let children = [];
item.breakdownList.forEach(
item => {
let aa = {
key: item.standId,
id: item.id,
standId: item.itemsNum,
itemsNum: item.itemsNum,
itemsName: item.itemsName,
workPeople: "请选择责任人"
};
children.push(aa);
}
);
this.dataList.forEach(key => {
key["children"] = [];
children.forEach(breakDown => {
if (key.standId === breakDown.key) {
key["children"].push(breakDown);
}
});
if (key["children"].length === 0) {
delete key["children"];
}
});
this.listForm.children = children;
});
},
//保存事件
@@ -423,7 +448,7 @@ export default {
//提交事件
handleSubmit() {
this.listForm.dataList.forEach(item => {
if (item.liablePeople !== undefined) {
if (item.workPeople !== undefined) {
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
console.log(json);
@@ -445,17 +470,6 @@ export default {
}
});
},
//批量操作按钮
batchOperation(id) {
console.log(this.selectList);
if (this.selectList.length === 0) {
this.$message.warning("请至少选择一条数据进行批量分发");
} else {
this.nodeList = [];
this.nodeList.push(id);
this.modalshowflag = true;
}
},
//标准表格选择框改变
selectStandChange(data) {
this.selectList = data;
@@ -474,26 +488,6 @@ export default {
this.roleRow = this.$refs.tree.getCheckedNodes()[0];
}
},
checkedRole(data) {
// 选取负责人时的操作
let mis = [];
this.selectList.forEach(item => {
item.liablePeople = data[0].name;
item.liablePeopleId = data[0].id;
mis.push(item.standId);
});
this.dataList.forEach(item => {
if (!mis.includes(item.standId)) {
this.selectList.push(item);
}
});
this.dataList = this.selectList;
this.$refs.selection.clearSelection();
this.modalshowflag = false;
},
cancleUserInfo() {
this.modalshowflag = false;
}
},
computed: {
listNoDataText() {
@@ -558,24 +552,9 @@ export default {
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 {
src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+13
View File
@@ -0,0 +1,13 @@
<template>
</template>
<script>
export default {
name: "xmpg2Step7"
};
</script>
<style scoped>
</style>
src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+13
View File
@@ -0,0 +1,13 @@
<template>
</template>
<script>
export default {
name: "xmpg2Step8"
};
</script>
<style scoped>
</style>
src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+13
View File
@@ -0,0 +1,13 @@
<template>
</template>
<script>
export default {
name: "xmpg2Step9"
};
</script>
<style scoped>
</style>
src/router/index.js
+54
View File
@@ -402,6 +402,60 @@ const routes = [
title: '项目合规评估流程-项目'
}
},
{
path: '/xmpg2Step7',
name: 'xmpg2Step7',
component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step7.vue'),
meta: {
requireAuth: true,
title: '项目合规评估流程-项目'
}
},
{
path: '/xmpg2Step8',
name: 'xmpg2Step8',
component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step8.vue'),
meta: {
requireAuth: true,
title: '项目合规评估流程-项目'
}
},
{
path: '/xmpg2Step9',
name: 'xmpg2Step9',
component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step9.vue'),
meta: {
requireAuth: true,
title: '项目合规评估流程-项目'
}
},
{
path: '/xmpg2Step10',
name: 'xmpg2Step10',
component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step10.vue'),
meta: {
requireAuth: true,
title: '项目合规评估流程-项目'
}
},
{
path: '/xmpg2Step11',
name: 'xmpg2Step11',
component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step11.vue'),
meta: {
requireAuth: true,
title: '项目合规评估流程-项目'
}
},
{
path: '/xmpg2Step12',
name: 'xmpg2Step12',
component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step12.vue'),
meta: {
requireAuth: true,
title: '项目合规评估流程-项目'
}
},
{
path: '/wfhxzgStep1',
name: 'wfhxzgStep1',