diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 4fe14ff2d..0da5d1e93 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -435,7 +435,7 @@ > - @@ -870,7 +870,212 @@ - + +
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ opt.label }} + + + + + + + + + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + + + + + + + +
+
+
+ +
+ @@ -1000,6 +1205,7 @@ import CustomOrg from '@/components/CustomFormComponents/OrgTree' import CustomSVPPS from '@/components/CustomFormComponents/SVPPS' import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; +import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle' import {mapGetters} from 'vuex' export default { @@ -1016,7 +1222,8 @@ export default { CustomOrg, CustomSVPPS, TreeSelect, - TreeSelectNew + TreeSelectNew, + ProcessTitle }, props: { }, @@ -1030,6 +1237,7 @@ export default { children: 'children', label: 'menuName' }, + advancedSearch:[], nodeKey: 'id', nodeKeyCode: 'code', nodeKeyModel: 'model', @@ -1526,7 +1734,32 @@ export default { applyCountry: '', // 国家/地区 standNature: '', // 标准性质 standSort: '', // 企标类别 - synopsis: '' // 内容摘要 + synopsis: '', // 内容摘要 + // 基础信息 + FZRQBUSS:'', + FSRQBUSS:'', + // 文本信息 + FBGBUSS:'', + BZSMBUSS:'', + LSBBBUSS:'', + QTWJBUSS:'', + // 适用范围 + QCDW:'', + QCRBUSS:'', + WJSCRYBUSS:'', + SYCXCLASS:'', + NYLXCLASS:'', + SYCPXCLASS:'', + TXLBBUSS:'', + VPPSBMBUSS:'', + VPPSCNBUSS:'', + // 关联信息 + DTQBBHBUSS:'', + BDTQBBHBUSS:'', + XGJLBUSS:'', + XGLC:'', + GLWJBUSS:'', + XCSJBUSS:'', }, // 分页查询过程中用到的对象 total: 0, configStandList: [], @@ -1598,6 +1831,7 @@ export default { categoryConfigOptions: [], // 所属类别下拉框 assemClassOptions: [], // 总成分类下拉框 qcdwOptions:[],//起草单位下拉框 + qcrOptions:[],//起草人下拉框 cysdOptions:[], //我司参与深度下拉框 nylxOptions:[],//能源类型下拉框 syrzOptions:[],//适用认证下拉框 @@ -1915,8 +2149,10 @@ export default { }, // 高级检索 selectMoreBtn () { - this.isAdvancedSearch = true - this.threeOptions = [] + this.isAdvancedSearch = true + this.sarBussionessSearch = {} + // this.isAdvancedSearch = true + // this.threeOptions = [] }, // 高级检索类型change事件 twoSelectChange (val) { @@ -3003,7 +3239,7 @@ export default { exportTestItem () { if (this.saveExportType === 'apart') { if (this.selectedList != null && this.selectedList !== '') { - window.open('/api/lawss/sarBussionessStand/exportSarBussionessStand?exportContent=' + this.selectedList.join(',') + '&exportType=' + this.saveExportType + '&exportName=' + this.exportName) + window.open('/api/lawss/sarBussionessStand/exportSarBussionessStand?exportContent=' + this.selectedList.join(',') + '&exportType=' + this.saveExportType + '&exportName=' + this.exportName + '&userId=' + this.$store.getters.userInfo.userId) // this.$refs.selection.selectAll(false) this.$message({ message: '导出信息成功', @@ -3013,7 +3249,7 @@ export default { } else if (this.saveExportType === 'all') { let exportEOStr = JSON.stringify(this.SarExportSearchEo) exportEOStr = exportEOStr.replace(/""/g, null) - window.open('/api/lawss/sarBussionessStand/exportSarBussionessStand?exportContent=' + exportEOStr + '&exportType=' + this.saveExportType + '&exportName=' + this.exportName) + window.open('/api/lawss/sarBussionessStand/exportSarBussionessStand?exportContent=' + exportEOStr + '&exportType=' + this.saveExportType + '&exportName=' + this.exportName + '&userId=' + this.$store.getters.userInfo.userId) this.$message({ message: '导出信息成功', type: 'success' @@ -3056,8 +3292,9 @@ export default { this.sarBussionessSearch.standStatus = '' this.sarBussionessSearch.citationUser = '' this.sarBussionessSearch.advanceSearchVOStr = '' - this.tableFlag.page = 1 + this.pageChange(1) this.getBussionStandTable(this.sarBussionessSearch) + this.isAdvancedSearch = false } else if (flag === 2) { // 标准条目搜索 // 标准条目搜索 @@ -3152,6 +3389,7 @@ export default { this.sarBussionessSearch.labelMenuId = undefined this.sarBussionessSearch.collectMenuId = undefined } + this.sarBussionessSearch.userId = this.$store.getters.userInfo.userId this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', !item ? this.sarBussionessSearch : item, { _this: this, loading: 'loading' }, res => { @@ -3167,7 +3405,6 @@ export default { res.data.list[i].isSubmit = false } this.standinfoList = res.data.list - console.log(this.standinfoList,'11111111111111111') this.total = res.data.count if ((this.standinfoList.length === 0 || this.standinfoList === []) && this.sarBussionessSearch.page !== 1) { this.pageChange(1) @@ -3448,7 +3685,23 @@ export default { const attrSearchMap = { applyArctic: formData.applyArctic } - formData['attrSearchStr'] = JSON.stringify(attrSearchMap) + formData['attrSearchStr'] = JSON.stringify(attrSearchMap) + + const advanceSearchVOList = []; + const formFieldList = this.formFieldList + const sarStandAttrObj = {} + formFieldList.forEach((item) => { + const value = formData[item.attrField] + // 时间格式处理 + if (value !== null && value !== '') { + this.advancedSearch.push({ + field: item.attrField || '', + type: 'like', + value: value + }) + } + }) + formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList); this.SarExportSearchEo = item || this.sarBussionessSearch this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, { _this: this, loading: 'loading' @@ -3652,6 +3905,7 @@ export default { this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.txlbOptions = res.data.TXLBCLASS // 体系类别 this.qcdwOptions = res.data.QCDW // 起草单位 + this.qcrOptions = res.data.QCRBUSS // 起草人 this.nylxOptions = res.data.NYLXCLASS // 能源类型 this.syrzOptions = res.data.SYRZCLASS // 适用认证 this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 @@ -3679,6 +3933,16 @@ export default {