From 2a1ea6a1c5b2210b3ac751e344517741cfbac2dd Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 19 一月 2024 10:59:31 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/technology/routing/routing-form.vue | 17 ++++-------------
1 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/src/views/technology/routing/routing-form.vue b/src/views/technology/routing/routing-form.vue
index 411b041..f467d9f 100644
--- a/src/views/technology/routing/routing-form.vue
+++ b/src/views/technology/routing/routing-form.vue
@@ -62,7 +62,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="BOM" prop="bomId">
- <el-select style="width:100%" :disabled="dataForm.id != null" v-model="dataForm.bomId" placeholder="" filterable>
+ <el-select style="width:100%" v-model="dataForm.bomId" placeholder="" filterable>
<el-option
v-for="item in bomList"
:key="item.id"
@@ -136,16 +136,8 @@
'--dragitemwidth': '250px'
}"
>
- <div
- :style="{
- width: 265 * dataForm.operations.length - 15 + 'px'
- }"
- >
- <div
- class="dragHead"
- v-for="x in dataForm.operations.length"
- :key="x"
- >
+ <div :style="{ width: 265 * dataForm.operations.length - 15 + 'px' }">
+ <div class="dragHead" v-for="x in dataForm.operations.length" :key="x" >
<div class="idx">{{ x }}</div>
</div>
<zttdraggable
@@ -659,8 +651,7 @@
typeOptions: [],
paramTemplateSelArr: [],
paramTemplateSelCol: 'operationTemplateNo',
- // templateDefaultObj: { dataType: '鐢熶骇瑕佹眰' },
- templateDefaultObj: {},
+ templateDefaultObj: { dataType: '鐢熶骇瑕佹眰' },
paramSelArr: [],
paramSelCol: 'code',
operationIndex: null,
--
Gitblit v1.9.3