1

js/service/person.js

@@ -19,6 +19,15 @@ var ServicePerson={
             className:"A班",
             avatar:"/images/avatar/avata_1.jpg"
         });
+        personList.push({
+            realName:"里斯",
+            inTime:"09:14",
+            warehouseId:"0001",
+            warehouseName:"A仓库",
+            classId:"0001",
+            className:"A班",
+            avatar:"/images/avatar/avata_5.jpg"
+        });
         personList.push({
             realName:"杜普",
             inTime:"09:12",
@@ -37,6 +46,15 @@ var ServicePerson={
             className:"A班",
             avatar:"/images/avatar/avata_3.jpg"
         });
+        personList.push({
+            realName:"杜普",
+            inTime:"09:12",
+            warehouseId:"0001",
+            warehouseName:"A仓库",
+            classId:"0001",
+            className:"A班",
+            avatar:"/images/avatar/avata_2.jpg"
+        });
         personList.push({
             realName:"范仲淹",
             inTime:"09:15",
@@ -46,15 +64,24 @@ var ServicePerson={
             className:"A班",
             avatar:"/images/avatar/avata_4.jpg"
         });
-        // personList.push({
-        //     realName:"里斯",
-        //     inTime:"09:14",
-        //     warehouseId:"0001",
-        //     warehouseName:"A仓库",
-        //     classId:"0001",
-        //     className:"A班",
-        //     avatar:"/images/avatar/avata_5.jpg"
-        // });
+        personList.push({
+            realName:"杜普",
+            inTime:"09:12",
+            warehouseId:"0001",
+            warehouseName:"A仓库",
+            classId:"0001",
+            className:"A班",
+            avatar:"/images/avatar/avata_2.jpg"
+        });
+        personList.push({
+            realName:"里斯",
+            inTime:"09:14",
+            warehouseId:"0001",
+            warehouseName:"A仓库",
+            classId:"0001",
+            className:"A班",
+            avatar:"/images/avatar/avata_5.jpg"
+        });
         return personList;
     },
     // 人员月出勤率,考勤人数，总人数

pages/dashboard/warehouse.html

@@ -74,26 +74,26 @@
                     </div>
                 </div>
                 <div class="row">
-                    <div class="col-lg-2 col-md-2 center no-padding padding-line">供方名称</div>
-                    <div class="col-lg-2 col-md-2 center no-padding padding-line">产品编码</div>
+                    <div style="width: 12%;" class="col-lg-2 col-md-2 center no-padding padding-line">供方名称</div>
+                    <div style="width: 12%;" class="col-lg-2 col-md-2 center no-padding padding-line">产品编码</div>
                     <div class="col-lg-2 col-md-2 center no-padding padding-line">产品名称</div>
                     <!-- <div class="col-lg-2 col-md-2 center no-padding padding-line">规格</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 padding-line">订单日期</div>
-                    <div class="col-lg-2 col-md-2 center no-padding padding-line">到货日期</div>
+                    <div style="width: 13%;" class="col-lg-2 col-md-2 center no-padding padding-line">到货数</div>
+                    <div style="width: 13%;" class="col-lg-2 col-md-2 center no-padding padding-line">入库数</div>
+                    <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding padding-line">订单日期</div>
+                    <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding padding-line">到货日期</div>
                 </div>
                 <div class="row" style="height: 30%;overflow:hidden;min-height:150px">
                     <div class="col-lg-12 col-md-12" >
                         <div class="row" v-for="material in waitingcheckMaterialList">
-                            <div class="col-lg-2 col-md-2 center no-padding">{{material.vendorName}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{material.materialCode}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{material.materialName}}</div>
+                            <div style="width: 12%;" class="col-lg-2 col-md-2 center no-padding">{{material.vendorName}}</div>
+                            <div style="width: 12%;" class="col-lg-2 col-md-2 center no-padding">{{material.materialCode}}</div>
+                            <div style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-2 col-md-2 left">{{material.materialName}}</div>
                             <!-- <div class="col-lg-2 col-md-2 center no-padding">{{material.specs}}</div> -->
-                            <div class="col-lg-1 col-md-1 center no-padding">{{material.arriveSum}}</div>
-                            <div class="col-lg-1 col-md-1 center no-padding">{{material.freceivedqty}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{material.dPODate}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{material.arriveDate}}</div>
+                            <div style="width: 13%;" class="col-lg-2 col-md-2 center">{{material.arriveSum}}</div>
+                            <div style="width: 13%;" class="col-lg-2 col-md-2 center ">{{material.freceivedqty}}</div>
+                            <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding">{{material.dPODate}}</div>
+                            <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding">{{material.arriveDate}}</div>
                         </div>
                     </div>
                 </div>
@@ -117,21 +117,21 @@
                     <div class="col-lg-12 col-md-12 block-title-important">安全库存</div>
                 </div>
                 <div class="row">
-                    <div class="col-lg-2 col-md-2 center no-padding">产品编码</div>
-                    <div class="col-lg-4 col-md-4 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 style="width: 20%;" class="col-lg-2 col-md-2 center no-padding">产品编码</div>
+                    <div style="width: 40%;" class="col-lg-4 col-md-4 center no-padding">产品名称</div>
+                    <div style="width: 20%;" class="col-lg-2 col-md-2 center no-padding">现存量</div>
+                    <div style="width: 20%;" class="col-lg-2 col-md-2 center no-padding">安全库存</div>
                     <!-- <div class="col-lg-2 col-md-2 center no-padding">总数量</div> -->
                 </div>
                 <div class="row">
                     <div class="col-lg-12 col-md-12" style="height: 30%;overflow:hidden;min-height:150px">
                         <div class="row" v-for="material in materialStockList">
-                            <div class="col-lg-2 col-md-2 center no-padding">{{material.materialCode}}</div>
-                            <div class="col-lg-4 col-md-4 center no-padding">{{material.materialName}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding"
+                            <div style="width: 20%;" class="col-lg-2 col-md-2 center no-padding">{{material.materialCode}}</div>
+                            <div style="width: 40%;" class="col-lg-4 col-md-4 center no-padding">{{material.materialName}}</div>
+                            <div style="width: 20%;" class="col-lg-2 col-md-2 center no-padding"
                                 :class="getMaterialStockNotEnoughClass(material)">
                                 {{material.realStockSum}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{material.safeStockSum}}</div>
+                            <div style="width: 20%;" class="col-lg-2 col-md-2 center no-padding">{{material.safeStockSum}}</div>
                             <!-- <div class="col-lg-2 col-md-2 center no-padding">{{material.realStockSum+material.safeStockSum}}</div> -->
                         </div>
                     </div>
@@ -186,24 +186,24 @@
                 </div>
                 <div class="row">
                     
-                    <div class="col-lg-2 col-md-2 center no-padding padding-line">项目名称</div>
-                    <div class="col-lg-2 col-md-2 center no-padding padding-line">仓库</div>
-                    <div class="col-lg-2 col-md-2 center no-padding padding-line">物料编码</div>
-                    <div class="col-lg-3 col-md-3 center no-padding padding-line">物料名称</div>
+                    <div style="width: 20%;" class="col-lg-2 col-md-2 center no-padding padding-line">项目名称</div>
+                    <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding padding-line">仓库</div>
+                    <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding padding-line">物料编码</div>
+                    <div style="width: 28%;" class="col-lg-3 col-md-3 center no-padding padding-line">物料名称</div>
                     <!-- <div class="col-lg-2 col-md-2 center no-padding padding-line">规格</div> -->
-                    <div class="col-lg-1 col-md-1 center no-padding">发货数量</div>
-                    <div class="col-lg-2 col-md-2 center no-padding padding-line">发货日期</div>
+                    <div style="width: 10%;" class="col-lg-1 col-md-1 center no-padding padding-line">发货数</div>
+                    <div style="width: 12%;" class="col-lg-2 col-md-2 center no-padding padding-line">发货日期</div>
                 </div>
                 <div class="row"style="height: 30%;overflow:hidden;min-height:150px">
                     <div class="col-lg-12 col-md-12">
                         <div class="row" v-for="product in waitingSendProductList">
-                            <div class="col-lg-2 col-md-2 center no-padding">{{product.cItemName}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{product.warehouseName}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{product.materialCode}}</div>
-                            <div class="col-lg-3 col-md-3 center no-padding">{{product.materialName}}</div>
+                            <div style="width: 20%;" class="col-lg-2 col-md-2 center no-padding">{{product.cItemName}}</div>
+                            <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding">{{product.warehouseName}}</div>
+                            <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding">{{product.materialCode}}</div>
+                            <div style="width: 28%;" class="col-lg-3 col-md-3 center no-padding">{{product.materialName}}</div>
                             <!-- <div class="col-lg-2 col-md-2 center no-padding">{{product.specs}}</div> -->
-                            <div class="col-lg-1 col-md-1 center no-padding">{{product.sendSum}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{product.planSendDate}}</div>
+                            <div style="width: 10%;" class="col-lg-1 col-md-1 center no-padding">{{product.sendSum}}</div>
+                            <div style="width: 12%;" class="col-lg-2 col-md-2 center no-padding">{{product.planSendDate}}</div>
                         </div>
                     </div>
                 </div>
@@ -297,7 +297,7 @@
                 <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-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-2 col-md-2 center no-padding">数量</div>
                     <div class="col-lg-2 col-md-2 center no-padding">已备数</div>
@@ -308,7 +308,7 @@
                         <div class="row" v-for="material in orderSheetMaterialList">
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.orderSheetCode}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.materialCode}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{material.materialName}}</div>
+                            <div style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-3 col-md-3 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"
                                 :class="getOrderSheetStockNotEnoughClass(material)"
@@ -332,9 +332,9 @@
                     </div>
                 </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-2 col-md-2 center no-padding">物料名称</div>
+                    <div class="col-lg-3 col-md-3 center no-padding">工单号</div>
+                    <div class="col-lg-3 col-md-3 center no-padding">物料编码</div>
+                    <div class="col-lg-24 col-md-4 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> -->
@@ -342,9 +342,9 @@
                 <div class="row"  style="height: 23%;overflow:hidden;min-height:180px">
                     <div class="col-lg-12 col-md-12">
                         <div class="row" v-for="material in orderSheetMaterialNotEnoughList">
-                            <div class="col-lg-2 col-md-2 center no-padding">{{material.orderSheetCode}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{material.materialCode}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{material.materialName}}</div>
+                            <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 center 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> -->
@@ -364,7 +364,7 @@
                 <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-2 col-md-2 center no-padding">产品名称</div>
+                    <div class="col-lg-24 col-md-4 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>
@@ -374,7 +374,7 @@
                         <div class="row" v-for="material in orderSheetMaterialEnoughList">
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.orderSheetCode}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.materialCode}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{material.materialName}}</div>
+                            <div style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-4 col-md-4 center 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>
@@ -393,7 +393,7 @@
                 <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-2 col-md-2 center no-padding">产品名称</div>
+                    <div class="col-lg-4 col-md-4 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>
@@ -404,7 +404,7 @@
                         <div class="row" v-for="material in applyMaterialList">
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.ddate}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.materialCode}}</div>
-                            <div class="col-lg-2 col-md-2 center 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.applyPerson}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.cdepName}}</div>