FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
11528
2022-03-21 17:02:17 +08:00
parent a5e70d3305 899bd30fae
commit d889ef6b12
9 changed files with 48 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/navMenu/index.vue
+2 -1
View File
@@ -124,7 +124,7 @@
{ {
title: '企标计划', title: '企标计划',
path: '/enterpriseStandardPlan', path: '/enterpriseStandardPlan',
// menuId: '8a9c87fe06244fb9d55e78fb281f625b' menuId: 'b07296765085f06eb3c158147f3a7312'
}, },
{ {
title: '法规清单', title: '法规清单',
@@ -139,6 +139,7 @@
{ {
title: '工作组', title: '工作组',
path: '/workingGroup', path: '/workingGroup',
menuId: 'b64240325f0e01ec4a318ee0cfedd82e'
}, },
{ {
title: '征求意见', title: '征求意见',
src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue
+1 -1
View File
@@ -125,7 +125,7 @@
</el-card> </el-card>
</div> </div>
<div class="process-name"> <div class="process-name">
<el-card shadow="hover" v-btn-permission="'a5694521151720f41a8b22d550bf435a'"> <el-card shadow="hover" v-btn-permission="'f01a55435ba41dfe0a4bf99428b9e5c2'">
<div class="card-box" @click="handleCreateProcess('13')"> <div class="card-box" @click="handleCreateProcess('13')">
<div class="card-top"> <div class="card-top">
<div class="card-top-left"> <div class="card-top-left">
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+2 -2
View File
@@ -163,12 +163,12 @@
v-btn-permission="'5aedea192a77b14c364f19bdcee3513a'"><i class="iconfont">&#xe611;</i>移除标准 v-btn-permission="'5aedea192a77b14c364f19bdcee3513a'"><i class="iconfont">&#xe611;</i>移除标准
</el-button> </el-button>
<el-button class="common-button-default" <el-button class="common-button-default"
v-btn-permission="''" v-btn-permission="'e7727b0018f886127174227cdbc58f28'"
size="mini" size="mini"
@click="OCRAdd('0')"><i class="iconfont">&#xe611;</i>OCR @click="OCRAdd('0')"><i class="iconfont">&#xe611;</i>OCR
</el-button> </el-button>
<el-button class="common-button-default" <el-button class="common-button-default"
v-btn-permission="''" v-btn-permission="'9b718444ea1f163e8ccd492396cc9234'"
size="mini" size="mini"
@click="OCRAdd('1')"><i class="iconfont">&#xe611;</i>拆分 @click="OCRAdd('1')"><i class="iconfont">&#xe611;</i>拆分
</el-button> </el-button>
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+22 -24
View File
@@ -275,7 +275,7 @@
</el-button> </el-button>
<el-button class="common-button-default" <el-button class="common-button-default"
size="mini" @click="OCRAdd('2')" size="mini" @click="OCRAdd('2')"
v-btn-permission="'247cebaefa7cf1683092af160af11502'"><i class="iconfont">&#xe611;</i>编辑 v-btn-permission="'dd4ea796dab7a01b105ba657b1968a84'"><i class="iconfont">&#xe611;</i>编辑
</el-button> </el-button>
<el-button class="common-button-default" <el-button class="common-button-default"
size="mini" @click="selectBuss()" style="float: right;margin-top: 11px;" size="mini" @click="selectBuss()" style="float: right;margin-top: 11px;"
@@ -416,27 +416,27 @@
<el-table-column fixed="right" <el-table-column fixed="right"
v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf')>0" label="收藏" align="center" width="50"> v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf')>0" label="收藏" align="center" width="50">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf') == 1" <!-- <div v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf') == 1"-->
@command="handleCommand" <!-- @command="handleCommand"-->
> <!-- >-->
<el-button type="text" v-btn-permission="'d9730d984627af948053df56a2db7997'" <!-- <el-button type="text" v-btn-permission="'d9730d984627af948053df56a2db7997'"-->
v-if="scope.row.collectBtn" <!-- v-if="scope.row.collectBtn"-->
@click="handleCommand([scope.row, '收藏'])" <!-- @click="handleCommand([scope.row, '收藏'])"-->
>收藏 <!-- >收藏-->
</el-button> <!-- </el-button>-->
<el-button type="text" v-btn-permission="'d9730d984627af948053df56a2db7997'" <!-- <el-button type="text" v-btn-permission="'d9730d984627af948053df56a2db7997'"-->
v-else <!-- v-else-->
@click="handleCommand([scope.row, '取消收藏'])" <!-- @click="handleCommand([scope.row, '取消收藏'])"-->
>取消收藏 <!-- >取消收藏-->
</el-button> <!-- </el-button>-->
<el-button type="text" @click="handleCommand([scope.row, '编辑'])" <!-- <el-button type="text" @click="handleCommand([scope.row, '编辑'])"-->
v-btn-permission="'dd4ea796dab7a01b105ba657b1968a84'">编辑 <!-- v-btn-permission="'dd4ea796dab7a01b105ba657b1968a84'">编辑-->
</el-button> <!-- </el-button>-->
<el-button type="text" @click="handleCommand([scope.row, '删除']) " <!-- <el-button type="text" @click="handleCommand([scope.row, '删除']) "-->
v-btn-permission="'a7a38a95ea374695fc3128037f6feccf'">删除 <!-- v-btn-permission="'a7a38a95ea374695fc3128037f6feccf'">删除-->
</el-button> <!-- </el-button>-->
</div> <!-- </div>-->
<div v-else> <div>
<div @click.stop style="display: inline-block"> <div @click.stop style="display: inline-block">
<el-button title="收藏" class="collection-btn" icon="el-icon-star-off" v-btn-permission="'d9730d984627af948053df56a2db7997'" <el-button title="收藏" class="collection-btn" icon="el-icon-star-off" v-btn-permission="'d9730d984627af948053df56a2db7997'"
v-if="scope.row.collectBtn" v-if="scope.row.collectBtn"
@@ -449,9 +449,7 @@
> >
</el-button> </el-button>
</div> </div>
</div> </div>
</template> </template>
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+7 -3
View File
@@ -34,6 +34,7 @@
</el-form-item> </el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
v-btn-permission="'1595c63ae9b14631ff3adefe51a92bdb'"
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
@@ -43,6 +44,7 @@
</el-form-item> </el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
v-btn-permission="'5c8347d102094d48139b30723e187113'"
class="common-button-default" class="common-button-default"
size="mini" size="mini"
@click="clearData"> @click="clearData">
@@ -56,6 +58,7 @@
<el-button type="primary" <el-button type="primary"
class="common-button-primary add-button" class="common-button-primary add-button"
size="mini" size="mini"
v-btn-permission="'66ae947771821e3bd064c5594a14d145'"
@click="addData"><i class="el-icon-plus"></i>新增 @click="addData"><i class="el-icon-plus"></i>新增
</el-button> </el-button>
<!-- <el-button class="common-button-default in-button"--> <!-- <el-button class="common-button-default in-button"-->
@@ -71,6 +74,7 @@
<!-- </el-button>--> <!-- </el-button>-->
<el-button class="common-button-default" <el-button class="common-button-default"
size="mini" size="mini"
v-btn-permission="'74c437f9bfce7198144aa08e9a52950e'"
@click="deleteList"><i class="iconfont">&#xe611;</i>删除 @click="deleteList"><i class="iconfont">&#xe611;</i>删除
</el-button> </el-button>
</div> </div>
@@ -171,13 +175,13 @@
<el-dropdown trigger="click" @command="handleCommand"> <el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i> <i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '查看']"> <el-dropdown-item v-btn-permission="'68bc53399a9e0daf1cc2f1bb2aa1d566'" :command="[scope.row, '查看']">
查看 查看
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item :command="[scope.row, '编辑']"> <el-dropdown-item v-btn-permission="'cc5d8f1a15726c62c5016e595246ec8b'" :command="[scope.row, '编辑']">
编辑 编辑
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item :command="[scope.row, '删除']"> <el-dropdown-item v-btn-permission="'74c437f9bfce7198144aa08e9a52950e'" :command="[scope.row, '删除']">
删除 删除
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+1 -1
View File
@@ -160,7 +160,7 @@
</el-button> </el-button>
<el-button class="common-button-default" <el-button class="common-button-default"
size="mini" @click="OCRAdd('2')" size="mini" @click="OCRAdd('2')"
v-btn-permission="'247cebaefa7cf1683092af160af11502'"><i class="iconfont">&#xe611;</i>编辑 v-btn-permission="'e8d690904ee1895dd0d17d9c794fbcd7'"><i class="iconfont">&#xe611;</i>编辑
</el-button> </el-button>
<!--&lt;!&ndash; <el-button class="common-button-default" <!--&lt;!&ndash; <el-button class="common-button-default"
size="mini" :loading="searching" size="mini" :loading="searching"
src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue
+6
View File
@@ -7,6 +7,7 @@
<div class="header-right"> <div class="header-right">
<el-button <el-button
type="primary" type="primary"
v-btn-permission="'141c18729a988fe5d9c52296f35ba9f4'"
size="mini" size="mini"
class="common-button-primary" class="common-button-primary"
v-if="addButton" v-if="addButton"
@@ -16,6 +17,7 @@
<el-button <el-button
type="primary" type="primary"
size="mini" size="mini"
v-btn-permission="'42a77131e13b8cc67886025b44d9948d'"
class="common-button-primary" class="common-button-primary"
v-if="addItemButton" v-if="addItemButton"
@click="addItem2"> @click="addItem2">
@@ -26,6 +28,7 @@
size="mini" size="mini"
class="common-button-primary" class="common-button-primary"
v-if="editButton" v-if="editButton"
v-btn-permission="'a3803aae3f65134dee97c6b03680d4f9'"
@click="editItem"> @click="editItem">
编辑 编辑
</el-button> </el-button>
@@ -33,6 +36,7 @@
type="primary" type="primary"
size="mini" size="mini"
class="common-button-primary" class="common-button-primary"
v-btn-permission="'db4ab168afb99c61d4f986c9746a7c65'"
v-if="seeButton" v-if="seeButton"
@click="seeItem"> @click="seeItem">
查看 查看
@@ -42,6 +46,7 @@
size="mini" size="mini"
class="common-button-primary" class="common-button-primary"
v-if="seeItemButton" v-if="seeItemButton"
v-btn-permission="'e99a7847d5d9d04d4423e8f69e77f080'"
@click="handlePreview(standId)"> @click="handlePreview(standId)">
查看标准 查看标准
</el-button> </el-button>
@@ -50,6 +55,7 @@
size="mini" size="mini"
class="common-button-default" class="common-button-default"
v-if="delectButton" v-if="delectButton"
v-btn-permission="'b1391e768988c363b177419e2ae16633'"
@click="delItem"> @click="delItem">
删除 删除
</el-button> </el-button>
src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue
+6
View File
@@ -10,6 +10,7 @@
size="mini" size="mini"
class="common-button-primary" class="common-button-primary"
v-if="addButton" v-if="addButton"
v-btn-permission="'9b99ffc92c0100dab08b9fd0037e2b06'"
@click="addItem"> @click="addItem">
新增 新增
</el-button> </el-button>
@@ -18,6 +19,7 @@
size="mini" size="mini"
class="common-button-primary" class="common-button-primary"
v-if="addItemButton" v-if="addItemButton"
v-btn-permission="'fc429d36f2d117f13f079aab59c28338'"
@click="addItem2"> @click="addItem2">
新增政策 新增政策
</el-button> </el-button>
@@ -26,6 +28,7 @@
size="mini" size="mini"
class="common-button-primary" class="common-button-primary"
v-if="editButton" v-if="editButton"
v-btn-permission="'8088f3612c206cb5ca5040091a08ac86'"
@click="editItem"> @click="editItem">
编辑 编辑
</el-button> </el-button>
@@ -34,6 +37,7 @@
size="mini" size="mini"
class="common-button-primary" class="common-button-primary"
v-if="seeButton" v-if="seeButton"
v-btn-permission="'4abd63ca838a6845bdf6a9e8cbc8ad5b'"
@click="seeItem"> @click="seeItem">
查看 查看
</el-button> </el-button>
@@ -42,6 +46,7 @@
size="mini" size="mini"
class="common-button-primary" class="common-button-primary"
v-if="seeItemButton" v-if="seeItemButton"
v-btn-permission="'acc9bf3585de7dbf7282cc3cf4fb6337'"
@click="handlePreview(standId)"> @click="handlePreview(standId)">
查看政策 查看政策
</el-button> </el-button>
@@ -50,6 +55,7 @@
size="mini" size="mini"
class="common-button-default" class="common-button-default"
v-if="delectButton" v-if="delectButton"
v-btn-permission="'19e9ff56a1d5dcde2710036d5cc53ebb'"
@click="delItem"> @click="delItem">
删除 删除
</el-button> </el-button>
src/pages/regulatoryRepository/workingGroup/index.vue
+1 -1
View File
@@ -14,7 +14,7 @@
<workingGroup2 v-if="activeName === 'workingGroup2'"></workingGroup2> <workingGroup2 v-if="activeName === 'workingGroup2'"></workingGroup2>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<el-button size="mini" type="primary" @click="statisticsBtn" class="statistics">工作组统计</el-button> <el-button size="mini" type="primary" @click="statisticsBtn" v-btn-permission="'2331baafd7d298b87ab3c0b5430d608d'" class="statistics">工作组统计</el-button>
</div> </div>
</template> </template>
<script> <script>