From 69e3acd447c8a28564b450108d137b608bae3000 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 21 Jun 2024 16:12:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/list/components/addPatrol.vue | 36 +++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/views/task/list/components/addPatrol.vue b/src/views/task/list/components/addPatrol.vue
index 3b8cd52..5ad1b3f 100644
--- a/src/views/task/list/components/addPatrol.vue
+++ b/src/views/task/list/components/addPatrol.vue
@@ -56,6 +56,19 @@
            </div>
          </div>
        </template>
+       <template v-slot:groups v-if="showgroups">
+         <div class="xy-table-item">
+           <div class="xy-table-item-label">
+             <span style="color: red;font-weight: 600;padding-right: 4px;"></span>小组：
+           </div>
+           <div class="xy-table-item-content">
+             <div>
+               {{groupObj.name}}:
+               <el-tag style="margin-right:5px" v-for="item in groupObj.details">{{item.name}}</el-tag>
+             </div>
+           </div>
+         </div>
+       </template>
       <template v-slot:patrol_list v-if="type=='add'">
         <div class="xy-table-item">
           <div class="xy-table-item-label"  style="font-weight: bold;">
@@ -119,19 +132,7 @@
         </div>
 
       </template>
-      <template v-slot:groups v-if="showgroups">
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>小组：
-          </div>
-          <div class="xy-table-item-content">
-            <div>
-              {{groupObj.name}}:
-              <el-tag style="margin-right:5px" v-for="item in groupObj.details">{{item.name}}</el-tag>
-            </div>
-          </div>
-        </div>
-      </template>
+
       <template v-slot:showgroups v-if="showgroups"></template>
       <template v-slot:ask_introduce  v-if="type=='editor'">
         <div class="xy-table-item">
@@ -382,6 +383,8 @@
           date: '',
           up_admin_id:"",
           siteName: '',
+          groups:'',
+          showgroups:"",
           patrol_list:[],
 
           ask_id: '',
@@ -391,8 +394,7 @@
           lon: '',
 
           ask_department: '',
-          groups:'',
-          showgroups:"",
+
           accept_department_ids:[],
           ask_introduce: '',
           tips: '',
@@ -616,6 +618,8 @@
           up_admin_id:res?.up_admin_id,
           site_id: res?.site_id,
           siteName: res.site_id?[undefined,res.site_id]:res.address,
+          groups:'',
+          showgroups:"",
           address: res?.address,
           lat: res?.lat,
           lon: res?.lon,
@@ -623,8 +627,6 @@
 
 
           ask_department: res?.ask_department,
-          groups:'',
-          showgroups:"",
           ask_introduce: res?.ask_introduce,
           tips: res?.tips,
           accept_department_ids:res.accept_department_ids?res.accept_department_ids:[],