Browse Source

Merge branch 'master' of http://119.23.210.103:3000/wy/zdqy_firm_former

johnsen 2 months ago
parent
commit
f2186b6b93

+ 4 - 2
src/views/component/facility/facilityData.vue

@@ -8,7 +8,7 @@
       <el-col style="margin: 0 0 5px 0">
         <div class="button">
           <el-button
-            v-if="!isCul"
+            v-if="!isCul || (isWaterDele&&!readonly)"
             type="danger"
             size="mini"
             icon="ibps-icon-close"
@@ -169,6 +169,7 @@ export default {
     }
   },
   data() {
+    const { setting } = this.$store.getters || {}
     return {
       dialogParams: {},
       dialogShow: false,
@@ -177,7 +178,8 @@ export default {
       multipleSelection: [],
       baoliuxiaoshu:true,
       config: 1,
-      isUpdatingFromParent: false  // 标记是否来自父组件的更新
+      isUpdatingFromParent: false, // 标记是否来自父组件的更新
+      isWaterDele:setting.facilities?.isWaterDele || false
     }
   },
   computed: {},

+ 1 - 1
src/views/platform/org/components/tree/index.vue

@@ -78,7 +78,7 @@ export default {
     checkStrictly: Boolean,
     height: {
       type: Number,
-      default: 400
+      default: 700
     },
     dataType: {
       // 数据类型,tree:树形,list:列表