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;
         }
       })
     }

@@ -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: () => {