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

修改查询bug 页面布局

Browse Source
This commit is contained in:
宋伟佳
2021-12-21 16:29:08 +08:00
parent 6337c43409
commit 1ea35ee8c6
9 changed files with 1005 additions and 996 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+7 -6
View File
@@ -10,7 +10,7 @@
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div> <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
</div> </div>
<div class="content" v-show="active === '1'"> <div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto"> <div style=" overflow: auto">
<process-title> <process-title>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
</process-title> </process-title>
@@ -149,6 +149,8 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</div>
<process-title> <process-title>
<template slot="title">填写信息</template> <template slot="title">填写信息</template>
</process-title> </process-title>
@@ -162,7 +164,7 @@
:data="dataList" :data="dataList"
border border
ref="selection" ref="selection"
height="49%" height="100%"
style="width: 100%;" style="width: 100%;"
@selection-change="selectStandChange" @selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
@@ -190,7 +192,7 @@
readonly readonly
@click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)" @click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)"
></el-input> ></el-input>
<!-- <span v-else>{{ scope.row.distributePerson }}</span>--> <!-- <span v-else>{{ scope.row.distributePerson }}</span>-->
</template> </template>
<!-- <template slot-scope="scope,text" v-if="showColumn">--> <!-- <template slot-scope="scope,text" v-if="showColumn">-->
<!-- <div>--> <!-- <div>-->
@@ -202,9 +204,6 @@
<!-- </template>--> <!-- </template>-->
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
</div>
<div>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="回执说明"> <el-collapse-item title="回执说明">
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
@@ -219,6 +218,8 @@
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
</div> </div>
<div>
</div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<div class="block" style="padding-top: 20px;"> <div class="block" style="padding-top: 20px;">
<el-timeline> <el-timeline>
src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue
+3 -3
View File
@@ -11,7 +11,7 @@
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div> <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div> </div>
<div class="content" v-show="active === '1'"> <div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto"> <div style="overflow: auto">
<process-title> <process-title>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
</process-title> </process-title>
@@ -132,6 +132,7 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</div>
<process-title> <process-title>
<template slot="title">填写信息</template> <template slot="title">填写信息</template>
</process-title> </process-title>
@@ -254,8 +255,6 @@
label="责任人"> label="责任人">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
<div>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="审批意见"> <el-collapse-item title="审批意见">
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
@@ -269,6 +268,7 @@
</div> </div>
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
<div>
</div> </div>
</div> </div>
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+6 -5
View File
@@ -10,7 +10,7 @@
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div> <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
</div> </div>
<div class="content" v-show="active === '1'"> <div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto"> <div style=" overflow: auto">
<process-title> <process-title>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
</process-title> </process-title>
@@ -163,6 +163,8 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</div>
<process-title> <process-title>
<template slot="title">填写信息</template> <template slot="title">填写信息</template>
</process-title> </process-title>
@@ -176,7 +178,7 @@
:data="dataList" :data="dataList"
border border
ref="selection" ref="selection"
height="49%" height="100%"
style="width: 100%;" style="width: 100%;"
@selection-change="selectStandChange" @selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
@@ -204,9 +206,6 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
</div>
<div>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="回执说明"> <el-collapse-item title="回执说明">
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
@@ -221,6 +220,8 @@
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
</div> </div>
<div>
</div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<div class="block" style="padding-top: 20px;"> <div class="block" style="padding-top: 20px;">
<el-timeline> <el-timeline>
src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+4 -4
View File
@@ -10,7 +10,7 @@
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div> <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div> </div>
<div class="content" v-show="active === '1'"> <div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto"> <div style="overflow: auto">
<process-title> <process-title>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
</process-title> </process-title>
@@ -131,6 +131,7 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</div>
<process-title> <process-title>
<template slot="title">填写信息</template> <template slot="title">填写信息</template>
</process-title> </process-title>
@@ -138,7 +139,7 @@
:data="dataList" :data="dataList"
border border
ref="selection" ref="selection"
height="49%" height="100%"
style="width: 100%;" style="width: 100%;"
@selection-change="selectStandChange" @selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
@@ -165,8 +166,6 @@
label="分发责任人"> label="分发责任人">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
<div>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="审批意见"> <el-collapse-item title="审批意见">
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
@@ -180,6 +179,7 @@
</div> </div>
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
<div>
</div> </div>
</div> </div>
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+31 -24
View File
@@ -15,7 +15,7 @@
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
</process-title> </process-title>
<el-collapse-transition> <el-collapse-transition>
<div class="prc-content-border" v-if="foldFormFlag === false"> <div v-if="foldFormFlag === false">
<el-form <el-form
:model="listForm" :model="listForm"
class="label-input-form prc-content-border" class="label-input-form prc-content-border"
@@ -132,6 +132,15 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<!-- 选择责任人-->
<Role-tree
is-title="选择落实人"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
</div>
<process-title> <process-title>
<template slot="title">填写信息</template> <template slot="title">填写信息</template>
</process-title> </process-title>
@@ -150,7 +159,7 @@
ref="multipleTable" ref="multipleTable"
:data="breakdownList" :data="breakdownList"
style="width: 100%; border: 1px solid #cccccc;height: 400px" style="width: 100%; border: 1px solid #cccccc;height: 400px"
height="48%" height="100%"
border border
highlight-current-row highlight-current-row
@selection-change="selectStandChange" @selection-change="selectStandChange"
@@ -226,22 +235,14 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- <el-pagination--> <!-- <el-pagination-->
<!-- layout="total,sizes, prev, pager, next"--> <!-- layout="total,sizes, prev, pager, next"-->
<!-- background--> <!-- background-->
<!-- :page-sizes="[20, 40, 60]"--> <!-- :page-sizes="[20, 40, 60]"-->
<!-- :total="total"--> <!-- :total="total"-->
<!-- @size-change="handleSizeChange"--> <!-- @size-change="handleSizeChange"-->
<!-- @current-change="handleCurrentChange"--> <!-- @current-change="handleCurrentChange"-->
<!-- />--> <!-- />-->
<!-- 选择责任人-->
<Role-tree
is-title="选择落实人"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
</div>
</div> </div>
<div class="content" v-show="active === '3'"> <div class="content" v-show="active === '3'">
@@ -341,7 +342,7 @@
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
size="small" size="small"
@click="getProject"> @click="getProjectBtn">
查询 查询
</el-button> </el-button>
</el-form-item> </el-form-item>
@@ -360,7 +361,7 @@
style="width: 100%" style="width: 100%"
border border
ref="table" ref="table"
height="100%" class="table-height"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
@selection-change="selectThree" @selection-change="selectThree"
@@ -679,6 +680,10 @@ export default {
} }
}, },
getProjectBtn(){
this.pageNo = 1,
this.getProject()
},
getProject() { getProject() {
this.$http.get("sarStandProjectLibrary/queryProjectUnderLine", { this.$http.get("sarStandProjectLibrary/queryProjectUnderLine", {
productLine: this.projectLineId, productLine: this.projectLineId,
@@ -967,16 +972,14 @@ export default {
padding: 0 20px 0; padding: 0 20px 0;
} }
} }
position: relative;
height: 100%;
.choiceBtn { .choiceBtn {
.el-button--primary { .el-button--primary {
width: 150px; width: 150px;
} }
} }
position: relative;
height: 100%;
.headerTabs { .headerTabs {
height: 52px; height: 52px;
display: flex; display: flex;
@@ -1035,6 +1038,10 @@ export default {
.demo-drawer-content { .demo-drawer-content {
margin-top: 10px; margin-top: 10px;
} }
.table-height{
height: calc(~'100% - 65px');
overflow: auto;
}
} }
</style> </style>
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+4 -4
View File
@@ -10,7 +10,7 @@
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div> <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div> </div>
<div class="content" v-show="active === '1'"> <div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto"> <div style="overflow: auto">
<process-title> <process-title>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
</process-title> </process-title>
@@ -131,6 +131,7 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</div>
<process-title> <process-title>
<template slot="title">填写信息</template> <template slot="title">填写信息</template>
</process-title> </process-title>
@@ -148,7 +149,7 @@
style="width: 100%" style="width: 100%"
border border
@selection-change="selectStandChange" @selection-change="selectStandChange"
height="48%" height="100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}"> fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
<el-table-column <el-table-column
@@ -311,8 +312,6 @@
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
<div>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="回执说明"> <el-collapse-item title="回执说明">
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
@@ -326,6 +325,7 @@
</div> </div>
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
<div>
</div> </div>
</div> </div>
src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+4 -4
View File
@@ -10,7 +10,7 @@
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div> <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div> </div>
<div class="content" v-show="active === '1'"> <div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto"> <div style="overflow: auto">
<process-title> <process-title>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
</process-title> </process-title>
@@ -131,6 +131,7 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</div>
<process-title> <process-title>
<template slot="title">填写信息</template> <template slot="title">填写信息</template>
</process-title> </process-title>
@@ -143,7 +144,7 @@
style="width: 100%" style="width: 100%"
border border
@selection-change="selectStandChange" @selection-change="selectStandChange"
height="55%" height="100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}"> fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
<el-table-column <el-table-column
@@ -253,8 +254,6 @@
label="责任人"> label="责任人">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
<div>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="审批意见"> <el-collapse-item title="审批意见">
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
@@ -268,6 +267,7 @@
</div> </div>
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
<div>
</div> </div>
</div> </div>
src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+4 -4
View File
@@ -10,7 +10,7 @@
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div> <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div> </div>
<div class="content" v-show="active === '1'"> <div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto"> <div style="overflow: auto">
<process-title> <process-title>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
</process-title> </process-title>
@@ -131,6 +131,7 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</div>
<process-title> <process-title>
<template slot="title">填写信息</template> <template slot="title">填写信息</template>
</process-title> </process-title>
@@ -143,7 +144,7 @@
style="width: 100%" style="width: 100%"
border border
@selection-change="selectStandChange" @selection-change="selectStandChange"
height="55%" height="100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}"> fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
<el-table-column <el-table-column
@@ -253,8 +254,6 @@
label="责任人"> label="责任人">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
<div>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="审批意见"> <el-collapse-item title="审批意见">
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
@@ -268,6 +267,7 @@
</div> </div>
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
<div>
</div> </div>
</div> </div>
src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+4 -4
View File
@@ -10,7 +10,7 @@
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div> <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div> </div>
<div class="content" v-show="active === '1'"> <div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto"> <div style="overflow: auto">
<process-title> <process-title>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
</process-title> </process-title>
@@ -131,6 +131,7 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</div>
<process-title> <process-title>
<template slot="title">填写信息</template> <template slot="title">填写信息</template>
</process-title> </process-title>
@@ -143,7 +144,7 @@
style="width: 100%" style="width: 100%"
border border
@selection-change="selectStandChange" @selection-change="selectStandChange"
height="52%" height="100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}"> fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
<el-table-column <el-table-column
@@ -253,8 +254,6 @@
label="责任人"> label="责任人">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
<div>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="审批意见"> <el-collapse-item title="审批意见">
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
@@ -268,6 +267,7 @@
</div> </div>
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
<div>
</div> </div>
</div> </div>