From dfc3b1297298e320da1c3ef6aec144751b2f486d Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 18 Jun 2021 11:11:44 +0800 Subject: [PATCH 1/5] commit --- .../pages/creatProcess/bzrk/step1.vue | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index aced02f51..db3a54aa2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -574,10 +574,9 @@ -

责任对接人

+

责任人

-
@@ -644,7 +643,7 @@ standNature: '', // 标准性质 standEnName: '', // 英文名称 standName: '', // 中文名称 - signFlag: '', // 是否需要会签 + signFlag: '1', // 是否需要会签 issueTime: '', // 发布时间 isRelateAccess: '', // 是否纳入认证清单 standSystem: '',// 标准体系 @@ -740,6 +739,24 @@ }, handleSave() {}, handleSubmit() { + var json = this.form + this.$http.get('lawss/activiti/startProcess', {type: '1'}, { + _this: this + }, res => { + if (res.ok) { + this.$http.post('lawss/activiti/completeTask', { + taskIds: res.data, + userId : this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + console.log(res); + if (res.ok) { + } + }) + } + }) } }, mounted () { From 41ef8fddfc68a3899318e75ebb118fa056b8f89c Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 18 Jun 2021 14:45:43 +0800 Subject: [PATCH 2/5] commit --- .../pages/creatProcess/bzrk/step1.vue | 3 + .../pages/standInvolveProjectDetail.vue | 76 ++++++++++++------- .../pages/technologyInvolveProject.vue | 60 +++++++++------ 3 files changed, 88 insertions(+), 51 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index db3a54aa2..e423ff5f4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -740,6 +740,9 @@ handleSave() {}, handleSubmit() { var json = this.form + json.zrUserId = this.$store.getters.userInfo.userId + json.jlUserId = this.$store.getters.userInfo.userId + json.applyUpdUserId = this.$store.getters.userInfo.userId this.$http.get('lawss/activiti/startProcess', {type: '1'}, { _this: this }, res => { diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index 31c69b2b7..f9679d2da 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -68,6 +68,11 @@ label="标准/政策名称" > + + { + if (res.ok) { + this.sarProStateListDatas = res.data.records + this.sarProStateTotal = res.data.total + } + }) + this.showSarProStateModal = true + }, // 查询项目数据 clearSearchProState () { - this.sarProStateEO.productName = '' - this.querySarProStateZero() + this.sarProStateEO.productName = '' + this.sarProStateTotalPage = 1 + this.querySarProStateZero() }, // 清空条件查询 clearSearchPro () { this.sarProStateEO.productName = '' diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue index 446877c09..6a9d684ba 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue @@ -14,6 +14,12 @@ placeholder="标准/政策名称查找" clearable> + + + + + + @@ -68,6 +74,11 @@ label="标准/政策名称" > + + Date: Fri, 18 Jun 2021 14:49:52 +0800 Subject: [PATCH 3/5] commit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 2 ++ .../pages/standInvolveProjectDetail.vue | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index e423ff5f4..dbe623393 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -743,6 +743,8 @@ json.zrUserId = this.$store.getters.userInfo.userId json.jlUserId = this.$store.getters.userInfo.userId json.applyUpdUserId = this.$store.getters.userInfo.userId + json.prcCreateUser = this.$store.getters.userInfo.userId + json.prcCreateUserName = this.$store.getters.userInfo.account this.$http.get('lawss/activiti/startProcess', {type: '1'}, { _this: this }, res => { diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index f9679d2da..5606b96b1 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -321,8 +321,9 @@ export default { this.querySarProStateZero() }, // 清空条件查询 clearSearchPro () { - this.sarProStateEO.productName = '' - this.showSarProStateModal = false + this.sarProStateEO.productName = '' + this.showSarProStateModal = false + this.standId = '' }, // 关闭查看事件 pageProStateChange (page) { this.sarProStateTotalPage = page From 98a3ebea39468ec84b6fcecd5b3b5f7d282111a7 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 18 Jun 2021 15:47:43 +0800 Subject: [PATCH 4/5] commit --- .../pages/components/ProcessMixin.vue | 101 +++--------------- .../processCenter/pages/newProcess/index.vue | 8 +- .../tabComponents/processCenter/index.vue | 20 ++++ .../pages/standInvolveProjectDetail.vue | 38 +++---- .../pages/technologyInvolveProject.vue | 98 ++++++++++------- 5 files changed, 115 insertions(+), 150 deletions(-) diff --git a/src/pages/processCenter/pages/components/ProcessMixin.vue b/src/pages/processCenter/pages/components/ProcessMixin.vue index eeac9195b..dfe31b56b 100644 --- a/src/pages/processCenter/pages/components/ProcessMixin.vue +++ b/src/pages/processCenter/pages/components/ProcessMixin.vue @@ -6,93 +6,22 @@ export default { mixins: [], components: {}, data () { - return { - processTypeList: [ - { - label: '法规入库及评估流程', - value: '1' - }, { - label: '标准法规技术储备评估流程', - value: '2' - }, - { - label: '项目评估流程', - value: '3' - }, - { - label: '企标制修订流程', - value: '4' - }, - { - label: '未符合项跟踪流程', - value: '5' - }, - { - label: '企标制修订申请流程', - value: '6' - }, - { - label: '企标废止流程', - value: '7' - }, - { - label: '企标延期制修订申请流程', - value: '8' - }, - { - label: '标准采购流程', - value: '9' - }, - { - label: '工作组会前申请流程', - value: '10' - }, - { - label: '企标制修订评估流程', - value: '11' - }, - { - label: '企标勘误流程', - value: '12' - }, - { - label: '行政管理要求评估流程', - value: '13' - }, - { - label: '政策入库及评估流程', - value: '14' - }, - { - label: '标准翻译申请流程', - value: '15' - }, - { - label: '工作组会后管理流程', - value: '16' - }, - { - label: '企标备案流程', - value: '17' - }, - { - label: '标准法规清单发布/更新流程', - value: '18' - }, - { - label: '企标复审流程', - value: '19' - } - ], - formDisableFlag: false, - pickerOptions: { - disabledDate(time) { - const start = new Date(new Date().toLocaleDateString()); - start.setTime(start.getTime()); - return time.getTime() < start - } + return { + processTypeList: [ + { + label: '标准入库流程', + value: '1' + }, + ], + formDisableFlag: false, + pickerOptions: { + disabledDate(time) { + const start = new Date(new Date().toLocaleDateString()); + start.setTime(start.getTime()); + return time.getTime() < start + } + } } - } }, methods: { /** diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index a4291c72b..efed470a0 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -4,8 +4,8 @@

标准法规管理流程
-
标准调研流程
-
标准入库流程
+
标准调研流程
+
标准入库流程
标准征求意见流程
标准需求(翻译)申请流程
标准发放申请流程
@@ -46,13 +46,13 @@ export default { this.$store.commit('setDetailMap', this.$route.path) this.$store.commit('setHandleInfo') switch (prcType) { - case '1': + case '2': // 标准调研流程 this.$router.push({ name: 'bzdyStep1' }) break - case '2': + case '1': // 标准入库流程 this.$router.push({ name: 'bzrkStep1' diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index b40e0992f..3769ea0de 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -82,6 +82,9 @@ align="center" width="180" > + { + this.processList = res.list + this.total = res.count + }, e => { + }) }, + selectProcessBtn () { // 搜索按钮 this.pageNo = 1 this.queryProcess() diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index 5606b96b1..30f4beac0 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -142,57 +142,57 @@ align="center"> + prop="standardItem" + label="标准章条"> @@ -201,22 +201,22 @@ align="center" label="在产产品"> diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue index 6a9d684ba..486dcaa66 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue @@ -148,26 +148,25 @@ align="center"> - { + if (res.ok) { + this.sarProStateListDatas = res.data.records + this.sarProStateTotal = res.data.total + } + }) + this.showSarProStateModal = true + }, // 查询项目数据 clearSearchProState () { this.sarProStateEO.productName = '' this.querySarProStateZero() From e51c79f98c8a84f25c36159a03bda91f10ae060a Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 18 Jun 2021 17:56:06 +0800 Subject: [PATCH 5/5] commit --- .../pages/creatProcess/bzrk/step2.vue | 831 ++++++++++++++++++ .../tabComponents/processCenter/index.vue | 12 + src/router/index.js | 9 + 3 files changed, 852 insertions(+) create mode 100644 src/pages/processCenter/pages/creatProcess/bzrk/step2.vue diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue new file mode 100644 index 000000000..55f15899b --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -0,0 +1,831 @@ + + + + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 3769ea0de..e9a545f17 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -215,6 +215,18 @@ export default { this.queryProcess() }, dealWith (row) { // 办理 + switch(row.prcType) { + case '1': + if (row.taskInfo === '标准法规业务经理审批') { + this.$router.push({ + name: 'bzrkStep2', + query: { + taskIds: row.taskIds, + prcId: row.prcId + } + }) + } + } }, ...mapMutations(['setProcess', 'setHandleInfo']), ...mapActions(['setMenu']) diff --git a/src/router/index.js b/src/router/index.js index 36b509f87..9467a539c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -240,6 +240,15 @@ const routes = [ title: '标准入库流程' } }, + { + path: '/bzrkStep2', + name: 'bzrkStep2', + component: () => import('@/pages/processCenter/pages/creatProcess/bzrk/step2.vue'), + meta: { + requireAuth: true, + title: '标准入库流程' + } + }, { path: '/bzdyStep1', name: 'bzdyStep1',