From 8f0bb9dd15589861df5574890976ad4c46490a8c Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 12 九月 2023 17:48:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/modeling/originalAdd.vue |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/modeling/originalAdd.vue b/Source/UBCS-WEB/src/views/modeling/originalAdd.vue
index 14cea7e..6b06bb8 100644
--- a/Source/UBCS-WEB/src/views/modeling/originalAdd.vue
+++ b/Source/UBCS-WEB/src/views/modeling/originalAdd.vue
@@ -6,7 +6,7 @@
             <el-form ref="form" :model="attribute" show-message="true" inline size="medium" label-suffix=":"
                 class="attributeForm" :rules="rules" @resetFields="resetAttributeForm" status-icon="true">
                 <el-form-item label="灞炴�х紪鍙�" label-width="100px" prop="id">
-                    <el-input v-model="attribute.id" maxlength="15" show-word-limit type="text"></el-input>
+                    <el-input v-model="attribute.id" maxlength="30" show-word-limit type="text"></el-input>
                 </el-form-item>
                 <el-form-item label="灞炴�у悕绉�" label-width="100px" prop="name">
                     <el-input v-model="attribute.name"></el-input>
@@ -111,7 +111,7 @@
             <!-- 閫夋嫨鏋氫妇鏃剁殑寮圭獥 -->
             <el-dialog title="鏋氫妇鍒楄〃" :visible.sync="enumRefer.show" append-to-body @close="closeEnumDialog" width="70%"
                 style="height: 115vh;">
-                <avue-crud ref="eunmTable" :option="enumRefer.option" :data="enumRefer.data" class="enumTable"
+                <avue-crud ref="eunmTable" :option="enumRefer.option"  @on-load="enumOnLoad" :data="enumRefer.data" class="enumTable"
                     @row-click="enumReferClick" :page.sync="enumRefer.enumPage">
                     <template slot="radio" slot-scope="{row}">
                         <el-radio v-model="enumRefer.selectRow" :label="row.$index">&nbsp;
@@ -153,7 +153,7 @@
                 id: [
                     { required: true, message: '璇疯緭鍏ュ睘鎬х紪鍙�', trigger: 'blur' },
                     { pattern: /^[A-Za-z]+$/, message: '灞炴�х紪鍙峰彧鑳戒负鑻辨枃', trigger: 'blur' },
-                    { min: 2, max: 15, message: '闀垮害鍦�2鍒�15涓瓧绗�', trigger: 'blur' }
+                    { min: 2, max: 30, message: '闀垮害鍦�2鍒�30涓瓧绗�', trigger: 'blur' }
                 ],
                 name: [
                     { required: true, message: '璇疯緭鍏ュ睘鎬у悕绉�', trigger: 'blur' }
@@ -281,6 +281,12 @@
         this.initAttributeReferTypeList();
     },
     methods: {
+        enumOnLoad(){
+          getParentList(this.enumRefer.enumPage.currentPage, this.enumRefer.enumPage.pageSize).then(res => {
+            this.enumRefer.enumPage.total = res.data.data.total;
+            this.enumRefer.data = res.data.data.records;
+          })
+        },
         closeSubmitDialog() {
             this.resetAttributeForm();
             this.showSubmitDialog = false;
@@ -382,9 +388,9 @@
                     this.btmRefer.btmPage.total = res.data.data.total;
                 })
             }
-            if (this.attribute.referTypeKey == 'linkType') {
-
-            }
+            // if (this.attribute.referTypeKey == 'linkType') {
+            //
+            // }
         },
         // 鏋氫妇绫诲瀷杈撳叆妗嗚幏寰楃劍鐐规椂鐨勪簨浠�
         openEnumConfig() {

--
Gitblit v1.9.3