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

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

@@ -2,24 +2,46 @@
   <div class="from-clues">
     <!-- 表单部分 -->
     <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-col :span="5">
             <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-form-item>
           </el-col>
           <el-col :span="5">
             <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-form-item>
           </el-col>
 
           <el-col :span="14" class="btnColRight">
             <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-form-item>
           </el-col>
@@ -27,10 +49,19 @@
       </el-form>
     </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>
     </div>
   </div>
@@ -44,13 +75,13 @@ import { getJtfcPage } from "@/api/jtfc";
 export default {
   name: "dydjb",
   mixins: [table],
-  mounted () {
+  mounted() {
     sendThis(this);
   },
   computed: {
     ...mapGetters(["dictData"]),
   },
-  data () {
+  data() {
     return {
       queryForm: {
         cxbh: "",
@@ -64,36 +95,37 @@ export default {
     };
   },
   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;
           this.tableData.data = records;
           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", {
-        btnShow: true,
         height: "800px",
         formData: {
           sqcxdata: scope.row,
         },
-        cancel: function () { }, //取消事件的回调
-        confirm: function () {
-        }
-      })
+        cancel: function () {}, //取消事件的回调
+        confirm: function () {},
+      });
     },
-    queryClick () {
-      this.fetchData();
-    }
-  }
-}
+    handleSort(name, sort) {
+      console.log(name, sort);
+    },
+  },
+};
 </script>
 <style scoped lang="scss">
 @import "~@/styles/public.scss";

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

@@ -2,32 +2,59 @@
   <div class="from-clues">
     <!-- 家庭房产 -->
     <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-col :span="5">
             <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-form-item>
           </el-col>
           <el-col :span="5">
             <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-form-item>
           </el-col>
           <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-col>
         </el-row>
       </el-form>
     </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>
     </div>
     <addjtfc v-model="isDialog" />
@@ -42,10 +69,10 @@ export default {
   name: "jtfc",
   components: { addjtfc },
   mixins: [table],
-  mounted () {
+  mounted() {
     sendThis(this);
   },
-  data () {
+  data() {
     return {
       isDialog: false,
       sqrOption: [],
@@ -59,29 +86,33 @@ export default {
         columns: datas.columns(),
         data: [],
       },
-
     };
   },
   methods: {
-    queryClick () {
+    //查询
+    queryClick() {
       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;
           this.tableData.data = records;
           this.tableData.total = total;
+        }
       });
     },
-    handleSort (name, sort) {
+    handleSort(name, sort) {
       console.log(name, sort);
     },
-    handleAdd () {
+    handleAdd() {
       this.isDialog = true;
-    }
-  }
-}
+    },
+  },
+};
 </script>
 <style scoped lang="scss">
 @import "~@/styles/public.scss";

@@ -2,23 +2,45 @@
   <div class="from-clues">
     <!-- 表单部分 -->
     <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-col :span="5">
             <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-form-item>
           </el-col>
           <el-col :span="5">
             <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-form-item>
           </el-col>
           <el-col :span="14" class="btnColRight">
             <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-form-item>
           </el-col>
@@ -26,10 +48,19 @@
       </el-form>
     </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>
     </div>
   </div>
@@ -41,10 +72,10 @@ import { getJtfcPage } from "@/api/jtfc";
 export default {
   name: "sqcxjl",
   mixins: [table],
-  mounted () {
+  mounted() {
     sendThis(this);
   },
-  data () {
+  data() {
     return {
       queryForm: {
         cxbh: "",
@@ -58,41 +89,38 @@ export default {
     };
   },
   methods: {
-    queryClick () {
+    queryClick() {
       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;
           this.tableData.data = records;
           this.tableData.total = total;
+        }
       });
     },
-    handleSort (name, sort) {
+    handleSort(name, sort) {
       console.log(name, sort);
     },
     // 查看
-    handleViewClick (scope) {
+    handleViewClick(scope) {
       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: {
           sqcxBsm: sqcxBsm,
         },
-        cancel: function () { }, //取消事件的回调
-        confirm: function () {
-          // that.loadBdcdylist();
-        }, //确认事件的回调
-      })
-    }
-  }
-}
+        cancel: function () {}, //取消事件的回调
+        confirm: function () {},
+      });
+    },
+  },
+};
 </script>
 <style scoped lang="scss">
 @import "~@/styles/public.scss";