Merge branch 'master' of http://139.196.39.194:9021/yuansh/FBS_VIEW

pages/dashboard/warehouse.html

@@ -344,7 +344,7 @@
                         <div class="row" v-for="material in orderSheetMaterialNotEnoughList">
                             <div class="col-lg-3 col-md-3 center no-padding">{{material.orderSheetCode}}</div>
                             <div class="col-lg-3 col-md-3 center no-padding">{{material.materialCode}}</div>
-                            <div class="col-lg-4 col-md-4 left no-padding">{{material.materialName}}</div>
+                            <div style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-4 col-md-4 left no-padding">{{material.materialName}}</div>
                             <!-- <div class="col-lg-2 col-md-2 center no-padding">{{material.specs}}</div> -->
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.needSum}}</div>
                             <!-- <div class="col-lg-2 col-md-2 center no-padding">{{material.stockSum}}</div> -->