From 4a2835ddadb796c69f180097b95f971dbab4687d Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 13 九月 2023 09:09:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/modeling/original.vue | 78 +++++++++++++++++++++++++++++----------
1 files changed, 58 insertions(+), 20 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/modeling/original.vue b/Source/UBCS-WEB/src/views/modeling/original.vue
index 805e99f..d701e74 100644
--- a/Source/UBCS-WEB/src/views/modeling/original.vue
+++ b/Source/UBCS-WEB/src/views/modeling/original.vue
@@ -1,4 +1,4 @@
-<template>
+ <template>
<el-container>
<el-main>
<basic-container>
@@ -17,7 +17,7 @@
</el-button>
<el-button size="small" plain type="primary" icon="el-icon-zoom-in" @click="applyRangeOpen">鏌ョ湅浣跨敤鑼冨洿
</el-button>
- <el-input placeholder="鎸夊睘鎬ц嫳鏂囧悕绉版煡璇�" v-model="searchId" clearable prefix-icon="el-icon-search" class="attrSearch"
+ <el-input placeholder="鎸夊睘鎬х紪鍙锋煡璇�" v-model="searchId" clearable prefix-icon="el-icon-search" class="attrSearch"
size="small" @change="doSearch" type="text"></el-input>
<el-button size="small" plain type="primary" icon="el-icon-search" @click="doSearch"> 鎼滅储</el-button>
</template>
@@ -54,12 +54,12 @@
</template>
{{ itemForm.itemData.typeValue }}
</el-descriptions-item>
- <el-descriptions-item>
+<!-- <el-descriptions-item>
<template slot="label">
鏍囩
</template>
{{ itemForm.itemData.hashtag }}
- </el-descriptions-item>
+ </el-descriptions-item>-->
<el-descriptions-item>
<template slot="label">
榛樿鍊�
@@ -70,7 +70,7 @@
<template slot="label">
鍏佽涓虹┖
</template>
- {{ itemForm.itemData.nullable }}
+ {{ 'true' == itemForm.itemData.nullable ? '鏄�' : '鍚�'}}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
@@ -122,14 +122,14 @@
<template slot="label">
鏋氫妇绫诲瀷
</template>
- {{ itemForm.itemData.dictCode }}
+ {{ itemForm.itemData.dictValue }}
</el-descriptions-item>
</el-descriptions>
</el-tab-pane>
</el-tabs>
</basic-container>
</el-aside>
- <originalAdd ref="originalAdd" @refreshTable="refreshChange"></originalAdd>
+ <originalAdd ref="originalAdd" @refreshTable="refreshChange" :attribute="editAttribute"></originalAdd>
</el-container>
</template>
@@ -141,6 +141,7 @@
update, getPage, getApplyRange
} from "@/api/omd/OmdAttribute";
import Versionpackage from "./Versionpackage.vue";
+import {getDictionary} from "@/api/omd/enum";
export default {
name: "original",
@@ -157,10 +158,11 @@
attribute: {
nullable: true
},
- editAttibute: {},
+ editAttribute: {},
applyRangeData: [],
option: {
- height: "550px",
+ height: "auto",
+ calcHeight:20,
headerAlign: "center",
border: true,
index: true,
@@ -192,12 +194,12 @@
prop: "name",
align: "left",
display: false
- }, {
+ },/* {
label: "鏍囩",
prop: "hashtag",
// hide: true,
display: false
- }, {
+ },*/ {
label: "鏄惁浣跨敤鏋氫妇",
prop: "usingDict",
type: "switch",
@@ -250,6 +252,8 @@
itemForm: {
itemData: {},
activeName: "referTab",
+ enumInitFlag:false,
+ referInitFlag: false,
form: {}
},
searchId: '',
@@ -263,23 +267,36 @@
},
addSave() {
this.$refs.originalAdd.showSubmitDialog = true;
- this.$refs.originalAdd.attribute = {};
+ const newAttr = {};
+ newAttr.nullable = true;
+ this.$refs.originalAdd.attribute = newAttr;
},
updateSave(row,index) {
this.selectRow = index;
var json = JSON.stringify(row);
- this.editAttibute = JSON.parse(json);
- this.editAttibute.nullable = row.nullable == 'true' ? true : false;
- this.$refs.originalAdd.attribute = this.editAttibute;
+ this.editAttribute = JSON.parse(json);
+ this.editAttribute.nullable = row.nullable == 'true' ? true : false;
+ this.$refs.originalAdd.attribute = this.editAttribute;
this.$refs.originalAdd.showSubmitDialog = true;
- this.refreshChange()
+ this.checkUsingReferDict(row);
+ this.$refs.originalAdd.activeName = this.itemForm.activeName;
+ this.$refs.originalAdd.enumInitFlag = this.itemForm.enumInitFlag;
+ this.$refs.originalAdd.referInitFlag = this.itemForm.referInitFlag;
+ // this.refreshChange()
},
deleteSave(row,index) {
- console.log(row);
- remove(row.oid).then(res => {
- this.$message.success("鍒犻櫎鎴愬姛");
+ this.$confirm("鍒犻櫎鍏冩暟鎹皢鏃犳硶琚仮澶�, 鏄惁缁х画?", "鎻愮ず", {
+ iconClass: 'el-icon-question',
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ showClose: true,
+ type: "warning"
+ }).then(() => {
+ remove(row.oid).then(res => {
+ this.$message.success("鍒犻櫎鎴愬姛");
+ this.refreshChange();
+ });
});
- this.refreshChange();
},
onLoad(page, params = {}) {
this.loading = true;
@@ -296,6 +313,27 @@
this.itemForm.itemData = row;
this.selectRow = row.$index;
this.attribute = row;
+ this.checkUsingReferDict(row);
+ },
+ checkUsingReferDict(row){
+ if (row.referToId !== null && row.referToId !== ""){
+ this.itemForm.activeName = 'referTab';
+ this.itemForm.referInitFlag = true;
+ this.itemForm.enumInitFlag = false;
+ }else if (row.usingDict === 'true'){
+ this.itemForm.activeName = 'enumTab';
+ this.itemForm.referInitFlag = false;
+ this.itemForm.enumInitFlag = true;
+ getDictionary({code: row.dictCode}).then(res => {
+ this.editAttribute.dictValue = res.data.data[0].label;
+ this.itemForm.itemData.dictValue = this.editAttribute.dictValue;
+ this.$refs.originalAdd.dictEnums = res.data.data;
+ })
+ }else {
+ this.itemForm.activeName = 'referTab';
+ this.itemForm.referInitFlag = true;
+ this.itemForm.enumInitFlag = false;
+ }
},
selectBtmType() {
this.referType.display = true;
--
Gitblit v1.9.3