From c48eafe8411adad734b57b424f5440284dbc85e3 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Nov 2025 16:15:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 src/views/resource/patchManagement.vue |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/views/resource/patchManagement.vue b/src/views/resource/patchManagement.vue
index 0f78973..2c51b44 100644
--- a/src/views/resource/patchManagement.vue
+++ b/src/views/resource/patchManagement.vue
@@ -35,13 +35,13 @@
         <el-button type="primary" text icon="el-icon-edit" @click="uploadPatch(scope.row, 'edit')"
           >编辑
         </el-button>
-        <el-button type="primary" text icon="el-icon-delete" @click="rowDel(scope.row)"
+        <el-button :disabled="scope.row.patches_type_desc==='综合类'" type="primary" text icon="el-icon-delete" @click="rowDel(scope.row)"
           >删除
         </el-button>
       </template>
     </avue-crud>
 
-    <el-dialog title="上传图斑" append-to-body align-center v-model="box" width="550px">
+    <el-dialog title="上传图斑" class="ztzf-dialog-mange" append-to-body align-center v-model="box" width="550px">
       <el-form
         ref="ruleFormRef"
         style="max-width: 600px"
@@ -156,8 +156,9 @@
   addBtn: false,
   tip: false,
   searchShow: true,
-  searchMenuSpan: 8,
-  searchMenuPosition: 'right',
+  searchGutter: 30,
+  searchMenuPosition: 'left',
+  searchMenuSpan: 4,
   border: true,
   index: true,
   indexLabel: '序号',
@@ -192,7 +193,7 @@
       label: '图斑类型',
       prop: 'patches_type_desc',
       span: 24,
-      searchLabelWidth: 100,
+      // searchLabelWidth: 100,
       search: true,
       searchSpan: 4,
       type: 'select',
@@ -220,7 +221,7 @@
       prop: 'areaName',
       span: 24,
       width: 180,
-      searchLabelWidth: 100,
+      // searchLabelWidth: 100,
       search: true,
       searchSpan: 4,
       type: 'tree',
@@ -248,7 +249,7 @@
       label: '创建人',
       prop: 'user_name',
       span: 24,
-      searchLabelWidth: 100,
+      // searchLabelWidth: 100,
       search: true,
       searchSpan: 4,
       type: 'select',

--
Gitblit v1.9.3