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

任超
Showing 4 changed files with 97 additions and 34 deletions
src/api/fqsq.js
src/views/workflow/components/szxx.vue
src/views/workflow/components/zsyl.vue
src/views/workflow/workFrame.vue
--- a/src/api/fqsq.js
View file @45ee467
+++ b/src/api/fqsq.js
View file @45ee467
@@ -176,3 +176,11 @@ export function issueCertificate (data) {
        data
    })
 }
+// 获取受理申请下全部不动产权证
+export function getSlsqBdcqzList (params) {
+    return request({
+        url: '/business/workFlow/getSlsqBdcqzList',
+        method: 'get',
+        params
+    })
+}
--- a/src/views/workflow/components/szxx.vue
View file @45ee467
+++ b/src/views/workflow/components/szxx.vue
View file @45ee467
@@ -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;
+         var heightSet = "650px";
-         this.bdcqz = item;
+         var showButton = false;
-         this.$refs.zsylDialog.bdcqz = item;
+         if(type == 2){
-         if (type == 2) {
+            heightSet = "700px";
-            this.$nextTick(() => {
+            showButton = true;
-               this.$refs.zsylDialog.ysxlhList();
-            });
         }
+         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) {
--- a/src/views/workflow/components/zsyl.vue
View file @45ee467
+++ b/src/views/workflow/components/zsyl.vue
View file @45ee467
 <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.bsmBdcqz = this.bdcqz.bsmBdcqz
-      this.ruleForm.bdcqzlx = this.$parent.bdcqz.bdcqzlx
+      this.ruleForm.bdcqzlx = this.bdcqz.bdcqzlx
-      this.ruleForm.szzh = this.$parent.bdcqz.bdcqzh
+      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);
          }
--- a/src/views/workflow/workFrame.vue
View file @45ee467
+++ b/src/views/workflow/workFrame.vue
View file @45ee467
@@ -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({