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

任超
Showing 6 changed files with 74 additions and 36 deletions
src/api/zhcx.js
src/views/ywbl/fqsq/fqsq.vue
src/views/zhcx/djbcx/components/djxxColumns.js
src/views/zhcx/djbcx/components/djxxTable.vue
src/views/zhcx/djbcx/djbcx.vue
src/views/zhcx/djbcx/djbcxdata.js
--- a/src/api/zhcx.js
View file @9f532d8
+++ b/src/api/zhcx.js
View file @9f532d8
@@ -54,6 +54,16 @@ export function getDetail(qlbsm) {
    method: 'get'
  })
 }
+// 获取权利详细信息
+export function getJsydsyqList(data) {  
+  return request({
+    url: '/zhcx/djbcx/getJsydsyqList',
+    method: 'post',
+    data
+  })
+}
 // 进度查询列表
 export function getJdcxBysearch (data) {
  return request({
--- a/src/views/ywbl/fqsq/fqsq.vue
View file @9f532d8
+++ b/src/views/ywbl/fqsq/fqsq.vue
View file @9f532d8
@@ -120,7 +120,7 @@ export default {
  },
  mounted () {
    if (this.$route.query.bsmSlsq) {
-      this.expandInfo(this.$route.query.bestepid);
+      this.expandInfo(this.$route.query.bsmSlsq,this.$route.query.bestepid);
      this.list(this.$route.query.bsmSlsq)
      this.queryForm.bsmSlsq = this.$route.query.bsmSlsq
      this.queryForm.bestepid = this.$route.query.bestepid
@@ -146,9 +146,10 @@ export default {
      })
    },
    //获取环节扩展信息
-    expandInfo (bestepid) {
+    expandInfo (bsmSlsq,bestepid) {
      let that = this
      var formdata = new FormData();
+      formdata.append("bsmSlsq", bsmSlsq);
      formdata.append("bestepid", bestepid);
      console.log(formdata, 'formdata');
      stepExpandInfo(formdata).then(res => {
--- a/src/views/zhcx/djbcx/components/djxxColumns.js
View file @9f532d8
+++ b/src/views/zhcx/djbcx/components/djxxColumns.js
View file @9f532d8
@@ -12,6 +12,7 @@ class data extends filter {
          {
            prop: "ssywh",
            label: "上手业务号",
+            width: "120"
          },
          {
            prop: "dah",
@@ -34,23 +35,23 @@ class data extends filter {
            label: "权利人类型",
          },
          {
-            prop: "qlr",
+            prop: "qlrmc",
            label: "权利人",
          },
          {
-            prop: "zjzl",
+            prop: "qlrzjzl",
            label: "证件种类",
          },
          {
-            prop: "zjh",
+            prop: "qlrzjhm",
            label: "证件号",
          },
          {
-            prop: "gyqk",
+            prop: "gyfs",
            label: "共有情况",
          },
          {
-            prop: "syqmj",
+            prop: "mj",
            label: "使用权面积(m²)",
          },
          {
@@ -58,12 +59,12 @@ class data extends filter {
            label: "权利性质",
          },
          {
-            prop: "tdyt",
+            prop: "ytmc",
            label: "土地用途",
          },
          {
-            prop: "syqqssj",
+            prop: "syqqzsj",
-            label: "使用权起始时间",
+            label: "使用权起止时间",
          },
          // {
          //   prop: "syqjssj",
@@ -74,8 +75,8 @@ class data extends filter {
          //   label: "土地使用期限",
          // },
          {
-            prop: "syqqzsj",
+            prop: "tdsyqx",
-            label: "使用权起止时间",
+            label: "土地使用期限",
          },
          {
            prop: "qdjg",
--- a/src/views/zhcx/djbcx/components/djxxTable.vue
View file @9f532d8
+++ b/src/views/zhcx/djbcx/components/djxxTable.vue
View file @9f532d8
@@ -59,7 +59,7 @@
 <script>
 import { mapGetters } from "vuex";
 import { datas } from "./djxxColumns";
+import { getJsydsyqList } from "@/api/zhcx.js";
 export default {
  name: "djxxTable",
  props: {
@@ -90,9 +90,22 @@ export default {
        this.columns = this.type[newVlue].columns;
        this.title = this.type[newVlue].title;
        this.checkList = ["临时", "现势", "历史"];
-        this.tableWidth = 810
+        this.tableWidth = 810;
+        let detail;
-        let detail = this.djbxx.detail.qlxxs[newVlue];
+        if (newVlue === "JSYDSYQ") {
+          getJsydsyqList({
+            bdcdyid: "2b33851f4edfd468ceef4d68c370bd41",
+            qllx: "A03",
+            qszt: ["1"]
+          }).then((res) => {
+            if (res.code === 200) {
+              detail = res.result;
+            }
+          });
+        } else {
+          detail = this.djbxx.detail.qlxxs[newVlue];
+        }
        detail.forEach((item) => {
          this.tableData.push(item);
          if (item.qszt == "0") {
--- a/src/views/zhcx/djbcx/djbcx.vue
View file @9f532d8
+++ b/src/views/zhcx/djbcx/djbcx.vue
View file @9f532d8
@@ -42,7 +42,7 @@
    </div>
    <!-- 表格 -->
    <div class="from-clues-content">
-      <lb-table :page-size="pageData.size" @sort-change="handleSort" :current-page.sync="pageData.current"
+      <lb-table :page-size="pageData.size" border @sort-change="handleSort" :current-page.sync="pageData.current"
        :total="pageData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
        :column="tableData.columns" :data="tableData.data">
      </lb-table>
@@ -122,9 +122,10 @@ export default {
    },
    // 高级查询
    moreQueryClick () { },
-    openDialog (scope) {
+    openDialog (scroll) {
+      //debugger;
      let _this = this;
-      let bsm = scope.row.bsmQlxx;
+      let bsm = scroll.bsmQlxx;
      axios
        .all([
          getDjbfm(bsm),
@@ -145,17 +146,17 @@ export default {
          _this.isDialog = true;
          // 弹窗打开,自动切换到对应的登记类型
-          if (scope.row.qllxmc == "国有建设用地使用权") {
+          if (scroll.qllxmc == "国有建设用地使用权") {
            this.$refs.djbxxDialog.showType = "JSYDSYQ";
-          } else if (scope.row.qllxmc == "抵押权") {
+          } else if (scroll.qllxmc == "抵押权") {
            this.$refs.djbxxDialog.showType = "DYAQ";
-          } else if (scope.row.qllxmc == "地役权") {
+          } else if (scroll.qllxmc == "地役权") {
            this.$refs.djbxxDialog.showType = "DYIQ";
-          } else if (scope.row.qllxmc == "预告登记") {
+          } else if (scroll.qllxmc == "预告登记") {
            this.$refs.djbxxDialog.showType = "YGDJ";
-          } else if (scope.row.qllxmc == "异议登记") {
+          } else if (scroll.qllxmc == "异议登记") {
            this.$refs.djbxxDialog.showType = "YYDJ";
-          } else if (scope.row.qllxmc == "查封登记") {
+          } else if (scroll.qllxmc == "查封登记") {
            this.$refs.djbxxDialog.showType = "CFDJ";
          }
        });
--- a/src/views/zhcx/djbcx/djbcxdata.js
View file @9f532d8
+++ b/src/views/zhcx/djbcx/djbcxdata.js
View file @9f532d8
@@ -24,6 +24,7 @@ class data extends filter {
      },
      {
        label: "权属状态",
+        width: '80',
        render: (h, scope) => {
          let obj = {
            "1": {
@@ -43,21 +44,27 @@ class data extends filter {
          let colorName = obj[scope.row.qszt]?.color || ''
          return (
            <div>
-              <span style={`color:${colorName}`}>●</span>
+              <span style={`color:${colorName}`}>●&nbsp;</span>
              <span >{textName}</span>
            </div>
          )
        }
      },
      {
-        prop: "qllxmc",
-        label: "权利类型",
-      },
-      {
        prop: "ywh",
        label: "业务号",
+        width: '110',
      },
      {
+        prop: "qllxmc",
+        label: "权利类型",
+      },   
+      {
+        prop: "djlxmc",
+        label: "登记类型",        
+        width: '90',
+      },  
+      {
        prop: "bdcdyh",
        label: "不动产单元号",
      },
@@ -74,14 +81,19 @@ class data extends filter {
        label: "义务人",
      },
      {
-        prop: "zl",
+        prop: "mj",
-        label: "坐落",
+        label: "面积",
+        width: '80'
      },
      {
-        prop: "sjlx",
+        prop: "ytmc",
-        label: "数据类型"
+        label: "用途"
      },
      {
+        prop: "zl",
+        label: "坐落",
+      },     
+      {
        label: '操作',
        width: '150',
        align: 'center',
@@ -89,8 +101,8 @@ class data extends filter {
        render: (h, scope) => {
          return (
            <div>
-              <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openDialog(scope) }}>登记薄</el-button>
+              <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openDialog(scope.row) }}>登记薄</el-button>
-              <el-button type="text" icon="el-icon-film" onClick={() => { vm.openDialog(scope) }}>楼盘表</el-button>
+              <el-button type="text" icon="el-icon-film" onClick={() => { vm.openDialog(scope.row) }}>楼盘表</el-button>
            </div>
          )
        }