From 7249f0d94d6aa4a7ff57e0da33ab377ee908ab63 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sat, 30 Oct 2021 22:45:48 +0800 Subject: [PATCH] feat: There is no way the,Laws --- .../foreignRegulationsDatabase/index.vue | 2 +- .../searchCenter/pages/advancedSearch.vue | 508 ++++++++++++------ 2 files changed, 357 insertions(+), 153 deletions(-) diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue index 8b84c1756..7c11b86dd 100644 --- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue +++ b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue @@ -908,7 +908,7 @@ diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue index d26f5e77d..3f55f76e4 100644 --- a/src/pages/searchCenter/pages/advancedSearch.vue +++ b/src/pages/searchCenter/pages/advancedSearch.vue @@ -39,9 +39,9 @@ {{ $t("m.standAll") }} - - - + + {{ $t("m.lawsAll") }} + {{ $t("m.enterpriseStandard") }} @@ -402,28 +402,35 @@ - - + + + + - - + - - + - - + @@ -436,156 +443,255 @@ - - + + - - - + + + + + + + + + + + {{ opt.label }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -891,12 +997,11 @@ @@ -985,11 +1090,11 @@ @@ -999,9 +1104,9 @@ width="180" :label="selectIndex === 'INLAND_STAND' ? '文本状态' : (this.selectIndex === 'INLAND_LAWS' ? '文件状态' : '文本状态')"> @@ -1142,6 +1247,33 @@ export default { }, data() { return { + pickerOptions: { + shortcuts: [{ + text: '最近一周', + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); + picker.$emit('pick', [start, end]); + } + }, { + text: '最近一个月', + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30); + picker.$emit('pick', [start, end]); + } + }, { + text: '最近三个月', + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 90); + picker.$emit('pick', [start, end]); + } + }] + }, tableLoading: false, // 分享抽屉状态 saveRoleBuss: [], @@ -1205,6 +1337,7 @@ export default { // 国内标准检索条件 regionOptions: [], // 区域 partsOptions: [], // 关联零部件 + commentCycleDate:'', standForm: { region: "", isHigh:'stand', @@ -1327,6 +1460,46 @@ export default { glwj: '', // 关联文件 xglc: '', // 相关流程 chjl: '', // 参会记录 + lawsType: '', + lawsNumber: '', + lawsName: '', + lawsEnName: '', + lawsNo: '', + issueTime: '', + issueCompany: '', + commentCycleStart: '', + commentCycleEnd: '', + lawsTextState: '', + lawsSyqy: '', + lawsSycx: '', + isRelateAccess: '', + lawsYear: '', + lawsNotisyncNum: '', + lawsBulletin: '', + lawsLabel: '', + lawsRemark: '', + SSRQLAWS:'', + XCXSSRQLAWS:'', + ZCXSSRQLAWS:'', + // 文本信息 + ZCWBLAWS:'', + GCWBLAWS:'', + JDWJLAWS:'', + // 适用范围 + FBJGLAWS: '', + CYSDLAWS: '', + TGRLAWS: '', + TGDWLAWS: '', + NYLXLAWS: '', + YYRZLAWS: '', + ZRBMLAWS: '', + ZRGCSLAWS: '', + DTWJHLAWS: '', + BDTWJHLAWS: '', + YYBZZCLAWS: '', + XGLC: '', + CHJLLAWS: '', + GLWJLAWS: '', }, // 国家/地区 countryOptions: [], @@ -1348,6 +1521,19 @@ export default { qcrOptions:[],//起草人下拉框 nylxOptions:[],//能源类型下拉框 syrzOptions:[],//适用认证下拉框 + lawsTypeOptions: [], + lawsTextStateOptions: [], + lawsSyqyOptions: [], + lawsSycxOptions: [], + lawsYearOptions: [], + lawsLabelOptions: [], + CYSDLAWSOptions: [], + TGRLAWSOptions: [], + TGDWLAWSOptions: [], + NYLXLAWSOptions: [], + YYRZLAWSOptions: [], + ZRBMLAWSOptions: [], + ZRGCSLAWSOptions: [], // 我司署名人 wssmrOptions: [], // 体系类别 @@ -1753,7 +1939,6 @@ export default { this.searchSarBykey(); }, judgeRolePermiOnSar(item, type) { - debugger let pagetype; if (type !== 5 && item.type === "msgdyinfo") { if (type === 2) { @@ -1846,6 +2031,12 @@ export default { sarStandAttrObj[item.attrField] = nowStandForm[attrField] }) nowStandForm['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'") + + if(this.commentCycleDate && this.commentCycleDate.length === 2){ + nowStandForm['commentCycleStart'] = this.commentCycleDate[0] + nowStandForm['commentCycleEnd'] = this.commentCycleDate[1] + } + this.exportSearchInfo = nowStandForm; this.$http.post("search/searchCenter/searchSarBykey", nowStandForm, { _this: this, @@ -1991,7 +2182,6 @@ export default { }, // 查看 查看跳转详情页 detailsStandardLaws(item) { - debugger let routername = ""; let pagetype = ""; if (item.type === "stand") { @@ -2003,19 +2193,20 @@ export default { pagetype = "FOREIGN_STAND"; } } else if (item.type === "laws") { - if (this.$hasPermission("9P2UTSAHZ3AHKDGAEY6V")) { - routername = "OtherLawsDetails"; - if (item.laws_type === "INLAND") { - pagetype = "INLAND_LAWS"; - } else { - pagetype = "FOREIGN_LAWS"; - } - } else { - this.$message({ - message: "无权访问", - type: "warning" - }); - } + routername = "OtherLawsStandDetails"; + pagetype = "LAWS_STAND"; + // if (this.$hasPermission("9P2UTSAHZ3AHKDGAEY6V")) { + // if (item.laws_type === "INLAND") { + // pagetype = "INLAND_LAWS"; + // } else { + // pagetype = "FOREIGN_LAWS"; + // } + // } else { + // this.$message({ + // message: "无权访问", + // type: "warning" + // }); + // } } else { routername = "OtherBussStandardDetails"; pagetype = "BUSINESS_STAND "; @@ -2255,7 +2446,7 @@ export default { } } else if (item.typeShow === "INLAND_LAWS" || item.typeShow === "FOREIGN_LAWS") { if (this.$hasPermission("9P2UTSAHZ3AHKDGAEY6V")) { - routername = "OtherLawsDetails"; + routername = "OtherLawsStandDetails"; } else { this.$message({ message: "无权访问", @@ -2483,6 +2674,19 @@ export default { this.qcdwOptions = res.data.QCDW // 起草单位 this.qcrOptions = res.data.QCRBUSS // 起草人 this.syrzOptions = res.data.SYRZCLASS // 适用认证 + this.lawsTypeOptions = res.data.lawsType + this.lawsTextStateOptions = res.data.lawsTextState + this.lawsSyqyOptions = res.data.lawsSyqy + this.lawsSycxOptions = res.data.lawsSycx + this.lawsYearOptions = res.data.lawsYear + this.lawsLabelOptions = res.data.lawsLabel + this.CYSDLAWSOptions = res.data.CYSDLAWS + this.TGRLAWSOptions = res.data.TGRLAWS + this.TGDWLAWSOptions = res.data.TGDWLAWS + this.NYLXLAWSOptions = res.data.NYLXLAWS + this.YYRZLAWSOptions = res.data.YYRZLAWS + this.ZRBMLAWSOptions = res.data.ZRBMLAWS + this.ZRGCSLAWSOptions = res.data.ZRGCSLAWS }, e => { }); // 根据资源类型过滤表头