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

 /*
  * @Description: 不动产权证
  * @Autor: renchao
- * @LastEditTime: 2023-05-16 14:04:18
+ * @LastEditTime: 2023-09-05 13:24:14
  */
 import request from '@/utils/request';
 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
@@ -131,3 +131,13 @@ export function bdcqzPreview (data) {
         responseType: 'blob'
     })
 }
+// 获取不动产权证详细信息
+export function getBdcqzDetail (bsmBdcqz) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/ywbl/bdcqz/getBdcqzDetail',
+        method: 'get',
+        params: {
+            bsmBdcqz: bsmBdcqz
+        }
+    })
+}
\ No newline at end of file

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-04 17:12:05
+ * @LastEditTime: 2023-09-05 14:28:25
 -->
 <template>
   <div class="szxx">
@@ -55,28 +55,14 @@
         </div>
       </div>
     </el-card>
-    <el-dialog title="证书作废" :visible.sync="invalidDiglog" width="30%" :modal-append-to-body="false" top="30vh">
-      <div class="invalid-diglog">
-        <div class="invalid-title">
-          <i class="el-icon-question invalid-icon"></i>
-          <div class="invalid-body">您确定作废证书并再次打印？印刷序列号{{ysxlh}}</div>
-        </div>
-        <div class="invalid-reson">作废原因：</div>
-        <el-input v-model="zfyy" placeholder="请输入作废原因" type="textarea" :rows="4"></el-input>
-        <div class="text-center pt-10">
-          <el-button @click="closeInvalidDiglog">取 消</el-button>
-          <el-button type="primary" @click="confirmInvalid">确 定</el-button>
-        </div>
-      </div>
-    </el-dialog>
+
     <el-empty description="暂无数据" v-if="tableData.length == 0"></el-empty>
   </div>
 </template>
 <script>
   import { mapGetters } from 'vuex'
   import store from '@/store/index.js'
-  import { getPrintTemplateByCode } from "@/api/print";
-  import { getSlsqBdcqzList, invalidCertificate } from "@/api/bdcqz.js";
+  import { getSlsqBdcqzList } from "@/api/bdcqz.js";
   export default {
     props: {},
     data () {
@@ -86,13 +72,8 @@
         dialog: false,
         tableData: [],
         bdcqzlx: 1,
-        bdcqz: {},
-        zfyy: "",
-        invalidDiglog: false,
-        bsmSz: "",
-        bsmBdcqz: "",
-        ysxlh: ""
-      };
+        bdcqz: {}
+      }
     },
     computed: {
       ...mapGetters(['workFresh'])
@@ -100,6 +81,7 @@
     watch: {
       workFresh: {
         handler (newVal, oldVal) {
+          console.log(newVal, 'newVal');
           if (newVal) this.list()
         }
       }
@@ -135,12 +117,11 @@
        */
       openZsylDialog (item, type) {
         store.dispatch('user/reWorkFresh', false)
-
         if (type == 1) {
           //证书证明预览
           this.$popupDialog("证书证明预览", "workflow/components/dialog/zsyl", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "76%", true);
         } else {
-          this.$popupDialog("证书证明打印", "workflow/components/dialog/zsdy", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "76%", true);
+          this.$popupDialog("证书证明打印", "workflow/components/dialog/zsdy", { ...item }, "76%", true);
         }
       },
       /**
@@ -149,38 +130,7 @@
        * @author: renchao
        */
       openInvalidDiglog (item) {
-        this.bdcqz = item
-        this.ysxlh = item.ysxlh
-        this.bsmSz = item.bsmSz;
-        this.invalidDiglog = true;
-        this.bsmBdcqz = item.bsmBdcqz
-      },
-      /**
-       * @description: closeInvalidDiglog
-       * @author: renchao
-       */
-      closeInvalidDiglog () {
-        this.invalidDiglog = false;
-        this.bsmSz = "";
-        this.zfyy = "";
-      },
-      /**
-       * @description: 作废缮证信息
-       * @author: renchao
-       */
-      confirmInvalid () {
-        invalidCertificate({ bsmBdcqz: this.bsmBdcqz, zfyy: this.zfyy }).then(async (res) => {
-          if (res.code === 200) {
-            this.list();
-            this.$message.success("作废成功");
-            this.invalidDiglog = false;
-            this.zfyy = ''
-            let res = await this.list()
-            if (res && res == 200) this.openZsylDialog(this.bdcqz);
-          } else {
-            this.$message.error(res.message);
-          }
-        })
+        this.$popupDialog("证书证明打印", "workflow/components/dialog/zsdy", { ...item }, "76%", true);
       },
       /**
        * @description: openRecordPop
@@ -263,39 +213,6 @@
     padding-top: 8px;
     font-size: 16px;
   }
-
-  .invalid-diglog {
-    padding-bottom: 20px;
-    font-size: 16px;
-    font-weight: bold;
-    color: rgb(99, 99, 99);
-
-    .invalid-title {
-      display: flex;
-      align-content: center;
-
-      .invalid-icon {
-        color: rgb(254, 148, 0);
-        font-size: 34px;
-        margin-right: 10px;
-      }
-
-      .invalid-body {
-        line-height: 40px;
-        margin-bottom: 10px;
-      }
-    }
-
-    .invalid-reson {
-      margin-bottom: 10px;
-    }
-
-    .dialog-footer {
-      margin-top: 10px;
-      display: flex;
-      justify-content: flex-end;
-    }
-  }
   .box-card {
     .szxx_header {
       color: #303133;

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-11 13:59:14
+ * @LastEditTime: 2023-09-05 15:05:56
  */
 import { getForm } from "../flowform";
 import { getHomeNoticeList } from "@/api/home.js"
@@ -49,7 +49,6 @@ export default {
      * @author: renchao
      */
     getFromRouter (tabname) {
-      console.log(tabname, 'tabnametabnametabnametabnametabname');
       //根据tabname获取选中的表单  此操作为了获取后端返回的表单对象，使用里面的是否可操作的属性
       for (let item of this.tabList) {
         if (item.value === tabname) {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-29 08:52:44
+ * @LastEditTime: 2023-09-05 11:32:50
 -->
 <template>
   <div class="from-clues">
@@ -58,7 +58,7 @@
   import { ywPopupDialog } from "@/utils/popup.js";
   import { selectLq } from "@/api/ywsq.js";
   import { startBusinessFlow } from "@/api/workFlow.js";
-  import { datas, sendThis } from "../javascript/selectQjlqxx.js";
+  import { datas, sendThis } from "../javascript/selectQjlqxxQt.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
   export default {
     mixins: [table, jump],
@@ -75,7 +75,7 @@
           columns: datas.columns(),
           data: [],
         },
-        bdcdysz: [],
+        bdcdysz: [], 
       };
     },
     mounted () {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-17 16:09:12
+ * @LastEditTime: 2023-09-05 13:10:53
 -->
 <template>
   <div class="from-clues">
@@ -58,7 +58,7 @@
   import { ywPopupDialog } from "@/utils/popup.js";
   import { selectLq } from "@/api/ywsq.js";
   import { startBusinessFlow } from "@/api/workFlow.js";
-  import { datas, sendThis } from "../javascript/selectQjzdjbxx.js";
+  import { datas, sendThis } from "../javascript/selectSllmqt.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
   export default {
     mixins: [table, jump],

+/*
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-09-05 11:33:36
+ */
+import filter from '@/utils/filter.js'
+let vm = null
+
+const sendThis = (_this) => {
+  vm = _this
+}
+class data extends filter {
+  constructor() {
+    super()
+  }
+  columns () {
+    return [
+      {
+        type: 'selection',
+        label: '全选',
+        selectable: this.selected
+      },
+      {
+        label: '序号',
+        type: 'index',
+        width: '50',
+        render: (h, scope) => {
+          return (
+            <div>
+              {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
+            </div>
+          )
+        }
+      },
+      {
+        label: "状态",
+        width: '130',
+        render: (h, scope) => {
+          return (
+            <div>
+              <a style='color:#3498db;' v-show={scope.row.djblzt == 1}>{this.yWstatus(scope.row)}</a>
+              <span v-show={scope.row.djblzt != 1}>{this.yWstatus(scope.row)}</span>
+            </div>
+          )
+        }
+      },
+      {
+        prop: "qllxmc",
+        label: "权利类型",
+      },
+      {
+        prop: "bdcdyh",
+        label: "不动产单元号",
+        minWidth: '150'
+      },
+      {
+        prop: "bdcqzh",
+        label: "不动产权证号",
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.bdcqzh} placement="top" popper-class="tooltip-width ">
+              <span class="ellipsis-table"> {scope.row.bdcqzh}</span>
+            </el-tooltip>
+          )
+        },
+        width: '150'
+      },
+      {
+        prop: "gyqk",
+        label: "共有方式",
+      },
+      {
+        prop: "qlrmc",
+        label: "使用权人",
+      },
+      {
+        prop: "qlrzjhm",
+        label: "证件号",
+      },
+      {
+        prop: "qlxzmc",
+        width: '80',
+        label: "权利性质",
+      },
+      {
+        prop: "qlmjmc",
+        width: '100',
+        label: "使用权面积",
+      },
+      {
+        prop: "qlytmc",
+        label: "土地用途",
+      },
+      {
+        prop: "qdjgmc",
+        width: '100',
+        label: "取得价格",
+      },
+      {
+        prop: "zl",
+        label: "坐落",
+        minWidth: '150'
+      },{
+        label: '操作',
+        width: '80',
+        align: 'center',
+        fixed: 'right',
+        render: (h, scope) => {
+          return (
+            <div>
+              <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
+            </div>
+          )
+        }
+      }
+    ]
+  }
+
+
+}
+let datas = new data()
+export {
+  datas,
+  sendThis
+}

+/*
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-09-05 13:10:31
+ */
+import filter from '@/utils/filter.js'
+let vm = null
+
+const sendThis = (_this) => {
+  vm = _this
+}
+class data extends filter {
+  constructor() {
+    super()
+  }
+  columns () {
+    return [
+      {
+        type: 'selection',
+        label: '全选',
+        selectable: this.selected
+      },
+      {
+        label: '序号',
+        type: 'index',
+        width: '50',
+        render: (h, scope) => {
+          return (
+            <div>
+              {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
+            </div>
+          )
+        }
+      },
+      {
+        label: "状态",
+        render: (h, scope) => {
+          return (
+            <div>
+              <a style='color:#3498db;' v-show={scope.row.djblzt == 1}>{this.yWstatus(scope.row)}</a>
+              <span v-show={scope.row.djblzt != 1}>{this.yWstatus(scope.row)}</span>
+              {/* <a style='color:#3498db;' v-show={scope.row.djblzt == 1} >正在办理</a>
+              <span v-show={scope.row.zjgcdyzt == 1}>,在建工程抵押</span>
+              <span v-show={scope.row.ycfzt == 1}>,已预查封</span>
+              <span v-show={scope.row.ycfzt == 1}>,已预查封</span>
+              <span v-show={scope.row.cfzt == 1}>,已查封</span>
+              <span v-show={scope.row.diyizt == 1}>,已地役</span>
+              <span v-show={scope.row.yyzt == 1}>,异议中</span>
+              <span v-show={scope.row.xzzt == 1}>,已限制</span>
+              <span v-show={scope.row.ygmmzt == 1}>,已预告买卖</span>
+              <span v-show={scope.row.ygdyzt == 1}>,已预告抵押</span>
+              <span v-show={scope.row.dyzt == 1}>,已抵押</span> */}
+            </div>
+          )
+        }
+      },
+      {
+        prop: "qllxmc",
+        label: "权利类型",
+      },
+      {
+        prop: "zddm",
+        label: "宗地代码",
+      },
+      {
+        prop: "bdcdyh",
+        label: "不动产单元号",
+        minWidth: '110'
+      },
+      {
+        prop: "showQlxz",
+        label: "权利性质",
+      },
+      {
+        prop: "zdmj",
+        label: "宗地面积(㎡)",
+      },
+      {
+        prop: "qlsdfsmc",
+        label: "权利设定方式",
+      },
+      {
+        prop: "showTdyt",
+        label: "土地用途",
+      },
+      {
+        prop: "tfh",
+        label: "图幅号",
+      },
+      {
+        prop: "djh",
+        label: "地籍号",
+      },
+      {
+        prop: "zl",
+        label: "坐落",
+        minWidth: '110'
+      },{
+        label: '操作',
+        width: '80',
+        align: 'center',
+        fixed: 'right',
+        render: (h, scope) => {
+          return (
+            <div>
+              <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
+            </div>
+          )
+        }
+      }
+    ]
+  }
+
+
+}
+let datas = new data()
+export {
+  datas,
+  sendThis
+}