@@ -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/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index c2fb62cd7..5d1c33c45 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -1512,7 +1512,6 @@ export default {
_this: this,
loading: 'dataLoading'
}, res => {
- console.log(res.data.list);
res.data.list[0].list.map(item => {
item.newPutTextTime = null
item.prodPutTextTime = null
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',
From ff89154ad9e732ce850d592ee0fee5fb50ca84f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 30 Jun 2021 18:54:09 +0800
Subject: [PATCH 2/2] commit
---
src/pages/localTool/standAutoSplit/index.vue | 23 +++++++++---------
.../page/listOfCountries.vue | 10 ++++----
.../page/listOther.vue | 10 ++++----
.../page/listProject.vue | 10 ++++----
.../pages/addEdit.vue | 2 ++
.../pages/details.vue | 1 +
.../pages/otherAddEit.vue | 2 ++
.../pages/projectAddEit.vue | 2 ++
.../domesticStandardsAndRegulations/index.vue | 24 +++++++++----------
.../pages/rectificationDatabase.vue | 6 +++--
src/sysConfig/index.js | 2 +-
11 files changed, 51 insertions(+), 41 deletions(-)
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/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 5d1c33c45..0439a827d 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -307,11 +307,13 @@
导出
删除