Merge branch 'dev20230707' of http://192.168.60.201/root/dsk-operate-sys into dev20230707

dsk-operate-ui/src/assets/styles/project.scss

@@ -1244,3 +1244,9 @@
     overflow-y: clip;
   }
 }
+
+.el-table__fixed {
+  .el-table__body {
+    padding-bottom: 16px;
+  }
+}

dsk-operate-ui/src/views/custom/customList/index.vue

@@ -26,7 +26,7 @@
             </div>
           </div>
           <skeleton v-if="isSkeleton"></skeleton>
-          <el-table v-if="!isSkeleton&&tableData.total > 0" class="fixed-table"
+          <el-table v-show="!isSkeleton&&tableData.total > 0" class="fixed-table" max-height="640" ref="thistables"
                     :data="tableData.rows"
             stripe border
             style="width: 100%">
@@ -48,10 +48,10 @@
               <div class="ps1">
                 <div class="wordprimary ps2" @click="toDetail(scope.row,'')" v-html="scope.row.companyName"></div>
                 <div class="ps3">
-                  <el-tooltip class="item" effect="dark" content="写跟进" placement="top">
+                  <el-tooltip class="item" effect="dark" content="写跟进" placement="top" transition="" :open-delay="450">
                     <div  @click="toDetail(scope.row,'gjjl')"><img class="i" src="@/assets/images/project/edit_1.png"><img class="o" src="@/assets/images/project/edit_11.png"></div>
                   </el-tooltip>
-                  <el-tooltip class="item" effect="dark" content="编辑信息" placement="top">
+                  <el-tooltip class="item" effect="dark" content="编辑信息" placement="top" transition="" :open-delay="450">
                     <div  @click="toDetail(scope.row,'business')"><img class="i" src="@/assets/images/project/edit_2.png"><img class="o" src="@/assets/images/project/edit_22.png"></div>
                   </el-tooltip>
                 </div>

dsk-operate-ui/src/views/custom/historicalCustomers/index.vue

@@ -18,7 +18,7 @@
             </div>
           </div>
           <skeleton v-if="isSkeleton"></skeleton>
-          <el-table v-if="!isSkeleton&&tableData.total > 0" class="fixed-table"
+          <el-table v-if="!isSkeleton&&tableData.total > 0" class="fixed-table" max-height="640"
             :data="tableData.rows"
             stripe border
             style="width: 100%">
@@ -377,6 +377,7 @@ export default {
     color: #3D3D3D;
     font-weight: 400;
     position: relative;
+    line-height: 32px;
     &::after{
       content: ' ';
       width: 2px;

dsk-operate-ui/src/views/detail/party-a/component/Tables.vue

 <template>
   <div class="Tables">
     <div class="table-item">
-      <el-table v-if="tableDataTotal>0" class="fixed-table"
+      <el-table v-if="tableDataTotal>0" class="fixed-table" max-height="640"
         v-loading="tableLoading"
         :data="tableData"
         element-loading-text="Loading"

dsk-operate-ui/src/views/project/projectList/component/lxr.vue

@@ -12,7 +12,7 @@
           <div class="p2">抱歉，你还未添加相关数据，快去添加吧</div>
           <div class="btn btn_primary h36 w102" @click="opennew" v-if="isDisableds == false">新增联系人</div>
         </div>
-        <el-table class="fixed-table" v-else
+        <el-table class="fixed-table" v-else max-height="640"
           :data="tableData"
           stripe border
           style="width: 100%"
@@ -156,12 +156,14 @@
             <!--<el-input type="text" v-model="queryParam.accendant" placeholder="请输入"></el-input>-->
           <!--</el-form-item>-->
           <el-form-item label="联系方式：" class="row">
-            <el-input type="text" v-model="queryParam.contactInformation" placeholder="请输入"></el-input>
+            <el-input type="text" maxlength="11" @input="inputphone"  v-model="queryParam.contactInformation" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="备注：" class="row">
             <el-input
               type="textarea"
+              maxlength="200"
               :rows="2"
+              show-word-limit
               placeholder="请输入"
               v-model="queryParam.remark">
             </el-input>
@@ -242,6 +244,9 @@
 
     },
     methods:{
+      inputphone(){
+        this.queryParam.contactInformation=this.queryParam.contactInformation.replace(/\D/g,'')
+      },
       todetail(id){
         this.$router.push({ path: '/project/projectList/detail', query: {id:id,tag:'xmsl'} });
       },

dsk-operate-ui/src/views/project/projectList/component/xgqy.vue

@@ -22,7 +22,7 @@
           <div class="p2">建议调整关键词或添加相关企业，重新搜索</div>
           <div class="btn btn_primary h36 w102" @click="opennew" v-if="isDisableds==false">新增相关企业</div>
         </div>
-        <el-table  v-else-if="!isSkeleton" class="fixed-table"
+        <el-table  v-else-if="!isSkeleton" class="fixed-table" max-height="640"
           :data="tableData.rows"
           style="width: 100%"
           :default-sort = "{prop: 'depth', order: 'descending'}"

dsk-operate-ui/src/views/project/projectList/component/zlwd.vue

@@ -80,7 +80,7 @@
             上传文档
           </el-upload></div>
         </div>
-        <el-table  v-else-if="!isSkeleton" class="fixed-table"
+        <el-table  v-else-if="!isSkeleton" class="fixed-table" max-height="640"
           :data="fileDatas.rows"
           style="width: 100%"
           :default-sort = "{prop: 'creatTime', order: 'descending'}"