Merge branch 'dev'

@@ -54,9 +54,9 @@
     },
     watch: {
       isShow (newValue) {
+        this.$nextTick(() => {
           this.editItem = this.loadViewFn(this.editItem)
           document.body.appendChild(this.$el);
-        this.$nextTick(() => {
           this.myShow = newValue
         })
       }

@@ -53,9 +53,9 @@
     },
     watch: {
       isShow (newValue) {
+        this.$nextTick(() => {
           this.editItem = this.loadViewFn(this.editItem)
           document.body.appendChild(this.$el);
-        this.$nextTick(() => {
           this.myShow = newValue
         })
       }

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-09 10:36:14
+ * @LastEditTime: 2023-10-16 09:10:05
 -->
 <template>
   <div class="from-clues">
@@ -30,7 +30,7 @@
       </el-form>
     </div>
     <div class="from-clues-content">
-      <lb-table :page-size="pageData.size" border :current-page.sync="pageData.currentPage" :heightNum="300"
+      <lb-table :page-size="pageData.size" border :current-page.sync="pageData.currentPage" :heightNum="280"
         :total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
         :column="tableData.columns" :data="tableData.data">
       </lb-table>
@@ -38,10 +38,10 @@
   </div>
 </template>
 <script>
-import table from "@/utils/mixin/table"
-import { datas, sendThis } from "./cwrzdata"
-import { getErrorLogList } from "@/api/view.js"
-export default {
+  import table from "@/utils/mixin/table"
+  import { datas, sendThis } from "./cwrzdata"
+  import { getErrorLogList } from "@/api/view.js"
+  export default {
     name: "cwrz",
     components: {},
     mixins: [table],
@@ -93,9 +93,9 @@ export default {
         this.$popupDialog("错误日志", "xtjk/cwrz/components/viewDialog", e, "50%")
       }
     }
-};
+  };
 </script>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
+  @import "~@/styles/public.scss";
 </style>
 

@@ -30,7 +30,7 @@
       </el-form>
     </div>
     <div class="from-clues-content">
-      <lb-table :page-size="pageData.size" border :current-page.sync="pageData.currentPage" :heightNum="300"
+      <lb-table :page-size="pageData.size" border :current-page.sync="pageData.currentPage" :heightNum="280"
         :total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
         :column="tableData.columns" :data="tableData.data">
       </lb-table>
@@ -38,10 +38,10 @@
   </div>
 </template>
 <script>
-import table from "@/utils/mixin/table"
-import { datas, sendThis } from "./czrzdata"
-import { getOperationLogList } from "@/api/view.js"
-export default {
+  import table from "@/utils/mixin/table"
+  import { datas, sendThis } from "./czrzdata"
+  import { getOperationLogList } from "@/api/view.js"
+  export default {
     name: "czrz",
     components: {},
     mixins: [table],
@@ -90,9 +90,9 @@ export default {
         this.$popupDialog("操作日志", "xtjk/czrz/components/viewDialog", e, "50%")
       }
     }
-};
+  };
 </script>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
+  @import "~@/styles/public.scss";
 </style>
 

@@ -58,19 +58,19 @@
           </el-col>
           <el-col :span="5">
             <el-form-item label="坐落:" label-width="105px">
-              <el-input v-model="queryForm.zl" clearable class="width100">
+              <el-input v-model="queryForm.zl" placeholder="坐落" clearable class="width100">
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="权利人:" label-width="105px">
-              <el-input v-model="queryForm.qlrmc" clearable class="width100">
+              <el-input v-model="queryForm.qlrmc" placeholder="权利人" clearable class="width100">
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="义务人:">
-              <el-input v-model="queryForm.ywrmc" clearable class="width100">
+              <el-input v-model="queryForm.ywrmc" placeholder="义务人" clearable class="width100">
               </el-input>
             </el-form-item>
           </el-col>

@@ -103,12 +103,16 @@
        * @author: renchao
        */
       openDialog (item) {
-        bdcqzPreview(item).then(res => {
+        // bdcqzPreview(item).then(res => {
+        //   this.$popupDialog("证书证明预览", "workflow/components/dialog/zsylxq", {
+        //     bsmSlsq: item.bsmSlsq,
+        //     bsmBdcqz: item.bsmBdcqz
+        //   }, '1230px', true)
+        // })
         this.$popupDialog("证书证明预览", "workflow/components/dialog/zsylxq", {
           bsmSlsq: item.bsmSlsq,
           bsmBdcqz: item.bsmBdcqz
         }, '1230px', true)
-        })
       },
       /**
        * @description: openWorkDialog