diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 2d783eefe..d2758415a 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -1066,7 +1066,7 @@ class="common-button-primary" icon="el-icon-check" type="primary" - @click="getDomesticStandardTableBtn(sarBussionessSearch)">搜索 + @click="getBussionStandTableBtn(sarBussionessSearch,'','sel')">搜索 { + const value = this.sarBussionessSearch[item.attrField] + // 时间格式处理 + if (value !== undefined && value !== null && value !== '') { + advanceSearchVOList.push({ + connect: advanceSearchVOList.length > 0 ? "and" : "", + field: item.attrField || '', + type: 'like', + value: value + }) + } + }) + } + this.sarBussionessSearch.advanceSearchVOStr = JSON.stringify(advanceSearchVOList); + } this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', !item ? this.sarBussionessSearch : item, { _this: this, loading: 'loading' }, res => { @@ -3409,6 +3428,7 @@ export default { if ((this.standinfoList.length === 0 || this.standinfoList === []) && this.sarBussionessSearch.page !== 1) { this.pageChange(1) } + this.isAdvancedSearch = false }, e => { }) // this.$refs.selection.selectAll(false) @@ -3685,22 +3705,7 @@ export default { const attrSearchMap = { applyArctic: formData.applyArctic } - formData['attrSearchStr'] = JSON.stringify(attrSearchMap) - - const advanceSearchVOList = []; - const formFieldList = this.formFieldList - formFieldList.forEach((item) => { - const value = formData[item.attrField] - // 时间格式处理 - if (value !== null && value !== '') { - advanceSearchVOList.push({ - field: item.attrField || '', - type: 'like', - value: value - }) - } - }) - formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList); + formData['attrSearchStr'] = JSON.stringify(attrSearchMap) this.SarExportSearchEo = item || this.sarBussionessSearch this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, { _this: this, loading: 'loading' @@ -3914,10 +3919,10 @@ export default { // this.classifyCodeOptions = res.data.STANDCLASSIFY }, e => { }) - this.getBussionStandTable(this.tableFlag) - // this.getOrgTreeSource() // 加载动态表单数据 this.getAddFormFieldList() + this.getBussionStandTable(this.tableFlag) + // this.getOrgTreeSource() this.tableHeight = $('.content').height() - 44 - 20 window.onresize = () => { this.tableHeight = $('.content').height() - 44 - 20