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

@@ -176,3 +176,11 @@ export function issueCertificate (data) {
         data
     })
 }
+// 获取受理申请下全部不动产权证
+export function getSlsqBdcqzList (params) {
+    return request({
+        url: '/business/workFlow/getSlsqBdcqzList',
+        method: 'get',
+        params
+    })
+}

 <template>
   <div>
-    <lb-table :column="column" :maxHeight="300" heightNumSetting :pagination="false" :data="tableData">
+    <lb-table :column="column" :maxHeight="300" heightNumSetting :pagination="false" :data="tableDataList">
     </lb-table>
-    <addQlr v-model="dialog" :details="details" />
+    <addQlr v-model="dialog" :details="details" @updateDetail="updateDetail" />
   </div>
 </template>
 <script>
@@ -27,21 +27,9 @@ export default {
       default: '1'
     }
   },
-  watch: {
-    tableData: {
-      handler: function (val, oldVal) {
-        if (val.length == 0) {
-          this.tableDataList = [{}]
-        } else {
-          this.tableDataList = _.cloneDeep(val)
-        }
-      },
-      immediate: true,
-      deep: true
-    }
-  },
   data () {
     return {
+      dataIndex: 0,
       dialog: false,
       details: {},
       tableDataList: [],
@@ -112,17 +100,21 @@ export default {
   },
   watch: {
     tableData: {
-      handler (newValue, oldValue) {
-        this.$emit('updateValue', newValue)
+      handler: function (val, oldVal) {
+        let that = this
+        if (val.length == 0 || !val) {
+          that.tableDataList = [{}]
+        } else {
+          that.tableDataList = _.cloneDeep(val)
+        }
       },
+      immediate: true,
       deep: true
     },
     '$route.query.bsmSlsq': {
       handler (newValue, oldValue) {
         // 获取列表数据
-
         // this.details = 
-
       },
       deep: true
     },
@@ -146,9 +138,9 @@ export default {
     }
   },
   methods: {
-    // 获取列表数据
-    getList () {
-
+    updateDetail (value) {
+      this.tableDataList[this.dataIndex] = value
+      this.$emit('upDateQlrxxList', this.tableDataList)
     },
     // 添加
     handleAdd () {
@@ -161,8 +153,10 @@ export default {
     // 身份证读取
     readClick () { },
     // 修改
-    handleEdit () {
+    handleEdit (index, row) {
+      this.dataIndex = index
       this.dialog = true
+      this.details = row
     },
     handleView () {
       this.dialog = true

@@ -37,7 +37,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="性别" prop="xb">
+          <el-form-item label="性别">
             <el-select clearable v-model="ruleForm.xb" class="width100" placeholder="请选择">
               <el-option v-for="item in dictData['A43']" :key="item.dcode" :label="item.dname" :value="item.dcode">
               </el-option>
@@ -47,17 +47,17 @@
       </el-row>
       <el-row>
         <el-col :span="8">
-          <el-form-item label="法人名称" prop="frmc">
+          <el-form-item label="法人名称">
             <el-input v-model="ruleForm.frmc"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="国家/地区" prop="gjdq">
+          <el-form-item label="国家/地区">
             <el-input v-model="ruleForm.gjdq"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="户籍所在省市" prop="szss">
+          <el-form-item label="户籍所在省市">
             <el-input v-model="ruleForm.szss"></el-input>
           </el-form-item>
         </el-col>
@@ -65,12 +65,12 @@
 
       <el-row>
         <el-col :span="16">
-          <el-form-item label="地址" prop="dz">
+          <el-form-item label="地址">
             <el-input v-model="ruleForm.dz"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="邮编" prop="yb">
+          <el-form-item label="邮编">
             <el-input v-model="ruleForm.yb"></el-input>
           </el-form-item>
         </el-col>
@@ -78,17 +78,17 @@
 
       <el-row>
         <el-col :span="8">
-          <el-form-item label="发证机关" prop="fzjg">
+          <el-form-item label="发证机关">
             <el-input v-model="ruleForm.fzjg"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="电子邮件" prop="dzyj">
+          <el-form-item label="电子邮件">
             <el-input v-model="ruleForm.dzyj"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="权利比例" prop="qlbl">
+          <el-form-item label="权利比例">
             <el-input v-model="ruleForm.qlbl"></el-input>
           </el-form-item>
         </el-col>
@@ -96,12 +96,12 @@
 
       <el-row>
         <el-col :span="8">
-          <el-form-item label="工作单位" prop="gzdw">
+          <el-form-item label="工作单位">
             <el-input v-model="ruleForm.gzdw"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="16">
-          <el-form-item label="代理机构" prop="dljg">
+          <el-form-item label="代理机构">
             <el-input v-model="ruleForm.dljg"></el-input>
           </el-form-item>
         </el-col>
@@ -109,17 +109,17 @@
 
       <el-row>
         <el-col :span="8">
-          <el-form-item label="联系电话" prop="lxdh" :rules="$rules.common.phone">
+          <el-form-item label="联系电话" :rules="$rules.common.phone">
             <el-input v-model="ruleForm.lxdh" maxlength="11"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="代理人姓名" prop="dlrxm">
+          <el-form-item label="代理人姓名">
             <el-input v-model="ruleForm.dlrxm"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="代理人证件类型" prop="dlrzjlx">
+          <el-form-item label="代理人证件类型">
             <el-select clearable v-model="ruleForm.dlrzjlx" class="width100" placeholder="请选择">
               <el-option v-for="item in dictData['A30']" :key="item.dcode" :label="item.dname" :value="item.dcode">
               </el-option>
@@ -129,7 +129,7 @@
       </el-row>
       <el-row>
         <el-col :span="8">
-          <el-form-item label="代理人证件号" prop="dlrzjh">
+          <el-form-item label="代理人证件号">
             <el-input v-model="ruleForm.dlrzjh" maxlength="20"></el-input>
           </el-form-item>
         </el-col>
@@ -137,7 +137,6 @@
     </el-form>
   </dialogBox>
 </template>
-
 <script>
 import { mapGetters } from 'vuex'
 export default {
@@ -183,48 +182,6 @@ export default {
         ],
         zjh: [
           { required: true, message: '证件号', trigger: 'blur' }
-        ],
-        xb: [
-          { required: true, message: '性别', trigger: 'change' }
-        ],
-        frmc: [
-          { required: true, message: '法人名称', trigger: 'blur' }
-        ],
-        gjdq: [
-          { required: true, message: '国家/地区', trigger: 'blur' }
-        ],
-        szss: [
-          { required: true, message: '户籍所在省市', trigger: 'blur' }
-        ],
-        dz: [
-          { required: true, message: '地址', trigger: 'blur' }
-        ],
-        yb: [
-          { required: true, message: '邮编', trigger: 'blur' }
-        ],
-        fzjg: [
-          { required: true, message: '发证机关', trigger: 'blur' }
-        ],
-        dzyj: [
-          { required: true, message: '电子邮件', trigger: 'blur' }
-        ],
-        qlbl: [
-          { required: true, message: '权利比例', trigger: 'blur' }
-        ],
-        gzdw: [
-          { required: true, message: '工作单位', trigger: 'blur' }
-        ],
-        dljg: [
-          { required: true, message: '代理机构', trigger: 'blur' }
-        ],
-        dlrxm: [
-          { required: true, message: '代理人姓名', trigger: 'blur' }
-        ],
-        dlrzjlx: [
-          { required: true, message: '代理人证件类型', trigger: 'change' }
-        ],
-        dlrzjh: [
-          { required: true, message: '代理人证件号', trigger: 'blur' }
         ]
       }
     }
@@ -240,17 +197,11 @@ export default {
       this.$refs['ruleForm'].resetFields();
     },
     submitForm () {
-      this.$refs['ruleForm.'].validate((valid) => {
-        if (valid) {
       this.$emit("input", false);
-        } else {
-          console.log('error submit!!');
-          return false;
+      this.$emit("updateDetail", this.ruleForm);
     }
-      });
-    },
-  },
-};
+  }
+}
 </script>
 <style scoped lang="scss">
 .submit-button {

@@ -59,22 +59,19 @@
             </div>
          </div>
       </el-dialog>
-      <zsylDialog ref="zsylDialog" v-model="zsylFlag" :value='zsylFlag' />
       <el-empty description="暂无数据" v-if="tableData.length==0"></el-empty>
    </div>
 </template>
 <script>
-import zsylDialog from "./zsyl.vue";
 import { getBdcqzList, invalidCertificate } from "@/api/fqsq.js";
 
 export default {
-   components: { zsylDialog },
+   components: { },
    props: {
    },
    data () {
       return {
          tableData: [],
-         zsylFlag: false,
          bdcqzlx: 1,
          bdcqz: {},
          zfyy: '',
@@ -100,14 +97,32 @@ export default {
       },
       //打开证书预览弹窗
       openZsylDialog (item, type) {
-         this.zsylFlag = true;
-         this.bdcqz = item;
-         this.$refs.zsylDialog.bdcqz = item;
-         if (type == 2) {
-            this.$nextTick(() => {
-               this.$refs.zsylDialog.ysxlhList();
-            });
+         var heightSet = "650px";
+         var showButton = false;
+         if(type == 2){
+            heightSet = "700px";
+            showButton = true;
          }
+         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();
+            },
+          })
       },
       //再次打印
       openInvalidDiglog (item) {

 <template>
-  <dialogBox title="证书预览" :isReset='false' :isSave='false' width="865px" 
-     @closeDialog="closeDialog" v-model="value">
   <div class="from-clues">
       <!-- 表单部分 -->
+      <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-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">
@@ -20,7 +21,8 @@
       <div class="zsyl-box">
         <div class="zsyl-left">
           <div class="zsyl-title">
-              <span>{{bdcqz.bdcqzh}}</span>
+              <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">
@@ -40,35 +42,35 @@
         <div class="zsyl-text"></div>
         </div>
       </div>
-      <div class="zsyl-button" v-if="isToPrint">
-         <el-button class="operation_button dy-button" type="text" @click="printCertificate()">打印证书</el-button>
-         <el-button class="operation_button gb-button" type="text" @click="closeDialog()">关闭</el-button>
     </div>
-    </div>
-  </dialogBox>
 </template>
 
 <script>
 import { datas } from "../javascript/zsyl.js";
-import { readYsxlh,certificate } from "@/api/fqsq.js"
+import { readYsxlh,certificate,getSlsqBdcqzList} from "@/api/fqsq.js"
 export default {
   components: {
   },
   props: {
-    value: { type: Boolean, default: false },
+    formData: {
+      type: Object,
+      default: {}
+    }
   },
   data () {
     return {
       //印刷序列号集合
       ysxlh: [],
-      //证书类型
-      zslx: '',
       //列名称对象
       columns: [],
       //选择的不动产权证文件
       bdcqz: '',
       //证书打开类型 是否需要展示打印按钮
       isToPrint: false,
+      //tab切换栏数组
+      headTabBdcqz: [],
+      //tab选择绑定值
+      activeName: '',
       ruleForm: {
         bsmBdcqz: '',
         szmc: '不动产权证书',
@@ -87,21 +89,27 @@ export default {
   },
   created() {
     this.columns = datas.columns();
+    if(this.formData.bdcqz){
+       //从缮证进入
+      this.bdcqz = this.formData.bdcqz
+      if(this.formData.entryType == 2){
+         this.ysxlhList();
+      }
+    }else{
+      //从按钮进入
+      this.getHeadTabBdcqz();
+    }
   },
   methods: {
     //获取印刷序列号列表
     ysxlhList() {
-       this.zslx = this.$parent.bdcqzlx
        this.isToPrint = true;
-       readYsxlh({zslx:this.$parent.bdcqzlx}).then(res => {
+       readYsxlh({zslx:this.bdcqz.bdcqzlx}).then(res => {
             if (res.code === 200) {
                this.ysxlh = res.result 
             }
          })
     },
-    closeDialog () {
-      this.$emit("input", false);
-    },
     //获取证书内容
     getRowValue(code){
       var value = this.bdcqz[code]
@@ -117,16 +125,32 @@ export default {
       }
       return value;
     },
+    //获取受理申请下全部不动产权证
+    getHeadTabBdcqz(){
+      getSlsqBdcqzList({bsmSlsq: this.formData.bsmSlsq}).then(res => {
+          if(res.code == 200){
+            if(res.result){
+              this.activeName = res.result[0].bsmBdcqz
+              this.bdcqz = res.result[0]
+            }
+            this.headTabBdcqz = res.result
+          }
+          
+      })
+    },
+    //tab表头切换方法
+    handleClick(e){
+      this.bdcqz = this.headTabBdcqz[e.index - 0]
+      this.activeName = this.headTabBdcqz.bsmBdcqz
+    },
     //打印证书
     printCertificate() {
-      this.ruleForm.bsmBdcqz = this.$parent.bdcqz.bsmBdcqz
-      this.ruleForm.bdcqzlx = this.$parent.bdcqz.bdcqzlx
-      this.ruleForm.szzh = this.$parent.bdcqz.bdcqzh
+      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('打印成功');
-            this.$emit("input", false);
-            this.$parent.list();
           }else{
             this.$message.error(res.message);
           }

@@ -281,7 +281,23 @@ export default {
           });
           break;
         case "B5":
-          this.zsylFlag = true;
+          this.$popup({
+            title: "证书预览",
+            editItem: "workflow/components/zsyl",
+            height: "600px",
+            width: "800px",
+            formData: {
+              bsmSlsq: this.bsmSlsq,
+              entryType: '1'
+            },
+            btnShow: false,
+            cancel: () => {
+              console.log("取消回调");
+            },
+            confirm: () => {
+              console.log("确认回调");
+            },
+          })
           break;
         case "B7":
           this.$popup({

@@ -150,7 +150,8 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <InformationTable :tableData="ruleForm.qlrxx" :viewtype="$route.query.viewtype" :gyfs="ruleForm.gyfs" />
+        <InformationTable :tableData="ruleForm.qlrxx" @upDateQlrxxList="upDateQlrxxList"
+          :viewtype="$route.query.viewtype" :gyfs="ruleForm.gyfs" />
         <div class="slxx_title title-block">
           登记原因
           <div class="triangle"></div>
@@ -190,9 +191,6 @@ export default {
           ...res.result.qlxxdatas,
           ...res.result.jsydsyqdatas
         }
-        if (this.ruleForm.gyfs == '1') {
-          this.ruleForm.qlrxx = [{}]
-        }
       }
     })
   },
@@ -234,6 +232,10 @@ export default {
     }
   },
   methods: {
+    // 更新权利人信息
+    upDateQlrxxList (val) {
+      this.ruleForm.qlrxx = val
+    },
     list (bsmSldy) {
       var formdata = new FormData();
       formdata.append("bsmSldy", bsmSldy);

@@ -133,10 +133,10 @@ export default {
       let that = this;
       this.$popup({
         title: "楼盘表",
-        width: "100%",
+        width: "50%",
         btnShow: true,
         editItem: "xxxxxxxxxx",
-        height: "1200px",
+        height: "800px",
         formData: {
           bsmSlsq: this.bsmSlsq,
           dataList: this.unitData,