From 07c23ff09a49c2236df798e5dde365e4c616f21a Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 09 十一月 2023 09:03:52 +0800
Subject: [PATCH] modified: src/views/quality/finishedProductInspection/index.vue modified: src/views/quality/rawMaterial/rawMaterial-form.vue
---
src/views/technology/operation/operation-form.vue | 60 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/src/views/technology/operation/operation-form.vue b/src/views/technology/operation/operation-form.vue
index 7c8b026..765b7e7 100644
--- a/src/views/technology/operation/operation-form.vue
+++ b/src/views/technology/operation/operation-form.vue
@@ -35,7 +35,7 @@
placeholder="宸ュ簭缂栧彿"
></el-input>
</el-form-item>
- <el-form-item label="闆朵欢鏃�" prop="partFamilyId">
+ <!-- <el-form-item label="闆朵欢鏃�" prop="partFamilyId">
<el-select
v-model="dataForm.partFamilyId"
filterable
@@ -50,7 +50,7 @@
>
</el-option>
</el-select>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="宸ヤ綔涓績" prop="workCenter">
<el-select
v-model="dataForm.workCenter"
@@ -66,7 +66,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鏈哄櫒杩愯浆鍥犵礌" prop="machRunFactor">
+ <!-- <el-form-item label="鏈哄櫒杩愯浆鍥犵礌" prop="machRunFactor">
<el-input
v-model="dataForm.machRunFactor"
placeholder="鏈哄櫒杩愯浆鍥犵礌"
@@ -77,7 +77,7 @@
v-model="dataForm.machSetupTime"
placeholder="鏈哄櫒璁剧疆鏃堕棿"
></el-input>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="浜哄伐绫诲埆" prop="laborClassNo">
<el-select
v-model="dataForm.laborClassNo"
@@ -94,19 +94,19 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鍔冲姏杩愯浆鍥犵礌" prop="laborRunFactor">
+ <!-- <el-form-item label="鍔冲姏杩愯浆鍥犵礌" prop="laborRunFactor">
<el-input
v-model="dataForm.laborRunFactor"
placeholder="鍔冲姏杩愯浆鍥犵礌"
></el-input>
- </el-form-item>
- <el-form-item label="鍔冲姏璁剧疆鏃堕棿" prop="laborSetupTime">
+ </el-form-item> -->
+ <!-- <el-form-item label="鍔冲姏璁剧疆鏃堕棿" prop="laborSetupTime">
<el-input
v-model="dataForm.laborSetupTime"
placeholder="鍔冲姏璁剧疆鏃堕棿"
></el-input>
- </el-form-item>
- <el-form-item label="鍥犵礌鍗曚綅" prop="runTimeCodeDb">
+ </el-form-item> -->
+ <!-- <el-form-item label="鍥犵礌鍗曚綅" prop="runTimeCodeDb">
<el-select
v-model="dataForm.runTimeCodeDb"
placeholder="鍥犵礌鍗曚綅"
@@ -119,14 +119,14 @@
:value="item.value"
/>
</el-select>
- </el-form-item>
- <el-form-item label="鐝粍浜哄憳" prop="crewSize">
+ </el-form-item> -->
+ <!-- <el-form-item label="鐝粍浜哄憳" prop="crewSize">
<el-input
v-model="dataForm.crewSize"
placeholder="鐝粍浜哄憳"
></el-input>
- </el-form-item>
- <el-form-item label="澶栭儴宸ュ簭椤圭洰" prop="outsideOpItem">
+ </el-form-item> -->
+ <!-- <el-form-item label="澶栭儴宸ュ簭椤圭洰" prop="outsideOpItem">
<el-select
v-model="dataForm.outsideOpItem"
placeholder="澶栭儴宸ュ簭椤圭洰"
@@ -140,7 +140,7 @@
:value="item.value"
/>
</el-select>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="澶囨敞" prop="remark">
<el-input
v-model="dataForm.remark"
@@ -307,7 +307,7 @@
</el-table>
</el-card>
</el-tab-pane>
- <el-tab-pane
+ <!-- <el-tab-pane
v-if="isShowStepBusiness"
label="宸ユ"
style="height: 100%"
@@ -363,7 +363,7 @@
</el-table-column>
</el-table>
</el-card>
- </el-tab-pane>
+ </el-tab-pane> -->
</el-tabs>
<ParamTemplateDialog
:currshowlist.sync="showOperationTemplate"
@@ -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