From 14d39ee4fab77642a9ab7c4229407a1a3b0defac Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 06 十二月 2023 16:13:20 +0800
Subject: [PATCH] 标准需求优化

---
 Source/UBCS-WEB/src/views/modeling/original.vue |   62 +++++++++++++++++++++----------
 1 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/modeling/original.vue b/Source/UBCS-WEB/src/views/modeling/original.vue
index 6588c67..f95fbbf 100644
--- a/Source/UBCS-WEB/src/views/modeling/original.vue
+++ b/Source/UBCS-WEB/src/views/modeling/original.vue
@@ -1,23 +1,23 @@
-<template>
+  <template>
   <el-container>
     <el-main>
       <basic-container>
-        <avue-crud v-model="form" ref="crud" :option="option" :data="data" @on-load="onLoad" :page.sync="page"
+        <avue-crud v-model="form" ref="crud" :option="option" :data="data" @on-load="onLoad" :page.sync="page" :permission="permissionList"
           @refresh-change="refreshChange" @row-click="rowClick">
           <template slot="radio" slot-scope="{row}">
             <el-radio v-model="selectRow" :label="row.$index">&nbsp;
             </el-radio>
           </template>
           <template slot="menu" slot-scope="{row,index}">
-            <el-button icon="el-icon-edit" size="small" type="text" @click="updateSave(row,index)">缂栬緫</el-button>
-            <el-button icon="el-icon-delete" size="small" type="text" @click="deleteSave(row,index)">鍒犻櫎</el-button>
+            <el-button icon="el-icon-edit" size="small" type="text" @click="updateSave(row,index)" v-if="permissionList.editBtn">缂栬緫</el-button>
+            <el-button icon="el-icon-delete" size="small" type="text" @click="deleteSave(row,index)" v-if="permissionList.delBtn">鍒犻櫎</el-button>
           </template>
-          <template slot="menuLeft">
-            <el-button size="small" type="primary" icon="el-icon-plus" @click="addSave">鏂�&nbsp;&nbsp;澧�
+            <template slot="menuLeft">
+            <el-button size="small" type="primary" icon="el-icon-plus" @click="addSave" v-if="permissionList.addBtn">鏂�&nbsp;&nbsp;澧�
             </el-button>
-            <el-button size="small" plain type="primary" icon="el-icon-zoom-in" @click="applyRangeOpen">鏌ョ湅浣跨敤鑼冨洿
+            <el-button size="small" plain type="primary" icon="el-icon-zoom-in" @click="applyRangeOpen" v-if="permissionList.apply">鏌ョ湅浣跨敤鑼冨洿
             </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">
@@ -142,6 +142,7 @@
 } from "@/api/omd/OmdAttribute";
 import Versionpackage from "./Versionpackage.vue";
 import {getDictionary} from "@/api/omd/enum";
+import {mapGetters} from "vuex";
 
 export default {
   name: "original",
@@ -161,7 +162,8 @@
       editAttribute: {},
       applyRangeData: [],
       option: {
-        height: "550px",
+        height: "auto",
+        calcHeight:20,
         headerAlign: "center",
         border: true,
         index: true,
@@ -193,12 +195,12 @@
           prop: "name",
           align: "left",
           display: false
-        }, {
+        },/* {
           label: "鏍囩",
           prop: "hashtag",
           // hide: true,
           display: false
-        }, {
+        },*/ {
           label: "鏄惁浣跨敤鏋氫妇",
           prop: "usingDict",
           type: "switch",
@@ -258,6 +260,17 @@
       searchId: '',
     };
   },
+  computed:{
+    ...mapGetters(["permission"]),
+    permissionList(){
+      return{
+        addBtn:this.vaildData(this.permission.modeling_original.original_add,false),
+        apply:this.vaildData(this.permission.modeling_original.original_applyopen,false),
+        delBtn:this.vaildData(this.permission.modeling_original.original_delete,false),
+        editBtn:this.vaildData(this.permission.modeling_original.original_edit,false),
+      }
+    },
+  },
   created() {
   },
   methods: {
@@ -266,7 +279,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 +294,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