跟进动态调整，资讯管理编辑调整

src/HDrpManagement/orderManage/details/tabs/table.vue

@@ -1,16 +1,18 @@
 <template>
-  <div>
+  <div class="bs-table">
     <!-- :header-cell-style="{background:'#EEEEEE',color:'#333'}" -->
-    <el-table  ref="table" :fit="tool.calculatedColumnWidth($refs.table,layout)" :row-class-name="tableClassName" highlight-current-row :data="data"  size="mini"  :height="height" @row-click="rowClick" style="width:100%;" :header-cell-style="{height:'40px',color:'#606266',fontWeight:'400',fontSize:'14px'}"
-              :cell-style="{height:'40px',color:'#666666',fontWeight:'400'}" border @selection-change="selectionChange" @header-dragend="headerDragend">
+    <el-table  ref="table" :fit="tool.calculatedColumnWidth($refs.table,layout)" :row-class-name="tableClassName" highlight-current-row :data="data"
+               size="mini"  :height="height" @row-click="rowClick" style="width:100%;" :header-cell-style="{height:'40px',color:'#606266',fontWeight:'400',fontSize:'14px'}"
+              :cell-style="{height:'40px',color:'#666666',fontWeight:'400'}" border stripe @selection-change="selectionChange" >
       <el-table-column
           type="selection"
           width="35" fixed v-if="checkbox">
       </el-table-column>
       <el-table-column
+        show-overflow-tooltip
         v-for="(col,index) in layout" :key="col.tablecolid"
         :prop="col.columnname"
-        :label="col.title"
+        :label="$t(col.title)"
         :min-width="col.width || 150"
         :fixed="fixedCalc(col.columnname)"
       >
@@ -46,15 +48,17 @@ export default {
   data () {
     return {
       list:[],
+      currentHoverRow: null,
+      currentHoverColumn: null
     }
   },
   watch:{
-    data(){
-      console.log('执行了222')
-      this.$nextTick(() => {
-        this.$refs.table.doLayout()
-      });
-    }
+    // data(){
+    //   console.log('执行了222')
+    //   this.$nextTick(() => {
+    //     this.$refs.table.doLayout()
+    //   });
+    // }
   },
   computed:{
     ...mapGetters({
@@ -97,10 +101,17 @@ export default {
       this.$emit('selectionChange',row)
     },
     headerDragend() {
-      if (this.$refs.table && this.$refs.table.doLayout) {
+      console.log('执行111111')
+      if (this.$refs.table || this.$refs.table.doLayout) {
         this.$refs.table.doLayout();
       }
     },
+    updateDataAndFixLayout(newData) {
+      this.data = newData;
+      if (this.$refs.table || this.$refs.table.doLayout) {
+        this.$refs.table.doLayout();
+      }
+    }
   },
   mounted () {
   }
@@ -117,28 +128,39 @@ export default {
 }
 </style>
 <style scoped>
-/*!* 设置滚动条常显示 *!*/
-/*>>>.el-table__body-wrapper {*/
-/*  overflow: scroll;*/
-/*}*/
-/*!* 解决横向滚动条被固定列遮住的问题 *!*/
-/*>>>.el-table__fixed, >>>.el-table__fixed-right {*/
-/*  height: calc(100% - 15px) !important;*/
-/*}*/
-/*!* 解决横向滚动条滑至最右时，列对不齐的问题 *!*/
-/*>>>.el-table__header-wrapper{*/
-/*  padding-right: 15px !important;*/
-/*}*/
-/*!* 解决竖向滚动条被固定列遮住的问题 *!*/
-/*>>>.el-table__fixed-right {*/
-/*  right: 15px !important;*/
-/*}*/
-/*!* 解决竖向滚动条滑至底部时，行对不齐的问题 *!*/
-/*>>>.el-table__fixed-body-wrapper .el-table__body {*/
-/*  padding-bottom: 15px;*/
-/*}*/
-/*!* 解决滑动横向滚动条时，表头最右侧会露出其他列表头的内容，形成的“样式穿透”问题 *!*/
-/*>>>.el-table__fixed-right-patch {*/
-/*  width: 15px !important;*/
-/*}*/
+
+/* 设置滚动条常显示 */
+>>>.el-table__body-wrapper {
+  overflow: scroll;
+}
+/* 修改横向滚动条高度和纵向滚动条宽度 */
+>>>.el-table .el-table__body-wrapper::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+/* 修改滚动条颜色 */
+>>>.el-table .el-table__body-wrapper::-webkit-scrollbar-thumb {
+  background-color: #AAA;
+}
+/* 解决横向滚动条被固定列遮住的问题 */
+>>>.el-table__fixed, >>>.el-table__fixed-right {
+  height: calc(100% - 10px) !important;
+}
+/* 解决横向滚动条滑至最右时，列对不齐的问题 */
+>>>.el-table__header-wrapper{
+  padding-right: 10px !important;
+}
+/* 解决竖向滚动条被固定列遮住的问题 */
+>>>.el-table__fixed-right {
+  right: 10px !important;
+}
+/* 解决竖向滚动条滑至底部时，行对不齐的问题 */
+>>>.el-table__fixed-body-wrapper .el-table__body {
+  padding-bottom: 10px;
+}
+/* 解决滑动横向滚动条时，表头最右侧会露出其他列表头的内容，形成的“样式穿透”问题 */
+>>>.el-table__fixed-right-patch {
+  width: 10px !important;
+}
+
 </style>

src/WebsiteManagement/consultManage/modules/edit.vue

@@ -241,8 +241,12 @@ export default {
         });
       });
     },
-    onCancel() {},
-    onClose() {},
+    onCancel() {
+      this.dialogFormVisible = false
+    },
+    onClose() {
+      this.dialogFormVisible = false
+    },
     clearCover() {
       this.form.cover = null;
       this.image = {};

src/components/normal-basic-layout-new/details/modules/followTable/index.vue

@@ -14,7 +14,7 @@
     >
       <el-table-column
           prop="createby"
-          label="跟进人"
+          :label="$t(`跟进人`)"
           min-width="60">
         <template slot-scope="scope">
           <div>
@@ -25,19 +25,19 @@
       </el-table-column>
       <el-table-column
           prop="createdate"
-          label="跟进时间"
+          :label="$t(`跟进时间`)"
           min-width="139">
       </el-table-column>
       <el-table-column
           v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/phonebookDetail'"
           prop="type"
-          label="跟进类型"
+          :label="$t(`跟进类型`)"
           min-width="80">
       </el-table-column>
       <el-table-column
           prop="contacts"
           v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/phonebookDetail'"
-          label="跟进对象"
+          :label="$t(`跟进对象`)"
           min-width="69">
         <template slot-scope="scope">
           <div v-for="item in scope.row.contacts" :key="item.index">
@@ -52,7 +52,7 @@
       </el-table-column>
       <el-table-column
           prop="content"
-          label="跟进内容"
+          :label="$t(`跟进内容`)"
           min-width="500"
           >
         <template slot-scope="scope">
@@ -67,7 +67,7 @@
       </el-table-column>
       <el-table-column
           prop="attcount"
-          label="附件数"
+          :label="$t(`附件数`)"
           min-width="69">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="showFiles(scope.row)">{{scope.row.attcount}}</el-button>
@@ -76,14 +76,14 @@
       <el-table-column
           v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/phonebookDetail'"
           prop="salesfeesamount"
-          label="营销费用"
+          :label="$t(`营销费用`)"
           min-width="80">
         <template slot-scope="scope">
           {{scope.row.salesfeesamount?tool.formatAmount(scope.row.salesfeesamount,2,'¥'):'¥0.00'}}
         </template>
       </el-table-column>
       <el-table-column
-          label="操作"
+          :label="$t(`操作`)"
           fixed="right"
           min-width="220">
         <template slot-scope="scope">

src/components/normal-basic-layout/details/modules/followTable/index.vue

@@ -14,7 +14,7 @@
     >
       <el-table-column
           prop="createby"
-          label="跟进人"
+          :label="$t('跟进人')"
           min-width="60">
         <template slot-scope="scope">
           <div>
@@ -25,19 +25,19 @@
       </el-table-column>
       <el-table-column
           prop="createdate"
-          label="跟进时间"
+          :label="$t(`跟进时间`)"
           min-width="139">
       </el-table-column>
       <el-table-column
           v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'"
           prop="type"
-          label="跟进类型"
+          :label="$t(`跟进类型`)"
           min-width="80">
       </el-table-column>
       <el-table-column
           prop="contacts"
           v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'"
-          label="跟进对象"
+          :label="$t(`跟进对象`)"
           min-width="69">
         <template slot-scope="scope">
           <div v-for="item in scope.row.contacts" :key="item.index">
@@ -52,7 +52,7 @@
       </el-table-column>
       <el-table-column
           prop="content"
-          label="跟进内容"
+          :label="$t(`跟进内容`)"
           min-width="500"
           >
         <template slot-scope="scope">
@@ -67,7 +67,7 @@
       </el-table-column>
       <el-table-column
           prop="attcount"
-          label="附件数"
+          :label="$t(`附件数`)"
           min-width="69">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="showFiles(scope.row)">{{scope.row.attcount}}</el-button>
@@ -76,14 +76,14 @@
       <el-table-column
           v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'"
           prop="salesfeesamount"
-          label="营销费用"
+          :label="$t(`营销费用`)"
           min-width="80">
         <template slot-scope="scope">
           {{scope.row.salesfeesamount?tool.formatAmount(scope.row.salesfeesamount,2,'¥'):'¥0.00'}}
         </template>
       </el-table-column>
       <el-table-column
-          label="操作"
+          :label="$t(`操作`)"
           fixed="right"
           min-width="220">
         <template slot-scope="scope">

src/components/normal-basic-layout/modules/table.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="bs-table" :style="{height:height?height:'calc(100vh - 330px)'}">
-    <el-table border stripe ref="tables" :fit="tool.calculatedColumnWidth($refs.tables,layout)" :row-class-name="tableClassName" :header-cell-style="{background:'#fafafafa',height:'40px','color':'#000000'}" highlight-current-row :data="data" size="mini" @row-click="rowClick" height="100%" style="width:100%;" @selection-change="handleSelectionChange" >
+    <el-table border stripe ref="tables" :fit="tool.calculatedColumnWidth($refs.tables,layout)" :row-class-name="tableClassName"
+              :header-cell-style="{background:'#fafafafa',height:'40px','color':'#000000'}" highlight-current-row :data="data" size="mini"
+              @row-click="rowClick" height="100%" style="width:100%;" @selection-change="handleSelectionChange" >
       <!-- <div slot="empty">
         <el-empty :image="require('../../../assets/empty.svg')" :image-size="250">
         </el-empty>
@@ -11,7 +13,8 @@
         align="center"
         @handleSelectionChange="handleSelectionChange">
       </el-table-column>
-      <el-table-column show-overflow-tooltip v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :min-width="col.width || 150" :label="$t(col.title)" :fixed="checkFixed(col.columnname)">
+      <el-table-column show-overflow-tooltip v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :min-width="col.width || 150"
+                       :label="$t(col.title)" :fixed="checkFixed(col.columnname)">
         <template slot-scope="scope">
 
           <slot v-if="col.columnname !== 'operation'" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>

src/template/dialogTemplate/normal.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-dialog
-        :title="title"
+        :title="$t(title)"
         :visible.sync="dialogVisible"
         width="700px"
         append-to-body