From 2c92901c0786d8d104acb9862c2e16f83f974cdd Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期三, 05 七月 2023 17:52:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue b/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
index d61723b..7e4f639 100644
--- a/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
+++ b/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
@@ -1,5 +1,5 @@
<template>
- <el-dialog
+ <el-dialog
title="涓氬姟绫诲瀷"
:visible.sync="showSubmitDialog"
append-to-body
@@ -43,16 +43,16 @@
</el-form-item>
</div>
<el-form-item label="鎻忚堪" label-width="100px" class="description">
- <el-input v-model="btmType.description"
- :prefix-icon="icons.desc"
+ <el-input v-model="btmType.description"
+ :prefix-icon="icons.desc"
class="descClass"
id="descId"
></el-input>
</el-form-item>
</el-form>
- <avue-crud :option="option"
- :data="btmType.attributes"
- :page.sync="page"
+ <avue-crud :option="option"
+ :data="btmType.attributes"
+ :page.sync="page"
ref="attrTable"
@cell-mouse-enter="cellEditClick"
@cell-mouse-leave="cellEditSave">
@@ -62,7 +62,7 @@
size="small"
@click="rowAdd()">灞炴�ч�夋嫨</el-button>
</template>
-
+
</avue-crud>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitBtmType">纭畾</el-button>
@@ -76,9 +76,9 @@
@close="closeAttrDialog"
width="80%"
>
- <avue-crud class="attrRef"
- :option="attrRef.option"
- :data="attrRef.data"
+ <avue-crud class="attrRef"
+ :option="attrRef.option"
+ :data="attrRef.data"
:page.sync="attrRef.page"
ref="attrRef"
@on-load="attrRefOnLoad"
@@ -98,7 +98,7 @@
:visible.sync="revisionRef.visible"
append-to-body
width="80%">
-
+
<avue-crud class="revisionRef"
:option="revisionRef.option"
:data="revisionRef.data"
@@ -203,6 +203,7 @@
reserveSelection: true,
searchMenuSpan:8,
highlightCurrentRow: true,
+ rowKey: 'id',
column: [
{
label: '鑻辨枃鍚嶇О',
@@ -319,7 +320,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: 20, message: '闀垮害鍦�2鍒�20涓瓧绗�', trigger: 'blur' }
],
domain: [
{ required: true, message: '璇烽�夋嫨鎵�灞為鍩�', trigger: 'blur' }
@@ -373,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({
@@ -384,7 +387,11 @@
attrDataType : item.typeKey,
defaultValue: item.defaultValue,
description: item.description,
- attributeLength: item.maxLength
+ attributeLength: item.maxLength,
+ referBtmTypeId: item.referTypeCode,
+ referBtmTypeName: item.referToName,
+ enumId: item.dictCode,
+ // enumName: item,
});
this.attrRef.queryNotIn += (item.id + ",")
});
@@ -417,7 +424,7 @@
this.$refs.attrTable.refreshTable();
})
},
- //
+ //
viewChange(){
},
--
Gitblit v1.9.3