From 588eba955400dc109311b876596dceeb628f3f66 Mon Sep 17 00:00:00 2001 From: fanlin Date: Fri, 23 Jul 2021 17:19:55 +0800 Subject: [PATCH 1/5] =?UTF-8?q?bug=EF=BC=9A=20=E6=A0=87=E5=87=86=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=B5=81=E7=A8=8B--=E6=A0=87=E5=87=86=E4=BD=93?= =?UTF-8?q?=E7=B3=BB=EF=BC=8C=E9=80=89=E4=B8=AD=EF=BC=8C=E7=82=B9=E7=A1=AE?= =?UTF-8?q?=E5=AE=9A=EF=BC=8C=E4=B8=8D=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 27deb03e8..e5e830a6e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -122,7 +122,7 @@ - + Date: Fri, 23 Jul 2021 17:30:22 +0800 Subject: [PATCH 2/5] =?UTF-8?q?bug=20=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=B5=81=E7=A8=8B--=E4=B8=8B=E6=8B=89=E6=A1=86=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E8=87=AA=E9=80=82=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 32 ++++++++++--------- .../domesticStandardsAndRegulations/index.vue | 10 ++++++ 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index e5e830a6e..3f8d70f52 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -58,7 +58,7 @@ > - + - + - + - + - + - + - + - + - + - + - + - + - + {{'手动查找'}} - + @@ -859,6 +859,7 @@ @@ -984,6 +985,7 @@ @@ -991,7 +993,7 @@ - + { this.isSubmit = false if (res.ok) { + this.personCollect.collectType = 'INLAND_STAND' + this.personCollect.id = this.id + this.personCollect.userId = this.$store.getters.userInfo.userId + this.$http.get('person/personCollect/updatePersonCollect', this.personCollect, { + _this: this, + loading: 'loading' + }, res => { + }, e => {}) this.getDomesticStandardTable(this.tableFlag) this.resetForm() if (this.addOrUPdateFlag === 1) { From 1cff3561c104e335d2ef37c9125f2adaa51ec802 Mon Sep 17 00:00:00 2001 From: liuhuaizhi Date: Fri, 23 Jul 2021 17:48:39 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix(445721=20=E6=9C=AA=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E9=A1=B9=E6=95=B4=E6=94=B9--=E5=8E=86=E5=8F=B2=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=A1=B5=E9=9D=A2=EF=BC=8C=E7=82=B9=E5=87=BB=E6=A0=87?= =?UTF-8?q?=E5=87=86=E7=BC=96=E5=8F=B7=E3=80=81=E6=A0=87=E5=87=86=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=BA=94=E8=B7=B3=E8=BD=AC=E8=87=B3=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=B8=94=E5=8E=86=E5=8F=B2=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=9F=A5=E8=AF=A2=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=97=A0=E4=BD=9C=E7=94=A8=20):?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonConfomity/pages/historicalData.vue | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue index da111f143..d79752675 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue @@ -25,7 +25,7 @@ :maxlength="100"> - + { @@ -510,7 +521,7 @@ export default { }) window.open(routeUrl.href, '_blank') }, e => { - }) + })*/ }, getOrgTreeSource () { this.$http.get('sys/org/getTree', {}, {_this: this}, @@ -612,8 +623,9 @@ export default { // }) // }, treeClickSearch (treeId, treeNode) { - this.historySearch.responseUnit = treeNode.id + this.historySearch.responsibleUnit = treeNode.id this.historySearch.responseUnitShow = treeNode.name + this.$forceUpdate() }, // 点击清空按钮事件 clearAllSearch () { @@ -621,7 +633,8 @@ export default { standNumOrName: '', quesType: '', productName: '', - responseUnit: '' + responsibleUnit: '', + responseUnitShow:'' } this.getTableBtn() }, From fde336157ed87f8425b78f0f29a5e11c8ac7a50f Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Sat, 24 Jul 2021 09:33:32 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B8=85=E5=8D=95=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 | 1456 +++++++++++++++++ .../pages/creatProcess/bzqdfb/step1.vue | 4 +- .../pages/creatProcess/bzqdfb/step2.vue | 25 +- .../pages/creatProcess/bzqdfb/step3.vue | 11 + .../pages/creatProcess/bzqdfb/step4.vue | 917 ++++++----- .../tabComponents/taskDraft/index.vue | 10 + src/router/index.js | 9 + 7 files changed, 1949 insertions(+), 483 deletions(-) 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..bc2aba78e --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -0,0 +1,1456 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 00b06a111..7bd76fbbd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -1012,11 +1012,11 @@ export default { _formData.append('createUserName', this.$store.getters.userInfo.userName) _formData.append('prcType', '4') _formData.append('json', JSON.stringify({ - form: this.form, + form: this.listForm, roleForm: this.roleForm, commentText: this.commentText })) - saveTaskFirst(_formData).then(res => { + saveTaskFirst(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index 6bb1abe0b..5ae8b512e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -37,13 +37,15 @@ clearable > - + - diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index 25fccf741..e1bcf6b58 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -226,6 +226,16 @@ export default { } }) break + case '4': + this.$router.push({ + name: 'bzqdfbStep1-1', + query: { + type: '4', + processName: '标准清单发布更新流程', + bpnId: id + } + }) + break } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/router/index.js b/src/router/index.js index 1e81556bc..ea5cdf612 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -249,6 +249,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: '/bzqdfbStep2', name: 'bzqdfbStep2', From 193dfc6bebd8253f52734e45c2d8581c3c7d7aba Mon Sep 17 00:00:00 2001 From: fanlin Date: Sat, 24 Jul 2021 10:46:35 +0800 Subject: [PATCH 5/5] bug --- .../domesticStandardsAndRegulations/index.vue | 12 ++++++++---- .../foreignStandardsAndRegulations/index.vue | 6 +++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 7dc2712f0..98f2d0e0f 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -449,7 +449,7 @@ label-width="150px" class="add-form-item" > - + @@ -459,7 +459,7 @@ label-width="150px" class="add-form-item" > - + @@ -1295,7 +1295,8 @@ export default { children: 'children', label: 'menuName' }, - id: '', + id: '', // 收藏数据的id + collectId: '', // 收藏id modalShowFlag1: false, // drawer开关 modalShowFlag2: false, // drawer开关 modalShowFlag3: false, // drawer开关 @@ -2264,6 +2265,7 @@ export default { // 编辑标准属性 selectStandardPro (item, state) { this.id = item.id + this.collectId = item.collectId this.addOrUPdateFlag = 2 this.modalshowtitle = '编辑国内标准' this.modalshowflag = true @@ -3120,8 +3122,10 @@ export default { if (res.ok) { this.personCollect.collectType = 'INLAND_STAND' this.personCollect.id = this.id + this.personCollect.collectResId = this.collectId + this.personCollect.collectTitle = this.sarStandardsInfoEO.standName this.personCollect.userId = this.$store.getters.userInfo.userId - this.$http.get('person/personCollect/updatePersonCollect', this.personCollect, { + this.$http.putData('person/personCollect/updatePersonCollect', this.personCollect, { _this: this, loading: 'loading' }, res => { diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index accef9644..b394854ef 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -510,7 +510,7 @@ label-width="150px" class="add-form-item" > - + @@ -520,7 +520,7 @@ label-width="150px" class="add-form-item" > - + @@ -2048,7 +2048,7 @@ export default { Promise.all([this.queryDisplayLocation()]).then((values) => { const [displayLocation] = values const formFieldList = this.formFieldList - console.log(formFieldList) + console.log(formFieldList, 'AAAAAAAAAAAAAAAAAAAAA') this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item)) this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem]; this.sarStandardsInfoEO.standSort = item.standSort