7f675083 by zhaoqian

Merge remote-tracking branch 'origin/master'

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