From 99b6935f7796f63fde98a2bd8adb8160d8f8bb1c Mon Sep 17 00:00:00 2001 From: "wangxiahui@91isoft.com" <140316hui> Date: Thu, 16 Dec 2021 16:54:45 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/newProcess/index.vue | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index f62646464..8503a7890 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -125,7 +125,7 @@
- +
@@ -140,7 +140,7 @@
- +
@@ -155,7 +155,7 @@
- +
@@ -190,7 +190,7 @@

企业标准相关流程
- +
@@ -205,7 +205,7 @@
- +
@@ -220,7 +220,7 @@
- +
@@ -235,7 +235,7 @@
- +
@@ -256,7 +256,7 @@

标准化活动相关流程
- +
@@ -271,7 +271,7 @@
- +
@@ -301,7 +301,7 @@
- +
@@ -316,7 +316,7 @@
- +
@@ -331,7 +331,7 @@
- +
@@ -346,7 +346,7 @@
- +
From ca00c83498ed6648386be5197ea842c2393ca6b8 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Thu, 16 Dec 2021 17:17:33 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/navMenu/index.vue | 7 + .../dataCenter/dataCenterDetail.vue | 306 ++++++++++++ .../regulatoryRepository/dataCenter/index.vue | 447 ++++++++++++++++++ src/router/index.js | 22 + 4 files changed, 782 insertions(+) create mode 100644 src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue create mode 100644 src/pages/regulatoryRepository/dataCenter/index.vue diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index e9e9b928e..b5ee61ce1 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -282,6 +282,13 @@ menuId: 'asfdew33', isChildren: true // 判断没有子菜单 }, + { + title: '资料中心', + path: '/dataCenter', + 'icon-class': 'el-icon-s-order', + menuId: '', + isChildren: true // 判断没有子菜单 + }, // { // title: '技术要求清单', // path: '/skillReq', diff --git a/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue b/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue new file mode 100644 index 000000000..0d3fcb05b --- /dev/null +++ b/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue @@ -0,0 +1,306 @@ + + + + + diff --git a/src/pages/regulatoryRepository/dataCenter/index.vue b/src/pages/regulatoryRepository/dataCenter/index.vue new file mode 100644 index 000000000..5149390bb --- /dev/null +++ b/src/pages/regulatoryRepository/dataCenter/index.vue @@ -0,0 +1,447 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index b44bac376..b0b98c54c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2404,6 +2404,28 @@ const routes = [ menuId: 'ABCLRLJUQN44ENBS93CQ' } }, + { + path: '/dataCenter', + name: 'dataCenter', + component: () => + import('@/pages/regulatoryRepository/dataCenter'), + meta: { + requireAuth: true, + title: '资料中心', + menuId: '' + } + }, + { + path: '/dataCenterDetail', + name: 'dataCenterDetail', + component: () => + import('@/pages/regulatoryRepository/dataCenter/dataCenterDetail'), + meta: { + requireAuth: true, + title: '资料中心详情', + menuId: '' + } + }, // 技术要求清单 { path: '/skillReq', From e9a2d665d5b4623332ee7a8c72a40a9a4eb17f6e Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Thu, 16 Dec 2021 17:25:56 +0800 Subject: [PATCH 3/5] commit --- .../domesticStandardsAndRegulations/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 30f65e677..b0f2bafc8 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -1499,7 +1499,7 @@ @@ -1777,7 +1777,7 @@ @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"> - + From e67ab551621178d5c606ac64a0dd8d16686a96cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 16 Dec 2021 16:57:06 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BD=93=E7=B3=BB=E7=B1=BB=E5=88=AB?= =?UTF-8?q?=E5=BC=B9=E6=A1=86=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EnterpriseStandardDatabase.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 5801004e3..b12fe4d6a 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -1338,7 +1338,7 @@ width = "500" :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" - :nodeKey="nodeKey" @popoverHide="popoverHide"> + :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"> Date: Thu, 16 Dec 2021 17:48:27 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=92=A4=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1-1.vue | 29 ++++++++++--------- .../pages/creatProcess/jrbzhxh/step1.vue | 11 ++++++- .../pages/creatProcess/qbfs/step1.vue | 12 +++++++- .../pages/creatProcess/qbfz/step1.vue | 12 +++++++- .../pages/creatProcess/qbzxdjhgk/step1.vue | 14 +++++++-- .../pages/creatProcess/wbsm/step1.vue | 12 +++++++- .../pages/creatProcess/xmpg/step1-1.vue | 25 +++++++++------- .../pages/creatProcess/xmpg/step1.vue | 13 ++++++++- .../pages/creatProcess/xmpg2/step1-1.vue | 22 +++++++------- .../pages/creatProcess/xmpg2/step1.vue | 12 +++++++- .../pages/creatProcess/xmqdqr/step1-1.vue | 21 ++++++++------ .../pages/creatProcess/xmqdqr/step1.vue | 13 ++++++++- 12 files changed, 143 insertions(+), 53 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index 661379ce7..ba13e4698 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -1124,15 +1124,26 @@ export default { if (this.dataList.length < 1) { this.$message.warning("标准不能为空"); } else { - this.listForm.commentText = this.commentText; - this.listForm.fileName = this.fileInfoList; + this.listForm.commentText = this.commentText + this.listForm.fileName = this.fileInfoList var json = Object.assign(this.listForm, this.roleForm); this.$refs["qdfbForm"].validate((valid) => { if (valid) { this.$refs["Form"].validate((valid) => { if (valid) { - this.isSubmit = true; - this.$http.get("lawss/activiti/startProcess", { type: "4" }, { + this.isSubmit = true + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '4', + json: JSON.stringify({ + taskInfo: '引入法规标准清单', + form: this.listForm, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { @@ -1145,17 +1156,9 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); - if (this.bpnId !== '') { - let taskId = { - id: this.bpnId - } - taskDel(taskId).then(res=>{ - return res - }) - } this.$router.push("/processCenter"); } - this.isSubmit = false; + this.isSubmit = false }); } }); diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue index 21eda1b26..99c95e502 100644 --- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue @@ -185,7 +185,16 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true - this.$http.get("lawss/activiti/startProcess", {type: "15"}, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '15', + json: JSON.stringify({ + taskInfo: '备案任务下发', + roleForm: this.roleForm, + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue index 4b687c61d..cee4400f8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue @@ -583,7 +583,17 @@ export default { this.qbfsForm.fileList = this.fileList this.qbfsForm.commentText = this.commentText var json = Object.assign(this.qbfsForm, this.roleForm) - this.$http.get('lawss/activiti/startProcess', {type: '23'}, { + this.$http.post('lawss/activiti/startProcessRollBack', { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '23', + json: JSON.stringify({ + roleForm: this.roleForm, + qbfsForm: this.qbfsForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue index c93be5d1e..5f2df297e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue @@ -624,7 +624,17 @@ export default { this.isSubmit = true this.standardSearch.commentText = this.commentText var json = Object.assign(this.standardSearch, this.roleForm) - this.$http.get('lawss/activiti/startProcess', {type: '24'}, { + this.$http.post('lawss/activiti/startProcessRollBack', { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '24', + json: JSON.stringify({ + roleForm: this.roleForm, + qbfsForm: this.standardSearch, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index cc933eb41..d0dc8ab97 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -474,9 +474,17 @@ export default { if (valid) { // this.isSubmit = true; var json = Object.assign(qbzxdFrom, this.roleForm); - console.log(json); - return - this.$http.get("lawss/activiti/startProcess", { type: "25" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '25', + json: JSON.stringify({ + roleForm: this.roleForm, + qbfsForm: qbzxdFrom, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue index d88f83492..111d9af70 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue @@ -680,7 +680,17 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true - this.$http.get("lawss/activiti/startProcess", {type: "16"}, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '16', + json: JSON.stringify({ + roleForm: this.roleForm, + dataList: this.dataList, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index 99c1f4b43..aca7388ec 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -854,14 +854,14 @@ export default { if (this.dataList.length < 1) { this.satisfyFlag = false this.$message.warning("请添加产品线信息"); - }else{ + }else { this.satisfyFlag = true } this.dataList.forEach(item => { if (!item.distributePerson) { this.satisfyFlag = false this.$message.warning("请选择分发责任人"); - }else{ + }else { this.satisfyFlag = true } }); @@ -874,7 +874,18 @@ export default { if (valid) { this.$refs["roleForm"].validate((valid) => { if (valid) { - this.$http.get("lawss/activiti/startProcess", { type: "5" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '5', + json: JSON.stringify({ + taskInfo: "选择已拆分标准", + form: this.listForm, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { @@ -887,14 +898,6 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); - if (this.bpnId !== '') { - let taskId = { - id: this.bpnId - } - taskDel(taskId).then(res=>{ - return res - }) - } this.$router.push("/processCenter"); } this.isSubmit = false; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 13b74f4af..2909c7f85 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -867,7 +867,18 @@ export default { if (valid) { this.$refs["roleForm"].validate((valid) => { if (valid) { - this.$http.get("lawss/activiti/startProcess", { type: "5" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '5', + json: JSON.stringify({ + taskInfo: "选择已拆分标准", + form: this.listForm, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue index ab5bfa4d4..05e50fb08 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue @@ -612,7 +612,17 @@ export default { this.$refs["roleForm"].validate((valid) => { if (valid) { this.isSubmit = true; - this.$http.get("lawss/activiti/startProcess", { type: "6" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '6', + json: JSON.stringify({ + form: this.listForm, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { @@ -625,14 +635,6 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); - if (this.bpnId !== '') { - let taskId = { - id: this.bpnId - } - taskDel(taskId).then(res=>{ - return res - }) - } this.$router.push("/processCenter"); } this.isSubmit = false; @@ -647,7 +649,7 @@ export default { return this.$message.warning("请完善基础信息"); } }); - } + } } }, choiceZRR(type, title, id) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index ccdd41aac..395c8b95f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -629,7 +629,17 @@ export default { this.$refs["roleForm"].validate((valid) => { if (valid) { this.isSubmit = true; - this.$http.get("lawss/activiti/startProcess", { type: "6" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '6', + json: JSON.stringify({ + form: this.listForm, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue index 0cf0dad19..6179964e5 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue @@ -655,7 +655,18 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true; - this.$http.get("lawss/activiti/startProcess", { type: "10" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '10', + json: JSON.stringify({ + taskInfo: "产品经理分发", + form: this.qdform, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { @@ -668,14 +679,6 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); - if (this.bpnId !== '') { - let taskId = { - id: this.bpnId - } - taskDel(taskId).then(res=>{ - return res - }) - } this.$router.push("/processCenter"); } this.isSubmit = false; diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue index 028182e51..ab4dd630f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -659,7 +659,18 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true; - this.$http.get("lawss/activiti/startProcess", { type: "10" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '10', + json: JSON.stringify({ + taskInfo: "产品经理分发", + form: this.qdform, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) {