From 9addec248cbe590744bebaee5d7057b600e0a47d Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 13 Dec 2022 15:12:46 +0800 Subject: [PATCH 01/26] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzdy/step5-1.vue | 538 ++++++++++++ .../pages/creatProcess/bzpg/step8-2.vue | 786 +++++++++++++++++ .../pages/creatProcess/bzzqyj/step5-1.vue | 813 ++++++++++++++++++ .../pages/processDetail/index.vue | 102 +++ src/router/index.js | 25 + 5 files changed, 2264 insertions(+) create mode 100644 src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue create mode 100644 src/pages/processCenter/pages/creatProcess/bzpg/step8-2.vue create mode 100644 src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue new file mode 100644 index 000000000..bb29aea0e --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue @@ -0,0 +1,538 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8-2.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8-2.vue new file mode 100644 index 000000000..19481e33b --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8-2.vue @@ -0,0 +1,786 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue new file mode 100644 index 000000000..355a89064 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue @@ -0,0 +1,813 @@ + + + + + diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index e0dd8d72c..7ad6211d8 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -31,6 +31,11 @@ @click="adjustmentHandler" round >调整处理人 + 流程审批 @@ -194,6 +199,89 @@ export default { } }) }, + // 流程审批 + approveHandler(){ + let index = this.detailData.length - 1 // 当前流程任务最后一步index + let isEnd = true + let row = {...this.detailData[0]} + row.taskIds = row.id + row.taskInfo = row.name + row.tabsName = this.$route.query.tabsName + let prcType = this.detailData[index].prcType // 流程类型 + if (isEnd) { + if (this.$store.state.detailMap !== '') { + let lastDetailMap = this.$store.getters.getLastDetailMap + lastDetailMap.push(this.$store.state.detailMap) + this.$store.commit('setLastDetailMap', JSON.stringify(lastDetailMap)) + } + this.$store.commit('setDetailMap', this.$route.path) + row.isEnd = isEnd + this.setHandleInfo((JSON.stringify(row))) + this.setPrcLastDetail((JSON.stringify(row))) + // 根据type判断跳转具体流程页面 + if (prcType === '1') { + row = {...this.detailData[0]} + // 标准入库流程数据 //第一步 + this.toProcessDetail('bzrkStep1',row) + }else if(prcType === '2'){ + //标准调研流程 //第五步 + row = {...this.detailData[4]} + this.toProcessDetail('bzdyStep5-1',row) + }else if(prcType === '3'){ + //标准征求意见 第七步 + row = {...this.detailData[6]} + this.toProcessDetail('bzzqyjStep5-1',row) + }else if(prcType === '4'){ + //标准清单发布流程数据 第一步 + this.toProcessDetail('bzqdfbStep1',row) + } else if(prcType === '9') { + //标准解读流程 数据汇总页面 最后一步 暂时没有 + // this.toProcessDetail('bzjdStep1', row) + }else if (prcType === '5'){ + //标准合规评估流程 最后一步 + row = {...this.detailData[index]} + this.toProcessDetail('bzpgStep8-2',row) + }else if(prcType === '6'){ + //项目合规评估流程 最后一步 + row = {...this.detailData[index]} + this.toProcessDetail('xmpg2Step12',row) + }else if(prcType === '10'){ + //项目清单确认 最后一步 + row = {...this.detailData[index]} + this.toProcessDetail('xmqdqrStep4',row) + }else if (prcType === '8') { + // 未符合项整改 3 + row = {...this.detailData[2]} + this.toProcessDetail('wfhxzgStep3',row) + }else if(prcType === 'buss1'){ + //企标制修订 技术标准 第9 + row = {...this.detailData[8]} + this.toProcessDetail('bussLibrary9',row) + }else if(prcType === 'buss2'){ + //企标 产品标准 6 + row = {...this.detailData[5]} + this.toProcessDetail('bussLibraryProduct6',row) + }else if(prcType === 'buss3'){ + //企标复审 4 + row = {...this.detailData[3]} + this.toProcessDetail('qbfsStep4',row) + }else if(prcType === '24'){ + //企标废止 3 + row = {...this.detailData[2]} + this.toProcessDetail('qbfzStep1',row) + }else if(prcType === '25'){ + //企标制修订计划管控 1 + row = {...this.detailData[0]} + this.toProcessDetail('qbzxdjhgkStep1',row) + }else if(prcType === '26'){ + //企标制修订计划立项 1 + row = {...this.detailData[0]} + this.toProcessDetail('qbzxdlxStep1',row) + } + } else { + this.$message.warning('当前流程未全部办理完成，无法查看') + } + }, /** * @author liruohao * @date 2019/4/22 @@ -1078,6 +1166,19 @@ export default { } } this.processTable() + }, + // 流程审批按钮是否显示 + getApproveShow(){ + this.$http.get('lawss/activiti/get_gather_by_instance',{ + prcNum: this.$route.query.prcNum, + sortWord: this.shunxu ? this.paixu : '', + shunxu: this.shunxu + },{ + loading: 'loading', + _this: this + }, res => { + console.log(res) + }, e => {}) } }, components: { @@ -1112,6 +1213,7 @@ export default { mounted () { this.processNum() this.processTable() + this.getApproveShow() } } diff --git a/src/router/index.js b/src/router/index.js index e9a655477..1a16542e7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -737,6 +737,14 @@ const routes = [ requireAuth: true, title: '标准合规评估流程' } + },{ + path: '/bzpgStep8-2', + name: 'bzpgStep8-2', + component: () => import('@/pages/processCenter/pages/creatProcess/bzpg/step8-2.vue'), + meta: { + requireAuth: true, + title: '标准合规评估流程' + } }, { path: '/xmpgStep1', @@ -1536,6 +1544,14 @@ const routes = [ requireAuth: true, title: '标准调研流程' } + },{ + path: '/bzzqyjStep5-1', + name: 'bzzqyjStep5-1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue'), + meta: { + requireAuth: true, + title: '标准调研流程' + } }, { path: '/bzzqyjStep8', @@ -1652,6 +1668,15 @@ const routes = [ title: '标准调研流程' } }, + { + path: '/bzdyStep5-1', + name: 'bzdyStep5-1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue'), + meta: { + requireAuth: true, + title: '标准调研流程' + } + }, { path: '/bzdyStep6', name: 'bzdyStep6', From c2206f0a69ad098efff2a613184e2a5f243bb7f4 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 13 Dec 2022 18:07:12 +0800 Subject: [PATCH 02/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=89=E9=92=AE=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B1=87=E6=80=BB=E9=A1=B5=E9=9D=A2=20(?= =?UTF-8?q?=E6=A0=87=E5=87=86=E8=B0=83=E7=A0=94=E6=B5=81=E7=A8=8B=20?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=20=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E9=A1=B9=E7=9B=AE=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E9=A1=B9=E7=9B=AE=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzdy/step5-1.vue | 9 +- .../pages/creatProcess/bzpg/step8-2.vue | 19 +- .../pages/creatProcess/xmpg/step5-1.vue | 658 +++++++++ .../pages/creatProcess/xmqdqr/step4-1.vue | 1238 +++++++++++++++++ .../pages/processDetail/index.vue | 33 +- src/router/index.js | 18 + 6 files changed, 1940 insertions(+), 35 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue create mode 100644 src/pages/processCenter/pages/creatProcess/xmqdqr/step4-1.vue diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue index bb29aea0e..a49e5f9a2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue @@ -76,8 +76,8 @@ - 隐藏基础信息 - 展开基础信息 + 隐藏基础信息 + 展开基础信息 @@ -132,8 +132,8 @@ - - + +
- 隐藏基础信息 - 展开基础信息 + 隐藏基础信息 + 展开基础信息 @@ -283,10 +283,10 @@ label="评估人" /> - - + +
- 流程列表加载中
- - +
+ + + + +
+
基础信息
+
审批历史
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + +
+ + +
+ + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + 流程列表加载中 +
+
+ + + + +
+ + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4-1.vue new file mode 100644 index 000000000..be6aaa8c9 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4-1.vue @@ -0,0 +1,1238 @@ + + + + + + diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 7ad6211d8..c769c9649 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -31,11 +31,11 @@ @click="adjustmentHandler" round >调整处理人 - 流程审批 + >汇总流程 @@ -147,6 +147,8 @@ export default { name: 'processDetail', data () { return { + approveShow:false, + approveRowIndex:0, assigneeNewLoading: false, // 调整处理人确定loading loginPeople: '', // 调整处理人抽屉状态 @@ -199,11 +201,11 @@ export default { } }) }, - // 流程审批 + // 汇总流程 approveHandler(){ let index = this.detailData.length - 1 // 当前流程任务最后一步index let isEnd = true - let row = {...this.detailData[0]} + let row = {...this.detailData[this.approveRowIndex]}//汇总页数据 row.taskIds = row.id row.taskInfo = row.name row.tabsName = this.$route.query.tabsName @@ -220,16 +222,13 @@ export default { this.setPrcLastDetail((JSON.stringify(row))) // 根据type判断跳转具体流程页面 if (prcType === '1') { - row = {...this.detailData[0]} // 标准入库流程数据 //第一步 this.toProcessDetail('bzrkStep1',row) }else if(prcType === '2'){ //标准调研流程 //第五步 - row = {...this.detailData[4]} this.toProcessDetail('bzdyStep5-1',row) }else if(prcType === '3'){ //标准征求意见 第七步 - row = {...this.detailData[6]} this.toProcessDetail('bzzqyjStep5-1',row) }else if(prcType === '4'){ //标准清单发布流程数据 第一步 @@ -239,47 +238,36 @@ export default { // this.toProcessDetail('bzjdStep1', row) }else if (prcType === '5'){ //标准合规评估流程 最后一步 - row = {...this.detailData[index]} this.toProcessDetail('bzpgStep8-2',row) }else if(prcType === '6'){ //项目合规评估流程 最后一步 - row = {...this.detailData[index]} - this.toProcessDetail('xmpg2Step12',row) + // this.toProcessDetail('xmpg2Step12-1',row) + this.toProcessDetail('xmpgStep5-1',row) }else if(prcType === '10'){ //项目清单确认 最后一步 - row = {...this.detailData[index]} - this.toProcessDetail('xmqdqrStep4',row) + this.toProcessDetail('xmqdqrStep4-1',row) }else if (prcType === '8') { // 未符合项整改 3 - row = {...this.detailData[2]} this.toProcessDetail('wfhxzgStep3',row) }else if(prcType === 'buss1'){ //企标制修订 技术标准 第9 - row = {...this.detailData[8]} this.toProcessDetail('bussLibrary9',row) }else if(prcType === 'buss2'){ //企标 产品标准 6 - row = {...this.detailData[5]} this.toProcessDetail('bussLibraryProduct6',row) }else if(prcType === 'buss3'){ //企标复审 4 - row = {...this.detailData[3]} this.toProcessDetail('qbfsStep4',row) }else if(prcType === '24'){ //企标废止 3 - row = {...this.detailData[2]} this.toProcessDetail('qbfzStep1',row) }else if(prcType === '25'){ //企标制修订计划管控 1 - row = {...this.detailData[0]} this.toProcessDetail('qbzxdjhgkStep1',row) }else if(prcType === '26'){ //企标制修订计划立项 1 - row = {...this.detailData[0]} this.toProcessDetail('qbzxdlxStep1',row) } - } else { - this.$message.warning('当前流程未全部办理完成，无法查看') } }, /** @@ -1177,7 +1165,8 @@ export default { loading: 'loading', _this: this }, res => { - console.log(res) + this.approveShow = res[res.length-1].isGather + this.approveRowIndex = res[res.length-1].index }, e => {}) } }, diff --git a/src/router/index.js b/src/router/index.js index 1a16542e7..65b0e35b2 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -791,6 +791,15 @@ const routes = [ title: '项目合规评估流程' } }, + { + path: '/xmpgStep5-1', + name: 'xmpgStep5-1', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程' + } + }, { path: '/xmpgStep1-5', name: 'xmpgStep1-5', @@ -971,6 +980,15 @@ const routes = [ title: '项目清单确认流程' } }, + { + path: '/xmqdqrStep4-1', + name: 'xmqdqrStep4-1', + component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step4-1.vue'), + meta: { + requireAuth: true, + title: '项目清单确认流程' + } + }, { path: '/xmqdqrStep1-4', name: 'xmqdqrStep1-4', From c1d302fbbeaae3d11fb97d9049b29c3581e28b95 Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 14 Dec 2022 09:19:51 +0800 Subject: [PATCH 03/26] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2(=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=B5=81=E7=A8=8B)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1-1.vue | 4049 +++++++++++++++++ .../pages/processDetail/index.vue | 2 +- src/router/index.js | 9 + 3 files changed, 4059 insertions(+), 1 deletion(-) create mode 100644 src/pages/processCenter/pages/creatProcess/bzrk/step1-1.vue diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1-1.vue new file mode 100644 index 000000000..2c56a6a75 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1-1.vue @@ -0,0 +1,4049 @@ + + + + + diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index c769c9649..9e0891558 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -223,7 +223,7 @@ export default { // 根据type判断跳转具体流程页面 if (prcType === '1') { // 标准入库流程数据 //第一步 - this.toProcessDetail('bzrkStep1',row) + this.toProcessDetail('bzrkStep1-1',row) }else if(prcType === '2'){ //标准调研流程 //第五步 this.toProcessDetail('bzdyStep5-1',row) diff --git a/src/router/index.js b/src/router/index.js index 65b0e35b2..cb93873e1 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1061,6 +1061,15 @@ const routes = [ title: '标准入库流程' } }, + { + path: '/bzrkStep1-1', + name: 'bzrkStep1-1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzrk/step1-1.vue'), + meta: { + requireAuth: true, + title: '标准入库流程' + } + }, { path: '/bzrkStep3', name: 'bzrkStep3', From 9acd7dee72cc3cc107991b210765beb6590460de Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 14 Dec 2022 09:29:11 +0800 Subject: [PATCH 04/26] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2(=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=8F=91=E5=B8=83/=E6=9B=B4=E6=96=B0=E6=B5=81=E7=A8=8B)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1_1.vue | 1676 +++++++++++++++++ .../pages/processDetail/index.vue | 2 +- src/router/index.js | 9 + 3 files changed, 1686 insertions(+), 1 deletion(-) create mode 100644 src/pages/processCenter/pages/creatProcess/bzqdfb/step1_1.vue diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1_1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1_1.vue new file mode 100644 index 000000000..d36095150 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1_1.vue @@ -0,0 +1,1676 @@ + + + + + + diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 9e0891558..f17809f7b 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -232,7 +232,7 @@ export default { this.toProcessDetail('bzzqyjStep5-1',row) }else if(prcType === '4'){ //标准清单发布流程数据 第一步 - this.toProcessDetail('bzqdfbStep1',row) + this.toProcessDetail('bzqdfbStep1_1',row) } else if(prcType === '9') { //标准解读流程 数据汇总页面 最后一步 暂时没有 // this.toProcessDetail('bzjdStep1', row) diff --git a/src/router/index.js b/src/router/index.js index cb93873e1..fe3570e43 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -432,6 +432,15 @@ const routes = [ title: '标准清单发布/更新流程' } }, + { + path: '/bzqdfbStep1_1', + name: 'bzqdfbStep1_1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzqdfb/step1_1.vue'), + meta: { + requireAuth: true, + title: '标准清单发布/更新流程' + } + }, { path: '/bzqdfbStep1-1', name: 'bzqdfbStep1-1', From 53945c80d844c4481df7d6661b220b573e1d02b9 Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 14 Dec 2022 09:37:15 +0800 Subject: [PATCH 05/26] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2(=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbzxdjhgk/step1-1.vue | 833 ++++++++++++++++++ .../pages/processDetail/index.vue | 2 +- src/router/index.js | 9 + 3 files changed, 843 insertions(+), 1 deletion(-) create mode 100644 src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-1.vue diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-1.vue new file mode 100644 index 000000000..41a3453ba --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-1.vue @@ -0,0 +1,833 @@ + + + + + diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index f17809f7b..5a52a028b 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -263,7 +263,7 @@ export default { this.toProcessDetail('qbfzStep1',row) }else if(prcType === '25'){ //企标制修订计划管控 1 - this.toProcessDetail('qbzxdjhgkStep1',row) + this.toProcessDetail('qbzxdjhgkStep1-1',row) }else if(prcType === '26'){ //企标制修订计划立项 1 this.toProcessDetail('qbzxdlxStep1',row) diff --git a/src/router/index.js b/src/router/index.js index fe3570e43..29e52ef2a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2309,6 +2309,15 @@ const routes = [ title: '企标制修订计划管控流程' } }, + { + path: '/qbzxdjhgkStep1-1', + name: 'qbzxdjhgkStep1-1', + component: () => import('@/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-1.vue'), + meta: { + requireAuth: true, + title: '企标制修订计划管控流程' + } + }, { path: '/qbzxdjhgkStep2', name: 'qbzxdjhgkStep2', From 3e00eec59a5b6283f8ac738471928ada9f62ef9a Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 14 Dec 2022 09:52:13 +0800 Subject: [PATCH 06/26] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2(=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E7=AB=8B=E9=A1=B9=E8=AE=A1=E5=88=92=E6=B5=81=E7=A8=8B?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbzxdlx/step1-1.vue | 1199 +++++++++++++++++ .../pages/processDetail/index.vue | 2 +- src/router/index.js | 9 + 3 files changed, 1209 insertions(+), 1 deletion(-) create mode 100644 src/pages/processCenter/pages/creatProcess/qbzxdlx/step1-1.vue diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1-1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1-1.vue new file mode 100644 index 000000000..f379f15f6 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1-1.vue @@ -0,0 +1,1199 @@ + + + + + diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 5a52a028b..0ea29f01a 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -266,7 +266,7 @@ export default { this.toProcessDetail('qbzxdjhgkStep1-1',row) }else if(prcType === '26'){ //企标制修订计划立项 1 - this.toProcessDetail('qbzxdlxStep1',row) + this.toProcessDetail('qbzxdlxStep1-1',row) } } }, diff --git a/src/router/index.js b/src/router/index.js index 29e52ef2a..36a9997b7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2382,6 +2382,15 @@ const routes = [ title: '企标制修订立项计划流程（流程发起）' } }, + { + path: '/qbzxdlxStep1-1', + name: 'qbzxdlxStep1-1', + component: () => import('@/pages/processCenter/pages/creatProcess/qbzxdlx/step1-1.vue'), + meta: { + requireAuth: true, + title: '企标制修订立项计划流程（流程发起）' + } + }, { path: '/qbzxdlxStep2', name: 'qbzxdlxStep2', From 4b9dea934de1d86ef22e3c2535630f3bcaf04375 Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 14 Dec 2022 10:26:25 +0800 Subject: [PATCH 07/26] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2(=E4=BC=81=E6=A0=87=E5=BA=9F=E6=AD=A2?= =?UTF-8?q?=E6=B5=81=E7=A8=8B)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbfz/step4-1.vue | 588 ++++++++++++++++++ .../pages/processDetail/index.vue | 2 +- src/router/index.js | 9 + 3 files changed, 598 insertions(+), 1 deletion(-) create mode 100644 src/pages/processCenter/pages/creatProcess/qbfz/step4-1.vue diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step4-1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step4-1.vue new file mode 100644 index 000000000..7777ffc6a --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step4-1.vue @@ -0,0 +1,588 @@ + + + + + diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 0ea29f01a..53ffe7d73 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -260,7 +260,7 @@ export default { this.toProcessDetail('qbfsStep4',row) }else if(prcType === '24'){ //企标废止 3 - this.toProcessDetail('qbfzStep1',row) + this.toProcessDetail('qbfzStep4-1',row) }else if(prcType === '25'){ //企标制修订计划管控 1 this.toProcessDetail('qbzxdjhgkStep1-1',row) diff --git a/src/router/index.js b/src/router/index.js index 36a9997b7..ba83afe9b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2263,6 +2263,15 @@ const routes = [ title: '企标废止流程' } }, + { + path: '/qbfzStep4-1', + name: 'qbfzStep4-1', + component: () => import('@/pages/processCenter/pages/creatProcess/qbfz/step4-1.vue'), + meta: { + requireAuth: true, + title: '企标废止流程' + } + }, { path: '/qbfzStep5', name: 'qbfzStep5', From 370bb3d219c3f26364fce1683c7d35764845db57 Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 14 Dec 2022 14:07:43 +0800 Subject: [PATCH 08/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/bzdy/step5-1.vue | 10 +++++++++- src/pages/processCenter/pages/processDetail/index.vue | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue index a49e5f9a2..88cd785f8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue @@ -435,13 +435,21 @@ }) }, getData() { + this.$http.get("lawss/activiti/queryTaskIndex", { + bpnId:this.$route.query.bpnId, + index:this.$route.query.index + }, { + _this: this + }, res => { + console.log(res) + }, e => { + }); return new Promise((resolve, reject) => { inboundLiaisonDetail({ taskIds: this.taskIds, pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - console.log(data); let jsonData = JSON.parse(res.mesg) this.jsonData = jsonData.form ? jsonData.form : jsonData this.commentText5 = data.commentText5 || '' diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 53ffe7d73..aa43897ab 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -398,6 +398,7 @@ export default { prcType: row.prcType, disabledXX:true, verifySarStandard:true, + index:this.approveRowIndex } } if (unShowReceipt) { From 698a988219279fea7ae81331e7748936d5d71a92 Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 14 Dec 2022 14:56:25 +0800 Subject: [PATCH 09/26] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2(=E4=BC=81=E6=A0=87=E5=A4=8D=E5=AE=A1?= =?UTF-8?q?=E6=B5=81=E7=A8=8B)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/processDetail/index.vue | 2 +- src/router/index.js | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index aa43897ab..99a122671 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -257,7 +257,7 @@ export default { this.toProcessDetail('bussLibraryProduct6',row) }else if(prcType === 'buss3'){ //企标复审 4 - this.toProcessDetail('qbfsStep4',row) + this.toProcessDetail('bussFs2-1',row) }else if(prcType === '24'){ //企标废止 3 this.toProcessDetail('qbfzStep4-1',row) diff --git a/src/router/index.js b/src/router/index.js index ba83afe9b..87d060172 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2162,6 +2162,15 @@ const routes = [ title: '企标复审流程' } }, + { + path: '/bussFs2-1', + name: 'bussFs2-1', + component: () => import('@/pages/processCenter/pages/creatProcess/qbfs/step4-1.vue'), + meta: { + requireAuth: true, + title: '企标复审流程' + } + }, { path: '/bussFsC2', name: 'bussFsC2', From d23dfd73b74a812765625069f5ed6bfae48490a3 Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 14 Dec 2022 14:57:07 +0800 Subject: [PATCH 10/26] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2(=E4=BC=81=E6=A0=87=E5=A4=8D=E5=AE=A1?= =?UTF-8?q?=E6=B5=81=E7=A8=8B)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qbfs/common/formListStep4-1.vue | 932 ++++++++++++++++++ .../pages/creatProcess/qbfs/step4-1.vue | 795 +++++++++++++++ 2 files changed, 1727 insertions(+) create mode 100644 src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep4-1.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbfs/step4-1.vue diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep4-1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep4-1.vue new file mode 100644 index 000000000..bd352bf5a --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep4-1.vue @@ -0,0 +1,932 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step4-1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step4-1.vue new file mode 100644 index 000000000..4ec79b493 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step4-1.vue @@ -0,0 +1,795 @@ + + + + + From 8f7ed7ea1c74bef4acfce3461e3d05c0c0964b29 Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 14 Dec 2022 17:51:52 +0800 Subject: [PATCH 11/26] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2(=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzdy/step5-1.vue | 2 +- .../pages/creatProcess/wfhxzg/step3-1.vue | 575 ++++++++++++++++++ .../pages/creatProcess/wfhxzg/step3.vue | 1 + .../pages/processDetail/index.vue | 5 +- src/router/index.js | 9 + 5 files changed, 589 insertions(+), 3 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/wfhxzg/step3-1.vue diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue index 88cd785f8..9cc739ea8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue @@ -436,7 +436,7 @@ }, getData() { this.$http.get("lawss/activiti/queryTaskIndex", { - bpnId:this.$route.query.bpnId, + prcId:this.$route.query.processInstanceId, index:this.$route.query.index }, { _this: this diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3-1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3-1.vue new file mode 100644 index 000000000..d71e2e5de --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3-1.vue @@ -0,0 +1,575 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index 4007f8371..94509d2a6 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -256,6 +256,7 @@ export default { }) }, getFormFieldList (item) { + console.log(item) this.$nextTick(() => { if (item.passInfo !== 0) { this.passInfo = JSON.parse(JSON.stringify(item)).passInfo diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 99a122671..6c4d5245d 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -248,7 +248,7 @@ export default { this.toProcessDetail('xmqdqrStep4-1',row) }else if (prcType === '8') { // 未符合项整改 3 - this.toProcessDetail('wfhxzgStep3',row) + this.toProcessDetail('wfhxzgStep3-1',row) }else if(prcType === 'buss1'){ //企标制修订 技术标准 第9 this.toProcessDetail('bussLibrary9',row) @@ -398,7 +398,8 @@ export default { prcType: row.prcType, disabledXX:true, verifySarStandard:true, - index:this.approveRowIndex + index:this.approveRowIndex, + processInstanceId:row.processInstanceId } } if (unShowReceipt) { diff --git a/src/router/index.js b/src/router/index.js index 87d060172..c9a16a43d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1034,6 +1034,15 @@ const routes = [ title: '未符合项整改/更新流程' } }, + { + path: '/wfhxzgStep3-1', + name: 'wfhxzgStep3-1', + component: () => import('@/pages/processCenter/pages/creatProcess/wfhxzg/step3-1.vue'), + meta: { + requireAuth: true, + title: '未符合项整改/更新流程' + } + }, { path: '/wfhxzgStep4', name: 'wfhxzgStep4', From 7d4d3724cb7d99c3ae5c76a7b2ae19cf6e66dcd4 Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 15 Dec 2022 10:29:33 +0800 Subject: [PATCH 12/26] =?UTF-8?q?=E6=B1=87=E6=80=BB(=E6=A0=87=E5=87=86?= =?UTF-8?q?=E8=B0=83=E7=A0=94=E6=B5=81=E7=A8=8B)=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzdy/step5-1.vue | 114 +++++++++++------- 1 file changed, 72 insertions(+), 42 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue index 9cc739ea8..9d581ca7e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue @@ -56,6 +56,7 @@ {{ form.hzfileName }} { - console.log(res) - }, e => { - }); - return new Promise((resolve, reject) => { - inboundLiaisonDetail({ - taskIds: this.taskIds, - pId: this.pId - }).then(res => { - let data = JSON.parse(res.mesg) - let jsonData = JSON.parse(res.mesg) - this.jsonData = jsonData.form ? jsonData.form : jsonData - this.commentText5 = data.commentText5 || '' - this.form.title = data.title || data.form.title - this.form.processName = data.processName || data.form.processName - this.form.date = data.date || data.form.date - let arr = data.responUserList || data.form.responUserList - let newArr = [] - for (let a = 0; a { - arr[a].institutionName = res.data[0].institutionName - }) - newArr.push(arr[a]) - } - this.tableData = newArr - this.form.hzfileId = data.form ? data.form.hzfileId : (data.hzfileId ? data.hzfileId : '') - this.form.hzfileName = data.form ? data.form.hzfileName : (data.hzfileName ? data.hzfileName : '') - this.newDocUser = data.form ? data.form.docUser : data.docUser - this.json = data || data.form - }).catch(e => { - }) - }) + return new Promise((resolve, reject) => { + this.$http.get("lawss/activiti/queryTaskIndex", { + prcId: this.$route.query.processInstanceId, + index: this.$route.query.index + }, { + _this: this + }, res => { + this.$nextTick(()=>{ + let data = JSON.parse(res.mesg) + let jsonData = JSON.parse(res.mesg) + this.jsonData = jsonData.form ? jsonData.form : jsonData + this.form.title = data.title || data.form.title + this.form.processName = data.processName || data.form.processName + this.form.date = data.date || data.form.date + let arr = data.responUserList || data.form.responUserList + let newArr = [] + for (let a = 0; a < arr.length; a++) { + arr[a].institutionName = '' + this.$http.get('sarUser/user/selectDeptByDY', { + ids: arr[a].dockUser + }, { + _this: this + }, res => { + arr[a].institutionName = res.data[0].institutionName + }) + newArr.push(arr[a]) + } + this.tableData = newArr + this.form.hzfileId = data.fileId + this.form.hzfileName = data.fileName + this.newDocUser = data.form ? data.form.docUser : data.docUser + this.json = data || data.form + + this.commentText5 = res.commitText || '' + }) + }, e => { + }); + }) + // return new Promise((resolve, reject) => { + // inboundLiaisonDetail({ + // taskIds: this.taskIds, + // pId: this.pId + // }).then(res => { + // let data = JSON.parse(res.mesg) + // let jsonData = JSON.parse(res.mesg) + // this.jsonData = jsonData.form ? jsonData.form : jsonData + // this.commentText5 = data.commentText5 || '' + // this.form.title = data.title || data.form.title + // this.form.processName = data.processName || data.form.processName + // this.form.date = data.date || data.form.date + // let arr = data.responUserList || data.form.responUserList + // let newArr = [] + // for (let a = 0; a { + // arr[a].institutionName = res.data[0].institutionName + // }) + // newArr.push(arr[a]) + // } + // this.tableData = newArr + // this.form.hzfileId = data.form ? data.form.hzfileId : (data.hzfileId ? data.hzfileId : '') + // this.form.hzfileName = data.form ? data.form.hzfileName : (data.hzfileName ? data.hzfileName : '') + // this.newDocUser = data.form ? data.form.docUser : data.docUser + // this.json = data || data.form + // }).catch(e => { + // }) + // }) }, }, mounted () { From f3b95693bdb8666f37182e3aa6effec4a1297733 Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 15 Dec 2022 10:47:29 +0800 Subject: [PATCH 13/26] =?UTF-8?q?=E6=B1=87=E6=80=BB(=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B)=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue index 355a89064..db7b76430 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue @@ -676,7 +676,7 @@ export default { pId: this.pId }).then(res => { let data = JSON.parse(res.mesg); - this.commentText5 = data.commentText5 || '' + this.commentText5 = data.commentText || '' this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName From 1642658d3f351adf23e5dfdd6dfb79c84740d221 Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 15 Dec 2022 11:09:26 +0800 Subject: [PATCH 14/26] =?UTF-8?q?=E6=B1=87=E6=80=BB(=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B)=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue index 673a6c6be..ffc22c8f3 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue @@ -454,6 +454,7 @@ export default { pId: this.pId }).then(res => { if (res) { + this.commentText = res.commitText const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); } @@ -489,12 +490,9 @@ export default { titleList.push(data.title); } }) - console.log(titleList,"titleList!!!!") - console.log(this.dataList,"dataList 进入方法前 !!!!") titleList.forEach(tl => { this.dataList.forEach(data=>{ if (data.title === tl){ - console.log(data.title,"方法中的title !!!!") ordelTitleList.push(data) } }) From 3f27a33cbdbc521df022dbf214d39e91fe9ff93d Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 15 Dec 2022 11:26:52 +0800 Subject: [PATCH 15/26] =?UTF-8?q?=E6=B1=87=E6=80=BB(=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B)=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzpg/step8-2.vue | 1 + src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8-2.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8-2.vue index fbc4bc27f..57cb4b6be 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step8-2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8-2.vue @@ -601,6 +601,7 @@ export default { pId: this.pId }).then(res => { if (res) { + this.commentText = res.commitText || '' const processForm = JSON.parse(res.mesg) this.getFormFieldList(processForm) } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue index ffc22c8f3..89b2528c9 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue @@ -454,7 +454,7 @@ export default { pId: this.pId }).then(res => { if (res) { - this.commentText = res.commitText + this.commentText = res.commitText || '' const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); } From d17e99e4b4918ecfe9be6244f90c753e33673c7c Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 15 Dec 2022 11:36:36 +0800 Subject: [PATCH 16/26] =?UTF-8?q?=E6=B1=87=E6=80=BB(=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B)=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/xmqdqr/step4-1.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4-1.vue index be6aaa8c9..069bb9633 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4-1.vue @@ -866,6 +866,7 @@ export default { pId: this.pId }).then(res => { if (res) { + this.commentText = res.commitText || '' const processForm = JSON.parse(res.mesg); let commitStatus = res.commitStatus if(commitStatus && commitStatus > 0){ From 1e4662e1cfb015efb9e3d83d87d97e4ebec6b48d Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Thu, 15 Dec 2022 13:38:31 +0800 Subject: [PATCH 17/26] =?UTF-8?q?=E6=8B=86=E5=88=86=E4=B8=8A=E4=B8=8B?= =?UTF-8?q?=E8=A7=92=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localTool/standAutoSplit/pages/itemSplitInfo.vue | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index d8a54e3c2..62e0b2512 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -2652,6 +2652,14 @@ export default { width:50%; height: 50%; } + /deep/.sub{ + vertical-align: sub; + font-size: small; + } + /deep/.sup{ + vertical-align: super; + font-size: small; + } .preImgStyle { text-align: center; /deep/.wordImg { From ccc79fb9ff0df56ee1ce6c7a74ab6a2fdc2afe87 Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 15 Dec 2022 16:12:13 +0800 Subject: [PATCH 18/26] =?UTF-8?q?=E6=B1=87=E6=80=BB(=E6=A0=87=E5=87=86?= =?UTF-8?q?=E8=B0=83=E7=A0=94=E6=B5=81=E7=A8=8B=20=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=20?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=BA=9F=E6=AD=A2=E6=B5=81=E7=A8=8B)?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzdy/step5-1.vue | 146 +++++++++--------- .../pages/creatProcess/bzzqyj/step5-1.vue | 1 + .../pages/creatProcess/qbfz/step4-1.vue | 4 +- .../pages/processDetail/index.vue | 5 +- 4 files changed, 82 insertions(+), 74 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue index 9d581ca7e..b9fff7703 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue @@ -436,77 +436,81 @@ }) }, getData() { - return new Promise((resolve, reject) => { - this.$http.get("lawss/activiti/queryTaskIndex", { - prcId: this.$route.query.processInstanceId, - index: this.$route.query.index - }, { - _this: this - }, res => { - this.$nextTick(()=>{ - let data = JSON.parse(res.mesg) - let jsonData = JSON.parse(res.mesg) - this.jsonData = jsonData.form ? jsonData.form : jsonData - this.form.title = data.title || data.form.title - this.form.processName = data.processName || data.form.processName - this.form.date = data.date || data.form.date - let arr = data.responUserList || data.form.responUserList - let newArr = [] - for (let a = 0; a < arr.length; a++) { - arr[a].institutionName = '' - this.$http.get('sarUser/user/selectDeptByDY', { - ids: arr[a].dockUser - }, { - _this: this - }, res => { - arr[a].institutionName = res.data[0].institutionName - }) - newArr.push(arr[a]) - } - this.tableData = newArr - this.form.hzfileId = data.fileId - this.form.hzfileName = data.fileName - this.newDocUser = data.form ? data.form.docUser : data.docUser - this.json = data || data.form - - this.commentText5 = res.commitText || '' - }) - }, e => { - }); - }) - // return new Promise((resolve, reject) => { - // inboundLiaisonDetail({ - // taskIds: this.taskIds, - // pId: this.pId - // }).then(res => { - // let data = JSON.parse(res.mesg) - // let jsonData = JSON.parse(res.mesg) - // this.jsonData = jsonData.form ? jsonData.form : jsonData - // this.commentText5 = data.commentText5 || '' - // this.form.title = data.title || data.form.title - // this.form.processName = data.processName || data.form.processName - // this.form.date = data.date || data.form.date - // let arr = data.responUserList || data.form.responUserList - // let newArr = [] - // for (let a = 0; a { - // arr[a].institutionName = res.data[0].institutionName - // }) - // newArr.push(arr[a]) - // } - // this.tableData = newArr - // this.form.hzfileId = data.form ? data.form.hzfileId : (data.hzfileId ? data.hzfileId : '') - // this.form.hzfileName = data.form ? data.form.hzfileName : (data.hzfileName ? data.hzfileName : '') - // this.newDocUser = data.form ? data.form.docUser : data.docUser - // this.json = data || data.form - // }).catch(e => { - // }) - // }) + // return new Promise((resolve, reject) => { + // this.$http.get("lawss/activiti/queryTaskIndex", { + // prcId: this.$route.query.processInstanceId, + // taskIds: this.$route.query.taskIds + // }, { + // _this: this + // }, res => { + // this.$nextTick(()=>{ + // console.log(res) + // let data = JSON.parse(res.mesg) + // let jsonData = JSON.parse(res.mesg) + // console.log(jsonData) + // this.jsonData = jsonData.form ? jsonData.form : jsonData + // this.form.title = data.title || data.form.title + // this.form.processName = data.processName || data.form.processName + // this.form.date = data.date || data.form.date + // let arr = data.responUserList || data.form.responUserList + // let newArr = [] + // for (let a = 0; a < arr.length; a++) { + // arr[a].institutionName = '' + // this.$http.get('sarUser/user/selectDeptByDY', { + // ids: arr[a].dockUser + // }, { + // _this: this + // }, res => { + // arr[a].institutionName = res.data[0].institutionName + // }) + // newArr.push(arr[a]) + // } + // this.tableData = newArr + // // this.form.hzfileId = data.fileId + // // this.form.hzfileName = data.fileName + // this.form.hzfileId = data.form ? data.form.hzfileId : (data.hzfileId ? data.hzfileId : '') + // this.form.hzfileName = data.form ? data.form.hzfileName : (data.hzfileName ? data.hzfileName : '') + // this.newDocUser = data.form ? data.form.docUser : data.docUser + // this.json = data || data.form + // + // this.commentText5 = res.commitText || '' + // }) + // }, e => { + // }); + // }) + return new Promise((resolve, reject) => { + inboundLiaisonDetail({ + taskIds: this.taskIds, + pId: this.pId + }).then(res => { + let data = JSON.parse(res.mesg) + let jsonData = JSON.parse(res.mesg) + this.commentText5 = data.commentText || '' + this.jsonData = jsonData.form ? jsonData.form : jsonData + this.form.title = data.title || data.form.title + this.form.processName = data.processName || data.form.processName + this.form.date = data.date || data.form.date + let arr = data.responUserList || data.form.responUserList + let newArr = [] + for (let a = 0; a { + arr[a].institutionName = res.data[0].institutionName + }) + newArr.push(arr[a]) + } + this.tableData = newArr + this.form.hzfileId = data.form ? data.form.hzfileId : (data.hzfileId ? data.hzfileId : '') + this.form.hzfileName = data.form ? data.form.hzfileName : (data.hzfileName ? data.hzfileName : '') + this.newDocUser = data.form ? data.form.docUser : data.docUser + this.json = data || data.form + }).catch(e => { + }) + }) }, }, mounted () { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue index db7b76430..39f440ebe 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue @@ -676,6 +676,7 @@ export default { pId: this.pId }).then(res => { let data = JSON.parse(res.mesg); + console.log(data) this.commentText5 = data.commentText || '' this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step4-1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step4-1.vue index 7777ffc6a..5ca8bfef6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step4-1.vue @@ -278,7 +278,7 @@ export default { data() { return { activesNames:'1', - disabledXX:this.$route.query.disabledXX, + disabledXX:!!this.$route.query.disabledXX, active: "1", isTransfer: false, isSubmit: false, @@ -360,9 +360,9 @@ export default { * @description: 动态表单读取 */ getFormFieldList(item) { - console.log(item); this.$nextTick(() => { this.qbfsForm = JSON.parse(JSON.stringify(item)); + this.commentText = item.commentText let res = item.res ? item.res.substring(1, item.res.lastIndexOf("]")) : ""; res = res.split(","); this.dataList = []; diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 6c4d5245d..363b77b35 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -205,7 +205,10 @@ export default { approveHandler(){ let index = this.detailData.length - 1 // 当前流程任务最后一步index let isEnd = true - let row = {...this.detailData[this.approveRowIndex]}//汇总页数据 + let row = {...this.detailData[this.approveRowIndex+1]}//汇总页数据 + if(this.approveRowIndex ===this.detailData.length-1){ //最后一步 + row = {...this.detailData[this.approveRowIndex]} + } row.taskIds = row.id row.taskInfo = row.name row.tabsName = this.$route.query.tabsName From f9fcc6cfba97f52ed6f65443e6376164e634ba09 Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 15 Dec 2022 16:54:11 +0800 Subject: [PATCH 19/26] =?UTF-8?q?=E6=B1=87=E6=80=BB(=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=A4=8D=E5=AE=A1=E6=B5=81=E7=A8=8B)=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbfs/step4-1.vue | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step4-1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step4-1.vue index 4ec79b493..637487100 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step4-1.vue @@ -428,6 +428,7 @@ export default { }).then(res => { if (res) { const processForm = JSON.parse(res.mesg) + console.log(processForm) if (processForm.qbfsForm === undefined) { this.getFormFieldList(processForm) } else { @@ -443,27 +444,27 @@ export default { * @description: 动态表单读取 */ async getFormFieldList (item) { - + this.commentText = item.commentText let standObj = await this.getStandInfoUpdateById(item.standId) let fileObjFx = await this.getSaveFile("model_fs") let fileObjLx = await this.getSaveFile("model_lx") this.$nextTick(() => { const bringData = standObj.data - const obj = { - reviewResults: "", - reviewResultsContent:"", - reviewUserId:this.$store.getters.userInfo.userId, - reviewUserName:this.$store.getters.userInfo.userName, - draftTime:"", - releaseTime:"", - expirationDate:"", - LXDName:"", - LXD:"", - FSDName:"", - FSD:"", - } - const json = Object.assign(bringData, bringData.attrInfoMap,item,obj); + // const obj = { + // reviewResults: "", + // reviewResultsContent:"", + // reviewUserId:this.$store.getters.userInfo.userId, + // reviewUserName:this.$store.getters.userInfo.userName, + // draftTime:"", + // releaseTime:"", + // expirationDate:"", + // LXDName:"", + // LXD:"", + // FSDName:"", + // FSD:"", + // } + const json = Object.assign(bringData, bringData.attrInfoMap,item); this.qbfsForm = JSON.parse(JSON.stringify(json)) this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName From a52c3d2573274b8270bc5557e837888729db8cfb Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 15 Dec 2022 17:48:20 +0800 Subject: [PATCH 20/26] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2=20?= =?UTF-8?q?=E6=B1=87=E6=80=BB(=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2-=E4=BA=A7=E5=93=81=E6=A0=87=E5=87=86)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qbrk-product/common/formEditList-1.vue | 985 ++++++ .../creatProcess/qbrk-product/step6-1.vue | 2904 +++++++++++++++++ .../pages/processDetail/index.vue | 2 +- src/router/index.js | 9 + 4 files changed, 3899 insertions(+), 1 deletion(-) create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList-1.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk-product/step6-1.vue diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList-1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList-1.vue new file mode 100644 index 000000000..5ca6258f6 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList-1.vue @@ -0,0 +1,985 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6-1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6-1.vue new file mode 100644 index 000000000..d692796d2 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6-1.vue @@ -0,0 +1,2904 @@ + + + + + diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 363b77b35..8bf179a01 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -257,7 +257,7 @@ export default { this.toProcessDetail('bussLibrary9',row) }else if(prcType === 'buss2'){ //企标 产品标准 6 - this.toProcessDetail('bussLibraryProduct6',row) + this.toProcessDetail('bussLibraryProduct6-1',row) }else if(prcType === 'buss3'){ //企标复审 4 this.toProcessDetail('bussFs2-1',row) diff --git a/src/router/index.js b/src/router/index.js index c9a16a43d..9dc3de2ca 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1363,6 +1363,15 @@ const routes = [ title: '企标制修订-产品标准' } }, + { + path: '/bussLibraryProduct6-1', + name: 'bussLibraryProduct6-1', + component: () => import('@/pages/processCenter/pages/creatProcess/qbrk-product/step6-1.vue'), + meta: { + requireAuth: true, + title: '企标制修订-产品标准' + } + }, { path: '/bussLibraryProductC6', name: 'bussLibraryProductC6', From 3dc9ba3dade47f96bf7c22ef470d25af0ed41756 Mon Sep 17 00:00:00 2001 From: zyn Date: Fri, 16 Dec 2022 10:41:07 +0800 Subject: [PATCH 21/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=B1=87=E6=80=BB(?= =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9=E6=95=B4=E6=94=B9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/wfhxzg/step3-1.vue | 105 +++++++++++------- 1 file changed, 63 insertions(+), 42 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3-1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3-1.vue index d71e2e5de..f594c7fb0 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3-1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3-1.vue @@ -15,6 +15,7 @@