Merge branch 'dev'
Showing
6 changed files
with
26 additions
and
22 deletions
| ... | @@ -54,9 +54,9 @@ | ... | @@ -54,9 +54,9 @@ |
| 54 | }, | 54 | }, |
| 55 | watch: { | 55 | watch: { |
| 56 | isShow (newValue) { | 56 | isShow (newValue) { |
| 57 | this.$nextTick(() => { | ||
| 57 | this.editItem = this.loadViewFn(this.editItem) | 58 | this.editItem = this.loadViewFn(this.editItem) |
| 58 | document.body.appendChild(this.$el); | 59 | document.body.appendChild(this.$el); |
| 59 | this.$nextTick(() => { | ||
| 60 | this.myShow = newValue | 60 | this.myShow = newValue |
| 61 | }) | 61 | }) |
| 62 | } | 62 | } | ... | ... |
| ... | @@ -53,9 +53,9 @@ | ... | @@ -53,9 +53,9 @@ |
| 53 | }, | 53 | }, |
| 54 | watch: { | 54 | watch: { |
| 55 | isShow (newValue) { | 55 | isShow (newValue) { |
| 56 | this.$nextTick(() => { | ||
| 56 | this.editItem = this.loadViewFn(this.editItem) | 57 | this.editItem = this.loadViewFn(this.editItem) |
| 57 | document.body.appendChild(this.$el); | 58 | document.body.appendChild(this.$el); |
| 58 | this.$nextTick(() => { | ||
| 59 | this.myShow = newValue | 59 | this.myShow = newValue |
| 60 | }) | 60 | }) |
| 61 | } | 61 | } | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-08-09 10:36:14 | 4 | * @LastEditTime: 2023-10-16 09:10:05 |
| 5 | --> | 5 | --> |
| 6 | <template> | 6 | <template> |
| 7 | <div class="from-clues"> | 7 | <div class="from-clues"> |
| ... | @@ -30,7 +30,7 @@ | ... | @@ -30,7 +30,7 @@ |
| 30 | </el-form> | 30 | </el-form> |
| 31 | </div> | 31 | </div> |
| 32 | <div class="from-clues-content"> | 32 | <div class="from-clues-content"> |
| 33 | <lb-table :page-size="pageData.size" border :current-page.sync="pageData.currentPage" :heightNum="300" | 33 | <lb-table :page-size="pageData.size" border :current-page.sync="pageData.currentPage" :heightNum="280" |
| 34 | :total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange" | 34 | :total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange" |
| 35 | :column="tableData.columns" :data="tableData.data"> | 35 | :column="tableData.columns" :data="tableData.data"> |
| 36 | </lb-table> | 36 | </lb-table> |
| ... | @@ -38,10 +38,10 @@ | ... | @@ -38,10 +38,10 @@ |
| 38 | </div> | 38 | </div> |
| 39 | </template> | 39 | </template> |
| 40 | <script> | 40 | <script> |
| 41 | import table from "@/utils/mixin/table" | 41 | import table from "@/utils/mixin/table" |
| 42 | import { datas, sendThis } from "./cwrzdata" | 42 | import { datas, sendThis } from "./cwrzdata" |
| 43 | import { getErrorLogList } from "@/api/view.js" | 43 | import { getErrorLogList } from "@/api/view.js" |
| 44 | export default { | 44 | export default { |
| 45 | name: "cwrz", | 45 | name: "cwrz", |
| 46 | components: {}, | 46 | components: {}, |
| 47 | mixins: [table], | 47 | mixins: [table], |
| ... | @@ -93,9 +93,9 @@ export default { | ... | @@ -93,9 +93,9 @@ export default { |
| 93 | this.$popupDialog("错误日志", "xtjk/cwrz/components/viewDialog", e, "50%") | 93 | this.$popupDialog("错误日志", "xtjk/cwrz/components/viewDialog", e, "50%") |
| 94 | } | 94 | } |
| 95 | } | 95 | } |
| 96 | }; | 96 | }; |
| 97 | </script> | 97 | </script> |
| 98 | <style scoped lang="scss"> | 98 | <style scoped lang="scss"> |
| 99 | @import "~@/styles/public.scss"; | 99 | @import "~@/styles/public.scss"; |
| 100 | </style> | 100 | </style> |
| 101 | 101 | ... | ... |
| ... | @@ -30,7 +30,7 @@ | ... | @@ -30,7 +30,7 @@ |
| 30 | </el-form> | 30 | </el-form> |
| 31 | </div> | 31 | </div> |
| 32 | <div class="from-clues-content"> | 32 | <div class="from-clues-content"> |
| 33 | <lb-table :page-size="pageData.size" border :current-page.sync="pageData.currentPage" :heightNum="300" | 33 | <lb-table :page-size="pageData.size" border :current-page.sync="pageData.currentPage" :heightNum="280" |
| 34 | :total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange" | 34 | :total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange" |
| 35 | :column="tableData.columns" :data="tableData.data"> | 35 | :column="tableData.columns" :data="tableData.data"> |
| 36 | </lb-table> | 36 | </lb-table> |
| ... | @@ -38,10 +38,10 @@ | ... | @@ -38,10 +38,10 @@ |
| 38 | </div> | 38 | </div> |
| 39 | </template> | 39 | </template> |
| 40 | <script> | 40 | <script> |
| 41 | import table from "@/utils/mixin/table" | 41 | import table from "@/utils/mixin/table" |
| 42 | import { datas, sendThis } from "./czrzdata" | 42 | import { datas, sendThis } from "./czrzdata" |
| 43 | import { getOperationLogList } from "@/api/view.js" | 43 | import { getOperationLogList } from "@/api/view.js" |
| 44 | export default { | 44 | export default { |
| 45 | name: "czrz", | 45 | name: "czrz", |
| 46 | components: {}, | 46 | components: {}, |
| 47 | mixins: [table], | 47 | mixins: [table], |
| ... | @@ -90,9 +90,9 @@ export default { | ... | @@ -90,9 +90,9 @@ export default { |
| 90 | this.$popupDialog("操作日志", "xtjk/czrz/components/viewDialog", e, "50%") | 90 | this.$popupDialog("操作日志", "xtjk/czrz/components/viewDialog", e, "50%") |
| 91 | } | 91 | } |
| 92 | } | 92 | } |
| 93 | }; | 93 | }; |
| 94 | </script> | 94 | </script> |
| 95 | <style scoped lang="scss"> | 95 | <style scoped lang="scss"> |
| 96 | @import "~@/styles/public.scss"; | 96 | @import "~@/styles/public.scss"; |
| 97 | </style> | 97 | </style> |
| 98 | 98 | ... | ... |
| ... | @@ -58,19 +58,19 @@ | ... | @@ -58,19 +58,19 @@ |
| 58 | </el-col> | 58 | </el-col> |
| 59 | <el-col :span="5"> | 59 | <el-col :span="5"> |
| 60 | <el-form-item label="坐落:" label-width="105px"> | 60 | <el-form-item label="坐落:" label-width="105px"> |
| 61 | <el-input v-model="queryForm.zl" clearable class="width100"> | 61 | <el-input v-model="queryForm.zl" placeholder="坐落" clearable class="width100"> |
| 62 | </el-input> | 62 | </el-input> |
| 63 | </el-form-item> | 63 | </el-form-item> |
| 64 | </el-col> | 64 | </el-col> |
| 65 | <el-col :span="5"> | 65 | <el-col :span="5"> |
| 66 | <el-form-item label="权利人:" label-width="105px"> | 66 | <el-form-item label="权利人:" label-width="105px"> |
| 67 | <el-input v-model="queryForm.qlrmc" clearable class="width100"> | 67 | <el-input v-model="queryForm.qlrmc" placeholder="权利人" clearable class="width100"> |
| 68 | </el-input> | 68 | </el-input> |
| 69 | </el-form-item> | 69 | </el-form-item> |
| 70 | </el-col> | 70 | </el-col> |
| 71 | <el-col :span="5"> | 71 | <el-col :span="5"> |
| 72 | <el-form-item label="义务人:"> | 72 | <el-form-item label="义务人:"> |
| 73 | <el-input v-model="queryForm.ywrmc" clearable class="width100"> | 73 | <el-input v-model="queryForm.ywrmc" placeholder="义务人" clearable class="width100"> |
| 74 | </el-input> | 74 | </el-input> |
| 75 | </el-form-item> | 75 | </el-form-item> |
| 76 | </el-col> | 76 | </el-col> | ... | ... |
| ... | @@ -103,12 +103,16 @@ | ... | @@ -103,12 +103,16 @@ |
| 103 | * @author: renchao | 103 | * @author: renchao |
| 104 | */ | 104 | */ |
| 105 | openDialog (item) { | 105 | openDialog (item) { |
| 106 | bdcqzPreview(item).then(res => { | 106 | // bdcqzPreview(item).then(res => { |
| 107 | // this.$popupDialog("证书证明预览", "workflow/components/dialog/zsylxq", { | ||
| 108 | // bsmSlsq: item.bsmSlsq, | ||
| 109 | // bsmBdcqz: item.bsmBdcqz | ||
| 110 | // }, '1230px', true) | ||
| 111 | // }) | ||
| 107 | this.$popupDialog("证书证明预览", "workflow/components/dialog/zsylxq", { | 112 | this.$popupDialog("证书证明预览", "workflow/components/dialog/zsylxq", { |
| 108 | bsmSlsq: item.bsmSlsq, | 113 | bsmSlsq: item.bsmSlsq, |
| 109 | bsmBdcqz: item.bsmBdcqz | 114 | bsmBdcqz: item.bsmBdcqz |
| 110 | }, '1230px', true) | 115 | }, '1230px', true) |
| 111 | }) | ||
| 112 | }, | 116 | }, |
| 113 | /** | 117 | /** |
| 114 | * @description: openWorkDialog | 118 | * @description: openWorkDialog | ... | ... |
-
Please register or sign in to post a comment