2022.3.17项目管理完成、撤销按钮修改

fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -138,8 +138,15 @@
                     <el-button v-if="user.role>0" size="mini"  @click="subProject(scope.row)">子项目</el-button>
                     <el-button size="mini" v-if="user.role>0 || user.id==scope.row.inchargerId" type="primary" @click="handleAdd(scope.$index, scope.row)">编辑</el-button>
                     <el-button v-if="user.role>0" size="mini"  @click="deletePro(scope.$index, scope.row)">删除</el-button>
-                    <el-button v-if="user.role>0 && scope.row.status == 1" size="mini"  @click="cancelPro(scope.row)">撤销</el-button>
-                    <el-button v-if="user.role>0 && scope.row.status == 1" size="mini"  @click="finishPro(scope.row)">完成</el-button>
+                    <!-- 111 -->
+                    <el-dropdown class="customdropdown" split-button size="mini" @click="finishPro(scope.row)" v-if="user.role>0 && scope.row.status == 1" placement="bottom-start">
+                        完成
+                        <el-dropdown-menu slot="dropdown" class="customdropdown_menu">
+                            <el-button size="mini"  @click="cancelPro(scope.row)" class="customdropdown_menu_btn">撤销</el-button>
+                        </el-dropdown-menu>
+                    </el-dropdown>
+                    <!-- <el-button v-if="user.role>0 && scope.row.status == 1" size="mini"  @click="cancelPro(scope.row)">撤销</el-button>
+                    <el-button v-if="user.role>0 && scope.row.status == 1" size="mini"  @click="finishPro(scope.row)">完成</el-button> -->
                     <el-button v-if="user.role>0 && scope.row.status >= 2" size="mini"  @click="restartPro(scope.row)">重启</el-button>
                 </template>
             </el-table-column>
@@ -1914,4 +1921,20 @@ a {
     white-space: nowrap;
     text-overflow: ellipsis;
 }
+// 111
+
+</style>
+<style>
+.customdropdown .el-dropdown__caret-button{
+    height: 27px;
+}
+.customdropdown .el-button--mini:nth-child(1){
+    height: 27px;
+}
+.customdropdown_menu{
+    padding: 0;
+}
+.customdropdown_menu_btn{
+    border-color: transparent;
+}
 </style>

fhKeeper/formulahousekeeper/timesheet/src/views/task/list.vue

@@ -38,9 +38,11 @@
                                 {{scope.$index+1+(page-1)*size}} 
                             </template>
                     </el-table-column>
-                    <el-table-column prop="name" label="任务名称" sortable width="380">
+                    <el-table-column prop="stagesName" label="任务阶段" sortable width="180" @mouseover="mouseOver">
+                    </el-table-column>
+                    <el-table-column prop="name" label="任务名称" sortable width="330">
                         <template slot-scope="scope">
-                            <el-popover trigger="hover" placement="top" width="380" v-if="scope.row.name">
+                            <el-popover trigger="hover" placement="top" width="330" v-if="scope.row.name">
                             <p id="caseContent">{{scope.row.name}}</p>
                             <div slot="reference" class="name-wrapper">
                                 <div class="cal" @click="editTask(scope.row)">{{scope.row.name}}</div>
@@ -48,20 +50,20 @@
                             </el-popover>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="projectName" label="项目名称" sortable width="350">
+                    
+                    <el-table-column prop="projectName" label="项目名称" sortable width="260" show-overflow-tooltip>
                         <template slot-scope="scope">
                             <el-link type="primary" :href="'#/projectInside/'+scope.row.projectId">{{scope.row.projectName}}</el-link>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="executorName" label="执行人" sortable width="200">
+                    <el-table-column prop="executorName" label="执行人" sortable width="130">
                         <template slot-scope="scope">
                             <el-link type="primary" @click="showUser(scope.row.executorId)">{{scope.row.executorName}}</el-link>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="stagesName" label="任务阶段" sortable width="230" @mouseover="mouseOver">
-                    </el-table-column>
-                    <el-table-column prop="createDate" label="创建时间" sortable width="250"></el-table-column>
-                    <el-table-column label="截止时间" width="290" fixed="right">
+                    
+                    <el-table-column prop="createDate" label="创建时间" sortable width="180"></el-table-column>
+                    <el-table-column label="截止时间" width="260" fixed="right">
                         <template slot-scope="scope">
                             <div style="display: flex;justify-content: space-between;padding-right: 40px">
                             <span style="display: inline-block;margin-right: 55px">{{scope.row.endDate}}</span>