From d683229f41119fb2782da4e7a4c798a551468421 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 11 Apr 2023 14:47:32 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=97=AE=E7=AD=94=E4=B8=AD=E5=BF=83=20?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/personal/pages/my-questions/index.vue | 2 +- src/pages/personal/pages/my-questions/index3.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue index 96dd7e975..8596c8bb1 100644 --- a/src/pages/personal/pages/my-questions/index.vue +++ b/src/pages/personal/pages/my-questions/index.vue @@ -824,7 +824,7 @@ 选择标准 - {{ questionForm.standSortShow }} {{questionForm.standNumber }}-{{ questionForm.standYear }} + {{ questionForm.standSortShow }} {{questionForm.standNumber }} {{ questionForm.standYear === '' ? '' : '-' }} {{ questionForm.standYear }} {{questionForm.standardName}} diff --git a/src/pages/personal/pages/my-questions/index3.vue b/src/pages/personal/pages/my-questions/index3.vue index c675a94cc..017d9ddb9 100644 --- a/src/pages/personal/pages/my-questions/index3.vue +++ b/src/pages/personal/pages/my-questions/index3.vue @@ -824,7 +824,7 @@ 选择标准 - {{ questionForm.standSortShow }} {{questionForm.standNumber }}-{{ questionForm.standYear }} + {{ questionForm.standSortShow }} {{questionForm.standNumber }} {{ questionForm.standYear === '' ? '' : '-' }} {{ questionForm.standYear }} {{questionForm.standardName}} From 2fa44dad39946f3358c4f4da9311a9beb71d38b1 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 11 Apr 2023 15:04:12 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=97=AE=E7=AD=94=E4=B8=AD=E5=BF=83=20?= =?UTF-8?q?=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/personal/pages/my-questions/index2.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/personal/pages/my-questions/index2.vue b/src/pages/personal/pages/my-questions/index2.vue index bb86a2284..357e4f782 100644 --- a/src/pages/personal/pages/my-questions/index2.vue +++ b/src/pages/personal/pages/my-questions/index2.vue @@ -98,7 +98,8 @@ export default { }, val => { this.asdId = val this.$http.post('lawss/AskQuestions/selectQuestionReplyInfo',{ - id: val + id: val, + userId:this.$store.getters.userInfo.userId }, { _this: this From 703fc2f85ce3f22bf5eaf5f75c925addcd933a1c Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 11 Apr 2023 15:30:58 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86=20?= =?UTF-8?q?=E6=A0=87=E5=87=86=E9=97=AE=E7=AD=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../otherBussStandardDetails/index.vue | 68 +++++++++++-------- 1 file changed, 41 insertions(+), 27 deletions(-) diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index 049871ad2..ebaffa63c 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -2973,37 +2973,51 @@ export default { },e => reject(e)); }) }, + jump(){ + return new Promise((resolve,reject)=>{ + this.$http.post('lawss/AskQuestions/jump', { + standId: this.$route.params.id, + userId : this.$store.getters.userInfo.userId, + }, { + _this: this + }, res => { + resolve(res) + },e => reject(e)); + }) + }, //标准问答按钮 knowledgeSharing() { - 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", - type: this.$route.params.pageType, - // classification: data.classification, - id: this.$route.params.id, - dialogVisible: false - }, - }) - } - }).catch(e =>{ - console.log(e) + this.jump().then(res => { + let activeName = res.data + this.selectAskReply() + .then((res)=>{ + if( res && res.data.length === 0){ + this.$router.push({ + name: 'MyQuestions3', + query: { + activeName, + 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, + type: this.$route.params.pageType, + // classification: data.classification, + id: this.$route.params.id, + dialogVisible: false + }, + }) + } + }) }) + // this.$router.push({ // // path: '/standQA', // query: { From 8f1adfd8e46f34acf8c1b68bbb138bd58397bcc6 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 11 Apr 2023 17:30:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E7=BB=84?= =?UTF-8?q?=E9=95=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qbzxdjhgk/component/cancel.vue | 13 ++++-- .../qbzxdjhgk/component/delay.vue | 11 +++-- .../qbzxdjhgk/component/establish.vue | 39 +++++++++++++--- .../qbzxdjhgk/component/merge.vue | 37 ++++++++++++--- .../qbzxdjhgk/component/rename.vue | 11 +++-- .../pages/creatProcess/qbzxdjhgk/step2.vue | 9 +++- .../pages/creatProcess/qbzxdjhgk/step3.vue | 15 ++++--- .../pages/creatProcess/qbzxdjhgk/step4.vue | 15 ++++--- .../pages/creatProcess/qbzxdjhgk/step5.vue | 15 ++++--- .../pages/creatProcess/qbzxdlx/step1.vue | 25 ++++++++++- .../pages/creatProcess/qbzxdlx/step2.vue | 26 +++++++++-- .../enterpriseStandardPlan/index.vue | 45 +++++++++++++++---- 12 files changed, 209 insertions(+), 52 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index 940f7b8fd..1de64f30b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -124,11 +124,16 @@ clearable > - + + @@ -290,10 +295,10 @@ align="center" label="评审责任人"> - + label="技术委员会评审负责人"> - + + @@ -309,7 +314,7 @@ + label="技术委员会评审负责人"> - + + + - + @@ -669,7 +681,8 @@ export default { {required: true, message: '请输入评审责任人', trigger: 'blur'}, ], wgLeaderName: [ - {required: true, message: '请输入工作组组长', trigger: 'blur'}, + // {required: true, message: '请输入工作组组长', trigger: 'blur'}, + { required: true, message: "请选择技术委员会评审负责人", trigger: "blur" } ], draftTime: [ {required: true, message: '请输入计划标准初稿完成时间', trigger: 'blur'}, @@ -727,6 +740,9 @@ export default { reviewDate: '', abolishCause:'', }, + //技术委员会评审负责人 + workLeaderVisible: false, + workLeaderNodeList: [] } }, mounted() { @@ -1147,6 +1163,17 @@ export default { console.log(data); this.selectList = data }, + workGroupUnfold(type, title, ids){ + if(ids){ + this.workLeaderNodeList = ids.split(',') + } + // 展开弹窗 + this.workLeaderVisible = true + }, + workLeaderCheckedRole(data){ + this.qbfsForm.wgLeader = data[0].id + this.qbfsForm.wgLeaderName = data[0].name + }, } }; diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index 6b8f82c98..c1f1aa7ea 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -131,11 +131,16 @@ clearable > - + + @@ -300,7 +305,7 @@ + label="技术委员会评审负责人"> - + + diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue index e72bb6a88..3342c5fc9 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue @@ -75,12 +75,17 @@ placeholder="请输入评审责任人" :maxlength="500"/> - + + + disabled + v-model="qbfsForm.wgLeaderName" + placeholder="请选择技术委员会评审负责人" + :maxlength="500"/> - + + + disabled + v-model="qbfsForm.wgLeaderName" + placeholder="请选择技术委员会评审负责人" + :maxlength="500"/> - + + + disabled + v-model="qbfsForm.wgLeaderName" + placeholder="请选择技术委员会评审负责人" + :maxlength="500"/> + @click.native="workGroupUnfold('workLeader', '选择工作组组长', addQblxData.wgLeader)"> + + @@ -585,7 +592,10 @@ export default { disabledDate(date) { return date.getTime() < Date.now() - 24 * 60 * 60 * 1000 } - } + }, + //工作组组长 + workLeaderVisible: false, + workLeaderNodeList: [] } }, @@ -1152,6 +1162,17 @@ export default { this.$message.warning('立项列表不能为空') } }, + workGroupUnfold(type, title, ids){ + if(ids){ + this.workLeaderNodeList = ids.split(',') + } + // 展开弹窗 + this.workLeaderVisible = true + }, + workLeaderCheckedRole(data){ + this.addQblxData.wgLeader = data[0].id + this.addQblxData.wgLeaderName = data[0].name + }, } } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index 4001f761e..a8d1e6a54 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -99,7 +99,7 @@ + @click.native="workGroupUnfold('workLeader', '选择工作组组长', qbfsForm.wgLeader)"> + + @@ -785,7 +792,9 @@ export default { {required: true, message: '请输入采用标准', trigger: 'blur'}, ], }, - + //工作组组长 + workLeaderVisible: false, + workLeaderNodeList: [] } }, mounted() { @@ -1374,7 +1383,18 @@ export default { this.roleForm.countersignerName = nameList; this.qbfsForm.resPerson = idList; this.qbfsForm.resPersonName = nameList; - } + }, + workGroupUnfold(type, title, ids){ + if(ids){ + this.workLeaderNodeList = ids.split(',') + } + // 展开弹窗 + this.workLeaderVisible = true + }, + workLeaderCheckedRole(data){ + this.qbfsForm.wgLeader = data[0].id + this.qbfsForm.wgLeaderName = data[0].name + }, }, }; diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index 231786700..4239a2d88 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -346,14 +346,21 @@ :maxlength="500"/> - - - - - + + + + + + + + + + + + + +