Merge branch 'dev'

renchao@pashanhoo.com
Showing 4 changed files with 89 additions and 172 deletions
src/views/lpb/lpbContent/index.vue
src/views/ywbl/ywsq/components/selectYbbgSplitMerge.vue
src/views/ywbl/ywsq/components/selectYbsc.vue
src/views/ywbl/ywsq/javascript/slectBdcdata.js
--- a/src/views/lpb/lpbContent/index.vue
View file @8ac1f5a
+++ b/src/views/lpb/lpbContent/index.vue
View file @8ac1f5a
 <template>
  <div class="lpbContent-wrap" ref="lpbContentWrap">
-    <div
+    <div class="lpbContent" ref="lpbContent" :style="{ 'height': 'calc(100% - '+ lpbContentHeight +'px)'}">
-      class="lpbContent"
-      ref="lpbContent"
-      :style="{ height: 'calc(100% - ' + lpbContentHeight + 'px)' }"
-    >
      <!-- 纵向倒序排列 逻辑幢位于独立幢单元和独立层户的上方 -->
      <div class="ch-zdy-wrap">
        <!-- 幢单元 -->
-        <zdy-cpn
+        <zdy-cpn v-if="lpbData.zdys.length" :zdys="lpbData.zdys" :onlyShow="onlyShow" />
-          v-if="lpbData.zdys.length"
-          :zdys="lpbData.zdys"
-          :onlyShow="onlyShow"
-        />
        <!-- 独立层户 -->
-        <ch-cpn
+        <ch-cpn v-if="lpbData.cs.length" :ch="lpbData.cs" :onlyShow="onlyShow" />
-          v-if="lpbData.cs.length"
-          :ch="lpbData.cs"
-          :onlyShow="onlyShow"
-        />
      </div>
      <!-- 逻辑幢 -->
-      <ljzs-cpn
+      <ljzs-cpn v-if="lpbData.ljzs.length" :ljzs="lpbData.ljzs" :onlyShow="onlyShow" />
-        v-if="lpbData.ljzs.length"
-        :ljzs="lpbData.ljzs"
-        :onlyShow="onlyShow"
-      />
    </div>
    <!-- 自然幢名称 -->
-    <p
+    <p class="lpb-xmmc" v-if="onlyShow" style="border-bottom: 1px solid #e6e6e6">{{ lpbData.xmmc }}</p>
-      class="lpb-xmmc"
+    <p class="lpb-xmmc" v-else :style="{ 'border-bottom':'1px solid #e6e6e6'}">
-      v-if="onlyShow"
-      style="border-bottom: 1px solid #e6e6e6"
-    >
-      {{ lpbData.xmmc }}
-    </p>
-    <p
-      class="lpb-xmmc"
-      v-else
-      :style="{ 'border-bottom': '1px solid #e6e6e6' }"
-    >
      <el-checkbox @change="zdySelectAll($event)">{{
        lpbData.xmmc
      }}</el-checkbox>
    </p>
-    <el-button
+    <el-button type="primary" class="save-btn" v-if="!onlyShow && showSave" @click="saveLpb">选择确认</el-button>
-      type="primary"
+    <el-button type="primary" class="save-btn" v-if="!onlyShow && !showSave" @click="submitForm" :loading="loading">发起申请</el-button>
-      class="save-btn"
-      v-if="!onlyShow && showSave"
-      @click="saveLpb"
-      >选择确认</el-button
-    >
-    <el-button
-      type="primary"
-      class="save-btn"
-      v-if="!onlyShow && !showSave"
-      @click="submitForm"
-      :loading="loading"
-      >发起申请</el-button
-    >
    <!-- 右键菜单 -->
    <ul
      v-show="lpbChVisible"
      :style="{ left: lpbChLeft + 'px', top: lpbChTop + 'px' }"
-      class="contextmenu"
+      class="contextmenu">
-    >
      <li @click="menuClick">菜单一</li>
      <li @click="menuClick">菜单二</li>
    </ul>
  </div>
 </template>
 <script>
-import { getLpb } from "@/api/lpcx.js";
+  import { getLpb } from "@/api/lpcx.js";
-import chCpn from "./ch.vue";
+  import chCpn from "./ch.vue";
-import zdyCpn from "./zdys.vue";
+  import zdyCpn from "./zdys.vue";
-import ljzsCpn from "./ljzs.vue";
+  import ljzsCpn from "./ljzs.vue";
-import {
+  import { startBusinessFlow, choiceBdcdy, againAddSldy } from "@/api/workFlow.js";
-  startBusinessFlow,
+  import jump from "../../ywbl/ywsq/components/mixin/jump";
-  choiceBdcdy,
+  import store from '@/store/index.js'
-  againAddSldy,
+  import { ywPopupCacel } from "@/utils/popup.js";
-} from "@/api/workFlow.js";
+  export default {
-import jump from "../../ywbl/ywsq/components/mixin/jump";
-import store from "@/store/index.js";
-import { ywPopupCacel } from "@/utils/popup.js";
-export default {
    mixins: [jump],
-  provide() {
+    provide () {
      return {
        openMenu: this.openMenu,
        selectAll: this.selectAllObj,
        changeChoosedObj: this.changeChoosedObj,
        clearChangeChoosedObj: this.clearChangeChoosedObj,
-      getBsmList: this.getBsmList,
+        getBsmList: this.getBsmList
      };
    },
    name: "",
@@ -123,10 +79,11 @@ export default {
      },
      sqywInfo: {
        type: Object,
-      default: () => {},
+        default: () => { }
      },
+      isJump: { type: Boolean, default: false },
    },
-  data() {
+    data () {
      return {
        lpbData: {
          ljzs: [],
@@ -145,17 +102,15 @@ export default {
        // 改变户选中状态
        changeChoosedObj: {
          bsms: [],
-        color: "",
+          color: ''
        },
        // 选中户bsm合集
        bsmList: [],
        loading: false,
      };
    },
-  mounted() {
+    mounted () {
-    this.scyclx
+      this.scyclx ? this.getLpb(this.zrzbsm, this.scyclx) : this.getLpb(this.zrzbsm);
-      ? this.getLpb(this.zrzbsm, this.scyclx)
-      : this.getLpb(this.zrzbsm);
      window.lpbContent = this;
    },
    methods: {
@@ -164,70 +119,52 @@ export default {
       * @param {Array} bsmList
       * @author: renchao
       */
-    getBsmList(bsmList, compFlag) {
+      getBsmList (bsmList, compFlag) {
        // 根据本次传入的组件标识删除之前对应组件标识存入hbsmList的数据
-      this.bsmList = this.bsmList.filter((i) => i.flag != compFlag);
+        this.bsmList = this.bsmList.filter((i) => i.flag != compFlag)
        // 合并本次数据
-      this.bsmList = this.bsmList.concat([
+        this.bsmList = this.bsmList.concat([...new Map(bsmList.map(item => [item.bdcdyh, item])).values()]);
-        ...new Map(bsmList.map((item) => [item.bdcdyh, item])).values(),
-      ]);
        // })
      },
      /**
       * @description: 保存当前楼盘表
       * @author: renchao
       */
-    saveLpb() {
+      saveLpb () {
        if (this.bsmList.length == 0) {
          this.$message.error("请至少选择一条数据");
          return;
        }
        this.loading = true;
-      store.dispatch("user/reMenuRefresh", false);
+        store.dispatch('user/reMenuRefresh', false)
        againAddSldy({
          bsmSqyw: this.sqywInfo.bsmSqyw,
          bsmSlsq: this.sqywInfo.bsmSlsq,
          bdcdysz: this.bsmList,
-        sjlx: "houses",
+          sjlx: "houses"
-      })
+        }).then((res) => {
-        .then((res) => {
+          this.loading = false
-          this.loading = false;
          if (res.code == 200) {
            this.$message({
              showClose: true,
-              message: "添加成功",
+              message: '添加成功',
-              type: "success",
+              type: 'success'
-            });
+            })
+            store.dispatch('user/reMenuRefresh', true)
            if (!this.isJump) {
-              this.jump(res.result, this.sqywInfo.djywbm);
+              this.jump(res.result, this.sqywInfo.djywbm)
            }
-            store.dispatch("user/refreshPage", true);
-            //this.close();
            this.$popupCacel();
          } else {
            if (res.result && res.result.length > 0) {
-              this.$popup("申请错误明细", "components/ywdialog", {
+              this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { result: res.result } })
-                width: "36%",
-                formData: { result: res.result },
-              });
-            } else {
-              if (res.result && res.result.length > 0) {
-                this.$popup("申请错误明细", "components/ywdialog", {
-                  width: "36%",
-                  formData: { result: res.result },
-                });
            } else {
-                this.$popup("申请错误明细", "components/ywdialog", {
+              this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { message: res.message } })
-                  width: "36%",
-                  formData: { message: res.message },
-                });
-              }
            }
          }
+        }).catch(() => {
+          this.loading = false
        })
-        .catch(() => {
-          this.loading = false;
-        });
        // todo 调用保存接口 传入参数待定
        //console.log(this.bsmList,'this.bsmList');
        // 保存成功后关闭弹框
@@ -240,7 +177,7 @@ export default {
       * @param {*} color
       * @author: renchao
       */
-    changeChoosed(bsms, color) {
+      changeChoosed (bsms, color) {
        this.changeChoosedObj.bsms = bsms;
        this.changeChoosedObj.color = color;
      },
@@ -248,7 +185,7 @@ export default {
       * @description: clearChangeChoosedObj
       * @author: renchao
       */
-    clearChangeChoosedObj() {
+      clearChangeChoosedObj () {
        this.changeChoosedObj.bsms = [];
      },
      //全选户
@@ -257,7 +194,7 @@ export default {
       * @param {*} val
       * @author: renchao
       */
-    zdySelectAll(val) {
+      zdySelectAll (val) {
        this.selectAllObj.selectAll = val;
      },
      //获取楼盘表数据
@@ -268,28 +205,17 @@ export default {
       * @param {*} actual
       * @author: renchao
       */
-    getLpb(zrzbsm, scyclx, actual) {
+      getLpb (zrzbsm, scyclx, actual) {
-      if (!zrzbsm) {
-        this.$message({
-          message: "暂无楼盘表",
-          type: "warning",
-        });
-      } else {
        getLpb(zrzbsm, scyclx).then((res) => {
          if (res.code == 200) {
            if (scyclx) {
              if (res.result.syclx == "1") {
-                res.result.lpb.ljzs = res.result.lpb.ljzs.sort(
+                res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place"));
-                  this.compare("place")
+                this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb;
-                );
-                this.lpbData =
-                  res.result.lpb == null ? this.lpbData : res.result.lpb;
              }
            } else {
-              this.$message({
+              res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place"));
-                message: res.message,
+              this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb;
-                type: "warning",
-              });
            }
          } else {
            this.$message({
@@ -298,7 +224,6 @@ export default {
            });
          }
        });
-      }
      },
      //户右键点击事件
      /**
@@ -308,7 +233,7 @@ export default {
       * @param {*} type
       * @author: renchao
       */
-    openMenu(e, item, type) {
+      openMenu (e, item, type) {
        this.lpbChLeft = e.pageX - 96;
        this.lpbChTop = e.pageY - 23;
        // this.lpbChVisible = true;
@@ -318,7 +243,7 @@ export default {
       * @description: 关闭户右键菜单
       * @author: renchao
       */
-    closeMenu() {
+      closeMenu () {
        this.lpbChVisible = false;
      },
      //右键菜单点击
@@ -326,7 +251,7 @@ export default {
       * @description: 右键菜单点击
       * @author: renchao
       */
-    menuClick() {
+      menuClick () {
        this.closeMenu();
      },
      /**
@@ -334,7 +259,7 @@ export default {
       * @param {*} property
       * @author: renchao
       */
-    compare(property) {
+      compare (property) {
        return function (a, b) {
          var value1 = a[property];
          var value2 = b[property];
@@ -345,7 +270,7 @@ export default {
       * @description: submitForm
       * @author: renchao
       */
-    submitForm() {
+      submitForm () {
        if (this.bsmList.length == 0) {
          this.$message.error("请至少选择一条数据");
          return;
@@ -354,68 +279,60 @@ export default {
        startBusinessFlow({
          bsmSqyw: this.sqywInfo.bsmSqyw,
          bdcdysz: this.bsmList,
-      })
+        }).then((res) => {
-        .then((res) => {
+          this.loading = false
-          this.loading = false;
          if (res.code == 200) {
            this.$message({
              showClose: true,
-              message: "发起申请成功",
+              message: '发起申请成功',
-              type: "success",
+              type: 'success'
-            });
+            })
            if (!this.isJump) {
-              this.jump(res.result, this.sqywInfo.djywbm);
+              this.jump(res.result, this.sqywInfo.djywbm)
            } else {
-              store.dispatch("user/refreshPage", true);
+              store.dispatch('user/refreshPage', true);
            }
-            this.close();
+            this.close()
          } else {
            if (res.result && res.result.length > 0) {
-              this.$popup("申请错误明细", "components/ywdialog", {
+              this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { result: res.result } })
-                width: "36%",
-                formData: { result: res.result },
-              });
            } else {
-              this.$popup("申请错误明细", "components/ywdialog", {
+              this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { message: res.message } })
-                width: "36%",
-                formData: { message: res.message },
-              });
            }
          }
+        }).catch(() => {
+          this.loading = false
        })
-        .catch(() => {
-          this.loading = false;
-        });
      },
      /**
       * @description: close
       * @param {*} val
       * @author: renchao
       */
-    close() {
+      close () {
-      ywPopupCacel();
+        ywPopupCacel()
      },
    },
    computed: {
-    lpbContentHeight() {
+      lpbContentHeight () {
-      return this.onlyShow ? 32 : 76;
+        return this.onlyShow ? 32 : 76
        // return 76
-    },
+      }
    },
    watch: {
      //户右键菜单显示时，监听到鼠标点击时关闭户右键菜单
-    lpbChVisible(value) {
+      lpbChVisible (value) {
        if (value) {
          document.body.addEventListener("click", this.closeMenu);
        } else {
          document.body.removeEventListener("click", this.closeMenu);
        }
+      }
    },
-  },
+  };
-};
 </script>
 <style scoped lang="scss">
-.lpbContent-wrap {
+  .lpbContent-wrap {
    width: 100%;
    height: 100%;
    overflow: hidden;
@@ -487,5 +404,5 @@ export default {
        background: #ffffff;
      }
    }
-}
+  }
 </style>
--- a/src/views/ywbl/ywsq/components/selectYbbgSplitMerge.vue
View file @8ac1f5a
+++ b/src/views/ywbl/ywsq/components/selectYbbgSplitMerge.vue
View file @8ac1f5a
@@ -168,7 +168,7 @@
        @current-change="handleCurrentChange"></el-pagination>
    </div>
    <div class="from-clues-content loadingtext">
-      预告抵押信息
+      预告抵押登记信息
      <lb-table ref="table" :pagination="false" :calcHeight="500" :column="tableData.columns"
        :data="tableData.dataList">
      </lb-table>
--- a/src/views/ywbl/ywsq/components/selectYbsc.vue
View file @8ac1f5a
+++ b/src/views/ywbl/ywsq/components/selectYbsc.vue
View file @8ac1f5a
@@ -58,7 +58,7 @@
  import { ywPopupDialog } from "@/utils/popup.js";
  import { datas, sendThis } from "../javascript/selectH.js";
  import { defaultParameters } from "../javascript/publicDefaultPar.js";
-  // import { selectHQjdc } from "@/api/ywsq.js";
+  import { selectHQjdc } from "@/api/ywsq.js";
  import { startTogetherFlow, againAddSldy } from "@/api/workFlow.js";
  export default {
    mixins: [ywsqTable, jump],
@@ -89,14 +89,14 @@
      queryClick () {
        this.$startLoading();
        this.queryForm.sqywbm = this.sqywInfo.djywbm;
-        // selectHQjdc({ ...this.queryForm, ...this.pageData }).then((res) => {
+        selectHQjdc({ ...this.queryForm, ...this.pageData }).then((res) => {
-        //   this.$endLoading();
+          this.$endLoading();
-        //   if (res.code === 200) {
+          if (res.code === 200) {
-        //     let { total, records } = res.result;
+            let { total, records } = res.result;
-        //     this.tableData.total = total;
+            this.tableData.total = total;
-        //     this.tableData.data = records;
+            this.tableData.data = records;
-        //   }
+          }
-        // });
+        });
      },
      /**
       * @description: submitForm
--- a/src/views/ywbl/ywsq/javascript/slectBdcdata.js
View file @8ac1f5a
+++ b/src/views/ywbl/ywsq/javascript/slectBdcdata.js
View file @8ac1f5a
 export function queueDjywmc (djywbm, djqxbm) {
+    console.log(djywbm);
    // 土地分割
    if (djqxbm == "A0320099" || djqxbm == "A0330099") {
        return "selectJsydsyqSplitMerge";
@@ -116,7 +117,6 @@ export function queueDjywmc (djywbm, djqxbm) {
            vm = "selectFwsyq";
            break;
        case "C04372": //一并国有房屋变更
-            // vm = "selectYbgybg";
            vm = "selectFwbjDybgSplitMerge"
            break;
        case "A11100"://林地使用权首次