From 2af81ccec20e5ac4e072acce1d2c87474af3f0de Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 4 Apr 2023 09:48:01 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2-=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86(=E5=8F=91?= =?UTF-8?q?=E5=B8=83)-=E9=87=87=E6=A0=87=E7=A8=8B=E5=BA=A6=E8=83=BD?= =?UTF-8?q?=E6=B8=85=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/common/formEditListFb.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbrk/step13.vue | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue index 33c7a694a..885309ef8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue @@ -439,7 +439,7 @@ disabled > - + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 2ec22b855..6be699889 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -2904,6 +2904,9 @@ /deep/ .el-input__suffix{ display: none !important; } + /deep/ .cbcd .el-input__suffix{ + display: inline-block !important; + } /deep/ #active2 .el-form-item__content{ margin-left: 0px !important; } From b7740ddbed929e3a5da4c099c7cbc08f38bcfb39 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 4 Apr 2023 10:01:49 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2-=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86(=E5=8F=91?= =?UTF-8?q?=E5=B8=83)-=E5=88=B6=E4=BF=AE=E8=AE=A2=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qbrk/common/formEditListFb.vue | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue index 885309ef8..5a53cc1bb 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue @@ -18,12 +18,20 @@ - + + + + + + + + + Date: Tue, 4 Apr 2023 14:09:15 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2-=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86(=E5=8F=91?= =?UTF-8?q?=E5=B8=83)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qbrk/common/formEditListFb.vue | 13 +++++++++-- .../pages/creatProcess/qbrk/step13.vue | 22 +++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue index 5a53cc1bb..0a8fed67a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue @@ -7,7 +7,7 @@ - + - + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 6be699889..c8bb9102e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -45,6 +45,8 @@ @formChoiceZRR3 = "formChoiceZRR3" @formChoiceZRR4 = "formChoiceZRR4" @formChoiceZRR5 = "formChoiceZRR5" + @standSortChange = "standSortChange" + @reveseStatusChange = 'reveseStatusChange' />
@@ -1118,6 +1120,7 @@ syrzOptions:[],//适用认证下拉框 data: [], // 标准列表数据 ListForm: {}, // 新增数据 + maxStandnSn:"", // 最大順序號 } }, watch:{ @@ -1166,6 +1169,16 @@ }, }, methods: { + reveseStatusChange(val){ + if(val === '1'){ + this.form.standNum = this.maxStandnSn + }else{ + this.form.standNum = this.form.standSn + } + }, + standSortChange(val){ + this.form.standCode = val + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }, checkedRoleTransfer (data) { this.isSubmit = true this.saveLoading = true @@ -1266,6 +1279,7 @@ this.fileType = fileType this.fileUpload(fileType) } + this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) }, modelProp(row,index){ console.log(row) @@ -2853,6 +2867,13 @@ }, e => { }) }, + getMaxStandnSn(){ + this.$http.get('lawss/sarBussionessStand/selectMaxStandnSn', '', { + _this: this + }, res => { + this.maxStandnSn = res.data + }) + } }, mounted () { // this.getTaskId() @@ -2894,6 +2915,7 @@ } this.busVsFunc() this.modelFunc() + this.getMaxStandnSn(); } } From 17b1856f734744c81f529c7c031fc119ab8e7303 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 4 Apr 2023 14:26:44 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86-?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=89=8D=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EnterpriseStandardDatabase.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 5033e3cf7..5813929e4 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -929,7 +929,7 @@ accept=".ZIP, .zip" :before-upload="beginImportFile" :on-success="importFileSuccess" - :show-file-list="false" + :show-file-list="true" >
@@ -4471,6 +4471,11 @@ export default { }, // 点击导入标准 addImportModal(flag) { + if(this.selectSarMenu.id === undefined){ + this.importFailed = true; + this.importForm.content = '请选择需要导入的目录' + return + } this.importModalshowflag = true this.showUploadlist = true this.importExcelUrl = '/api/lawss/sarBussionessStand/importSarBussionessStandFile?menuId=' + this.selectSarMenu.id + '&userId=' + this.$store.getters.userInfo.userId From 02d4775cb2ce5df28a2a739c0dd8153de53faf15 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 4 Apr 2023 14:40:36 +0800 Subject: [PATCH 05/13] =?UTF-8?q?ProcessFooter=E7=BB=84=E4=BB=B6=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E6=8E=A5=E6=94=B6=E4=BB=BB=E5=8A=A1=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/components/ProcessFooter.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue index d00e6488e..3af8662b4 100644 --- a/src/pages/processCenter/pages/components/ProcessFooter.vue +++ b/src/pages/processCenter/pages/components/ProcessFooter.vue @@ -104,7 +104,7 @@ icon="el-icon-check" @click="handleReceive" :loading="submitLoading" - v-if="showReceive" + v-if="false" >接收任务 Date: Tue, 4 Apr 2023 14:49:30 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E9=97=AE=E7=AD=94=E5=BA=93=E6=8F=90?= =?UTF-8?q?=E9=97=AE=E5=8F=91=E8=B5=B7=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regulatoryRepository/standQA/index.vue | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/pages/regulatoryRepository/standQA/index.vue b/src/pages/regulatoryRepository/standQA/index.vue index ccf4c45b0..b79eeb03c 100644 --- a/src/pages/regulatoryRepository/standQA/index.vue +++ b/src/pages/regulatoryRepository/standQA/index.vue @@ -1073,6 +1073,27 @@ export default { this.dialogVisible = false this.isSubmit = false this.searchBtn() + this.$http.post('lawss/activiti/startProcessRollBack',{ + json: JSON.stringify(res.data), + type: '27', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + }, + { + _this: this + }, val => { + this.$http.post('lawss/activiti/completeTask',{ + taskIds: val.data, + userId : this.$store.getters.userInfo.userId, + json: JSON.stringify(res.data), + }, + { + _this: this + }, res => { + }, e => { + }) + }, e => { + }) }, e => { }) From 1de9fea2c100fb8d0217620f723d99d726a9a84b Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 4 Apr 2023 15:21:24 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=8E=A5=E5=8F=97=E6=8C=89=E9=92=AE=E6=94=BE=E5=88=B0=E5=8F=B3?= =?UTF-8?q?=E4=BE=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home2/components/todoList/index.vue | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index f1170da41..3f26ec0f6 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -9,18 +9,21 @@
  • -
    - {{ getPrcNameFilter(item) }} - +
    + {{ getPrcNameFilter(item) }} +
    +
    + 接受任务 + (item.prcType == 'buss3' && item.taskInfo === '复审'))? true : false">接受 +
    From bfa8ea19ecdae9898a829bda8c5c5005b2690453 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 4 Apr 2023 15:30:20 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2-=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86(=E6=8A=80?= =?UTF-8?q?=E6=9C=AF=E5=A7=94=E5=91=98=E4=BC=9A=E8=AF=84=E5=AE=A1=E3=80=81?= =?UTF-8?q?=E8=AF=84=E5=AE=A1=E6=84=8F=E8=A7=81=E4=BF=AE=E6=94=B9)?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=A8=BF=E5=8F=AF=E4=BB=A5=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbrk/step6.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue index 3f2eb9160..d26afae77 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue @@ -149,6 +149,7 @@
    Date: Tue, 4 Apr 2023 18:48:28 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E5=BA=93-=E6=A0=87=E5=87=86=E9=97=AE=E7=AD=94=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../otherBussStandardDetails/index.vue | 54 +- .../details/otherStandardDetails/index.vue | 57 +- .../personal/pages/my-questions/index3.vue | 2136 +++++++++++++++++ src/router/index.js | 9 + 4 files changed, 2241 insertions(+), 15 deletions(-) create mode 100644 src/pages/personal/pages/my-questions/index3.vue diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index ec2303410..44165c42e 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -2962,16 +2962,56 @@ export default { this.relateDialog1 = true this.relateNowList1 = list }, + selectAskReply(){ + return new Promise((resolve,reject)=>{ + this.$http.post('lawss/AskQuestions/selectAskReply', { + id: this.$route.params.id + }, { + _this: this + }, res => { + resolve(res) + },e => reject(e)); + }) + }, //标准问答按钮 knowledgeSharing() { - this.$router.push({ - path: '/standQA', - query:{ - standId: this.$route.params.id, - standType: 'BUSINESS_STAND', - sourceType: 'details', - } + this.selectAskReply() + .then((res)=>{ + if( res && res.data.length === 0){ + this.$router.push({ + name: 'MyQuestions3', + query: { + activeName: "myQue", + type: this.$route.params.pageType, + id: this.$route.params.id, + dialogVisible: true + }, + }) + }else{ + const data = res.data[0].askQuestions + this.$router.push({ + name: 'MyQuestions3', + query: { + activeName: "myQue", + classification: data.classification, + id: this.$route.params.id, + dialogVisible: false + }, + }) + } + }).catch(e =>{ + console.log(e) }) + + // this.$router.push({ + // // path: '/standQA', + // query: { + // standId: this.$route.params.id, + // standType: this.sarStandardsInfoEO.standType, + // sourceType: 'details', + // }, + // name: 'MyQuestions2', + // }) }, // 更新LOG relateEvent () { diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index a504c20cb..a02274591 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -2634,16 +2634,57 @@ export default { pageSizeChange1() { this.getKnowList() }, + selectAskReply(){ + return new Promise((resolve,reject)=>{ + this.$http.post('lawss/AskQuestions/selectAskReply', { + id: this.$route.params.id + }, { + _this: this + }, res => { + resolve(res) + },e => reject(e)); + }) + }, //标准问答按钮 knowledgeSharing() { - this.$router.push({ - path: '/standQA', - query: { - standId: this.$route.params.id, - standType: this.sarStandardsInfoEO.standType, - sourceType: 'details', - } - }) + console.log(this.$route.params.id) + this.selectAskReply() + .then((res)=>{ + if( res && res.data.length === 0){ + this.$router.push({ + name: 'MyQuestions3', + query: { + activeName: "myQue", + type: this.$route.params.pageType, + id: this.$route.params.id, + dialogVisible: true + }, + }) + }else{ + const data = res.data[0].askQuestions + this.$router.push({ + name: 'MyQuestions3', + query: { + activeName: "myQue", + classification: data.classification, + id: this.$route.params.id, + dialogVisible: false + }, + }) + } + }).catch(e =>{ + console.log(e) + }) + + // this.$router.push({ + // // path: '/standQA', + // query: { + // standId: this.$route.params.id, + // standType: this.sarStandardsInfoEO.standType, + // sourceType: 'details', + // }, + // name: 'MyQuestions2', + // }) }, // 获取知识点列表数据 getKnowList() { diff --git a/src/pages/personal/pages/my-questions/index3.vue b/src/pages/personal/pages/my-questions/index3.vue new file mode 100644 index 000000000..9cc50d46a --- /dev/null +++ b/src/pages/personal/pages/my-questions/index3.vue @@ -0,0 +1,2136 @@ + + + + + + diff --git a/src/router/index.js b/src/router/index.js index fa6658dbd..7299ca608 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -338,6 +338,15 @@ const routes = [ requireAuth: false, title: '我的问答' } + }, + { + path: '/questions3', + name: 'MyQuestions3', + component: resolve => require(['@/pages/personal/pages/my-questions/index3.vue'], resolve), + meta: { + requireAuth: false, + title: '我的问答' + } }, { path: '/questionDetail', From d8c9407f9fbe5b89a436e3a5cec63a17d4ad712a Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 4 Apr 2023 18:58:21 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=88=E6=A0=87=E5=87=86=E9=9C=80=E6=B1=82=EF=BC=88=E7=BF=BB?= =?UTF-8?q?=E8=AF=91=EF=BC=89=E7=94=B3=E8=AF=B7=E6=B5=81=E7=A8=8B=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherBussStandardDetails/index.vue | 2 +- src/pages/details/otherStandardDetails/index.vue | 2 +- src/pages/searchCenter/pages/standardSearch.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index 44165c42e..8556ce49f 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -334,7 +334,7 @@ 更新记录 标准问答 - 标准需求（翻译）申请流程 + 标准需求（翻译）申请流程
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index a02274591..82f49c5ec 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -37,7 +37,7 @@ @click="collectClick()"> 更新记录 标准问答 - 标准需求（翻译）申请流程 + 标准需求（翻译）申请流程 diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index 95c032033..f093e2848 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -30,7 +30,7 @@
首页
- + 标准需求（翻译）申请流程 From 92d1115eb199756767ed8fb638738e0f9114c9e5 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 4 Apr 2023 19:08:50 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=8E=A5=E5=8F=97=E4=BB=BB=E5=8A=A1=E5=90=8E?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home2/components/todoList/index.vue | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index 3f26ec0f6..39023f501 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -1,6 +1,6 @@