diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index 9dc7f2281..daadb9bce 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -14,10 +14,12 @@ size="mini" type="primary" class="common-button-primary" - @click="searchStandList">搜索 + v-btn-permission="'bcf0d05723689ced8f49fae7794ff0db'" + @click="searchStandList">查询 清空 @@ -26,10 +28,10 @@
- 拆分 - 上传 - 导入拆分结果 - 删除 + 拆分 + 上传 + 导入拆分结果 + 删除
@@ -107,25 +109,24 @@ - 查看 - + 查看 收藏 取消收藏 - 分享 + 分享 - 删除 + 删除 diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue new file mode 100644 index 000000000..6f9b6ffd5 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -0,0 +1,659 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue new file mode 100644 index 000000000..88296df3c --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -0,0 +1,13 @@ + + + + + + diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index 880fd4e01..8f32c18a9 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -9,6 +9,7 @@
标准征求意见流程
标准需求(翻译)申请流程
标准发放申请流程
+
标准清单发布/更新流程
@@ -77,6 +78,10 @@ export default { // 标准发放申请流程 break case '6': + //标准清单发布流程 + this.$router.push({ + name:'bzqdfbStep1' + }) break case '7': break diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue index 48e9227cb..4dc533b3d 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue @@ -51,7 +51,7 @@ class="common-button-primary add-button" size="mini" @click="openModal(null,'addOpt')" - v-btn-permission="'J2YEFN9MH4KWW5HMR2QH'" + v-btn-permission="'db44de86c8a30b037335bb35ded9f40e'" >新增 批量删除
@@ -144,11 +144,11 @@ - 查看 + 查看 - 编辑 + 编辑 - 删除 + 删除 diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue index 11be7d7e0..647b63905 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue @@ -42,7 +42,7 @@ class="common-button-primary add-button" size="mini" @click="openModal(null,'addOpt')" - v-btn-permission="'J2YEFN9MH4KWW5HMR2QH'" + v-btn-permission="'ae7419baca1564175bf96d94e827ef8b'" >新增 批量删除
@@ -135,11 +135,11 @@ - 查看 + 查看 - 编辑 + 编辑 - 删除 + 删除 diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue index ef41f7f6d..e6af17365 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue @@ -42,7 +42,7 @@ class="common-button-primary add-button" size="mini" @click="openModal(null,'addOpt')" - v-btn-permission="'J2YEFN9MH4KWW5HMR2QH'" + v-btn-permission="'00139623434e23209d184eb8f753c980'" >新增 批量删除 @@ -135,11 +135,11 @@ - 查看 + 查看 - 编辑 + 编辑 - 删除 + 删除 diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index c2fb62cd7..0439a827d 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -307,11 +307,13 @@ 导出 删除 { - console.log(res.data.list); res.data.list[0].list.map(item => { item.newPutTextTime = null item.prodPutTextTime = null diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index f684c471d..fd8d643cb 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -79,6 +79,7 @@ 导出 删除 diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 2b1f5c2f5..483dbe70e 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -292,9 +292,11 @@ 导出 删除 diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index a46b47eeb..1e14d387e 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -86,36 +86,36 @@ class="common-button-primary add-button" @click="addModal" size="mini" - v-btn-permission="'B6KGCGZWKM'" + v-btn-permission="'57f40856850c95912be0760a082db0e0'" :disabled="addBtnDisabled">新增 导入 + v-btn-permission="'417c6562dd08f1c98c681a40fbf94e31'">导入 导出 批量删除 + v-btn-permission="'c09dc12531085e30e39bbdc6cb6116ba'">批量删除 移除标准 + v-btn-permission="'5aedea192a77b14c364f19bdcee3513a'">移除标准 模板下载 + v-btn-permission="'86a8f92390bb4dcd7f1c2176c183c943'">模板下载 配置标准 + v-btn-permission="'8158aefd62cda676a6baf179532328c6'">配置标准
@@ -199,21 +199,21 @@ - 收藏 - 取消收藏 - 编辑 - 分享 - 删除 + 编辑 + 分享 + 删除
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 1fca1e5d1..52b5d0c9c 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -71,13 +71,15 @@ size="mini" @click="exportStandard()" title="不勾选时默认导出所有筛选项;勾选时仅导出勾选项" + v-btn-permission="'496090d129d51cf2f3730eaf030c2728'" >导出 批量关闭 + v-btn-permission="'740b5b1fb6131517ebc273bfe18b7272'" + >批量关闭 - 查看 + 查看
diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index f9eb6f226..875e7bc49 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -192,7 +192,7 @@ export default { resultLoading: false, total: 0, page: 1, - zqazqazqa:[], + searchData: [], pageAll: 1, totalAll: 0, Allitems: [], // 选中全部返回数据 @@ -242,12 +242,11 @@ export default { ] } ]; - res.data.forEach((info) => { - _this.searchOptions.push(info); - let resdata = JSON.parse(JSON.stringify(_this.searchOptions)); - let data = resdata.slice(0, 6); - _this.searchOptions =data; - }); + _this.searchData = res.data; + for (let i = 0; i < res.data.length; i++) { + if (_this.searchOptions.length >= 6) break; + _this.searchOptions.push(res.data[i]); + } }, e => { }); }, @@ -268,13 +267,17 @@ export default { this.AllCheck = true; //点击全部显示分页 this.AllPage = true; - this.searchOptions = [condition]; + this.searchOptions = [condition] this.searchCondition.selectIndex = ["All"]; this.searchSarByInputKey(); } else { this.AllPage = false; this.Allitems = []; this.AllCheck = false; + for (let i = 0; i < this.searchData.length; i++) { + if (this.searchOptions.length >= 6) break; + this.searchOptions.push(this.searchData[i]); + } } } else { this.AllPage = false; @@ -574,17 +577,10 @@ export default { .search-condition { width: 100%; - /*min-height: 200px;*/ - min-height: 200px; position: relative; - //border: 1px solid @borderColor; border-bottom: 1px solid @borderColor; - margin-top: 15px; - //background-color: hsla(0,0%,100%,.9); - //border-radius: 20px; padding: 10px; - //overflow: auto; max-height: 300px; .condition-btn { diff --git a/src/router/index.js b/src/router/index.js index 71676e073..95bc69384 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -240,6 +240,24 @@ const routes = [ title: '标准发放申请流程' } }, + { + path: '/bzqdfbStep1', + name: 'bzqdfbStep1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue'), + meta: { + requireAuth: true, + title: '标准清单发布/更新流程' + } + }, + { + path: '/bzqdfbStep2', + name: 'bzqdfbStep2', + component: () => import('@/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue'), + meta: { + requireAuth: true, + title: '标准清单发布/更新流程' + } + }, { path: '/bzrkStep1', name: 'bzrkStep1', diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 0e6b7fc85..167e13033 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -6,7 +6,7 @@ // 服务器地址 // const devIp = '39.98.140.126' // const devInterfacePORT = '10005' -const devIp = '192.168.10.29' +const devIp = '192.168.10.53' const devInterfacePORT = '9999' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'