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

+import request from '@/utils/request';
+import SERVER from './config';
+
+// 获取不动产权证列表
+export function getBdcqzList (params) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/business/workFlow/getBdcqzList',
+        method: 'get',
+        params: params
+    })
+}
+// 获取印刷序列号
+export function readYsxlh (params) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/business/workFlow/readYsxlh',
+        method: 'get',
+        params: params
+    })
+}
+// 缮证
+export function certificate (data) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/business/workFlow/certificate',
+        method: 'post',
+        data
+    })
+}
+// 作废缮证信息
+export function invalidCertificate (data) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/business/workFlow/invalidCertificate',
+        method: 'post',
+        data
+    })
+}
+// 缮证列表
+export function getCertificateList (data) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/business/workFlow/getCertificateList',
+        method: 'post',
+        data
+    })
+}
+// 发证
+export function issueCertificate (data) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/business/workFlow/issueCertificate',
+        method: 'post',
+        data
+    })
+}
+// 获取受理申请下全部不动产权证
+export function getSlsqBdcqzList (params) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/business/workFlow/getSlsqBdcqzList',
+        method: 'get',
+        params
+    })
+}
\ No newline at end of file

+import request from '@/utils/request'
+import SERVER from './config'
+
+// 上传单个文件 
+export function sjClmxUpload (data) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/zhcx/sjClmx/upload',
+        method: 'post',
+        data
+    })
+}
+// 删除上传文件
+export function sjClmxDelete (bsmClmx) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/zhcx/sjClmx/delete?bsmClmx=' + bsmClmx,
+        method: 'delete'
+    })
+}
\ No newline at end of file

@@ -60,10 +60,10 @@ export default {
   methods: {
     // 列表渲染接口
     fetchData () {
-      this.ruleForm.bsmSldy = this.$parent.unitData[0].bsmSldy
+      this.ruleForm.bsmSldy = this.$parent.unitData[0].bsmSldy;
       getCertificateList(this.ruleForm).then(res => {
         if (res.code === 200) {
-          this.tableData.data = res.result
+          this.tableData.data = res.result;
         }
       })
     }

 <template>
   <div class="szxx">
-      <el-card class="box-card" v-for="(item,index) in tableData" :key="index">
+    <el-card class="box-card" v-for="(item, index) in tableData" :key="index">
       <div slot="header" class="szxx_header">
-            <span class="header_type">{{item.bdcqzlx == 1 ? '不动产权证书' : '不动产登记证明'}}</span>
-            <div class="header_text">{{item.bdcqzh}}</div>
+        <span class="header_type">{{
+          item.bdcqzlx == 1 ? "不动产权证书" : "不动产登记证明"
+        }}</span>
+        <div class="header_text">{{ item.bdcqzh }}</div>
       </div>
       <div class="szxx_body card_padding">
         <div class="text color_iray">
-               <span>{{item.qllxmc}}</span>
+          <span>{{ item.qllxmc }}</span>
         </div>
         <div class="text color_red">
-               <span>{{item.qlr}}</span>
+          <span>{{ item.qlr }}</span>
         </div>
         <div class="text color_iray">
-               <span>{{item.gyfs == 1 ? '单独所有' : item.gyfs == 2 ? '共同共有' : '按份所有'}}</span>
+          <span>{{
+            item.gyqk
+          }}</span>
         </div>
         <div class="text color_red">
-               <span>{{item.bdcdyh}}</span>
+          <span>{{ item.bdcdyh }}</span>
         </div>
         <div class="text color_iray">
-               <span>{{item.yt}}</span>
+          <span>{{ item.yt }}</span>
         </div>
         <div class="text color_red">
-               <span>{{item.mj}}</span>
+          <span>{{ item.mj }}</span>
         </div>
         <div class="text color_iray">
-               <span>{{item.syqx}}</span>
+          <span>{{ item.syqx }}</span>
         </div>
         <div v-if="item.ysxlh">
           <div class="top_line middle_margin"></div>
           <div class="text color_iray">
-                  <span>印刷序列号：{{item.ysxlh}}</span>
+            <span>印刷序列号：{{ item.ysxlh }}</span>
           </div>
         </div>
       </div>
       <div class="card_padding">
         <div class="top_line middle_margin"></div>
-            <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="openInvalidDiglog(item)">再次打印（{{item.szcs}})</el-button>
+        <div class="text" v-if="item.ysxlh">
+          <el-button
+            class="operation_button"
+            type="text"
+            @click="openZsylDialog(item, 1)"
+            >证书预览</el-button
+          >
+          <el-button
+            class="operation_button"
+            type="text"
+            @click="openInvalidDiglog(item)"
+            >再次打印（{{ item.szcs }})</el-button
+          >
         </div>
         <div class="text" v-else>
-               <el-button class="operation_button" type="text" @click="openZsylDialog(item,2)">证书打印（{{item.szcs}}）</el-button>
+          <el-button
+            class="operation_button"
+            type="text"
+            @click="openZsylDialog(item, 2)"
+            >证书打印（{{ item.szcs }}）</el-button
+          >
         </div>
       </div>
     </el-card>
-      <el-dialog title="证书打印" :visible.sync="invalidDiglog" width="30%" :modal-append-to-body='false' top='30vh'>
+    <el-dialog
+      title="证书打印"
+      :visible.sync="invalidDiglog"
+      width="30%"
+      :modal-append-to-body="false"
+      top="30vh"
+    >
       <div class="invalid-diglog">
         <div class="invalid-title">
           <i class="el-icon-question invalid-icon"></i>
           <div class="invalid-body">您确定作废证书并再次打印？</div>
         </div>
         <div class="invalid-reson">作废原因：</div>
-            <el-input v-model="zfyy" placeholder="请输入作废原因" type="textarea" :rows="4"></el-input>
+        <el-input
+          v-model="zfyy"
+          placeholder="请输入作废原因"
+          type="textarea"
+          :rows="4"
+        ></el-input>
         <div class="dialog-footer">
           <el-button @click="closeInvalidDiglog()">取 消</el-button>
           <el-button type="primary" @click="confirmInvalid()">确 定</el-button>
         </div>
       </div>
     </el-dialog>
-      <el-empty description="暂无数据" v-if="tableData.length==0"></el-empty>
+    <el-empty description="暂无数据" v-if="tableData.length == 0"></el-empty>
   </div>
 </template>
 <script>
-import { getBdcqzList, invalidCertificate } from "@/api/fqsq.js";
+import { getSlsqBdcqzList, invalidCertificate } from "@/api/fqsq.js";
 
 export default {
-   components: { },
-   props: {
-   },
-   data () {
+  components: {},
+  props: {},
+  data() {
     return {
       tableData: [],
       bdcqzlx: 1,
       bdcqz: {},
-         zfyy: '',
+      zfyy: "",
       invalidDiglog: false,
-         bsmSz: '',
+      bsmSz: "",
     };
   },
-   created () {
+  created() {
     this.list();
   },
   methods: {
     //初始化列表
-      list () {
-         var bsmSldy = this.$parent.unitData[0].bsmSldy
-         getBdcqzList({ bsmSldy: bsmSldy }).then(res => {
+    list() {
+      // var bsmSldy = this.$parent.unitData[0].bsmSldy;
+      var bsmSlsq = this.$route.query.bsmSlsq;
+      getSlsqBdcqzList({ bsmSlsq: bsmSlsq }).then((res) => {
         if (res.code === 200) {
-               this.tableData = res.result
+          this.tableData = res.result;
           if (res.result) {
-                  this.bdcqz = res.result[0]
+            this.bdcqz = res.result[0];
           }
         }
-         })
+      });
     },
     //打开证书预览弹窗
-      openZsylDialog (item, type) {
+    openZsylDialog(item, type) {
       let that = this;
-         if(type == 1){
+      if (type == 1) {
         //证书预览
-            this.$popup("证书预览","workflow/components/zsyl",{              
-               height: '650px',
+        this.$popup("证书预览", "workflow/components/zsyl", {
+          height: "650px",
           width: "800px",
           formData: {
-                  bdcqz: item
+            bdcqz: item,
           },
           btnShow: false,
           cancel: () => {
@@ -113,51 +143,51 @@ export default {
           confirm: () => {
             console.log("取消回调");
           },
-            })
-         }else{
+        });
+      } else {
         //证书打印
-            this.$popup("证书打印","workflow/components/zsdy",{
-               height: '700px',
+        this.$popup("证书打印", "workflow/components/zsdy", {
+          height: "700px",
           width: "800px",
           formData: {
             bsmSlsq: this.bsmSlsq,
-                  bdcqz: item
+            bdcqz: item,
           },
           btnShow: true,
-               confirmText: '打印证书',
+          confirmText: "打印证书",
           cancel: () => {
             console.log("取消回调");
           },
           confirm: () => {
             that.list();
           },
-            })
+        });
       }
     },
     //再次打印
-      openInvalidDiglog (item) {
+    openInvalidDiglog(item) {
       this.bsmSz = item.bsmSz;
-         this.invalidDiglog = true
+      this.invalidDiglog = true;
     },
-      closeInvalidDiglog () {
-         this.invalidDiglog = false
-         this.bsmSz = '';
-         this.zfyy = '';
+    closeInvalidDiglog() {
+      this.invalidDiglog = false;
+      this.bsmSz = "";
+      this.zfyy = "";
     },
     //作废缮证信息
-      confirmInvalid () {
-         invalidCertificate({ "bsmSz": this.bsmSz, "zfyy": this.zfyy }).then(res => {
+    confirmInvalid() {
+      invalidCertificate({ bsmSz: this.bsmSz, zfyy: this.zfyy }).then((res) => {
         if (res.code === 200) {
           this.list();
-               this.$message.success('作废成功');
+          this.$message.success("作废成功");
           this.invalidDiglog = false;
           this.openZsylDialog(this.bdcqz);
         } else {
           this.$message.error(res.message);
         }
-         })
-      }
-   }
+      });
+    },
+  },
 };
 </script>
 <style scoped lang='scss'>
@@ -228,7 +258,7 @@ export default {
 }
 
 .card_padding {
-   padding-top: 8px
+  padding-top: 8px;
 }
 
 .invalid-diglog {
@@ -269,6 +299,6 @@ export default {
 }
 
 /deep/.el-card__body {
-   padding: 0px
+  padding: 0px;
 }
 </style>
\ No newline at end of file

@@ -36,7 +36,7 @@
         </div>
         <div class="zsyl-right">
         <div class="zsyl-title">附记</div>
-        <div class="zsyl-text"></div>
+        <div class="zsyl-text"> {{ bdcqz.fj }}</div>
         </div>
       </div>
     </div>
@@ -94,17 +94,7 @@ export default {
     },
     //获取证书内容
     getRowValue(code){
-      var value = this.bdcqz[code]
-      if(code == 'gyqk'){
-        switch(value){
-          case '1':
-            return '单独所有';
-          case '2':
-            return '共同共有';
-          case '3':
-            return '按份所有';    
-        }
-      }
+      var value = this.bdcqz[code];     
       return value;
     },
     //打印证书

@@ -8,7 +8,7 @@ class data extends filter {
   constructor() {
     super()
   }
-  columns () {
+  columns() {
     return [
       {
         label: '序号',
@@ -33,7 +33,14 @@ class data extends filter {
       },
       {
         prop: "ywrmc",
-        label: "义务人"
+        label: "义务人",
+        render: (h, scope) => {
+          if (scope.row.bdcqzh=="") {
+            return  <div>{scope.row.ywrmc}</div>
+          }  else{
+            return <div>{scope.row.ywrmc}</div>
+          }      
+        }
       },
       {
         prop: "mj",

@@ -318,10 +318,8 @@ export default {
           })
           break;
         case "B7":
-          this.$popup({
-            title: "证书领取",
-            editItem: "workflow/components/zslq",
-            height: "500px",
+          this.$popup("证书领取", "workflow/components/zslq",{
+            height: "700px",
             formData: {},
             btnShow: true,
             cancel: () => {