From da4f7a545c98ace217d348b278446760a7a24660 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Mon, 23 Aug 2021 15:51:58 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BA=93=E8=B0=83=E5=8F=96=E6=95=B0=E6=8D=AEbug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9~~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/details.vue | 153 ++++++------------ 1 file changed, 45 insertions(+), 108 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 10b8a91f7..04b1c3912 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -699,115 +699,52 @@ export default { cancelStand() { this.standModel = false; }, - //如果张宇欢改好了就把这个放开，然后把底下那个注释了 - // okStand() { - // let _this = this; - // if (this.standList.length < 1) { - // _this.$message.warning("请选择标准"); - // } else { - // for (let i = 0; i < this.dataList.length; i++) { - // let newStand = false; - // for (let j = 0; j < this.standList.length; j++) { - // if (this.standList[j].id == this.dataList[i].standId) { - // newStand = true; - // this.standList.splice(j, 1) - // j-- - // } - // } - // if (newStand) { - // _this.$message.warning("请勿重复添加数据"); - // } else { - // // _this.dataList.push(item); - // } - // } - // this.standardData = [] - // _this.standModel = false; - // for (var i = 0; i < this.standList.length; i++) { - // this.standList1.push({ - // standId: this.standList[i].id, - // projectId: this.localProEO.id - // }) - // } - // if (this.standList1 != '') { - // this.$http.postData("sarStandProjectLibrary/batchInsert", this.standList1, { - // _this: this - // }, res => { - // if (res.ok) { - // // this.$message.success(res.message) - // this.getDataList() - // } - // }, e => { - // }); - // } - // this.standList = [] - // this.standList1 = [] - // _this.standModel = false; - // } - // }, - //添加标准确定事件 - okStand(){ - if(this.standList.length > 0){ - this.standList.forEach(item => { - let addIndex - addIndex = this.dataList.findIndex(items => { - return items.standId === item.id - }) - if(addIndex > -1){ - this.$message.warning('请勿重复添加数据') - }else{ - this.dataList.push(item) - } - }) - this.detailedListModel = false - this.standModel = false - }else{ - this.$message.warning('请至少选择一条数据进行添加') - } + + okStand() { + let _this = this; + if (this.standList.length < 1) { + _this.$message.warning("请选择标准"); + } else { + for (let i = 0; i < this.dataList.length; i++) { + let newStand = false; + for (let j = 0; j < this.standList.length; j++) { + if (this.standList[j].id == this.dataList[i].standId) { + newStand = true; + this.standList.splice(j, 1) + j-- + } + } + if (newStand) { + _this.$message.warning("请勿重复添加数据"); + } else { + // _this.dataList.push(item); + } + } + this.standardData = [] + _this.standModel = false; + for (var i = 0; i < this.standList.length; i++) { + this.standList1.push({ + standId: this.standList[i].id, + projectId: this.localProEO.id + }) + } + if (this.standList1 != '') { + this.$http.postData("sarStandProjectLibrary/batchInsert", this.standList1, { + _this: this + }, res => { + if (res.ok) { + // this.$message.success(res.message) + this.getDataList() + } + }, e => { + }); + } + this.standList = [] + this.standList1 = [] + _this.detailedListModel = false; + _this.standModel = false; + } }, - // okStand() { - // let _this = this; - // if (this.standList.length < 1) { - // _this.$message.warning("请选择标准"); - // } else { - // for (let i = 0; i < this.dataList.length; i++) { - // let newStand = false; - // for (let j = 0; j < this.standList.length; j++) { - // if (this.standList[j].id == this.dataList[i].standId) { - // newStand = true; - // this.standList.splice(j, 1) - // j-- - // } - // } - // if (newStand) { - // _this.$message.warning("请勿重复添加数据"); - // } else { - // // _this.dataList.push(item); - // } - // } - // this.standardData = [] - // _this.standModel = false; - // for (var i = 0; i < this.standList.length; i++) { - // this.standList1.push({ - // standId: this.standList[i].id, - // projectId: this.localProEO.id - // }) - // } - // if (this.standList1 != '') { - // this.$http.postData("sarStandProjectLibrary/batchInsert", this.standList1, { - // _this: this - // }, res => { - // if (res.ok) { - // // this.$message.success(res.message) - // this.getDataList() - // } - // }, e => { - // }); - // } - // this.standList = [] - // this.standList1 = [] - // _this.standModel = false; - // } - // }, //获取标准 getStandrd(data){ this.detailedId = data.id From 5164456f617535a4499c60e00fdbb56f472b3943 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Mon, 23 Aug 2021 15:52:17 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E7=BB=93=E6=9E=9Ctab=E9=A1=B5=E4=B8=8B=E7=9A=84=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E9=A1=B5=E9=9D=A2=EF=BC=8C=E7=82=B9=E5=87=BB=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8C=89=E9=92=AE=EF=BC=8C=E6=8F=90=E7=A4=BA=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/standInvolveProjectDetail.vue | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index a68f0a129..e6137ab47 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -109,6 +109,13 @@
+ + + - - - Date: Mon, 23 Aug 2021 17:49:28 +0800 Subject: [PATCH 03/20] feat: There is no way the advanced query --- .../components/EnterpriseStandardDatabase.vue | 286 +++++++++++++++++- 1 file changed, 275 insertions(+), 11 deletions(-) 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 { diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index f7be9ed8a..2f8411f01 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -219,6 +219,8 @@ export default { }else{ this.toProcessDetail('xmpg2Step1-2',row) } + }else if(prcType === '9'){ + this.toProcessDetail('bzjdStep1-6',row) } } else { this.$message.warning('当前流程未全部办理完成，无法查看') diff --git a/src/router/index.js b/src/router/index.js index c01c0ef07..cb6fc9cd6 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -862,6 +862,15 @@ const routes = [ title: '标准解读流程' } }, + { + path: '/bzjdStep1-6', + name: 'bzjdStep1-6', + component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue'), + meta: { + requireAuth: true, + title: '标准解读流程' + } + }, ] }, // 本地工具 From f56839b8b12be0d14c4d0b1ee30a2427c65a329b Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 24 Aug 2021 14:11:05 +0800 Subject: [PATCH 09/20] commit --- .../pages/creatProcess/bzzqyj/step3.vue | 13 +------------ .../pages/creatProcess/bzzqyj/step5.vue | 13 +++++++++++++ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index e0d16c839..1d19fe428 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -357,7 +357,6 @@ json.commentText = this.commentText json.info = this.data json.department = this.$store.getters.userInfo.orgName - json.introduce = true this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -383,17 +382,7 @@ this.form.endTime = data.endTime this.form.cname = data.cname this.json = data - if (data.introduce) { - this.data = data.info || [] - } else { - this.$http.get('slrs/sar-public-idea-all/getPublicIdea', { - unique: data.uniques - }, {}, res => { - res.data.forEach(item => { - this.data.push(item) - }) - }) - } + this.data = data.info || [] }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 0d73dd9a0..1320b9156 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -330,6 +330,7 @@ var json = this.json json.oldinfo = this.oldData json.commentText = this.commentText + json.introduce = true this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -364,6 +365,18 @@ }) this.json = data this.data = data.summaryList + if (data.introduce) { + } else { + this.$http.get('slrs/sar-public-idea-all/getPublicIdea', { + unique: data.uniques + }, {}, res => { + res.data.forEach(item => { + item.chapterNumber = item.partCode + item.responUserName= item.userName + this.data.push(item) + }) + }) + } }).catch(e => { }) }) 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 10/20] =?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 11/20] =?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 12/20] =?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 13/20] =?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 14/20] =?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 15/20] 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 16/20] 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 17/20] 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 @@ + + diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 2f8411f01..233ebf577 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -219,8 +219,12 @@ export default { }else{ this.toProcessDetail('xmpg2Step1-2',row) } + //标准解读流程 }else if(prcType === '9'){ this.toProcessDetail('bzjdStep1-6',row) + //标准调研流程 + }else if(prcType === '2'){ + this.toProcessDetail('bzdyStep1-9',row) } } else { this.$message.warning('当前流程未全部办理完成，无法查看') diff --git a/src/router/index.js b/src/router/index.js index cb6fc9cd6..5669438e8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -799,6 +799,15 @@ const routes = [ title: '标准调研流程' } }, + { + path: '/bzdyStep1-9', + name: 'bzdyStep1-9', + component: () => import('@/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue'), + meta: { + requireAuth: true, + title: '标准调研流程' + } + }, { path: '/bzjdStep1', name: 'bzjdStep1', From d6f7c8492afd71d0a427fd125ef293f4c6639218 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 25 Aug 2021 10:07:02 +0800 Subject: [PATCH 19/20] feat: There is no way the es testStatus --- src/pages/searchCenter/pages/advancedSearch.vue | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue index 216fe4e16..d6dce4ec3 100644 --- a/src/pages/searchCenter/pages/advancedSearch.vue +++ b/src/pages/searchCenter/pages/advancedSearch.vue @@ -973,10 +973,10 @@ + :label="selectIndex === 'INLAND_STAND' ? '文本状态' : (this.selectIndex === 'INLAND_LAWS' ? '文件状态' : '文本状态')"> @@ -1963,20 +1963,8 @@ export default { }); } } else { - if (this.$hasPermission("AMFQKB2GCPSJ5YVPPHG6")) { routername = "OtherBussStandardDetails"; pagetype = "BUSINESS_STAND "; - // this.judgeBussRole(item) - // if (this.bussRoleFlag === false) { - // this.$message.error('当前角色无权限查看此信息') - // } else { - // } - } else { - this.$message({ - message: "无权访问", - type: "warning" - }); - } } // 详情跳到新页 if (routername !== "") { From 6b89c5f43094bb8292466e427c55e4784e737463 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 25 Aug 2021 10:55:51 +0800 Subject: [PATCH 20/20] feat: There is no way the buss --- .../searchCenter/pages/advancedSearch.vue | 41 +++++++++++++++++-- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue index d6dce4ec3..23a60ebce 100644 --- a/src/pages/searchCenter/pages/advancedSearch.vue +++ b/src/pages/searchCenter/pages/advancedSearch.vue @@ -775,7 +775,19 @@ - + + @@ -1126,6 +1138,7 @@ export default { modalShowFlag2: false, // drawer开关 modalShowFlag3: false, // drawer开关 modalShowFlag4: false, // drawer开关 + modalShowFlagBuss: false, // drawer开关 url:'', urlChild:'', drawerTitle: '', //drawer标题 @@ -1151,6 +1164,7 @@ export default { key1:2, key2:3, key3:4, + keyBuss:5, nodeKey: 'id', defaultCheckedKeys: [], nodeKeyCode: 'code', @@ -1302,6 +1316,7 @@ export default { // 国家/地区 countryOptions: [], standSystemOptions: [], // 标准体系 + standSystemBussOptions: [], // 企标体系 busVppsOptions: [], // 车系体系架构 busVppsChildOptions: [], // 车系体系架构子集合 modelOptions: [], // 模块体系架构 @@ -1390,11 +1405,19 @@ export default { // 国内外标准 const inlandList = data['INLAND_STAND'] || [] const foreignList = data['FOREIGN_STAND'] || [] + const bussList = data['BUSS'] || [] const foreignFilterList = foreignList.filter ( item => item.attrField === 'GXHBQ' || item.attrField === 'ZBJBD' || item.attrField === 'KWJ' || item.attrField === 'TXLB'); - this.formFieldListStandData = this.formFieldListStandData.concat(inlandList).concat(foreignFilterList); + const bussFilterList = bussList.filter ( item => item.attrField !== 'QCDW' && item.attrField !== 'XGLC'); + this.formFieldListStandData = this.formFieldListStandData.concat(inlandList).concat(foreignFilterList).concat(bussFilterList); + console.log(this.formFieldListStandData) } }, e => {}) }, + choiceZRRTxlbBuss (type, title, id) { + this.drawerTitle = title + this.modalShowFlagBuss = true + this.keyBuss++ + }, choiceZRR1 (type, title, id) { this.drawerTitle = title this.modalShowFlag1 = true @@ -1427,6 +1450,17 @@ export default { this.urlChild="sarModelTree/childByList" this.key3++ }, + popoverBuss (checkedIds, checkedData,isShow,isLoadChild,topId) { + if(checkedData) { + if(checkedData.length > 0){ + this.standForm.TXLBBUSS = checkedData.map(item => item.menuName).join(",") + }else { + this.standForm.TXLBBUSS = checkedData.menuName + } + } + this.modalShowFlagBuss = false + this.$forceUpdate() + }, popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) { if(checkedData) { if(checkedData.length > 0){ @@ -1784,7 +1818,7 @@ export default { const formFieldList = this.formFieldListStandData const sarStandAttrObj = {} formFieldList.forEach((item) => { - const attrField = item.attrField.toLowerCase(); + const attrField = this.selectIndex === 'INLAND_STAND' ? item.attrField.toLowerCase() : item.attrField; const value = nowStandForm[attrField] // 时间格式处理 if (item.attrType === 'DATE_PICKER' && value) { @@ -2407,6 +2441,7 @@ export default { this.standNatureOptions = res.data.SARPROPERTY // 标准性质 this.standStateOptions = res.data.WBZTCLASS // 文本状态 this.standSystemOptions = res.data.BZTXCLASS // 标准体系 + this.standSystemBussOptions = res.data.TXLBBUSS // 企标体系 this.applyArcticOptions = res.data.ENERGYTYPES // 根据需求文档，产品类别对应标准属性中的“适用车型” this.categoryOptions = res.data.NYLXCLASS // 能源类型 this.applyAuthOptions = res.data.SYRZCLASS // 适用认证