From 93bb83a3376eb619a4a2673373f15849cd99337d Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 14 十二月 2023 19:46:47 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/basic/part/part-form.vue | 48 ++++++++++++++++++++++++++----------------------
1 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/src/views/basic/part/part-form.vue b/src/views/basic/part/part-form.vue
index f15bf51..72fb943 100644
--- a/src/views/basic/part/part-form.vue
+++ b/src/views/basic/part/part-form.vue
@@ -171,8 +171,8 @@
<el-input v-model="dataForm.specs" placeholder="瑙勬牸鍨嬪彿"></el-input>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="妫�楠屽憳" prop="examiner">
+ <!-- <el-col :span="12"> -->
+ <!-- <el-form-item label="妫�楠屽憳" prop="examiner">
<el-select
v-model="dataForm.examiner"
placeholder="璇烽�夋嫨"
@@ -186,7 +186,7 @@
>
</el-option>
</el-select>
- </el-form-item>
+ </el-form-item> -->
<!-- <el-form-item label="妫�楠岃鍒�" prop="testRuleId">
<el-select
v-model="dataForm.testRuleId"
@@ -204,7 +204,7 @@
</el-option>
</el-select>
</el-form-item> -->
- </el-col>
+ <!-- </el-col> -->
<!-- <el-col :span="12">
<el-form-item label="鍥惧彿" prop="drawingNumber">
<el-input
@@ -266,8 +266,8 @@
</el-select>
</el-form-item>
</el-col> -->
- </el-row>
- <el-row>
+ <!-- </el-row>
+ <el-row> -->
<!-- <el-col :span="12">
<el-form-item label="鐢靛帇绛夌骇" prop="voltageLevel">
<el-input
@@ -275,13 +275,15 @@
placeholder="鐢靛帇绛夌骇"
></el-input> </el-form-item
></el-col> -->
- </el-row>
- <el-row>
+ <!-- </el-row>
+ <el-row> -->
<el-col :span="12"
><el-form-item label="閲嶉噺" prop="weight">
<el-input v-model="dataForm.weight" placeholder="閲嶉噺"></el-input>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row>
<el-col :span="12">
<el-form-item label="鐗堟湰鍙�" prop="engChgLevel">
<el-input
@@ -291,6 +293,20 @@
></el-input>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="闆朵欢灞炴��" prop="materialAttribute">
+ <el-select v-model="dataForm.materialAttribute" style="width: 100%">
+ <el-option
+ v-for="(item, index) in materialAttributeOptions"
+ :key="index"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
<!-- <el-col :span="12">
<el-form-item label="IFS鍚敤鎵规绠＄悊" prop="lotTrackingIfs">
<el-select
@@ -318,7 +334,7 @@
</el-select>
</el-form-item>
</el-col> -->
- </el-row>
+ <!-- </el-row> -->
<el-row>
<el-col :span="12">
<el-form-item
@@ -342,20 +358,8 @@
</el-form-item>
</el-col>
</el-row>
+ <!-- <el-row> -->
<el-row>
- <el-col :span="12">
- <el-form-item label="闆朵欢灞炴��" prop="materialAttribute">
- <el-select v-model="dataForm.materialAttribute" style="width: 100%">
- <el-option
- v-for="(item, index) in materialAttributeOptions"
- :key="index"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
<el-col :span="12">
<el-form-item label="澶囨敞" prop="description">
<el-input
--
Gitblit v1.9.3