From c4d7fdaeb9b28dec51942dc5cfc08e2b48ea67a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sat, 4 Sep 2021 14:20:53 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B=E6=95=B0=E6=8D=AE=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue index 76bcc77c7..2b0c6bf74 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue @@ -354,9 +354,13 @@ export default { this.qdform.prcNum = this.prcNum; this.qdform.prcName = this.prcName; this.qdform["id"] = item.id; + this.projectId = item.projectId + this.getStandData(); }else{ this.qdform = item.form this.dataList =item.form.dataList + this.projectId = item.form.projectId + this.getStandData(); } }); }, From 6d3c0449dce37c10597d31cd7bcf172a408462e6 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sat, 4 Sep 2021 14:33:44 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86->?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5->=E6=96=87=E6=9C=AC=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=8F=AF=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index c1acaa477..df03929cf 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -739,7 +739,7 @@ clearable> From 19215f389732e2c7b3c2184f0bdc1ac96622abd2 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sat, 4 Sep 2021 14:35:22 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=AE=9E=E6=96=BD?= =?UTF-8?q?=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EnterpriseStandardDatabase.vue | 48 +++++++++++++++---- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 6fba1dcf0..f27be025e 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -478,7 +478,7 @@ :editable="false" placeholder="请选择发布日期"> - + - + { const value = nowstandinfo[item.attrField] @@ -3276,6 +3283,28 @@ export default { this.tableFlag = item // item.advanceSearchVOStr = JSON.stringify(advancedSearch) || '' this.getBussionStandTable(item,'',type) + + + this.sarBussionessSearch.applyCountry = '' + this.sarBussionessSearch.standGenera = '' + this.sarBussionessSearch.standSubclass = '' + this.sarBussionessSearch.issueTime = '' + this.sarBussionessSearch.putTime = '' + this.sarBussionessSearch.responsibleUnit = '' + this.sarBussionessSearch.classifyCode = '' + this.sarBussionessSearch.standCode = '' + this.sarBussionessSearch.standName = '' + this.sarBussionessSearch.numberName = '' + this.sarBussionessSearch.standSort = '' + this.sarBussionessSearch.replaceStandNum = '' + this.sarBussionessSearch.orgName = '' + this.sarBussionessSearch.id = '' + this.sarBussionessSearch.synopsis = '' + this.sarBussionessSearch.classifyCode = '' + this.sarBussionessSearch.quoteStand = '' + this.sarBussionessSearch.standStatus = '' + this.sarBussionessSearch.citationUser = '' + this.sarBussionessSearch.advanceSearchVOStr = '' }, // 清空搜索框 clearAllSearch (flag) { @@ -3617,6 +3646,7 @@ export default { }, { _this: this }, res => { + console.log('getAreaList',res.data) this.showRegionOptions = res.data || [] resolve(res.data || []) }, e => { From ce88c8cf9ef67e2fc9fbf02f911187e08167cc97 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sat, 4 Sep 2021 15:26:37 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=80=E7=9B=B4=E6=8F=90=E7=A4=BA=E4=B8=8D=E8=83=BD=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 63409ec07..f21b9a182 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -1935,7 +1935,7 @@ export default { {type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'} // {validator: this.verify.valiateEnName, trigger: 'blur'} ], - standState: [ + textStatus: [ {required: true, message: '文本状态不能为空', trigger: 'change'} ], replaceStandNum: [ From 168d5da1920c878768d9e334b392c3d00f254aec Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sat, 4 Sep 2021 16:39:21 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=A4=8D=E5=AE=A1=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E4=B8=BA=E5=AD=97=E7=AC=A6=E4=B8=B2=E7=9A=84?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EnterpriseStandardDatabase.vue | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index f27be025e..be621f770 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -3899,8 +3899,22 @@ export default { handler: function() { if(this.sarBussionessStandEO.issueTime !== undefined && this.sarBussionessStandEO.issueTime !== null && this.sarBussionessStandEO.issueTime !== ''){ let date = new Date(this.$moment(this.sarBussionessStandEO.issueTime).format('YYYY-MM-DD')) - const FSRQBUSS = date.getFullYear()+ 5 + '-' + date.getMonth() + '-' + date.getDate() - this.sarBussionessStandEO["FSRQBUSS"] = FSRQBUSS + // const FSRQBUSS = date.getFullYear()+ 5 + '-' + date.getMonth() + '-' + date.getDate() + // this.sarBussionessStandEO["FSRQBUSS"] = FSRQBUSS + + let year = date.getFullYear()+5; + let month =(date.getMonth() + 1).toString(); + let day = (date.getDate()).toString(); + if (month.length == 1) { + month = "0" + month; + } + if (day.length == 1) { + day = "0" + day; + } + const FSRQBUSS = year + "-" + month + "-" + day; + console.log(FSRQBUSS,"FSRQBUSS"); + this.sarBussionessStandEO["FSRQBUSS"] = FSRQBUSS + } }, },