|
|
@@ -291,24 +291,22 @@
|
|
|
</div>
|
|
|
<div class="col-lg-3" style="width: 32%;height: 100%;">
|
|
|
<!--工单备料-->
|
|
|
- <div class="row block-padding">
|
|
|
+ <!-- <div class="row block-padding">
|
|
|
|
|
|
<div class="col-lg-12 col-md-12">
|
|
|
- <span class="block-title-important">工单备料</span>
|
|
|
+ <span class="block-title-important">工单</span>
|
|
|
|
|
|
<span class="block-title-important">{{orderSheetMaterialNeedSum}}</span>
|
|
|
|
|
|
- <!-- <span class="block-title-important">{{orderSheetMaterialPercent}}%</span> -->
|
|
|
</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-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>
|
|
|
- <!-- <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>
|
|
|
<div class="row" style="overflow:hidden;min-height:160px;height:160px">
|
|
|
<div class="col-lg-12 col-md-12">
|
|
|
@@ -316,15 +314,37 @@
|
|
|
<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 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)"
|
|
|
- > -->
|
|
|
+
|
|
|
<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>
|
|
|
- <!-- <div class="col-lg-1 col-md-1 center no-padding error-font" :class="getshortageQuantity(material)">{{material.shortageQuantity}}</div> -->
|
|
|
+ <div class="col-lg-1 col-md-1 center no-padding error-font" :class="getshortageQuantity(material)">{{material.shortageQuantity}}</div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div> -->
|
|
|
+ <div class="row block-padding">
|
|
|
+
|
|
|
+ <div class="col-lg-12 col-md-12">
|
|
|
+ <span class="block-title-important">生产工单配料</span>
|
|
|
+
|
|
|
+ <span class="block-title-important">{{orderSheetMaterialNeedSum}}</span>
|
|
|
+
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="row block-padding" style="padding-bottom: 4%;">
|
|
|
+ <div class="col-lg-2 col-md-2 left no-padding">工单号</div>
|
|
|
+ <div class="col-lg-3 col-md-3 center no-padding">产品编码</div>
|
|
|
+ <div class="col-lg-4 col-md-4 left no-padding">产品名称</div>
|
|
|
+ <div class="col-lg-2 col-md-2 center no-padding">产品数量</div>
|
|
|
+ </div>
|
|
|
+ <div class="row" style="overflow:hidden;min-height:30px;height:30px">
|
|
|
+ <div class="col-lg-12 col-md-12">
|
|
|
+ <div class="row" v-for="material in orderSheetMaterialNotEnoughList">
|
|
|
+ <div v-if="material.free1=='1'" class="col-lg-2 col-md-2 left no-padding">{{material.mocode}}</div>
|
|
|
+ <div v-if="material.free1=='1'" class="col-lg-3 col-md-3 center no-padding">{{material.invcode}}</div>
|
|
|
+ <div v-if="material.free1=='1'" style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-4 col-md-4 left no-padding">{{material.cinvname}}</div>
|
|
|
+ <div v-if="material.free1=='1'" class="col-lg-2 col-md-2 center no-padding">{{material.modQty}}</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -357,34 +377,29 @@
|
|
|
</div>
|
|
|
</div> -->
|
|
|
<!--工单缺料-->
|
|
|
+ <div class="row"><hr></div>
|
|
|
<div class="row block-padding">
|
|
|
-
|
|
|
- <div class="col-lg-12 col-md-12">
|
|
|
- <span class="block-title-important">工单缺料明细</span>
|
|
|
-
|
|
|
- <span class="block-title-important">{{orderSheetMaterialNotEnoughSum}}</span>
|
|
|
- </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-3 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-3 center no-padding">产品名称</div> -->
|
|
|
+ <div class="col-lg-2 col-md-2 left 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-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-2 col-md-2 center no-padding">已备数</div> -->
|
|
|
</div>
|
|
|
<div class="row" style="height: 44%;overflow:hidden;min-height:160px;height:360px">
|
|
|
<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 style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-2 col-md-2 left no-padding">{{material.cinvname}}</div>
|
|
|
- <div 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-3 col-md-3 left no-padding">{{material.materialName}}</div>
|
|
|
+ <!-- <div class="col-lg-2 col-md-2 center no-padding">{{material.orderSheetCode}}</div>
|
|
|
+ <div style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-2 col-md-2 left no-padding">{{material.cinvname}}</div> -->
|
|
|
+ <div class="col-lg-2 col-md-2 left no-padding">{{material.minvCode}}</div>
|
|
|
+ <div style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-4 col-md-4 left no-padding">{{material.mcinvname}}</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-1 col-md-1 center no-padding">{{material.materialPreparationTotal}}</div>
|
|
|
+ <div class="col-lg-2 col-md-2 center no-padding">{{material.qtys}}</div>
|
|
|
+ <div class="col-lg-2 col-md-2 center no-padding">{{material.issQty}}</div>
|
|
|
+ <div class="col-lg-2 col-md-2 center no-padding">{{material.materialPreparationTotal}}</div>
|
|
|
<!-- <div class="col-lg-2 col-md-2 center no-padding">{{material.stockSum}}</div> -->
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -410,7 +425,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: 23%;overflow:hidden;min-height:160px;height:160px">
|
|
|
+ <div class="col-lg-12 col-md-12" style="height: 23%;overflow:hidden;min-height:290px;height:290px">
|
|
|
<div class="row" v-for="material in applyMaterialList">
|
|
|
<div class="col-lg-2 col-md-2 center no-padding">{{material.ddate}}</div>
|
|
|
<div style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-2 col-md-2 center no-padding">{{material.materialCode}}</div>
|
|
|
@@ -710,33 +725,34 @@
|
|
|
/** 工单备料 **/
|
|
|
// var orderSheetList=ServiceMaterial.getListByOrderSheet("1");
|
|
|
// const orderSheetMaterialList = ServiceMaterial.getListByOrderSheet1(orderSheetList);
|
|
|
- const orderSheetMaterialList = ServiceMaterial.getOrderDetailList();
|
|
|
+ // const orderSheetMaterialList = ServiceMaterial.getOrderDetailList();
|
|
|
|
|
|
- var orderSheetMaterialNeedSum = 0;
|
|
|
- var orderSheetMaterialStockSum = 0;
|
|
|
+ // var orderSheetMaterialNeedSum = 0;
|
|
|
+ // var orderSheetMaterialStockSum = 0;
|
|
|
|
|
|
- this.orderSheetMaterialNeedSum = orderSheetMaterialList.length;
|
|
|
- orderSheetMaterialNeedSum = orderSheetMaterialList.length;
|
|
|
- $.each(orderSheetMaterialList, function (index, item) {
|
|
|
- if (item.needSum * 1 > item.stockSum * 1)
|
|
|
- orderSheetMaterialStockSum++;
|
|
|
- });
|
|
|
+ // this.orderSheetMaterialNeedSum = orderSheetMaterialList.length;
|
|
|
+ // orderSheetMaterialNeedSum = orderSheetMaterialList.length;
|
|
|
+ // $.each(orderSheetMaterialList, function (index, item) {
|
|
|
+ // if (item.needSum * 1 > item.stockSum * 1)
|
|
|
+ // orderSheetMaterialStockSum++;
|
|
|
+ // });
|
|
|
|
|
|
- this.orderSheetMaterialPercent = ((orderSheetMaterialNeedSum -
|
|
|
- orderSheetMaterialStockSum) /
|
|
|
- orderSheetMaterialNeedSum * 100).toFixed("0");
|
|
|
+ // this.orderSheetMaterialPercent = ((orderSheetMaterialNeedSum -
|
|
|
+ // orderSheetMaterialStockSum) /
|
|
|
+ // orderSheetMaterialNeedSum * 100).toFixed("0");
|
|
|
|
|
|
- this.cacheDataObject.orderSheetMaterialList = {
|
|
|
- data: orderSheetMaterialList,
|
|
|
- pagesize: 8,
|
|
|
- pageindex: 0
|
|
|
- }
|
|
|
- this.orderSheetMaterialList = orderSheetMaterialList.slice(0, this.cacheDataObject
|
|
|
- .orderSheetMaterialList.pagesize);
|
|
|
+ // this.cacheDataObject.orderSheetMaterialList = {
|
|
|
+ // data: orderSheetMaterialList,
|
|
|
+ // pagesize: 8,
|
|
|
+ // pageindex: 0
|
|
|
+ // }
|
|
|
+ // this.orderSheetMaterialList = orderSheetMaterialList.slice(0, this.cacheDataObject
|
|
|
+ // .orderSheetMaterialList.pagesize);
|
|
|
/** 工单缺料 **/
|
|
|
// const orderSheetMaterialNotEnoughList = ServiceMaterial.getListByOrderSheetNotEnough();
|
|
|
// const orderSheetMaterialNotEnoughList = ServiceMaterial.getListByOrderSheet3(orderSheetList);
|
|
|
const orderSheetMaterialNotEnoughList = ServiceMaterial.getMoallocateList();
|
|
|
+ this.orderSheetMaterialNeedSum=ServiceMaterial.getMoallocateListGroupCount();
|
|
|
if(orderSheetMaterialNotEnoughList){
|
|
|
this.orderSheetMaterialNotEnoughSum = orderSheetMaterialNotEnoughList.length;
|
|
|
}else{
|
|
|
@@ -771,7 +787,7 @@
|
|
|
this.applyCompleteSumPercent = applyCompleteSumPercent + '%';
|
|
|
this.cacheDataObject.applyMaterialList = {
|
|
|
data: applyMaterialList,
|
|
|
- pagesize: 8,
|
|
|
+ pagesize: 13,
|
|
|
pageindex: 0
|
|
|
}
|
|
|
this.applyMaterialList = applyMaterialList.slice(0, this.cacheDataObject
|
|
|
@@ -780,7 +796,7 @@
|
|
|
|
|
|
},
|
|
|
mounted() {
|
|
|
- this.timer_long = setInterval(this.refreshData, 60000);
|
|
|
+ this.timer_long = setInterval(this.refreshData, 600000);
|
|
|
this.refreshData();
|
|
|
|
|
|
},
|
