2022.4.12

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

@@ -1069,7 +1069,6 @@ export default {
         this.displayTable = true;
         this.apk2 = 5
         this.apk = true
-        this.statistical()
       } else {
         this.NcurDeptId = []
         this.displayTable = true;

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

@@ -2127,7 +2127,7 @@ a {
     border-color: transparent;
 }
 .ganttdialog .el-dialog__body{
-    height: 880px;
+    height: 550px;
 }
 .toolbar_formitem_n1{
     margin-right: 0 !important;

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

@@ -120,7 +120,7 @@
                                     draggable=".taskCard">
                                         
                                         <!--头部显示阶段名称，操作 -->
-                                        <div slot="header" style="margin:10px 0px;cursor:move;" role="task">
+                                        <div slot="header" style="margin:10px 0px;cursor:move;width:300px" role="task">
                                             <span class="stage">{{stage.stagesName}}</span><span style="margin-left:10px;color:#303133;font-size:12px;">{{stage.taskList.length}}</span>
                                             <!-- <i class="el-icon-more" style="float:right;"></i> -->
                                             <el-dropdown trigger="click" style="float:right;cursor:pointer;">
@@ -137,37 +137,40 @@
                                                     </el-dropdown-menu>
                                             </el-dropdown>
                                         </div>
-                                        <div v-for="element in stage.taskList" :id="element.id" :key="element.id" class="taskCard" ref="tasks" @click="editTask(element)" :style="element.taskStatus==0?'':'background:#eFeFeF;'">
-                                            <!--任务卡片内容显示 -->
-                                            <div>
-                                                <div v-if="element.taskLevel == 2" class="taskImg hong"><img src="../../assets/image/hong.png" alt=""></div>
-                                                <div v-if="element.taskLevel == 1" class="taskImg huang"><img src="../../assets/image/huang.png" alt=""></div>
-                                                <div v-if="element.taskLevel == 0" class="taskImg hui"><img src="../../assets/image/hui.png" alt=""></div>
-                                                <el-checkbox :disabled="element.taskStatus==2 || element.subTaskList.length > element.subTaskFinishNum" :checked="element.taskStatus==1?true:false" size="large" class="cb"  
-                                                @change="finishTask(element)"
-                                                @click.stop.native=""
-                                                ></el-checkbox>
-                                                <el-tooltip class="item" effect="dark" :content="element.name" placement="top">
-                                                <label class="task_name" :style="'background:'+(element.taskStatus==0?'#ffffff;':'#eFeFeF;')"><span>{{element.name}}</span></label>
-                                                </el-tooltip>
-                                                <i :class="taskTypeIcon[element.taskType]" :style="'float:right;color:'+taskTypeColor[element.taskType]+';margin-right:8px;margin-top:8px;'" ></i>
+
+                                        <div class="taskListin" :style="'max-height:' + taskListinH + 'px;'">
+                                            <div v-for="element in stage.taskList" :id="element.id" :key="element.id" class="taskCard" ref="tasks" @click="editTask(element)" :style="element.taskStatus==0?'':'background:#eFeFeF;'">
+                                                <!--任务卡片内容显示 -->
+                                                <div>
+                                                    <div v-if="element.taskLevel == 2" class="taskImg hong"><img src="../../assets/image/hong.png" alt=""></div>
+                                                    <div v-if="element.taskLevel == 1" class="taskImg huang"><img src="../../assets/image/huang.png" alt=""></div>
+                                                    <div v-if="element.taskLevel == 0" class="taskImg hui"><img src="../../assets/image/hui.png" alt=""></div>
+                                                    <el-checkbox :disabled="element.taskStatus==2 || element.subTaskList.length > element.subTaskFinishNum" :checked="element.taskStatus==1?true:false" size="large" class="cb"  
+                                                    @change="finishTask(element)"
+                                                    @click.stop.native=""
+                                                    ></el-checkbox>
+                                                    <el-tooltip class="item" effect="dark" :content="element.name" placement="top">
+                                                    <label class="task_name" :style="'background:'+(element.taskStatus==0?'#ffffff;':'#eFeFeF;')"><span>{{element.name}}</span></label>
+                                                    </el-tooltip>
+                                                    <i :class="taskTypeIcon[element.taskType]" :style="'float:right;color:'+taskTypeColor[element.taskType]+';margin-right:8px;margin-top:8px;'" ></i>
+                                                    </div>
+                                                <div style="margin: 10px 0px;color:#666;" @click="timess(element.endDate)">
+                                                    <span v-if="element.endDate >= times || element.taskStatus == 1"><i v-if="element.endDate != null" class="el-icon-date">&nbsp;&nbsp;{{element.endDate}}</i></span>
+                                                    <span v-else><em v-if="element.endDate != null" style="display: inline-block;padding:3px 5px"><i v-if="element.endDate != null" class="el-icon-date"><span  class="element_span"> &nbsp;&nbsp;{{element.endDate}} 截止</span></i></em></span>
+                                                    <span v-if="element.executorName">
+                                                    <span v-for="(exeItem, exeIndex) in element.executorName.split(',')" :key="exeIndex" :style="'background:'+element.executorColor.split(',')[exeIndex]" class="user_name_icon">{{exeItem.length>2?exeItem.substring(exeItem.length-2, exeItem.length):exeItem}}</span>
+                                                    </span>
+                                                    <el-button v-if="!element.executorName" type="primary" @click.stop.native="addAsMyTask(element)" size="mini" style="float:right;width:38px;padding:5px;position: absolute;z-index: 5;right: 5px;">认领</el-button>
+                                                </div>
+                                                <!--子任务 -->
+                                                <div v-if="element.subTaskList.length > 0">
+                                                    <el-tooltip class="item" effect="dark" content="查看子任务" placement="top">
+                                                    <el-link class="sub_task_num" @click.stop.native="showSubTaskList(element)"><i class="iconfont firerock-icontree" ></i><span style="margin-left:5px;">{{element.subTaskFinishNum}}/{{element.subTaskList.length}}</span></el-link>
+                                                    </el-tooltip>
                                                 </div>
-                                            <div style="margin: 10px 0px;color:#666;" @click="timess(element.endDate)">
-                                                <span v-if="element.endDate >= times || element.taskStatus == 1"><i v-if="element.endDate != null" class="el-icon-date">&nbsp;&nbsp;{{element.endDate}}</i></span>
-                                                <span v-else><em v-if="element.endDate != null" style="display: inline-block;padding:3px 5px"><i v-if="element.endDate != null" class="el-icon-date"><span  class="element_span"> &nbsp;&nbsp;{{element.endDate}} 截止</span></i></em></span>
-                                                <span v-if="element.executorName">
-                                                <span v-for="(exeItem, exeIndex) in element.executorName.split(',')" :key="exeIndex" :style="'background:'+element.executorColor.split(',')[exeIndex]" class="user_name_icon">{{exeItem.length>2?exeItem.substring(exeItem.length-2, exeItem.length):exeItem}}</span>
-                                                </span>
-                                                <el-button v-if="!element.executorName" type="primary" @click.stop.native="addAsMyTask(element)" size="mini" style="float:right;width:38px;padding:5px;position: absolute;z-index: 5;right: 5px;">认领</el-button>
-                                            </div>
-                                            <!--子任务 -->
-                                            <div v-if="element.subTaskList.length > 0">
-                                                <el-tooltip class="item" effect="dark" content="查看子任务" placement="top">
-                                                <el-link class="sub_task_num" @click.stop.native="showSubTaskList(element)"><i class="iconfont firerock-icontree" ></i><span style="margin-left:5px;">{{element.subTaskFinishNum}}/{{element.subTaskList.length}}</span></el-link>
-                                                </el-tooltip>
                                             </div>
                                         </div>
-                                        <el-button slot="footer" role="people" @click="addTask(stage)" style="width:100%;" size="small" icon="el-icon-plus"></el-button>
+                                        <el-button slot="footer" role="people" @click="addTask(stage)" style="width:300px;" size="small" icon="el-icon-plus"></el-button>
                                     </draggable>
                                 </v-flex>
                             <!-- </transition-group > -->
@@ -748,6 +751,7 @@
                 //优先级
                 taskLevelColor:['#262626','#E6A23C','#F56C6C'],
                 stageListHeight:0,
+                taskListinH:0,
                 groupWidth:260,
                 drag: false,
                 stageDrag: false,
@@ -2177,10 +2181,12 @@
             let height = window.innerHeight;
             this.tableHeight = height - 135;
             this.stageListHeight = this.tableHeight - 45;
+            this.taskListinH = this.stageListHeight - 75;
             const that = this;
             window.onresize = function temp() {
                 that.tableHeight = window.innerHeight - 135;
                 that.stageListHeight = that.tableHeight - 45;
+                that.taskListinH = that.stageListHeight - 75;
             };
         },
         mounted() {
@@ -2208,10 +2214,15 @@
     margin:10px;
     display:inline-block;
     vertical-align:top;
+    width: 331px;
 }
 .taskList {
     padding:7px;
-    width:300px;
+    width:331px;
+}
+.taskListin{
+    width: 317px;
+    overflow: auto;
 }
 
 .taskList .stage {
@@ -2234,6 +2245,7 @@ overflow: auto;
     position: relative;
     border-radius: 3px;
     overflow: hidden;
+    width: 288px;
 }
 
 .taskImg {