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

@@ -224,9 +224,9 @@ export default {
       }
       }
 
 
       &.active {
       &.active {
-        background-color: #42b983;
+        background-color: #0794FF;
         color: #fff;
         color: #fff;
-        border-color: #42b983;
+        border-color: #0794FF;
 
 
         &::before {
         &::before {
           content: '';
           content: '';

@@ -3,12 +3,12 @@ import Loading from '@/components/loading/index.js';
 let loading
 let loading
 
 
 // loading开始 方法
 // loading开始 方法
-function startLoading (target, loadingText = '正在加载中...') {
+function startLoading (loadingText = '正在加载中...') {
   loading = Loading.service({
   loading = Loading.service({
     text: loadingText,
     text: loadingText,
     spinner: 'el-icon-loading',
     spinner: 'el-icon-loading',
     background: 'rgba(255, 255, 255, 0.5)',
     background: 'rgba(255, 255, 255, 0.5)',
-    target: target ? '#' + target : 'body'
+    target: document.querySelector('.loadingtext')
   })
   })
 }
 }
 
 

@@ -2,24 +2,46 @@
   <div class="from-clues">
   <div class="from-clues">
     <!-- 表单部分 -->
     <!-- 表单部分 -->
     <div class="from-clues-header">
     <div class="from-clues-header">
-      <el-form :model="queryForm" ref="queryForm" @submit.native.prevent label-width="70px">
+      <el-form
+        :model="queryForm"
+        ref="queryForm"
+        @submit.native.prevent
+        label-width="70px"
+      >
         <el-row>
         <el-row>
           <el-col :span="5">
           <el-col :span="5">
             <el-form-item label="查询编号">
             <el-form-item label="查询编号">
-              <el-input placeholder="请输入编号" v-model="queryForm.cxbh" class="width100" clearable @clear="queryClick()">
+              <el-input
+                placeholder="请输入编号"
+                v-model="queryForm.cxbh"
+                class="width100"
+                clearable
+                @clear="queryClick()"
+              >
               </el-input>
               </el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="5">
           <el-col :span="5">
             <el-form-item label="申请人">
             <el-form-item label="申请人">
-              <el-input placeholder="请输入申请人" v-model="queryForm.sqr" class="width100" @clear="queryClick()" clearable>
+              <el-input
+                placeholder="请输入申请人"
+                v-model="queryForm.sqr"
+                class="width100"
+                @clear="queryClick()"
+                clearable
+              >
               </el-input>
               </el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
 
 
           <el-col :span="14" class="btnColRight">
           <el-col :span="14" class="btnColRight">
             <el-form-item>
             <el-form-item>
-              <el-button type="primary" native-type="submit" @click="queryClick()">查询</el-button>
+              <el-button
+                type="primary"
+                native-type="submit"
+                @click="queryClick()"
+                >查询</el-button
+              >
               <el-button @click="moreQueryClick()">高级查询</el-button>
               <el-button @click="moreQueryClick()">高级查询</el-button>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
@@ -27,10 +49,19 @@
       </el-form>
       </el-form>
     </div>
     </div>
     <!-- 表格 -->
     <!-- 表格 -->
-    <div class="from-clues-content">
-      <lb-table :page-size="pageData.size" id="dydjb" border @sort-change="handleSort"
-        :current-page.sync="pageData.current" :total="tableData.total" @size-change="handleSizeChange"
-        @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
+    <div class="from-clues-content" id="divcontentid">
+      <lb-table
+        :page-size="pageData.size"
+        id="dydjb"
+        border
+        @sort-change="handleSort"
+        :current-page.sync="pageData.current"
+        :total="tableData.total"
+        @size-change="handleSizeChange"
+        @p-current-change="handleCurrentChange"
+        :column="tableData.columns"
+        :data="tableData.data"
+      >
       </lb-table>
       </lb-table>
     </div>
     </div>
   </div>
   </div>
@@ -44,13 +75,13 @@ import { getJtfcPage } from "@/api/jtfc";
 export default {
 export default {
   name: "dydjb",
   name: "dydjb",
   mixins: [table],
   mixins: [table],
-  mounted () {
+  mounted() {
     sendThis(this);
     sendThis(this);
   },
   },
   computed: {
   computed: {
     ...mapGetters(["dictData"]),
     ...mapGetters(["dictData"]),
   },
   },
-  data () {
+  data() {
     return {
     return {
       queryForm: {
       queryForm: {
         cxbh: "",
         cxbh: "",
@@ -64,36 +95,37 @@ export default {
     };
     };
   },
   },
   methods: {
   methods: {
+    //查询
+    queryClick() {
+      this.fetchData();
+    },
     // 初始化数据
     // 初始化数据
-    fetchData () {
-      getJtfcPage({ ...this.queryForm, ...this.pageData }, { 'target': '#dydjb' }).then((res) => {
+    fetchData() {
+      this.$startLoading("divcontentid");
+      getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => {
+        this.$endLoading();
+        if (res.code === 200) {
           let { records, total } = res.result;
           let { records, total } = res.result;
           this.tableData.data = records;
           this.tableData.data = records;
           this.tableData.total = total;
           this.tableData.total = total;
+        }
       });
       });
     },
     },
-    handleSort (name, sort) {
-      console.log(name, sort);
-    },
-
-    dydjbClick (scope) {
-      // var sqcxBsm = scope.row.bsmSqcx; 
+    dydjbClick(scope) {
       this.$popup("打印登记薄", "sqcx/dydjb/components/dydjbInfo", {
       this.$popup("打印登记薄", "sqcx/dydjb/components/dydjbInfo", {
-        btnShow: true,
         height: "800px",
         height: "800px",
         formData: {
         formData: {
           sqcxdata: scope.row,
           sqcxdata: scope.row,
         },
         },
-        cancel: function () { }, //取消事件的回调
-        confirm: function () {
-        }
-      })
+        cancel: function () {}, //取消事件的回调
+        confirm: function () {},
+      });
     },
     },
-    queryClick () {
-      this.fetchData();
-    }
-  }
-}
+    handleSort(name, sort) {
+      console.log(name, sort);
+    },
+  },
+};
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">
 @import "~@/styles/public.scss";
 @import "~@/styles/public.scss";

@@ -130,7 +130,6 @@ export default {
       }
       }
     },
     },
     queryChick () {      
     queryChick () {      
-      debugger;
       this.addJtfc.djSqcxDO = { ...this.ruleForm }
       this.addJtfc.djSqcxDO = { ...this.ruleForm }
       // this.$message({
       // this.$message({
       //     type: 'success',
       //     type: 'success',

@@ -2,32 +2,59 @@
   <div class="from-clues">
   <div class="from-clues">
     <!-- 家庭房产 -->
     <!-- 家庭房产 -->
     <div class="from-clues-header">
     <div class="from-clues-header">
-      <el-form :model="queryForm" @submit.native.prevent ref="queryForm" label-width="70px">
+      <el-form
+        :model="queryForm"
+        @submit.native.prevent
+        ref="queryForm"
+        label-width="70px"
+      >
         <el-row>
         <el-row>
           <el-col :span="5">
           <el-col :span="5">
             <el-form-item label="查询编号">
             <el-form-item label="查询编号">
-              <el-input placeholder="请输入查询编号" @clear="queryClick()" v-model="queryForm.cxbh" clearable class="width100">
+              <el-input
+                placeholder="请输入查询编号"
+                @clear="queryClick()"
+                v-model="queryForm.cxbh"
+                clearable
+                class="width100"
+              >
               </el-input>
               </el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="5">
           <el-col :span="5">
             <el-form-item label="申请人">
             <el-form-item label="申请人">
-              <el-input placeholder="请输入申请人" @clear="queryClick()" v-model="queryForm.sqr" clearable class="width100">
+              <el-input
+                placeholder="请输入申请人"
+                @clear="queryClick()"
+                v-model="queryForm.sqr"
+                clearable
+                class="width100"
+              >
               </el-input>
               </el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="14" class="btnColRight">
           <el-col :span="14" class="btnColRight">
-            <el-button type="primary" native-type="submit" @click="queryClick()">查询</el-button>
+            <el-button type="primary" native-type="submit" @click="queryClick()"
+              >查询</el-button
+            >
             <el-button type="primary" @click="handleAdd">新增</el-button>
             <el-button type="primary" @click="handleAdd">新增</el-button>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
       </el-form>
       </el-form>
     </div>
     </div>
     <!-- 表格 -->
     <!-- 表格 -->
-    <div class="from-clues-content">
-      <lb-table :page-size="pageData.size" border id="jtfc" :current-page.sync="pageData.current"
-        :total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
-        :column="tableData.columns" :data="tableData.data">
+    <div class="from-clues-content" id="divcontentid">
+      <lb-table
+        :page-size="pageData.size"
+        border
+        id="jtfc"
+        :current-page.sync="pageData.current"
+        :total="tableData.total"
+        @size-change="handleSizeChange"
+        @p-current-change="handleCurrentChange"
+        :column="tableData.columns"
+        :data="tableData.data"
+      >
       </lb-table>
       </lb-table>
     </div>
     </div>
     <addjtfc v-model="isDialog" />
     <addjtfc v-model="isDialog" />
@@ -42,10 +69,10 @@ export default {
   name: "jtfc",
   name: "jtfc",
   components: { addjtfc },
   components: { addjtfc },
   mixins: [table],
   mixins: [table],
-  mounted () {
+  mounted() {
     sendThis(this);
     sendThis(this);
   },
   },
-  data () {
+  data() {
     return {
     return {
       isDialog: false,
       isDialog: false,
       sqrOption: [],
       sqrOption: [],
@@ -59,29 +86,33 @@ export default {
         columns: datas.columns(),
         columns: datas.columns(),
         data: [],
         data: [],
       },
       },
-
     };
     };
   },
   },
   methods: {
   methods: {
-    queryClick () {
+    //查询
+    queryClick() {
       this.fetchData();
       this.fetchData();
     },
     },
     // 初始化数据
     // 初始化数据
-    fetchData () {
-      getJtfcPage({ ...this.queryForm, ...this.pageData }, { 'target': '#jtfc' }).then((res) => {
+    fetchData() {
+      this.$startLoading("divcontentid");
+      getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => {
+        this.$endLoading();
+        if (res.code === 200) {
           let { records, total } = res.result;
           let { records, total } = res.result;
           this.tableData.data = records;
           this.tableData.data = records;
           this.tableData.total = total;
           this.tableData.total = total;
+        }
       });
       });
     },
     },
-    handleSort (name, sort) {
+    handleSort(name, sort) {
       console.log(name, sort);
       console.log(name, sort);
     },
     },
-    handleAdd () {
+    handleAdd() {
       this.isDialog = true;
       this.isDialog = true;
-    }
-  }
-}
+    },
+  },
+};
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">
 @import "~@/styles/public.scss";
 @import "~@/styles/public.scss";

@@ -2,23 +2,45 @@
   <div class="from-clues">
   <div class="from-clues">
     <!-- 表单部分 -->
     <!-- 表单部分 -->
     <div class="from-clues-header">
     <div class="from-clues-header">
-      <el-form :model="queryForm" ref="queryForm" @submit.native.prevent label-width="70px">
+      <el-form
+        :model="queryForm"
+        ref="queryForm"
+        @submit.native.prevent
+        label-width="70px"
+      >
         <el-row>
         <el-row>
           <el-col :span="5">
           <el-col :span="5">
             <el-form-item label="查询编号">
             <el-form-item label="查询编号">
-              <el-input placeholder="请输入编号" @clear="queryClick()" v-model="queryForm.cxbh" class="width100" clearable>
+              <el-input
+                placeholder="请输入编号"
+                @clear="queryClick()"
+                v-model="queryForm.cxbh"
+                class="width100"
+                clearable
+              >
               </el-input>
               </el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="5">
           <el-col :span="5">
             <el-form-item label="申请人">
             <el-form-item label="申请人">
-              <el-input placeholder="请输入申请人" @clear="queryClick()" v-model="queryForm.sqr" class="width100" clearable>
+              <el-input
+                placeholder="请输入申请人"
+                @clear="queryClick()"
+                v-model="queryForm.sqr"
+                class="width100"
+                clearable
+              >
               </el-input>
               </el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="14" class="btnColRight">
           <el-col :span="14" class="btnColRight">
             <el-form-item>
             <el-form-item>
-              <el-button type="primary" native-type="submit" @click="queryClick()">查询</el-button>
+              <el-button
+                type="primary"
+                native-type="submit"
+                @click="queryClick()"
+                >查询</el-button
+              >
               <el-button @click="moreQueryClick()">高级查询</el-button>
               <el-button @click="moreQueryClick()">高级查询</el-button>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
@@ -26,10 +48,19 @@
       </el-form>
       </el-form>
     </div>
     </div>
     <!-- 表格 -->
     <!-- 表格 -->
-    <div class="from-clues-content">
-      <lb-table :page-size="pageData.size" border id="sqcxjl" @sort-change="handleSort"
-        :current-page.sync="pageData.current" :total="tableData.total" @size-change="handleSizeChange"
-        @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
+    <div class="from-clues-content" id="divcontentid">
+      <lb-table
+        :page-size="pageData.size"
+        border
+        id="sqcxjl"
+        @sort-change="handleSort"
+        :current-page.sync="pageData.current"
+        :total="tableData.total"
+        @size-change="handleSizeChange"
+        @p-current-change="handleCurrentChange"
+        :column="tableData.columns"
+        :data="tableData.data"
+      >
       </lb-table>
       </lb-table>
     </div>
     </div>
   </div>
   </div>
@@ -41,10 +72,10 @@ import { getJtfcPage } from "@/api/jtfc";
 export default {
 export default {
   name: "sqcxjl",
   name: "sqcxjl",
   mixins: [table],
   mixins: [table],
-  mounted () {
+  mounted() {
     sendThis(this);
     sendThis(this);
   },
   },
-  data () {
+  data() {
     return {
     return {
       queryForm: {
       queryForm: {
         cxbh: "",
         cxbh: "",
@@ -58,41 +89,38 @@ export default {
     };
     };
   },
   },
   methods: {
   methods: {
-    queryClick () {
+    queryClick() {
       this.fetchData();
       this.fetchData();
     },
     },
     // 初始化数据
     // 初始化数据
-    fetchData () {
-
-      getJtfcPage({ ...this.queryForm, ...this.pageData }, { 'target': '#sqcxjl' }).then((res) => {
+    fetchData() {
+      this.$startLoading("divcontentid");
+      getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => {
+        this.$endLoading();
+        if (res.code === 200) {
           let { records, total } = res.result;
           let { records, total } = res.result;
           this.tableData.data = records;
           this.tableData.data = records;
           this.tableData.total = total;
           this.tableData.total = total;
+        }
       });
       });
     },
     },
-    handleSort (name, sort) {
+    handleSort(name, sort) {
       console.log(name, sort);
       console.log(name, sort);
     },
     },
     // 查看
     // 查看
-    handleViewClick (scope) {
+    handleViewClick(scope) {
       var sqcxBsm = scope.row.bsmSqcx;
       var sqcxBsm = scope.row.bsmSqcx;
-      this.$popup({
-        title: "申请查询记录",
-        width: "85%",
-        btnShow: true,
-        editItem: "sqcx/sqcxjl/components/sqcxjlInfo", // 弹窗内容
-        height: "700px",
+      this.$popup("申请查询记录", "sqcx/sqcxjl/components/sqcxjlInfo", {
+        height: "800px",
         formData: {
         formData: {
           sqcxBsm: sqcxBsm,
           sqcxBsm: sqcxBsm,
         },
         },
-        cancel: function () { }, //取消事件的回调
-        confirm: function () {
-          // that.loadBdcdylist();
-        }, //确认事件的回调
-      })
-    }
-  }
-}
+        cancel: function () {}, //取消事件的回调
+        confirm: function () {},
+      });
+    },
+  },
+};
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">
 @import "~@/styles/public.scss";
 @import "~@/styles/public.scss";

@@ -55,10 +55,11 @@
         </el-row>
         </el-row>
       </el-form>
       </el-form>
     </div>
     </div>
-    <div class="from-clues-content" id="dbx">
-      <lb-table :page-size="pageData.size" border @sort-change="handleSort" :current-page.sync="pageData.currentPage"
-        :heightNum="300" :total="tableData.total" @size-change="handleSizeChange"
-        @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
+    <div class="from-clues-content">
+      <lb-table :page-size="pageData.size" class="loadingtext" border @sort-change="handleSort"
+        :current-page.sync="pageData.currentPage" :heightNum="300" :total="tableData.total"
+        @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
+        :data="tableData.data">
       </lb-table>
       </lb-table>
     </div>
     </div>
     <searchBox v-model="isSearch" @getSearch="getSearch" />
     <searchBox v-model="isSearch" @getSearch="getSearch" />
@@ -70,7 +71,7 @@ import searchBox from '../components/search.vue'
 import table from "@/utils/mixin/table"
 import table from "@/utils/mixin/table"
 import searchMin from "../components/mixin/index"
 import searchMin from "../components/mixin/index"
 import { datas, sendThis } from "./dbxdata"
 import { datas, sendThis } from "./dbxdata"
-import { searchTaskToDo, deleteFlow ,claimTask} from "@/api/ywbl.js"
+import { searchTaskToDo, deleteFlow, claimTask } from "@/api/ywbl.js"
 export default {
 export default {
   name: "dbx",
   name: "dbx",
   components: { searchBox },
   components: { searchBox },
@@ -95,26 +96,12 @@ export default {
   },
   },
   mounted () {
   mounted () {
     sendThis(this);
     sendThis(this);
-    window.addEventListener('visibilitychange', this.init, true)
+    this.queryClick()
   },
   },
-  destroyed () {
-    window.removeEventListener('visibilitychange', this.init, true)
-  },
-  created () { },
   methods: {
   methods: {
-    init (e) {
-      var isHidden = document.hidden;
-      if (isHidden) {//切离该页面时执行
-        //页面切换时，处理逻辑
-      } else {//切换到该页面时执行
-        if (window.location.hash == '#/ywbl/dbx') {
-          this.fetchData()
-        }
-      }
-    },
     // 列表渲染接口
     // 列表渲染接口
-    fetchData () {
-      this.$startLoading('dbx')
+    queryClick () {
+      this.$startLoading()
       searchTaskToDo({ ...this.queryForm, ...this.pageData }).then(res => {
       searchTaskToDo({ ...this.queryForm, ...this.pageData }).then(res => {
         if (res.code === 200) {
         if (res.code === 200) {
           this.$endLoading()
           this.$endLoading()
@@ -132,9 +119,6 @@ export default {
         }
         }
       })
       })
     },
     },
-    queryClick () {
-      this.fetchData()
-    },
     handelItem (index) {
     handelItem (index) {
       console.log(index);
       console.log(index);
       this.searchList.splice(index, 1)
       this.searchList.splice(index, 1)
@@ -142,7 +126,7 @@ export default {
     handleSort (val) {
     handleSort (val) {
       this.queryForm.sortField = val.prop
       this.queryForm.sortField = val.prop
       this.queryForm.sortOrder = val.order == "ascending" ? 'asc' : 'desc'
       this.queryForm.sortOrder = val.order == "ascending" ? 'asc' : 'desc'
-      this.fetchData()
+      this.queryClick()
     },
     },
     del (item) {
     del (item) {
       let formdata = new FormData();
       let formdata = new FormData();
@@ -159,7 +143,7 @@ export default {
               type: 'success',
               type: 'success',
               message: '删除成功!'
               message: '删除成功!'
             });
             });
-            this.fetchData()
+            this.queryClick()
           } else {
           } else {
             this.$message.error(res.message);
             this.$message.error(res.message);
           }
           }
@@ -174,9 +158,8 @@ export default {
     ywhClick (item) {
     ywhClick (item) {
       const { href } = this.$router.resolve('/workFrame?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&sqywbm=' + item.djywbm);
       const { href } = this.$router.resolve('/workFrame?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&sqywbm=' + item.djywbm);
       window.open(href, '_blank');
       window.open(href, '_blank');
-
       //从待办箱进入的调取任务领取接口
       //从待办箱进入的调取任务领取接口
-      claimTask(item.bsmSlsq,item.bestepid)
+      claimTask(item.bsmSlsq, item.bestepid)
     }
     }
   }
   }
 }
 }

@@ -33,14 +33,14 @@
           </el-col>
           </el-col>
           <el-col :span="5">
           <el-col :span="5">
             <el-form-item label="业务号">
             <el-form-item label="业务号">
-              <el-input placeholder="请输入业务号" v-model="queryForm.ywh" @clear="queryClick()" clearable class="width200px">
+              <el-input placeholder="请输入业务号" v-model="queryForm.ywh" @clear="queryClick" clearable class="width200px">
               </el-input>
               </el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
 
 
           <el-col :span="4" class="btnColRight">
           <el-col :span="4" class="btnColRight">
             <el-form-item>
             <el-form-item>
-              <el-button type="primary" native-type="submit" @click="queryClick()">查询</el-button>
+              <el-button type="primary" native-type="submit" @click="queryClick">查询</el-button>
               <el-button @click="moreQueryClick()">高级查询</el-button>
               <el-button @click="moreQueryClick()">高级查询</el-button>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
@@ -60,7 +60,7 @@
     </div>
     </div>
     <!-- 表格 -->
     <!-- 表格 -->
     <div class="from-clues-content">
     <div class="from-clues-content">
-      <lb-table :page-size="pageData.size" id="ybxLoading" :heightNum="300" @sort-change="handleSort" border
+      <lb-table :page-size="pageData.size" class="loadingtext" :heightNum="300" @sort-change="handleSort" border
         :current-page.sync="pageData.current" :total="pageData.total" @size-change="handleSizeChange"
         :current-page.sync="pageData.current" :total="pageData.total" @size-change="handleSizeChange"
         @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
         @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
       </lb-table>
       </lb-table>
@@ -81,6 +81,7 @@ export default {
   mixins: [table, searchMin],
   mixins: [table, searchMin],
   mounted () {
   mounted () {
     sendThis(this);
     sendThis(this);
+    this.queryClick()
   },
   },
   computed: {
   computed: {
     ...mapGetters(['dictData'])
     ...mapGetters(['dictData'])
@@ -106,13 +107,12 @@ export default {
     };
     };
   },
   },
   methods: {
   methods: {
-    init (e) {
-      this.fetchData()
-    },
     // 列表渲染接口
     // 列表渲染接口
-    fetchData () {
+    queryClick () {
+      this.$startLoading()
       searchTaskDone({ ...this.queryForm, ...this.pageData }, { 'target': '#ybxLoading' }).then(res => {
       searchTaskDone({ ...this.queryForm, ...this.pageData }, { 'target': '#ybxLoading' }).then(res => {
         if (res.code === 200) {
         if (res.code === 200) {
+          this.$endLoading()
           let { total, records } = res.result
           let { total, records } = res.result
           this.pageData.total = total;
           this.pageData.total = total;
           records.forEach(item => {
           records.forEach(item => {
@@ -125,13 +125,10 @@ export default {
         }
         }
       })
       })
     },
     },
-    queryClick () {
-      this.fetchData()
-    },
     handleSort (val) {
     handleSort (val) {
       this.queryForm.sortField = val.prop
       this.queryForm.sortField = val.prop
       this.queryForm.sortOrder = val.order == "ascending" ? 'asc' : 'desc'
       this.queryForm.sortOrder = val.order == "ascending" ? 'asc' : 'desc'
-      this.fetchData()
+      this.queryClick()
     },
     },
     ywhClick (item) {
     ywhClick (item) {
       const { href } = this.$router.resolve('/workFrameView?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&viewtype=1');
       const { href } = this.$router.resolve('/workFrameView?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&viewtype=1');

@@ -53,7 +53,6 @@
 </template>
 </template>
 <script>
 <script>
 //查封登记
 //查封登记
-import Cookies from 'js-cookie'
 import { datas, sendThis } from "../javascript/bdcql.js";
 import { datas, sendThis } from "../javascript/bdcql.js";
 import { defaultParameters } from "../javascript/publicDefaultPar.js";
 import { defaultParameters } from "../javascript/publicDefaultPar.js";
 import table from "@/utils/mixin/table";
 import table from "@/utils/mixin/table";
@@ -63,7 +62,12 @@ export default {
   mixins: [table, jump],
   mixins: [table, jump],
   props: {
   props: {
     isJump: { type: Boolean, default: false },
     isJump: { type: Boolean, default: false },
-    djywbm: { type: String, default: '' }
+    djywbm: { type: String, default: '' },
+    djqxObj: {
+      type: Object,
+      default: {}
+    },
+    bsmSqyw: { type: String, default: '' },
   },
   },
   data () {
   data () {
     return {
     return {
@@ -103,10 +107,10 @@ export default {
       }
       }
       if (!this.isJump) {
       if (!this.isJump) {
         startBusinessFlow({
         startBusinessFlow({
-          bsmSqyw: Cookies.get("bsmSqyw"),
+          bsmSqyw: this.bsmSqyw,
           bdcdysz: this.bdcdysz,
           bdcdysz: this.bdcdysz,
-          djqxbm: Cookies.get("djqxObj") ? JSON.parse(Cookies.get("djqxObj"))?.djqxbm : '',
-          djqxmc: Cookies.get("djqxObj") ? JSON.parse(Cookies.get("djqxObj"))?.djqxmc : '',
+          djqxbm: this.djqxObj?.djqxbm,
+          djqxmc: this.djqxObj?.djqxmc
         }).then((res) => {
         }).then((res) => {
           if (res.code == 200) {
           if (res.code == 200) {
             this.$message({
             this.$message({
@@ -146,7 +150,7 @@ export default {
       })
       })
       this.bdcdysz = val
       this.bdcdysz = val
     }
     }
-  },
+  }
 };
 };
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">

@@ -53,7 +53,6 @@
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
-import Cookies from 'js-cookie'
 import { datas, sendThis } from "../javascript/bdcqlMain.js";
 import { datas, sendThis } from "../javascript/bdcqlMain.js";
 import { defaultParameters } from "../javascript/publicDefaultPar.js";
 import { defaultParameters } from "../javascript/publicDefaultPar.js";
 import table from "@/utils/mixin/table";
 import table from "@/utils/mixin/table";
@@ -63,7 +62,12 @@ export default {
   mixins: [table, jump],
   mixins: [table, jump],
   props: {
   props: {
     isJump: { type: Boolean, default: false },
     isJump: { type: Boolean, default: false },
-    djywbm: { type: String, default: '' }
+    djywbm: { type: String, default: '' },
+    djqxObj: {
+      type: Object,
+      default: {}
+    },
+    bsmSqyw: { type: String, default: '' }
   },
   },
   data () {
   data () {
     return {
     return {
@@ -101,10 +105,10 @@ export default {
         return;
         return;
       }
       }
       startBusinessFlow({
       startBusinessFlow({
-        bsmSqyw: Cookies.get("bsmSqyw"),
+        bsmSqyw: this.bsmSqyw,
         bdcdysz: this.bdcdysz,
         bdcdysz: this.bdcdysz,
-        djqxbm: Cookies.get("djqxObj") ? JSON.parse(Cookies.get("djqxObj"))?.djqxbm : '',
-        djqxmc: Cookies.get("djqxObj") ? JSON.parse(Cookies.get("djqxObj"))?.djqxmc : '',
+        djqxbm: this.djqxObj?.djqxbm,
+        djqxmc: this.djqxObj?.djqxmc
       }).then((res) => {
       }).then((res) => {
         if (res.code == 200) {
         if (res.code == 200) {
           this.jump(res.result)
           this.jump(res.result)

@@ -53,7 +53,6 @@
 </template>
 </template>
 <script>
 <script>
 //查封登记
 //查封登记
-import Cookies from 'js-cookie'
 import { datas, sendThis } from "../javascript/cfdj.js";
 import { datas, sendThis } from "../javascript/cfdj.js";
 import { defaultParameters } from "../javascript/publicDefaultPar.js";
 import { defaultParameters } from "../javascript/publicDefaultPar.js";
 import table from "@/utils/mixin/table";
 import table from "@/utils/mixin/table";
@@ -62,7 +61,12 @@ import { selectCfdj, startBusinessFlow, choiceBdcdy } from "@/api/ywbl.js";
 export default {
 export default {
   props: {
   props: {
     isJump: { type: Boolean, default: false },
     isJump: { type: Boolean, default: false },
-    djywbm: { type: String, default: '' }
+    djywbm: { type: String, default: '' },
+    djqxObj: {
+      type: Object,
+      default: {}
+    },
+    bsmSqyw: { type: String, default: '' },
   },
   },
   mixins: [table, jump],
   mixins: [table, jump],
   data () {
   data () {
@@ -102,10 +106,10 @@ export default {
       }
       }
       if (!this.isJump) {
       if (!this.isJump) {
         startBusinessFlow({
         startBusinessFlow({
-          bsmSqyw: Cookies.get("bsmSqyw"),
+          bsmSqyw: this.bsmSqyw,
           bdcdysz: this.bdcdysz,
           bdcdysz: this.bdcdysz,
-          djqxbm: Cookies.get("djqxObj") ? JSON.parse(Cookies.get("djqxObj"))?.djqxbm : '',
-          djqxmc: Cookies.get("djqxObj") ? JSON.parse(Cookies.get("djqxObj"))?.djqxmc : '',
+          djqxbm: this.djqxObj?.djqxbm,
+          djqxmc: this.djqxObj?.djqxmc
         }).then((res) => {
         }).then((res) => {
           if (res.code == 200) {
           if (res.code == 200) {
             this.$message({
             this.$message({

@@ -65,7 +65,12 @@ export default {
   mixins: [table, jump],
   mixins: [table, jump],
   props: {
   props: {
     isJump: { type: Boolean, default: false },
     isJump: { type: Boolean, default: false },
-    djywbm: { type: String, default: '' }
+    djywbm: { type: String, default: '' },
+    djqxObj: {
+      type: Object,
+      default: {}
+    },
+    bsmSqyw: { type: String, default: '' },
   },
   },
   data () {
   data () {
     return {
     return {
@@ -94,7 +99,7 @@ export default {
           this.tableData.total = total;
           this.tableData.total = total;
           this.tableData.data = records;
           this.tableData.data = records;
         }
         }
-      });
+      })
     },
     },
     submitForm () {
     submitForm () {
       if (this.bdcdysz.length == 0) {
       if (this.bdcdysz.length == 0) {
@@ -102,10 +107,10 @@ export default {
         return;
         return;
       }
       }
       startBusinessFlow({
       startBusinessFlow({
-        bsmSqyw: Cookies.get("bsmSqyw"),
+        bsmSqyw: this.bsmSqyw,
         bdcdysz: this.bdcdysz,
         bdcdysz: this.bdcdysz,
-        djqxbm: Cookies.get("djqxObj") ? JSON.parse(Cookies.get("djqxObj"))?.djqxbm : '',
-        djqxmc: Cookies.get("djqxObj") ? JSON.parse(Cookies.get("djqxObj"))?.djqxmc : '',
+        djqxbm: this.djqxObj?.djqxbm,
+        djqxmc: this.djqxObj?.djqxmc
       }).then((res) => {
       }).then((res) => {
         if (res.code == 200) {
         if (res.code == 200) {
           this.$message({
           this.$message({
@@ -129,8 +134,7 @@ export default {
         item.ybdcqzsh = item.bdcqzh
         item.ybdcqzsh = item.bdcqzh
       })
       })
       this.bdcdysz = val;
       this.bdcdysz = val;
-    },
-
+    }
   }
   }
 }
 }
 </script>
 </script>

@@ -68,7 +68,6 @@
 </template>
 </template>
 <script>
 <script>
 //国有建设用地使用权/房屋使用权
 //国有建设用地使用权/房屋使用权
-import Cookies from 'js-cookie'
 import { datas, sendThis } from "../javascript/fwsyq.js";
 import { datas, sendThis } from "../javascript/fwsyq.js";
 import table from "@/utils/mixin/table";
 import table from "@/utils/mixin/table";
 import jump from "@/views/ywbl/ywsq/components/mixin/jump";
 import jump from "@/views/ywbl/ywsq/components/mixin/jump";
@@ -78,7 +77,12 @@ export default {
   mixins: [table, jump],
   mixins: [table, jump],
   props: {
   props: {
     isJump: { type: Boolean, default: false },
     isJump: { type: Boolean, default: false },
-    djywbm: { type: String, default: '' }
+    djywbm: { type: String, default: '' },
+    djqxObj: {
+      type: Object,
+      default: {}
+    },
+    bsmSqyw: { type: String, default: '' },
   },
   },
   data () {
   data () {
     return {
     return {
@@ -150,11 +154,11 @@ export default {
       }
       }
       if (!this.isJump) {
       if (!this.isJump) {
         startBusinessFlow({
         startBusinessFlow({
-          bsmSqyw: Cookies.get("bsmSqyw"),
+          bsmSqyw: this.bsmSqyw,
           fwlx: this.activeName,
           fwlx: this.activeName,
           bdcdysz: this.bdcdysz,
           bdcdysz: this.bdcdysz,
-          djqxbm: Cookies.get("djqxObj") ? JSON.parse(Cookies.get("djqxObj"))?.djqxbm : '',
-          djqxmc: Cookies.get("djqxObj") ? JSON.parse(Cookies.get("djqxObj"))?.djqxmc : '',
+          djqxbm: this.djqxObj?.djqxbm,
+          djqxmc: this.djqxObj?.djqxmc
         }).then((res) => {
         }).then((res) => {
           if (res.code == 200) {
           if (res.code == 200) {
             this.$message({
             this.$message({
@@ -189,14 +193,11 @@ export default {
       this.bdcdysz = val
       this.bdcdysz = val
     },
     },
     handleLpbClick (item) {
     handleLpbClick (item) {
-      console.log(item, 'eeeeeeeeeeeeee');
       this.$popup('楼盘表', 'components/bjlp/index', {
       this.$popup('楼盘表', 'components/bjlp/index', {
         width: '85%',
         width: '85%',
         formData: {
         formData: {
           bsm: item.bsm
           bsm: item.bsm
-        },
-        cancel: function () { }, //取消事件的回调
-        confirm: function () { }, //确认事件的回调
+        }
       })
       })
     }
     }
   }
   }

@@ -39,7 +39,6 @@
 </template>
 </template>
 <script>
 <script>
 //首次登记
 //首次登记
-import Cookies from 'js-cookie'
 import { datas, sendThis } from "../javascript/jsydsyq100.js";
 import { datas, sendThis } from "../javascript/jsydsyq100.js";
 import { defaultParameters } from "../javascript/publicDefaultPar.js";
 import { defaultParameters } from "../javascript/publicDefaultPar.js";
 import table from "@/utils/mixin/table";
 import table from "@/utils/mixin/table";
@@ -50,7 +49,12 @@ export default {
   mixins: [table, jump],
   mixins: [table, jump],
   props: {
   props: {
     isJump: { type: Boolean, default: false },
     isJump: { type: Boolean, default: false },
-    djywbm: { type: String, default: '' }
+    djywbm: { type: String, default: '' },
+    djqxObj: {
+      type: Object,
+      default: {}
+    },
+    bsmSqyw: { type: String, default: '' },
   },
   },
   data () {
   data () {
     return {
     return {
@@ -75,7 +79,6 @@ export default {
     },
     },
     fetchData () {
     fetchData () {
       this.queryForm.sqywbm = this.djywbm;
       this.queryForm.sqywbm = this.djywbm;
-
       selectZdjbxx({ ...this.queryForm, ...this.pageData }).then((res) => {
       selectZdjbxx({ ...this.queryForm, ...this.pageData }).then((res) => {
         if (res.code === 200) {
         if (res.code === 200) {
           let { total, records } = res.result;
           let { total, records } = res.result;
@@ -90,10 +93,10 @@ export default {
         return;
         return;
       }
       }
       startBusinessFlow({
       startBusinessFlow({
-        bsmSqyw: Cookies.get("bsmSqyw"),
+        bsmSqyw: this.bsmSqyw,
         bdcdysz: this.bdcdysz,
         bdcdysz: this.bdcdysz,
-        djqxbm: Cookies.get("djqxObj") ? JSON.parse(Cookies.get("djqxObj"))?.djqxbm : '',
-        djqxmc: Cookies.get("djqxObj") ? JSON.parse(Cookies.get("djqxObj"))?.djqxmc : '',
+        djqxbm: this.djqxObj?.djqxbm,
+        djqxmc: this.djqxObj?.djqxmc
       }).then((res) => {
       }).then((res) => {
         if (res.code == 200) {
         if (res.code == 200) {
           this.$message({
           this.$message({
@@ -109,11 +112,11 @@ export default {
         } else {
         } else {
           this.$message.error(res.message);
           this.$message.error(res.message);
         }
         }
-      });
+      })
     },
     },
     handleSelectionChange (val) {
     handleSelectionChange (val) {
       this.bdcdysz = val;
       this.bdcdysz = val;
-    },
+    }
   }
   }
 }
 }
 </script>
 </script>
@@ -121,3 +124,4 @@ export default {
 @import "~@/styles/mixin.scss";
 @import "~@/styles/mixin.scss";
 @import "~@/styles/public.scss";
 @import "~@/styles/public.scss";
 </style>
 </style>
+

@@ -53,7 +53,6 @@
 </template>
 </template>
 <script>
 <script>
 //首次登记
 //首次登记
-import Cookies from 'js-cookie'
 import { datas, sendThis } from "../javascript/jsydsyq200.js";
 import { datas, sendThis } from "../javascript/jsydsyq200.js";
 import { defaultParameters } from "../javascript/publicDefaultPar.js";
 import { defaultParameters } from "../javascript/publicDefaultPar.js";
 import table from "@/utils/mixin/table";
 import table from "@/utils/mixin/table";
@@ -64,7 +63,12 @@ export default {
   mixins: [table, jump],
   mixins: [table, jump],
   props: {
   props: {
     isJump: { type: Boolean, default: false },
     isJump: { type: Boolean, default: false },
-    djywbm: { type: String, default: '' }
+    djywbm: { type: String, default: '' },
+    djqxObj: {
+      type: Object,
+      default: {}
+    },
+    bsmSqyw: { type: String, default: '' },
   },
   },
   data () {
   data () {
     return {
     return {
@@ -93,7 +97,7 @@ export default {
           this.tableData.total = total;
           this.tableData.total = total;
           this.tableData.data = records;
           this.tableData.data = records;
         }
         }
-      });
+      })
     },
     },
     submitForm () {
     submitForm () {
       if (this.bdcdysz.length == 0) {
       if (this.bdcdysz.length == 0) {
@@ -101,10 +105,10 @@ export default {
         return;
         return;
       }
       }
       startBusinessFlow({
       startBusinessFlow({
-        bsmSqyw: Cookies.get("bsmSqyw"),
+        bsmSqyw: this.bsmSqyw,
         bdcdysz: this.bdcdysz,
         bdcdysz: this.bdcdysz,
-        djqxbm: Cookies.get("djqxObj") ? JSON.parse(Cookies.get("djqxObj"))?.djqxbm : '',
-        djqxmc: Cookies.get("djqxObj") ? JSON.parse(Cookies.get("djqxObj"))?.djqxmc : '',
+        djqxbm: this.djqxObj?.djqxbm,
+        djqxmc: this.djqxObj?.djqxmc
       }).then((res) => {
       }).then((res) => {
         if (res.code == 200) {
         if (res.code == 200) {
           this.$message({
           this.$message({
@@ -120,7 +124,7 @@ export default {
         } else {
         } else {
           this.$message.error(res.message);
           this.$message.error(res.message);
         }
         }
-      });
+      })
     },
     },
     handleSelectionChange (val) {
     handleSelectionChange (val) {
       val.forEach((item, index) => {
       val.forEach((item, index) => {
@@ -131,22 +135,9 @@ export default {
     },
     },
     openBook (row) {
     openBook (row) {
       var param = { bdcdyid: row.bdcdyid, qllx: row.qllx, bdcdyh: row.bdcdyh, bsmQlxx: row.bsmQlxx };
       var param = { bdcdyid: row.bdcdyid, qllx: row.qllx, bdcdyh: row.bdcdyh, bsmQlxx: row.bsmQlxx };
-      this.$popup({
-        titleStyle: "left",
-        title: "登记簿详情", // 弹窗标题
-        editItem: "registerBook/djbFrame", // 弹窗内容
-        formData: param,
-        width: "1220px",
-        height: "790px",
-        // cancelText: '取消摆烂', // 右边按钮文本
-        // confirmText: '确定点击', //左边按钮文本
-        cancel: () => {
-          console.log("取消回调");
-        },
-        confirm: () => {
-          console.log("确认回调");
-        },
-      });
+      this.$popup('登记簿详情', 'registerBook/djbFrame', {
+        formData: param
+      })
     }
     }
   }
   }
 }
 }

 <template>
 <template>
   <dialogBox title="查询权利信息" width="85%" :isButton="false" :isMain="true" @closeDialog="closeDialog" v-model="myValue">
   <dialogBox title="查询权利信息" width="85%" :isButton="false" :isMain="true" @closeDialog="closeDialog" v-model="myValue">
-    <component :is="editItem" @closeDialog="closeDialog" :isJump="isJump" id="slectBdc" @updateDialog="updateDialog"
-      :djywbm="djywbm" :key="key" />
+    <component :is="editItem" @closeDialog="closeDialog" v-bind="$attrs" :isJump="isJump" id="slectBdc"
+      @updateDialog="updateDialog" :djywbm="djywbm" :key="key" />
   </dialogBox>
   </dialogBox>
 </template>
 </template>
 <script>
 <script>
@@ -16,7 +16,7 @@ export default {
     return {
     return {
       key: 0,
       key: 0,
       editItem: '',
       editItem: '',
-      myValue: this.value,
+      myValue: this.value
     }
     }
   },
   },
   watch: {
   watch: {
@@ -24,12 +24,12 @@ export default {
       this.myValue = val
       this.myValue = val
       this.key++
       this.key++
       if (this.$route.query.sqywbm) {
       if (this.$route.query.sqywbm) {
-        let dd = queueDjywmc(this.$route.query.sqywbm, { 'target': '#slectBdc' })
+        let dd = queueDjywmc(this.$route.query.sqywbm)
         this.editItem = this.loadView(dd)
         this.editItem = this.loadView(dd)
       }
       }
     },
     },
     'djywbm' (val) {
     'djywbm' (val) {
-      let dd = queueDjywmc(val, { 'target': '#slectBdc' })
+      let dd = queueDjywmc(val)
       this.editItem = this.loadView(dd)
       this.editItem = this.loadView(dd)
     }
     }
   },
   },

@@ -66,7 +66,7 @@
         <el-button type="primary" :disabled="btnDisabled" @click="bthSelectClick">选择不动产</el-button>
         <el-button type="primary" :disabled="btnDisabled" @click="bthSelectClick">选择不动产</el-button>
       </div>
       </div>
     </div>
     </div>
-    <fqsqDialog v-model="isDialog" :djywbm="djywbm"/>
+    <fqsqDialog v-model="isDialog" :djqxObj="djqxObj" :bsmSqyw="bsmSqyw" :djywbm="djywbm" />
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
@@ -87,7 +87,13 @@ export default {
       djqxList: [],
       djqxList: [],
       isDialog: false,
       isDialog: false,
       btnDisabled: true,
       btnDisabled: true,
-      djywbm: ''
+      djywbm: '',
+
+      djqxObj: {
+        djqxbm: '',
+        djqxmc: ''
+      },
+      bsmSqyw: ''
     }
     }
   },
   },
   components: {
   components: {
@@ -122,13 +128,12 @@ export default {
         this.$set(item, 'cselect', false)
         this.$set(item, 'cselect', false)
       })
       })
       item.cselect = true
       item.cselect = true
-      Cookies.set("djqxObj", JSON.stringify({
-        'djqxbm': item.nodecode,
-        'djqxmc': item.nodename
-      }))
+      this.djqxObj.djqxbm = item.nodecode
+      this.djqxObj.djqxmc = item.djqxmc
+
       if (item.sffqlc == '1') {
       if (item.sffqlc == '1') {
         this.btnDisabled = false
         this.btnDisabled = false
-        Cookies.set("bsmSqyw", item.bsmSqyw)
+        this.bsmSqyw = item.bsmSqyw
         this.djywbm = item.djywbm
         this.djywbm = item.djywbm
         console.log(this.djywbm, 'this.djywbm');
         console.log(this.djywbm, 'this.djywbm');
       }
       }

@@ -118,7 +118,7 @@ export default {
     handleLpbClick (item) {
     handleLpbClick (item) {
       this.$popup('楼盘表', 'components/bjlp/index', {
       this.$popup('楼盘表', 'components/bjlp/index', {
         width: '90%',
         width: '90%',
-        height: "90%",
+        height: "92%",
         formData: {
         formData: {
           bsm: ''
           bsm: ''
         }
         }

@@ -99,36 +99,23 @@ export default {
 
 
     //打开楼盘表
     //打开楼盘表
     openlpbClick (scope) {
     openlpbClick (scope) {
-      debugger;
-      var zrzbsm = scope.row.bsm;
-
-      let that = this;
-      this.$popup({
-        title: "楼盘表",
-        width: "50%",
-        btnShow: true,
-        editItem: "xxxxxxxxxx",
-        height: "600px",
+      // var zrzbsm = scope.row.bsm;
+      this.$popup('楼盘表', 'components/bjlp/index', {
+        width: '90%',
+        height: "92%",
         formData: {
         formData: {
-          bsmSlsq: this.bsmSlsq,
-          dataList: this.unitData,
-        },
-        cancel: function () { }, //取消事件的回调
-        confirm: function () {
-          that.loadBdcdylist();
-        }, //确认事件的回调
-      });
-
-
-      getLpb({ zrzbsm: zrzbsm })
-        .then((res) => {
-          if (res.code == 200) {
-            var lpbdata = res.result;
+          bsm: ''
         }
         }
       })
       })
-        .catch((error) => {
-          console.log(error);
-        });
+      // getLpb({ zrzbsm: zrzbsm })
+      //   .then((res) => {
+      //     if (res.code == 200) {
+      //       var lpbdata = res.result;
+      //     }
+      //   })
+      //   .catch((error) => {
+      //     console.log(error);
+      //   });
     },
     },
   },
   },
 };
 };