diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index d6b350f39..cb1830288 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -977,7 +977,7 @@ width = "500" :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" - :nodeKey="nodeKey" @popoverHide="popoverHide"> + :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"> + :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"> diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue index 641508646..b577a8962 100644 --- a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue @@ -162,10 +162,10 @@ > - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + {{'手动查找'}} + + + + + + + + + + + + + + + @@ -651,7 +658,7 @@ @@ -694,12 +701,11 @@ { @@ -1881,20 +1887,15 @@ }) } this.selectedListRep.map((item) => { - let texts = '' - if (item.standYear != null && item.standYear !== '') { - texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear - } else { - texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber - } + let texts = item.lawsNumber textArr.push(texts) textArr = [...new Set(textArr)] this.replaceLawsNumModel = false }) // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',') // 解决 标准入库流程--圈住的字段,先手动输入,然后再手动查找,点提交就会把手动输入的标准号覆盖 - if(this.replaceLawType === 'dtbjh'){ - this.form.dtbjh = this.form.dtbjh ? this.form.dtbjh + ',' + textArr.join(',') : textArr.join(',') + if(this.replaceLawType === 'YYBZZCLAWS'){ + this.form.YYBZZCLAWS = this.form.YYBZZCLAWS ? this.form.YYBZZCLAWS + ',' + textArr.join(',') : textArr.join(',') }else if(this.replaceLawType === 'yybj'){ this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',') }else if(this.replaceLawType === 'cbbh'){ @@ -1949,7 +1950,7 @@ this.replaceLawsNumForm.quoteIdList = '' } this.replaceLawsNumForm.standType = this.form.standInData === '1' ? 'FOREIGN' : 'INLAND' - this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, { + this.$http.get('lawss/sarLawsInfo/page', this.replaceLawsNumForm, { _this: this, loading: 'replaceLoading' }, res => { diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 3fdf0f328..acbf66a62 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -1545,8 +1545,8 @@ - - + - - - - - - --> + + + + + +