diff --git a/src/assets/languages/cn.js b/src/assets/languages/cn.js index ce849b0be..7542fe423 100644 --- a/src/assets/languages/cn.js +++ b/src/assets/languages/cn.js @@ -407,6 +407,7 @@ export const m = { PleaseSelectYourFieldOfExpertise: '请选择所属专业领域', pleaseEnterComments: '请输入备注', standardNo: '标准号', + enterpriseStandardNumber: '企标号', nameStandard: '标准名称', theImportFile: '导入文件', specialEffectiveDate: '特殊生效日期', diff --git a/src/assets/languages/en.js b/src/assets/languages/en.js index de96936ed..95d3023e0 100644 --- a/src/assets/languages/en.js +++ b/src/assets/languages/en.js @@ -236,6 +236,7 @@ export const m = { pleaseSelectApplicableArea: 'PleaseSelectApplicableArea', country: 'Country', itemNumber: 'ItemNumber', + enterpriseStandardNumber: 'enterpriseStandardNumber', entryName: 'EntryName', clauseRequirements: 'ClauseRequirements', keyPointsOfimplementation: 'KeyPointsOfimplementation', diff --git a/src/pages/config/pages/attributeCustom/components/stand.vue b/src/pages/config/pages/attributeCustom/components/stand.vue index af18030c8..64706c03e 100644 --- a/src/pages/config/pages/attributeCustom/components/stand.vue +++ b/src/pages/config/pages/attributeCustom/components/stand.vue @@ -135,7 +135,7 @@ - + { + filesId.push(itemIds.id) + }) + this.listForm.fileId = filesId.join(',') item.fileName.forEach(itemId => { this.fileIds = itemId.id this.getFileInfo(); diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index af104870f..a1dcfe0a3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -543,8 +543,8 @@ }) } else { this.$message.warning('流程启动失败') + this.isSubmit = false } - this.isSubmit = false }) } else { return this.$message.warning('请完善人员信息') diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index e095c2f12..47fbb736a 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -204,7 +204,7 @@ tooltip-effect="dark" style="width: 100%" border - height="100%" + height="150%" :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @selection-change="selectedChange" @@ -233,7 +233,7 @@ @@ -283,13 +283,10 @@ export default { standModel: false, // 总数 total: 0, - // 当前页数 - pageNo: 1, // 查询未符合项整改数据库数据 queryUnqualidiedData: { - pageNo: 1, - pageSize: 10, - total: 0, + current: 1, + size: this.$store.getters.userInfo.configContent, closeState: '1', standId: '', standSerialNumber: '', // 标准号/名称 @@ -344,6 +341,12 @@ export default { //点击新增事件 addList() { dicTypeData().then(res => { + if (this.pageNo !== undefined) { + this.queryUnqualidiedData.current = this.pageNo + } + if (this.size !== undefined) { + this.queryUnqualidiedData.size = this.size + } this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 standUnqualified(this.queryUnqualidiedData).then(res => { this.unqualidiedData = res.data.records @@ -553,8 +556,9 @@ export default { this.pageNo = page this.getTableByPage() }, - pageSizeChange () { - this.getTableByPage() + pageSizeChange (pageSize) { + this.size = pageSize + this.getTableByPage(pageSize) }, } } diff --git a/src/pages/regulatoryRepository/partCodeApply/index.vue b/src/pages/regulatoryRepository/partCodeApply/index.vue index b245f5a95..f9c470180 100644 --- a/src/pages/regulatoryRepository/partCodeApply/index.vue +++ b/src/pages/regulatoryRepository/partCodeApply/index.vue @@ -42,8 +42,8 @@ - - 删除 + + 批量删除 diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue index 2acf17183..216fe4e16 100644 --- a/src/pages/searchCenter/pages/advancedSearch.vue +++ b/src/pages/searchCenter/pages/advancedSearch.vue @@ -599,178 +599,232 @@ - - + + + + - - + - - + + - - + + - - + + - - + + + + {{ opt.label }} + + - - + + - - + + - - + + - - + + - - + + + + - + + + - - - - - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -1259,6 +1313,11 @@ export default { txlbOptions: [], // 体系类别 // 标准类别 standSortOptions: [], + textStatusOptions: [], + qcdwOptions:[],//起草单位下拉框 + qcrOptions:[],//起草人下拉框 + nylxOptions:[],//能源类型下拉框 + syrzOptions:[],//适用认证下拉框 // 我司署名人 wssmrOptions: [], // 体系类别 @@ -2377,6 +2436,10 @@ export default { this.bussBigClassOptions = res.data.BUSSBIGCLASS; this.bussStandClassOptions = res.data.BUSSSTANDCLASS; this.regionOptions = res.data.REGION; // 区域 + this.textStatusOptions = res.data.TEXTSTATUSBUSS // 文本状态 + this.qcdwOptions = res.data.QCDW // 起草单位 + this.qcrOptions = res.data.QCRBUSS // 起草人 + this.syrzOptions = res.data.SYRZCLASS // 适用认证 }, e => { }); // 根据资源类型过滤表头 diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index ca938b778..18bd700ac 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -877,9 +877,9 @@ } else if (this.selectIndex === 'laws' && seniortype[i] === 'CYSD') { renameType = 'WSSFCY' } else if (this.selectIndex === 'enterprise' && seniortype[i] === 'ORGLIST'){ - renameType = 'ZQCBM' + renameType = 'QCDW' } else if (this.selectIndex === 'enterprise' && seniortype[i] === 'BUSSSTATE'){ - renameType = 'statecode' + renameType = 'textStatusBuss' } else { renameType = seniortype[i] @@ -1136,11 +1136,11 @@ // 企业标准 case 'enterprise': //标准状态 - filterOptions.BUSSSTATE = originOptions.BUSSSTATE - filterOptions.BUSSSTATE.title = '标准状态' + filterOptions.BUSSSTATE = originOptions.TEXTSTATUSBUSS + filterOptions.BUSSSTATE.title = '文本状态' filterOptions.BUSSSTATE.index = 1 //主起草部门 - filterOptions.ORGLIST = originOptions.ORGLIST + filterOptions.ORGLIST = originOptions.QCDW filterOptions.ORGLIST.title = '主起草部门' filterOptions.ORGLIST.index = 2 break @@ -1264,8 +1264,8 @@ } if(condition.selectIndex === 'enterprise'){ condition.selectIndex='bussstand' - condition.standState = condition.BUSSSTATE - condition.ZQCBM = condition.ORGLIST + condition.textStatusBuss = condition.BUSSSTATE + condition.QCDW = condition.ORGLIST } // 查询为国内外政策时,改变查询参数名 if (condition.selectIndex === 'laws') {