+
-
+ ref="tree2">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ listForm.breakdownList[scope.$index].implementer == null ? "请选择落实人" : listForm.breakdownList[scope.$index].implementer
}}
+
+
+
+
-
+
{
+ // if (this.selectList.includes(item.itemId)) {
+ // this.listForm.breakdownList[index].implementerId = this.roleRow.id;
+ // this.listForm.breakdownList[index].implementer = this.roleRow.name;
+ // }
+ // });
+ // } else {
+ // this.listForm.breakdownList[this.dsadadadsada].implementerId = this.roleRow.id;
+ // this.listForm.breakdownList[this.dsadadadsada].implementer = this.roleRow.name;
+ // }
+ // this.listForm.implementer = this.roleRow.name;
+ // this.showColumn = false;
+ // this.$nextTick(() => {
+ // this.showColumn = true;
+ // });
+ // }
+ // this.modalshowflag = false;
+ // },
+ saveUserInfo2 () {
+ var idList = "";
+ var nameList = "";
+ this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach(item => {
+ if (nameList.length > 0) {
+ nameList += ",";
+ idList += ",";
+ }
+ idList += item.id;
+ nameList += item.name;
+ });
// 如果有勾选的项
if (this.selectList.length) {
this.listForm.breakdownList.forEach((item, index) => {
+ console.log(item.itemId);
+ console.log(index);
if (this.selectList.includes(item.itemId)) {
- this.listForm.breakdownList[index].implementerId = this.roleRow.id;
- this.listForm.breakdownList[index].implementer = this.roleRow.name;
+ this.listForm.breakdownList[index].implementerId = idList;
+ this.listForm.breakdownList[index].implementer = nameList;
}
});
} else {
- this.listForm.breakdownList[this.dsadadadsada].implementerId = this.roleRow.id;
- this.listForm.breakdownList[this.dsadadadsada].implementer = this.roleRow.name;
+ this.listForm.breakdownList[this.dsadadadsada].implementerId = idList;
+ this.listForm.breakdownList[this.dsadadadsada].implementer = nameList;
}
- this.listForm.implementer = this.roleRow.name;
+ this.listForm.implementer = nameList;
this.showColumn = false;
this.$nextTick(() => {
this.showColumn = true;
});
- }
- this.modalshowflag = false;
+ this.modalshowflag2 = false;
+ //不要删除 By 宋伟佳
+ console.log(this.$refs.multipleTable.clearSelection())
+ this.$nextTick(() => {
+ for(var i=0;i 0) {
+ this.nodeList = this.roleForm.implementer.split(",");
+ }
+ this.modalshowflag2 = true;
},
getTree() {
this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index a0d0d502b..d3f680706 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -271,9 +271,9 @@
-
+
{
- console.log(res.mesg);
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
@@ -492,11 +461,18 @@ export default {
getFormFieldList(item) {
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
- console.log(item.fenFlag);
if (item.fenFlag === undefined ) {
+ item.step3DTOS.forEach(item => {
+ item.implementerId = this.$store.getters.userInfo.userId
+ item.implementer = this.$store.getters.userInfo.userName
+ })
this.dataList = item.step3DTOS;
} else {
this.dataList = item.dataList;
+ this.dataList.forEach(item => {
+ item.implementerId = this.$store.getters.userInfo.userId
+ item.implementer = this.$store.getters.userInfo.userName
+ })
}
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
@@ -524,6 +500,7 @@ export default {
this.listForm.signFlag = "";
this.listForm.dataList = this.dataList;
const json = JSON.stringify(this.listForm);
+ console.log(json);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
index 60b351613..1dc390e5a 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
@@ -228,7 +228,7 @@
-
+
- 数据加载中……
+
-
-
查询
+ @click="sarStandCompareHisInfo">查询
+
清空
+ @click="clearSearchStand">清空
+
@@ -54,7 +58,7 @@
label="标准"
align="center">
- {{ scope.row.category }}
+ {{ scope.row.category }}
-
-
+
+
+ {{ editRowData.standSortShow }} {{ editRowData.standNumber }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/regulatoryRepository/standardForComments/index.vue b/src/pages/regulatoryRepository/standardForComments/index.vue
index 98f515675..f59f8f7b3 100644
--- a/src/pages/regulatoryRepository/standardForComments/index.vue
+++ b/src/pages/regulatoryRepository/standardForComments/index.vue
@@ -9,10 +9,12 @@
+
+
+
@@ -87,11 +88,17 @@ export default {
})
break
case '7':
- //项目评估流程
+ //项目评估流程 - 标准
this.$router.push({
name: 'xmpgStep1'
})
break
+ case '10':
+ //项目评估流程- 项目
+ this.$router.push({
+ name: 'xmpg2Step1'
+ })
+ break
case '8':
//未符合项整改流程
this.$router.push({
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 9a8810380..712ae4209 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -378,6 +378,9 @@
align="center"
width="210px"
label="标准实施日期">
+
+ {{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}
+
-
+
下移
+ 编辑
@@ -499,6 +507,87 @@
+
+
+
+ 项目合规评估流程 - 项目
+ 申请人发起流程
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
new file mode 100644
index 000000000..a61c3a4a4
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue
index 709ebe063..3ac149a2f 100644
--- a/src/pages/processCenter/pages/newProcess/index.vue
+++ b/src/pages/processCenter/pages/newProcess/index.vue
@@ -10,7 +10,8 @@
+
+ 基础信息
+ 人员信息
+
+
+
+
+ 基础信息
+
+
+
+
+
+ 选择项目
+
+
+
+
+
+
+
+
+
+ 填写信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 流程发起人
+
+
+
+ 审批责任人
+
+
+
+
+
+ 工程经理
+
+
+
+ 标准法规部部长
+
+
+
+ 标准清单发布/更新流程
- 项目合规评估流程
+ 项目合规评估流程-标准
+ 项目合规评估流程-项目
未符合项整改流程
标准解读流程