Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

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

@@ -17,20 +17,20 @@
         <el-table-column
           type="selection"
           width="55"
-          fixed
+          fixed="left"
           align="center">
         </el-table-column>
         <el-table-column
             prop="rowno"
             label="行号"
-            fixed
-            width="50">
+            width="50"
+            fixed="left">
         </el-table-column>
         <el-table-column
           prop="itemname"
           label="产品名称"
-          fixed
-          width="180">
+          width="180"
+          fixed="left">
         </el-table-column>
         <el-table-column
           prop="itemno"
@@ -543,12 +543,18 @@ export default {
 
     })
     console.log(this.columnTitle)
+  },
+  watch:{
+    listData () {
+      this.$nextTick(() => {
+          this.$refs.mutipleTable.doLayout();
+      });
+
+    }
   }
 }
 
 </script>
 <style scoped>
-/deep/.el-table__fixed, .el-table__fixed-right{
-height: calc(100% - 20px) !important;
-}
+
 </style>

src/style/style.css

@@ -23,9 +23,6 @@ input[type=number]::-webkit-outer-spin-button {
   -webkit-appearance: none;
   margin: 0;
 }
-/* ::-webkit-scrollbar{
-  width: 10px;
-} */
 ul{
   list-style:none;
 }
@@ -231,4 +228,4 @@ ul{
   color:#3874F6;
   text-decoration: underline;
   cursor: pointer;
-}
+}