+
{
+ console.log(res.mesg);
if (res) {
const processForm = JSON.parse(res.mesg)
this.getFormFieldList(processForm)
@@ -375,8 +491,11 @@ export default {
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.step3DTOS
+ this.listForm.standName = item.step3DTOS[0].standName
+ this.listForm.standNumber = item.step3DTOS[0].standNumber
+ this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer
+ this.listForm.certifiedEngineer = item.step3DTOS[0].certifiedEngineer
})
},
@@ -394,6 +513,7 @@ export default {
this.listForm.approvalOpinion = "";
this.listForm.standId = this.listForm.standId;
this.listForm.signFlag = "";
+ this.listForm.dataList = this.dataList
const json = JSON.stringify(this.listForm);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
index d657db275..d9b691b9c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
@@ -1,13 +1,579 @@
+
+
+
+ 项目合规评估流程
+ 分发责任人审批
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 填写信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{scope.row.commentText}}
+
+
+
+
+ {{ scope.row.endTime ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+
+ 项目合规评估流程
+ 产品线责任人审批
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 填写信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{scope.row.commentText}}
+
+
+
+
+ {{ scope.row.endTime ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+
+ 项目合规评估流程
+ 标准法规部领导审批
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 填写信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{scope.row.commentText}}
+
+
+
+
+ {{ scope.row.endTime ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
标准清单发布/更新流程
项目合规评估流程
未符合项整改流程
+ 标准解读流程
@@ -98,6 +99,10 @@ export default {
})
break
case '9':
+ // 标准解读流程
+ this.$router.push({
+ name:'bzjdStep1'
+ })
break
case '10':
break
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index a8aecdb8a..5d55a3700 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -344,7 +344,6 @@ export default {
})
}
break;
- break
case '3':
if (row.taskInfo === '责任对接人选择责任人') {
this.$router.push({
@@ -497,6 +496,50 @@ export default {
prcType: row.prcType
}
})
+ }else if(row.taskInfo === '合规性评估'){
+ this.$router.push({
+ name: 'xmpgStep4',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }else if(row.taskInfo === '分发责任人审核'){
+ this.$router.push({
+ name: 'xmpgStep5',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ // }else if(row.taskInfo === '标准法规部领导审核'){
+ // this.$router.push({
+ // name: 'xmpgStep6',
+ // query: {
+ // taskIds: row.taskIds,
+ // prcId: row.prcId,
+ // prcNum: row.prcNum,
+ // prcName: row.prcName,
+ // prcType: row.prcType
+ // }
+ // })
+ }else if(row.taskInfo === '标准法规部领导审核'){
+ this.$router.push({
+ name: 'xmpgStep7',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
}
break
//未符合项整改流程
@@ -547,6 +590,30 @@ export default {
})
}
break
+ case '9':
+ if (row.taskInfo === '选择执行人') {
+ this.$router.push({
+ name: 'bzjdStep2',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if (row.taskInfo === '填写解读分析') {
+ this.$router.push({
+ name: 'bzjdStep3',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }
}
},
...mapMutations(['setProcess', 'setHandleInfo']),
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
index 7b55ad910..98aed73cb 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
@@ -295,19 +295,18 @@ export default {
},
// 批量删除
deleteSarAccess(flag, id) {
- if (flag === "delOne") {
+ if (flag === 'delOne') {
this.selectedList = [];
this.selectedList[0] = id;
}
- if (!this.selectedList.length) {
- this.$message.warning("请选择要删除的数据");
+ if (this.selectedList.length === 0) {
+ this.$message.warning('请选择要删除的数据')
} else {
- this.$confirm("确认删除选中数据？", "确认删除", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- confirmButtonClass: "common-button-primary",
- roundButton: false,
- type: "warning"
+ this.$confirm('确定删除这些数据？', '提示', {
+ confirmButtonText: '确定',
+ confirmButtonClass: 'common-button-primary',
+ cancelButtonText: '取消',
+ type: 'warning',
}).then(() => {
const URL = `sarLawsDetailedList/sar-laws-detailed-list/deleteListAll?idList=${this.selectedList.join(',')}`
this.$http.postDelete(URL, {}, res => {
@@ -317,7 +316,8 @@ export default {
}, e => {
});
}).catch(() => {
- });
+
+ })
}
},
// 表格选择框
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
index 9ab5e43c8..2bcab6947 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
@@ -300,31 +300,31 @@ export default {
name: "OtherAddEit"
});
},
- // 删除
+ //批量删除
deleteSarAccess(flag, id) {
- if (flag === "delOne") {
+ if (flag === 'delOne') {
this.selectedList = [];
this.selectedList[0] = id;
}
if (this.selectedList.length === 0) {
- this.$message.warning("请选择要删除的数据");
+ this.$message.warning('请选择要删除的数据')
} else {
- this.$confirm("确认删除这些数据？", "提示", {
- confirmButtonText: "确认",
- confirmButtonClass: "common-button-primary",
- cancelButtonText: "取消",
- type: "warning"
+ this.$confirm('确定删除这些数据？', '提示', {
+ confirmButtonText: '确定',
+ confirmButtonClass: 'common-button-primary',
+ cancelButtonText: '取消',
+ type: 'warning',
}).then(() => {
- const URL = `sarLawsDetailedList/sar-laws-detailed-list/deleteListAll?idList=${this.selectedList.join(",")}`;
+ const URL = `sarLawsDetailedList/sar-laws-detailed-list/deleteListAll?idList=${this.selectedList.join(',')}`
this.$http.postDelete(URL, {}, res => {
this.searchSarAccess();
this.selectedList = [];
- this.$message.success("删除成功");
+ this.$message.success('删除成功')
}, e => {
});
}).catch(() => {
- });
+ })
}
},
// 表格选择框
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
index bc2abd6a1..34ac7c354 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
@@ -309,7 +309,7 @@ export default {
this.selectedList = [];
this.selectedList[0] = id;
}
- if (this.selectedList === 0) {
+ if (this.selectedList.length === 0) {
this.$message.warning('请选择要删除的数据')
} else {
this.$confirm('确定删除这些数据？', '提示', {
@@ -329,7 +329,6 @@ export default {
})
}
-
},
// 表格选择框
selectOne(data) {
diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index 62876a7b3..04ef5ace5 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -363,6 +363,10 @@ export default {
mounted() {
//查询所有选项
this.queryOptions();
+ let globalInputSearch = this.$route.params.searchValue
+ if (globalInputSearch !== 'allvalue') {
+ this.keywords = globalInputSearch
+ }
},
unmounted() {
diff --git a/src/router/index.js b/src/router/index.js
index 8939581cf..4fdfc96b2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -591,6 +591,33 @@ const routes = [
title: '标准调研流程'
}
},
+ {
+ path: '/bzjdStep1',
+ name: 'bzjdStep1',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step1.vue'),
+ meta: {
+ requireAuth: true,
+ title: '标准解读流程'
+ }
+ },
+ {
+ path: '/bzjdStep2',
+ name: 'bzjdStep2',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step2.vue'),
+ meta: {
+ requireAuth: true,
+ title: '标准解读流程'
+ }
+ },
+ {
+ path: '/bzjdStep3',
+ name: 'bzjdStep3',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step3.vue'),
+ meta: {
+ requireAuth: true,
+ title: '标准解读流程'
+ }
+ },
]
},
// 本地工具