From f443b27dd9dcf5af1339439689531536e85836c7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 12 三月 2024 15:55:48 +0800
Subject: [PATCH] 合并冲突
---
src/views/plan/manufacturingorder/edit-order-operation.vue | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/views/plan/manufacturingorder/edit-order-operation.vue b/src/views/plan/manufacturingorder/edit-order-operation.vue
index 8ac91c1..d62cc04 100644
--- a/src/views/plan/manufacturingorder/edit-order-operation.vue
+++ b/src/views/plan/manufacturingorder/edit-order-operation.vue
@@ -46,7 +46,7 @@
style="width: 100%"
>
<el-option
- v-for="item in isSpecialIns"
+ v-for="item in isSpecialInss"
:key="item.id"
:label="item.label"
:value="item.value"
@@ -167,10 +167,11 @@
return {
innerVisible: false,
workCenterOptions: [],
- isSpecialIns: [{ label: '鏄�', value: true} ,{label: '鍚�', value: false }],
+ isSpecialInss: [{ label: '鏄�', value: true} ,{label: '鍚�', value: false }],
dataForm: {
id: 0,
workCenter: null,
+ isSpecialIns: null,
machRunFactor: 0,
machSetupTime: 0,
laborClassNo: null,
@@ -211,7 +212,7 @@
},
methods: {
saveSelectRow() {
- this.$refs.operationDataForm.validate((valid) => {
+ /* this.$refs.operationDataForm.validate((valid) => {
if (valid) {
if (
this.dataForm.machRunFactor == 0 &&
@@ -250,11 +251,12 @@
}
if (remindFlag) {
this.$message.error(remindInfo)
- } else {
+ } else { */
moRouringOperation(this.dataForm).then((response) => {
const data = response.data
if (data.code === 0) {
this.currOrderOperation.workCenter = this.dataForm.workCenter
+ this.currOrderOperation.isSpecialIns = this.dataForm.isSpecialIns
this.currOrderOperation.machRunFactor =
this.dataForm.machRunFactor
this.currOrderOperation.machSetupTime =
@@ -276,10 +278,10 @@
this.$message.error('缂栬緫澶辫触')
}
})
- }
+ /* }
}
}
- })
+ }) */
},
// 鑾峰彇IFS浜哄伐绫诲埆鐨勬暟鎹瓧鍏�
getLaborClassNo() {
--
Gitblit v1.9.3