diff --git a/src/common/verify/index.js b/src/common/verify/index.js index 2f030082a..b217a4af9 100644 --- a/src/common/verify/index.js +++ b/src/common/verify/index.js @@ -24,8 +24,9 @@ export default { * */ validateStandardItem (rule, value, callback) { // return callback() - let testval = /^[A-Za-z0-9/ ,.-\\-()()]+$/ - if (value && !value.match(testval)) { + let testval = /^[A-Za-z0-9/]+$/ + let testval1 = /[.-]+/ + if (value && !value.match(testval) && !value.match(testval1)) { return callback(new Error('只能为(字母、数字、.、-)')) } else { callback() @@ -457,9 +458,9 @@ export default { callback() } }, - // 验证输入数字和英文 + // 验证输入数字 testNumberCode (rule, value, callback) { - let reg = /[0-9\-]/ + let reg = /^[0-9]*$/ if (value !== '' && !value.match(reg)) { return callback(new Error('只能输入数字')) } else { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index 3f2da573d..bf4b8f6b8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -355,6 +355,7 @@ this.form.endTime = data.endTime this.form.cname = data.cname this.json = data + 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 83c9a4840..2d74da2a8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -74,26 +74,10 @@ prop="chapterNumber" label="章条编号" width="170px"> - - { - item.state = '1' + if (item.state) { + } else { + item.state = '1' + } item.type = false }) this.json = data diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index 4bd4a2c47..03ebb522f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -3,7 +3,7 @@ - +
基础信息
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue index d1758b600..cc10b90c5 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue @@ -289,10 +289,8 @@ export default { this.searchSarAccess(); }, clearSearch() { - this.sarSarAccessEOSearch = { - countryArea: "", - detailedListName: "" - }; + this.sarSarAccessEOSearch.countryArea = '' + this.sarSarAccessEOSearch.detailedListName = '' this.searchSarAccess(); }, // 新增相关 diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue index e9e38173a..36b0a7b56 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue @@ -165,12 +165,11 @@ export default { total: 0, page: 1, rows: 10, + pageSize: this.$store.getters.userInfo.configContent, // 查询相关参数 sarSarAccessEOSearch: { detailedList: "", detailedListName: "", - page: 1, - pageSize: this.$store.getters.userInfo.configContent }, sarAccessListDatas: [], sarAccessListTotal: 0, @@ -267,9 +266,9 @@ export default { //分页查询 searchSarAccess() { this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", { - ...this.sarSarAccessEOSearch, page: 1, - pageSize: 10, + pageSize: this.pageSize, + ...this.sarSarAccessEOSearch, sortKey: 3 }, { _this: this @@ -289,10 +288,8 @@ export default { this.searchSarAccess(); }, clearSearch() { - this.sarSarAccessEOSearch = { - detailedList: "", - detailedListName: "" - }; + this.sarSarAccessEOSearch.detailedList = '' + this.sarSarAccessEOSearch.detailedListName = '' this.searchSarAccess(); }, // 新增相关 diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue index 29a9da82b..d90958400 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue @@ -165,13 +165,12 @@ export default { searching: false, total: 0, page: 1, + pageSize: this.$store.getters.userInfo.configContent, rows: 10, // 查询相关参数 sarSarAccessEOSearch: { projectName: "", detailedListName: "", - page: 1, - pageSize: this.$store.getters.userInfo.configContent }, sarAccessListDatas: [], sarAccessListTotal: 0, @@ -268,9 +267,9 @@ export default { //分页查询 searchSarAccess() { this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", { + page: this.page, + pageSize: this.pageSize, ...this.sarSarAccessEOSearch, - page: 1, - pageSize: 10, sortKey: 2 }, { _this: this @@ -291,10 +290,8 @@ export default { }, //清空 clearSearch() { - this.sarSarAccessEOSearch = { - projectName: "", - detailedListName: "", - }; + this.sarSarAccessEOSearch.projectName = '' + this.sarSarAccessEOSearch.detailedListName = '' this.searchSarAccess() }, diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 9300400fc..96f578574 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -1376,9 +1376,9 @@ export default { // 清单条目 table select事件 sarAccessInfoSelect (selectData) { this.sarAccessInfoListArry = selectData - let sarAccessInfoListArryId = [] + /* let sarAccessInfoListArryId = [] for(let i=0; i - + + + + 查询 @@ -106,7 +120,7 @@ + + + + + 0) { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index 351a42d50..f8c391e79 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -1392,7 +1392,7 @@ export default { for (var accessInfo in exportList) { accIdAndrestype.push(exportList[accessInfo].id) } - const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName + const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&id=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName window.open(exportURL) // window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames this.$message.success('导出信息成功') diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index ad7f9a9fe..3c8704868 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -1390,7 +1390,7 @@ export default { for (var accessInfo in exportList) { accIdAndrestype.push(exportList[accessInfo].id) } - const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName + const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&id=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName window.open(exportURL) // window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames this.$message.success('导出信息成功') diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index be7ea2547..2cdf2e30f 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -188,7 +188,7 @@ round @click="clearAllSearch('sarBussionessSearch')" > - 高级检索 +
@@ -218,7 +218,7 @@ round @click="exportStandard" title="不勾选时默认导出所有筛选项;勾选时仅导出勾选项" - v-btn-permission="'UFIZU4O3AH'" + v-btn-permission="'784d26f527a659eefe84d5e5a53deb96'" >导出 @@ -227,23 +227,23 @@ - - - - - - + 批量删除 配置标准 移除标准 @@ -382,20 +382,20 @@ 收藏 取消收藏 - 编辑 - 分享 - 授权 + 编辑 + + @@ -757,7 +757,8 @@ @click="saveConfigStand" :loading="isSubmit" >提交 - 取消 + 取消 diff --git a/src/pages/regulatoryRepository/standardForComments/index.vue b/src/pages/regulatoryRepository/standardForComments/index.vue index f59f8f7b3..b70d81004 100644 --- a/src/pages/regulatoryRepository/standardForComments/index.vue +++ b/src/pages/regulatoryRepository/standardForComments/index.vue @@ -73,6 +73,9 @@ prop="endTime" label="征求意见周期" align="center"> +

- {{ this.$route.query.item.categorg }} + {{ this.$route.query.item.cid }}

@@ -19,10 +19,11 @@

- {{ this.$route.query.item.starttime || '-' }} + {{ this.$route.query.item.startTime + ' ~ ' + this.$route.query.item.endTime}} + -

- {{ this.$route.query.item.endtime || '-' }} + {{ this.$route.query.item.endTime || '-' }}

@@ -105,8 +106,8 @@