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

Merge branch 'develop' into 'test'

Browse Source 
Develop

See merge request LAWS/laws-system-front-FOTON!172
This commit is contained in:
王夏晖
2021-10-11 09:02:24 +08:00
parent a76781acb5 637b3e1bb4
commit 67d17df055
22 changed files with 163 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/styles/newStyle.less
-1
View File
@@ -793,7 +793,6 @@ tr.el-table__row{
}
.iconfont {
font-size: 12px;
margin-right: 5px;
}
.dept-popover {
padding: 0;
src/components/comHeader/index.vue
-1
View File
@@ -129,7 +129,6 @@
align-items: center;
.iconfont {
font-size: 22px;
margin-right: 5px;
}
& > img{
width: 25px;
src/components/navMenu/index.vue
+6
View File
@@ -489,6 +489,9 @@
box-sizing: border-box;
background: rgb(255, 255, 255);
background-size: 100% 100%;
/deep/.el-tooltip {
padding: 0px 16px !important;
}
.left-tree {
height: calc(~'100% - 95px');
overflow-y: auto;
@@ -541,6 +544,7 @@
display: none; /* Chrome Safari */
}
.el-menu-item {
padding: 0 16px !important;
span {
font-weight: normal;
margin-left: 5px;
@@ -574,6 +578,7 @@
}
.el-submenu {
/deep/.el-submenu__title {
padding: 0 16px !important;
span {
font-weight: normal;
margin-left: 5px;
@@ -616,6 +621,7 @@
}
}
.el-menu--collapse{
width: 100%;
.shangqi-icon{
width: 24px;
height: 24px;
src/components/treeSelect/treeSelectNew.vue
+1 -1
View File
@@ -264,7 +264,7 @@
this.$emit('popoverHide', this.checkedIds, this.checkedData,false);
},
cancelUserInfo () {
this.$emit('popoverHide', this.checkedIds, this.checkedData,false);
this.$emit('popoverHideCancel', this.checkedIds, this.checkedData,false);
},
},
watch: {
src/pages/home/components/EnterCard.vue
+24 -10
View File
@@ -1,32 +1,37 @@
<template>
<div class="wx-card" @click="toPage">
<div style="">
<div>
<div>
<i class="icon" :class="icon" />
</div>
<div style="margin-top: 10px;">
<div v-if="label">
<span class="card-font">{{ label }}</span>
</div>
<div v-else>
<div class="labelNull">
<i class="el-icon-circle-plus-outline"></i>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
name: 'EnterCard',
props: ['icon', 'label', 'path'],
methods: {
toPage() {
this.$router.push(this.path)
export default {
name: 'EnterCard',
props: ['icon', 'label', 'path'],
methods: {
toPage() {
this.$router.push(this.path)
}
}
}
}
</script>
<style lang="less" scoped>
.wx-card {
width: 214px;
line-height: 88px;
line-height: 70px;
text-align: center;
background: rgba(182, 213, 255, 0.22);
margin-left: 10px;
@@ -36,4 +41,13 @@ export default {
align-items: center;
cursor: pointer;
}
.labelNull {
height: 100%;
display: flex;
align-items: center;
.el-icon-circle-plus-outline {
font-size: 50px;
color: #F4F4F4;
}
}
</style>
src/pages/home2/components/empennage/index.vue
+1 -1
View File
@@ -4,7 +4,7 @@
<div class="title">友情链接</div>
<ul>
<li v-for="(link, index) in linkList" v-if="index<5" :key="index" @click="openLinkUrl(link.url)">
<a v-if="link.name.length>13" v-html="link.name.substring(0,13)+'...'" :title="link.name"></a>
<a v-if="link.name.length>10" v-html="link.name.substring(0,10)+'...'" :title="link.name"></a>
<a v-else v-html="link.name" :title="link.name"></a>
</li>
<li>
src/pages/home2/components/release/index.vue
+2 -1
View File
@@ -13,7 +13,7 @@
ref="selection"
:data="standardReleaseList"
tooltip-effect="dark"
style="width: 100%;padding:0 0 20px 0;"
style="padding:0 0 20px 0;"
border
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
style="width: 100%">
@@ -96,6 +96,7 @@ export default {
<style lang="less" scoped>
.release {
width: 100%;
.time-title {
margin: 15px;
.time {
src/pages/home2/components/solicitopinions/index.vue
+2 -2
View File
@@ -13,7 +13,7 @@
ref="selection"
:data="domesticDynamics"
tooltip-effect="dark"
style="width: 100%;padding:0 0 20px 0;"
style="padding:0 0 20px 0;"
border
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
style="width: 100%">
@@ -90,7 +90,7 @@ export default {
<style lang="less" scoped>
.solicitopinions {
height: 100%;
width: 100%;
.time-title {
margin: 15px;
color: #333333;
src/pages/home2/components/todoList/index.vue
+1 -1
View File
@@ -37,7 +37,7 @@ export default {
queryProcess () { // 查询待办流程
this.$http.postData('lawss/activiti/todoTaskList', {
current: this.pageNo,
size: parseInt(this.$store.getters.userInfo.configContent),
size: 10,
userId: this.$store.getters.userInfo.usid || this.$store.getters.userInfo.userId,
},
{
src/pages/home2/index.vue
+3 -1
View File
@@ -117,7 +117,7 @@ export default {
display: flex;
flex: 1;
flex-direction: column;
width: 53.5vw;
width: 48vw;
height: calc(~'100% - 10px');
margin-right: 10px;
.more {
@@ -157,8 +157,10 @@ export default {
background:#FFFFFF;
.main-left-wrap {
height: 100%;
width: 100%;
.home-tabs {
height: 100%;
width: 100%;
}
}
}
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+20 -8
View File
@@ -549,7 +549,7 @@
:url="url"
:urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
</el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
<el-input v-model="form.kccvppsbm" placeholder="选择卡车VPPS编码" @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', form.kccvppsbm)"></el-input>
@@ -565,7 +565,7 @@
:url="url"
:urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select-new>
:nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs" @popoverHideCancel="popoverHideCarVsCancel"></tree-select-new>
</el-form-item>
<el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
<el-input v-model="form.dybxh" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxh', '模块结构单元', form.dybxh)"></el-input>
@@ -581,7 +581,7 @@
:show-checkBox="showCheckBox"
:urlChild="urlChild"
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select-new>
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"></tree-select-new>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门">
@@ -2313,19 +2313,23 @@
this.modalShowFlag1 = false
},
popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
if(checkedData.length > 0){
if(checkedData && checkedData.length != 0) {
if(checkedData.length > 0 && checkedData.length != 0){
this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
}else {
this.form.cycvppsbm = checkedData.code
this.form.cycvppscn = checkedData.chineseName
}
this.modalShowFlag2 = false
}
this.modalShowFlag2 = false
},
popoverHideBusVsCancel(){
this.modalShowFlag2 = false
},
popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
if(checkedData && checkedData.length != 0) {
if(checkedData.length > 0){
this.form.kccvppsbm = checkedData.map(item => item.code).join(",")
this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",")
@@ -2333,11 +2337,15 @@
this.form.kccvppsbm = checkedData.code
this.form.kccvppscn = checkedData.chineseName
}
this.modalShowFlag3 = false
}
},
popoverHideCarVsCancel(){
this.modalShowFlag3 = false
},
popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
if(checkedData && checkedData.length != 0) {
if(checkedData.length > 0){
this.form.dybxh = checkedData.map(item => item.model).join(",")
this.form.dymc = checkedData.map(item => item.name).join(",")
@@ -2345,7 +2353,11 @@
this.form.dybxh = checkedData.model
this.form.dymc = checkedData.name
}
this.modalShowFlag4 = false
}
},
popoverHideModelCancel(){
this.modalShowFlag4 = false
},
closeDrawer() {
src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+1
View File
@@ -66,6 +66,7 @@
border
style="width: 100%; flex: auto;"
class="drag-table"
:default-sort = "{prop: 'chapterNumber', order: 'ascending'}"
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+1
View File
@@ -66,6 +66,7 @@
border
style="width: 100%; flex: auto;"
class="drag-table"
:default-sort = "{prop: 'chapterNumber', order: 'ascending'}"
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+1
View File
@@ -78,6 +78,7 @@
border
style="width: 100%; flex: auto;"
class="drag-table"
:default-sort = "{prop: 'chapterNumber', order: 'ascending'}"
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+1
View File
@@ -78,6 +78,7 @@
border
style="width: 100%; flex: auto;"
class="drag-table"
:default-sort = "{prop: 'chapterNumber', order: 'ascending'}"
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+1
View File
@@ -78,6 +78,7 @@
border
style="width: 100%; flex: auto;"
class="drag-table"
:default-sort = "{prop: 'chapterNumber', order: 'ascending'}"
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+1
View File
@@ -78,6 +78,7 @@
border
style="width: 100%; flex: auto;"
class="drag-table"
:default-sort = "{prop: 'chapterNumber', order: 'ascending'}"
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
+20
View File
@@ -53,6 +53,7 @@
height="70%"
style="width: 100%; border:1px solid #ccc"
@selection-change="selectStandChange"
@select="handleSelectionChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
@@ -303,6 +304,7 @@
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectListChange"
@select="handleSelectionChanges"
ref="selection"
>
<el-table-column
@@ -430,6 +432,20 @@ export default {
};
},
methods: {
// 表格勾选
handleSelectionChange(selection, val) {
if (selection.length > 1) {
let del_row = selection.shift();
this.$refs.selection.toggleRowSelection(del_row, false);
// this.$refs.listSelection.toggleRowSelection(del_row, false);
}
},
handleSelectionChanges(selection, val) {
if (selection.length > 1) {
let del_row = selection.shift();
this.$refs.selection.toggleRowSelection(del_row, false);
}
},
getData() {
queryTaskFirst({
bpnId: this.$route.query.bpnId
@@ -650,6 +666,10 @@ export default {
}
}
/deep/ .el-table__header-wrapper .el-checkbox {
display: none;
}
.choiceBtn {
.el-button--primary {
width: 150px;
src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+21 -8
View File
@@ -55,6 +55,7 @@
height="70%"
style="width: 100%; border:1px solid #ccc"
@selection-change="selectStandChange"
@select="handleSelectionChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
@@ -305,6 +306,7 @@
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectListChange"
@select="handleSelectionChanges"
ref="listSelection"
>
<el-table-column
@@ -433,6 +435,20 @@ export default {
};
},
methods: {
// 表格勾选
handleSelectionChange(selection, val) {
if (selection.length > 1) {
let del_row = selection.shift();
this.$refs.selection.toggleRowSelection(del_row, false);
// this.$refs.listSelection.toggleRowSelection(del_row, false);
}
},
handleSelectionChanges(selection, val) {
if (selection.length > 1) {
let del_row = selection.shift();
this.$refs.listSelection.toggleRowSelection(del_row, false);
}
},
//tab发生变化
handleTabs(type) {
this.active = type;
@@ -538,14 +554,7 @@ export default {
},
//项目的多选框改变
selectListChange(data) {
// 单选
if (data.length > 1) {
this.$refs.listSelection.clearSelection()
this.$refs.listSelection.toggleRowSelection(data.pop())
}
this.multipleSelection = data
this.selectedList = data;
this.selectedList = data;
},
pageChange(page) {
this.page = page;
@@ -676,6 +685,10 @@ export default {
}
}
/deep/ .el-table__header-wrapper .el-checkbox {
display: none;
}
.choiceBtn {
.el-button--primary {
width: 150px;
src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue
+20 -14
View File
@@ -195,6 +195,7 @@
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectProjectChange"
@select="handleSelectionChange"
ref="projectSelection"
>
<el-table-column
@@ -298,6 +299,7 @@
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectListChange"
@select="handleSelectionChanges"
ref="listSelection"
>
<el-table-column
@@ -463,6 +465,20 @@ export default {
this.commentText = mes.commentText;
});
},
// 表格勾选
handleSelectionChange(selection, val) {
if (selection.length > 1) {
let del_row = selection.shift();
this.$refs.projectSelection.toggleRowSelection(del_row, false);
// this.$refs.listSelection.toggleRowSelection(del_row, false);
}
},
handleSelectionChanges(selection, val) {
if (selection.length > 1) {
let del_row = selection.shift();
this.$refs.listSelection.toggleRowSelection(del_row, false);
}
},
handleTabs(type) {
this.active = type;
},
@@ -623,24 +639,10 @@ export default {
},
//清单勾选框数据
selectListChange(data) {
// 单选
if (data.length > 1) {
this.$refs.listSelection.clearSelection()
this.$refs.listSelection.toggleRowSelection(data.pop())
}
this.multipleSelection = data
this.selectedList = data;
},
//项目勾选框数据
selectProjectChange(data) {
// 单选
if (data.length > 1) {
this.$refs.projectSelection.clearSelection()
this.$refs.projectSelection.toggleRowSelection(data.pop())
}
this.multipleSelection = data
this.selectProject = data;
},
//提交事件
@@ -758,6 +760,10 @@ export default {
}
}
/deep/ .el-table__header-wrapper .el-checkbox {
display: none;
}
/deep/ .el-drawer__container {
.prc-content-border {
border: none;
src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+16 -21
View File
@@ -194,6 +194,7 @@
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectProjectChange"
@select="handleSelectionChange"
ref="projectSelection"
>
<el-table-column
@@ -297,6 +298,7 @@
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectListChange"
@select="handleSelectionChanges"
ref="listSelection"
>
<el-table-column
@@ -457,13 +459,18 @@ export default {
},
methods: {
// 表格勾选
handleSelectionChange(val) {
// 单选
if (val.length > 1) {
this.$refs.table.clearSelection();
this.$refs.table.toggleRowSelection(val.pop());
handleSelectionChange(selection, val) {
if (selection.length > 1) {
let del_row = selection.shift();
this.$refs.projectSelection.toggleRowSelection(del_row, false);
// this.$refs.listSelection.toggleRowSelection(del_row, false);
}
},
handleSelectionChanges(selection, val) {
if (selection.length > 1) {
let del_row = selection.shift();
this.$refs.listSelection.toggleRowSelection(del_row, false);
}
this.multipleSelection = val;
},
handleTabs(type) {
this.active = type;
@@ -624,24 +631,10 @@ export default {
},
//清单勾选框数据
selectListChange(data) {
// 单选
if (data.length > 1) {
this.$refs.listSelection.clearSelection();
this.$refs.listSelection.toggleRowSelection(data.pop());
}
this.multipleSelection = data
this.selectedList = data;
},
//项目勾选框数据
selectProjectChange(data) {
// 单选
if (data.length > 1) {
this.$refs.projectSelection.clearSelection();
this.$refs.projectSelection.toggleRowSelection(data.pop());
}
this.multipleSelection = data
this.selectProject = data;
},
//提交事件
@@ -757,7 +750,9 @@ export default {
line-height: 10px;
}
}
/deep/ .el-table__header-wrapper .el-checkbox {
display: none;
}
/deep/ .el-drawer__container {
.prc-content-border {
border: none;
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+20 -9
View File
@@ -1083,7 +1083,7 @@
:url="url"
:urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
<tree-select-new
width="500"
:lazy=true
@@ -1094,7 +1094,7 @@
:url="url"
:urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select-new>
:nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs" @popoverHideCancel="popoverHideCarVsCancel()" ></tree-select-new>
<tree-select-new
width="500"
:lazy=true
@@ -1105,7 +1105,7 @@
:url="url"
:urlChild="urlChild"
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select-new>
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel()"></tree-select-new>
<!-- 导入失败-->
<el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px">
<p slot="title" style="color:#f60">
@@ -2407,7 +2407,7 @@ export default {
this.$forceUpdate()
},
popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
if (checkedData) {
if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0) {
this.sarStandardsInfoEO.CYCVPPSBM = checkedData.map(item => item.code).join(",")
this.sarStandardsInfoEO.CYCVPPSCN = checkedData.map(item => item.chineseName).join(",")
@@ -2415,12 +2415,16 @@ export default {
this.sarStandardsInfoEO.CYCVPPSBM = checkedData.code
this.sarStandardsInfoEO.CYCVPPSCN = checkedData.chineseName
}
this.modalShowFlag2 = false
}
this.modalShowFlag2 = false
this.$forceUpdate()
},
popoverHideBusVsCancel(){
this.modalShowFlag2 = false
},
popoverHideCarVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
if (checkedData) {
if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0) {
this.sarStandardsInfoEO.KCCVPPSBM = checkedData.map(item => item.code).join(",")
this.sarStandardsInfoEO.KCCVPPSCN = checkedData.map(item => item.chineseName).join(",")
@@ -2428,12 +2432,16 @@ export default {
this.sarStandardsInfoEO.KCCVPPSBM = checkedData.code
this.sarStandardsInfoEO.KCCVPPSCN = checkedData.chineseName
}
this.modalShowFlag3 = false
}
this.modalShowFlag3 = false
this.$forceUpdate()
},
popoverHideCarVsCancel(){
this.modalShowFlag3 = false
},
popoverHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
if (checkedData) {
if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0) {
this.sarStandardsInfoEO.DYBXH = checkedData.map(item => item.model).join(",")
this.sarStandardsInfoEO.DYMC = checkedData.map(item => item.name).join(",")
@@ -2441,10 +2449,13 @@ export default {
this.sarStandardsInfoEO.DYBXH = checkedData.model
this.sarStandardsInfoEO.DYMC = checkedData.name
}
this.modalShowFlag4 = false
}
this.modalShowFlag4 = false
this.$forceUpdate()
},
popoverHideModelCancel(){
this.modalShowFlag4 = false
},
busVsFunc() {
this.$http.get('sarVppsTree/list', '', {
_this: this