From 5db4c4f167c5353c257c5b890b6ba6ccecbdfc07 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 02 十二月 2024 14:35:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
index 92d564f..b041053 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
@@ -55,11 +55,11 @@
<template slot="label">
鍥炬爣
</template>
- <span class="avue-icon avue-icon--small">
- <svg v-if="nodeRow.icon && nodeRow.icon.indexOf('#')==-1" aria-hidden="true">
- <use :xlink:href="nodeRow.icon"></use>
+ <span class="avue-icon avue-icon--small" style="display: block">
+ <svg v-if="nodeRow.imageName && nodeRow.imageName.indexOf('#')==0" aria-hidden="true">
+ <use :xlink:href="nodeRow.imageName"></use>
</svg>
- <i v-else :class="nodeRow.icon"></i>
+ <i v-else :class="nodeRow.imageName"></i>
</span>
</el-descriptions-item>
<el-descriptions-item :span="12" :contentStyle="descriptionOption.contentStyle"
@@ -182,28 +182,28 @@
</el-form-item>
<el-row :span="24">
<el-col :span="12">
- <el-form-item label="鏍囩锛�">
+ <el-form-item label="鏍囩锛�" prop="name">
<el-input v-model="form.name"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鍥炬爣锛�">
- <avue-input-icon v-model="form.icon" :icon-list="iconList" placeholder="璇烽�夋嫨鍥炬爣">
+ <el-form-item label="鍥炬爣锛�" prop="imageName">
+ <avue-input-icon v-model="form.imageName" :icon-list="iconList" placeholder="璇烽�夋嫨鍥炬爣">
</avue-input-icon>
</el-form-item>
</el-col>
</el-row>
- <el-form-item label="缁ф壙鑷細">
+ <el-form-item label="缁ф壙鑷細" prop="fName">
<avue-input-tree :disabled="title === 'add'"
v-model="form.fName"
placeholder="璇烽�夋嫨涓氬姟绫诲瀷"
:props="{label: 'id', value: 'id',children: 'children'}"
:dic="inheritTreeData"></avue-input-tree>
</el-form-item>
- <el-form-item label="瀹炵幇绫伙細">
+ <el-form-item label="瀹炵幇绫伙細" prop="implClass">
<el-input v-model="form.implClass"></el-input>
</el-form-item>
- <el-form-item label="鎻忚堪">
+ <el-form-item label="鎻忚堪" prop="description">
<el-input v-model="form.description" :rows="2" type="textarea"></el-input>
</el-form-item>
</div>
@@ -247,7 +247,7 @@
:props="{label: 'id', value: 'id'}"
:dic="lifeData"></avue-select>
</el-form-item>
- <el-form-item label="澶囬�夌敓鍛藉懆鏈熷垪琛細" label-width="138px">
+ <el-form-item label="澶囬�夌敓鍛藉懆鏈熷垪琛細" label-width="138px" prop="subLifeCycleIdList">
<avue-select multiple
:filterable="true"
v-model="form.subLifeCycleIdList"
@@ -651,6 +651,9 @@
{required: true, message: '璇疯緭绫诲瀷鍚嶇О', trigger: 'blur'},
{validator: this.validateEnglishOnly, trigger: 'blur'}
],
+ imageName:[
+ {required: true, message: '璇烽�夋嫨鍥炬爣', trigger: 'blur'},
+ ],
revLevel: [
{required: true, message: '璇烽�夋嫨鐗堟湰瑙勫垯', trigger: 'blur'},
],
--
Gitblit v1.9.3