From 29a163df36dd12960a8a8592d0b25b36def8cb53 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 10 七月 2023 23:00:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/modeling/original.vue | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/modeling/original.vue b/Source/UBCS-WEB/src/views/modeling/original.vue
index 73f81c0..2cfd7c7 100644
--- a/Source/UBCS-WEB/src/views/modeling/original.vue
+++ b/Source/UBCS-WEB/src/views/modeling/original.vue
@@ -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">
@@ -193,12 +193,12 @@
prop: "name",
align: "left",
display: false
- }, {
+ },/* {
label: "鏍囩",
prop: "hashtag",
// hide: true,
display: false
- }, {
+ },*/ {
label: "鏄惁浣跨敤鏋氫妇",
prop: "usingDict",
type: "switch",
@@ -266,7 +266,9 @@
},
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;
@@ -282,10 +284,17 @@
// this.refreshChange()
},
deleteSave(row,index) {
- console.log(row);
- remove(row.oid).then(res => {
- this.$message.success("鍒犻櫎鎴愬姛");
- this.refreshChange();
+ this.$confirm("鍒犻櫎鍏冩暟鎹皢鏃犳硶琚仮澶�, 鏄惁缁х画?", "鎻愮ず", {
+ iconClass: 'el-icon-question',
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ showClose: true,
+ type: "warning"
+ }).then(() => {
+ remove(row.oid).then(res => {
+ this.$message.success("鍒犻櫎鎴愬姛");
+ this.refreshChange();
+ });
});
},
onLoad(page, params = {}) {
--
Gitblit v1.9.3