Merge branch 'dev'

 /*
 /*
  * @Description: 不动产权证
  * @Description: 不动产权证
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-05-16 14:04:18
+ * @LastEditTime: 2023-09-05 13:24:14
  */
  */
 import request from '@/utils/request';
 import request from '@/utils/request';
 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
@@ -131,3 +131,13 @@ export function bdcqzPreview (data) {
         responseType: 'blob'
         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

@@ -80,7 +80,7 @@
       console.log("this.propsParam.bdcdyid ", this.propsParam);
       console.log("this.propsParam.bdcdyid ", this.propsParam);
       window.open(
       window.open(
         `'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=bdcqljqtsx`,
         `'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=bdcqljqtsx`,
-        `printdjb`
+        `bdcqljqtsx`
       );
       );
     },
     },
      }
      }

@@ -211,7 +211,7 @@ export default {
       console.log("this.propsParam.bdcdyid ", this.propsParam);
       console.log("this.propsParam.bdcdyid ", this.propsParam);
       window.open(
       window.open(
         `'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=cfdj`,
         `'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=cfdj`,
-        `printdjb`
+        `cfdj`
       );
       );
     },
     },
   },
   },

@@ -207,7 +207,7 @@ export default {
       console.log("this.propsParam.bdcdyid ", this.propsParam);
       console.log("this.propsParam.bdcdyid ", this.propsParam);
       window.open(
       window.open(
         `'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=diyaq`,
         `'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=diyaq`,
-        `printdjb`
+        `diyaq`
       );
       );
     },
     },
   },
   },

@@ -208,7 +208,7 @@ export default {
       console.log("this.propsParam.bdcdyid ", this.propsParam);
       console.log("this.propsParam.bdcdyid ", this.propsParam);
       window.open(
       window.open(
         `'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=diyiq`,
         `'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=diyiq`,
-        `printdjb`
+        `diyiq`
       );
       );
     },
     },
   },
   },

@@ -66,7 +66,7 @@
       },
       },
        print(){
        print(){
          console.log("this.propsParam.bdcdyid ",this.propsParam);
          console.log("this.propsParam.bdcdyid ",this.propsParam);
-          window.open(`'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=djbfm`, `printdjb`);
+          window.open(`'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=djbfm`, `djbfm`);
       }
       }
     },
     },
   };
   };

@@ -241,7 +241,7 @@ export default {
       console.log("this.propsParam.bdcdyid ", this.propsParam);
       console.log("this.propsParam.bdcdyid ", this.propsParam);
       window.open(
       window.open(
         `'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=fdcq1`,
         `'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=fdcq1`,
-        `printdjb`
+        `fdcq1`
       );
       );
     },
     },
   },
   },

@@ -202,7 +202,7 @@ export default {
       console.log("this.propsParam.bdcdyid ", this.propsParam);
       console.log("this.propsParam.bdcdyid ", this.propsParam);
       window.open(
       window.open(
         `'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=fdcq2`,
         `'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=fdcq2`,
-        `printdjb`
+        `fdcq2`
       );
       );
     },
     },
   },
   },

@@ -210,7 +210,7 @@ export default {
       console.log("this.propsParam.bdcdyid ", this.propsParam);
       console.log("this.propsParam.bdcdyid ", this.propsParam);
       window.open(
       window.open(
         `'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=jsydsyq`,
         `'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=jsydsyq`,
-        `printdjb`
+        `jsydsyq`
       );
       );
     },
     },
   },
   },

@@ -211,7 +211,7 @@ export default {
       console.log("this.propsParam.bdcdyid ", this.propsParam);
       console.log("this.propsParam.bdcdyid ", this.propsParam);
       window.open(
       window.open(
         `'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=ldsyq`,
         `'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=ldsyq`,
-        `printdjb`
+        `ldsyq`
       );
       );
     },
     },
   },
   },

@@ -263,7 +263,7 @@ export default {
       console.log("this.propsParam.bdcdyid ", this.propsParam);
       console.log("this.propsParam.bdcdyid ", this.propsParam);
       window.open(
       window.open(
         `'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=nydsyq`,
         `'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=nydsyq`,
-        `printdjb`
+        `nydsyq`
       );
       );
     },
     },
   },
   },

@@ -193,7 +193,7 @@
       console.log("this.propsParam.bdcdyid ", this.propsParam);
       console.log("this.propsParam.bdcdyid ", this.propsParam);
       window.open(
       window.open(
         `'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=sllmsyq`,
         `'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=sllmsyq`,
-        `printdjb`
+        `sllmsyq`
       );
       );
     },
     },
     },
     },

@@ -183,7 +183,7 @@
       console.log("this.propsParam.bdcdyid ", this.propsParam);
       console.log("this.propsParam.bdcdyid ", this.propsParam);
       window.open(
       window.open(
         `'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=tdsyq`,
         `'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=tdsyq`,
-        `printdjb`
+        `tdsyq`
       );
       );
     },
     },
     },
     },

@@ -183,7 +183,7 @@
       console.log("this.propsParam.bdcdyid ", this.propsParam);
       console.log("this.propsParam.bdcdyid ", this.propsParam);
       window.open(
       window.open(
         `'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=ygdj`,
         `'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=ygdj`,
-        `printdjb`
+        `ygdj`
       );
       );
     },
     },
     },
     },

@@ -182,7 +182,7 @@
       console.log("this.propsParam.bdcdyid ", this.propsParam);
       console.log("this.propsParam.bdcdyid ", this.propsParam);
       window.open(
       window.open(
         `'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=yydj`,
         `'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=yydj`,
-        `printdjb`
+        `yydj`
       );
       );
     },
     },
     },
     },

@@ -216,7 +216,7 @@ export default {
       console.log("this.propsParam.bdcdyid ", this.propsParam);
       console.log("this.propsParam.bdcdyid ", this.propsParam);
       window.open(
       window.open(
         `'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=zdjbxx`,
         `'#/printdjb?bdcdyid=${this.propsParam.bdcdyid}&qllx=${this.propsParam.qllx}&content=zdjbxx`,
-        `printdjb`
+        `zdjbxx`
       );
       );
     },
     },
   },
   },

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-08-15 09:43:21
+ * @LastEditTime: 2023-09-04 17:09:21
 -->
 -->
 <template>
 <template>
   <div class="clxx">
   <div class="clxx">
@@ -134,7 +134,6 @@
           this.previewImg.bsmSj = this.tableData[this.treeCheckIndex].bsmSj;
           this.previewImg.bsmSj = this.tableData[this.treeCheckIndex].bsmSj;
         }
         }
       },
       },
-      // 材料目录明细初始化
       /**
       /**
        * @description: 材料目录明细初始化
        * @description: 材料目录明细初始化
        * @param {*} type
        * @param {*} type

+<template>
+  <div>
+    <div>自来水信息</div>
+    <div>天然气信息</div>
+    <div>电力信息</div>
+  </div>
+</template>
\ No newline at end of file

+<template>
+  <div>
+    <div>不动产信息</div>
+    <div>收费明细</div>
+    <div>缴费票据</div>
+  </div>
+</template>
\ No newline at end of file

+<template>
+   <div>
+    <div>不动产信息</div>
+    <div>买方信息</div>
+    <div>卖方信息</div>
+    <div>合同信息</div>
+     <div>缴税信息</div>
+  </div>
+</template>
\ No newline at end of file

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-08-31 09:36:04
+ * @LastEditTime: 2023-09-05 14:28:25
 -->
 -->
 <template>
 <template>
   <div class="szxx">
   <div class="szxx">
@@ -55,28 +55,14 @@
         </div>
         </div>
       </div>
       </div>
     </el-card>
     </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>
     <el-empty description="暂无数据" v-if="tableData.length == 0"></el-empty>
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
   import { mapGetters } from 'vuex'
   import { mapGetters } from 'vuex'
   import store from '@/store/index.js'
   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 {
   export default {
     props: {},
     props: {},
     data () {
     data () {
@@ -86,13 +72,8 @@
         dialog: false,
         dialog: false,
         tableData: [],
         tableData: [],
         bdcqzlx: 1,
         bdcqzlx: 1,
-        bdcqz: {},
-        zfyy: "",
-        invalidDiglog: false,
-        bsmSz: "",
-        bsmBdcqz: "",
-        ysxlh: ""
-      };
+        bdcqz: {}
+      }
     },
     },
     computed: {
     computed: {
       ...mapGetters(['workFresh'])
       ...mapGetters(['workFresh'])
@@ -100,6 +81,7 @@
     watch: {
     watch: {
       workFresh: {
       workFresh: {
         handler (newVal, oldVal) {
         handler (newVal, oldVal) {
+          console.log(newVal, 'newVal');
           if (newVal) this.list()
           if (newVal) this.list()
         }
         }
       }
       }
@@ -114,15 +96,18 @@
        * @author: renchao
        * @author: renchao
        */
        */
       list () {
       list () {
+        return new Promise((resolve, reject) => {
           var bsmSlsq = this.$route.query.bsmSlsq;
           var bsmSlsq = this.$route.query.bsmSlsq;
           getSlsqBdcqzList({ bsmSlsq: bsmSlsq }).then((res) => {
           getSlsqBdcqzList({ bsmSlsq: bsmSlsq }).then((res) => {
+            resolve(res.code);
             if (res.code === 200) {
             if (res.code === 200) {
               this.tableData = res.result;
               this.tableData = res.result;
               if (res.result) {
               if (res.result) {
                 this.bdcqz = res.result[0];
                 this.bdcqz = res.result[0];
               }
               }
             }
             }
-        });
+          })
+        })
       },
       },
       /**
       /**
        * @description: 打开证书预览弹窗
        * @description: 打开证书预览弹窗
@@ -132,12 +117,11 @@
        */
        */
       openZsylDialog (item, type) {
       openZsylDialog (item, type) {
         store.dispatch('user/reWorkFresh', false)
         store.dispatch('user/reWorkFresh', false)
-
         if (type == 1) {
         if (type == 1) {
           //证书证明预览
           //证书证明预览
           this.$popupDialog("证书证明预览", "workflow/components/dialog/zsyl", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "76%", true);
           this.$popupDialog("证书证明预览", "workflow/components/dialog/zsyl", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "76%", true);
         } else {
         } 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);
         }
         }
       },
       },
       /**
       /**
@@ -146,37 +130,7 @@
        * @author: renchao
        * @author: renchao
        */
        */
       openInvalidDiglog (item) {
       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((res) => {
-          if (res.code === 200) {
-            this.list();
-            this.$message.success("作废成功");
-            this.invalidDiglog = false;
-            this.zfyy = ''
-            this.openZsylDialog(this.bdcqz);
-          } else {
-            this.$message.error(res.message);
-          }
-        })
+        this.$popupDialog("证书证明打印", "workflow/components/dialog/zsdy", { ...item }, "76%", true);
       },
       },
       /**
       /**
        * @description: openRecordPop
        * @description: openRecordPop
@@ -259,39 +213,6 @@
     padding-top: 8px;
     padding-top: 8px;
     font-size: 16px;
     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 {
   .box-card {
     .szxx_header {
     .szxx_header {
       color: #303133;
       color: #303133;

@@ -66,6 +66,15 @@ export function getForm(tabName, djywbm) {
     case "spyj":
     case "spyj":
       form = require("@/views/workflow/components/spyj.vue");
       form = require("@/views/workflow/components/spyj.vue");
       break;
       break;
+    case "swxx":
+      form = require("@/views/workflow/components/swxx.vue");
+      break;
+    case "sfxx":
+      form = require("@/views/workflow/components/sfxx.vue");
+      break;
+      case "sdqxx":
+      form = require("@/views/workflow/components/sdqxx.vue");
+      break;
     case "zdjbxx":
     case "zdjbxx":
       form = require("@/views/registerBook/zdjbxx.vue");
       form = require("@/views/registerBook/zdjbxx.vue");
       break;
       break;

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

@@ -369,7 +369,7 @@
           :disabled="viewEdit"
           :disabled="viewEdit"
           :gyfs="ruleForm.sldy.gyfs" />
           :gyfs="ruleForm.sldy.gyfs" />
 
 
-        <div v-if="ruleForm.ywrList && ruleForm.qlxx.djlx == '200'">
+        <div v-if="ruleForm.qlxx.djlx == '200'">
           <div class="slxx_title title-block">
           <div class="slxx_title title-block">
             义务人信息
             义务人信息
             <div class="triangle"></div>
             <div class="triangle"></div>
@@ -379,7 +379,7 @@
             @upDateQlrxxList="upDateYwrxxList"
             @upDateQlrxxList="upDateYwrxxList"
             :tableData="ruleForm.ywrList"
             :tableData="ruleForm.ywrList"
             :disabled="viewEdit"
             :disabled="viewEdit"
-            :gyfs="ruleForm.sldy.gyfs" />
+             />
         </div>
         </div>
         <div class="slxx_title title-block">
         <div class="slxx_title title-block">
           登记原因
           登记原因

@@ -253,7 +253,17 @@
         </div>
         </div>
         <el-row :gutter="10">
         <el-row :gutter="10">
           <el-col>
           <el-col>
-            <el-form-item label="登记原因：" prop="djyy">
+            <el-form-item v-if="ruleForm.sldy.djlx=='400'" label="注销登记原因：" prop="djyy">
+              <el-input
+                class="textArea"
+                type="textarea"
+                maxlength="500"
+                show-word-limit
+                :disabled="!viewEdit"
+                v-model="ruleForm.ygdj.zxyy">
+              </el-input>
+            </el-form-item>
+            <el-form-item v-else label="登记原因：" prop="djyy">
               <el-input
               <el-input
                 class="textArea"
                 class="textArea"
                 type="textarea"
                 type="textarea"

@@ -268,14 +268,25 @@
         </div>
         </div>
         <el-row :gutter="10">
         <el-row :gutter="10">
           <el-col>
           <el-col>
-            <el-form-item label="登记原因：" prop="djyy">
+            <el-form-item v-if="ruleForm.sldy.djlx=='400'" label="注销登记原因：" prop="djyy">
               <el-input
               <el-input
                 class="textArea"
                 class="textArea"
                 type="textarea"
                 type="textarea"
                 maxlength="500"
                 maxlength="500"
                 show-word-limit
                 show-word-limit
                 :disabled="!viewEdit"
                 :disabled="!viewEdit"
-                v-model="ruleForm.ygdj.djyy"></el-input>
+                v-model="ruleForm.ygdj.zxyy">
+              </el-input>
+            </el-form-item>
+            <el-form-item v-else label="登记原因：" prop="djyy">
+              <el-input
+                class="textArea"
+                type="textarea"
+                maxlength="500"
+                show-word-limit
+                :disabled="!viewEdit"
+                v-model="ruleForm.ygdj.djyy">
+              </el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
         </el-row>
         </el-row>

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-08-29 08:52:44
+ * @LastEditTime: 2023-09-05 11:32:50
 -->
 -->
 <template>
 <template>
   <div class="from-clues">
   <div class="from-clues">
@@ -58,7 +58,7 @@
   import { ywPopupDialog } from "@/utils/popup.js";
   import { ywPopupDialog } from "@/utils/popup.js";
   import { selectLq } from "@/api/ywsq.js";
   import { selectLq } from "@/api/ywsq.js";
   import { startBusinessFlow } from "@/api/workFlow.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";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
   export default {
   export default {
     mixins: [table, jump],
     mixins: [table, jump],

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

@@ -96,7 +96,7 @@ export function queueDjywmc (djywbm, djqxbm) {
         // case "C40400": //一并申请注销
         // case "C40400": //一并申请注销
         //     vm = "selectYbbg";
         //     vm = "selectYbbg";
         //     break;
         //     break;
-        case "C04372": //一并国有房屋变更
+        //case "C04372": //一并国有房屋变更
         case "C04371": //一并国有房屋转移
         case "C04371": //一并国有房屋转移
             vm = "selectYbgybg";
             vm = "selectYbgybg";
             break;
             break;