From 4800a6646c8ba646b9fde08467c6b5b72451b0c0 Mon Sep 17 00:00:00 2001
From: z_yu <1534695664@qq.com>
Date: Wed, 6 Jul 2022 09:40:09 +0800
Subject: [PATCH] =?UTF-8?q?bug27=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/yxk-admin.scss              | 8 ++++----
 src/views/category/fieldManage/index.vue      | 6 ++++++
 src/views/components/category/SettingForm.vue | 2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss
index 1fb1fb6..fe30613 100644
--- a/src/assets/styles/yxk-admin.scss
+++ b/src/assets/styles/yxk-admin.scss
@@ -987,11 +987,11 @@ input[type='number'] {
   margin-right: 10px;
 }
 
-.svg-arc-style{
-  margin-right: 10px;
-}
-
 .el-form-item__error--inline{
   margin-left: 0;
   vertical-align: top;
+}
+.inline-error-item .el-form-item__content{
+  line-height: normal;
+  margin-bottom: -15px;
 }
\ No newline at end of file
diff --git a/src/views/category/fieldManage/index.vue b/src/views/category/fieldManage/index.vue
index fab0587..e2a3825 100644
--- a/src/views/category/fieldManage/index.vue
+++ b/src/views/category/fieldManage/index.vue
@@ -144,6 +144,7 @@ export default {
       })
     },
     [CRUD.HOOK.beforeValidateCU](crud) {
+      // 页面重复添加信息时，下拉框的校验会存在，需要手工取消
       crud.findVM('form').$refs['editForm'].$refs['form'].validate(valid => {
         if (!valid) {
           return
@@ -162,6 +163,11 @@ export default {
         this.crud.data.reduce((prev, cur) => { return Math.max(prev.isSequence, cur.isSequence) })
       }
     },
+    [CRUD.HOOK.beforeToCU]() {
+      if (this.crud.findVM('form').$refs['editForm']) {
+        this.crud.findVM('form').$refs['editForm'].$refs['form'].clearValidate()
+      }
+    },
     clickRowHandler(row) {
       this.$refs.fieldTable.clearSelection()
       this.$refs.fieldTable.toggleRowSelection(row)
diff --git a/src/views/components/category/SettingForm.vue b/src/views/components/category/SettingForm.vue
index feba244..3b72c40 100644
--- a/src/views/components/category/SettingForm.vue
+++ b/src/views/components/category/SettingForm.vue
@@ -7,7 +7,7 @@
             <el-input v-model="form.fieldCnName" :disabled="isDisabled" />
           </el-form-item>
 
-          <el-form-item v-if="!isDisabled" label="字段标识" prop="fieldName" :inline-message="true">
+          <el-form-item v-if="!isDisabled" label="字段标识" prop="fieldName" class="inline-error-item" :inline-message="true">
             <el-input v-if="isDisabled" v-model="form.fieldName" readonly />
             <el-input v-else v-model="form.fieldName" :disabled="!isAdd" />
           </el-form-item>