Skip to content

liangzhen / framework-tools-web

Go to a project
Commit f8e7bdf8 by Thews
Options

20230104wangwansu

1 parent 7aea9674
Expand all
Inline Side-by-side
Showing with 449 additions and 283 deletions
src/views/archiViewConfig/index.vue
...@@ -90,36 +90,32 @@ ...@@ -90,36 +90,32 @@
<el-dialog <el-dialog
:title="title" :title="title"
:visible.sync="add_dialog" :visible.sync="add_dialog"
top="4%"
:center="false" :center="false"
width="50%"> width="60%">
<div class="add_dialog_content"> <div class="add_dialog_content">
<div class="dialog_content_1"> <el-form :model="formData" :rules="rules" ref="viewForm">
<div class="dialog_form_item"> <div class="form_item_container">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>架构视图名称</div> <el-form-item class="cross" label="架构视图名称:" prop="viewName">
<el-input v-model="formData.viewName" placeholder="请输入内容" class="search_item"></el-input> <el-input v-model="formData.viewName" maxlength="100"></el-input>
<!-- <el-select v-model="formData.viewName" placeholder="请选择" clearable class="search_item"> </el-form-item>
<el-option v-for="(item,idnex) in viewNameList" :key="idnex" :label="item" :value="item" ></el-option> <el-form-item class="cross" label="架构层次:" prop="archiLevelId">
</el-select> --> <el-select v-model="formData.archiLevelId" placeholder="请选择" clearable>
<el-option v-for="(item,idnex) in levelList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
</el-select>
</el-form-item>
<el-form-item class="cross" label="架构层次:" prop="archiBelongId">
<el-select v-model="formData.archiBelongId" placeholder="请选择" clearable>
<el-option v-for="(item,idnex) in belongList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
</el-select>
</el-form-item>
<el-form-item class="cross1" label="视图描述:" prop="content">
<el-input type="textarea" :rows="3" maxlength="200" show-word-limit placeholder="请输入内容" class="dialog_form_item_content" v-model="formData.content"></el-input>
</el-form-item>
</div> </div>
<div class="dialog_form_item"> </el-form>
<div class="dialog_form_item_title"><span class="reqIcon">*</span>架构层次</div>
<el-select v-model="formData.archiLevelId" placeholder="请选择" clearable class="search_item">
<el-option v-for="(item,idnex) in levelList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
</el-select>
</div>
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>架构归属</div>
<el-select v-model="formData.archiBelongId" placeholder="请选择" clearable class="search_item">
<el-option v-for="(item,idnex) in belongList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
</el-select>
</div>
</div>
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>视图描述</div>
<el-input type="textarea" :rows="2" placeholder="请输入内容" class="dialog_form_item_content" v-model="formData.content"></el-input>
</div>
<div class="dialog_form_item"> <div class="dialog_form_item">
<div class="dialog_form_item_title">*元素范围</div> <div class="dialog_form_item_title"><span class="reqIcon">*</span>元素范围</div>
<el-table :data="tableData1" ref="multipleTable1" border height="195" @selection-change="handleSelectionChange1"> <el-table :data="tableData1" ref="multipleTable1" border height="195" @selection-change="handleSelectionChange1">
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column> <el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
...@@ -127,7 +123,7 @@ ...@@ -127,7 +123,7 @@
</el-table> </el-table>
</div> </div>
<div class="dialog_form_item"> <div class="dialog_form_item">
<div class="dialog_form_item_title">*元素关系范围</div> <div class="dialog_form_item_title"><span class="reqIcon">*</span>元素关系范围</div>
<el-table :data="tableData2" ref="multipleTable2" border height="195" @selection-change="handleSelectionChange2"> <el-table :data="tableData2" ref="multipleTable2" border height="195" @selection-change="handleSelectionChange2">
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column> <el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
...@@ -184,6 +180,20 @@ export default { ...@@ -184,6 +180,20 @@ export default {
archiEleRelId: "", archiEleRelId: "",
relName: "", relName: "",
}, },
rules: {
viewName: [
{ required: true, message: '请输入架构视图名称', trigger: 'blur' },
],
archiLevelId: [
{ required: true, message: '请选择架构层次', trigger: 'change' },
],
archiBelongId: [
{ required: true, message: '请选择架构归属', trigger: 'change' },
],
content: [
{ required: true, message: '请输入视图描述', trigger: 'blur' },
],
},
params: { params: {
current: 1, current: 1,
pageSize: 10, pageSize: 10,
...@@ -356,6 +366,9 @@ export default { ...@@ -356,6 +366,9 @@ export default {
this.add_dialog = true; this.add_dialog = true;
this.title = "新建架构视图"; this.title = "新建架构视图";
this.resetForm(); this.resetForm();
this.$nextTick(() => {
this.$refs.viewForm.resetFields();
});
}else if (type == "edit") { }else if (type == "edit") {
this.add_dialog = true; this.add_dialog = true;
this.title = "编辑架构视图"; this.title = "编辑架构视图";
...@@ -374,10 +387,6 @@ export default { ...@@ -374,10 +387,6 @@ export default {
if (item.archiEleRelId) { if (item.archiEleRelId) {
this.selectData4 = item.archiEleRelId.split(","); this.selectData4 = item.archiEleRelId.split(",");
} }
// this.selectData1 = item.eleName.split(",");
// this.selectData2 = item.archiEleId.split(",");
// this.selectData3 = item.relName.split(",");
// this.selectData4 = item.archiEleRelId.split(",");
this.tableData1.forEach(item => { this.tableData1.forEach(item => {
this.selectData2.forEach(item2 => { this.selectData2.forEach(item2 => {
if (item.elementId == item2) { if (item.elementId == item2) {
...@@ -397,37 +406,49 @@ export default { ...@@ -397,37 +406,49 @@ export default {
}); });
}); });
}else if (type == "create") { }else if (type == "create") {
this.formData.state = 2; this.$refs.viewForm.validate(valid => {
// 赋值 if(valid) {
this.formData.eleName = this.selectData1.join(","); if (this.selectData1.length == 0) {
this.formData.archiEleId = this.selectData2.join(","); this.$message.error("请勾选元素范围");
this.formData.relName = this.selectData3.join(","); return;
this.formData.archiEleRelId = this.selectData4.join(",");
if (this.formData.viewId) {
// 编辑保存
getJGSTPZUpdate(this.formData).then(res => {
if (res.code == 200) {
this.$message.success("保存成功");
this.add_dialog = false;
this.getList();
}else{
this.add_dialog = false;
this.$message.error(res.msg);
} }
}); if (this.selectData3.length == 0) {
}else{ this.$message.error("请勾选元素关系范围");
// 新建保存 return;
getJGSTPZAdd(this.formData).then(res => { }
if (res.code == 200) { this.formData.state = 2;
this.$message.success("保存成功"); // 赋值
this.add_dialog = false; this.formData.eleName = this.selectData1.join(",");
this.getList(); this.formData.archiEleId = this.selectData2.join(",");
this.formData.relName = this.selectData3.join(",");
this.formData.archiEleRelId = this.selectData4.join(",");
if (this.formData.viewId) {
// 编辑保存
getJGSTPZUpdate(this.formData).then(res => {
if (res.code == 200) {
this.$message.success("保存成功");
this.add_dialog = false;
this.getList();
}else{
this.add_dialog = false;
this.$message.error(res.msg);
}
});
}else{ }else{
this.add_dialog = false; // 新建保存
this.$message.error(res.msg); getJGSTPZAdd(this.formData).then(res => {
if (res.code == 200) {
this.$message.success("保存成功");
this.add_dialog = false;
this.getList();
}else{
this.add_dialog = false;
this.$message.error(res.msg);
}
});
} }
}); }
} });
}else if (type == "pushAdd") { }else if (type == "pushAdd") {
this.formData.state = 1; this.formData.state = 1;
this.formData.eleName = this.selectData1.join(","); this.formData.eleName = this.selectData1.join(",");
...@@ -602,6 +623,32 @@ export default { ...@@ -602,6 +623,32 @@ export default {
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
} }
.form_item_container{
display: flex;
flex-wrap: wrap;
.cross{
width: 32% !important;
/deep/ .el-form-item__label{
width: 40%;
}
/deep/ .el-form-item__content{
width: 60% !important;
}
}
.cross1{
width: 100% !important;
/deep/ .el-form-item__label{
width: 13%;
}
/deep/ .el-form-item__content{
width: 83% !important;
}
}
.el-form-item{
display: flex;
width: 100%;
}
}
.dialog_content_1{ .dialog_content_1{
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
...@@ -713,6 +760,7 @@ export default { ...@@ -713,6 +760,7 @@ export default {
margin-top: 50px; margin-top: 50px;
} }
.dialog_form_item{ .dialog_form_item{
width: 96%;
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 10px; margin-bottom: 10px;
...@@ -720,10 +768,11 @@ export default { ...@@ -720,10 +768,11 @@ export default {
.dialog_form_item_title{ .dialog_form_item_title{
flex-shrink: 0; flex-shrink: 0;
margin-right: 15px; margin-right: 15px;
width: 100px; width: 130px;
text-align: right; text-align: right;
.reqIcon{ .reqIcon{
color: red; color: #F56C6C;
margin-right: 4px;
} }
} }
/deep/ .el-dialog__header{ /deep/ .el-dialog__header{
......
src/views/metaModelDic/pages/page1.vue
...@@ -179,34 +179,27 @@ ...@@ -179,34 +179,27 @@
:center="false" :center="false"
width="40%"> width="40%">
<div class="add_dialog_content"> <div class="add_dialog_content">
<div class="dialog_content_1"> <el-form :model="formData2" :rules="rules" ref="page1Form">
<div class="dialog_form_item2"> <div class="form_item_container">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>字段名</div> <el-form-item class="cross" label="字段名:" prop="fieldName">
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.fieldName" @input="formData2.fieldName=formData2.fieldName.replace(/[^a-zA-Z]/g,'')"></el-input> <el-input v-model="formData2.fieldName" maxlength="100"></el-input>
</div> </el-form-item>
<div class="dialog_form_item2"> <el-form-item class="cross" label="中文名:" prop="chineseName">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>中文名</div> <el-input v-model="formData2.chineseName" maxlength="100"></el-input>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.chineseName"></el-input> </el-form-item>
</div> <el-form-item class="cross" label="排序:" prop="displayOrder">
</div> <el-input v-model="formData2.displayOrder" maxlength="100"></el-input>
<div class="dialog_content_1"> </el-form-item>
<div class="dialog_form_item2"> <el-form-item class="cross" label="长度:" prop="contentLength">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>排序</div> <el-input v-model="formData2.contentLength" maxlength="100"></el-input>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.displayOrder"></el-input> </el-form-item>
</div> <el-form-item class="cross" label="控件:" prop="controlType">
<div class="dialog_form_item2"> <el-select v-model="formData2.controlType" placeholder="请选择" clearable>
<div class="dialog_form_item_title"><span class="reqIcon">*</span>长度</div> <el-option v-for="(item,idnex) in selectTypeList" :key="idnex" :label="item.label" :value="item.value"></el-option>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.contentLength"></el-input> </el-select>
</div> </el-form-item>
</div>
<div class="dialog_content_1">
<div class="dialog_form_item2">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>控件</div>
<el-select v-model="formData2.controlType" placeholder="请选择" class="search_item">
<el-option v-for="(item,idnex) in selectTypeList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
</el-select>
</div> </div>
</div> </el-form>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button class="greenButton" @click="operateDia('save')">保存</el-button> <el-button class="greenButton" @click="operateDia('save')">保存</el-button>
...@@ -265,6 +258,23 @@ export default { ...@@ -265,6 +258,23 @@ export default {
contentLength: "", contentLength: "",
controlType: "", controlType: "",
}, },
rules: {
fieldName: [
{ required: true, message: '请输入字段名', trigger: 'blur' },
],
chineseName: [
{ required: true, message: '请输入中文名', trigger: 'blur' },
],
displayOrder: [
{ required: true, message: '请输字段入排序', trigger: 'blur' },
],
contentLength: [
{ required: true, message: '请输入字段长度', trigger: 'blur' },
],
controlType: [
{ required: true, message: '请选择控件类型', trigger: 'change' },
],
},
params: { params: {
current: 1, current: 1,
pageSize: 10, pageSize: 10,
...@@ -540,6 +550,9 @@ export default { ...@@ -540,6 +550,9 @@ export default {
this.add_dialog2 = true; this.add_dialog2 = true;
this.title2 = "新建字典属性"; this.title2 = "新建字典属性";
this.resetFormData2(); this.resetFormData2();
this.$nextTick(() => {
this.$refs.page1Form.resetFields();
});
break; break;
// 编辑 // 编辑
case 'edit': case 'edit':
...@@ -549,56 +562,60 @@ export default { ...@@ -549,56 +562,60 @@ export default {
break; break;
// 保存 // 保存
case 'save': case 'save':
if (this.formData2.propertyId) { this.$refs.page1Form.validate(valid => {
let params = { if(valid) {
fieldName: this.formData2.fieldName, if (this.formData2.propertyId) {
chineseName: this.formData2.chineseName, let params = {
displayOrder: this.formData2.displayOrder, fieldName: this.formData2.fieldName,
contentLength: this.formData2.contentLength, chineseName: this.formData2.chineseName,
controlType: this.formData2.controlType, displayOrder: this.formData2.displayOrder,
propertyId: this.formData2.propertyId, contentLength: this.formData2.contentLength,
type: this.formData.type, controlType: this.formData2.controlType,
typeId: this.formData.typeId, propertyId: this.formData2.propertyId,
version: this.formData.version, type: this.formData.type,
dicyId: this.formData.dicyId, typeId: this.formData.typeId,
state: this.formData.state, version: this.formData.version,
} dicyId: this.formData.dicyId,
// 编辑保存 state: this.formData.state,
getYMXZDGLProyUpdate(params).then(res => { }
if (res.code == 200) { // 编辑保存
this.$message.success("保存成功"); getYMXZDGLProyUpdate(params).then(res => {
this.add_dialog2 = false; if (res.code == 200) {
this.getProyList(this.formData); this.$message.success("保存成功");
this.add_dialog2 = false;
this.getProyList(this.formData);
}else{
this.add_dialog2 = false;
this.$message.error(res.msg);
}
});
}else{ }else{
this.add_dialog2 = false; let params = {
this.$message.error(res.msg); fieldName: this.formData2.fieldName,
chineseName: this.formData2.chineseName,
displayOrder: this.formData2.displayOrder,
contentLength: this.formData2.contentLength,
controlType: this.formData2.controlType,
type: this.formData.type,
typeId: this.formData.typeId,
version: this.formData.version,
dicyId: this.formData.dicyId,
state: this.formData.state,
}
// 新建保存
getYMXZDGLProyAdd(params).then(res => {
if (res.code == 200) {
this.$message.success("新建成功");
this.add_dialog2 = false;
this.getProyList(this.formData);
}else{
this.add_dialog2 = false;
this.$message.error(res.msg);
}
});
} }
});
}else{
let params = {
fieldName: this.formData2.fieldName,
chineseName: this.formData2.chineseName,
displayOrder: this.formData2.displayOrder,
contentLength: this.formData2.contentLength,
controlType: this.formData2.controlType,
type: this.formData.type,
typeId: this.formData.typeId,
version: this.formData.version,
dicyId: this.formData.dicyId,
state: this.formData.state,
} }
// 新建保存 });
getYMXZDGLProyAdd(params).then(res => {
if (res.code == 200) {
this.$message.success("新建成功");
this.add_dialog2 = false;
this.getProyList(this.formData);
}else{
this.add_dialog2 = false;
this.$message.error(res.msg);
}
});
}
break; break;
// 删除 // 删除
case 'del': case 'del':
...@@ -658,6 +675,26 @@ export default { ...@@ -658,6 +675,26 @@ export default {
} }
.add_dialog_content{ .add_dialog_content{
width: 100%; width: 100%;
.form_item_container{
display: flex;
flex-wrap: wrap;
.cross{
width: 50% !important;
/deep/ .el-form-item__label{
width: 25%;
}
/deep/ .el-form-item__content{
width: 65% !important;
.el-select{
width: 100% !important;
}
}
}
.el-form-item{
display: flex;
width: 100%;
}
}
} }
.dialog_content_1{ .dialog_content_1{
width: 100%; width: 100%;
......
src/views/metaModelDic/pages/page2.vue
...@@ -174,34 +174,27 @@ ...@@ -174,34 +174,27 @@
:center="false" :center="false"
width="40%"> width="40%">
<div class="add_dialog_content"> <div class="add_dialog_content">
<div class="dialog_content_1"> <el-form :model="formData2" :rules="rules" ref="page2Form">
<div class="dialog_form_item"> <div class="form_item_container">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>字段名</div> <el-form-item class="cross" label="字段名:" prop="fieldName">
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.fieldName" @input="formData2.fieldName=formData2.fieldName.replace(/[^a-zA-Z]/g,'')"></el-input> <el-input v-model="formData2.fieldName" maxlength="100"></el-input>
</div> </el-form-item>
<div class="dialog_form_item"> <el-form-item class="cross" label="中文名:" prop="chineseName">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>中文名</div> <el-input v-model="formData2.chineseName" maxlength="100"></el-input>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.chineseName"></el-input> </el-form-item>
</div> <el-form-item class="cross" label="排序:" prop="displayOrder">
</div> <el-input v-model="formData2.displayOrder" maxlength="100"></el-input>
<div class="dialog_content_1"> </el-form-item>
<div class="dialog_form_item"> <el-form-item class="cross" label="长度:" prop="contentLength">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>排序</div> <el-input v-model="formData2.contentLength" maxlength="100"></el-input>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.displayOrder"></el-input> </el-form-item>
</div> <el-form-item class="cross" label="控件:" prop="controlType">
<div class="dialog_form_item"> <el-select v-model="formData2.controlType" placeholder="请选择" clearable>
<div class="dialog_form_item_title"><span class="reqIcon">*</span>长度</div> <el-option v-for="(item,idnex) in selectTypeList" :key="idnex" :label="item.label" :value="item.value"></el-option>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.contentLength"></el-input> </el-select>
</div> </el-form-item>
</div>
<div class="dialog_content_1">
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>控件</div>
<el-select v-model="formData2.controlType" placeholder="请选择" class="search_item">
<el-option v-for="(item,idnex) in selectTypeList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
</el-select>
</div> </div>
</div> </el-form>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button class="greenButton" @click="operateDia('save')">保存</el-button> <el-button class="greenButton" @click="operateDia('save')">保存</el-button>
...@@ -266,6 +259,23 @@ export default { ...@@ -266,6 +259,23 @@ export default {
contentLength: "", contentLength: "",
controlType: "", controlType: "",
}, },
rules: {
fieldName: [
{ required: true, message: '请输入字段名', trigger: 'blur' },
],
chineseName: [
{ required: true, message: '请输入中文名', trigger: 'blur' },
],
displayOrder: [
{ required: true, message: '请输字段入排序', trigger: 'blur' },
],
contentLength: [
{ required: true, message: '请输入字段长度', trigger: 'blur' },
],
controlType: [
{ required: true, message: '请选择控件类型', trigger: 'change' },
],
},
params: { params: {
current: 1, current: 1,
pageSize: 10, pageSize: 10,
...@@ -496,6 +506,9 @@ export default { ...@@ -496,6 +506,9 @@ export default {
this.add_dialog2 = true; this.add_dialog2 = true;
this.title2 = "新建字典属性"; this.title2 = "新建字典属性";
this.resetFormData2(); this.resetFormData2();
this.$nextTick(() => {
this.$refs.page2Form.resetFields();
});
break; break;
// 编辑 // 编辑
case 'edit': case 'edit':
...@@ -505,56 +518,60 @@ export default { ...@@ -505,56 +518,60 @@ export default {
break; break;
// 保存 // 保存
case 'save': case 'save':
if (this.formData2.propertyId) { this.$refs.page2Form.validate(valid => {
let params = { if(valid) {
fieldName: this.formData2.fieldName, if (this.formData2.propertyId) {
chineseName: this.formData2.chineseName, let params = {
displayOrder: this.formData2.displayOrder, fieldName: this.formData2.fieldName,
contentLength: this.formData2.contentLength, chineseName: this.formData2.chineseName,
controlType: this.formData2.controlType, displayOrder: this.formData2.displayOrder,
propertyId: this.formData2.propertyId, contentLength: this.formData2.contentLength,
type: this.formData.type, controlType: this.formData2.controlType,
typeId: this.formData.typeId, propertyId: this.formData2.propertyId,
version: this.formData.version, type: this.formData.type,
dicyId: this.formData.dicyId, typeId: this.formData.typeId,
state: this.formData.state, version: this.formData.version,
} dicyId: this.formData.dicyId,
// 编辑保存 state: this.formData.state,
getYMXZDGLProyUpdate(params).then(res => { }
if (res.code == 200) { // 编辑保存
this.$message.success("保存成功"); getYMXZDGLProyUpdate(params).then(res => {
this.add_dialog2 = false; if (res.code == 200) {
this.getProyList(this.formData); this.$message.success("保存成功");
this.add_dialog2 = false;
this.getProyList(this.formData);
}else{
this.add_dialog2 = false;
this.$message.error(res.msg);
}
});
}else{ }else{
this.add_dialog2 = false; let params = {
this.$message.error(res.msg); fieldName: this.formData2.fieldName,
chineseName: this.formData2.chineseName,
displayOrder: this.formData2.displayOrder,
contentLength: this.formData2.contentLength,
controlType: this.formData2.controlType,
type: this.formData.type,
typeId: this.formData.typeId,
version: this.formData.version,
dicyId: this.formData.dicyId,
state: this.formData.state,
}
// 新建保存
getYMXZDGLProyAdd(params).then(res => {
if (res.code == 200) {
this.$message.success("新建成功");
this.add_dialog2 = false;
this.getProyList(this.formData);
}else{
this.add_dialog2 = false;
this.$message.error(res.msg);
}
});
} }
});
}else{
let params = {
fieldName: this.formData2.fieldName,
chineseName: this.formData2.chineseName,
displayOrder: this.formData2.displayOrder,
contentLength: this.formData2.contentLength,
controlType: this.formData2.controlType,
type: this.formData.type,
typeId: this.formData.typeId,
version: this.formData.version,
dicyId: this.formData.dicyId,
state: this.formData.state,
} }
// 新建保存 });
getYMXZDGLProyAdd(params).then(res => {
if (res.code == 200) {
this.$message.success("新建成功");
this.add_dialog2 = false;
this.getProyList(this.formData);
}else{
this.add_dialog2 = false;
this.$message.error(res.msg);
}
});
}
break; break;
// 删除 // 删除
case 'del': case 'del':
...@@ -624,6 +641,29 @@ export default { ...@@ -624,6 +641,29 @@ export default {
width: 260px; width: 260px;
} }
} }
.add_dialog_content{
width: 100%;
.form_item_container{
display: flex;
flex-wrap: wrap;
.cross{
width: 50% !important;
/deep/ .el-form-item__label{
width: 25%;
}
/deep/ .el-form-item__content{
width: 65% !important;
.el-select{
width: 100% !important;
}
}
}
.el-form-item{
display: flex;
width: 100%;
}
}
}
.search_menu{ .search_menu{
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
......
src/views/metaModelDic/pages/page3.vue
...@@ -173,34 +173,27 @@ ...@@ -173,34 +173,27 @@
:center="false" :center="false"
width="40%"> width="40%">
<div class="add_dialog_content"> <div class="add_dialog_content">
<div class="dialog_content_1"> <el-form :model="formData2" :rules="rules" ref="page3Form">
<div class="dialog_form_item"> <div class="form_item_container">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>字段名</div> <el-form-item class="cross" label="字段名:" prop="fieldName">
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.fieldName" @input="formData2.fieldName=formData2.fieldName.replace(/[^a-zA-Z]/g,'')"></el-input> <el-input v-model="formData2.fieldName" maxlength="100"></el-input>
</div> </el-form-item>
<div class="dialog_form_item"> <el-form-item class="cross" label="中文名:" prop="chineseName">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>中文名</div> <el-input v-model="formData2.chineseName" maxlength="100"></el-input>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.chineseName"></el-input> </el-form-item>
</div> <el-form-item class="cross" label="排序:" prop="displayOrder">
</div> <el-input v-model="formData2.displayOrder" maxlength="100"></el-input>
<div class="dialog_content_1"> </el-form-item>
<div class="dialog_form_item"> <el-form-item class="cross" label="长度:" prop="contentLength">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>排序</div> <el-input v-model="formData2.contentLength" maxlength="100"></el-input>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.displayOrder"></el-input> </el-form-item>
</div> <el-form-item class="cross" label="控件:" prop="controlType">
<div class="dialog_form_item"> <el-select v-model="formData2.controlType" placeholder="请选择" clearable>
<div class="dialog_form_item_title"><span class="reqIcon">*</span>长度</div> <el-option v-for="(item,idnex) in selectTypeList" :key="idnex" :label="item.label" :value="item.value"></el-option>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.contentLength"></el-input> </el-select>
</div> </el-form-item>
</div>
<div class="dialog_content_1">
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>控件</div>
<el-select v-model="formData2.controlType" placeholder="请选择" class="search_item">
<el-option v-for="(item,idnex) in selectTypeList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
</el-select>
</div> </div>
</div> </el-form>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button class="greenButton" @click="operateDia('save')">保存</el-button> <el-button class="greenButton" @click="operateDia('save')">保存</el-button>
...@@ -260,6 +253,23 @@ export default { ...@@ -260,6 +253,23 @@ export default {
contentLength: "", contentLength: "",
controlType: "", controlType: "",
}, },
rules: {
fieldName: [
{ required: true, message: '请输入字段名', trigger: 'blur' },
],
chineseName: [
{ required: true, message: '请输入中文名', trigger: 'blur' },
],
displayOrder: [
{ required: true, message: '请输字段入排序', trigger: 'blur' },
],
contentLength: [
{ required: true, message: '请输入字段长度', trigger: 'blur' },
],
controlType: [
{ required: true, message: '请选择控件类型', trigger: 'change' },
],
},
params: { params: {
current: 1, current: 1,
pageSize: 10, pageSize: 10,
...@@ -561,6 +571,9 @@ export default { ...@@ -561,6 +571,9 @@ export default {
this.add_dialog2 = true; this.add_dialog2 = true;
this.title2 = "新建字典属性"; this.title2 = "新建字典属性";
this.resetFormData2(); this.resetFormData2();
this.$nextTick(() => {
this.$refs.page3Form.resetFields();
});
break; break;
// 编辑 // 编辑
case 'edit': case 'edit':
...@@ -570,56 +583,60 @@ export default { ...@@ -570,56 +583,60 @@ export default {
break; break;
// 保存 // 保存
case 'save': case 'save':
if (this.formData2.propertyId) { this.$refs.page3Form.validate(valid => {
let params = { if(valid) {
fieldName: this.formData2.fieldName, if (this.formData2.propertyId) {
chineseName: this.formData2.chineseName, let params = {
displayOrder: this.formData2.displayOrder, fieldName: this.formData2.fieldName,
contentLength: this.formData2.contentLength, chineseName: this.formData2.chineseName,
controlType: this.formData2.controlType, displayOrder: this.formData2.displayOrder,
propertyId: this.formData2.propertyId, contentLength: this.formData2.contentLength,
type: this.formData.type, controlType: this.formData2.controlType,
typeId: this.formData.typeId, propertyId: this.formData2.propertyId,
version: this.formData.version, type: this.formData.type,
dicyId: this.formData.dicyId, typeId: this.formData.typeId,
state: this.formData.state, version: this.formData.version,
} dicyId: this.formData.dicyId,
// 编辑保存 state: this.formData.state,
getYMXZDGLProyUpdate(params).then(res => { }
if (res.code == 200) { // 编辑保存
this.$message.success("保存成功"); getYMXZDGLProyUpdate(params).then(res => {
this.add_dialog2 = false; if (res.code == 200) {
this.getProyList(this.formData); this.$message.success("保存成功");
this.add_dialog2 = false;
this.getProyList(this.formData);
}else{
this.add_dialog2 = false;
this.$message.error(res.msg);
}
});
}else{ }else{
this.add_dialog2 = false; let params = {
this.$message.error(res.msg); fieldName: this.formData2.fieldName,
chineseName: this.formData2.chineseName,
displayOrder: this.formData2.displayOrder,
contentLength: this.formData2.contentLength,
controlType: this.formData2.controlType,
type: this.formData.type,
typeId: this.formData.typeId,
version: this.formData.version,
dicyId: this.formData.dicyId,
state: this.formData.state,
}
// 新建保存
getYMXZDGLProyAdd(params).then(res => {
if (res.code == 200) {
this.$message.success("新建成功");
this.add_dialog2 = false;
this.getProyList(this.formData);
}else{
this.add_dialog2 = false;
this.$message.error(res.msg);
}
});
} }
});
}else{
let params = {
fieldName: this.formData2.fieldName,
chineseName: this.formData2.chineseName,
displayOrder: this.formData2.displayOrder,
contentLength: this.formData2.contentLength,
controlType: this.formData2.controlType,
type: this.formData.type,
typeId: this.formData.typeId,
version: this.formData.version,
dicyId: this.formData.dicyId,
state: this.formData.state,
} }
// 新建保存 });
getYMXZDGLProyAdd(params).then(res => {
if (res.code == 200) {
this.$message.success("新建成功");
this.add_dialog2 = false;
this.getProyList(this.formData);
}else{
this.add_dialog2 = false;
this.$message.error(res.msg);
}
});
}
break; break;
// 删除 // 删除
case 'del': case 'del':
...@@ -670,6 +687,29 @@ export default { ...@@ -670,6 +687,29 @@ export default {
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
} }
.add_dialog_content{
width: 100%;
.form_item_container{
display: flex;
flex-wrap: wrap;
.cross{
width: 50% !important;
/deep/ .el-form-item__label{
width: 25%;
}
/deep/ .el-form-item__content{
width: 65% !important;
.el-select{
width: 100% !important;
}
}
}
.el-form-item{
display: flex;
width: 100%;
}
}
}
.newBtn{ .newBtn{
margin-top: 5px; margin-top: 5px;
.addItem{ .addItem{
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!