diff --git a/src/views/modules/board/SORoutingBoard.vue b/src/views/modules/board/SORoutingBoard.vue
index a836b35..6307fc8 100644
--- a/src/views/modules/board/SORoutingBoard.vue
+++ b/src/views/modules/board/SORoutingBoard.vue
@@ -15,14 +15,14 @@
border
:row-class-name="tableRowClassName"
style="width: 100%;">
-
-
+
+
+
+
+
+
+
+
@@ -70,7 +70,7 @@
@@ -89,6 +89,63 @@
label="上工序完成数量">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -111,6 +168,9 @@
totalPage: 1,
height: 200,
tableData: [],
+ pageIndex2: 1,
+ totalPage2: 1,
+ tableData2: [],
// 默认的刷新，滚动时间，滚动间距
// refreshTime: 5,
// rollTime: 5,
@@ -119,7 +179,7 @@
},
mounted () {
this.$nextTick(() => {
- this.height = window.innerHeight - 80
+ this.height = window.innerHeight - 221
})
// this.autoRoll()
},
@@ -132,7 +192,7 @@
return ''
},
search () {
- let inData= {number:this.pageIndex,
+ let inData= {number:this.pageIndex,number2:this.pageIndex2,
text1:this.lineNo};
SORoutingBoard(inData).then(({data}) => {
this.tableData = data.rows;
@@ -142,6 +202,14 @@
}else {
this.pageIndex=this.pageIndex+1
}
+
+ this.tableData2 = data.rows2;
+ this.totalPage2= data.maxPage2;
+ if(this.pageIndex2+1>data.maxPage2){
+ this.pageIndex2=1
+ }else {
+ this.pageIndex2=this.pageIndex2+1
+ }
})
},
// 鼠标进入
diff --git a/src/views/modules/board/scheduledBoard.vue b/src/views/modules/board/scheduledBoard.vue
index 0e688fa..7d8b5b4 100644
--- a/src/views/modules/board/scheduledBoard.vue
+++ b/src/views/modules/board/scheduledBoard.vue
@@ -46,7 +46,7 @@
header-align="center"
align="center"
min-width="40"
- label="派工数/PlanQty"
+ label="派工数/Schedule"
:render-header="renderHeader"
>
@@ -89,7 +89,7 @@
prop="resourceDesc"
header-align="center"
align="center"
- min-width="72"
+ min-width="92"
label="生产线/ProduceLine"
:render-header="renderHeader"
>
@@ -99,7 +99,7 @@
header-align="center"
align="center"
min-width="100"
- label="派工数量/PlanQty"
+ label="派工数量/Schedule"
:render-header="renderHeader">
>
+
+
@@ -379,7 +387,7 @@
series: [
{
- 'name': '当日完成率',
+ 'name': '完成率',
'type': 'bar',
'emphasis': {
focus: 'series'
@@ -398,7 +406,7 @@
},
{
- 'name': '当日良品率',
+ 'name': '良品率',
'type': 'bar',
'emphasis': {
focus: 'series'
diff --git a/src/views/modules/board/shopOrderBoard.vue b/src/views/modules/board/shopOrderBoard.vue
index 9a1aabe..7c1a3f3 100644
--- a/src/views/modules/board/shopOrderBoard.vue
+++ b/src/views/modules/board/shopOrderBoard.vue
@@ -34,7 +34,7 @@
@@ -72,7 +72,7 @@
diff --git a/src/views/modules/schedule/closeSchedule.vue b/src/views/modules/schedule/closeSchedule.vue
index b59c118..310b948 100644
--- a/src/views/modules/schedule/closeSchedule.vue
+++ b/src/views/modules/schedule/closeSchedule.vue
@@ -222,6 +222,20 @@
min-width="100"
label="加工中心编码">
+
+
+
+
+
+
+
+
@@ -447,7 +461,8 @@
'机台ID': 'sResourceID',
'班次': 'sShiftNo',
'加工中心': 'sWorkCenterNo',
-
+ '开工时间': 'firstWorkDate',
+ '结束时间': 'closedDate',
},
exportName: '派工单列表' + this.getStrDate(),
exportHeader: ['派工单列表'],
diff --git a/src/views/modules/schedule/scheduleForShopOrder.vue b/src/views/modules/schedule/scheduleForShopOrder.vue
index 3e10599..e16d590 100644
--- a/src/views/modules/schedule/scheduleForShopOrder.vue
+++ b/src/views/modules/schedule/scheduleForShopOrder.vue
@@ -733,13 +733,34 @@
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
+ if( Number(this.schedulingModalData.sumQty)>Number(this.schedulingModalData.qtyToSchedule)){
+ this.$confirm(`累计派工数量大于订单数量，是否继续`, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ this.doSchedule();
+ })
+ }else {
+ this.doSchedule();
+
+ }
- this.doSchedule();
})
}else {
-
+ if( Number(this.schedulingModalData.sumQty)>Number(this.schedulingModalData.qtyToSchedule)){
+ this.$confirm(`累计派工数量大于订单数量，是否继续`, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
this.doSchedule();
+ })
+ }else {
+ this.doSchedule();
+
+ }
}
},
doSchedule(){
diff --git a/src/views/modules/schedule/soscheduleRouting.vue b/src/views/modules/schedule/soscheduleRouting.vue
index babb8ad..905e01b 100644
--- a/src/views/modules/schedule/soscheduleRouting.vue
+++ b/src/views/modules/schedule/soscheduleRouting.vue
@@ -257,6 +257,20 @@
min-width="100"
label="加工中心编码">
+
+
+
+