From e75fbafe30f3acfafa5cc9425ddca1eb1221ae45 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 19 十二月 2023 15:44:40 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/technology/routing/routing-form.vue | 2 +-
src/views/technology/structure/single-structure-form.vue | 4 +++-
src/views/basic/part/part-form.vue | 4 ++++
src/views/basic/location/location-form.vue | 4 ++--
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/views/basic/location/location-form.vue b/src/views/basic/location/location-form.vue
index 26c0b1c..a63ba17 100644
--- a/src/views/basic/location/location-form.vue
+++ b/src/views/basic/location/location-form.vue
@@ -31,14 +31,14 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="鐖惰妭鐐圭被鍨�" prop="pType">
<el-input
v-model="dataForm.pType"
placeholder="鐖惰妭鐐圭被鍨�"
></el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
<el-row>
<el-col :span="12">
diff --git a/src/views/basic/part/part-form.vue b/src/views/basic/part/part-form.vue
index 72fb943..39c8942 100644
--- a/src/views/basic/part/part-form.vue
+++ b/src/views/basic/part/part-form.vue
@@ -31,6 +31,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="鍚嶇О" prop="partName">
+ <el-tooltip class="item" effect="dark" :content="dataForm.partName" >
<el-input
v-model="dataForm.partName"
placeholder="闆朵欢鍚嶇О"
@@ -42,6 +43,7 @@
@click="openPartDialog()"
></el-button> -->
</el-input>
+ </el-tooltip>
</el-form-item>
</el-col>
</el-row>
@@ -362,10 +364,12 @@
<el-row>
<el-col :span="12">
<el-form-item label="澶囨敞" prop="description">
+ <el-tooltip class="item" effect="dark" :content="dataForm.description" >
<el-input
v-model="dataForm.description"
placeholder="澶囨敞"
></el-input>
+ </el-tooltip>
</el-form-item>
</el-col>
</el-row>
diff --git a/src/views/technology/routing/routing-form.vue b/src/views/technology/routing/routing-form.vue
index 2e9dc08..c2ddbf2 100644
--- a/src/views/technology/routing/routing-form.vue
+++ b/src/views/technology/routing/routing-form.vue
@@ -701,7 +701,7 @@
dataRule: {
partNo: [
{ required: true, message: '闆朵欢涓嶈兘涓虹┖', trigger: 'blur' }
- ],
+ ],
bomTypeDb: [
{ required: true, message: '宸ヨ壓绫诲瀷涓嶈兘涓虹┖', trigger: 'change' }
],
diff --git a/src/views/technology/structure/single-structure-form.vue b/src/views/technology/structure/single-structure-form.vue
index 813347d..5e105b8 100644
--- a/src/views/technology/structure/single-structure-form.vue
+++ b/src/views/technology/structure/single-structure-form.vue
@@ -39,13 +39,15 @@
</el-input>
</el-form-item>
<el-form-item label="闆朵欢鍚嶇О" prop="partName">
+ <el-tooltip class="item" effect="dark" :content="dataForm.partName" >
<el-input
v-model="dataForm.partName"
placeholder="闆朵欢鍚嶇О"
- style="width: 150px"
+ style="width: 100%"
:readonly="true"
>
</el-input>
+ </el-tooltip>
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
<el-input
--
Gitblit v1.9.3