多语言适配bug修复,表格配置調整

src/HDrpManagement/collectionRule/modules/table.vue

@@ -67,7 +67,7 @@
           <el-table-column
               prop="iswarranty"
               label="是否质保金"
-              width="50">
+              width="75">
             <template slot-scope="scope">
               <div v-if="scope.row.accountingnodes">
                 <div v-if="scope.row.accountingnodes.ordercheck">
@@ -128,7 +128,7 @@
           <el-table-column
               prop="iswarranty"
               label="是否质保金"
-              width="50">
+              width="75">
             <template slot-scope="scope">
               <div v-if="scope.row.accountingnodes">
                 <div v-if="scope.row.accountingnodes.logisticscheck">
@@ -189,7 +189,7 @@
           <el-table-column
               prop="iswarranty"
               label="是否质保金"
-              width="50">
+              width="75">
             <template slot-scope="scope">
               <div v-if="scope.row.accountingnodes">
                 <div v-if="scope.row.accountingnodes.invoiceapplycheck">
@@ -205,7 +205,7 @@
       <el-table-column
         prop="isdefault"
         :label="$t(`是否默认条件`)"
-        width="50">
+        width="90">
         <template slot-scope="scope">
           <span v-if="scope.row.isdefault" style="color: red">{{$t('是')}}</span>
           <span v-else>{{$t('否')}}</span>

src/HDrpManagement/competitor/detail/modules/competeProjects/components/table.vue

@@ -13,7 +13,7 @@
           type="selection"
           width="55" @handleSelectionChange="handleSelectionChange"  v-if="checkbox">
       </el-table-column>
-      <el-table-column :show-overflow-tooltip="col.title == '来源' || col.title == '地址' || col.title == '备注'" v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.table,layout,index)">
+      <el-table-column :show-overflow-tooltip="col.title == '来源' || col.title == '地址' || col.title == '备注'" v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.tables,layout,index)">
         <template slot-scope="scope">
           <!-- 自定义表格显示内容 -->
           <slot v-if="custom" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>
@@ -84,4 +84,4 @@ export default {
 </script>
 <style>
 
-</style>
+</style>

src/HDrpManagement/contractManage/components/productClassList/table.vue

@@ -7,7 +7,7 @@
         align="center"
         fixed>
       </el-table-column>
-      <el-table-column :show-overflow-tooltip="col.title == '来源' || col.title == '地址' || col.title == '备注'" v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.table,layout,index)" :fixed="col.columnname === fixedName?'right':false">
+      <el-table-column :show-overflow-tooltip="col.title == '来源' || col.title == '地址' || col.title == '备注'" v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.tables,layout,index)" :fixed="col.columnname === fixedName?'right':false">
         <template slot-scope="scope">
           <!-- 自定义表格显示内容 -->
           <slot v-if="custom" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>
@@ -52,7 +52,7 @@ export default {
             })
           }
         })
-      });    
+      });
     },
     allArr (val) {
       this.$emit('upDateData',val)
@@ -90,4 +90,4 @@ export default {
 /deep/.el-table__header .DisableSelection > .cell {
   display: none !important;
 }
-</style>
+</style>

src/HDrpManagement/payvoucher/components/table.vue

@@ -13,7 +13,7 @@
           type="selection"
           width="55" @handleSelectionChange="handleSelectionChange"  v-if="checkbox">
       </el-table-column>
-      <el-table-column :show-overflow-tooltip="col.title == '来源' || col.title == '地址' || col.title == '备注'" v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.table,layout,index)">
+      <el-table-column :show-overflow-tooltip="col.title == '来源' || col.title == '地址' || col.title == '备注'" v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.tables,layout,index)">
         <template slot-scope="scope">
           <!-- 自定义表格显示内容 -->
           <slot v-if="custom" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>
@@ -97,4 +97,4 @@ export default {
 </script>
 <style>
 
-</style>
+</style>

src/HDrpManagement/productMoneyOdd/components/table.vue

@@ -7,7 +7,7 @@
         align="center"
         fixed>
       </el-table-column>
-      <el-table-column :show-overflow-tooltip="col.title == '来源' || col.title == '地址' || col.title == '备注'" v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.table,layout,index)" :fixed="col.columnname === fixedName?'right':false">
+      <el-table-column :show-overflow-tooltip="col.title == '来源' || col.title == '地址' || col.title == '备注'" v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.tables,layout,index)" :fixed="col.columnname === fixedName?'right':false">
         <template slot-scope="scope">
           <!-- 自定义表格显示内容 -->
           <slot v-if="custom" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>
@@ -52,7 +52,7 @@ export default {
             })
           }
         })
-      });    
+      });
     },
     allArr (val) {
       this.$emit('upDateData',val)
@@ -88,4 +88,4 @@ export default {
 /deep/.el-table__header .DisableSelection > .cell {
   display: none !important;
 }
-</style>
+</style>

src/HDrpManagement/projectChange/modules/modules/andEnterprise/components/table.vue

@@ -13,7 +13,7 @@
           type="selection"
           width="55" @handleSelectionChange="handleSelectionChange"  v-if="checkbox">
       </el-table-column>
-      <el-table-column :show-overflow-tooltip="col.title == '来源' || col.title == '地址' || col.title == '备注'" v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.table,layout,index)">
+      <el-table-column :show-overflow-tooltip="col.title == '来源' || col.title == '地址' || col.title == '备注'" v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.tables,layout,index)">
         <template slot-scope="scope">
           <!-- 自定义表格显示内容 -->
           <slot v-if="custom" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>
@@ -97,4 +97,4 @@ export default {
 </script>
 <style>
 
-</style>
+</style>

src/HDrpManagement/recvoucher/components/table.vue

@@ -25,11 +25,11 @@
         :show-overflow-tooltip="
           col.title == '来源' || col.title == '地址' || col.title == '备注'
         "
-        v-for="col in layout"
+        v-for="(col,index) in layout"
         :key="col.tablecolid"
         :prop="col.columnname"
         :label="col.title"
-        :width="col.width"
+        :min-width="tool.calcTableColWidth($refs.tables,layout,index)"
       >
         <template slot-scope="scope">
           <!-- 自定义表格显示内容 -->
@@ -128,4 +128,4 @@ export default {
 };
 </script>
 <style>
-</style>
+</style>

src/HDrpManagement/salerpriceData/components/table.vue

@@ -24,11 +24,11 @@
       <el-table-column type="selection" width="35" fixed v-if="checkbox">
       </el-table-column>
       <el-table-column
-        v-for="col in layout"
+        v-for="(col,index) in layout"
         :key="col.tablecolid"
         :prop="col.columnname"
         :label="col.title"
-        :width="col.width"
+        :min-width="tool.calcTableColWidth($refs.table,layout,index)"
         :fixed="
           fixedName
             ? fixedName.indexOf(col.columnname) != -1

src/HDrpManagement/writeoffbill/modules/order/selectOrder.vue

@@ -16,11 +16,11 @@
       <el-table-column type="selection" width="45" align="center" fixed>
       </el-table-column>
       <el-table-column
-        v-for="col in layout"
+        v-for="(col,index) in layout"
         :key="col.tablecolid"
         :prop="col.columnname"
         :label="col.title"
-        :width="col.width"
+        :min-width="tool.calcTableColWidth($refs.tables,layout,index)"
         :fixed="col.columnname === fixedName ? 'right' : false"
       >
         <template slot-scope="scope">
@@ -116,4 +116,4 @@ export default {
 /deep/.el-table__header .DisableSelection > .cell {
   display: none !important;
 }
-</style>
+</style>

src/HManagement/roleManage/modules/table.vue

@@ -7,7 +7,7 @@
         align="center"
         fixed>
       </el-table-column>
-      <el-table-column :show-overflow-tooltip="col.title == '来源' || col.title == '地址' || col.title == '备注'" v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.table,layout,index)" :fixed="col.columnname === fixedName?'right':false">
+      <el-table-column :show-overflow-tooltip="col.title == '来源' || col.title == '地址' || col.title == '备注'" v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.tables,layout,index)" :fixed="col.columnname === fixedName?'right':false">
         <template slot-scope="scope">
           <!-- 自定义表格显示内容 -->
           <slot v-if="custom" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>
@@ -52,7 +52,7 @@ export default {
             })
           }
         })
-      });    
+      });
     },
     allArr (val) {
       this.$emit('upDateData',val)
@@ -67,7 +67,7 @@ export default {
         this.allArr.splice(index,1)
       }
       console.log(this.allArr);
-      
+
     },
     selectAll (val) {
       if (val.length == 0) {
@@ -90,4 +90,4 @@ export default {
 /deep/.el-table__header .DisableSelection > .cell {
   display: none !important;
 }
-</style>
+</style>

src/SDrpManagement/QuotedPrice/detail/components/table.vue

@@ -13,7 +13,7 @@
           type="selection"
           width="55" @handleSelectionChange="handleSelectionChange"  v-if="checkbox">
       </el-table-column>
-      <el-table-column :show-overflow-tooltip="col.title == '来源' || col.title == '地址' || col.title == '备注'" v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.table,layout,index)">
+      <el-table-column :show-overflow-tooltip="col.title == '来源' || col.title == '地址' || col.title == '备注'" v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.tables,layout,index)">
         <template slot-scope="scope">
           <!-- 自定义表格显示内容 -->
           <slot v-if="custom" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>
@@ -94,4 +94,4 @@ export default {
 </script>
 <style>
 
-</style>
+</style>

src/SDrpManagement/salerPrivatecustomer/components/table.vue

@@ -25,11 +25,11 @@
         :show-overflow-tooltip="
           col.title == '来源' || col.title == '地址' || col.title == '备注'
         "
-        v-for="col in layout"
+        v-for="(col,index) in layout"
         :key="col.tablecolid"
         :prop="col.columnname"
         :label="$t(col.title)"
-        :width="col.width"
+        :min-width="tool.calcTableColWidth($refs.tables,layout,index)"
       >
         <template slot-scope="scope">
           <!-- 自定义表格显示内容 -->
@@ -116,4 +116,4 @@ export default {
 };
 </script>
 <style>
-</style>
+</style>

src/SManagement/project_target/modules/components/projectAdd/table.vue

@@ -13,7 +13,7 @@
           type="selection"
           width="55" @handleSelectionChange="handleSelectionChange"  v-if="checkbox">
       </el-table-column>
-      <el-table-column :show-overflow-tooltip="col.title == '来源' || col.title == '地址' || col.title == '备注'" v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.table,layout,index)">
+      <el-table-column :show-overflow-tooltip="col.title == '来源' || col.title == '地址' || col.title == '备注'" v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.tables,layout,index)">
         <template slot-scope="scope">
           <!-- 自定义表格显示内容 -->
           <slot v-if="custom" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>
@@ -84,4 +84,4 @@ export default {
 </script>
 <style>
 
-</style>
+</style>

src/SManagement/sales_forecast/components/mergeTable.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-table :span-method="arraySpanMethod" :row-class-name="tableClassName" v-loading="loading" highlight-current-row :data="data1" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini" :height="height" @row-click="rowClick" style="width:100%"  border>
+    <el-table ref="table" :span-method="arraySpanMethod" :row-class-name="tableClassName" v-loading="loading" highlight-current-row :data="data1" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini" :height="height" @row-click="rowClick" style="width:100%"  border>
       <el-table-column v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.table,layout,index)">
         <template slot-scope="scope">
           <!-- 自定义表格显示内容 -->
@@ -83,4 +83,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

src/SManagement/sales_forecast/components/readHeaderTable.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <el-table :row-class-name="tableClassName" v-loading="loading" highlight-current-row :data="data" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini" :height="height" @row-click="rowClick" style="width:100%"  border>
-      <el-table-column :render-header="(h,obj) => readHeaderFun1(h, obj, col.columnname)" v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="col.width">
+    <el-table ref="table" :row-class-name="tableClassName" v-loading="loading" highlight-current-row :data="data" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini" :height="height" @row-click="rowClick" style="width:100%"  border>
+      <el-table-column :render-header="(h,obj) => readHeaderFun1(h, obj, col.columnname)" v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.table,layout,index)">
         <template slot-scope="scope">
           <!-- 自定义表格显示内容 -->
           <slot v-if="custom" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>
@@ -61,4 +61,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

src/components/dynamic-newTable/index.vue

@@ -18,12 +18,12 @@
       <el-table-column type="selection" width="35" fixed v-if="checkbox"></el-table-column>
       <el-table-column
         show-overflow-tooltip
-        v-for="col in layout"
+        v-for="(col,index) in layout"
         :key="col.tablecolid"
         :prop="col.columnname"
         :label="col.title"
-        :width="width ? col.width : 150"
         :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?redirect ? redirect : 'right' :false : false"
+        :min-width="tool.calcTableColWidth($refs.table,layout,index)"
       >
         <template v-slot:header="{ column,$index }" v-if="customHeader">
           <slot name="header" :data="column"></slot>

src/components/dynamic-newTable/index1.vue

@@ -18,11 +18,11 @@
       <el-table-column type="selection" width="35" fixed v-if="checkbox"></el-table-column>
       <el-table-column
         show-overflow-tooltip
-        v-for="col in layout"
+        v-for="(col,index) in layout"
         :key="col.tablecolid"
         :prop="col.columnname"
         :label="col.title"
-        :width="width ? col.width : 150"
+        :min-width="tool.calcTableColWidth($refs.table,layout,index)"
         :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?redirect ? redirect : 'right' :false : false"
       >
         <template

src/components/dynamic-newTable/index2.vue

@@ -9,7 +9,7 @@
           type="selection"
           width="35" fixed v-if="checkbox">
       </el-table-column>
-      <el-table-column show-overflow-tooltip v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="width ? col.width : 150" :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?redirect ? redirect : 'right' :false : false">
+      <el-table-column show-overflow-tooltip v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.table,layout,index)" :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?redirect ? redirect : 'right' :false : false">
         <template v-slot:header="{ column,$index }" v-if="customHeader">
           <slot name="header" :data="column"></slot>
         </template>

src/components/dynamic-table-detail/index.vue

@@ -7,7 +7,7 @@
           type="selection"
           width="35" fixed v-if="checkbox">
       </el-table-column>
-      <el-table-column show-overflow-tooltip v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="width ? col.width : 150" :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?redirect ? redirect : 'right' :false : false">
+      <el-table-column show-overflow-tooltip v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.table,layout,index)" :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?redirect ? redirect : 'right' :false : false">
         <template v-slot:header="{ column,$index }" v-if="customHeader">
           <slot name="header" :data="column"></slot>
         </template>

src/components/dynamic-table-merge/index.vue

@@ -17,11 +17,11 @@
     >
       <el-table-column type="selection" width="35" fixed v-if="checkbox"></el-table-column>
       <el-table-column
-        v-for="col in layout"
+        v-for="(col,index) in layout"
         :key="col.tablecolid"
         :prop="col.columnname"
         :label="col.title"
-        :width="width && col.width === 0 ? 150 : col.width"
+        :min-width="tool.calcTableColWidth($refs.table,layout,index)"
         :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?redirect ? redirect : 'right' :false : false"
       >
         <template v-slot:header="{ column,$index }" v-if="customHeader">

src/components/dynamic-table/index.vue

@@ -17,11 +17,11 @@
     >
       <el-table-column type="selection" width="35" fixed v-if="checkbox"></el-table-column>
       <el-table-column
-        v-for="col in layout"
+        v-for="(col,index) in layout"
         :key="col.tablecolid"
         :prop="col.columnname"
         :label="col.title"
-        :width="width && col.width === 0 ? 150 : col.width"
+        :min-width="tool.calcTableColWidth($refs.table,layout,index)"
         :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?redirect ? redirect : 'right' :false : false"
       >
         <template v-slot:header="{ column,$index }" v-if="customHeader">

src/components/dynamic-table/index1.vue

@@ -17,11 +17,11 @@
     >
       <el-table-column type="selection" width="35" fixed v-if="checkbox"></el-table-column>
       <el-table-column
-        v-for="col in layout"
+        v-for="(col,index) in layout"
         :key="col.tablecolid"
         :prop="col.columnname"
         :label="col.title"
-        :width="width && col.width === 0 ? 150 : col.width"
+        :min-width="tool.calcTableColWidth($refs.table,layout,index)"
         :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?redirect ? redirect : 'right' :false : false"
       >
         <template v-slot:header="{ column,$index }" v-if="customHeader">

src/components/dynamic-table/index2.vue

@@ -17,11 +17,11 @@
     >
       <el-table-column type="selection" width="35" fixed v-if="checkbox"></el-table-column>
       <el-table-column
-        v-for="col in layout"
+        v-for="(col,index) in layout"
         :key="col.tablecolid"
         :prop="col.columnname"
         :label="col.title"
-        :width="width?col.width:'150px'"
+        :min-width="tool.calcTableColWidth($refs.table,layout,index)"
         :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?redirect ? redirect : 'right' :false : false"
       >
         <template v-slot:header="{ column,$index }" v-if="customHeader">

src/components/dynamic-table/index3.vue

@@ -17,11 +17,11 @@
     >
       <el-table-column type="selection" width="35" fixed v-if="checkbox"></el-table-column>
       <el-table-column
-        v-for="col in layout"
+        v-for="(col,index) in layout"
         :key="col.tablecolid"
         :prop="col.columnname"
         :label="col.title"
-        :width="width?col.width:'150px'"
+        :min-width="tool.calcTableColWidth($refs.table,layout,index)"
         :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?redirect ? redirect : 'right' :false : false"
       >
         <template

src/components/selectTable/index.vue

@@ -7,7 +7,7 @@
         align="center"
         fixed>
       </el-table-column>
-      <el-table-column v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.table,layout,index)" :fixed="col.columnname === fixedName?'right':false">
+      <el-table-column v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.tables,layout,index)" :fixed="col.columnname === fixedName?'right':false">
         <template slot-scope="scope">
           <!-- 自定义表格显示内容 -->
           <slot v-if="custom" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>
@@ -52,7 +52,7 @@ export default {
             })
           }
         })
-      });    
+      });
     },
     allArr (val) {
       this.$emit('upDateData',val)
@@ -90,4 +90,4 @@ export default {
 /deep/.el-table__header .DisableSelection > .cell {
   display: none !important;
 }
-</style>
+</style>

src/components/table/index.vue

@@ -5,7 +5,7 @@
         type="selection"
         width="55" @handleSelectionChange="handleSelectionChange" v-if="checkbox" :selectable="isCheck">
       </el-table-column>
-      <el-table-column :show-overflow-tooltip="col.title == '来源' || col.title == '地址' || col.title == '备注'" v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.table,layout,index)">
+      <el-table-column :show-overflow-tooltip="col.title == '来源' || col.title == '地址' || col.title == '备注'" v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.tables,layout,index)">
         <template slot-scope="scope">
           <!-- 自定义表格显示内容 -->
           <slot v-if="custom" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>
@@ -47,7 +47,7 @@ export default {
       row.index = rowIndex
     },
     handleSelectionChange(val) {
-      this.$emit('checkboxCallBack',val)      
+      this.$emit('checkboxCallBack',val)
     },
     isCheck(row,rowIndex) {
       if (!row.status) return true
@@ -65,4 +65,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

src/components/table/index2.vue

@@ -5,7 +5,7 @@
         type="selection"
         width="55" @handleSelectionChange="handleSelectionChange" v-if="checkbox">
       </el-table-column>
-      <el-table-column :show-overflow-tooltip="col.title == '来源' || col.title == '地址' || col.title == '备注'" v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.table,layout,index)">
+      <el-table-column :show-overflow-tooltip="col.title == '来源' || col.title == '地址' || col.title == '备注'" v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.tables,layout,index)">
         <template slot-scope="scope">
           <!-- 自定义表格显示内容 -->
           <slot v-if="custom" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>
@@ -65,4 +65,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

src/components/table/index3.vue

@@ -5,7 +5,7 @@
         type="selection"
         width="55" @handleSelectionChange="handleSelectionChange"  v-if="checkbox">
       </el-table-column>
-      <el-table-column :show-overflow-tooltip="col.title == '来源' || col.title == '地址' || col.title == '备注'" v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.table,layout,index)">
+      <el-table-column :show-overflow-tooltip="col.title == '来源' || col.title == '地址' || col.title == '备注'" v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.tables,layout,index)">
         <template slot-scope="scope">
           <!-- 自定义表格显示内容 -->
           <slot v-if="custom" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>
@@ -63,4 +63,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

src/components/uploadAllData/index.vue

@@ -58,7 +58,7 @@ export default {
     /* 一键选择所有商品 */
     allProduct () {
       if (this.total > this.dataSize) {
-        this.$confirm(`${$t('总共有')}${this.total}${$t('个')}${this.dataType},${$t('是否确定')}${this.type == 'upload' ? '提交' : '删除'}`,this.$t('提示'),{
+        this.$confirm(`${this.$t('总共有')}${this.total}${this.$t('个')}${this.dataType},${this.$t('是否确定')}${this.type == 'upload' ? '提交' : '删除'}`,this.$t('提示'),{
           confirmButtonText:this.$t('确定'),
           cancelButtonText:this.$t('取消'),
           closeOnClickModal:false,
@@ -72,7 +72,7 @@ export default {
           }
         })
       } else {
-        this.$confirm(`${$t('总共有')}${this.total}${$t('个')}${this.dataType},${$t('是否确定')}${this.type == 'upload' ? '提交' : '删除'}`,this.$t('提示'),{
+        this.$confirm(`${this.$t('总共有')}${this.total}${this.$t('个')}${this.dataType},${this.$t('是否确定')}${this.type == 'upload' ? '提交' : '删除'}`,this.$t('提示'),{
           confirmButtonText:this.$t('确定'),
           cancelButtonText:this.$t('取消'),
           closeOnClickModal:false,

src/optionSystem/FProductManage/modules/table.vue

@@ -6,7 +6,7 @@
             type="selection"
             width="35" fixed v-if="checkbox">
         </el-table-column>
-        <el-table-column v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="width && col.width === 0 ? 150 : col.width" :fixed="fixedName ? fixedName == col.columnname?redirect ? redirect : 'right' :false : false">
+        <el-table-column v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.table,layout,index)" :fixed="fixedName ? fixedName == col.columnname?redirect ? redirect : 'right' :false : false">
           <template v-slot:header="{ column,$index }">
             <div style="display: flex;align-items: center;align-content: center;">
               <span @click="setSort(col,0)">{{ col.title }}</span>
@@ -42,7 +42,7 @@
       </div>
     </div>
   </template>
-  
+
   <script>
   import {mapGetters} from "vuex"
   export default {
@@ -72,7 +72,7 @@
       if (this.param.content.pageNumber == this.totalPage) return
         this.param.content.pageNumber += 1
         console.log(this.param.content.pageNumber);
-        
+
         this.listData(()=>{},true)
       },
       async listData (callback,init) {
@@ -149,7 +149,7 @@
     mounted () {
     }
   }
-  
+
   </script>
   <style scoped>
     .sort-icon img {
@@ -158,4 +158,3 @@
       height: 18px;
     }
   </style>
-  

src/template/tableMainLayout/index.vue

@@ -12,7 +12,7 @@
           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" :label="col.title" :min-width="tool.calcTableColWidth($refs.table,layout,index)" :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?redirect ? redirect : 'right' :false : false">
+      <el-table-column show-overflow-tooltip v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.tables,layout,index)" :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?redirect ? redirect : 'right' :false : false">
         <template slot-scope="scope">
 
           <slot v-if="col.columnname !== 'operation'" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>