diff --git a/src/views/modules/board/productionBlankingBoard.vue b/src/views/modules/board/productionBlankingBoard.vue
index c728ced..ba7a9ec 100644
--- a/src/views/modules/board/productionBlankingBoard.vue
+++ b/src/views/modules/board/productionBlankingBoard.vue
@@ -14,6 +14,14 @@
border
:row-class-name="tableRowClassName"
style="width: 100%;">
+
+
diff --git a/src/views/modules/production/dailyPlan.vue b/src/views/modules/production/dailyPlan.vue
index 1ef2e4c..4a9b2fc 100644
--- a/src/views/modules/production/dailyPlan.vue
+++ b/src/views/modules/production/dailyPlan.vue
@@ -436,7 +436,7 @@
},
// 排产信息界面
openScheduleModel (row) {
- if (row.status == '已计划' || row.status == '已取消' || row.status == '已关闭') {
+ if (row.status == '已计划' || row.status == '已关闭') {
this.$alert('该订单状态为' + row.status + '无法排产', '错误', {
confirmButtonText: '确定'
})
@@ -444,7 +444,7 @@
}
let list = {orderNo: row.orderNo}
getSchedulingSize(list).then(({data}) => {
- this.scheduledModelData.schedulingSize = data.schedulingSize
+ this.scheduledModelData.schedulingSize = data.schedulingSize.toFixed(1)
this.scheduledModelData.unSchedulingSize = this.decimalUtil.sub(this.scheduledingData.lotSize,data.schedulingSize)
})
this.scheduledingData.lotSize = row.lotSize
@@ -489,8 +489,8 @@
savePlan(this.scheduledingData).then(({data}) => {
if (data && data.code === 0) {
- this.scheduledModelData.schedulingSize = data.schedulingSize
- this.scheduledModelData.unSchedulingSize = this.decimalUtil.sub(this.scheduledingData.lotSize,data.schedulingSize)
+ this.scheduledModelData.schedulingSize = data.schedulingSize.toFixed(1);
+ this.scheduledModelData.unSchedulingSize = this.decimalUtil.sub(this.scheduledingData.lotSize,data.schedulingSize.toFixed(1))
this.schedulingModalFlag = false
let data1 = {orderNo: this.scheduledModelData.orderNo}
getWorkPlanData(data1).then(({data}) => {
@@ -577,8 +577,8 @@
savePlans(JSON.stringify(scheduledList)).then(({data}) => {
if (data && data.code === 0) {
- this.scheduledModelData.schedulingSize = data.schedulingSize
- this.scheduledModelData.unSchedulingSize = this.decimalUtil.sub(this.scheduledingData.lotSize,data.schedulingSize)
+ this.scheduledModelData.schedulingSize = data.schedulingSize.toFixed(1)
+ this.scheduledModelData.unSchedulingSize = this.decimalUtil.sub(this.scheduledingData.lotSize,data.schedulingSize.toFixed(1))
this.schedulingsFlag = false
let data1 = {orderNo: this.scheduledModelData.orderNo}
getWorkPlanData(data1).then(({data}) => {
@@ -624,8 +624,8 @@
savePlan(this.scheduledingData).then(({data}) => {
if (data && data.code === 0) {
- this.scheduledModelData.schedulingSize = data.schedulingSize;
- this.scheduledModelData.unSchedulingSize = this.decimalUtil.sub(this.scheduledingData.lotSize,data.schedulingSize);
+ this.scheduledModelData.schedulingSize = data.schedulingSize.toFixed(1);
+ this.scheduledModelData.unSchedulingSize = this.decimalUtil.sub(this.scheduledingData.lotSize,data.schedulingSize.toFixed(1));
let data1 = {orderNo: this.scheduledModelData.orderNo}
getWorkPlanData(data1).then(({data}) => {
this.scheduleTableData = data.rows
@@ -675,8 +675,8 @@
}).then(() => {
delPlan(delData).then(({data}) => {
if (data && data.code === 0) {
- this.scheduledModelData.schedulingSize = data.schedulingSize
- this.scheduledModelData.unSchedulingSize = this.decimalUtil.sub(this.scheduledingData.lotSize,data.schedulingSize);
+ this.scheduledModelData.schedulingSize = data.schedulingSize.toFixed(1)
+ this.scheduledModelData.unSchedulingSize = this.decimalUtil.sub(this.scheduledingData.lotSize,data.schedulingSize.toFixed(1));
this.getData()
let data1 = {orderNo: this.scheduledModelData.orderNo}
getWorkPlanData(data1).then(({data}) => {
diff --git a/src/views/modules/production/productionBlankingSearch.vue b/src/views/modules/production/productionBlankingSearch.vue
index caaad32..4cbd4d2 100644
--- a/src/views/modules/production/productionBlankingSearch.vue
+++ b/src/views/modules/production/productionBlankingSearch.vue
@@ -25,6 +25,14 @@
align="center"
width="30">
+
+