From a69a3fe6ab1e9ccc2f336bb4a78330ffe5cfb997 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, 27 Jul 2021 09:39:51 +0800 Subject: [PATCH 1/3] commit --- src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index 865bad1cd..b0315ca40 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -83,7 +83,8 @@ From 04eca92d736cc139930b5594c787cfafa406e33b Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 27 Jul 2021 10:05:28 +0800 Subject: [PATCH 2/3] commit --- .../pages/creatProcess/bzdy/step1-1.vue | 1 - .../pages/creatProcess/bzdy/step3.vue | 1 - .../pages/creatProcess/bzdy/step4.vue | 1 - .../pages/creatProcess/bzdy/step5.vue | 1 - .../pages/creatProcess/bzzqyj/step1-1.vue | 622 ++++++++++++++++++ .../pages/creatProcess/bzzqyj/step1.vue | 22 +- .../pages/creatProcess/bzzqyj/step2.vue | 2 +- .../pages/creatProcess/bzzqyj/step3.vue | 1 - .../pages/creatProcess/bzzqyj/step4.vue | 1 - .../pages/creatProcess/bzzqyj/step5.vue | 1 - .../pages/creatProcess/bzzqyj/step6.vue | 1 - .../pages/creatProcess/bzzqyj/step7.vue | 1 - .../pages/creatProcess/bzzqyj/step8.vue | 1 - .../pages/creatProcess/bzzqyj/step9.vue | 1 - .../tabComponents/taskDraft/index.vue | 12 +- .../pags/consultationDetails.vue | 68 +- src/router/index.js | 9 + 17 files changed, 704 insertions(+), 42 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index dc9425a1f..6f7638f37 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -146,7 +146,6 @@ +
+ + + + + +
+
基础信息
+
人员信息
+
+
+
+ + + + +
+ + + +
+ 选择标准 +
+
+ + + + + + + + + + +
+
+
+
+
+ + +
+ + +
+
+
+
+
+
+ + + + + +

流程发起人

+
+ + +
+
+
+
+ + + +

责任部门对接人

+
+ + + +
+
+
+
+ + + +

标准法规部部长

+
+ + +
+
+
+
+ + + +

技术管理中心主任

+
+ + +
+
+
+
+ + + +

工程研究总院院长

+
+ + +
+
+
+
+
+
+
+
+ + + +
+
+ + +
+
+ + + + + + + {{ opt.label }} + + + + + + + + + + + 查询 + 清空 + + +
+
+
+
+
+ + + + + + + + + +
+
+
+ + 数据加载中…… + +
+
+ + +
+ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index d7f0df38b..1f82da739 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -263,6 +263,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' +import { saveTaskFirst } from 'api/process' export default { name: "bzzqyjStep1", @@ -489,7 +490,26 @@ export default { handleTabs(name) { this.active = name }, - handleSave() {}, + handleSave() { + this.saveLoading = true + let _formData = new FormData() + _formData.append('id', this.bpnId || '') + _formData.append('createUser', this.$store.getters.userInfo.userId) + _formData.append('createUserName', this.$store.getters.userInfo.userName) + _formData.append('prcType', '3') + _formData.append('json', JSON.stringify({ + form: this.form, + roleForm: this.roleForm, + commentText: this.commentText + })) + saveTaskFirst(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + this.bpnId = res.result + }).catch(e => { + this.saveLoading = false + }) + }, handleSubmit() { this.$refs['bzzqyjForm'].validate((valid) => { if (valid) { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index 06eb9fd69..0804ddc82 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -135,7 +135,6 @@ { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index 6ee42f0a7..e30b056fb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -184,7 +184,6 @@
- - + + - + @@ -132,6 +132,14 @@ export default { partCode: '', content: '', }, + opinionContentRules: { + partCode: [ + { required: true, message: '请输入章节编号', trigger: 'blur' }, + ], + content: [ + { required: true, message: '请输入修改意见内容(包括理由或依据)', trigger: 'blur' } + ], + }, standinfoList: [], // 详情列表 form: { cid: this.$route.query.item.cid, @@ -228,32 +236,36 @@ export default { }, //点击抽屉按钮提交事件 saveUserInfo() { - var url = '' - var form = { - cid: this.$route.query.item.cid, - content: this.opinionContent.content, - partCode: this.opinionContent.partCode, - userId: this.$store.getters.userInfo.userId, - userName: this.$store.getters.userInfo.account, - deptName: this.$store.getters.userInfo.orgName, - deptId: this.$store.getters.userInfo.orgId - } - if (this.type === 'edit') { - form.id = this.id - form.autUserId = this.$store.getters.userInfo.userId - url = 'slrs/sar-public-idea-all/updateStand' - } else { - url = 'slrs/sar-public-idea-all/insetStand' - } - this.$http.post(url, form, { - _this: this - }, res => { - if (res.respCode === '200') { - this.form.page = 1 - this.getList() - } + this.$refs['formAdd'].validate((valid) => { + if (valid) { + var url = '' + var form = { + cid: this.$route.query.item.cid, + content: this.opinionContent.content, + partCode: this.opinionContent.partCode, + userId: this.$store.getters.userInfo.userId, + userName: this.$store.getters.userInfo.account, + deptName: this.$store.getters.userInfo.orgName, + deptId: this.$store.getters.userInfo.orgId + } + if (this.type === 'edit') { + form.id = this.id + form.autUserId = this.$store.getters.userInfo.userId + url = 'slrs/sar-public-idea-all/updateStand' + } else { + url = 'slrs/sar-public-idea-all/insetStand' + } + this.$http.post(url, form, { + _this: this + }, res => { + if (res.respCode === '200') { + this.form.page = 1 + this.getList() + } + }) + this.isDialog = false + } }) - this.isDialog = false }, //点击抽屉按钮取消事件 closeDrawer() { diff --git a/src/router/index.js b/src/router/index.js index 99a83b87c..d46cfc24f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -591,6 +591,15 @@ const routes = [ title: '标准征求意见流程' } }, + { + path: '/bzzqyjStep1-1', + name: 'bzzqyjStep1-1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue'), + meta: { + requireAuth: true, + title: '标准征求意见流程' + } + }, { path: '/bzzqyjStep2', name: 'bzzqyjStep2', From 677dc31b815feb612f97a0a347f8256466cae25f Mon Sep 17 00:00:00 2001 From: fanlin Date: Tue, 27 Jul 2021 10:07:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?bug:=20=20=E5=9B=BD=E5=86=85=E5=A4=96?= =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84=EF=BC=8C=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=89=8B=E5=8A=A8=E6=9F=A5=E6=89=BE=EF=BC=8C?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E9=87=8D=E7=BD=AE=E6=8C=89=E9=92=AE=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E5=8F=98=E5=B0=91=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CustomFormComponents/InputForStandards.vue | 2 +- .../CustomFormComponents/InputForStandardsForForeign.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/CustomFormComponents/InputForStandards.vue b/src/components/CustomFormComponents/InputForStandards.vue index 0afef8433..3b9d5a974 100644 --- a/src/components/CustomFormComponents/InputForStandards.vue +++ b/src/components/CustomFormComponents/InputForStandards.vue @@ -361,7 +361,7 @@ export default { page: 1, pageSize: this.$store.getters.userInfo.configContent, total: 0, - standType: 'INLAND', + standType: 'ALL', quoteIdList: '', validFlag: '0' } diff --git a/src/components/CustomFormComponents/InputForStandardsForForeign.vue b/src/components/CustomFormComponents/InputForStandardsForForeign.vue index 08d4408ee..303fce717 100644 --- a/src/components/CustomFormComponents/InputForStandardsForForeign.vue +++ b/src/components/CustomFormComponents/InputForStandardsForForeign.vue @@ -329,7 +329,7 @@ export default { page: 1, pageSize: this.$store.getters.userInfo.configContent, total: 0, - standType: 'FOREIGN', + standType: 'ALL', quoteIdList: '', validFlag: '0' }