|
|
@@ -165,7 +165,7 @@
|
|
|
<div class="col-lg-2 col-md-2 center no-padding padding-line">发货日期</div>
|
|
|
</div>
|
|
|
<div class="row">
|
|
|
- <div class="col-lg-12 col-md-12" style="height: 160px;">
|
|
|
+ <div class="col-lg-12 col-md-12" style="height: 140px;">
|
|
|
<div class="row" v-for="product in waitingSendProductList">
|
|
|
<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>
|
|
|
@@ -196,7 +196,7 @@
|
|
|
<div class="col-lg-12 col-md-12 center block-title">月成品出货统计</div>
|
|
|
</div>
|
|
|
<div class="row">
|
|
|
- <div class="col-lg-12 col-md-12" style="height:400px" id="charts_11"></div>
|
|
|
+ <div class="col-lg-12 col-md-12" style="height:440px" id="charts_11"></div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="col-lg-6">
|
|
|
@@ -204,13 +204,13 @@
|
|
|
<div class="col-lg-12 col-md-12 center block-title">项目月发货统计</div>
|
|
|
</div>
|
|
|
<div class="row">
|
|
|
- <div class="col-lg-12 col-md-12" style="height:400px" id="charts_12"></div>
|
|
|
+ <div class="col-lg-12 col-md-12" style="height:440px" id="charts_12"></div>
|
|
|
</div>
|
|
|
</div>
|
|
|
|
|
|
</div>
|
|
|
<div class="row block-padding">
|
|
|
- <div class="col-lg-6 col-md-6">
|
|
|
+ <div class="col-lg-6 col-md-6" style="padding-left:30px;">
|
|
|
<!--安全库存-->
|
|
|
<div class="row ">
|
|
|
|
|
|
@@ -240,7 +240,7 @@
|
|
|
<div class="col-lg-12 col-md-12 center block-title">成品库存</div>
|
|
|
</div>
|
|
|
<div class="row">
|
|
|
- <div class="col-lg-12 col-md-2" style="height:400px" id="charts_22"></div>
|
|
|
+ <div class="col-lg-12 col-md-2" style="height:500px" id="charts_22"></div>
|
|
|
</div>
|
|
|
</div>
|
|
|
|
|
|
@@ -358,7 +358,7 @@
|
|
|
<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: 160px;">
|
|
|
+ <div class="col-lg-12 col-md-12" style="height: 140px;">
|
|
|
<div class="row" v-for="material in applyMaterialList">
|
|
|
<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>
|
|
|
@@ -496,6 +496,11 @@
|
|
|
this.userList = userList.slice(0, this.cacheDataObject.userList.pagesize);
|
|
|
// 待入库
|
|
|
const waitinginMaterialList = ServiceMaterial.getWatingInList();
|
|
|
+ $.each(waitinginMaterialList,function(index,item){
|
|
|
+ if (item.specs.length>6)
|
|
|
+ item.specs = item.specs.substr(0,6);
|
|
|
+ item.arriveDate = item.arriveDate.replace(/-/g,"");
|
|
|
+ });
|
|
|
this.waitinginMaterialSum = waitinginMaterialList.length;
|
|
|
this.inMaterialSum = ServiceMaterial.getInSum();
|
|
|
const waitinginMaterialSumPercent = (this.waitinginMaterialSum / (this
|
|
|
@@ -513,6 +518,11 @@
|
|
|
.waitinginMaterialList.pagesize);
|
|
|
// 收料待检
|
|
|
const waitingcheckMaterialList = ServiceMaterial.getWatingCheckList();
|
|
|
+ $.each(waitingcheckMaterialList,function(index,item){
|
|
|
+ if (item.specs.length>6)
|
|
|
+ item.specs = item.specs.substr(0,6);
|
|
|
+ item.arriveDate = item.arriveDate.replace(/-/g,"");
|
|
|
+ });
|
|
|
this.waitingcheckMaterialSum = waitingcheckMaterialList.length;
|
|
|
this.checkedMaterialSum = ServiceMaterial.getCheckSum();
|
|
|
const checkedMaterialSumPercent = (this.checkedMaterialSum / (this.checkedMaterialSum +
|
|
|
@@ -527,8 +537,13 @@
|
|
|
}
|
|
|
this.waitingcheckMaterialList = waitingcheckMaterialList.slice(0, this.cacheDataObject
|
|
|
.waitingcheckMaterialList.pagesize);
|
|
|
- // 待入库
|
|
|
+ // 发货通知
|
|
|
const waitingSendProductList = ServiceProduct.getWatingSendList();
|
|
|
+ $.each(waitingSendProductList,function(index,item){
|
|
|
+ if (item.specs != null && item.specs != undefined && item.specs.length>6)
|
|
|
+ item.specs = item.specs.substr(0,6);
|
|
|
+ item.planSendDate = item.planSendDate.replace(/-/g,"");
|
|
|
+ });
|
|
|
this.waitingSendProductSum = waitingSendProductList.length;
|
|
|
this.sendProductSum = ServiceProduct.getSendSum();
|
|
|
const waitingSendProductSumPercent = (this.waitingSendProductSum / (this
|
|
|
@@ -539,7 +554,7 @@
|
|
|
this.waitingSendProductSumPercent = waitingSendProductSumPercent + '%';
|
|
|
this.cacheDataObject.waitingSendProductList = {
|
|
|
data: waitingSendProductList,
|
|
|
- pagesize: 8,
|
|
|
+ pagesize: 7,
|
|
|
pageindex: 0
|
|
|
}
|
|
|
this.waitingSendProductList = waitingSendProductList.slice(0, this.cacheDataObject
|
|
|
@@ -548,7 +563,7 @@
|
|
|
const materialStockList = ServiceMaterial.getStockList();
|
|
|
this.cacheDataObject.materialStockList = {
|
|
|
data: materialStockList,
|
|
|
- pagesize: 20,
|
|
|
+ pagesize: 22,
|
|
|
pageindex: 0
|
|
|
}
|
|
|
this.materialStockList = materialStockList.slice(0, this.cacheDataObject
|
|
|
@@ -603,7 +618,7 @@
|
|
|
this.applyCompleteSumPercent = applyCompleteSumPercent + '%';
|
|
|
this.cacheDataObject.applyMaterialList = {
|
|
|
data: applyMaterialList,
|
|
|
- pagesize: 8,
|
|
|
+ pagesize: 7,
|
|
|
pageindex: 0
|
|
|
}
|
|
|
this.applyMaterialList = applyMaterialList.slice(0, this.cacheDataObject
|
