修改

@@ -41,6 +41,16 @@ export function getCertificateList (data) {
         data
         data
     })
     })
 }
 }
+
+//获取未领取的证书信息
+export function getUnclaimedBdcqz (data) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/ywbl/bdcqz/getUnclaimedBdcqz',
+        method: 'post',
+        params: data
+    })
+}
+
 // 发证
 // 发证
 export function issueCertificate (data) {
 export function issueCertificate (data) {
     return request({
     return request({

@@ -52,7 +52,7 @@ export default {
       },
       },
       tableData: {
       tableData: {
         total: 0,
         total: 0,
-        columns: datas.columns(),
+        columns: datas.columns().fzgrid,
         data: [],
         data: [],
       }
       }
     }
     }

@@ -53,7 +53,7 @@
 <script>
 <script>
 import store from '@/store/index.js'
 import store from '@/store/index.js'
 import table from "@/utils/mixin/table";
 import table from "@/utils/mixin/table";
-import { getCertificateList, issueCertificate } from "@/api/fqsq.js";
+import { getUnclaimedBdcqz, issueCertificate } from "@/api/bdcqz.js";
 import { datas } from "../javascript/fzxxdata";
 import { datas } from "../javascript/fzxxdata";
 export default {
 export default {
   mixins: [table],
   mixins: [table],
@@ -86,27 +86,23 @@ export default {
       },
       },
       tableData: {
       tableData: {
         total: 0,
         total: 0,
-        columns: datas.columns(),
+        columns: datas.columns().lzgrid,
         data: [],
         data: [],
       },
       },
     }
     }
   },
   },
+  props: ["formData"],
   created () {
   created () {
-    this.zslqList = store.getters.dictData['A30']
+    this.zslqList = store.getters.dictData['A30'];
+    this.loadGrid();
   },
   },
   methods: {
   methods: {
     fetchData () { },
     fetchData () { },
     //列表初始化
     //列表初始化
-    tablelistFn () {
-      var bsmSldy = this.$parent._data.unitData[0].bsmSldy
-      getCertificateList({ "bsmSldy": bsmSldy }).then(res => {
+    loadGrid () {
+      getUnclaimedBdcqz({bsmSlsq:this.formData.bsmSlsq}).then(res => {
         if (res.code === 200) {
         if (res.code === 200) {
-          this.tableData.data = res.result
-          if (res.result) {
-            res.result.forEach((item, index) => {
-              this.ruleForm.bsmBdcqz.push(item.bsmBdcqz)
-            })
-          }
+          this.tableData.data = res.result;         
         }
         }
       })
       })
     },
     },

@@ -9,19 +9,33 @@ class data extends filter {
     super()
     super()
   }
   }
   columns() {
   columns() {
-    return [
+    return {
+      //发证列表
+      fzgrid: [
         {
         {
           label: '序号',
           label: '序号',
           type: 'index',
           type: 'index',
           width: '50'
           width: '50'
         },
         },
         {
         {
+          prop: "bdcqzlx",
+          label: "不动产权证类型",
+          render: (h, scope) => {
+            if (scope.row.bdcqzlx == "1") {
+              return (<div>不动产权证书</div>)
+            } else {
+              return (<div>不动产登记证明</div>)
+            }
+          }
+        },
+        {
           prop: "qllxmc",
           prop: "qllxmc",
           label: "权利类型"
           label: "权利类型"
         },
         },
         {
         {
           prop: "ysxlh",
           prop: "ysxlh",
-        label: "印刷序列号"
+          label: "印刷序列号",
+          width: '100',
         },
         },
         {
         {
           prop: "bdcqzh",
           prop: "bdcqzh",
@@ -32,15 +46,8 @@ class data extends filter {
           label: "权利人"
           label: "权利人"
         },
         },
         {
         {
-        prop: "ywrmc",
-        label: "义务人",
-        render: (h, scope) => {
-          if (scope.row.bdcqzh=="") {
-            return  <div>{scope.row.ywrmc}</div>
-          }  else{
-            return <div>{scope.row.ywrmc}</div>
-          }      
-        }
+          prop: "ywr",
+          label: "义务人"
         },
         },
         {
         {
           prop: "mj",
           prop: "mj",
@@ -63,8 +70,59 @@ class data extends filter {
             return <el-button type="text" icon="el-icon-delete" onClick={() => { vm.del(scope.row) }}>添加领取材料</el-button>
             return <el-button type="text" icon="el-icon-delete" onClick={() => { vm.del(scope.row) }}>添加领取材料</el-button>
           }
           }
         }
         }
+      ],
+      //领证证列表
+      lzgrid: [
+        {
+          label: '序号',
+          type: 'index',
+          width: '50'
+        },
+        {
+          prop: "bdcqzlx",
+          label: "不动产权证类型",
+          width: '120',
+          render: (h, scope) => {
+            if (scope.row.bdcqzlx == "1") {
+              return (<div>不动产权证书</div>)
+            } else {
+              return (<div>不动产登记证明</div>)
+            }
+          }
+        },
+        {
+          prop: "qllx",
+          label: "权利类型"
+        },
+        {
+          prop: "ysxlh",
+          label: "印刷序列号",
+          width: '100',
+        },
+        {
+          prop: "bdcqzh",
+          label: "不动产权证号"
+        },
+        {
+          prop: "qlr",
+          label: "权利人"
+        },
+        {
+          prop: "ywr",
+          label: "义务人"
+        },
+        {
+          prop: "mj",
+          label: "面积（㎡）",
+          width: '100',
+        },
+        {
+          prop: "zl",
+          label: "坐落"
+        }
       ]
       ]
     }
     }
+  }
 
 
 
 
 }
 }

@@ -320,13 +320,13 @@ export default {
         case "B7":
         case "B7":
           this.$popup("证书领取", "workflow/components/zslq",{
           this.$popup("证书领取", "workflow/components/zslq",{
             height: "700px",
             height: "700px",
-            formData: {},
+            formData: {bsmSlsq:this.$route.query.bsmSlsq},
             btnShow: true,
             btnShow: true,
             cancel: () => {
             cancel: () => {
               console.log("取消回调");
               console.log("取消回调");
             },
             },
             confirm: () => {
             confirm: () => {
-              console.log("确认回调");
+              this.submitForm();
             },
             },
           })
           })
           break;
           break;