From effc49ca2b549423d9038a26085c6efd391dbe8c Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 14 七月 2023 09:56:46 +0800
Subject: [PATCH] 代码整合，前端代码打包

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

diff --git a/Source/UBCS-WEB/src/views/modeling/original.vue b/Source/UBCS-WEB/src/views/modeling/original.vue
index 6588c67..2cfd7c7 100644
--- a/Source/UBCS-WEB/src/views/modeling/original.vue
+++ b/Source/UBCS-WEB/src/views/modeling/original.vue
@@ -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">&nbsp;鎼滅储</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">
@@ -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;
@@ -279,14 +281,21 @@
       this.$refs.originalAdd.activeName = this.itemForm.activeName;
       this.$refs.originalAdd.enumInitFlag = this.itemForm.enumInitFlag;
       this.$refs.originalAdd.referInitFlag = this.itemForm.referInitFlag;
-      this.refreshChange()
+      // 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;

--
Gitblit v1.9.3