Merge branch 'dev'

renchao@pashanhoo.com
Showing 7 changed files with 109 additions and 17 deletions
src/api/djbDetail.js
src/views/registerBook/djbFrame.vue
src/views/registerBook/djbFrameData.js
src/views/registerBook/tdcbjyq.vue
src/views/workflow/components/leftmenu/ordinaryMenu.vue
src/views/workflow/components/leftmenu/segmentMenu.vue
src/views/ywbl/ywsq/javascript/slectBdcdata.js
--- a/src/api/djbDetail.js
View file @2f410f0
+++ b/src/api/djbDetail.js
View file @2f410f0
@@ -23,7 +23,7 @@ export function getDjbfm (data) {
 * @param {*} params
 * @author: renchao
 */
- export function getQllxByBdcdyid (params) {
+export function getQllxByBdcdyid (params) {
  return request({
    url: SERVER.SERVERAPI + '/rest/djbDetail/getQllxByBdcdyid',
    method: 'get',
@@ -86,7 +86,7 @@ export function getBdcqljqtsx (data) {
 * @param {*} data
 * @author: renchao
 */
- export function getBdcqljqtsxBdcdyh (data) {
+export function getBdcqljqtsxBdcdyh (data) {
  return request({
    url: SERVER.SERVERAPI + '/rest/djbDetail/getBdcqljqtsxBdcdyh',
    method: 'get',
@@ -120,6 +120,19 @@ export function getJsydsyqList (data) {
 }
 /**
+ * @description: 获取土地承包经营权
+ * @param {*} data
+ * @author: renchao
+ */
+export function getTdcbjyqList (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/djbDetail/getTdcbjyqList',
+    method: 'post',
+    data
+  })
+}
+/**
 * @description: 获取房屋独幢信息集合
 * @param {*} data
 * @author: renchao
@@ -235,7 +248,7 @@ export function getNydsyqList (data) {
 * @author: renchao
 */
- export function getDjbQlxxDiff (data) {
+export function getDjbQlxxDiff (data) {
  return request({
    url: SERVER.SERVERAPI + '/rest/djbDetail/getDjbQlxxDiff?bsmQlxx=' + data,
    method: 'post',
@@ -247,7 +260,7 @@ export function getNydsyqList (data) {
 * @param {*} data
 * @author: renchao
 */
- export function getLqList (data) {
+export function getLqList (data) {
  return request({
    url: SERVER.SERVERAPI + '/rest/djbDetail/getLqList',
    method: 'post',
--- a/src/views/registerBook/djbFrame.vue
View file @2f410f0
+++ b/src/views/registerBook/djbFrame.vue
View file @2f410f0
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2024-01-23 10:37:15
+ * @LastEditTime: 2024-01-25 13:15:05
 -->
 <template>
  <div class="content">
@@ -221,6 +221,7 @@
        this.highlight = false
      },
      taplist (data, index) {
+        console.log(data, 333333);
        this.loadComponent(data.form);
        this.isActive = index;
        this.titleActive = -1
--- a/src/views/registerBook/djbFrameData.js
View file @2f410f0
+++ b/src/views/registerBook/djbFrameData.js
View file @2f410f0
@@ -2,7 +2,7 @@
 /*
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-09-15 10:52:40
+ * @LastEditTime: 2024-01-25 13:37:19
 */
 var qlxxPage = [
    { qllx: "A01", id: "tdsyq", form: "tdsyq.vue", label: "集体土地所有权" },
@@ -13,7 +13,7 @@ var qlxxPage = [
    { qllx: "A06", id: "", form: "", label: "宅基地使用权/房屋所有权" },
    { qllx: "A07", id: "jsydsyq", form: "jsydsyq.vue", label: "集体建设用地使用权" },
    { qllx: "A08", id: "", form: "", label: "集体建设用地使用权/房屋所有权" },
-    { qllx: "A09", id: "jsydsyq", form: "jsydsyq.vue", label: "土地承包经营权" },
+    { qllx: "A09", id: "tdcbjyq", form: "tdcbjyq.vue", label: "土地承包经营权" },
    { qllx: "A11", id: "ldsyq", form: "ldsyq.vue", label: "林地使用权" },
    { qllx: "A12", id: "sllmsyq", form: "sllmsyq.vue", label: "林地使用权/森林、林木使用权" },
    { qllx: "A13", id: "jsydsyq", form: "jsydsyq.vue", label: "草原使用权" },
@@ -90,12 +90,12 @@ export function getNode (qllx, qlxx, bdcdylx, bdcdyid) {
        if (qlxxPage[i].qllx == qllx) {
            if (qllx == "A04" || qllx == "A06" || qllx == "A08") {
                if (bdcdylx == "4") {
-                    node = { bdcdyid: bdcdyid, id: "fdcq1", form: "fdcq1.vue", label: qlxxPage[i].label ,zt: "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi + ")" };
+                    node = { bdcdyid: bdcdyid, id: "fdcq1", form: "fdcq1.vue", label: qlxxPage[i].label, zt: "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi + ")" };
                } else {
-                    node = { bdcdyid: bdcdyid, id: "fdcq2", form: "fdcq2.vue", label: qlxxPage[i].label  ,zt: "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi + ")" };
+                    node = { bdcdyid: bdcdyid, id: "fdcq2", form: "fdcq2.vue", label: qlxxPage[i].label, zt: "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi + ")" };
                }
            } else {
-                node = { bdcdyid: bdcdyid, id: qlxxPage[i].id, form: qlxxPage[i].form, label: qlxxPage[i].label ,zt: "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi + ")" };
+                node = { bdcdyid: bdcdyid, id: qlxxPage[i].id, form: qlxxPage[i].form, label: qlxxPage[i].label, zt: "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi + ")" };
            }
            break;
        }
--- a/src/views/registerBook/tdcbjyq.vue 0 → 100644
View file @2f410f0
+++ b/src/views/registerBook/tdcbjyq.vue 0 → 100644
View file @2f410f0
+<!--
+ * @Description:
+ * @Autor: miaofang
+ * @LastEditTime: 2024-01-25 13:20:07
+-->
+<template>
+  <div class="djxxTable">
+    <djbDetail :title="title" ref="djbDetail" :shows="shows" :propsParam="propsParam"
+      :columns="columns" :tableData="tableData" />
+  </div>
+</template>
+<script>
+  import { datas } from "./qlxxFormData.js";
+  import { getSjlx } from "@/utils/dictionary.js";
+  import { getTdcbjyqList } from "@/api/djbDetail.js";
+  import djbDetail from "./components/djbDetail.vue"
+  export default {
+    components: {
+      djbDetail,
+    },
+    data () {
+      return {
+        printObj: {
+          id: "box",
+          //其他配置项，
+        },
+        shows: false,
+        title: "土地承包经营权登记信息",
+        //传递参数
+        propsParam: this.$attrs,
+        //列表数据
+        tableData: [],
+        //列名称对象
+        columns: datas.columns().JSYDSYQ,
+        render: false,
+      };
+    },
+    created () {
+      this.loadData();
+    },
+    methods: {
+      loadData (checkList = []) {
+        getTdcbjyqList({
+          bdcdyid: this.propsParam.bdcdyid,
+          qllx: this.propsParam.qllx,
+          qszt: checkList
+        }).then((res) => {
+          if (res.code === 200) {
+            this.tableData = res.result;
+            this.shows = this.tableData.length > 0;
+            this.tableData.forEach((item) => {
+              item.sjlx = getSjlx(item.sjlx);
+            });
+            if (this.tableData.length < datas.columns().emptycolNum) {
+              this.$refs.djbDetail.emptycolNum = datas.columns().emptycolNum - this.tableData.length;
+            } else {
+              this.$refs.djbDetail.emptycolNum = 0
+            }
+          }
+        })
+      }
+    }
+  }
+</script>
+<style lang="scss" scoped>
+  @import "./qlxxCommon.scss";
+  .title {
+    position: relative;
+    .print {
+      // background-color: #0079fe;
+      z-index: 10;
+      position: absolute;
+      left: 11px;
+      top: 5px;
+    }
+  }
+</style>
--- a/src/views/workflow/components/leftmenu/ordinaryMenu.vue
View file @2f410f0
+++ b/src/views/workflow/components/leftmenu/ordinaryMenu.vue
View file @2f410f0
 <!--
 * @Description: workFrame左侧菜单列表-普通
 * @Autor: renchao
- * @LastEditTime: 2023-10-17 09:54:06
+ * @LastEditTime: 2024-01-25 13:40:13
 -->
 <template>
  <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
@@ -13,7 +13,7 @@
    <div v-if="this.isShowdrawer">
      <div class="title">
        申请单元列表({{ unitData.length }})
-        <el-button type="text" class="batchDel" @click="handleBatchDel" v-if="unitData.length > 1">批量删除</el-button>
+        <!-- <el-button type="text" class="batchDel" @click="handleBatchDel" v-if="unitData.length > 1">批量删除</el-button> -->
      </div>
      <el-menu v-model="activeIndex" :default-active="activeIndex" :key="key" @select="unitClick">
        <el-menu-item v-for="(item, index) in unitData" :index="index.toString()" :key="index">
@@ -25,7 +25,7 @@
              <p v-else class="title-detail">{{ item.qllxmc }}</p>
            </el-tooltip>
          </div>
-          <i class="el-icon-delete" v-if="unitData.length > 1 && item.sqfl=='1'" @click.stop="handleDel(item)"></i>
+          <!-- <i class="el-icon-delete" v-if="unitData.length > 1 && item.sqfl=='1'" @click.stop="handleDel(item)"></i> -->
        </el-menu-item>
      </el-menu>
    </div>
--- a/src/views/workflow/components/leftmenu/segmentMenu.vue
View file @2f410f0
+++ b/src/views/workflow/components/leftmenu/segmentMenu.vue
View file @2f410f0
 <!--
 * @Description: workFrame左侧菜单列表-分割
 * @Autor: renchao
- * @LastEditTime: 2023-10-17 10:54:39
+ * @LastEditTime: 2024-01-25 13:40:28
 -->
 <template>
  <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
@@ -23,7 +23,7 @@
              <p class="title-detail">{{ item.zl }}</p>
            </el-tooltip>
          </div>
-          <i class="el-icon-delete" v-if="aroundUnitData.length > 1" @click.stop="handleDel(item,'around')"></i>
+          <!-- <i class="el-icon-delete" v-if="aroundUnitData.length > 1" @click.stop="handleDel(item,'around')"></i> -->
        </el-menu-item>
      </el-menu>
      <!-- 变更后单元 -->
@@ -39,7 +39,7 @@
              <p class="title-detail">{{ item.zl }}</p>
            </el-tooltip>
          </div>
-          <i class="el-icon-delete" v-if="afterUnitData.length > 1" @click.stop="handleDel(item, 'after')"></i>
+          <!-- <i class="el-icon-delete" v-if="afterUnitData.length > 1" @click.stop="handleDel(item, 'after')"></i> -->
        </el-menu-item>
      </el-menu>
    </div>
--- a/src/views/ywbl/ywsq/javascript/slectBdcdata.js
View file @2f410f0
+++ b/src/views/ywbl/ywsq/javascript/slectBdcdata.js
View file @2f410f0
 export function queueDjywmc (djywbm, djqxbm) {
-    console.log(djywbm, 'djywbm', 'djqxbm', djqxbm);
    // 土地分割
    if (djqxbm == "A0320099" || djqxbm == "A0330099") {
        return "selectJsydsyqSplitMerge";