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

renchao@pashanhoo.com
Showing 4 changed files with 113 additions and 104 deletions
src/api/djbDetail.js
src/utils/mixin/table.js
src/views/registerBook/djbFrameData.js
src/views/registerBook/djbFrameall.vue
--- a/src/api/djbDetail.js
View file @e184c47
+++ b/src/api/djbDetail.js
View file @e184c47
@@ -81,7 +81,18 @@ export function getBdcqljqtsx (data) {
    params: data
  })
 }
+/**
+ * @description: 获取不动产权利及其他事项Bdcdyh
+ * @param {*} data
+ * @author: renchao
+ */
+ export function getBdcqljqtsxBdcdyh (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/djbDetail/getBdcqljqtsxBdcdyh',
+    method: 'get',
+    params: data
+  })
+}
 /**
 * @description: 获取土地所有权
 * @param {*} data
--- a/src/utils/mixin/table.js
View file @e184c47
+++ b/src/utils/mixin/table.js
View file @e184c47
-import { log } from 'bpmn-js-token-simulation';
 import { mapGetters } from 'vuex'
 import { defaultParameters } from "../../views/ywbl/ywsq/javascript/publicDefaultPar";
 export default {
@@ -28,7 +27,6 @@ export default {
     */
    handkeyCode (e) {
      if (e.keyCode === 13) {
-        console.log("安");
        this.handleSearch()
      }
    },
--- a/src/views/registerBook/djbFrameData.js
View file @e184c47
+++ b/src/views/registerBook/djbFrameData.js
View file @e184c47
 /*
 * @Description:
 * @Autor: renchao
--- a/src/views/registerBook/djbFrameall.vue
View file @e184c47
+++ b/src/views/registerBook/djbFrameall.vue
View file @e184c47
@@ -14,7 +14,8 @@
        :default-expand-all="true"
        :expand-on-click-node="false"
        node-key="id"
-        :default-checked-keys="[showTab]">
+        :default-checked-keys="[showTab]"
+      >
      </el-tree>
      <el-collapse v-model="activeName" accordion>
        <el-collapse-item
@@ -22,7 +23,8 @@
          ref="sfq"
          v-for="(item, index) in sfqdata"
          :key="index"
-          :name="index">
+          :name="index"
+        >
          <template slot="title">
            <span class="text" @click="tap(item)">
              <span>
@@ -35,7 +37,8 @@
            :re="item"
            :key="index"
            :class="[isActive == index ? activeCls : '', errorCls]"
-            @click="taplist(item, index)">
+            @click="taplist(item, index)"
+          >
            <span>
              {{ item.label }}
            </span>
@@ -50,17 +53,18 @@
      <component
        :is="componentTag"
        @getBdcdyh="getBdcdyh"
-        v-bind="currentSelectProps" />
+        v-bind="currentSelectProps"
+      />
    </div>
  </div>
 </template>
 <script>
-  import { getBdcqljqtsx } from "@/api/djbDetail.js";
+import { getBdcqljqtsx, getBdcqljqtsxBdcdyh } from "@/api/djbDetail.js";
-  import { loadTreeData, loadsfqData, getNode } from "./djbFrameData.js";
+import { loadTreeData, loadsfqData, getNode } from "./djbFrameData.js";
-  import { searchTaskToDo } from "@/api/workflow/search.js";
+import { searchTaskToDo } from "@/api/workflow/search.js";
-  import { leftMenu } from "@/api/workFlow.js";
+import { leftMenu } from "@/api/workFlow.js";
-  export default {
+export default {
-    data () {
+  data() {
    return {
      //接收参数
      // propsParam: this.$attrs,
@@ -91,8 +95,8 @@
      showTab: "bdcqldjml", // 选中状态,根据表格中权利类型判断
    };
  },
-    mounted () {
+  mounted() {
-      this.getdata();
+    this.loadData(this.getCaption(window.location.href));
  },
  methods: {
    // 截取字符的方法
@@ -101,7 +105,7 @@
     * @param {*} obj
     * @author: renchao
     */
-      getCaption (obj) {
+    getCaption(obj) {
      let index = obj.lastIndexOf("=");
      obj = obj.substring(index + 1, obj.length);
      return obj;
@@ -111,30 +115,30 @@
     * @description: 通过不动产业务号获取参数
     * @author: renchao
     */
-      getdata () {
+    // getdata () {
-        this.queryForm = {
+    //   this.queryForm = {
-          bdcdyh: this.getCaption(window.location.href),
+    //     bdcdyh: this.getCaption(window.location.href),
-          currentPage: 1,
+    //     currentPage: 1,
-          djlx: "",
+    //     djlx: "",
-          pageSize: 10,
+    //     pageSize: 10,
-          qllx: "",
+    //     qllx: "",
-          ywh: "",
+    //     ywh: "",
-          ywly: "",
+    //     ywly: "",
-        };
+    //   };
-        if (this.queryForm) {
+    //   if (this.queryForm) {
-          this.$startLoading();
+    //     this.$startLoading();
-          searchTaskToDo({
+    //     searchTaskToDo({
-            ...this.queryForm,
+    //       ...this.queryForm,
-          }).then((res) => {
+    //     }).then((res) => {
-            if (res.code === 200) {
+    //       if (res.code === 200) {
-              let { records } = res.result;
+    //         let { records } = res.result;
-              this.loadBdcdylist(records[0].bsmSlsq, records[0].bestepid);
+    //         this.loadBdcdylist(records[0].bsmSlsq, records[0].bestepid);
-              this.$endLoading();
+    //         this.$endLoading();
-            }
+    //       }
-          });
+    //     });
-        }
+    //   }
-      },
+    // },
    // 获取不动产信息
    /**
@@ -143,33 +147,33 @@
     * @param {*} b
     * @author: renchao
     */
-      loadBdcdylist (a, b) {
+    // loadBdcdylist (a, b) {
-        var formdata = new FormData();
+    //   var formdata = new FormData();
-        formdata.append("bsmSlsq", a);
+    //   formdata.append("bsmSlsq", a);
-        formdata.append("bestepid", b);
+    //   formdata.append("bestepid", b);
-        leftMenu(formdata).then((res) => {
+    //   leftMenu(formdata).then((res) => {
-          if (res.code === 200) {
+    //     if (res.code === 200) {
-            if (res.result) {
+    //       if (res.result) {
-              this.currentSelectProps = res.result[0];
+    //         this.currentSelectProps = res.result[0];
-              this.loadData(this.currentSelectProps.bdcdyh);
+    //         this.loadData(this.currentSelectProps.bdcdyh);
-            }
+    //       }
-          }
+    //     }
-        });
+    //   });
-      },
+    // },
    /**
     * @description: getBdcdyh
     * @author: miaofang
     * 点击不动产单元号事件
     */
-      getBdcdyh (val) {
+    getBdcdyh(val) {
      this.addloadData(val);
    },
    /**
     * @description: addloadData
     * @author: miaofang
     */
-      addloadData (val) {
+    addloadData(val) {
      getBdcqljqtsx({
        bdcdyid: val.bdcdyid,
        bdcdyh: val.bdcdyh,
@@ -179,7 +183,7 @@
            let index = this.sfqdata.findIndex((item) => {
              return item.bdcdyid == val.bdcdyid;
            });
-              this.activeName = index
+            this.activeName = index;
          } else {
            this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid));
            this.activeName = this.sfqdata.length - 1;
@@ -197,19 +201,16 @@
     * @description: loadData
     * @author: renchao
     */
-      loadData (val) {
+    loadData(val) {
-        getBdcqljqtsx({
+      getBdcqljqtsxBdcdyh({
-          bdcdyid: this.currentSelectProps.bdcdyid,
        bdcdyh: val,
      }).then((res) => {
        if (res.code === 200) {
          this.treedata = loadTreeData(val);
-            this.sfqdata.push(
+          this.sfqdata.push(loadsfqData(res.result, val, res.result.bdcdyid));
-              loadsfqData(res.result, val, this.currentSelectProps.bdcdyid)
-            );
          this.$nextTick(function () {
            this.defaultNode = getNode(
-                this.currentSelectProps.qllx,
+              res.result.ztqllx,
              { linShi: 0, xianShi: 0, liShi: 0 },
              res.result.bdcdylx || ""
            );
@@ -218,22 +219,20 @@
                this.loadComponent(item.form);
                this.isActive = index;
              }
-              })
+            });
+            this.currentSelectProps = {
+              bdcdyid: res.result.bdcdyid,
+              bdcdyh: val,
+              qllx: res.result.qllx,
+              bsmQlxx: this.currentSelectProps.bsmQlxx,
+            };
            // this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
            // this.loadComponent(this.defaultNode.form);
            // this.setstyle(0, 0, this.iskey);
          });
        }
      });
-        this.currentSelectProps = {
-          bdcdyid: this.currentSelectProps.bdcdyid,
-          bdcdyh: this.currentSelectProps.bdcdyh,
-          qllx: this.currentSelectProps.qllx,
-          bsmQlxx: this.currentSelectProps.bsmQlxx,
-        };
    },
    /*
          点击登记簿菜单
@@ -243,16 +242,16 @@
     * @param {*} data
     * @author: renchao
     */
-      handleNodeClick (data) {
+    handleNodeClick(data) {
      this.loadComponent(data.form);
    },
    /**
-* @description: setstyle
+     * @description: setstyle
-* @param {*} data
+     * @param {*} data
-* @author: renchao
+     * @author: renchao
-* 设置样式和点击定位到当前功能
+     * 设置样式和点击定位到当前功能
-*/
+     */
    // setstyle (newindex, index, key) {
    //   if (key != undefined || this.keyy == index) {
    //     if (key != undefined) {
@@ -276,7 +275,7 @@
     * @author: renchao
     * 新增列表功能
     */
-      tap (data, index) {
+    tap(data, index) {
      this.loadComponent(data.form);
    },
    /**
@@ -285,7 +284,7 @@
     * @author: renchao
     * 新增列表功能
     */
-      taplist (data, index) {
+    taplist(data, index) {
      this.loadComponent(data.form);
      this.isActive = index;
    },
@@ -294,19 +293,19 @@
     * @param {*} form
     * @author: renchao
     */
-      loadComponent (form) {
+    loadComponent(form) {
      this.componentTag = (r) =>
        require.ensure([], () => r(require("@/views/registerBook/" + form)));
    },
  },
-  };
+};
 </script>
 <style scoped lang="scss">
-  /deep/.rollTable {
+/deep/.rollTable {
  height: calc(120vh - 254px) !important;
-  }
+}
-  .content {
+.content {
  width: 100%;
  height: 100%;
  display: flex;
@@ -327,34 +326,34 @@
    background-color: #f5f5f5;
    border: 1px solid rgb(228, 228, 228);
  }
-  }
+}
-  /deep/ .expanded.el-tree-node__expand-icon,
+/deep/ .expanded.el-tree-node__expand-icon,
-  /deep/ .el-tree-node__expand-icon {
+/deep/ .el-tree-node__expand-icon {
  visibility: hidden;
-  }
+}
-  /deep/ .el-tree-node__content {
+/deep/ .el-tree-node__content {
  border: 1px solid rgb(228, 228, 228);
  height: 45px;
-  }
+}
-  /deep/ .el-tree-node:focus > .el-tree-node__content {
+/deep/ .el-tree-node:focus > .el-tree-node__content {
  // background-color: #f5f5f5;
  // color: #0079fe;
  // border-right: 4px solid #0079fe;
-  }
+}
-  /deep/.el-tree-node {
+/deep/.el-tree-node {
  white-space: pre-wrap;
-  }
+}
-  /deep/ .is-current > .el-tree-node__content {
+/deep/ .is-current > .el-tree-node__content {
  // background-color: #f5f5f5;
  // color: #0079fe;
  // border-right: 4px solid #0079fe;
-  }
+}
-  /deep/.el-collapse-item__header {
+/deep/.el-collapse-item__header {
  width: 100%;
  cursor: pointer;
  position: relative;
@@ -379,11 +378,11 @@
  display: inline-block;
  line-height: 45px;
  border: 1px solid rgb(228, 228, 228);
-  }
+}
-  /deep/.el-collapse-item__content {
+/deep/.el-collapse-item__content {
  padding-bottom: 5px;
-  }
+}
-  /deep/.unselected {
+/deep/.unselected {
  // white-space: wrap;
  border: none;
  cursor: pointer;
@@ -400,9 +399,9 @@
    justify-content: center;
    align-items: center;
  }
-  }
+}
-  .select {
+.select {
  border: none;
  cursor: pointer;
  width: 250px;
@@ -419,5 +418,5 @@
    justify-content: center;
    align-items: center;
  }
-  }
+}
 </style>