From ccb2fcb6fd960def9ddf79dd0f0bafd0a27908d1 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Wed, 11 Jan 2023 12:27:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E9=9C=80=E6=B1=82=E6=97=B6?=
=?UTF-8?q?=E9=97=B4=202023=E5=B9=B41=E6=9C=8811=E6=97=A5=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../shopOrder/common/routingAddAndEdit.vue | 12 ++---
.../yieldReport/com_malformed_material.vue | 46 +++++++++++--------
2 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/src/views/modules/shopOrder/shopOrder/common/routingAddAndEdit.vue b/src/views/modules/shopOrder/shopOrder/common/routingAddAndEdit.vue
index 0ec9aa3..33b5f49 100644
--- a/src/views/modules/shopOrder/shopOrder/common/routingAddAndEdit.vue
+++ b/src/views/modules/shopOrder/shopOrder/common/routingAddAndEdit.vue
@@ -276,10 +276,10 @@
this.$message.warning('效率不能为空!')
return
}
- if (!this.selectRow.timeRequired) {
- this.$message.warning('需求时间不能为空!')
- return
- }
+ // if (!this.selectRow.timeRequired) {
+ // this.$message.warning('需求时间不能为空!')
+ // return
+ // }
if (!this.selectRow.planFinishTime) {
this.$message.warning('计划完工时间不能为空!')
return
@@ -291,8 +291,8 @@
this.$message.warning('计划开工时间不能早于计划完工时间!')
return
}
- if (this.selectRow.timeRequired<=0){
- this.$message.warning('需求随时间不能小于0!')
+ if (this.selectRow.timeRequired<0){
+ this.$message.warning('需求时间不能小于0!')
return
}
if (this.selectRow.crewsize<1) {
diff --git a/src/views/modules/yieldReport/com_malformed_material.vue b/src/views/modules/yieldReport/com_malformed_material.vue
index 541c804..ab08370 100644
--- a/src/views/modules/yieldReport/com_malformed_material.vue
+++ b/src/views/modules/yieldReport/com_malformed_material.vue
@@ -18,7 +18,7 @@
{{ buttons.confirmButton }}
-
+
@@ -35,7 +35,7 @@
{{ buttons.closeButton }}
-
+
-
+
{
+ if (data.code == 0){
+ this.pageData.rollQty = data.cRollinfo.rollqty
+ }
+ })
},
/*获取BOM行号*/
@@ -328,15 +335,15 @@ export default {
return false;
}
//判断是否选中行号
- if (!this.pageData.qtyConsumed ) {
+ if (!this.pageData.qtyConsumed) {
this.$message.error(this.labels.pleaseQtyConsumed)
return false;
}
- if (this.pageData.qtyConsumed <=0 ) {
+ if (this.pageData.qtyConsumed <= 0) {
this.$message.error(this.labels.pleaseQtyConsumed2)
return false;
}
- if (this.pageData.qtyConsumed > this.pageData.rollQty ) {
+ if (this.pageData.qtyConsumed > this.pageData.rollQty) {
this.$message.error(this.labels.pleaseQtyConsumed3)
return false;
}
@@ -346,16 +353,16 @@ export default {
//清空当前扫描卷属性值 防止重复点击确认
this.pageData.scanRmRollNo = '';
let dto = {
- site:this.$store.state.user.site,
- orderNo: this.pageData.orderNo,
- itemNo: this.pageData.itemNo,
- seqNo: this.pageData.seqNo,
- userId: this.$store.state.user.name,
- rollNo: this.pageData.rollNo,
- rmRollNo: this.pageData.rmRollNo,
- bomItemNo: this.pageData.bomItemNo,
- operatorId: this.pageData.operatorId,
- qtyConsumed: this.pageData.qtyConsumed ,
+ site: this.$store.state.user.site,
+ orderNo: this.pageData.orderNo,
+ itemNo: this.pageData.itemNo,
+ seqNo: this.pageData.seqNo,
+ userId: this.$store.state.user.name,
+ rollNo: this.pageData.rollNo,
+ rmRollNo: this.pageData.rmRollNo,
+ bomItemNo: this.pageData.bomItemNo,
+ operatorId: this.pageData.operatorId,
+ qtyConsumed: this.pageData.qtyConsumed,
}
//调用方法执行上材料
scannerMaterial(this.pageData).then(({data}) => {
@@ -368,6 +375,9 @@ export default {
this.pageData.bomItemNo = -1;
this.bomList = [];
this.timeArray = [];
+ this.pageData.rollQty = '';
+ this.pageData.qtyConsumed = '';
+ this.closeDialog()
}
});
},