a2a16c33 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 29d83d27 b7a5e395
...@@ -54,9 +54,9 @@ ...@@ -54,9 +54,9 @@
54 }, 54 },
55 watch: { 55 watch: {
56 isShow (newValue) { 56 isShow (newValue) {
57 this.editItem = this.loadViewFn(this.editItem)
58 document.body.appendChild(this.$el);
59 this.$nextTick(() => { 57 this.$nextTick(() => {
58 this.editItem = this.loadViewFn(this.editItem)
59 document.body.appendChild(this.$el);
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.editItem = this.loadViewFn(this.editItem)
57 document.body.appendChild(this.$el);
58 this.$nextTick(() => { 56 this.$nextTick(() => {
57 this.editItem = this.loadViewFn(this.editItem)
58 document.body.appendChild(this.$el);
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,64 +38,64 @@ ...@@ -38,64 +38,64 @@
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],
48 mounted () { 48 mounted () {
49 sendThis(this); 49 sendThis(this);
50 },
51 computed: {
52 },
53 data () {
54 return {
55 queryForm: {
56 ywlx: "",
57 apiUrl: "",
58 },
59 pageData: {
60 current: 1,
61 size: 10,
62 },
63 tableData: {
64 total: 0,
65 columns: datas.columns(),
66 data: [],
67 },
68 };
69 },
70 methods: {
71 /**
72 * @description: queryClick
73 * @author: renchao
74 */
75 queryClick () {
76 getErrorLogList({ ...this.queryForm, ...this.pageData }).then(res => {
77 if (res.code === 200) {
78 let { total, records } = res.result
79 this.tableData.total = total;
80 this.tableData.data = records
81 this.tableData.data.forEach((item, index) => {
82 item.cwdmwz = item.cwdmwz.replace(/\\n/g, '\n')
83 })
84 }
85 })
86 }, 50 },
87 /** 51 computed: {
88 * @description: viewDetail 52 },
89 * @param {*} e 53 data () {
90 * @author: renchao 54 return {
91 */ 55 queryForm: {
92 viewDetail (e) { 56 ywlx: "",
93 this.$popupDialog("错误日志", "xtjk/cwrz/components/viewDialog", e, "50%") 57 apiUrl: "",
58 },
59 pageData: {
60 current: 1,
61 size: 10,
62 },
63 tableData: {
64 total: 0,
65 columns: datas.columns(),
66 data: [],
67 },
68 };
69 },
70 methods: {
71 /**
72 * @description: queryClick
73 * @author: renchao
74 */
75 queryClick () {
76 getErrorLogList({ ...this.queryForm, ...this.pageData }).then(res => {
77 if (res.code === 200) {
78 let { total, records } = res.result
79 this.tableData.total = total;
80 this.tableData.data = records
81 this.tableData.data.forEach((item, index) => {
82 item.cwdmwz = item.cwdmwz.replace(/\\n/g, '\n')
83 })
84 }
85 })
86 },
87 /**
88 * @description: viewDetail
89 * @param {*} e
90 * @author: renchao
91 */
92 viewDetail (e) {
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,61 +38,61 @@ ...@@ -38,61 +38,61 @@
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],
48 mounted () { 48 mounted () {
49 sendThis(this); 49 sendThis(this);
50 },
51 computed: {
52 },
53 data () {
54 return {
55 queryForm: {
56 czlx: "",
57 apiUrl: "",
58 },
59 pageData: {
60 current: 1,
61 size: 10,
62 },
63 tableData: {
64 total: 0,
65 columns: datas.columns(),
66 data: [],
67 },
68 };
69 },
70 methods: {
71 /**
72 * @description: queryClick
73 * @author: renchao
74 */
75 queryClick () {
76 getOperationLogList({ ...this.queryForm, ...this.pageData }).then(res => {
77 if (res.code === 200) {
78 let { total, records } = res.result
79 this.tableData.total = total;
80 this.tableData.data = records
81 }
82 })
83 }, 50 },
84 /** 51 computed: {
85 * @description: viewDetail 52 },
86 * @param {*} e 53 data () {
87 * @author: renchao 54 return {
88 */ 55 queryForm: {
89 viewDetail (e) { 56 czlx: "",
90 this.$popupDialog("操作日志", "xtjk/czrz/components/viewDialog", e, "50%") 57 apiUrl: "",
58 },
59 pageData: {
60 current: 1,
61 size: 10,
62 },
63 tableData: {
64 total: 0,
65 columns: datas.columns(),
66 data: [],
67 },
68 };
69 },
70 methods: {
71 /**
72 * @description: queryClick
73 * @author: renchao
74 */
75 queryClick () {
76 getOperationLogList({ ...this.queryForm, ...this.pageData }).then(res => {
77 if (res.code === 200) {
78 let { total, records } = res.result
79 this.tableData.total = total;
80 this.tableData.data = records
81 }
82 })
83 },
84 /**
85 * @description: viewDetail
86 * @param {*} e
87 * @author: renchao
88 */
89 viewDetail (e) {
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", { 107 // this.$popupDialog("证书证明预览", "workflow/components/dialog/zsylxq", {
108 bsmSlsq: item.bsmSlsq, 108 // bsmSlsq: item.bsmSlsq,
109 bsmBdcqz: item.bsmBdcqz 109 // bsmBdcqz: item.bsmBdcqz
110 }, '1230px', true) 110 // }, '1230px', true)
111 }) 111 // })
112 this.$popupDialog("证书证明预览", "workflow/components/dialog/zsylxq", {
113 bsmSlsq: item.bsmSlsq,
114 bsmBdcqz: item.bsmBdcqz
115 }, '1230px', true)
112 }, 116 },
113 /** 117 /**
114 * @description: openWorkDialog 118 * @description: openWorkDialog
......