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

@@ -207,6 +207,13 @@ aside {
   }
 }
 
+.ellipsis-line {
+  width: 200px;
+  overflow: hidden;
+  text-overflow: ellipsis; //文本溢出显示省略号
+  white-space: nowrap; //文本不会换行
+}
+
 //main-container全局样式
 .app-container {
   padding: 20px;

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-19 09:52:28
+ * @LastEditTime: 2023-08-16 08:54:00
 -->
 <template>
   <div class="djxxTable">
@@ -62,7 +62,14 @@
                 {{ getQsztName(row[item.prop]) }}
               </span>
 
-              <span v-else> {{ row[item.prop] }}</span>
+              <span v-if="item.prop != 'djyy'">
+                {{ 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-07-19 09:52:37
+ * @LastEditTime: 2023-08-16 08:52:10
 -->
 <template>
   <div class="djxxTable">
@@ -56,7 +56,14 @@
                 {{ getQsztName(row[item.prop]) }}
               </span>
 
-              <span v-else> {{ row[item.prop] }}</span>
+              <span v-if="item.prop != 'djyy'">
+                {{ 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>

@@ -90,6 +90,7 @@
        * @author: renchao
        */
       loadComponent (form) {
+        console.log(form, 'form');
         this.componentTag = (r) =>
           require.ensure([], () => r(require("@/views/registerBook/" + form)))
       }

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-19 15:01:08
+ * @LastEditTime: 2023-08-16 08:54:50
 -->
 <template>
   <div class="djxxTable">
@@ -62,7 +62,14 @@
                 {{ getQsztName(row[item.prop]) }}
               </span>
 
-              <span v-else> {{ row[item.prop] }}</span>
+              <span v-if="item.prop != 'djyy'">
+                {{ 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>

@@ -51,7 +51,14 @@
                 {{ getQsztName(row[item.prop]) }}
               </span>
 
-              <span v-else> {{ row[item.prop] }}</span>
+              <span v-if="item.prop != 'djyy'">
+                {{ 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>

@@ -51,7 +51,15 @@
                 {{ getQsztName(row[item.prop]) }}
               </span>
 
-              <span v-else> {{ row[item.prop] }}</span>
+              <span v-if="item.prop != 'djyy'">
+                {{ 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>
@@ -88,7 +96,15 @@
                 {{ getQsztName(row[item.prop]) }}
               </span>
 
-              <span v-else> {{ row[item.prop] }}</span>
+              <span v-if="item.prop != 'djyy'">
+                {{ 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-07-19 15:03:56
+ * @LastEditTime: 2023-08-16 08:53:21
 -->
 <template>
   <div class="djxxTable">
@@ -51,7 +51,14 @@
                 {{ getQsztName(row[item.prop]) }}
               </span>
 
-              <span v-else> {{ row[item.prop] }}</span>
+              <span v-if="item.prop != 'djyy'">
+                {{ 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-07-19 15:04:07
+ * @LastEditTime: 2023-08-16 08:53:33
 -->
 <template>
   <div class="djxxTable">
@@ -50,7 +50,14 @@
                 {{ getQsztName(row[item.prop]) }}
               </span>
 
-              <span v-else> {{ row[item.prop] }}</span>
+              <span v-if="item.prop != 'djyy'">
+                {{ 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-07-19 15:04:15
+ * @LastEditTime: 2023-08-16 08:53:41
 -->
 <template>
   <div class="djxxTable">
@@ -50,7 +50,14 @@
                 {{ getQsztName(row[item.prop]) }}
               </span>
 
-              <span v-else> {{ row[item.prop] }}</span>
+              <span v-if="item.prop != 'djyy'">
+                {{ 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-10 09:34:25
+ * @LastEditTime: 2023-08-16 08:59:32
  */
 import { getPrintTemplateByCode } from "@/api/print";
 import { uploadUndo } from "@/api/clxx";

@@ -253,7 +253,7 @@
               </el-input>
             </el-form-item>
             <el-form-item v-else label="登记原因：" prop="djyy">
-              <el-input class="textArea" type="textarea" :disabled="!ableOperation"
+              <el-input class="textArea" type="textarea" maxlength="500" show-word-limit :disabled="!ableOperation"
                 v-model="ruleForm.diyaq.djyy">
               </el-input>
             </el-form-item>

 <!--
  * @Description: 房屋多幢受理信息
  * @Autor: ssq
- * @LastEditTime: 2023-08-14 13:02:34
+ * @LastEditTime: 2023-08-16 09:06:00
 -->
 <template>
   <div class="slxx">
@@ -164,7 +164,7 @@
           <el-row :gutter="10">
             <el-col>
               <el-form-item v-if="ruleForm.sldy" label="登记原因：" prop="djyy">
-                <el-input class="textArea" type="textarea" :disabled="!ableOperation"
+                <el-input class="textArea" type="textarea" maxlength="500" show-word-limit :disabled="!ableOperation"
                   v-model="ruleForm.fdcq1.djyy">
                 </el-input>
               </el-form-item>

 <!--
  * @Description: 受理信息
  * @Autor: renchao
- * @LastEditTime: 2023-08-14 12:57:21
+ * @LastEditTime: 2023-08-16 09:15:51
 -->
 <template>
   <div class="slxx">
@@ -360,7 +360,7 @@
         <el-row :gutter="10">
           <el-col>
             <el-form-item v-if="ruleForm.sldy" label="登记原因：" prop="djyy">
-              <el-input class="textArea" type="textarea" :disabled="!ableOperation"
+              <el-input class="textArea" type="textarea" maxlength="500"  show-word-limit :disabled="!ableOperation"
                 v-model="ruleForm.fdcq2.djyy">
               </el-input>
             </el-form-item>

 <!--
  * @Description: 受理信息
  * @Autor: renchao
- * @LastEditTime: 2023-08-14 12:58:13
+ * @LastEditTime: 2023-08-16 09:06:05
 -->
 <template>
   <div class="slxx">
@@ -239,7 +239,7 @@
         <el-row :gutter="10">
           <el-col>
             <el-form-item v-if="ruleForm.fdcq2" label="登记原因：" prop="djyy">
-              <el-input class="textArea" type="textarea" :disabled="!ableOperation"
+              <el-input class="textArea" type="textarea" maxlength="500"  show-word-limit :disabled="!ableOperation"
                 v-model="ruleForm.fdcq2.djyy">
               </el-input>
             </el-form-item>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-06-30 17:09:35
+ * @LastEditTime: 2023-08-16 08:53:48
 -->
 <template>
   <div class="djxxTable" :style="{'max-height': this.timeLineHeight + 'px' }"
@@ -50,7 +50,14 @@
                 {{ getQsztName(row[item.prop]) }}
               </span>
 
-              <span v-else> {{ row[item.prop] }}</span>
+              <span v-if="item.prop != 'djyy'">
+                {{ 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>
           </tr>
         </table>

@@ -11,8 +11,7 @@
       ref="ruleForm"
       :label-position="flag ? 'top' : ''"
       :inline="flag"
-      label-width="130px"
-    >
+      label-width="130px">
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
           受理信息
@@ -40,16 +39,14 @@
             <el-form-item label="权利类型：">
               <el-input
                 disabled
-                v-model="ruleForm.sldyList[0].qllxmc"
-              ></el-input>
+                v-model="ruleForm.sldyList[0].qllxmc"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8" v-if="ruleForm.sldyList.length > 0">
             <el-form-item label="登记类型：">
               <el-input
                 disabled
-                v-model="ruleForm.sldyList[0].djlxmc"
-              ></el-input>
+                v-model="ruleForm.sldyList[0].djlxmc"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -116,8 +113,7 @@
               <el-radio-group
                 :disabled="!ableOperation"
                 @change="showCZInfo"
-                v-model="ruleForm.sldyList[0].gyfs"
-              >
+                v-model="ruleForm.sldyList[0].gyfs">
                 <el-radio label="0">单独所有</el-radio>
                 <el-radio label="1">共同共有</el-radio>
                 <el-radio label="2">按份所有</el-radio>
@@ -157,8 +153,7 @@
         <qlrCommonTable
           @upDateQlrxxList="upDateQlrxxList"
           :tableData="ruleForm.qlrList"
-          :gyfs="ruleForm.sldyList[0].gyfs"
-        />
+          :gyfs="ruleForm.sldyList[0].gyfs" />
         <div class="slxx_title title-block">
           登记原因
           <div class="triangle"></div>
@@ -169,9 +164,9 @@
               <el-input
                 class="textArea"
                 type="textarea"
+                maxlength="500"  show-word-limit
                 :disabled="!ableOperation"
-                v-model="ruleForm.fdcq2List[0].djyy"
-              >
+                v-model="ruleForm.fdcq2List[0].djyy">
               </el-input>
             </el-form-item>
           </el-col>
@@ -195,7 +190,7 @@
     computed: {
       ...mapGetters(["dictData", "flag"]),
     },
-    components: { qlrCommonTable},
+    components: { qlrCommonTable },
 
     // 更新义务人信息
     /**
@@ -203,7 +198,7 @@
      * @param {*} val
      * @author: renchao
      */
-    upDateYwrxxList(val) {
+    upDateYwrxxList (val) {
       this.ruleForm.ywrList = _.cloneDeep(val);
     },
     data () {
@@ -231,7 +226,7 @@
         //表单是否可操作
         ableOperation: true,
         rules: {},
-        gyfs:"",
+        gyfs: "",
         bsmSlsq: this.$route.query.bsmSlsq,//受理申请标识码
         splicingFdcq2: {//前端根据后台数组组装展示内容
           fwxz: ''//房屋性质
@@ -253,7 +248,7 @@
         if (res.code == 200) {
           this.ruleForm = res.result;
           this.czrOptions = this.ruleForm.qlrList;
-         this.gyfs=this.ruleForm.sldyList[0].gyfs
+          this.gyfs = this.ruleForm.sldyList[0].gyfs
           this.splicingFdcq2Info();
         }
       })
@@ -315,7 +310,7 @@
        * @author: renchao
        */
       onSubmit () {
-           if (this.ruleForm.sldyList[0].gyfs== "0") {
+        if (this.ruleForm.sldyList[0].gyfs == "0") {
           if (this.ruleForm.qlrList.length > 1) {
             this.$message({
               showClose: true,
@@ -355,52 +350,52 @@
   }
 </script>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
+  @import "~@/styles/public.scss";
 
-/deep/.el-form {
+  /deep/.el-form {
     display: flex;
     flex-direction: column;
     height: calc(100vh - 130px);
-}
+  }
 
-/deep/.el-form-item__label {
+  /deep/.el-form-item__label {
     padding: 0;
-}
+  }
 
-/deep/.el-radio {
+  /deep/.el-radio {
     margin-right: 10px;
-}
+  }
 
-/deep/.el-select {
+  /deep/.el-select {
     width: 100%;
-}
+  }
 
-/deep/.el-form-item {
+  /deep/.el-form-item {
     margin-bottom: 8px;
-}
+  }
 
-.marginBot0 {
+  .marginBot0 {
     margin-bottom: 0 !important;
-}
+  }
 
-.slxx {
+  .slxx {
     box-sizing: border-box;
-}
+  }
 
-.slxx_con {
+  .slxx_con {
     flex: 1;
     height: 100%;
     background-color: #ffffff;
     overflow-y: auto;
     padding-right: 3px;
     overflow-x: hidden;
-}
+  }
 
-.submit_btn {
+  .submit_btn {
     height: 50px;
-}
+  }
 
-.slxx_title {
+  .slxx_title {
     border-bottom: 1px solid $borderColor;
     padding-left: 10px;
     padding-bottom: 5px;
@@ -409,23 +404,23 @@
     font-size: 16px;
     font-weight: 500;
     color: #4a4a4a;
-}
+  }
 
-.btn {
+  .btn {
     text-align: center;
     padding-top: 10px;
     height: 36px;
     background-color: #ffffff;
     padding: 5px 0;
-}
+  }
 
-.textArea {
+  .textArea {
     /deep/.el-textarea__inner {
       min-height: 90px !important;
     }
-}
+  }
 
-/deep/.el-form-item__label {
+  /deep/.el-form-item__label {
     padding-bottom: 0px;
-}
+  }
 </style>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-14 13:03:32
+ * @LastEditTime: 2023-08-16 09:06:15
 -->
 <template>
   <!-- 受理信息 -->
@@ -171,7 +171,7 @@
         <el-row :gutter="10">
           <el-col>
             <el-form-item label="登记原因：" prop="djyy">
-              <el-input class="textArea" type="textarea" :disabled="!ableOperation" v-model="ruleForm.djyy">
+              <el-input class="textArea" type="textarea" maxlength="500" show-word-limit :disabled="!ableOperation" v-model="ruleForm.djyy">
               </el-input>
             </el-form-item>
           </el-col>

@@ -207,7 +207,7 @@
         <el-row :gutter="10">
           <el-col>
             <el-form-item label="登记原因：" prop="djyy">
-              <el-input class="textArea" type="textarea" :disabled="!ableOperation"
+              <el-input class="textArea" type="textarea" maxlength="500" show-word-limit :disabled="!ableOperation"
                 v-model="ruleForm.jsydsyq.djyy">
               </el-input>
             </el-form-item>

@@ -2,7 +2,7 @@
 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-14 12:54:53
+ * @LastEditTime: 2023-08-16 09:06:23
 -->
 <template>
   <!-- 受理信息 -->
@@ -198,6 +198,7 @@
               <el-input
                 class="textArea"
                 type="textarea"
+                maxlength="500" show-word-limit
                 :disabled="!ableOperation"
                 v-model="ruleForm.jsydsyq.djyy">
               </el-input>

 <!--
  * @Description: 房屋多幢受理信息
  * @Autor: ssq
- * @LastEditTime: 2023-08-15 10:24:21
+ * @LastEditTime: 2023-08-16 09:06:27
 -->
 <template>
   <div class="slxx">
@@ -227,6 +227,7 @@
               <el-input
                 class="textArea"
                 type="textarea"
+                maxlength="500" show-word-limit
                 :disabled="!ableOperation"
                 v-model="ruleForm.lq.djyy">
               </el-input>

@@ -225,7 +225,7 @@
         <el-row :gutter="10">
           <el-col>
             <el-form-item label="登记原因：" prop="djyy">
-              <el-input class="textArea" type="textarea" :disabled="!ableOperation"
+              <el-input class="textArea" type="textarea" maxlength="500" show-word-limit :disabled="!ableOperation"
                 v-model="ruleForm.nydsyq.djyy">
               </el-input>
             </el-form-item>

@@ -230,7 +230,7 @@
         <el-row :gutter="10">
           <el-col>
             <el-form-item label="登记原因：" prop="djyy">
-              <el-input class="textArea" type="textarea" :disabled="!ableOperation"
+              <el-input class="textArea" type="textarea" maxlength="500" show-word-limit :disabled="!ableOperation"
                 v-model="ruleForm.nydsyq.djyy">
               </el-input>
             </el-form-item>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-14 13:06:03
+ * @LastEditTime: 2023-08-16 09:06:39
 -->
 <template>
   <!-- 受理信息 -->
@@ -321,6 +321,7 @@
             <el-form-item label="登记原因：" prop="djyy">
               <el-input
                 class="textArea"
+                maxlength="500" show-word-limit
                 type="textarea"
                 :disabled="!ableOperation"
                 v-model="ruleForm.tdsyq.djyy">

@@ -196,7 +196,7 @@
         <el-row :gutter="10">
           <el-col>
             <el-form-item label="登记原因：" prop="djyy">
-              <el-input class="textArea" type="textarea" :disabled="!ableOperation"
+              <el-input class="textArea" type="textarea" maxlength="500" show-word-limit :disabled="!ableOperation"
                 v-model="ruleForm.ygdj.djyy">
               </el-input>
             </el-form-item>

@@ -164,7 +164,7 @@
         <el-row :gutter="10">
           <el-col>
             <el-form-item label="登记原因：" prop="djyy">
-              <el-input class="textArea" type="textarea" :disabled="!ableOperation"
+              <el-input class="textArea" type="textarea" maxlength="500" show-word-limit :disabled="!ableOperation"
                 v-model="ruleForm.ygdj.djyy">
               </el-input>
             </el-form-item>

@@ -225,7 +225,7 @@
         <el-row :gutter="10">
           <el-col>
             <el-form-item label="登记原因：" prop="djyy">
-              <el-input class="textArea" type="textarea" :disabled="!ableOperation"
+              <el-input class="textArea" type="textarea" maxlength="500" show-word-limit :disabled="!ableOperation"
                 v-model="ruleForm.ygdj.djyy">
               </el-input>
             </el-form-item>

@@ -189,7 +189,7 @@
               </el-input>
             </el-form-item>
             <el-form-item v-else label="登记原因：" prop="djyy">
-              <el-input class="textArea" type="textarea" :disabled="!ableOperation"
+              <el-input class="textArea" type="textarea" maxlength="500" show-word-limit :disabled="!ableOperation"
                 v-model="ruleForm.diyaqList[0].djyy">
               </el-input>
             </el-form-item>

@@ -243,7 +243,7 @@
               </el-input>
             </el-form-item>
             <el-form-item v-else label="登记原因：" prop="djyy">
-              <el-input class="textArea" type="textarea" :disabled="!ableOperation "
+              <el-input class="textArea" type="textarea" maxlength="500" show-word-limit :disabled="!ableOperation "
                 v-model="ruleForm.diyaq.djyy">
               </el-input>
             </el-form-item>