From 41aacf110288329a6beb494ccccaeabd217a08b9 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 05 十二月 2023 18:05:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue | 88 +++++++++++++++++++++++++------------------
1 files changed, 51 insertions(+), 37 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue b/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
index 6c390a7..5cb22bb 100644
--- a/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
+++ b/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
@@ -1,49 +1,61 @@
-<template>
+ <template>
<el-dialog
title="涓氬姟绫诲瀷"
:visible.sync="showSubmitDialog"
append-to-body
@close="closeSubmitDialog"
width="70%"
+ top="6vh"
style="height: 115vh;"
>
<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-input v-model="btmType.id" :prefix-icon="icons.key" :disabled="true"></el-input>
</el-form-item>
<el-form-item label="涓枃鍚嶇О" label-width="100px">
<el-input v-model="btmType.name" :prefix-icon="icons.name"></el-input>
</el-form-item>
- <el-form-item label="鏁版嵁搴撹〃鍚�" label-width="100px">
+ <!-- <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> -->
<el-form-item label="鎵�灞為鍩�" label-width="100px" prop="domain" class="domainSelect">
- <el-select v-model="btmType.bizDomain" :prefix-icon="icons.domain">
+ <el-select placeholder="璇烽�夋嫨棰嗗煙" v-model="btmType.bizDomain" :prefix-icon="icons.domain">
<el-option v-for="item in domainOption"
:label="item.label" :value="item.value" :key="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="鐗堟湰瑙勫垯" label-width="100px">
- <el-input v-model="btmType.revisionRuleName" :prefix-icon="icons.revisionRule" class="revisionRule"
- @focus="openRevision" clearable @clear="clearRevision">
- <i slot="suffix" class="el-input__icon el-icon-search"></i>
+ <el-input v-model="btmType.revisionRuleName"
+ :prefix-icon="icons.revisionRule"
+ class="revisionRule"
+ @focus="openRevision"
+ clearable
+ @clear="clearRevision"
+ :suffix-icon="icons.referType"
+ placeholder="璇烽�夋嫨锛岀暀绌哄垯涓嶈繘琛岀鐞�">
</el-input>
</el-form-item>
<el-form-item label="鐢熷懡鍛ㄦ湡" label-width="100px">
- <el-input v-model="btmType.lifeCycleName" :prefix-icon="icons.lifeCycle" class="lifeCycle" @focus="openLifeCycle" clearable @clear="clearLifeCycle">
- <i slot="suffix" class="el-input__icon el-icon-search"></i>
+ <el-input v-model="btmType.lifeCycleName"
+ :prefix-icon="icons.lifeCycle"
+ class="lifeCycle"
+ @focus="openLifeCycle"
+ clearable
+ @clear="clearLifeCycle"
+ :suffix-icon="icons.referType"
+ placeholder="璇烽�夋嫨锛岀暀绌哄垯涓嶈繘琛岀鐞�">
</el-input>
</el-form-item>
- <div>
- <el-form-item label="寮�鍚鍥�" label-width="100px" class="viewFlag">
- <el-switch v-model="btmType.viewFlag" active-color="#13ce66" @change="viewChange"></el-switch>
- </el-form-item>
- <el-form-item label="瑙嗗浘璇彞" label-width="100px" class="viewInput">
- <el-input v-model="btmType.view" :prefix-icon="icons.view" :disabled="!btmType.viewFlag"></el-input>
- </el-form-item>
- </div>
+<!-- <div>-->
+<!-- <el-form-item label="寮�鍚鍥�" label-width="100px" class="viewFlag">-->
+<!-- <el-switch v-model="btmType.viewFlag" active-color="#13ce66" @change="viewChange"></el-switch>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="瑙嗗浘璇彞" label-width="100px" class="viewInput">-->
+<!-- <el-input v-model="btmType.view" :prefix-icon="icons.view" :disabled="!btmType.viewFlag"></el-input>-->
+<!-- </el-form-item>-->
+<!-- </div>-->
<el-form-item label="鎻忚堪" label-width="100px" class="description">
<el-input v-model="btmType.description"
:prefix-icon="icons.desc"
@@ -67,7 +79,7 @@
<el-tag>{{ row.attrDataTypeText }}</el-tag>
</template>
<template slot="menu" slot-scope="{row,index}">
- <el-button icon="el-icon-edit" size="small" type="text" v-if="!row.$cellEdit" @click="cellEditClick(row)">缂栬緫
+ <el-button icon="el-icon-edit" size="small" type="text" v-if="!row.$cellEdit" @click="cellEditClick(row,index)">缂栬緫
</el-button>
<el-button icon="el-icon-delete" size="small" type="text" v-if="!row.$cellEdit"
@click="removeFormAttrTable(row,index)">绉婚櫎
@@ -191,7 +203,7 @@
watch: {
btmType: {
handler(newval, oldval) {
- console.log('鐩戝惉', newval, oldval)
+ // console.log('鐩戝惉', newval, oldval)
},
deep: true,
immediate: true
@@ -220,7 +232,8 @@
{
label: '鑻辨枃鍚嶇О',
prop: 'id',
- align: 'center'
+ align: 'center',
+ disabled:true
}, {
label: '涓枃鍚嶇О',
prop: 'name',
@@ -272,6 +285,7 @@
prop: 'id',
align: 'left',
search: true,
+ disabled:true,
width: 230
}, {
label: '涓枃鍚嶇О',
@@ -344,6 +358,7 @@
{
label: '鑻辨枃鍚嶇О',
prop: 'id',
+ disabled:true,
search: true
},
{
@@ -408,6 +423,7 @@
{
label: '鑻辨枃鍚嶇О',
prop: 'id',
+ disabled:true,
search: true
},
{
@@ -525,7 +541,7 @@
if (!this.btmType.attributes) {
this.btmType.attributes = [];
}
- console.log(this.attrRef.selectData);
+ // console.log(this.attrRef.selectData);
this.attrRef.selectData.forEach(item => {
this.btmType.attributes.push({
id: item.id,
@@ -551,7 +567,7 @@
},
// 娣诲姞涓氬姟绫诲瀷
submitBtmType() {
- console.log(this.btmType);
+ // console.log(this.btmType);
if (!this.btmType.attributes){
this.$message.warning("杩樻病鏈変负涓氬姟绫诲瀷閫夋嫨灞炴��");
return;
@@ -594,15 +610,17 @@
},
// 鍒楄〃缂栬緫
cellEditClick(cell) {
- console.log(cell);
+ // console.log(cell);
cell.$cellEdit = true;
},
// 鍒楄〃缂栬緫淇濆瓨
- cellEditSave(row) {
- this.btmType.attributes[row.$index].name = row.name
- this.btmType.attributes[row.$index].defaultValue = row.defaultValue;
- this.btmType.attributes[row.$index].description = row.description;
+ cellEditSave(row,index) {
+ this.btmType.attributes[index].name = row.name
+ this.btmType.attributes[index].defaultValue = row.defaultValue;
+ this.btmType.attributes[index].description = row.description;
row.$cellEdit = false;
+ // console.log(this.btmType.attributes);
+ this.$refs.attrTable.refreshTable();
},
// 鎵撳紑鐗堟湰瑙勫垯鍙傜収
openRevision() {
@@ -787,26 +805,22 @@
}
.btmTypeForm > .el-form-item > .el-form-item__content > .el-input > .el-input__inner {
- width: 200px;
+ width: 260px;
}
.domainSelect > .el-form-item__content > .el-select > .el-input > .el-input__inner {
- width: 200px;
+ width: 260px;
}
.viewFlag {
- width: 305px;
+ width: 360px;
}
.viewInput > .el-form-item__content > .el-input > .el-input__inner {
- width: 200px;
+ width: 630px;
}
.descClass > .el-input__inner {
- width: 57vw
-}
-
-#descId {
- width: 57vw;
+ width: 1000px;
}
</style>
--
Gitblit v1.9.3