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:
zhutianqi
2021-07-28 17:25:46 +08:00
parent 9e20156e5b c532794d64
commit 4a9814337b
9 changed files with 43 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+6 -3
View File
@@ -995,7 +995,8 @@
<tree-select-new
width = "500"
:lazy=true
:multiple=false
:multiple=true
:check-strictly=true
:modalShowFlag="modalShowFlag2"
:drawerTitle="drawerTitle"
:url="url"
@@ -1005,7 +1006,8 @@
<tree-select-new
width = "500"
:lazy=true
:multiple=false
:multiple=true
:check-strictly=true
:modalShowFlag="modalShowFlag3"
:drawerTitle="drawerTitle"
:url="url"
@@ -1015,7 +1017,8 @@
<tree-select-new
width = "500"
:lazy=true
:multiple=false
:multiple=true
:check-strictly=true
:modalShowFlag="modalShowFlag4"
:drawerTitle="drawerTitle"
:url="url"
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+8 -5
View File
@@ -1254,7 +1254,8 @@
<tree-select-new
width = "500"
:lazy=true
:multiple=false
:multiple=true
:check-strictly=true
:modalShowFlag="modalShowFlag2"
:drawerTitle="drawerTitle"
:url="url"
@@ -1264,7 +1265,8 @@
<tree-select-new
width = "500"
:lazy=true
:multiple=false
:multiple=true
:check-strictly=true
:modalShowFlag="modalShowFlag3"
:drawerTitle="drawerTitle"
:url="url"
@@ -1274,7 +1276,8 @@
<tree-select-new
width = "500"
:lazy=true
:multiple=false
:multiple=true
:check-strictly=true
:modalShowFlag="modalShowFlag4"
:drawerTitle="drawerTitle"
:url="url"
@@ -4316,13 +4319,13 @@ export default {
</script>
<style lang="less" scoped>
/deep/ .icon-tree {
/deep/.icon-tree {
margin:0 5px 0 10px;
position:relative;
background:url('~@/assets/images/shangqi/img/tree-add.png');
background-size:100% 100%;
}
/deep/ .expanded{
/deep/.expanded{
background:url('~@/assets/images/shangqi/img/tree-sub.png');
background-size:100% 100%;
}
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+3
View File
@@ -64,6 +64,9 @@
fixed="left"
width="260px"
>
<template slot-scope="scope">
<span style="margin-left: 10px">{{ scope.row.standSort+ ' ' + scope.row.standNumber + '-' + scope.row.standYear}}</span>
</template>
</el-table-column>
<el-table-column
prop="standName"