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 1/3] 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') { From 7f8c5737bc9efc0df2edb95832b40809346eb4da Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 24 Aug 2021 17:38:20 +0800 Subject: [PATCH 2/3] commit --- .../pages/creatProcess/bzzqyj/step1.vue | 6 ++++- .../pages/creatProcess/bzzqyj/step3.vue | 27 ++++++++++++++----- .../pages/creatProcess/bzzqyj/step4.vue | 8 +++--- .../pages/creatProcess/bzzqyj/step5.vue | 6 ++--- 4 files changed, 33 insertions(+), 14 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index c38825090..8accf6817 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -552,12 +552,16 @@ export default { if (res.success) { this.$message.success('流程发起成功') this.$router.push('/processCenter') + this.isSubmit = false + } else { + this.$message.warning('流程启动失败') + this.isSubmit = false } }) } else { this.$message.warning('流程启动失败') + this.isSubmit = false } - this.isSubmit = false }) } else { return this.$message.warning('请完善人员信息') diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index 1d19fe428..0ff0abfea 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -221,7 +221,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {inboundLiaisonDetail,processCreateStand} from 'api/process' + import {inboundLiaisonDetail,processCreateStand,saveTaskForPub} from 'api/process' export default { name: "bzzqyjStep3", @@ -324,7 +324,22 @@ handleTabs(name) { this.active = name }, - handleSave() {}, + handleSave() { + this.saveLoading = true + let _formData = new FormData() + _formData.append('taskIds', this.taskIds) + _formData.append('json', JSON.stringify({ + form: this.form, + data: this.data, + commentText: this.commentText, + })) + saveTaskForPub(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + }).catch(e => { + this.saveLoading = false + }) + }, handleSubmit() { if (this.data.length < 1) { this.$message.warning('请输入征求意见') @@ -378,11 +393,11 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.cid = data.cid - this.form.endTime = data.endTime - this.form.cname = data.cname + this.form.cid = data.cid || data.form.cid + this.form.endTime = data.endTime || data.form.endTime + this.form.cname = data.cname || data.form.cname this.json = data - this.data = data.info || [] + this.data = data.info || data.data || [] }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 4e3e3e5b3..8f2419ce2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -301,11 +301,11 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.cid = data.cid - this.form.endTime = data.endTime - this.form.cname = data.cname + this.form.cid = data.cid || data.form.cid + this.form.endTime = data.endTime || data.form.endTime + this.form.cname = data.cname || data.form.cname this.json = data - this.data = data.info + this.data = data.info || data.data }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 1320b9156..e08b93f6e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -352,9 +352,9 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.cid = data.cid - this.form.endTime = data.endTime - this.form.cname = data.cname + this.form.cid = data.cid || data.form.cid + this.form.endTime = data.endTime || data.form.endTime + this.form.cname = data.cname || data.form.cname this.oldData = JSON.parse(JSON.stringify(data.summaryList)) data.summaryList.forEach( item => { if (item.state) { From 2a945201c2734b4e229ba55cbff8c5fbbca6b428 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 24 Aug 2021 20:13:37 +0800 Subject: [PATCH 3/3] commit --- src/pages/login/index.vue | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index c15f9b668..faaa39b35 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -27,6 +27,7 @@