From 86a216010c436ea1f8ff9cd2789c3555f51d1b3f Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 31 七月 2023 16:20:45 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS-WEB/src/views/modeling/original.vue |   32 +++++++++++++++++++++-----------
 1 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/modeling/original.vue b/Source/UBCS-WEB/src/views/modeling/original.vue
index 73f81c0..11490ee 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">
@@ -161,7 +161,8 @@
       editAttribute: {},
       applyRangeData: [],
       option: {
-        height: "550px",
+        height: "auto",
+        calcHeight:20,
         headerAlign: "center",
         border: true,
         index: true,
@@ -193,12 +194,12 @@
           prop: "name",
           align: "left",
           display: false
-        }, {
+        },/* {
           label: "鏍囩",
           prop: "hashtag",
           // hide: true,
           display: false
-        }, {
+        },*/ {
           label: "鏄惁浣跨敤鏋氫妇",
           prop: "usingDict",
           type: "switch",
@@ -266,7 +267,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 +285,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