From 2060aeb0076a308ed2c369dd815d6993bdddd30f Mon Sep 17 00:00:00 2001 From: baoyu <102349094+Bytq@users.noreply.github.com> Date: Mon, 17 Jun 2024 10:31:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E6=A0=87=E5=87=86=20=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=8B=E7=82=B9=E5=87=BB=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E4=BC=9A=E4=B8=A2=E5=A4=B1=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EnterpriseStandardDatabase.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 45a56c146..b30887217 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -2117,6 +2117,7 @@ export default { props: {}, data () { return { + advancedSearchOrNot: false, // 是否为高级检索 editCheckd:[], rootNode: '', // 左侧树当前选中的数据的根节点(企业标准,技术体系) systemCategoryId: [], // 表格选中数据的体系标准Id @@ -5245,6 +5246,7 @@ export default { }, // 搜索 getBussionStandTableBtn (item, advancedSearch, type) { + this.advancedSearchOrNot = type === 'sel' item.page = 1 this.tableFlag = item // item.advanceSearchVOStr = JSON.stringify(advancedSearch) || '' @@ -5253,6 +5255,7 @@ export default { }, // 清空搜索框 clearAllSearch (flag) { + this.advancedSearchOrNot = false if (flag === 'sarBussionessSearch') { console.log('1'); // 标准搜索 @@ -5406,7 +5409,7 @@ export default { formData.nowOrderBy = this.nowOrder ? this.orderBy : '' formData.nowOrder = this.nowOrder formData.userId = this.$store.getters.userInfo.userId - if (type === 'sel') { + if (type === 'sel' || this.advancedSearchOrNot) { const advanceSearchVOList = []; if (this.formFieldListData !== undefined && this.formFieldListData !== null) { const formFieldList = this.formFieldListData From a3d01771d6e6b40c8b9f4a370564f4c9e6c2f5ac Mon Sep 17 00:00:00 2001 From: baoyu <102349094+Bytq@users.noreply.github.com> Date: Mon, 17 Jun 2024 11:48:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2-=E6=8A=80=E6=9C=AF=E6=A0=87?= =?UTF-8?q?=E5=87=86=20=E6=96=B0=E5=A2=9E=E8=AE=A1=E5=88=92=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8F=91=E5=B8=83=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/qbrk/step1-2.vue | 8 +++++--- .../processCenter/pages/creatProcess/qbrk/step10.vue | 6 ++++-- .../processCenter/pages/creatProcess/qbrk/step11-1.vue | 6 ++++-- .../processCenter/pages/creatProcess/qbrk/step11.vue | 6 ++++-- .../processCenter/pages/creatProcess/qbrk/step12.vue | 6 ++++-- .../processCenter/pages/creatProcess/qbrk/step13.vue | 6 ++++-- src/pages/processCenter/pages/creatProcess/qbrk/step2.vue | 8 +++++--- src/pages/processCenter/pages/creatProcess/qbrk/step3.vue | 8 +++++--- src/pages/processCenter/pages/creatProcess/qbrk/step4.vue | 8 +++++--- src/pages/processCenter/pages/creatProcess/qbrk/step5.vue | 6 ++++-- src/pages/processCenter/pages/creatProcess/qbrk/step6.vue | 7 +++++-- src/pages/processCenter/pages/creatProcess/qbrk/step7.vue | 6 ++++-- src/pages/processCenter/pages/creatProcess/qbrk/step8.vue | 6 ++++-- src/pages/processCenter/pages/creatProcess/qbrk/step9.vue | 6 ++++-- .../processCenter/pages/creatProcess/qbrk/stepC1.vue | 6 ++++-- .../processCenter/pages/creatProcess/qbrk/stepC3.vue | 6 ++++-- .../processCenter/pages/creatProcess/qbrk/stepC6.vue | 6 ++++-- .../processCenter/pages/creatProcess/qbrk/stepDetail.vue | 6 ++++-- 18 files changed, 77 insertions(+), 40 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index 0431fbba0..b5ede3c32 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -3,7 +3,7 @@ - +
基础信息
@@ -1603,6 +1603,7 @@ export default { }; return { PlanStandDraftCompleteTime: '', + ReleaseTime: '', pickerOptions: { shortcuts: [ { text: '最近一周', @@ -2120,8 +2121,9 @@ export default { this.$http.get('lawss/sarBussionessStand/queryPlanStandDraftCompleteTime', { 'planId': planId }, { _this: this }, res => { - if (res.ok){ - this.PlanStandDraftCompleteTime = res.data + if (res.ok) { + this.PlanStandDraftCompleteTime = res.data.draftTime + this.ReleaseTime = res.data.releaseTime } }) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue index 685c91bc3..b1ee0f88c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue @@ -2,7 +2,7 @@ - +
基础信息
@@ -536,6 +536,7 @@ }; return { PlanStandDraftCompleteTime: '', + ReleaseTime: '', pickerOptions: { shortcuts: [{ text: '最近一周', @@ -985,7 +986,8 @@ _this: this }, res => { if (res.ok){ - this.PlanStandDraftCompleteTime = res.data + this.PlanStandDraftCompleteTime = res.data.draftTime + this.ReleaseTime = res.data.releaseTime } }) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step11-1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step11-1.vue index 178c3d464..0f8beb6d4 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step11-1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step11-1.vue @@ -2,7 +2,7 @@ - +
基础信息
@@ -527,6 +527,7 @@ }; return { PlanStandDraftCompleteTime: '', + ReleaseTime: '', pickerOptions: { shortcuts: [{ text: '最近一周', @@ -975,7 +976,8 @@ _this: this }, res => { if (res.ok){ - this.PlanStandDraftCompleteTime = res.data + this.PlanStandDraftCompleteTime = res.data.draftTime + this.ReleaseTime = res.data.releaseTime } }) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue index 2ecce2ba8..3d7fce093 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue @@ -2,7 +2,7 @@ - +
基础信息
@@ -535,6 +535,7 @@ }; return { PlanStandDraftCompleteTime: '', + ReleaseTime: '', pickerOptions: { shortcuts: [{ text: '最近一周', @@ -983,7 +984,8 @@ _this: this }, res => { if (res.ok){ - this.PlanStandDraftCompleteTime = res.data + this.PlanStandDraftCompleteTime = res.data.draftTime + this.ReleaseTime = res.data.releaseTime } }) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue index bd309f105..bf036efce 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue @@ -3,7 +3,7 @@ - +
基础信息
@@ -665,6 +665,7 @@ export default { }; return { PlanStandDraftCompleteTime:'', + ReleaseTime: '', pickerOptions: { shortcuts: [ { text: '最近一周', @@ -1168,7 +1169,8 @@ export default { _this: this }, res => { if (res.ok){ - this.PlanStandDraftCompleteTime = res.data + this.PlanStandDraftCompleteTime = res.data.draftTime + this.ReleaseTime = res.data.releaseTime } }) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 11c39d355..56025239c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -3,7 +3,7 @@ - +
基础信息
@@ -744,6 +744,7 @@ export default { }; return { PlanStandDraftCompleteTime: '', + ReleaseTime: '', openModifyFileNameDialog: false, modifyFile: { fileName: '', @@ -1276,7 +1277,8 @@ export default { _this: this }, res => { if (res.ok){ - this.PlanStandDraftCompleteTime = res.data + this.PlanStandDraftCompleteTime = res.data.draftTime + this.ReleaseTime = res.data.releaseTime } }) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue index f0c33633c..574c1972e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue @@ -2,7 +2,7 @@ - +
基础信息
@@ -661,6 +661,7 @@ }; return { PlanStandDraftCompleteTime: '', + ReleaseTime: '', nowEsId: '', pickerOptions: { shortcuts: [{ @@ -1111,8 +1112,9 @@ this.$http.get('lawss/sarBussionessStand/queryPlanStandDraftCompleteTime', { 'planId': planId }, { _this: this }, res => { - if (res.ok){ - this.PlanStandDraftCompleteTime = res.data + if (res.ok) { + this.PlanStandDraftCompleteTime = res.data.draftTime + this.ReleaseTime = res.data.releaseTime } }) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue index 1cfc32f4a..5978d1176 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue @@ -3,7 +3,7 @@ - +
基础信息
@@ -706,6 +706,7 @@ export default { }; return { PlanStandDraftCompleteTime: '', + ReleaseTime: '', pickerOptions: { shortcuts: [ { text: '最近一周', @@ -1198,8 +1199,9 @@ export default { this.$http.get('lawss/sarBussionessStand/queryPlanStandDraftCompleteTime', { 'planId': nowEsId }, { _this: this }, res => { - if (res.ok){ - this.PlanStandDraftCompleteTime = res.data + if (res.ok) { + this.PlanStandDraftCompleteTime = res.data.draftTime + this.ReleaseTime = res.data.releaseTime } }) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue index 4f44f8c4b..4a27a1944 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue @@ -3,7 +3,7 @@ - +
基础信息
@@ -538,6 +538,7 @@ }; return { PlanStandDraftCompleteTime: '', + ReleaseTime: '', pickerOptions: { shortcuts: [{ text: '最近一周', @@ -983,8 +984,9 @@ this.$http.get('lawss/sarBussionessStand/queryPlanStandDraftCompleteTime', { 'planId': nowEsId }, { _this: this }, res => { - if (res.ok){ - this.PlanStandDraftCompleteTime = res.data + if (res.ok) { + this.PlanStandDraftCompleteTime = res.data.draftTime + this.ReleaseTime = res.data.releaseTime } }) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue index b54529beb..645ea07a8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue @@ -2,7 +2,7 @@ - +
基础信息
@@ -850,6 +850,7 @@ }; return { PlanStandDraftCompleteTime: '', + ReleaseTime: '', pickerOptions: { shortcuts: [{ text: '最近一周', @@ -1342,7 +1343,8 @@ _this: this }, res => { if (res.ok){ - this.PlanStandDraftCompleteTime = res.data + this.PlanStandDraftCompleteTime = res.data.draftTime + this.ReleaseTime = res.data.releaseTime } }) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue index 72e4473fc..7467983d1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue @@ -3,7 +3,7 @@ - +
基础信息
@@ -954,6 +954,8 @@ export default { callback() }; return { + PlanStandDraftCompleteTime: '', + ReleaseTime: '', pickerOptions: { shortcuts: [ { text: '最近一周', @@ -1472,7 +1474,8 @@ export default { _this: this }, res => { if (res.ok){ - this.PlanStandDraftCompleteTime = res.data + this.PlanStandDraftCompleteTime = res.data.draftTime + this.ReleaseTime = res.data.releaseTime } }) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue index d0188aebe..a0ba55c70 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue @@ -3,7 +3,7 @@ - +
基础信息
@@ -683,6 +683,7 @@ }; return { PlanStandDraftCompleteTime:'', + ReleaseTime:'', pickerOptions: { shortcuts: [{ text: '最近一周', @@ -1140,7 +1141,8 @@ _this: this }, res => { if (res.ok){ - this.PlanStandDraftCompleteTime = res.data + this.PlanStandDraftCompleteTime = res.data.draftTime + this.ReleaseTime = res.data.releaseTime } }) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue index 181972786..38b4d0787 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue @@ -2,7 +2,7 @@ - +
基础信息
@@ -549,6 +549,7 @@ }; return { PlanStandDraftCompleteTime: '', + ReleaseTime: '', pickerOptions: { shortcuts: [{ text: '最近一周', @@ -1009,7 +1010,8 @@ _this: this }, res => { if (res.ok){ - this.PlanStandDraftCompleteTime = res.data + this.PlanStandDraftCompleteTime = res.data.draftTime + this.ReleaseTime = res.data.releaseTime } }) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue index b1c4048df..6f8151229 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue @@ -2,7 +2,7 @@ - +
基础信息
@@ -668,6 +668,7 @@ }; return { PlanStandDraftCompleteTime: '', + ReleaseTime: '', pickerOptions: { shortcuts: [{ text: '最近一周', @@ -1129,7 +1130,8 @@ _this: this }, res => { if (res.ok){ - this.PlanStandDraftCompleteTime = res.data + this.PlanStandDraftCompleteTime = res.data.draftTime + this.ReleaseTime = res.data.releaseTime } }) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue index b0ca4e79f..dd7364c21 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue @@ -3,7 +3,7 @@ - +
基础信息
@@ -772,6 +772,7 @@ export default { }; return { PlanStandDraftCompleteTime: '', + ReleaseTime: '', pickerOptions: { shortcuts: [ { text: '最近一周', @@ -1276,7 +1277,8 @@ export default { _this: this }, res => { if (res.ok){ - this.PlanStandDraftCompleteTime = res.data + this.PlanStandDraftCompleteTime = res.data.draftTime + this.ReleaseTime = res.data.releaseTime } }) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue index 44ea15b61..8408c134b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue @@ -3,7 +3,7 @@ - +
基础信息
@@ -703,6 +703,7 @@ export default { }; return { PlanStandDraftCompleteTime: '', + ReleaseTime: '', pickerOptions: { shortcuts: [ { text: '最近一周', @@ -1196,7 +1197,8 @@ export default { _this: this }, res => { if (res.ok){ - this.PlanStandDraftCompleteTime = res.data + this.PlanStandDraftCompleteTime = res.data.draftTime + this.ReleaseTime = res.data.releaseTime } }) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue index 95e7a505f..e46c74d4f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue @@ -3,7 +3,7 @@ - +
基础信息
@@ -950,6 +950,7 @@ export default { }; return { PlanStandDraftCompleteTime: '', + ReleaseTime: '', pickerOptions: { shortcuts: [ { text: '最近一周', @@ -1468,7 +1469,8 @@ export default { _this: this }, res => { if (res.ok){ - this.PlanStandDraftCompleteTime = res.data + this.PlanStandDraftCompleteTime = res.data.draftTime + this.ReleaseTime = res.data.releaseTime } }) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue index 2073ea294..3c378eb7d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue @@ -2,7 +2,7 @@ - +
基础信息
@@ -474,6 +474,7 @@ }; return { PlanStandDraftCompleteTime: '', + ReleaseTime: '', pickerOptions: { shortcuts: [{ text: '最近一周', @@ -912,7 +913,8 @@ _this: this }, res => { if (res.ok){ - this.PlanStandDraftCompleteTime = res.data + this.PlanStandDraftCompleteTime = res.data.draftTime + this.ReleaseTime = res.data.releaseTime } }) },