7f675083 by zhaoqian

Merge remote-tracking branch 'origin/master'

2 parents 9d5dfa86 fcad0c5e
1 <template> 1 <template>
2 <div class="h content-form" ref="mainBox" :class="$route.path == '/h' ? 'hpage':''" :style="{'height': $route.path == '/h' ? '100%' : formHeight+'px'}"> 2 <div class="h content-form" ref="mainBox" :class="$route.path == '/h' ? 'hpage':''" :style="{'height': $route.path == '/h' ? '100%' : formHeight+'px'}">
3 <el-form ref="form" :model="form" label-width="160px" class="form"> 3 <el-form ref="form" :model="form" label-width="160px" class="form">
4 <Qlr ref="qlrxxModule" :bsm='bsm'></Qlr> 4 <Qlr ref="qlrxxModule" :bsm='bsm' :qszt="form.qszt"></Qlr>
5 <table border="1" width="100%" cellspacing="0" cellpadding="0" class="hTable"> 5 <table border="1" width="100%" cellspacing="0" cellpadding="0" class="hTable">
6 <tbody> 6 <tbody>
7 <tr height="30"> 7 <tr height="30">
......