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

+import request from '@/utils/request'
+// 根据条件进行列表查询
+export function getJtfcPage (data) {
+  return request({
+    url: '/sqcx/jtfc/getJtfcPage',
+    method: 'post',
+    data
+  })
+}
+// 新增申请查询家庭房产信息
+export function addJtfcCxjgXx (data) {
+  return request({
+    url: '/sqcx/jtfc/addJtfcCxjgXx',
+    method: 'post',
+    data,
+    showLoading: true,
+    loadingTarget: '正在查询中...'
+  })
+}
\ No newline at end of file

-import request from '@/utils/request'
-// 根据条件进行列表查询
-export function getJtfcPage (data) {
-  return request({
-    url: '/sqcx/getJtfcPage',
-    method: 'post',
-    data
-  })
-}
-// 新增申请查询家庭房产信息
-export function addJtfcCxjgXx (data) {
-  return request({
-    url: '/sqcx/addJtfcCxjgXx',
-    method: 'post',
-    data,
-    showLoading: true,
-    loadingTarget: '正在查询中...'
-  })
-}
\ No newline at end of file
+// import request from '@/utils/request'
+// // 根据条件进行列表查询
+// export function getJtfcPage (data) {
+//   return request({
+//     url: '/sqcx/getJtfcPage',
+//     method: 'post',
+//     data
+//   })
+// }
+// // 新增申请查询家庭房产信息
+// export function addJtfcCxjgXx (data) {
+//   return request({
+//     url: '/sqcx/addJtfcCxjgXx',
+//     method: 'post',
+//     data,
+//     showLoading: true,
+//     loadingTarget: '正在查询中...'
+//   })
+// }
\ No newline at end of file

@@ -46,7 +46,7 @@
 
 
 <script>
 <script>
 import personInfoTable from '@/views/components/personInfoTable'
 import personInfoTable from '@/views/components/personInfoTable'
-import { addJtfcCxjgXx } from '@/api/sqcx'
+import { addJtfcCxjgXx } from '@/api/jtfc'
 export default {
 export default {
   components: {
   components: {
     personInfoTable
     personInfoTable

 <template>
 <template>
   <div class="from-clues">
   <div class="from-clues">
-    <!-- 表单部分 -->
+    <!-- 家庭房产 -->
     <div class="from-clues-header">
     <div class="from-clues-header">
-      <el-form :model="queryForm" ref="queryForm" label-width="80px">
+      <el-form :model="queryForm" 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="请输入编号" v-model="queryForm.cxbh" clearable>
+              <el-input
+                placeholder="请输入查询编号"
+                v-model="queryForm.cxbh"
+                clearable
+                class="width200px"
+              >
               </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" clearable>
+              <el-input
+                placeholder="请输入申请人"
+                v-model="queryForm.sqr"
+                clearable
+                class="width200px"
+              >
               </el-input>
               </el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="14" class="btnCol">
           <el-col :span="14" class="btnCol">
-            <el-button type="primary" icon="el-icon-search" @click="fetchData">查询</el-button>
-            <el-button type="primary" @click="handleAdd" icon="el-icon-plus">新增</el-button>
+            <el-button type="primary"  @click="queryClick()"
+              >查询</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">
     <div class="from-clues-content">
-      <lb-table :page-size="pageData.size" border :current-page.sync="pageData.current" :total="tableData.total"
-        @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
-        :data="tableData.data">
+      <lb-table
+        :page-size="pageData.size"
+        border
+        :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>
     <editDialog v-model="isDialog" />
     <editDialog v-model="isDialog" />
@@ -36,59 +57,54 @@
 <script>
 <script>
 import table from "@/utils/mixin/table";
 import table from "@/utils/mixin/table";
 import { datas, sendThis } from "./jtfcdata";
 import { datas, sendThis } from "./jtfcdata";
-import { getJtfcPage } from "@/api/sqcx";
-import editDialog from "../components/editDialog.vue"
+import { getJtfcPage } from "@/api/jtfc";
+import editDialog from "../components/editDialog.vue";
 export default {
 export default {
   name: "jtfc",
   name: "jtfc",
   components: { editDialog },
   components: { editDialog },
   mixins: [table],
   mixins: [table],
-  mounted () {
+  mounted() {
     sendThis(this);
     sendThis(this);
   },
   },
-  data () {
+  data() {
     return {
     return {
       isDialog: false,
       isDialog: false,
       sqrOption: [],
       sqrOption: [],
       cxytOption: [],
       cxytOption: [],
       queryForm: {
       queryForm: {
         cxbh: "",
         cxbh: "",
-        sqr: ""
+        sqr: "",
       },
       },
+
+
       tableData: {
       tableData: {
-        total: 0,
         columns: datas.columns(),
         columns: datas.columns(),
-        data: [
-          {
-            cxlx: "家庭房产",
-            cxbh: "20200409146",
-            cxsj: "2016-10-12 10:00:00",
-            slry: "查询窗口",
-            sqr: "张三",
-            yqlrgx: "不动产权利人",
-            qlr: "张三",
-            cxyt: "预告买卖记录||首次登记",
-          },
-        ],
+        data: [],
       },
       },
+
     };
     };
   },
   },
   methods: {
   methods: {
+    queryClick(){
+      this.fetchData();
+    },
+
     // 初始化数据
     // 初始化数据
-    fetchData () {
+    fetchData() {
       getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => {
       getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => {
         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 () {
-      this.isDialog = true
-    }
-  }
-}
+    handleAdd() {
+      this.isDialog = true;
+    },
+  },
+};
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">
 @import "~@/styles/public.scss";
 @import "~@/styles/public.scss";

@@ -73,15 +73,6 @@ class data extends filter {
     ]
     ]
   }
   }
 
 
-  ywlys () {
-    return [
-      { value: 1, label: "办事大厅" },
-      { value: 2, label: "微信小程序" },
-      { value: 3, label: "法院端" },
-      { value: 4, label: "银行端" },
-    ]
-  }
-
 }
 }
 let datas = new data()
 let datas = new data()
 export {
 export {

@@ -38,10 +38,10 @@
             <div class="top_line middle_margin"></div>
             <div class="top_line middle_margin"></div>
             <div class="text" v-if="item.bsmSz">
             <div class="text" v-if="item.bsmSz">
                <el-button class="operation_button" type="text" @click="openZsylDialog(item,1)">证书预览</el-button>
                <el-button class="operation_button" type="text" @click="openZsylDialog(item,1)">证书预览</el-button>
-               <el-button class="operation_button" type="text" @click="openInvalidDiglog(item)">再次打印（1）</el-button>
+               <el-button class="operation_button" type="text" @click="openInvalidDiglog(item)">再次打印（{{item.szcs}})</el-button>
             </div>
             </div>
             <div class="text" v-else>
             <div class="text" v-else>
-               <el-button class="operation_button" type="text" @click="openZsylDialog(item,2)">证书打印（0）</el-button>
+               <el-button class="operation_button" type="text" @click="openZsylDialog(item,2)">证书打印（{{item.szcs}}）</el-button>
             </div>
             </div>
          </div>
          </div>
       </el-card>
       </el-card>
@@ -97,32 +97,46 @@ export default {
       },
       },
       //打开证书预览弹窗
       //打开证书预览弹窗
       openZsylDialog (item, type) {
       openZsylDialog (item, type) {
-         var heightSet = "650px";
-         var showButton = false;
-         if(type == 2){
-            heightSet = "700px";
-            showButton = true;
-         }
          let that = this;
          let that = this;
-         this.$popup({
-            title: "证书预览",
-            editItem: "workflow/components/zsyl",
-            height: heightSet,
-            width: "800px",
-            formData: {
-              bsmSlsq: this.bsmSlsq,
-              entryType: type,
-              bdcqz: item
-            },
-            btnShow: showButton,
-            confirmText: '打印证书',
-            cancel: () => {
-              console.log("取消回调");
-            },
-            confirm: () => {
-              this.list();
-            },
-          })
+         if(type == 1){
+            //证书预览
+            this.$popup({
+               title: "证书预览",
+               editItem: "workflow/components/zsyl",
+               height: '650px',
+               width: "800px",
+               formData: {
+                  bdcqz: item
+               },
+               btnShow: false,
+               cancel: () => {
+                  console.log("取消回调");
+               },
+               confirm: () => {
+                  console.log("取消回调");
+               },
+            })
+         }else{
+            //证书打印
+            this.$popup({
+               title: "证书打印",
+               editItem: "workflow/components/zsdy",
+               height: '700px',
+               width: "800px",
+               formData: {
+                  bsmSlsq: this.bsmSlsq,
+                  bdcqz: item
+               },
+               btnShow: true,
+               confirmText: '打印证书',
+               cancel: () => {
+                  console.log("取消回调");
+               },
+               confirm: () => {
+                  that.list();
+               },
+            })
+         }
       },
       },
       //再次打印
       //再次打印
       openInvalidDiglog (item) {
       openInvalidDiglog (item) {

@@ -6,7 +6,7 @@
         <ul style="margin-bottom:15px">
         <ul style="margin-bottom:15px">
           <li v-for="(item,index) in dataList" class="listDetail" :key="index">
           <li v-for="(item,index) in dataList" class="listDetail" :key="index">
             <p class="icon">
             <p class="icon">
-              <el-radio v-model="radio"></el-radio>
+              <el-radio v-model="selectActivity" :label="item.activityId" @change="changeSelectItem(item)"></el-radio>
             </p>
             </p>
             <p>{{item.activityName}}</p>
             <p>{{item.activityName}}</p>
             <p v-for="(child,childIndex) in item.userInfos" :key="childIndex">{{child.name}}</p>
             <p v-for="(child,childIndex) in item.userInfos" :key="childIndex">{{child.name}}</p>
@@ -31,8 +31,10 @@ export default {
   },
   },
   data () {
   data () {
     return {
     return {
+      selectActivity: '',
       dataList: [],
       dataList: [],
-      outstepopinion: ''
+      outstepopinion: '',
+      selectItem: {}
     }
     }
   },
   },
   created () {
   created () {
@@ -40,12 +42,31 @@ export default {
   },
   },
   methods: {
   methods: {
     childFn () {
     childFn () {
-      console.log(1111);
+      this.selectItem.outstepopinion = this.outstepopinion;
+      sendBackTask({
+        bsmSlsq: this.formData.bsmSlsq,
+        backNodeList: [this.selectItem]
+      }).then(res => {
+        this.$message.success('退回成功')
+          setTimeout(() => {
+            window.opener = null;
+            window.open("about:blank", "_self");
+            window.close();
+            this.$emit('input', false)
+          }, 1000);
+      })
+    },
+    changeSelectItem(item){
+      this.selectItem = item
     },
     },
     getBackNode () {
     getBackNode () {
       getTaskBackNode(this.formData).then(res => {
       getTaskBackNode(this.formData).then(res => {
         if (res.code == 200) {
         if (res.code == 200) {
           this.dataList = res.result
           this.dataList = res.result
+          if(res.result){
+            this.selectActivity = res.result[0].activityId
+            this.selectItem = res.result[0]
+          }
         }
         }
       })
       })
     }
     }
@@ -81,4 +102,7 @@ export default {
     min-height: 90px !important;
     min-height: 90px !important;
   }
   }
 }
 }
+ /deep/.el-radio .el-radio__label {
+  display: none;
+}
 </style>
 </style>

+<template>
+  <div class="from-clues">
+      <div class="middle_padding">
+        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px">
+          <el-form-item label="印刷序列号：" prop="ysxlh">
+            <el-select v-model="ruleForm.ysxlh" placeholder="请选择">
+              <el-option
+              v-for="item in ysxlh"
+              :key="item.ysxlh"
+              :label="item.ysxlh"
+              :value="item.ysxlh">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="aaaa">{{bdcqz.bdcqzlx == '1' ? '不动产权证书' : '不动产权证明'}}</div>
+      <div class="zsyl-box">
+        <div class="zsyl-left">
+          <div class="zsyl-title">
+              <span v-if="bdcqz.bdcqzh">{{bdcqz.bdcqzh}}</span>
+              <span v-else>____(  )________不动产权第      号</span>
+          </div>
+          <table class="table-column">
+            <tr v-for="(item, colindex) in columns" :key="colindex">
+              <td>
+                <span>{{ item.label }}</span>
+              </td>
+              <td>
+                <span>
+                  {{ getRowValue(item.prop) }}
+                </span>
+              </td>
+            </tr>
+          </table>
+        </div>
+        <div class="zsyl-right">
+        <div class="zsyl-title">附记</div>
+        <div class="zsyl-text"></div>
+        </div>
+      </div>
+    </div>
+</template>
+
+<script>
+import { datas } from "../javascript/zsyl.js";
+import { readYsxlh,certificate,getSlsqBdcqzList} from "@/api/fqsq.js"
+export default {
+  components: {
+  },
+  props: {
+    formData: {
+      type: Object,
+      default: {}
+    }
+  },
+  data () {
+    return {
+      //印刷序列号集合
+      ysxlh: [],
+      //列名称对象
+      columns: [],
+      //选择的不动产权证文件
+      bdcqz: '',
+      ruleForm: {
+        bsmBdcqz: '',
+        szmc: '不动产权证书',
+        bdcqzlx: '',
+        szzh: '',
+        ysxlh: '',
+      },
+      rules: {
+        ysxlh: [
+          { required: true, message: '请选择印刷序列号', trigger: 'change' }
+        ],
+      },
+    }
+  },
+  mounted(){
+  },
+  created() {
+    this.columns = datas.columns();
+    this.bdcqz = this.formData.bdcqz
+    this.ysxlhList();
+  },
+  methods: {
+    //获取印刷序列号列表
+    ysxlhList() {
+       readYsxlh({zslx:this.bdcqz.bdcqzlx}).then(res => {
+            if (res.code === 200) {
+               this.ysxlh = res.result 
+            }
+         })
+    },
+    //获取证书内容
+    getRowValue(code){
+      var value = this.bdcqz[code]
+      if(code == 'gyqk'){
+        switch(value){
+          case '1':
+            return '单独所有';
+          case '2':
+            return '共同共有';
+          case '3':
+            return '按份所有';    
+        }
+      }
+      return value;
+    },
+    //打印证书
+    childFn() {
+      this.ruleForm.bsmBdcqz = this.bdcqz.bsmBdcqz
+      this.ruleForm.bdcqzlx = this.bdcqz.bdcqzlx
+      this.ruleForm.szzh = this.bdcqz.bdcqzh
+      certificate(this.ruleForm).then(res => {
+          if (res.code === 200) {
+            this.$message.success('打印成功');
+          }else{
+            this.$message.error(res.message);
+          }
+      })
+    }, 
+  }
+}
+</script>
+<style scoped lang="scss">
+@import "~@/styles/mixin.scss";
+.zsyl-box{
+  display: flex;
+  justify-content: space-between;
+  padding: 20px;
+  background: #FAFBE5;
+  .zsyl-left{
+    width: 330px;
+    .zsyl-title{
+      font-size: 18px;
+      text-align: center;
+    }
+  }
+  .zsyl-right{
+    width: 330px;
+    .zsyl-title{
+      letter-spacing: 50px;
+      text-align: center;
+      text-indent: 50px;
+    }
+    .zsyl-text{
+      border: 1px solid #ccc;
+      height: 90%;
+    }
+  }
+  .zsyl-title{
+    margin-bottom: 12px;
+  }
+  /deep/.el-table__row{
+    background: #FAFBE5!important;
+  }
+}
+.middle_padding {
+  padding-bottom: 10px;
+}
+.zsyl-button{
+  text-align: center;
+  margin-top: 20px;
+  .operation_button{
+    width: 100px;
+    border: 1px solid rgb(0,121,254);
+  }
+  .dy-button {
+    color: white;
+    background-color: rgb(0,121,254);
+  }
+}
+.table-column {
+  border-spacing: 1px;
+  width: 100%;
+  tr td {
+      border: 1px solid #ccc;
+      text-align: center;
+      height: 40px;
+      padding: 4px;
+      font-size: 13px;
+      background: rgb(251,249,229);
+  } 
+}
+.aaaa{
+  background: #FAFBE5;
+  text-align: center;
+  padding-top: 10px;
+  font-size: 20px;
+}
+</style>

@@ -4,20 +4,6 @@
       <el-tabs v-model="activeName" @tab-click="handleClick" v-if="headTabBdcqz.length > 1">
       <el-tabs v-model="activeName" @tab-click="handleClick" v-if="headTabBdcqz.length > 1">
         <el-tab-pane :label="item.qlr + '(' + item.bdcqzh + ')'" :name="item.bsmBdcqz" v-for="(item,index) in headTabBdcqz" :key="index"></el-tab-pane>
         <el-tab-pane :label="item.qlr + '(' + item.bdcqzh + ')'" :name="item.bsmBdcqz" v-for="(item,index) in headTabBdcqz" :key="index"></el-tab-pane>
       </el-tabs>
       </el-tabs>
-      <div class="middle_padding" v-if="isToPrint">
-        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px">
-          <el-form-item label="印刷序列号：" prop="ysxlh">
-            <el-select v-model="ruleForm.ysxlh" placeholder="请选择">
-              <el-option
-              v-for="item in ysxlh"
-              :key="item.ysxlh"
-              :label="item.ysxlh"
-              :value="item.ysxlh">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-form>
-      </div>
       <div class="aaaa">{{bdcqz.bdcqzlx == '1' ? '不动产权证书' : '不动产权证明'}}</div>
       <div class="aaaa">{{bdcqz.bdcqzlx == '1' ? '不动产权证书' : '不动产权证明'}}</div>
       <div class="zsyl-box">
       <div class="zsyl-box">
         <div class="zsyl-left">
         <div class="zsyl-left">
@@ -79,11 +65,6 @@ export default {
         szzh: '',
         szzh: '',
         ysxlh: '',
         ysxlh: '',
       },
       },
-      rules: {
-        ysxlh: [
-          { required: true, message: '请选择印刷序列号', trigger: 'change' }
-        ],
-      },
     }
     }
   },
   },
   mounted(){
   mounted(){
@@ -93,24 +74,12 @@ export default {
     if(this.formData.bdcqz){
     if(this.formData.bdcqz){
        //从缮证进入
        //从缮证进入
       this.bdcqz = this.formData.bdcqz
       this.bdcqz = this.formData.bdcqz
-      if(this.formData.entryType == 2){
-         this.ysxlhList();
-      }
     }else{
     }else{
       //从按钮进入
       //从按钮进入
       this.getHeadTabBdcqz();
       this.getHeadTabBdcqz();
     }
     }
   },
   },
   methods: {
   methods: {
-    //获取印刷序列号列表
-    ysxlhList() {
-       this.isToPrint = true;
-       readYsxlh({zslx:this.bdcqz.bdcqzlx}).then(res => {
-            if (res.code === 200) {
-               this.ysxlh = res.result 
-            }
-         })
-    },
     //获取证书内容
     //获取证书内容
     getRowValue(code){
     getRowValue(code){
       var value = this.bdcqz[code]
       var value = this.bdcqz[code]
@@ -143,20 +112,7 @@ export default {
     handleClick(e){
     handleClick(e){
       this.bdcqz = this.headTabBdcqz[e.index - 0]
       this.bdcqz = this.headTabBdcqz[e.index - 0]
       this.activeName = this.headTabBdcqz.bsmBdcqz
       this.activeName = this.headTabBdcqz.bsmBdcqz
-    },
-    //打印证书
-    printCertificate() {
-      this.ruleForm.bsmBdcqz = this.bdcqz.bsmBdcqz
-      this.ruleForm.bdcqzlx = this.bdcqz.bdcqzlx
-      this.ruleForm.szzh = this.bdcqz.bdcqzh
-      certificate(this.ruleForm).then(res => {
-          if (res.code === 200) {
-            this.$message.success('打印成功');
-          }else{
-            this.$message.error(res.message);
-          }
-      })
-    }, 
+    }
   }
   }
 }
 }
 </script>
 </script>

@@ -319,7 +319,7 @@ export default {
           this.$popup({
           this.$popup({
             title: "退回",
             title: "退回",
             editItem: "workflow/components/th",
             editItem: "workflow/components/th",
-            height: "330px",
+            height: "400px",
             width: '30%',
             width: '30%',
             formData: {
             formData: {
               bsmSlsq: this.bsmSlsq,
               bsmSlsq: this.bsmSlsq,

 <template>
 <template>
   <div class="from-clues">
   <div class="from-clues">
-    <!-- 表单部分 -->
+    <!-- 楼盘查询 -->
     <div class="from-clues-header">
     <div class="from-clues-header">
       <el-form :model="queryForm" ref="queryForm" label-width="70px">
       <el-form :model="queryForm" ref="queryForm" label-width="70px">
         <el-row>
         <el-row>
@@ -136,7 +136,7 @@ export default {
         width: "50%",
         width: "50%",
         btnShow: true,
         btnShow: true,
         editItem: "xxxxxxxxxx",
         editItem: "xxxxxxxxxx",
-        height: "800px",
+        height: "600px",
         formData: {
         formData: {
           bsmSlsq: this.bsmSlsq,
           bsmSlsq: this.bsmSlsq,
           dataList: this.unitData,
           dataList: this.unitData,
@@ -148,15 +148,15 @@ export default {
       });
       });
 
 
 
 
-      // getLpb({ zrzbsm: zrzbsm })
-      //   .then((res) => {
-      //     if (res.code == 200) {
-      //       var lpbdata = res.result;
-      //     }
-      //   })
-      //   .catch((error) => {
-      //     console.log(error);
-      //   });
+      getLpb({ zrzbsm: zrzbsm })
+        .then((res) => {
+          if (res.code == 200) {
+            var lpbdata = res.result;
+          }
+        })
+        .catch((error) => {
+          console.log(error);
+        });
     },
     },
   },
   },
 };
 };