Merge branch 'dev'
Showing
3 changed files
with
6 additions
and
5 deletions
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-07-25 09:27:43 | 4 | * @LastEditTime: 2023-08-08 11:01:08 |
| 5 | --> | 5 | --> |
| 6 | <template> | 6 | <template> |
| 7 | <div class="from-clues"> | 7 | <div class="from-clues"> |
| 8 | <!-- 表单部分 --> | 8 | <!-- 表单部分 --> |
| 9 | <div class="from-clues-header"> | 9 | <div class="from-clues-header"> |
| 10 | <el-form :model="ruleForm" @submit.native.prevent label-width="80px"> | 10 | <el-form :model="ruleForm" @submit.native.prevent label-width="50px"> |
| 11 | <el-row> | 11 | <el-row> |
| 12 | <el-col :span="5"> | 12 | <el-col :span="5"> |
| 13 | <el-form-item label="标题"> | 13 | <el-form-item label="标题"> |
| ... | @@ -24,7 +24,7 @@ | ... | @@ -24,7 +24,7 @@ |
| 24 | </el-form> | 24 | </el-form> |
| 25 | </div> | 25 | </div> |
| 26 | <!-- 表格 --> | 26 | <!-- 表格 --> |
| 27 | <div class="from-clues-content"> | 27 | <div class="from-clues-content loadingtext"> |
| 28 | <lb-table :page-size="pageData.size" border :current-page.sync="pageData.current" :total="tableData.total" | 28 | <lb-table :page-size="pageData.size" border :current-page.sync="pageData.current" :total="tableData.total" |
| 29 | @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns" | 29 | @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns" |
| 30 | :data="tableData.data"> | 30 | :data="tableData.data"> | ... | ... |
| ... | @@ -27,7 +27,7 @@ | ... | @@ -27,7 +27,7 @@ |
| 27 | </el-form> | 27 | </el-form> |
| 28 | </div> | 28 | </div> |
| 29 | <!-- 表格 --> | 29 | <!-- 表格 --> |
| 30 | <div class="from-clues-content"> | 30 | <div class="from-clues-content loadingtext"> |
| 31 | <lb-table :page-size="pageData.size" border :current-page.sync="pageData.current" :total="tableData.total" | 31 | <lb-table :page-size="pageData.size" border :current-page.sync="pageData.current" :total="tableData.total" |
| 32 | @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns" | 32 | @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns" |
| 33 | :data="tableData.data"> | 33 | :data="tableData.data"> | ... | ... |
| 1 | /* | 1 | /* |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-08-08 09:36:08 | 4 | * @LastEditTime: 2023-08-08 14:32:47 |
| 5 | */ | 5 | */ |
| 6 | import filter from '@/utils/filter.js' | 6 | import filter from '@/utils/filter.js' |
| 7 | let vm = null | 7 | let vm = null |
| ... | @@ -72,6 +72,7 @@ class data extends filter { | ... | @@ -72,6 +72,7 @@ class data extends filter { |
| 72 | prop: "qlrmc", | 72 | prop: "qlrmc", |
| 73 | label: "权利人", | 73 | label: "权利人", |
| 74 | width: '120', | 74 | width: '120', |
| 75 | showOverflowTooltip: true | ||
| 75 | }, | 76 | }, |
| 76 | { | 77 | { |
| 77 | prop: "ywrmc", | 78 | prop: "ywrmc", | ... | ... |
-
Please register or sign in to post a comment