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

pages/dashboard/line.html

@@ -127,10 +127,10 @@
                 </div>
                 <div class="row block-padding">
                     <div class="col-lg-2 col-md-2 center no-padding">项目号</div>
-                    <div class="col-lg-2 col-md-2 center no-padding">工单号</div>
+                    <div class="col-lg-1 col-md-1 center no-padding">工单号</div>
                     <div class="col-lg-2 col-md-2 center no-padding">产品编码</div>
                     <!-- <div class="col-lg-2 col-md-2 center no-padding">型号规格</div> -->
-                    <div class="col-lg-2 col-md-2 center no-padding">产品名称</div>
+                    <div class="col-lg-3 col-md-3 center no-padding">产品名称</div>
                     <div class="col-lg-1 col-md-1 center no-padding">计划数量</div>
                     <div class="col-lg-1 col-md-1 center no-padding">标准工时</div>
                     <div class="col-lg-2 col-md-2 center no-padding">人员</div>
@@ -138,10 +138,10 @@
                 </div>
                 <div class="row" v-for="product in dayProduceTaskList">
                     <div class="col-lg-2 col-md-2 center no-padding">{{product.projectCode}}</div>
-                    <div class="col-lg-2 col-md-2 center no-padding">{{product.orderSheetCode}}</div>
-                    <div class="col-lg-2 col-md-2 center no-padding">{{product.materialCode}}</div>
+                    <div class="col-lg-1 col-md-1 center no-padding">{{product.orderSheetCode}}</div>
+                    <div style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-2 col-md-2 center no-padding">{{product.materialCode}}</div>
                     <!-- <div class="col-lg-2 col-md-2 center no-padding">{{product.specs}}</div> -->
-                    <div class="col-lg-2 col-md-2 center no-padding">{{product.materialName}}</div>
+                    <div style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-3 col-md-3 left no-padding">{{product.materialName}}</div>
                     <div class="col-lg-1 col-md-1 center no-padding">{{product.planSum}}</div>
                     <div class="col-lg-1 col-md-1 center no-padding">{{product.workHour}}</div>
                     <div class="col-lg-2 col-md-2 center no-padding">{{product.name}}</div>

pages/dashboard/produce.html

@@ -70,9 +70,9 @@
                 <div class="row block-padding">
                     <div class="col-lg-1 col-md-1 center no-padding" >工单号</div>
                     <div class="col-lg-2 col-md-2 center no-padding">项目名</div>
-                    <div class="col-lg-1 col-md-1 center no-padding">产品编码</div>
+                    <div class="col-lg-2 col-md-2 center no-padding">产品编码</div>
                     <!-- <div class="col-lg-2 col-md-2 center no-padding">型号规格</div> -->
-                    <div class="col-lg-3 col-md-3 center no-padding">产品名称</div>
+                    <div class="col-lg-2 col-md-2 center no-padding">产品名称</div>
                     <div class="col-lg-1 col-md-1 center no-padding">计划数量</div>
                     <div class="col-lg-1 col-md-1 center no-padding">标准工时</div>
                     <div class="col-lg-1 col-md-1 center no-padding">实际工时</div>
@@ -84,9 +84,9 @@
                         <div class="row" v-for="product in mouthProduceTaskList">
                             <div class="col-lg-1 col-md-1 center no-padding">{{product.orderSheetCode}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{product.define12}}</div>
-                            <div class="col-lg-1 col-md-1 center no-padding">{{product.materialCode}}</div>
+                            <div style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-2 col-md-2 center no-padding">{{product.materialCode}}</div>
                             <!-- <div class="col-lg-2 col-md-2 center no-padding">{{product.specs}}</div> -->
-                            <div style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-3 col-md-3 center no-padding">{{product.materialName}}</div>
+                            <div style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-2 col-md-2 left no-padding">{{product.materialName}}</div>
                             <div class="col-lg-1 col-md-1 center no-padding">{{product.planSum}}</div>
                             <div class="col-lg-1 col-md-1 center no-padding">{{product.workHour}}</div>
                             <div class="col-lg-1 col-md-1 center no-padding">{{product.manHoursInvested}}</div>