diff --git a/src/views/modules/base/maintainProductRouting.vue b/src/views/modules/base/maintainProductRouting.vue
index c014963..f9bb225 100644
--- a/src/views/modules/base/maintainProductRouting.vue
+++ b/src/views/modules/base/maintainProductRouting.vue
@@ -222,7 +222,6 @@
-
@@ -232,7 +231,6 @@
-
@@ -1595,11 +1593,11 @@ export default {
workCenterNo: '',
machSetupTime: '',
machRunFactor: '',
- factorUnit: '',
+ factorUnit: '单位/小时',
jjgzUnitPrice: '',
- jjgzUnitFactor: '',
+ jjgzUnitFactor: '小时',
efficiency: '',
- crewsize: '',
+ crewsize: 1,
remark: '',
site: '',
partNo: '',
@@ -1798,10 +1796,11 @@ export default {
workCenterNo: '',
machSetupTime: 0,
machRunFactor: 0,
- factorUnit: null,
+ factorUnit: '单位/小时',
+ jjgzUnitFactor: '小时',
jjgzUnitPrice: 0,
efficiency: 100,
- crewsize: 0,
+ crewsize: 1,
remark: '',
add: 0,
partNo: this.mainData.partNo,
@@ -1862,6 +1861,15 @@ export default {
})
return false;
}
+
+ if (this.detailData.machRunFactor<=0) {
+ this.$message.warning('单位产出量不能小于0!')
+ return
+ }
+ if (this.detailData.crewsize<1) {
+ this.$message.warning('操作工人数不能少于1!')
+ return
+ }
saveRoutingDetailData(this.detailData).then(({data}) => {
this.currentRow = null;
if (data && data.code == 200) {
@@ -1991,7 +1999,7 @@ export default {
},
getSearchModal() {
this.searchPartNo = '';
- this.searchRoutingWithPartNo();
+ // this.searchRoutingWithPartNo();
this.modelFlag = true;
},
editRoutingDetail() {
diff --git a/src/views/modules/shopOrder/shopOrder/common/routingAddAndEdit.vue b/src/views/modules/shopOrder/shopOrder/common/routingAddAndEdit.vue
index 465636d..be26dc5 100644
--- a/src/views/modules/shopOrder/shopOrder/common/routingAddAndEdit.vue
+++ b/src/views/modules/shopOrder/shopOrder/common/routingAddAndEdit.vue
@@ -144,7 +144,7 @@
closedFlag: '',
crewsize: 1,
efficiency: 80,
- factorUnit: '',
+ factorUnit: '单位/小时',
factorUnit_DB: null,
itemNo: null,
machRunFactor: 0,
@@ -299,6 +299,10 @@
this.$message.warning('操作工人数不能少于1!')
return
}
+ if (this.selectRow.machRunFactor<=0) {
+ this.$message.warning('单位产出量不能小于0!')
+ return
+ }
let centerInfo = {
workCenterNo: this.selectRow.workCenterNo,
active: 'Y',