From 6b003c3d7ef58ef2c7a24b7668c74fd8f16f37d6 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 06 十一月 2023 17:33:06 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/technology/operation/operation-form.vue | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/views/technology/operation/operation-form.vue b/src/views/technology/operation/operation-form.vue
index b510c9a..765b7e7 100644
--- a/src/views/technology/operation/operation-form.vue
+++ b/src/views/technology/operation/operation-form.vue
@@ -120,12 +120,12 @@
/>
</el-select>
</el-form-item> -->
- <el-form-item label="鐝粍浜哄憳" prop="crewSize">
+ <!-- <el-form-item label="鐝粍浜哄憳" prop="crewSize">
<el-input
v-model="dataForm.crewSize"
placeholder="鐝粍浜哄憳"
></el-input>
- </el-form-item>
+ </el-form-item> -->
<!-- <el-form-item label="澶栭儴宸ュ簭椤圭洰" prop="outsideOpItem">
<el-select
v-model="dataForm.outsideOpItem"
@@ -448,7 +448,7 @@
laborRunFactor: 0,
laborSetupTime: 0,
runTimeCodeDb: '2',
- crewSize: 1,
+ crewSize: null,
outsideOpItem:null
},
operationTemplateList: [],
@@ -724,7 +724,7 @@
this.dataForm.laborRunFactor = 0
this.dataForm.laborSetupTime = 0
this.dataForm.runTimeCodeDb = '2'
- this.dataForm.crewSize = 1
+ this.dataForm.crewSize = null
this.fileList = []
this.operationTemplateList = []
this.stepList = []
@@ -751,17 +751,17 @@
this.$refs.dataForm.validate((valid) => {
if (valid) {
// 鏍￠獙銆愭満鍣ㄨ繍杞洜绱犮�戙�併�愭満鍣ㄨ缃椂闂淬�戙�併�愬姵鍔涜繍杞洜绱犮�戙�併�愬姵鍔涜缃椂闂淬�戜腑鑷冲皯鏈変竴涓瓧娈电殑鍊奸』澶т簬0
- if (
- this.dataForm.machRunFactor == 0 &&
- this.dataForm.machSetupTime == 0 &&
- this.dataForm.laborRunFactor == 0 &&
- this.dataForm.laborSetupTime == 0
- ) {
- this.$message.error(
- '銆愭満鍣ㄨ繍杞洜绱犮�戙�併�愭満鍣ㄨ缃椂闂淬�戙�併�愬姵鍔涜繍杞洜绱犮�戙�併�愬姵鍔涜缃椂闂淬�戜腑鑷冲皯鏈変竴涓瓧娈电殑鍊奸』澶т簬0'
- )
- this.isSubmit = false
- } else {
+ // if (
+ // this.dataForm.machRunFactor == 0 &&
+ // this.dataForm.machSetupTime == 0 &&
+ // this.dataForm.laborRunFactor == 0 &&
+ // this.dataForm.laborSetupTime == 0
+ // ) {
+ // this.$message.error(
+ // '銆愭満鍣ㄨ繍杞洜绱犮�戙�併�愭満鍣ㄨ缃椂闂淬�戙�併�愬姵鍔涜繍杞洜绱犮�戙�併�愬姵鍔涜缃椂闂淬�戜腑鑷冲皯鏈変竴涓瓧娈电殑鍊奸』澶т簬0'
+ // )
+ // this.isSubmit = false
+ // } else {
// 銆愪汉宸ョ被鍒�戜负绌烘椂銆愮彮缁勪汉鍛樸�戝繀椤讳负绌猴紝鍚﹀垯蹇呴』澶т簬0
let remindInfo = ''
let remindFlag = false
@@ -828,7 +828,7 @@
})
}
}
- }
+ // }
} else {
this.isSubmit = false
}
--
Gitblit v1.9.3