From abcfdfe98929ce0399d5d0ac8fd7b1b0b3e56f20 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 20 十二月 2023 10:01:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/technology/routing/routing-form.vue | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/views/technology/routing/routing-form.vue b/src/views/technology/routing/routing-form.vue
index 9a1e3d4..411b041 100644
--- a/src/views/technology/routing/routing-form.vue
+++ b/src/views/technology/routing/routing-form.vue
@@ -50,12 +50,14 @@
</el-col>
<el-col :span="6">
<el-form-item prop="partName" label="闆朵欢鍚嶇О">
+ <el-tooltip class="item" effect="dark" :content="dataForm.partName" >
<el-input
v-model="dataForm.partName"
placeholder="闆朵欢鍚嶇О"
readonly
style="width: 100%"
></el-input>
+ </el-tooltip>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -657,7 +659,8 @@
typeOptions: [],
paramTemplateSelArr: [],
paramTemplateSelCol: 'operationTemplateNo',
- templateDefaultObj: { dataType: '鐢熶骇瑕佹眰' },
+ // templateDefaultObj: { dataType: '鐢熶骇瑕佹眰' },
+ templateDefaultObj: {},
paramSelArr: [],
paramSelCol: 'code',
operationIndex: null,
@@ -681,6 +684,7 @@
routingNo: null,
name: null,
partId: null,
+ partNo: null,
partName: null,
description: null,
state: null,
@@ -699,14 +703,14 @@
},
dataRule: {
partNo: [
- { required: true, message: '闆朵欢涓嶈兘涓虹┖', trigger: 'change' }
- ],
+ { required: true, message: '闆朵欢涓嶈兘涓虹┖', trigger: 'blur' }
+ ],
bomTypeDb: [
{ required: true, message: '宸ヨ壓绫诲瀷涓嶈兘涓虹┖', trigger: 'change' }
],
bomId: [{ required: true, message: 'BOM涓嶈兘涓虹┖', trigger: 'change' }],
phaseInDate: [
- { required: true, message: '閫愭閲囩敤鏃ユ湡涓嶈兘涓虹┖', trigger: 'blur' }
+ { required: true, message: '閫愭閲囩敤鏃ユ湡涓嶈兘涓虹┖', trigger: 'change' }
],
alternativeNo: [
{ required: true, message: '鏇夸唬涓嶈兘涓虹┖', trigger: 'blur' }
--
Gitblit v1.9.3