Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

@@ -11,7 +11,7 @@
   import { mapGetters } from 'vuex'
   import { getSzRecordList } from "@/api/bdcqz.js";
   import table from "@/utils/mixin/table";
-  import { datas } from "../../javascript/szxxdata";
+  import { szxxdatas } from "../../javascript/szxxdata";
   export default {
     components: {
 
@@ -34,7 +34,7 @@
         details: {},
         tableData: {
           total: 0,
-          columns: datas.columns(),
+          columns: szxxdatas.columns(),
           data: [],
         },
       }

@@ -102,9 +102,8 @@ export default {
       handler(val) {
         this.propsParam = this.$attrs;
         this.dataset()
-        if(this.$parent.dqhj){
-            this.getShList();
-        }
+       this.getShList();
+
       },
       deep: true,
       immediate: true,

@@ -104,7 +104,6 @@ export default {
   watch: {
     workFresh: {
       handler(newVal, oldVal) {
-        console.log(newVal, "newVal");
         if (newVal) this.list();
       },
     },
@@ -146,7 +145,7 @@ export default {
           "证书证明预览",
           "workflow/components/dialog/zsyl",
           { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq },
-          "76%",
+          '1230px',
           true
         );
       } else {
@@ -269,7 +268,7 @@ export default {
   }
   .zm-card.no-print {
     background-image: url("~@/image/zm-gray.png");
-    
+
     /deep/ .el-card__header {
       &:after {
         background-color: #6d7278;

+/*
+ * @Description:
+ * @Autor: renchao
+ * @LastEditTime: 2023-08-29 12:55:07
+ */
+import filter from '@/utils/filter.js'
+let vm = null
+
+const sendThis = (_this) => {
+  vm = _this
+}
+class data extends filter {
+  constructor() {
+    super()
+  }
+  columns () {
+    return {
+      //发证列表
+      fzgrid: [
+        {
+          label: '序号',
+          type: 'index',
+          width: '50'
+        },
+        {
+          prop: "fzrmc",
+          label: "发证人"
+        },
+        {
+          prop: "bdcqzlx",
+          label: "不动产权证类型",
+          width: '130',
+          render: (h, scope) => {
+            return (
+              <div>
+                <span v-show={scope.row.bdcqzlx == '1'}>不动产权证书</span>
+                <span v-show={scope.row.bdcqzlx == '2'}>不动产登记证明</span>
+              </div>
+            )
+          }
+        },
+        {
+           label: "权利类型",
+          width: '100',
+          render: (h, scope) => {
+            return (
+              <el-tooltip effect="dark" content={scope.row.qllx} placement="top" popper-class="tooltip-width ">
+                <span class="ellipsis-table"> {scope.row.qllx}</span>
+              </el-tooltip>
+            )
+          }
+        },
+        {
+          label: "面积（㎡）",
+          width: '100',
+          render: (h, scope) => {
+            return (
+              <el-tooltip effect="dark" content={scope.row.mj} placement="top" popper-class="tooltip-width ">
+                <span class="ellipsis-table"> {scope.row.mj}</span>
+              </el-tooltip>
+            )
+          }
+        },
+        {
+          prop: "fzsj",
+          label: "发证时间",
+          width: '140',
+        },
+        {
+          prop: "lzrxm",
+          label: "领证人姓名"
+        },
+      ],
+    }
+  }
+}
+let datas = new data()
+export {
+  datas,
+  sendThis
+}

 /*
- * @Description: 
+ * @Description:
  * @Autor: renchao
  * @LastEditTime: 2023-05-17 10:39:03
  */
@@ -16,6 +16,7 @@ class data extends filter {
   columns () {
     return [
       {
+        width:"50px",
         label: '序号',
         type: 'index',
         render: (h, scope) => {
@@ -59,8 +60,8 @@ class data extends filter {
     ]
   }
 }
-let datas = new data()
+let szxxdatas = new data()
 export {
-  datas,
+  szxxdatas,
   sendThis
 }

+/*
+ * @Description:
+ * @Autor: renchao
+ * @LastEditTime: 2023-05-17 10:39:03
+ */
+import filter from '@/utils/filter.js'
+let vm = null
+
+const sendThis = (_this) => {
+  vm = _this
+}
+class data extends filter {
+  constructor() {
+    super()
+  }
+  columns () {
+    return [
+      {
+        width:"50px",
+        label: '序号',
+        type: 'index',
+        render: (h, scope) => {
+          return (
+            <div>
+              {scope.$index + 1}
+            </div>
+          )
+        }
+      },
+      {
+        prop: "szry",
+        label: "缮证人员",
+      },
+      {
+        prop: "szsj",
+        label: "缮证时间",
+      },
+      {
+        label: "是否作废",
+        render: (h, scope) => {
+          if (scope.row.sfzf == '0') {
+            return <div>否</div>
+          } else {
+            return <div>已作废</div>
+          }
+        }
+      },
+      {
+        prop: "bz",
+        label: "备注信息",
+      },
+    ]
+  }
+}
+let szxxdatas = new data()
+export {
+  szxxdatas,
+  sendThis
+}

@@ -126,7 +126,7 @@ export default {
           this.$popupDialog("证书证明预览", "workflow/components/dialog/zsyl", {
             bsmSlsq: this.bsmSlsq,
             entryType: '1'
-          }, '1210px', true)
+          }, '1230px', true)
           break;
         case "B6":
           //根据编号获取对应信息

@@ -104,10 +104,10 @@
        */
       openDialog (item) {
         bdcqzPreview(item).then(res => {
-          this.$popupDialog("证书证明预览", "workflow/components/dialog/zsyl", {
+          this.$popupDialog("证书证明预览", "workflow/components/dialog/zsylxq", {
             bsmSlsq: item.bsmSlsq,
             bsmBdcqz: item.bsmBdcqz
-          }, '1210px', true)
+          }, '1230px', true)
         })
       },
       /**