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:
super_liu
2022-03-22 11:00:32 +08:00
parent fc658fb3bf dd730500bb
commit 674812e8cd
51 changed files with 4713 additions and 4648 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+7 -7
View File
@@ -163,12 +163,12 @@
v-btn-permission="'5aedea192a77b14c364f19bdcee3513a'"><i class="iconfont">&#xe611;</i>移除标准
</el-button>
<el-button class="common-button-default"
v-btn-permission="''"
v-btn-permission="'e7727b0018f886127174227cdbc58f28'"
size="mini"
@click="OCRAdd('0')"><i class="iconfont">&#xe611;</i>OCR
</el-button>
<el-button class="common-button-default"
v-btn-permission="''"
v-btn-permission="'9b718444ea1f163e8ccd492396cc9234'"
size="mini"
@click="OCRAdd('1')"><i class="iconfont">&#xe611;</i>拆分
</el-button>
@@ -2747,11 +2747,11 @@ export default {
synopsis: [
{type: 'string', max: 500, message: '文本说明不能超过500个字符', trigger: 'change'}
],
standYear: [
{required: true, message: '标准年份不能为空', trigger: 'change'},
// {validator: this.verify.testNumberCode, trigger: 'change'},
{type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'}
],
// standYear: [
// {required: true, message: '标准年份不能为空', trigger: 'change'},
// // {validator: this.verify.testNumberCode, trigger: 'change'},
// {type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'}
// ],
standName: [
{required: true, message: '中文名称不能为空', trigger: 'change'},
{type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+23 -25
View File
@@ -275,11 +275,11 @@
</el-button>
<el-button class="common-button-default"
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 class="common-button-default"
size="mini" @click="selectBuss()" style="float: right;margin-top: 11px;"
v-btn-permission="''"><i class="iconfont">&#xe606;</i>企标复审计划
v-btn-permission="'76742566e1cf930f384ef78cecb86f61'"><i class="iconfont">&#xe606;</i>企标复审计划
</el-button>
</div>
<!--表格-->
@@ -416,27 +416,27 @@
<el-table-column fixed="right"
v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf')>0" label="收藏" align="center" width="50">
<template slot-scope="scope">
<div v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf') == 1"
@command="handleCommand"
>
<el-button type="text" v-btn-permission="'d9730d984627af948053df56a2db7997'"
v-if="scope.row.collectBtn"
@click="handleCommand([scope.row, '收藏'])"
>收藏
</el-button>
<el-button type="text" v-btn-permission="'d9730d984627af948053df56a2db7997'"
v-else
@click="handleCommand([scope.row, '取消收藏'])"
>取消收藏
</el-button>
<el-button type="text" @click="handleCommand([scope.row, '编辑'])"
v-btn-permission="'dd4ea796dab7a01b105ba657b1968a84'">编辑
</el-button>
<el-button type="text" @click="handleCommand([scope.row, '删除']) "
v-btn-permission="'a7a38a95ea374695fc3128037f6feccf'">删除
</el-button>
</div>
<div v-else>
<!-- <div v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf') == 1"-->
<!-- @command="handleCommand"-->
<!-- >-->
<!-- <el-button type="text" v-btn-permission="'d9730d984627af948053df56a2db7997'"-->
<!-- v-if="scope.row.collectBtn"-->
<!-- @click="handleCommand([scope.row, '收藏'])"-->
<!-- >收藏-->
<!-- </el-button>-->
<!-- <el-button type="text" v-btn-permission="'d9730d984627af948053df56a2db7997'"-->
<!-- v-else-->
<!-- @click="handleCommand([scope.row, '取消收藏'])"-->
<!-- >取消收藏-->
<!-- </el-button>-->
<!-- <el-button type="text" @click="handleCommand([scope.row, '编辑'])"-->
<!-- v-btn-permission="'dd4ea796dab7a01b105ba657b1968a84'">编辑-->
<!-- </el-button>-->
<!-- <el-button type="text" @click="handleCommand([scope.row, '删除']) "-->
<!-- v-btn-permission="'a7a38a95ea374695fc3128037f6feccf'">删除-->
<!-- </el-button>-->
<!-- </div>-->
<div>
<div @click.stop style="display: inline-block">
<el-button title="收藏" class="collection-btn" icon="el-icon-star-off" v-btn-permission="'d9730d984627af948053df56a2db7997'"
v-if="scope.row.collectBtn"
@@ -449,9 +449,7 @@
>
</el-button>
</div>
</div>
</template>
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+7 -3
View File
@@ -34,6 +34,7 @@
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
v-btn-permission="'1595c63ae9b14631ff3adefe51a92bdb'"
type="primary"
class="common-button-primary"
size="mini"
@@ -43,6 +44,7 @@
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
v-btn-permission="'5c8347d102094d48139b30723e187113'"
class="common-button-default"
size="mini"
@click="clearData">
@@ -56,6 +58,7 @@
<el-button type="primary"
class="common-button-primary add-button"
size="mini"
v-btn-permission="'66ae947771821e3bd064c5594a14d145'"
@click="addData"><i class="el-icon-plus"></i>新增
</el-button>
<!-- <el-button class="common-button-default in-button"-->
@@ -71,6 +74,7 @@
<!-- </el-button>-->
<el-button class="common-button-default"
size="mini"
v-btn-permission="'74c437f9bfce7198144aa08e9a52950e'"
@click="deleteList"><i class="iconfont">&#xe611;</i>删除
</el-button>
</div>
@@ -171,13 +175,13 @@
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<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 :command="[scope.row, '编辑']">
<el-dropdown-item v-btn-permission="'cc5d8f1a15726c62c5016e595246ec8b'" :command="[scope.row, '编辑']">
编辑
</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '删除']">
<el-dropdown-item v-btn-permission="'74c437f9bfce7198144aa08e9a52950e'" :command="[scope.row, '删除']">
删除
</el-dropdown-item>
</el-dropdown-menu>
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+1 -1
View File
@@ -160,7 +160,7 @@
</el-button>
<el-button class="common-button-default"
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>
<!--&lt;!&ndash; <el-button class="common-button-default"
size="mini" :loading="searching"
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+1 -1
View File
@@ -83,7 +83,7 @@
width="80"
align="center">
<template slot-scope="scope">
<el-button size="mini" type="primary" class="common-button-primary" @click="handleProjectCompliance(scope.row)">查看</el-button>
<el-button size="mini" type="primary" class="common-button-primary" @click="handleProjectCompliance(scope.row)" v-btn-permission="'08e9f28f1afb80b706217bdd9c6323bd'">查看</el-button>
</template>
</el-table-column>
</el-table>
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
+1 -1
View File
@@ -104,7 +104,7 @@
width="100"
align="center">
<template slot-scope="scope">
<el-button class="common-button-primary" type="primary" size="mini" @click="handleProjectCompliance(scope.row)">查看</el-button>
<el-button class="common-button-primary" type="primary" size="mini" @click="handleProjectCompliance(scope.row)" v-btn-permission="'7d79b9521e77c73857ee788e30670e8d'">查看</el-button>
<!-- <i class="el-icon-view btn-i" @click="handleProjectCompliance(scope.row)"></i>-->
</template>
</el-table-column>
src/pages/regulatoryRepository/nonConfomity/index.vue
+39 -16
View File
@@ -2,11 +2,11 @@
<template>
<div id="non-cnfomity" >
<div class="non-content">
<el-tabs v-model="activeName" @tab-click="handleClick" style="height: 100%">
<el-tab-pane label="未符合项整改数据库" name="database">
<el-tabs v-model="tabValue" @tab-click="handleClick" style="height: 100%">
<el-tab-pane label="未符合项整改数据库" name="database" v-if="database">
<rectification-database></rectification-database>
</el-tab-pane>
<el-tab-pane label="重点问题项管控" name="keynote">
<el-tab-pane label="重点问题项管控" name="keynote" v-if="keynote">
<key-issues :keynoteActiveName="keynoteActiveName"></key-issues>
</el-tab-pane>
</el-tabs>
@@ -22,30 +22,53 @@
keyIssues,
rectificationDatabase,
},
data () {
data() {
return {
activeName: 'database',
keynote: false,
database: false,
menuName: ["未符合项整改数据库", "重点问题项管控"],
tabValue: '',
keynoteActiveName: 'cause'
}
},
methods: {
handleClick(tab, event) {
},
getActiveName(){
if (this.$route.query.activeName){
this.activeName = this.$route.query.activeName
}
if (this.$route.query.keynoteActiveName){
this.keynoteActiveName = this.$route.query.keynoteActiveName
}
console.log('35',this.keynoteActiveName)
}
// getActiveName() {
// if (this.$route.query.activeName) {
// this.activeName = this.$route.query.activeName
// }
// if (this.$route.query.keynoteActiveName) {
// this.keynoteActiveName = this.$route.query.keynoteActiveName
// }
// console.log('35', this.keynoteActiveName)
// }
},
created() {
this.getActiveName()
// this.getActiveName()
},
mounted () {
var list = [];
const menuList = this.$store.getters.getMenuList;
let menuData = [];
let menuID = ["ff7bc984c8115204bba04090f350b19c", "e02897e9ab6b1a72f49c47c07b5be9a5"];
this.menuName.forEach(item => {
for (let i = 0; i < menuList.length; i++) {
let entity = menuList[i];
if (item !== entity.menuName) continue;
if (menuID.indexOf(entity.id) >= 0 && menuData.indexOf(entity.id) === -1) {
menuData.push(entity.id);
if (entity.id === "ff7bc984c8115204bba04090f350b19c") {
this.database = true
} else if (entity.id === "e02897e9ab6b1a72f49c47c07b5be9a5") {
this.keynote = true
}
}
}
});
this.tabValue = this.database ? 'database' : (this.keynote ? 'keynote' : (this.tracking ? 'listTracking' : (this.other ? 'listOther' : (this.library ? 'localProductsOrProjectLibrary' : ''))))
},
watch: {},
mounted () {}
}
</script>
<style lang="less" scoped>
src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue
+2 -2
View File
@@ -75,7 +75,7 @@
type="primary"
class="common-button-primary"
size="mini"
v-btn-permission="'aff4a409c3c3856986c535a5f4782b13'"
v-btn-permission="'dd74d2cb03c9f31074c5ea06c57c89cb'"
@click="searchSarAccessBtn('')">
查询
</el-button>
@@ -84,7 +84,7 @@
<el-button
class="common-button-default"
size="mini"
v-btn-permission="'66fa37fc93e298b03d272fe17aeca6de'"
v-btn-permission="'3f5fe30d457f714c9cf68ec48b2887ec'"
@click="clearAllSearch">清空
</el-button>
</el-form-item>
src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue
+1 -1
View File
@@ -90,7 +90,7 @@
class="common-button-primary"
type="primary"
size="mini"
v-btn-permission="''"
v-btn-permission="'013dc790d5438d2fa93a03eabf641318'"
title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
><i class="iconfont">&#xe6e9;</i>导出
</el-button>
src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
+5 -5
View File
@@ -33,6 +33,7 @@
type="primary"
size="mini"
class="common-button-primary"
v-btn-permission="'904b8b52d0c9d76e3622531d9d5a9f0e'"
@click="getTableBtn">
查询
</el-button>
@@ -41,6 +42,7 @@
<el-button
size="mini"
class="common-button-default"
v-btn-permission="'af79900eebf9360eea4ed45f257dae0c'"
@click="clearAllSearch">清空</el-button>
</el-form-item>
</el-form>
@@ -76,7 +78,7 @@
</el-table-column>
<el-table-column
prop="standName"
width="180px"
min-width="300px"
align="center"
label="标准名称">
<template slot-scope="scope">
@@ -103,19 +105,17 @@
</el-table-column>
<el-table-column
prop="productName"
width="150"
min-width="200"
align="center"
label="项目名称">
</el-table-column>
<el-table-column
prop="responsibleUnit"
width="150"
align="center"
label="责任部门">
</el-table-column>
<el-table-column
prop="dutyEngineerName"
width="150"
align="center"
label="责任工程师">
</el-table-column>
@@ -132,7 +132,7 @@
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '查看']">查看</el-dropdown-item>
<el-dropdown-item v-btn-permission="'24e7400242307a236cc50bbec1796d26'" :command="[scope.row, '查看']">查看</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
src/pages/regulatoryRepository/nonConfomity/pages/productDetails.vue
+3 -1
View File
@@ -58,6 +58,7 @@
type="primary"
size="mini"
class="common-button-primary"
v-btn-permission="'e1be15b50bc9493f20c38ad678699422'"
@click="getTableBtn">
查询
</el-button>
@@ -66,6 +67,7 @@
<el-button
size="mini"
class="common-button-default"
v-btn-permission="'8dbef1803c841b8dadbed619d3cbf249'"
@click="clearAllSearch">清空</el-button>
</el-form-item>
</el-form>
@@ -154,7 +156,7 @@
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '查看']">查看</el-dropdown-item>
<el-dropdown-item v-btn-permission="'41f76602450a4f4fa4516b6c35eb3b75'" :command="[scope.row, '查看']">查看</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+2 -2
View File
@@ -55,7 +55,7 @@
class="common-button-primary"
size="small"
type="primary"
v-btn-permission="''"
v-btn-permission="'0021d017199b2b57c953671fa09e1677'"
@click="addModel"
><i class="el-icon-plus"></i>新增
</el-button>
@@ -188,7 +188,7 @@
<el-dropdown-item :command="[scope.row, '查看']"
v-btn-permission="'374cb5206597fa201e57f561ff2f8ed7'">查看
</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="''">编辑</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'bcd9e2881cc174e5aef98bf0e54694e9'">编辑</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+747 -747
View File
File diff suppressed because it is too large Load Diff
src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue
+6
View File
@@ -7,6 +7,7 @@
<div class="header-right">
<el-button
type="primary"
v-btn-permission="'141c18729a988fe5d9c52296f35ba9f4'"
size="mini"
class="common-button-primary"
v-if="addButton"
@@ -16,6 +17,7 @@
<el-button
type="primary"
size="mini"
v-btn-permission="'42a77131e13b8cc67886025b44d9948d'"
class="common-button-primary"
v-if="addItemButton"
@click="addItem2">
@@ -26,6 +28,7 @@
size="mini"
class="common-button-primary"
v-if="editButton"
v-btn-permission="'a3803aae3f65134dee97c6b03680d4f9'"
@click="editItem">
编辑
</el-button>
@@ -33,6 +36,7 @@
type="primary"
size="mini"
class="common-button-primary"
v-btn-permission="'db4ab168afb99c61d4f986c9746a7c65'"
v-if="seeButton"
@click="seeItem">
查看
@@ -42,6 +46,7 @@
size="mini"
class="common-button-primary"
v-if="seeItemButton"
v-btn-permission="'e99a7847d5d9d04d4423e8f69e77f080'"
@click="handlePreview(standId)">
查看标准
</el-button>
@@ -50,6 +55,7 @@
size="mini"
class="common-button-default"
v-if="delectButton"
v-btn-permission="'b1391e768988c363b177419e2ae16633'"
@click="delItem">
删除
</el-button>
src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue
+6
View File
@@ -10,6 +10,7 @@
size="mini"
class="common-button-primary"
v-if="addButton"
v-btn-permission="'9b99ffc92c0100dab08b9fd0037e2b06'"
@click="addItem">
新增
</el-button>
@@ -18,6 +19,7 @@
size="mini"
class="common-button-primary"
v-if="addItemButton"
v-btn-permission="'fc429d36f2d117f13f079aab59c28338'"
@click="addItem2">
新增政策
</el-button>
@@ -26,6 +28,7 @@
size="mini"
class="common-button-primary"
v-if="editButton"
v-btn-permission="'8088f3612c206cb5ca5040091a08ac86'"
@click="editItem">
编辑
</el-button>
@@ -34,6 +37,7 @@
size="mini"
class="common-button-primary"
v-if="seeButton"
v-btn-permission="'4abd63ca838a6845bdf6a9e8cbc8ad5b'"
@click="seeItem">
查看
</el-button>
@@ -42,6 +46,7 @@
size="mini"
class="common-button-primary"
v-if="seeItemButton"
v-btn-permission="'acc9bf3585de7dbf7282cc3cf4fb6337'"
@click="handlePreview(standId)">
查看政策
</el-button>
@@ -50,6 +55,7 @@
size="mini"
class="common-button-default"
v-if="delectButton"
v-btn-permission="'19e9ff56a1d5dcde2710036d5cc53ebb'"
@click="delItem">
删除
</el-button>
src/pages/regulatoryRepository/workingGroup/index.vue
+1 -1
View File
@@ -14,7 +14,7 @@
<workingGroup2 v-if="activeName === 'workingGroup2'"></workingGroup2>
</el-tab-pane>
</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>
</template>
<script>