Переглянути джерело

调整项目概览的里程碑,项目报表的部门选择调整,任务看板加分组详情,组织架构页面调整

Lijy 2 роки тому
батько
коміт
83dbdd7d45

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -87,7 +87,7 @@
           
           <!-- 部门筛选 -->
           <el-cascader v-if="(ins == 9 && permissions.reportAllTimely) || (ins == 8 && permissions.reportAllTimeDivide) || (ins == 6 && permissions.reportAllOvertime) || (ins == 11 && permissions.reportPersonnel)" v-model="departmentIdArray" :options="departmentList" placeholder="请选择部门"
-            :props="{ checkStrictly: false,expandTrigger: 'hover' }" :show-all-levels="false" clearable
+            :props="{ checkStrictly: true,expandTrigger: 'hover' }" :show-all-levels="false" clearable
             @change="selcts(9)" size="small" style="margin-left:10px"
           ></el-cascader>
 

+ 8 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/project/info.vue

@@ -1648,7 +1648,14 @@
                             //     res.data[i].taskTex = '截止于 ' + res.data[i].endDate
                             // }
                             if(res.data[i].finishDate) {
-                                res.data[i].taskTex = '完成于 ' + res.data[i].finishDate
+                                let str = `完成于 ${res.data[i].finishDate}`
+                                res.data[i].taskTex = str
+                                if(res.data[i].endDate) {
+                                    let strS = '截止于 ' + res.data[i].endDate
+                                    let assignment = `${strS}   ${str}`
+                                    res.data[i].taskTex = assignment
+                                }
+                                // res.data[i].taskTex = '完成于 ' + res.data[i].finishDate
                             } else if(res.data[i].endDate) {
                                 res.data[i].taskTex = '截止于 ' + res.data[i].endDate
                             } else {

+ 47 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/project/projectInside.vue

@@ -66,7 +66,9 @@
                                             <i class="el-icon-delete"></i>
                                             删除分组</el-dropdown-item>
                                             <!-- 设置参与人 0000 -->
-                                            
+                                        <el-dropdown-item divided @click.native="getGroupDetails(item)">
+                                            <i class="el-icon-tickets"></i>
+                                            分组详情</el-dropdown-item>
                                     </el-dropdown-menu>
                                 </el-dropdown>
                                 </div>
@@ -82,6 +84,24 @@
                             </el-menu-item>
                         </el-menu>
                     </el-aside>
+                    <!-- 分组详情 -->
+                    <el-dialog :title="groupDetailTil" :visible.sync="groupDetailsShow" width="500px" :before-close="handleClose">
+                        <div>
+                            <el-form label-width="80px">
+                                <el-form-item label="负责人:">
+                                    {{groupDetailData.incharger}}
+                                </el-form-item>
+                                <el-form-item label="参与人:">
+                                    <span v-for="(item, index) in groupDetailData.participators" :key="index">
+                                        {{item.userName}} <span v-if="index < groupDetailData.participators.length - 1">、</span>
+                                    </span>
+                                </el-form-item>
+                            </el-form>
+                        </div>
+                        <span slot="footer" class="dialog-footer">
+                            <el-button type="primary" @click="groupDetailsShow = false">确 定</el-button>
+                        </span>
+                    </el-dialog>
                     <span :style="'background:#f0f0f0;width:1px;height:'+tableHeight+'px;'" @click="toggleGroup">
                         
                     </span>
@@ -1077,6 +1097,9 @@ import delete$ from 'dingtalk-jsapi/api/biz/cspace/delete';
 
                 canAddTask: false, // 分组创建任务的判断
                 groupResponsibleId: '', // 分组负责人的id
+                groupDetailsShow: false,
+                groupDetailData: {},
+                groupDetailTil: ''
             };
             
         },
@@ -2476,6 +2499,29 @@ import delete$ from 'dingtalk-jsapi/api/biz/cspace/delete';
                         });
                 });
             },
+            getGroupDetails(obj) {
+                this.http.post('/task-group/detail',{
+                    groupId: obj.id
+                },
+                res => {
+                    if (res.code == "ok") {
+                        this.groupDetailsShow = true
+                        this.groupDetailData = res.data
+                        this.groupDetailTil = obj.name + ' - 分组详情'
+                    } else {
+                        this.$message({
+                            message: res.msg,
+                            type: "error"
+                        });
+                    }
+                },
+                error => {
+                    this.$message({
+                        message: error,
+                        type: "error"
+                    });
+                });
+            },
             addTemplateGroup() {
                 // var param = JSON.parse(JSON.stringify(this.groupTemplateList.filter(g=>g.selected)[0]));
                 // delete param.stagesList;

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -20,7 +20,7 @@
                         <span style="padding-right: 50px;box-sizing: border-box;overflow:hidden;text-overflow:ellipsis;line-height: 36px; display: inline-block;">{{ node.label }}</span>
 
                         <!-- <span v-if="node.label != '全部人员'" class="node none"> -->
-                        <span v-if="node.label != '全部人员'" class="node none poAub">
+                        <span v-if="node.label != '全部人员' && node.label != '未分配'" class="node none poAub">
                             <el-button type="text" size="mini" @click="createDepartment(-2)" >
                                 <i class="el-icon-circle-plus-outline"></i> <!-- 新增 -->
                             </el-button>