From dbe1b807e2a0e4aaa37277b69c50dd69dc42dda2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期日, 25 六月 2023 10:34:36 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue |   40 +++++++++++++++++++++++++++++-----------
 1 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue b/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
index bb1501a..1515c8f 100644
--- a/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
+++ b/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
@@ -7,9 +7,8 @@
     width="70%"
     style="height: 115vh;"
     >
-        <el-form ref="form" :model="btmType" show-message="true" inline size="medium" label-suffix=":" class="btmTypeForm">
-                
-            <el-form-item label="鑻辨枃鍚嶇О" label-width="100px" required="true">
+        <el-form ref="form" :model="btmType" show-message="true" inline size="medium" label-suffix=":" class="btmTypeForm" :rules="rules" @resetFields="resetForm" status-icon="true">
+            <el-form-item label="鑻辨枃鍚嶇О" label-width="100px" required="true" prop="id">
                 <el-input v-model="btmType.id" :prefix-icon="icons.key"></el-input>
             </el-form-item>
             <el-form-item label="涓枃鍚嶇О" label-width="100px">
@@ -18,7 +17,7 @@
             <el-form-item label="鏁版嵁搴撹〃鍚�" label-width="100px">
                 <el-input v-model="btmType.tableName" :prefix-icon="icons.tableName"></el-input>
             </el-form-item>
-            <el-form-item label="鎵�灞為鍩�" label-width="100px">
+            <el-form-item label="鎵�灞為鍩�" label-width="100px" prop="domain">
                 <el-select v-model="btmType.domain" :prefix-icon="icons.domain">
                     <el-option v-for="item in domainOption"
                     :label="item.label" :value="item.value" :key="item.value"></el-option>
@@ -85,8 +84,8 @@
             @on-load="attrRefOnLoad"
             @search-change="attrRefSearch"
             @selection-change="selectionChange">
-                <template slot="name" slot-scope="scope" >
-                    <el-tag>{{scope}}</el-tag>
+                <template slot="typeValue" slot-scope="scope" >
+                    <el-tag>{{scope.row.typeValue}}</el-tag>
                 </template>
             </avue-crud>
             <div slot="footer" class="dialog-footer">
@@ -204,22 +203,24 @@
                     reserveSelection: true,
                     searchMenuSpan:8,
                     highlightCurrentRow: true,
+                    rowKey: 'id',
                     column: [
                         {
                         label: '鑻辨枃鍚嶇О',
-                        prop: 'key',
+                        prop: 'id',
                         align: 'left',
                         search: true,
                         width: 230
                     }, {
                         label: '涓枃鍚嶇О',
-                        prop: 'label',
+                        prop: 'name',
                         align: 'center',
                     },
                     {
                         label: "绫诲瀷",
                         prop: "typeValue",
-                        align: 'center'
+                        align: 'center',
+                        slot: true,
                     },
                     {
                         label: "榛樿鍊�",
@@ -315,6 +316,16 @@
                     ]
                 },
             },
+            rules: {
+                id: [
+                    { required: true, message: '璇疯緭鍏ヤ笟鍔＄被鍨嬬紪鍙�', trigger: 'blur' },
+                    { pattern: /^[A-Za-z]+$/, message: '涓氬姟绫诲瀷缂栧彿鍙兘涓鸿嫳鏂�', trigger: 'blur' },
+                    { min: 2, max: 15, message: '闀垮害鍦�2鍒�15涓瓧绗�', trigger: 'blur' }
+                ],
+                domain: [
+                    { required: true, message: '璇烽�夋嫨鎵�灞為鍩�', trigger: 'blur' }
+                ]
+            },
         }
     },
     created() {
@@ -328,6 +339,7 @@
             this.btmType = {};
             this.attrRef.selectData = [];
             this.attrRef.queryNotIn = null;
+            this.resetForm();
         },
         // 鍏抽棴灞炴�ф睜鏌ヨ寮圭獥
         closeAttrDialog(){
@@ -362,7 +374,9 @@
         },
         // 纭灞炴�ф睜鍕鹃��
         confirmSelectAttr(){
-            this.btmType.attributes = [];
+            if(!this.btmType.attributes){
+                this.btmType.attributes = [];
+            }
             this.attrRef.queryNotIn = "";
             this.attrRef.selectData.forEach(item => {
                 this.btmType.attributes.push({
@@ -370,7 +384,7 @@
                     name: item.name,
                     typeValue: item.typeValue,
                     typeKey: item.typeValue,
-                    attrDataType : item.typeValue,
+                    attrDataType : item.typeKey,
                     defaultValue: item.defaultValue,
                     description: item.description,
                     attributeLength: item.maxLength
@@ -465,6 +479,10 @@
             this.$delete(this.btmType,'revisionRuleId');
             this.$delete(this.btmType,'revisionRuleName');
             this.$delete(this.btmType,'inputRevisionFlag');
+       },
+       resetForm(){
+        this.btmType = {};
+        this.$refs.form.resetFields();
        }
     }
 }

--
Gitblit v1.9.3