From 16f24d0ed3476843c8a66f3d305fd865a0064a2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 25 Jan 2022 16:54:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0=E6=B5=81?=
=?UTF-8?q?=E7=A8=8B=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/home2/components/todoList/index.vue | 37 +-
.../pages/creatProcess/bzpg/step3.vue | 3 +
.../pages/creatProcess/bzpg/step4.vue | 151 ++-
.../pages/creatProcess/bzpg/step5.vue | 1003 ++++++++++++++++-
.../pages/creatProcess/bzpg/step6.vue | 13 +
.../pages/creatProcess/bzpg/step7.vue | 13 +
.../pages/creatProcess/bzpg/step8.vue | 13 +
.../tabComponents/processCenter/index.vue | 27 +-
src/router/index.js | 27 +
9 files changed, 1251 insertions(+), 36 deletions(-)
create mode 100644 src/pages/processCenter/pages/creatProcess/bzpg/step6.vue
create mode 100644 src/pages/processCenter/pages/creatProcess/bzpg/step7.vue
create mode 100644 src/pages/processCenter/pages/creatProcess/bzpg/step8.vue
diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue
index 4a4a57122..1e10f3f57 100644
--- a/src/pages/home2/components/todoList/index.vue
+++ b/src/pages/home2/components/todoList/index.vue
@@ -630,11 +630,11 @@ export default {
})
}
break
- //项目合规评估流程
+ //标准合规评估
case '5' :
- if(row.taskInfo === '标准法规部业务经理审批'){
+ if(row.taskInfo === '审核(标准法规业务经理)'){
this.$router.push({
- name: 'xmpgStep2',
+ name: 'bzpgStep2',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
@@ -643,9 +643,9 @@ export default {
prcType: row.prcType
}
})
- }else if(row.taskInfo === '标准评估任务下发'){
+ }else if(row.taskInfo === '项目分发(项目群负责人/标准法规工程师)'){
this.$router.push({
- name: 'xmpgStep3',
+ name: 'bzpgStep3',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
@@ -654,9 +654,9 @@ export default {
prcType: row.prcType
}
})
- }else if(row.taskInfo === '合规性评估'){
+ }else if(row.taskInfo === '任务分发(项目经理)'){
this.$router.push({
- name: 'xmpgStep4',
+ name: 'bzpgStep4',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
@@ -665,9 +665,9 @@ export default {
prcType: row.prcType
}
})
- }else if(row.taskInfo === '分发责任人审核'){
+ }else if(row.taskInfo === '合规评估(专业技术人员)'){
this.$router.push({
- name: 'xmpgStep5',
+ name: 'bzpgStep5',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
@@ -676,9 +676,9 @@ export default {
prcType: row.prcType
}
})
- }else if(row.taskInfo === '汇总审核'){
+ }else if(row.taskInfo === '审核(项目经理)'){
this.$router.push({
- name: 'xmpgStep6',
+ name: 'bzpgStep6',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
@@ -687,9 +687,20 @@ export default {
prcType: row.prcType
}
})
- }else if(row.taskInfo === '标准法规部领导审核'){
+ }else if(row.taskInfo === '审定(项目群负责人)'){
this.$router.push({
- name: 'xmpgStep7',
+ name: 'bzpgStep7',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }else if(row.taskInfo === '批准(标准法规部高级经理)'){
+ this.$router.push({
+ name: 'bzpgStep8',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
index a5a596550..6564f6a57 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
@@ -453,6 +453,9 @@ export default {
_this: this
}, res => {
this.breakdownList = res.data
+ this.breakdownList.map(item => {
+ delete item.termsConditions
+ })
})
});
},
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue
index 505953b26..b3ec93312 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue
@@ -79,13 +79,30 @@
填写信息
+
+
+
+
+
-
+
查看条款内容
@@ -153,8 +169,17 @@
prop="zccssrq"
align="center"
width="160px"
- label="在产车实施日期">
-
+ label="在产车实施日期"/>
+
+
+
+
+
+
@@ -267,6 +292,13 @@
关闭
+
+
@@ -286,6 +318,8 @@ export default {
data(){
return {
active: '1',
+ activeName: 'first',
+ fileType: '', //条款文件类型
//折叠的标志,true为折叠,false为不折叠
foldFormFlag: false,
drawerModal: false,
@@ -293,17 +327,22 @@ export default {
isTransfer: false,
isSubmit: false,
saveLoading: false,
+ modalshowflag: false,
itermsConditionsFlag: false,
userId:this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
commentText: '',
drawerTitle: '',
+ lsIndex: "",
itermsConditionsTitle: '',
listForm: {},
dataList: [],
detailData: [],
nodeList: [],
+ nodeList2: [],
+ projectTabName: [],
+ selectProject: [],
}
},
mounted() {
@@ -311,6 +350,15 @@ export default {
this.processTable()
},
methods: {
+ handleClick(tab) {
+ let projectData = this.dataList
+ this.dataList = []
+ projectData.forEach(item => {
+ if(item.projectName === tab.name){
+ this.dataList.push(item)
+ }
+ })
+ },
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
@@ -331,21 +379,34 @@ export default {
getFormFieldList (item) {
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item))
+ this.fileType = item.fileType
this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName
this.listForm['id'] = item.id
- this.listForm.dataList = item.dataList
- this.dataList = item.dataList
+ this.dataList = item.resDats
+ item.resDats.forEach(item => {
+ if(!this.projectTabName.includes(item.projectName)){
+ this.projectTabName.push(item.projectName)
+ }
+ })
+ this.listForm.resDats = []
+ this.listForm.breakdownList = []
this.dataList.distributePerson = item.dataList[0].distributePerson
- this.listForm.breakdownList = item.breakdownList
})
},
itermsConditionsClose () {
this.itermsConditionsFlag = false
},
itermsConditionsOpen (row) {
+ this.$http.get('SarStandItems/sar-stand-items/findItemById',{
+ type:this.fileType,
+ ids: row.id
+ },{
+ _this: this
+ }, res => {
+ this.itermsConditionsTitle = res.data[0].termsConditions.replace(/''/g, '\'')
+ })
this.itermsConditionsFlag = true
- this.itermsConditionsTitle = row.replace(/''/g, '\'')
},
//tab发生变化
handleTabs(name) {
@@ -368,8 +429,11 @@ export default {
},
//提交
handleSubmit(){
+ this.dataList.map(item => {
+ delete item.termsConditions
+ })
this.listForm.commentText = this.commentText
- this.listForm.stepFlag = '0'
+ this.listForm.dataList = this.dataList
const json = JSON.stringify(this.listForm);
this.isSubmit = true
this.$http.post('lawss/activiti/completeTask', {
@@ -465,6 +529,65 @@ export default {
this.detailData = res
}, e => {})
},
+ selectProjectChange(data){
+ this.selectProject = data
+ },
+ choiceZRRS(row, type, index) {
+ this.type = type;
+ if (type === 1) {
+ this.nodeList2 = [];
+ this.lsIndex = index;
+ if (row.implementerId) {
+ this.nodeList2 = row.implementerId.split(",");
+ } else {
+ this.nodeList2.push(row);
+ }
+ this.modalshowflag = true;
+ } else if (type === 2) {
+ // 批量
+ if (this.selectProject.length > 0) {
+ this.nodeList2 = [];
+ this.modalshowflag = true;
+ this.selectProject.forEach(item =>{
+ if(item.implementerId){
+ this.nodeList2 = item.implementerId.split(",");
+ }
+ })
+ } else {
+ this.$message.warning("请选择要分发的数据");
+ }
+ }
+ },
+ checkedRole2(data) {
+ let idList = "",nameList = "";
+ data.forEach(item => {
+ if (nameList.length) {
+ nameList += ",";
+ idList += ",";
+ }
+ idList += item.id;
+ nameList += item.name;
+ });
+ if (this.type === 1) {
+ let projectList = JSON.parse(JSON.stringify(this.dataList))
+ projectList[this.lsIndex].implementerId = idList;
+ projectList[this.lsIndex].implementer = nameList;
+ this.dataList = projectList
+ } else if (this.type === 2) {
+ let projectList = JSON.parse(JSON.stringify(this.dataList))
+ projectList.forEach(item => {
+ this.selectProject.forEach(items => {
+ if (item.projectName === items.projectName && item.itemsNum === items.itemsNum) {
+ item.implementerId = idList;
+ item.implementer = nameList;
+ }
+ });
+ });
+ this.dataList = projectList
+ this.$refs.multipleTable.clearSelection();
+ }
+ this.modalshowflag = false;
+ },
},
computed: {
listNoDataText () {
@@ -534,7 +657,7 @@ export default {
.tableButton {
position: absolute;
- right: 0;
+ left: 0;
top: 0;
}
@@ -548,7 +671,9 @@ export default {
}
}
}
-
+ /deep/.el-tabs__header{
+ margin: 0;
+ }
.demo-drawer-content {
margin-top: 10px;
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
index 60a5fa44d..82d9cc9c1 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
@@ -1,13 +1,1012 @@
+
+
+
+ 标准合规评估流程
+ 责任人评估
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
隐藏基础信息
+
展开基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 填写信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
+
+
+
+
+ {{ scope.row.commentText }}
+
+
+
+
+ {{ scope.row.endTime ? "已完成" : "未完成" }}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue
new file mode 100644
index 000000000..face62e72
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue
new file mode 100644
index 000000000..f5307e9a6
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue
new file mode 100644
index 000000000..1ad204b53
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 334b7b9c1..e2fc878e5 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -900,9 +900,9 @@ export default {
prcType: row.prcType
}
})
- }else if(row.taskInfo === '合规性评估'){
+ }else if(row.taskInfo === '任务分发(项目经理)'){
this.$router.push({
- name: 'xmpgStep4',
+ name: 'bzpgStep4',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
@@ -911,9 +911,9 @@ export default {
prcType: row.prcType
}
})
- }else if(row.taskInfo === '分发责任人审核'){
+ }else if(row.taskInfo === '合规评估(专业技术人员)'){
this.$router.push({
- name: 'xmpgStep5',
+ name: 'bzpgStep5',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
@@ -922,9 +922,9 @@ export default {
prcType: row.prcType
}
})
- }else if(row.taskInfo === '汇总审核'){
+ }else if(row.taskInfo === '审核(项目经理)'){
this.$router.push({
- name: 'xmpgStep6',
+ name: 'bzpgStep6',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
@@ -933,9 +933,20 @@ export default {
prcType: row.prcType
}
})
- }else if(row.taskInfo === '标准法规部领导审核'){
+ }else if(row.taskInfo === '审定(项目群负责人)'){
this.$router.push({
- name: 'xmpgStep7',
+ name: 'bzpgStep7',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }else if(row.taskInfo === '批准(标准法规部高级经理)'){
+ this.$router.push({
+ name: 'bzpgStep8',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
diff --git a/src/router/index.js b/src/router/index.js
index b10d95503..2be48c1b8 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -565,6 +565,33 @@ const routes = [
title: '标准合规评估流程'
}
},
+ {
+ path: '/bzpgStep6',
+ name: 'bzpgStep6',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzpg/step6.vue'),
+ meta: {
+ requireAuth: true,
+ title: '标准合规评估流程'
+ }
+ },
+ {
+ path: '/bzpgStep7',
+ name: 'bzpgStep7',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzpg/step7.vue'),
+ meta: {
+ requireAuth: true,
+ title: '标准合规评估流程'
+ }
+ },
+ {
+ path: '/bzpgStep8',
+ name: 'bzpgStep8',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzpg/step8.vue'),
+ meta: {
+ requireAuth: true,
+ title: '标准合规评估流程'
+ }
+ },
{
path: '/xmpgStep1',
name: 'xmpgStep1',