Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
ebc4fdf7 by renchao@pashanhoo.com
Options

Merge branch 'dev'

2 parents bfef8d1d 5439e063
Inline Side-by-side
Showing 1 changed file with 6 additions and 5 deletions
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-12-26 15:00:22 4 * @LastEditTime: 2024-03-11 15:18:56
5 --> 5 -->
6 <template> 6 <template>
7 <dialogBox 7 <dialogBox
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
24 v-if="activeName==1" 24 v-if="activeName==1"
25 :model="ruleForm" 25 :model="ruleForm"
26 :rules="rules" 26 :rules="rules"
27 style="height:490px"
27 ref="ruleForm" 28 ref="ruleForm"
28 label-width="120px"> 29 label-width="120px">
29 <el-form-item label="身份证读卡器" style="margin-top:-10px;margin-bottom:0"> 30 <el-form-item label="身份证读卡器" style="margin-top:-10px;margin-bottom:0">
...@@ -261,7 +262,7 @@ ...@@ -261,7 +262,7 @@
261 </el-col> 262 </el-col>
262 </el-row> 263 </el-row>
263 </el-form> 264 </el-form>
264 <div v-if="activeName==2" class="padding10"> 265 <div v-if="activeName==2" class="padding10" style="height:550px">
265 <el-form :model="queryFormQY" label-width="80px"> 266 <el-form :model="queryFormQY" label-width="80px">
266 <el-row> 267 <el-row>
267 <el-col :span="8"> 268 <el-col :span="8">
...@@ -283,7 +284,7 @@ ...@@ -283,7 +284,7 @@
283 </el-col> 284 </el-col>
284 </el-row> 285 </el-row>
285 </el-form> 286 </el-form>
286 <el-table :data="tableDataQy.data" border v-Loading="loading" :height="563"> 287 <el-table :data="tableDataQy.data" border v-Loading="loading" :height="450">
287 <el-table-column label="序号" type="index" width="50" align="center"> 288 <el-table-column label="序号" type="index" width="50" align="center">
288 <template slot-scope="scope"> 289 <template slot-scope="scope">
289 {{(pageData.currentPage - 1) * pageData.pageSize + scope.$index + 1}} 290 {{(pageData.currentPage - 1) * pageData.pageSize + scope.$index + 1}}
...@@ -301,7 +302,7 @@ ...@@ -301,7 +302,7 @@
301 @current-change="handleQYCurrentChange"></el-pagination> 302 @current-change="handleQYCurrentChange"></el-pagination>
302 </div> 303 </div>
303 304
304 <div v-if="activeName==3" class="padding10"> 305 <div v-if="activeName==3" class="padding10" style="height:550px">
305 <el-form :model="queryFormYH" label-width="80px"> 306 <el-form :model="queryFormYH" label-width="80px">
306 <el-row> 307 <el-row>
307 <el-col :span="8"> 308 <el-col :span="8">
...@@ -323,7 +324,7 @@ ...@@ -323,7 +324,7 @@
323 </el-col> 324 </el-col>
324 </el-row> 325 </el-row>
325 </el-form> 326 </el-form>
326 <el-table :data="tableDataYh.data" border v-Loading="loading" :height="563"> 327 <el-table :data="tableDataYh.data" border v-Loading="loading" :height="450">
327 <el-table-column label="序号" type="index" width="50" align="center"> 328 <el-table-column label="序号" type="index" width="50" align="center">
328 <template slot-scope="scope"> 329 <template slot-scope="scope">
329 {{(pageData.currentPage - 1) * pageData.pageSize + scope.$index + 1}} 330 {{(pageData.currentPage - 1) * pageData.pageSize + scope.$index + 1}}
......