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(); } }); }, diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 6fba1dcf0..be621f770 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 => { @@ -3869,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 + } }, }, diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 1669d43ce..f21b9a182 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -739,7 +739,7 @@ clearable> @@ -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: [