From d8af38336419b6d62bd92245ba0358fbde9f57c8 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Tue, 24 Aug 2021 14:35:47 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=87=AA=E5=AE=9A=E4=B9=89=E7=A6=81=E7=94=A8?= =?UTF-8?q?=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/config/pages/attributeCustom/components/stand.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ - + Date: Tue, 24 Aug 2021 14:43:51 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E7=AC=AC=E4=B8=80=E6=AD=A5=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E6=8C=89=E9=92=AEloading=E6=95=88=E6=9E=9C=E4=B8=8D=E4=BD=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index c38825090..3de6d38dd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -556,8 +556,8 @@ export default { }) } else { this.$message.warning('流程启动失败') + this.isSubmit = false } - this.isSubmit = false }) } else { return this.$message.warning('请完善人员信息') From 08a863a0979f1145f7b85912a74ba48d96e3653f Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Tue, 24 Aug 2021 15:32:57 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81--=E7=94=B3=E8=AF=B7=E4=BA=BA=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E6=B5=81=E7=A8=8B=E6=AD=A5=E9=AA=A4=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=B2=A1=E6=9C=89loading=EF=BC=8C=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E9=80=9A=E8=BF=87=E7=82=B9=E5=87=BB=E5=A4=9A=E6=AC=A1?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=8C=89=E9=92=AE=E6=8F=90=E4=BA=A4=E5=A4=9A?= =?UTF-8?q?=E6=AC=A1=20=E8=BF=99=E4=B8=AA=E9=97=AE=E9=A2=98=E5=9C=A8?= =?UTF-8?q?=E8=8D=89=E7=A8=BF=E5=92=8C=E6=96=B0=E5=BB=BA=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E9=83=BD=E5=AD=98=E5=9C=A8=20=E7=8E=B0=E5=B7=B2=E8=A7=A3?= =?UTF-8?q?=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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('请完善人员信息') From 707cf898a263d8053bd68e8f02ee616f6a6349ee Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Tue, 24 Aug 2021 15:34:26 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E4=BC=A0=E8=BE=93=E6=96=87=E4=BB=B6id=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step4.vue | 6 +++++ .../pages/creatProcess/wfhxzg/step1.vue | 22 +++++++++++-------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index 2cbe932a9..4f1126628 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -261,6 +261,7 @@ export default { total: 0, pageSize: this.$store.getters.userInfo.configContent, listForm: { + fileIds: '', listType: "", //区分是哪个清单 listName: "", //清单名称 descriptionList: "", //清单说明 @@ -358,6 +359,11 @@ export default { this.listForm.applyUpdUserId = item.applyUpdUserId; this.listForm.jlUserId = item.jlUserId; this.listForm.zrUserId = item.zrUserId; + let filesId = [] + item.fileName.forEach(itemIds =>{ + 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/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) }, } } From 197c403ede9f3ec26a4059b47aee381746e506df Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Tue, 24 Aug 2021 15:40:42 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E9=9B=B6=E9=83=A8=E4=BB=B6=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E7=94=B3=E8=AF=B7=E7=9A=84=E6=8C=89=E9=92=AE=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/regulatoryRepository/partCodeApply/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 @@ - - 删除 + + 批量删除 From b062e5d80c5b913b4d42eb1750aa2aa5c6f12bea Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 24 Aug 2021 17:32:23 +0800 Subject: [PATCH 6/6] feat: There is no way the ES BUSS --- src/assets/languages/cn.js | 1 + src/assets/languages/en.js | 1 + .../searchCenter/pages/advancedSearch.vue | 281 +++++++++++------- .../searchCenter/pages/standardSearch.vue | 14 +- 4 files changed, 181 insertions(+), 116 deletions(-) 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/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') {