From 789812132e18cb9d065585f0a2762c604c8377fa Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Wed, 17 Apr 2024 16:50:29 +0800
Subject: [PATCH] jihua renwu

---
 src/views/task/list/patrol.vue | 17 +++++++++------
 src/views/task/list/plan.vue   | 40 +++++++++++++++++-----------------
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/src/views/task/list/patrol.vue b/src/views/task/list/patrol.vue
index 5b2429f..7c07c1b 100644
--- a/src/views/task/list/patrol.vue
+++ b/src/views/task/list/patrol.vue
@@ -22,7 +22,7 @@
 
             <Button type="primary" @click="getList">查询</Button>
             <Button type="primary" style="margin-left: 10px;" @click="editorPatrol('','add')">添加</Button>
-            <Button type="primary" style='margin-left:10px;' @click="chooseEditorPatrol()">编辑</Button>
+            <!-- <Button type="primary" style='margin-left:10px;' @click="chooseEditorPatrol()">编辑</Button> -->
 
             <Button type="primary"  style="margin-left: 10px;" @click="importTable(new Date().getTime().toString())">导出</Button>
 
@@ -49,19 +49,22 @@
       <template v-slot:btns>
         <el-table-column align='center' label="操作" width="80" header-align="center">
           <template slot-scope="scope">
-            <div>
-              <Button v-if="(is_guiji||is_chuzhang||scope.row.is_myself)&&!(scope.row.status==5||scope.row.status==6)" type="primary" style='margin-right:5px;margin-bottom:5px;' size="small" @click="showPatrol(scope.row.id,'show')">办理</Button>
-              <Button v-else style='margin-right:5px;margin-bottom:5px;' size="small" @click="showPatrol(scope.row.id,'show')">查看</Button>
+            <div v-if="(is_guiji||is_chuzhang||scope.row.is_myself)&&!(scope.row.status==5||scope.row.status==6)">
+              <Button  type="primary" style='margin-right:5px;margin-bottom:5px;' size="small" @click="showPatrol(scope.row.id,'show')">办理</Button>
+            </div>
+            <div v-else>
+              <Button size="small" style='margin-right:5px;margin-bottom:5px;' @click="showPatrol(scope.row.id,'show')">查看</Button>
+
             </div>
             <!-- <Button type="primary" style='margin-right:5px;margin-bottom:5px;' size="small" @click="showPatrol(scope.row.id,'show')">查看</Button> -->
             <!-- <Button v-if="scope.row.status==1&&((scope.row.check_leader==1&&is_leader&&scope.row.leader_status===null)||(scope.row.check_main==1&&is_main_leader&&scope.row.main_status===null))" type="primary" style='margin-right:5px;margin-bottom:5px;' size="small" @click="showPatrol(scope.row.id,'leader')">确认</Button> -->
             <!-- <Button v-if="scope.row.status==9&&((scope.row.re_check_leader==1&&is_leader&&scope.row.re_leader_status===null)||(scope.row.re_check_main==1&&is_main_leader&&scope.row.re_main_status===null))" type="primary" style='margin-right:5px;margin-bottom:5px;' size="small" @click="showPatrol(scope.row.id,'leaderconfirm')">审核</Button> -->
             <div v-if='is_guiji||is_chuzhang||login_id==scope.row.admin_id'>
-              <Button type="primary" style='margin-left:10px;' @click="editorPatrol(scope.row.id,'editor')">编辑</Button>
+              <Button type="primary" style='margin-right:5px;margin-bottom:5px;' size='small' @click="editorPatrol(scope.row.id,'editor')">编辑</Button>
             </div>
             <div  v-if='is_guiji||is_chuzhang'>
               <Poptip transfer confirm title="确认要删除吗？" @on-ok="deleteList(scope.row.id)">
-                <Button type="primary" size='small' style="margin-left:5px;margin-bottom:5px;" ghost>删除</Button>
+                <Button type="primary" style='margin-right:5px;margin-bottom:5px;' size='small' ghost>删除</Button>
               </Poptip>
             </div>
 
@@ -725,7 +728,7 @@
 </script>
 
 <style scoped>
-   /deep/ .missionName{
+   /deep/ .v-table .el-table__body .missionName{
      vertical-align: top!important;
    }
   /deep/ .el-icon-circle-close{
diff --git a/src/views/task/list/plan.vue b/src/views/task/list/plan.vue
index bf0c462..3e0c68b 100644
--- a/src/views/task/list/plan.vue
+++ b/src/views/task/list/plan.vue
@@ -217,25 +217,25 @@
           // width: 120,
           align:'left'
         },
-        {
-          label: "月份",
-          prop: 'start_date',
-          width: 180,
-          align:'left',
-          customFn:(row)=>{
-            return(<div style={{"display": "flex","flex-wrap": "wrap","justify-content": "center"}}>
-            {
-              row.start_date.map((item,index)=>{
-                return(<span>{
-                  index===row.start_date.length-1?
-                    item
-                  :item+"、"
-                }</span>)
-              })
-            }
-            </div>)
-          }
-        },
+        // {
+        //   label: "月份",
+        //   prop: 'start_date',
+        //   width: 180,
+        //   align:'left',
+        //   customFn:(row)=>{
+        //     return(<div style={{"display": "flex","flex-wrap": "wrap","justify-content": "center"}}>
+        //     {
+        //       row.start_date.map((item,index)=>{
+        //         return(<span>{
+        //           index===row.start_date.length-1?
+        //             item
+        //           :item+"、"
+        //         }</span>)
+        //       })
+        //     }
+        //     </div>)
+        //   }
+        // },
         // {
         //   label: "计划名称",
         //   prop: 'name',
@@ -606,7 +606,7 @@
 </script>
 
 <style scoped>
-    /deep/ .monthName{
+    /deep/ .v-table .el-table__body .monthName{
         vertical-align: top!important;
   }
   /deep/ .el-icon-circle-close {