|
|
@@ -83,7 +83,7 @@
|
|
|
<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="row" style="height: 30%;overflow:hidden;min-height:180px;height:180px">
|
|
|
<div class="col-lg-12 col-md-12" >
|
|
|
<div class="row" v-for="material in waitingcheckMaterialList">
|
|
|
<div style="width: 12%;" class="col-lg-2 col-md-2 center no-padding">{{material.vendorName}}</div>
|
|
|
@@ -124,10 +124,10 @@
|
|
|
<!-- <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="col-lg-12 col-md-12" style="height: 30%;min-height:180px;height:180px">
|
|
|
<div class="row" v-for="material in materialStockList">
|
|
|
<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: 40%;overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-4 col-md-4 left 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>
|
|
|
@@ -178,14 +178,13 @@
|
|
|
<!--发货通知-->
|
|
|
<div class="row block-padding">
|
|
|
|
|
|
- <div class="col-lg-12 col-md-12">
|
|
|
+ <div class="col-lg-12 col-md-12" style="margin-top: 10px;">
|
|
|
<span class="block-title-important">发货通知</span>
|
|
|
|
|
|
<span class="block-title-important">{{waitingSendProductSum}}</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="row">
|
|
|
-
|
|
|
<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>
|
|
|
@@ -194,13 +193,13 @@
|
|
|
<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:180px">
|
|
|
+ <div class="row" style="min-height:160px;height:160px">
|
|
|
<div class="col-lg-12 col-md-12">
|
|
|
<div class="row" v-for="product in waitingSendProductList">
|
|
|
<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 style="width: 28%;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-2 col-md-2 center no-padding">{{product.specs}}</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>
|
|
|
@@ -303,7 +302,7 @@
|
|
|
<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>
|
|
|
- <div class="row" style="height: 23%;overflow:hidden;min-height:180px">
|
|
|
+ <div class="row" style="overflow:hidden;min-height:150px;height:150px">
|
|
|
<div class="col-lg-12 col-md-12">
|
|
|
<div class="row" v-for="material in orderSheetMaterialList">
|
|
|
<div class="col-lg-2 col-md-2 center no-padding">{{material.orderSheetCode}}</div>
|
|
|
@@ -339,7 +338,7 @@
|
|
|
<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>
|
|
|
- <div class="row" style="height: 23%;overflow:hidden;min-height:180px">
|
|
|
+ <div class="row" style="height: 23%;overflow:hidden;min-height:180px;height:180px">
|
|
|
<div class="col-lg-12 col-md-12">
|
|
|
<div class="row" v-for="material in orderSheetMaterialNotEnoughList">
|
|
|
<div class="col-lg-3 col-md-3 center no-padding">{{material.orderSheetCode}}</div>
|
|
|
@@ -370,7 +369,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: 21%;overflow:hidden;min-height:150px">
|
|
|
+ <div class="col-lg-12 col-md-12" style="height: 21%;overflow:hidden;min-height:180px;height:180px">
|
|
|
<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>
|
|
|
@@ -400,7 +399,7 @@
|
|
|
<div class="col-lg-1 col-md-1 center no-padding">数量</div>
|
|
|
</div>
|
|
|
<div class="row">
|
|
|
- <div class="col-lg-12 col-md-12" style="height: 23%;overflow:hidden;min-height:180px">
|
|
|
+ <div class="col-lg-12 col-md-12" style="height: 23%;overflow:hidden;min-height:180px;height:180px">
|
|
|
<div class="row" v-for="material in applyMaterialList">
|
|
|
<div class="col-lg-2 col-md-1 center no-padding">{{material.ddate}}</div>
|
|
|
<div class="col-lg-2 col-md-2 center no-padding">{{material.materialCode}}</div>
|
|
|
@@ -677,7 +676,7 @@
|
|
|
this.waitingSendProductSumPercent = waitingSendProductSumPercent + '%';
|
|
|
this.cacheDataObject.waitingSendProductList = {
|
|
|
data: waitingSendProductList,
|
|
|
- pagesize: 7,
|
|
|
+ pagesize: 10,
|
|
|
pageindex: 0
|
|
|
}
|
|
|
this.waitingSendProductList = waitingSendProductList.slice(0, this.cacheDataObject
|
|
|
@@ -719,7 +718,7 @@
|
|
|
this.orderSheetMaterialNotEnoughSum = orderSheetMaterialNotEnoughList.length;
|
|
|
this.cacheDataObject.orderSheetMaterialNotEnoughList = {
|
|
|
data: orderSheetMaterialNotEnoughList,
|
|
|
- pagesize: 10,
|
|
|
+ pagesize: 9,
|
|
|
pageindex: 0
|
|
|
}
|
|
|
this.orderSheetMaterialNotEnoughList = orderSheetMaterialNotEnoughList.slice(0, this
|
|
|
@@ -729,7 +728,7 @@
|
|
|
this.orderSheetMaterialEnoughSum = orderSheetMaterialEnoughList.length;
|
|
|
this.cacheDataObject.orderSheetMaterialEnoughList = {
|
|
|
data: orderSheetMaterialEnoughList,
|
|
|
- pagesize: 10,
|
|
|
+ pagesize: 8,
|
|
|
pageindex: 0
|
|
|
}
|
|
|
this.orderSheetMaterialEnoughList = orderSheetMaterialEnoughList.slice(0, this
|
|
|
@@ -744,7 +743,7 @@
|
|
|
this.applyCompleteSumPercent = applyCompleteSumPercent + '%';
|
|
|
this.cacheDataObject.applyMaterialList = {
|
|
|
data: applyMaterialList,
|
|
|
- pagesize: 10,
|
|
|
+ pagesize: 9,
|
|
|
pageindex: 0
|
|
|
}
|
|
|
this.applyMaterialList = applyMaterialList.slice(0, this.cacheDataObject
|
