项目报表服务新增项目阶段工时表

fhKeeper/formulahousekeeper/timesheet/src/components/cascader.vue

@@ -259,6 +259,7 @@ export default {
                     id: item.value,
                     distinction: this.distinction
                 }
+                console.log('将要传出去的值1', obj)
                 this.$emit('vueCasader', obj)
             }
             if(this.radios) {
@@ -268,6 +269,7 @@ export default {
                     distinction: this.distinction,
                     item: item
                 }
+                console.log('将要传出去的值2', obj)
                 this.$emit('vueCasader', obj)
             } else {
                 this.transitionBoxLiIdx = ''

fhKeeper/formulahousekeeper/timesheet/src/i18n/en.json

@@ -1460,5 +1460,6 @@
   "zan-wu-ren-wu": "No job at the moment",
   "xiu-gai-xiang-mu-dang-qian-jie-duan": "Modifying the current phase",
   "zheng-shi-xiang-mu": "Formal Project",
-  "fei-xiang-mu": "Non item"
+  "fei-xiang-mu": "Non item",
+  "zheng-shi-xiang-mu-zhi-dui-can-yu-ren-kai-fang-fei-xiang-mu-dui-suo-you-cheng-yuan-kai-fang": "Formal projects are open to participants only, non-projects are open to all members"
 }

fhKeeper/formulahousekeeper/timesheet/src/i18n/zh.json

@@ -1460,5 +1460,6 @@
   "ren-wu-jie-zhi-shi-jian-bu-neng-xiao-yu-kai-shi-shi-jian": "任务截止时间不能小于开始时间",
   "xiu-gai-xiang-mu-dang-qian-jie-duan": "修改项目当前阶段",
   "zheng-shi-xiang-mu": "正式项目",
-  "fei-xiang-mu": "非项目"
+  "fei-xiang-mu": "非项目",
+  "zheng-shi-xiang-mu-zhi-dui-can-yu-ren-kai-fang-fei-xiang-mu-dui-suo-you-cheng-yuan-kai-fang": "正式项目只对参与人开放，非项目对所有成员开放"
 }

fhKeeper/formulahousekeeper/timesheet/src/permissions.js

@@ -75,6 +75,8 @@ const StringUtil = {
         reportResponsiblePersonnel: false, // 负责部门月度工时表   //
         reportAllDepartmentParticipation: false, // 全部部门参与项目情况表 //
         reportResponsibleDepartmentParticipation: false, // 负责部门参与项目情况表 //
+        reportPhaseHours: false, // 全部分组阶段工时 // 
+        reportStageWorkingTime: false, // 负责项目分组阶段工时 //
 
         // 请假模块
         leaveFil : false, // 请假填报 // 
@@ -199,6 +201,8 @@ const StringUtil = {
         arr[i] == '全部部门参与项目情况表' ? obj.reportAllDepartmentParticipation = true : ''
         arr[i] == '负责部门参与项目情况表' ? obj.reportResponsibleDepartmentParticipation = true : ''
         arr[i] == '编辑负责项目编码和名称' ? obj.projectCodeAndName = true : ''
+        arr[i] == '全部分组阶段工时' ? obj.reportPhaseHours = true : ''
+        arr[i] == '负责项目分组阶段工时' ? obj.reportStageWorkingTime = true : ''
     }
 
     return obj

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

@@ -36,6 +36,7 @@
                   <el-menu-item index="1-12" v-if="permissions.reportPersonnel || permissions.reportResponsible" @click="ssl(11)"><p>{{ $t('statisticsofpersonnelhours') }}</p></el-menu-item>
                   <el-menu-item index="1-15" v-if="permissions.reportMonthlyPersonnel || permissions.reportResponsiblePersonnel" @click="ssl(14)"><p>{{ $t('ren-yuan-yue-du-gong-shi-biao') }}</p></el-menu-item>
                   <el-menu-item index="1-16" v-if="permissions.reportAllDepartmentParticipation || permissions.reportResponsibleDepartmentParticipation" @click="ssl(15)"><p>{{ $t('bumenchanyuqingkuang') }}</p></el-menu-item>
+                  <el-menu-item index="1-17" v-if="permissions.reportPhaseHours || permissions.reportStageWorkingTime" @click="ssl(16)"><p>项目各分组与阶段工时表</p></el-menu-item>
                   <!-- <el-menu-item index="1-12"><p @click="ssl(11)">人员工时统计表</p></el-menu-item> -->
                 </el-submenu>
               </el-menu>
@@ -69,7 +70,7 @@
           </el-select>
         </template>
         <!-- 时间段筛选 -->
-          <template v-if="ins == 6 || ins == 8 || ins == 9 || ins == 10 || ins == 11 || ins == 12 || ins == 5">
+          <template v-if="ins == 6 || ins == 8 || ins == 9 || ins == 10 || ins == 11 || ins == 12 || ins == 5 || ins == 16">
             <span>
               <span class="demonstration" style="color:#999;padding:0 10px">
                 {{ ins == 15 ? $t('xiang-mu-chuang-jian-shi-jian-duan') : $t('message.period') }}
@@ -780,6 +781,21 @@
                 <el-table-column align="center" prop="tripPeopleCount" :label="'出差人数'" min-width="150"></el-table-column>
             </el-table>
 
+            <!-- 项目各分组与阶段工时表 -->
+            <el-table v-if="ins == 16"  key="16" border :data="groupingItemsArr" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;">
+                <el-table-column align="center" prop="projectCode" label="项目编号" min-width="150"></el-table-column>
+                <el-table-column align="center" prop="projectName" label="项目名称" min-width="150"></el-table-column>
+                <el-table-column align="center" prop="groupName" label="任务分组" min-width="150"></el-table-column>
+                <el-table-column align="center" prop="workingTime" label="分组合计工时" min-width="150"></el-table-column>
+                <el-table-column align="center" :label="item" min-width="150" v-for="(item, index) in groupingItemsArrTitle" :key="index">
+                  <template slot-scope="scope">
+                    <div>
+                      {{scope.row.categoryList | categoryListName(scope.column.label)}}
+                    </div>
+                  </template>
+                </el-table-column>
+            </el-table>
+
         <!--工具条-->
         <el-col :span="24" class="toolbar" v-if="ins != 6">
           <el-pagination
@@ -1047,13 +1063,14 @@ export default {
       this.$t('pojectbalancesheetincomestatement'),this.$t('customerprojectprofitstatement'),this.$t('projectphasetimesheet'),
       this.$t('statisticsofovertimework'),this.$t('timecostearlywarningtable'),this.$t('personneltimeallocationtable'),
       this.$t('statisticsofstafffillingintimerate'),this.$t('dailyreporttobereviewedstatistics'),this.$t('statisticsofpersonnelhours'),this.$t('taskgrouptimesheet'),this.$t('projectcostbaselinetable'),
-      this.$t('ren-yuan-yue-du-gong-shi-biao'), this.$t('bumenchanyuqingkuang')],
+      this.$t('ren-yuan-yue-du-gong-shi-biao'), this.$t('bumenchanyuqingkuang'), '各分组与阶段工时表'],
 
       shuzArr: [this.$t('projectreport'),this.$t('projectTaskReport'),this.$t('projectcoststatement'),
       this.$t('projectbalancesheet'),this.$t('customerprojectincomestatement'),this.$t('projectphasetimesheet'),
       this.$t('statisticsofovertimework'),this.$t('timecostearlywarningtable'),this.$t('personneltimeallocationtable'),
       this.$t('employeereporttimelinessrate'),this.$t('dailyreporttobereviewedstatistics'),this.$t('statisticsofpersonnelhours'),this.$t('taskgrouptimesheet'),this.$t('projectcostbaselinetable'),
-      this.$t('ren-yuan-yue-du-gong-shi-biao'), this.$t('bumenchanyuqingkuang')],
+      this.$t('ren-yuan-yue-du-gong-shi-biao'), this.$t('bumenchanyuqingkuang'), '各分组与阶段工时表'],
+
       ins: 10000,
       user: JSON.parse(sessionStorage.user),
       overTimeList: [], // 项目加班情况统计列表
@@ -1112,7 +1129,9 @@ export default {
         year: '2022',
         quarter: 1
       },
-      exportLoading: false
+      exportLoading: false,
+      groupingItemsArr: [],
+      groupingItemsArrTitle: []
     };
   },
   computed: {},
@@ -1142,7 +1161,6 @@ export default {
     this.monthPersonnel = year + '-' + yue
   },
   filters: {
-      
       numberToCurrency(value) {
           if (value == undefined || !value) return '0.00'
           value = value.toFixed(2)
@@ -1172,6 +1190,15 @@ export default {
             s += '0';  
         }  
         return s;  
+      },
+      categoryListName(value, label) {
+        let str = '-'
+        for(var i in value) {
+          if(value[i].stagesName == label) {
+            str = value[i].workingTime
+          }
+        }
+        return str
       }
   },
   methods: {
@@ -1192,6 +1219,7 @@ export default {
       if(this.permissions.reportPersonnel || this.permissions.reportResponsible) {this.ssl(11);this.defaultActive = '1-12';return}
       if(this.permissions.reportMonthlyPersonnel || this.permissions.reportResponsiblePersonnel) {this.ssl(14);this.defaultActive = '1-15';return}
       if(this.permissions.reportAllDepartmentParticipation || this.permissions.reportResponsibleDepartmentParticipation) {this.ssl(15);this.defaultActive = '1-16';return}
+      if(this.permissions.reportPhaseHours || this.permissions.reportStageWorkingTime) {this.ssl(16);this.defaultActive = '1-17';return}
       {this.allWrong = false}
     },
     rowspan(spanArr,position,spanName){
@@ -1431,8 +1459,12 @@ export default {
                   this.getMonthlyPersonnel()
                 } else if(this.ins == 15) {
                   this.getDepartmentsInvolved()
+                } else if(this.ins == 16) {
+                  this.groupingItems()
+                }
+                if(this.ins != 16) {
+                  this.getUserList()
                 }
-                this.getUserList()
             },
       exportExcel() {
         var url = "/project";
@@ -1539,6 +1571,12 @@ export default {
           url += "/exportDeptPartInProjects"
           sl.month = this.monthPersonnel + '-01'
           sl.departmentId = this.departmentIdArray.length > 0 ? this.departmentIdArray[this.departmentIdArray.length - 1] : ''
+        } else if(this.ins == 16) {
+          fName = '各分组阶段工时表' + '.xls'
+          url += "/exportProjectGroupAndCategoryWorkTime"
+          sl.startDate = this.rangeDatas[0]
+          sl.endDate = this.rangeDatas[1]
+          sl.projectId = this.proJuctId
         }
           this.http.post(url, sl,
             res => {
@@ -1809,6 +1847,38 @@ export default {
         })
       })
     },
+    // 项目各分组与阶段工时表
+    groupingItems() {
+      this.listLoading = true
+      this.http.post('/project/projectGroupAndCategoryWorkTime', {
+         startDate: this.rangeDatas[0],
+         endDate: this.rangeDatas[1],
+         projectId: this.proJuctId,
+         pageIndex: this.page,
+         pageSize: this.size,
+      },
+        res => {
+            this.listLoading = false
+            if (res.code == "ok") {
+                // console.log(res.data, '数据来源')
+                this.groupingItemsArr = res.data.data
+                this.groupingItemsArrTitle = res.data.titleList
+                this.total = res.data.total
+            } else {
+                this.listLoading = false
+                this.$message({
+                  message: res.msg,
+                  type: "error"
+                });
+            }
+        },
+        error => {
+            this.$message({
+                message: error,
+                type: "error"
+            });
+        });
+    },
     overTime() {
       this.listLoading = true;
       var obj = {

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

@@ -409,7 +409,11 @@
         <el-col :span="18" >
             <el-scrollbar style="height:100%;border:1px solid #dddddd;margin-right:20px;" >
             <div class="tree" :style="'height:'+ (tableHeight-120) + 'px'">
-                <div style="padding:5px;color:#333;" v-if="depData != null">{{ $t('setup') }} &lt;<span style="color:#20a0ff;">{{depData.label}}&gt;</span> {{ $t('approvalprocessforleaveofdirect staff') }}
+                <div style="padding:5px;color:#333;" v-if="depData != null">{{ $t('setup') }} &lt;<span style="color:#20a0ff;">
+                  <!-- {{depData.label}} -->
+                    <span v-if="user.userNameNeedTranslate != 1">{{depData.label}}</span>
+                    <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='departmentName' :openid='depData.label'></ww-open-data></span>
+                  &gt;</span> {{ $t('approvalprocessforleaveofdirect staff') }}
                     <el-tooltip effect="dark" v-if="depData != null && depData.children!=null" content="仅适用于当前部门的直属人员，子部门人员的审批流程需要单独设置" placement="top-start">
                     <i class="el-icon-question"></i>
                     </el-tooltip>
@@ -450,9 +454,9 @@
               <el-form label-width="140px">
               <el-form-item :label="$t('selectdepartmentsdesignatepersonnel')" >
                   <el-cascader filterable ref="deptCascader"  v-model="curDeptId" :placeholder="$t('defaultText.pleaseChoose')" style="width: 100%" @change="chooseDept"
-                    :options="soption" :props="{ checkStrictly: true,expandTrigger: 'hover' }" :show-all-levels="false" clearable v-if="user.userNameNeedTranslate != 1"></el-cascader>
+                    :options="soption" :props="{ checkStrictly: true,expandTrigger: 'hover' }" :show-all-levels="false" clearable v-show="user.userNameNeedTranslate != 1"></el-cascader>
 
-                  <vueCascader :size="'small'" :widthStr="'200'" :clearable="true" :subject="soption" :radios="true" :distinction="'1'" @vueCasader="vueCasader" v-if="user.userNameNeedTranslate == 1"></vueCascader>
+                  <vueCascader :size="'small'" :widthStr="'200'" :clearable="true" :userName="true" :subject="soption" :radios="true" :distinction="'1'" @vueCasader="vueCasader" v-if="user.userNameNeedTranslate == 1"></vueCascader>
 
               </el-form-item>
               </el-form>
@@ -1307,6 +1311,7 @@ export default {
                         if (arr[i].children != null && arr[i].children.length>0) {
                             arr[i].children = this.changeArr(arr[i].children);
                         }
+                        arr[i].type = 'dep'
                         arr[i].id && (arr[i].value = arr[i].id);
                         delete arr[i].id;
                     }
@@ -1474,7 +1479,7 @@ export default {
                 // this.users = res.data.records;
                 this.users = res.data;
                 for (let i = 0; i < this.users.length; i++) {
-                  this.susers.push({value:this.users[i].id,label:this.users[i].name})
+                  this.susers.push({value:this.users[i].id,label:this.users[i].name,type: 'user'})
                 }
                 //只能自己填报自己的请假单
                 this.addForm.ownerId = this.user.id;

fhKeeper/formulahousekeeper/timesheet/src/views/provider/provider.vue

@@ -71,7 +71,7 @@
                 </el-form-item>
                 <el-form-item :label="$t('classificationSuppliers')" prop="providerCategoryId">
                     <el-select v-model="addForm.providerCategoryId" filterable :placeholder="$t('defaultText.pleaseChoose')" clearable @change="supplierChange">
-                        <el-option v-for="item in baseClfList" :key="item.id" ::label="item.providerCategoryName" :value="item.id"></el-option>
+                        <el-option v-for="item in baseClfList" :key="item.id" :label="item.providerCategoryName" :value="item.id"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item :label="$t('contact')" prop="contactName">

fhKeeper/formulahousekeeper/timesheet/src/views/workflow/report.vue

@@ -28,7 +28,10 @@
         <el-col :span="18" >
             <el-scrollbar style="height:100%;border:1px solid #dddddd;margin-right:20px;" >
             <div class="tree" :style="'height:'+ (tableHeight-120) + 'px'">
-                <div style="padding:5px;color:#333;" v-if="depData != null">{{ $t('setup') }} &lt;<span style="color:#20a0ff;">{{depData.label}}&gt;</span> {{ $t('workinghoursapprovalprocessofdirectstaff') }}
+                <div style="padding:5px;color:#333;" v-if="depData != null">{{ $t('setup') }} &lt;<span style="color:#20a0ff;">
+                    <span v-if="user.userNameNeedTranslate != 1">{{depData.label}}</span>
+                    <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='departmentName' :openid='depData.label'></ww-open-data></span>
+                    &gt;</span> {{ $t('workinghoursapprovalprocessofdirectstaff') }}
                     <el-tooltip effect="dark" v-if="depData != null && depData.children!=null" :content="$t('onlyapplicabletotheimmediatestaffofthecurrentdepartment')" placement="top-start">
                     <i class="el-icon-question"></i>
                     </el-tooltip>
@@ -41,7 +44,12 @@
                     <icon class="iconfont firerock-iconright"></icon>
                     <span v-for="(item, index) in dataArray" :key="item.seq" >
                         
-                        <el-button type="primary" v-if="item.isDeptAudit == 1" @click="editNodeDialog(index, item)">{{item.auditDeptName}}</el-button>
+                        <el-button type="primary" v-if="item.isDeptAudit == 1" @click="editNodeDialog(index, item)">
+                            <span v-if="user.userNameNeedTranslate != 1">{{item.auditDeptName}}</span>
+                            <span v-if="user.userNameNeedTranslate == 1">
+                                <ww-open-data type='departmentName' :openid='item.auditDeptName'></ww-open-data>
+                            </span>
+                        </el-button>
                         <el-button type="primary" v-if="item.isDeptAudit == 0" >{{ $t('other.projectAuditor') }}</el-button>
                         <icon class="iconfont firerock-iconright"></icon>
                         <icon class="iconfont firerock-iconInsertLine addNode" @click="showNodeDialog(index+1)"></icon>
@@ -68,7 +76,8 @@
               <el-form-item :label="$t('other.selectdepartment')" >
                   <el-cascader ref="deptCascader"  v-model="curDeptId" :placeholder="$t('qing-xuan-ze-bu-men')" style="width: 100%" @change="chooseDept"
                     :options="option" :props="{ checkStrictly: true,expandTrigger: 'hover' }" :show-all-levels="false" clearable v-show="user.userNameNeedTranslate != 1"></el-cascader>
-                <vueCascader :size="'small'" :subjectId="curDeptId" :widthStr="'200'" :clearable="true" :subject="option" :radios="true" :distinction="'3'" @vueCasader="vueCasader" v-if="user.userNameNeedTranslate == 1"></vueCascader>
+
+                    <vueCascader :size="'small'" :subjectId="curDeptId" :widthStr="'200'" :clearable="true" :subject="option" :radios="true" :distinction="'3'" @vueCasader="vueCasader" v-if="user.userNameNeedTranslate == 1"></vueCascader>
               </el-form-item>
               </el-form>
             <div slot="footer" class="dialog-footer">
@@ -123,7 +132,8 @@
                 editNode:{},
                 user: JSON.parse(sessionStorage.getItem("user")),
                 userList:[],
-                sysAuditUSer:{}
+                sysAuditUSer:{},
+                addNodeObj: {}
             };
         },
         components: {
@@ -243,7 +253,14 @@
             addNode() {
               this.dialogVisible = false;
               if (this.curDeptId == null) return;
-              var node = this.$refs.deptCascader.getCheckedNodes()[0];
+              var node = ''
+              if(this.user.userNameNeedTranslate != 1) {
+                node = this.$refs.deptCascader.getCheckedNodes()[0];
+              } else {
+                node = this.addNodeObj
+              }
+              
+              console.log(node)
               
               if (this.isAdd) {
                 var node = {auditDeptId: node.value, auditDeptName: node.label, isDeptAudit:1};
@@ -347,6 +364,7 @@
                     let arr = []
                     arr.push(obj.id)
                     this.curDeptId = arr
+                    this.addNodeObj = obj.item
                 }
             }