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

@@ -52,7 +52,14 @@
               </div>
               <span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span>
 
-              <span v-else>{{ row[item.prop] }}</span>
+              <span v-if="!['djyy','fj'].includes(item.prop)">
+                {{ row[item.prop] }}
+              </span>
+              <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
+                <span class="ellipsis-line">
+                  {{ row[item.prop] }}
+                </span>
+              </el-tooltip>
             </td>
             <td v-for="count in emptycolNum" :key="~count"></td>
           </tr>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-16 08:54:00
+ * @LastEditTime: 2023-08-23 15:54:12
 -->
 <template>
   <div class="djxxTable">
@@ -62,7 +62,7 @@
                 {{ getQsztName(row[item.prop]) }}
               </span>
 
-              <span v-if="item.prop != 'djyy'">
+              <span v-if="!['djyy','fj'].includes(item.prop)">
                 {{ row[item.prop] }}
               </span>
               <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-16 08:52:10
+ * @LastEditTime: 2023-08-23 15:54:23
 -->
 <template>
   <div class="djxxTable">
@@ -56,7 +56,7 @@
                 {{ getQsztName(row[item.prop]) }}
               </span>
 
-              <span v-if="item.prop != 'djyy'">
+              <span v-if="!['djyy','fj'].includes(item.prop)">
                 {{ row[item.prop] }}
               </span>
               <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-16 15:00:12
+ * @LastEditTime: 2023-08-23 15:57:40
 -->
 <template>
   <div class="content">
@@ -14,8 +14,7 @@
         :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
@@ -23,8 +22,7 @@
           ref="sfq"
           v-for="(item, index) in sfqdata"
           :key="index"
-          :name="index"
-        >
+          :name="index">
           <template slot="title">
             <span class="text" @click="addlist(item)">
               <span>
@@ -37,8 +35,7 @@
             :re='item'
             :key="index"
             class="sfqcontent"
-            @click="addlist(item, index)"
-          >
+            @click="addlist(item, index)">
             {{ item.label }}
           </el-button>
         </el-collapse-item>
@@ -48,16 +45,15 @@
       <component
         :is="componentTag"
         @getBdcdyh="getBdcdyh"
-        v-bind="currentSelectProps"
-      />
+        v-bind="currentSelectProps" />
     </div>
   </div>
 </template>
 <script>
-import { getBdcqljqtsx } from "@/api/djbDetail.js";
-import { loadTreeData, loadsfqData, getNode } from "./djbFrameData.js";
-export default {
-  data() {
+  import { getBdcqljqtsx } from "@/api/djbDetail.js";
+  import { loadTreeData, loadsfqData, getNode } from "./djbFrameData.js";
+  export default {
+    data () {
       return {
         activeName: 0,
         //接收参数
@@ -71,8 +67,8 @@ export default {
         //左侧树形结构数据
         treedata: [],
         sfqdata: [],
-      keyy:"",
-      iskey:"",
+        keyy: "",
+        iskey: "",
         defaultNode: "",
         defaultProps: {
           value: "id",
@@ -83,7 +79,7 @@ export default {
       };
     },
     props: ["formData"],
-  mounted() {
+    mounted () {
       this.loadData(this.formData.bdcdyh);
     },
     methods: {
@@ -93,30 +89,30 @@ export default {
       * @author: miaofang
       * 点击不动产单元号事件
       */
-    getBdcdyh(val) {
+      getBdcdyh (val) {
         this.addloadData(val);
       },
       /**
        * @description: addloadData
        * @author: miaofang
        */
-    addloadData(val) {
+      addloadData (val) {
         getBdcqljqtsx({
           bdcdyid: val.bdcdyid,
           bdcdyh: val.bdcdyh,
         }).then((res) => {
           if (res.code === 200) {
             if (this.sfqdata.some((item) => item.bdcdyid === val.bdcdyid)) {
-          let index= this.sfqdata.findIndex((item) => {
-              return item.bdcdyid ==val.bdcdyid;
+              let index = this.sfqdata.findIndex((item) => {
+                return item.bdcdyid == val.bdcdyid;
               });
-            this.activeName=index
-            this.setstyle(index,0,this.iskey);
+              this.activeName = index
+              this.setstyle(index, 0, this.iskey);
             } else {
               this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid));
               this.activeName = this.sfqdata.length - 1;
               this.$nextTick(() => {
-              this.setstyle(this.sfqdata.length - 1,0,this.iskey);
+                this.setstyle(this.sfqdata.length - 1, 0, this.iskey);
               })
             }
           }
@@ -132,7 +128,7 @@ export default {
    * @description: loadData
    * @author: renchao
    */
-    loadData(val) {
+      loadData (val) {
         getBdcqljqtsx({
           bdcdyid: this.formData.bdcdyid,
           bdcdyh: val,
@@ -148,15 +144,15 @@ export default {
                 { linShi: 0, xianShi: 0, liShi: 0 },
                 this.formData.bdcdylx || ""
               );
-            this.sfqdata[0].children.forEach((item,index) => {
-              if( item.id==this.defaultNode.id){
-              this.iskey=index
+              this.sfqdata[0].children.forEach((item, index) => {
+                if (item.id == this.defaultNode.id) {
+                  this.iskey = index
                 }
               })
               // this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
               // this.loadComponent(this.defaultNode.form);
 
-              this.setstyle(0,0,this.iskey);
+              this.setstyle(0, 0, this.iskey);
 
 
             });
@@ -174,7 +170,7 @@ export default {
        * @param {*} data
        * @author: renchao
        */
-    handleNodeClick(data) {
+      handleNodeClick (data) {
         this.loadComponent(data.form);
       },
       /**
@@ -183,17 +179,17 @@ export default {
    * @author: renchao
    * 设置样式和点击定位到当前功能
    */
-    setstyle(newindex,index,key) {
-      if(key!=undefined||this.keyy==index){
-        if(key!=undefined){
-          this.keyy=key
+      setstyle (newindex, index, key) {
+        if (key != undefined || this.keyy == index) {
+          if (key != undefined) {
+            this.keyy = key
           }
           this.loadComponent(this.$refs.sfq[newindex].$children[this.keyy].$attrs.re.form);
           let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el
           dpme.style.backgroundColor = "#f5f5f5";
           dpme.style.color = "#0079fe";
           dpme.style.borderRight = "4px solid #0079fe";
-      }else{
+        } else {
           let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el
           dpme.style.backgroundColor = "#ffffff";
           dpme.style.color = "black";
@@ -210,19 +206,19 @@ export default {
     * @author: renchao
     * 新增列表功能
     */
-    addlist(data, index) {
-      if(index!=undefined){
-       let newindex= this.sfqdata.findIndex((item) => {
-              return item.bdcdyid ==data.bdcdyid;
+      addlist (data, index) {
+        if (index != undefined) {
+          let newindex = this.sfqdata.findIndex((item) => {
+            return item.bdcdyid == data.bdcdyid;
           });
-      this.setstyle(newindex,index);
+          this.setstyle(newindex, index);
           this.currentSelectProps.bdcdyid = data.bdcdyid;
           this.loadComponent(data.form);
-      }else{
-       let newindex= this.sfqdata.findIndex((item) => {
-              return item.bdcdyid ==data.bdcdyid;
+        } else {
+          let newindex = this.sfqdata.findIndex((item) => {
+            return item.bdcdyid == data.bdcdyid;
           });
-      this.setstyle(newindex,index,this.iskey);
+          this.setstyle(newindex, index, this.iskey);
           this.currentSelectProps.bdcdyid = data.bdcdyid;
         }
 
@@ -232,19 +228,20 @@ export default {
        * @param {*} form
        * @author: renchao
        */
-    loadComponent(form) {
+      loadComponent (form) {
+        console.log(form, 'form');
         this.componentTag = (r) =>
           require.ensure([], () => r(require("@/views/registerBook/" + form)));
       },
     },
-};
+  };
 </script>
 <style scoped lang="scss">
-/deep/.rollTable {
+  /deep/.rollTable {
     height: calc(100vh - 300px) !important;
-}
+  }
 
-.content {
+  .content {
     width: 100%;
     height: 100%;
     display: flex;
@@ -266,35 +263,35 @@ export default {
       background-color: #f5f5f5;
       border: 1px solid rgb(228, 228, 228);
     }
-}
+  }
 
-/deep/ .expanded.el-tree-node__expand-icon,
-/deep/ .el-tree-node__expand-icon {
+  /deep/ .expanded.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;
@@ -319,11 +316,11 @@ export default {
     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/.sfqcontent {
+  }
+  /deep/.sfqcontent {
     white-space: wrap;
     border: none;
     padding: 0;
@@ -342,14 +339,14 @@ export default {
     height: 45px;
     border: 1px solid rgb(228, 228, 228);
     border-right: 4px solid #f5f5f5;
-}
-.sfqcontent:hover {
+  }
+  .sfqcontent:hover {
     background-color: #f5f5f5;
     color: black;
-}
-.sfqcontent:focus {
+  }
+  .sfqcontent:focus {
     background-color: #f5f5f5;
     color: #0079fe;
     border-right: 4px solid #0079fe;
-}
+  }
 </style>

@@ -46,7 +46,13 @@
                 {{ getQsztName(row[item.prop]) }}
               </span>
 
-              <span v-if="item.prop !== 'qszt' && !judge(item.label)"> {{ row[item.prop] }}</span>
+              <el-tooltip v-if="['djyy','fj'].includes(item.prop)" effect="dark" :content="row[item.prop]" placement="top">
+                <span class="ellipsis-line">
+                  {{ row[item.prop] }}
+                </span>
+              </el-tooltip>
+
+              <span v-if="(item.prop !== 'qszt' && item.prop !== 'djyy'&& item.prop !== 'fj') && !judge(item.label)"> {{ row[item.prop] }}</span>
               <div class="many" v-if="judge(item.label)">
                 <div v-for="(label, index) in row.djQlxxFdcqxmDoList" :key="index">
                   {{ label[item.prop] }}
@@ -147,10 +153,10 @@
        * @param {*} lable
        * @author: renchao
        */
-      judge(label){
+      judge (label) {
         if ('项目名称幢号总层数规划用途用途名称批准用途实际用途房屋结构房屋结构名称建筑面积竣工时间总套数'.indexOf(label) > -1) {
           return true
-        }else{
+        } else {
           return false
         }
       },
@@ -187,20 +193,20 @@
 
 <style lang="scss" scoped>
   @import "./qlxxCommon.scss";
-  .cols{
-    td{
-      .many{
+  .cols {
+    td {
+      .many {
         width: 100%;
         height: 100%;
         display: flex;
         flex-direction: row;
-        div{
+        div {
           flex: 1;
           border-right: 2px solid #e3e2e2;
           line-height: 40px;
           overflow: unset;
         }
-        div:last-child{
+        div:last-child {
           border: 0;
         }
       }

@@ -62,7 +62,7 @@
                 {{ getQsztName(row[item.prop]) }}
               </span>
 
-              <span v-if="item.prop != 'djyy'">
+              <span v-if="!['djyy','fj'].includes(item.prop)">
                 {{ row[item.prop] }}
               </span>
               <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
@@ -70,6 +70,7 @@
                   {{ row[item.prop] }}
                 </span>
               </el-tooltip>
+
             </td>
             <td v-for="count in emptycolNum" :key="~count"></td>
           </tr>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-19 15:01:40
+ * @LastEditTime: 2023-08-23 15:54:45
 -->
 <template>
   <div class="djxxTable">
@@ -51,7 +51,7 @@
                 {{ getQsztName(row[item.prop]) }}
               </span>
 
-              <span v-if="item.prop != 'djyy'">
+              <span v-if="!['djyy','fj'].includes(item.prop)">
                 {{ row[item.prop] }}
               </span>
               <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-19 15:03:14
+ * @LastEditTime: 2023-08-23 15:54:51
 -->
 <template>
   <div class="djxxTable">
@@ -96,7 +96,7 @@
                 {{ getQsztName(row[item.prop]) }}
               </span>
 
-              <span v-if="item.prop != 'djyy'">
+              <span v-if="!['djyy','fj'].includes(item.prop)">
                 {{ row[item.prop] }}
               </span>
               <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
@@ -104,7 +104,6 @@
                   {{ row[item.prop] }}
                 </span>
               </el-tooltip>
-
             </td>
             <td v-for="count in emptycolNum" :key="~count"></td>
           </tr>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-16 08:53:21
+ * @LastEditTime: 2023-08-23 15:54:56
 -->
 <template>
   <div class="djxxTable">
@@ -51,7 +51,7 @@
                 {{ getQsztName(row[item.prop]) }}
               </span>
 
-              <span v-if="item.prop != 'djyy'">
+              <span v-if="!['djyy','fj'].includes(item.prop)">
                 {{ row[item.prop] }}
               </span>
               <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-16 08:53:33
+ * @LastEditTime: 2023-08-23 15:55:02
 -->
 <template>
   <div class="djxxTable">
@@ -50,7 +50,7 @@
                 {{ getQsztName(row[item.prop]) }}
               </span>
 
-              <span v-if="item.prop != 'djyy'">
+              <span v-if="!['djyy','fj'].includes(item.prop)">
                 {{ row[item.prop] }}
               </span>
               <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-16 08:53:41
+ * @LastEditTime: 2023-08-23 15:55:15
 -->
 <template>
   <div class="djxxTable">
@@ -50,7 +50,7 @@
                 {{ getQsztName(row[item.prop]) }}
               </span>
 
-              <span v-if="item.prop != 'djyy'">
+              <span v-if="!['djyy','fj'].includes(item.prop)">
                 {{ row[item.prop] }}
               </span>
               <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-16 08:53:48
+ * @LastEditTime: 2023-08-23 15:56:52
 -->
 <template>
   <div class="djxxTable" :style="{'max-height': this.timeLineHeight + 'px' }"
@@ -50,7 +50,7 @@
                 {{ getQsztName(row[item.prop]) }}
               </span>
 
-              <span v-if="item.prop != 'djyy'">
+              <span v-if="!['djyy','fj'].includes(item.prop)">
                 {{ row[item.prop] }}
               </span>
               <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">