Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/LeaveSheetServiceImpl.java

@@ -165,7 +165,7 @@ public class LeaveSheetServiceImpl extends ServiceImpl<LeaveSheetMapper, LeaveSh
         jsonObj1.put("key", "审核人");
         jsonObj1.put("value",("$userName="+auditor.getCorpwxUserid()+"$"));
         String applyTimeDesc = "";
-        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("MM/dd");
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("M月d日");
         if (sheet.getStartDate().isEqual(sheet.getEndDate())) {
             applyTimeDesc = dateTimeFormatter.format(sheet.getStartDate()) + ", "+sheet.getTimeHours()+"小时";
         } else {
@@ -203,7 +203,7 @@ public class LeaveSheetServiceImpl extends ServiceImpl<LeaveSheetMapper, LeaveSh
     private void saveNotifyToApplier(LeaveSheet sheet) {
         //推送到企业微信
         String applyTimeDesc = "";
-        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("MM/dd");
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("M月d日");
         if (sheet.getStartDate().isEqual(sheet.getEndDate())) {
             applyTimeDesc = dateTimeFormatter.format(sheet.getStartDate()) + ", "+sheet.getTimeHours()+"小时";
         } else {
@@ -247,7 +247,7 @@ public class LeaveSheetServiceImpl extends ServiceImpl<LeaveSheetMapper, LeaveSh
         jsonObj1.put("key", "请假类型");
         jsonObj1.put("value",LEAVE_TYPES[sheet.getLeaveType()]);
         String applyTimeDesc = "";
-        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("MM/dd");
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("M月d日");
         if (sheet.getStartDate().isEqual(sheet.getEndDate())) {
             applyTimeDesc = dateTimeFormatter.format(sheet.getStartDate()) + ", "+sheet.getTimeHours()+"小时";
         } else {
@@ -501,14 +501,47 @@ public class LeaveSheetServiceImpl extends ServiceImpl<LeaveSheetMapper, LeaveSh
         Integer companyId = userMapper.selectById(userId).getCompanyId();
         WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", companyId));
         List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", companyId).select("id","name","corpwx_userid"));
-        QueryWrapper<LeaveSheet> qw = new QueryWrapper<LeaveSheet>()
-                .select("owner_id","tel","owner_name", "leave_type", "start_date","end_date","time_days", "time_hours", "status", "remark")
-                .eq("company_id", companyId)
-                .eq(status != null, "status", status)
-                .eq(leaveType != null, "leave_type", leaveType)
-                .le(endTime != "" && endTime != null, "start_date", endTime)
-                .ge(startTime != "" && startTime != null, "end_date", startTime).orderByDesc("id");
-        List<LeaveSheet> leaveSheets = leaveSheetMapper.selectList(qw);
+        String token = request.getHeader("TOKEN");
+        User user = userMapper.selectById(token);
+        QueryWrapper<LeaveSheet> queryWrapper = new QueryWrapper<>();
+        LeaveSheet sheet = new LeaveSheet();
+        List<SysRichFunction> functionList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "查看全部请假单");
+        if (functionList.size() == 0) {
+            //部门负责人可以看这个部门的
+            List<Integer> mdids = departmentService.getAllManagedDeptIdList(user, null);
+//            List<Department> departmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("manager_id", user.getId()));
+            if (mdids.size() > 0) {
+                //负责的部门的人员
+                //先是自己的
+                List<String> userIds = new ArrayList<>();
+                userIds.add(user.getId());
+                List<User> deptUserList = userMapper.selectList(new QueryWrapper<User>().select("id").in("department_id", mdids));
+                List<String> collect = deptUserList.stream().map(User::getId).collect(Collectors.toList());
+                userIds.addAll(collect);
+                queryWrapper.in("owner_id", userIds);
+            } else {
+                //普通员工只能看自己的
+                sheet.setOwnerId(user.getId());
+            }
+        }
+        sheet.setCompanyId(user.getCompanyId());
+
+        queryWrapper.eq("company_id", sheet.getCompanyId()).orderByDesc("id");
+        //增加状态
+        if (sheet.getStatus() != null) {
+            queryWrapper.eq("status", sheet.getStatus());
+        }
+        if (!StringUtils.isEmpty(sheet.getOwnerId())) {
+            queryWrapper.eq("owner_id", sheet.getOwnerId());
+        }
+        if (sheet.getLeaveType() != null) {
+            queryWrapper.eq("leave_type", leaveType);
+        }
+        if (sheet.getStartDate() != null && sheet.getEndDate() != null) {
+            queryWrapper.le("start_date", startTime).ge("end_date", endTime);
+        }
+
+        List<LeaveSheet> leaveSheets = leaveSheetMapper.selectList(queryWrapper);
         if (leaveSheets.size()==0){
             return httpRespMsg;
         };
@@ -585,6 +618,12 @@ public class LeaveSheetServiceImpl extends ServiceImpl<LeaveSheetMapper, LeaveSh
             item.add(eds);
             item.add(leaveSheet.getTimeDays()==null?"":leaveSheet.getTimeDays().toString());
             item.add(leaveSheet.getTimeHours()==null?"":leaveSheet.getTimeHours().toString());
+            Optional<User> first = userList.stream().filter(u -> u.getId().equals(leaveSheet.getAuditorId())).findFirst();
+            String auditorName = first.isPresent()?first.get().getName():"";
+            //转译处理
+            if (wxCorpInfo != null && wxCorpInfo.getSaasSyncContact() == 1) {
+                auditorName = "$userName="+auditorName+"$";
+            }
             String statusS = "";
             switch (leaveSheet.getStatus()){
                 case 0:
@@ -593,7 +632,8 @@ public class LeaveSheetServiceImpl extends ServiceImpl<LeaveSheetMapper, LeaveSh
                     break;
                 case 1:
                     //statusS = "待审核";
-                    statusS = MessageUtils.message("stages.reviewed");
+                    statusS = MessageUtils.message("stages.reviewed")
+                            + "-" + auditorName;
                     break;
                 case 2:
                     //statusS = "驳回";

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

@@ -189,7 +189,7 @@ export default {
         },
         subjectId: {
             handler(newValue, oldValue) {
-                console.log(newValue, oldValue)
+                console.log(newValue, '过来的id')
                 this.optionsOId = newValue
                 if(this.optionsOId && this.optionsOId.length != 0) {
                     this.traverseArr(this.options, this.optionsOId)
@@ -231,6 +231,8 @@ export default {
         }
         if(this.subjectId) {
             this.optionsOId = JSON.parse(JSON.stringify(this.subjectId))
+            console.log(this.options, '过来的数据')
+            this.traverseArr(this.options, this.optionsOId)
             for(let i in this.options) {
                 if(this.options[i].id == this.optionsOId || this.options[i].auditorId == this.optionsOId) {
                      this.selectName = this.options[i].name || this.options[i].auditorName
@@ -247,11 +249,12 @@ export default {
     methods: {
         // 循环取值
         traverseArr(arr, idd){
-            console.log(arr, idd, '传过来的值')
             let id = idd[0]
             if(arr) {
                 for(var i in arr) {
-                    if(arr[i].value == id) {
+                    console.log(arr[i].value, idd)
+                    if(arr[i].value == idd) {
+                        console.log('将要付给的值', arr[i])
                         this.selectName = arr[i].label
                         if(arr[i].type) {
                             this.selectNameType = arr[i].type

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

@@ -1461,5 +1461,23 @@
   "xiu-gai-xiang-mu-dang-qian-jie-duan": "Modifying the current phase",
   "zheng-shi-xiang-mu": "Formal Project",
   "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"
+  "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",
+  "bu-men-ren-shu": "Number of Departments",
+  "chu-cha-ren-shu": "Number of business trips",
+  "di": "The ",
+  "di-er-ji-du": "Second Quarter",
+  "di-san-ji-du": "Third Quarter",
+  "di-si-ji-du": "Fourth Quarter",
+  "di-yi-ji-du": "First quarter",
+  "fei-xiang-mu-gong-shi": "Non-project hours",
+  "fei-xiang-mu-gong-shi-zhan-bi": "Proportion of non-project working hours",
+  "fen-zu-he-ji-gong-shi": "Total working hours by group",
+  "ge-fen-zu-jie-duan-gong-shi-biao": " group stage timesheet",
+  "ge-fen-zu-yu-jie-duan-gong-shi-biao": "Timesheets for groups and stages",
+  "shu-liang": "number ",
+  "xiang-mu-ge-fen-zu-yu-jie-duan-gong-shi-biao": "Project with each group and stage timesheet",
+  "xuan-ze-ji-du": "Choose a quarter",
+  "xuan-ze-nian": "Choose the Year",
+  "xuan-ze-nian-fen": "Choose the Month",
+  "zheng-shi-xiang-mu-gong-shi": "Official project hours"
 }

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

@@ -1461,5 +1461,23 @@
   "xiu-gai-xiang-mu-dang-qian-jie-duan": "修改项目当前阶段",
   "zheng-shi-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": "正式项目只对参与人开放，非项目对所有成员开放"
+  "zheng-shi-xiang-mu-zhi-dui-can-yu-ren-kai-fang-fei-xiang-mu-dui-suo-you-cheng-yuan-kai-fang": "正式项目只对参与人开放，非项目对所有成员开放",
+  "xiang-mu-ge-fen-zu-yu-jie-duan-gong-shi-biao": "项目各分组与阶段工时表",
+  "zheng-shi-xiang-mu-gong-shi": "正式项目工时",
+  "fei-xiang-mu-gong-shi": "非项目工时",
+  "fei-xiang-mu-gong-shi-zhan-bi": "非项目工时占比",
+  "bu-men-ren-shu": "部门人数",
+  "shu-liang": "数量",
+  "chu-cha-ren-shu": "出差人数",
+  "fen-zu-he-ji-gong-shi": "分组合计工时",
+  "xuan-ze-nian-fen": "选择年份",
+  "xuan-ze-nian": "选择年",
+  "xuan-ze-ji-du": "选择季度",
+  "di-yi-ji-du": "第一季度",
+  "di-er-ji-du": "第二季度",
+  "di-san-ji-du": "第三季度",
+  "di-si-ji-du": "第四季度",
+  "ge-fen-zu-yu-jie-duan-gong-shi-biao": "各分组与阶段工时表",
+  "ge-fen-zu-jie-duan-gong-shi-biao": "各分组阶段工时表",
+  "di": "第"
 }

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

@@ -417,7 +417,8 @@
         <!-- <el-form ref="editItemForm" :model="editItemForm" label-width="80px" :rules="editItemFormRules"> -->
         <el-form ref="editItemForm" :model="editItemForm" label-width="80px" :rules="editItemRules">
             <el-form-item :label="$t('businesspersonnel')" prop="ownerName"  style="width: 300px;display: inline-block;">
-                <span>{{editItemForm.ownerName}}</span>
+                <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='editItemForm.ownerName'></ww-open-data></span>
+                <span v-else>{{editItemForm.ownerName}}</span>
             </el-form-item>
             <el-form-item :label="$t('onewayroundtrip')" prop="goBack" style="width: 300px;display: inline-block;">
                 <el-radio-group v-model="editItemForm.goBack">

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

@@ -36,7 +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-17" v-if="permissions.reportPhaseHours || permissions.reportStageWorkingTime" @click="ssl(16)"><p>{{ $t('xiang-mu-ge-fen-zu-yu-jie-duan-gong-shi-biao') }}</p></el-menu-item>
                   <!-- <el-menu-item index="1-12"><p @click="ssl(11)">人员工时统计表</p></el-menu-item> -->
                 </el-submenu>
               </el-menu>
@@ -512,12 +512,14 @@
                   </template>
               </el-table-column>
               <el-table-column prop="jobNumber" :label="$t('Worknumber')" width="150"></el-table-column>
-              <el-table-column prop="unPublic" :label="$t('ordinaryprojecthours')" min-width="160" align="right">
+              <!-- <el-table-column prop="unPublic" :label="$t('ordinaryprojecthours')" min-width="160" align="right"> -->
+              <el-table-column prop="unPublic" :label="$t('zheng-shi-xiang-mu-gong-shi')" min-width="160" align="right">
                 <template slot-scope="scope">
                   <span>{{scope.row.unPublic == null? 0 + 'h' : scope.row.unPublic.toFixed(1) + 'h'}}</span>
                 </template>
               </el-table-column>
-              <el-table-column prop="isPublic" :label="$t('publicprojecthours')" min-width="160" align="right">
+              <!-- <el-table-column prop="isPublic" :label="$t('publicprojecthours')" min-width="160" align="right"> -->
+              <el-table-column prop="isPublic" :label="$t('fei-xiang-mu-gong-shi')" min-width="160" align="right">
                 <template slot-scope="scope">
                   <span>{{scope.row.isPublic == null? 0 + 'h' : scope.row.isPublic.toFixed(1) + 'h'}}</span>
                 </template>
@@ -529,7 +531,8 @@
                   <span>{{scope.row.workingTime == null? 0 + 'h' : scope.row.workingTime.toFixed(1) + 'h'}}</span>
                 </template>
               </el-table-column>
-              <el-table-column prop="proportion" :label="$t('publicprojecthourszan')" min-width="130" align="right">
+              <el-table-column prop="proportion" :label="$t('fei-xiang-mu-gong-shi-zhan-bi')" min-width="160" align="right">
+              <!-- <el-table-column prop="proportion" :label="$t('publicprojecthourszan')" min-width="160" align="right"> -->
                 
               </el-table-column>
             </el-table>
@@ -773,20 +776,20 @@
                     </div>
                   </template>
                 </el-table-column>
-                <el-table-column align="center" prop="deptHeadCount" :label="'部门人数'" min-width="150"></el-table-column>
+                <el-table-column align="center" prop="deptHeadCount" :label="$t('bu-men-ren-shu')" min-width="150"></el-table-column>
                 <el-table-column align="center" prop="projectCount" :label="$t('can-yu-de-xiang-mu-de-shu-liang')" min-width="150"></el-table-column>
-                <el-table-column align="center" prop="centerCount" :label="this.user.timeType.customDegreeName + '数量'" min-width="150"></el-table-column>
+                <el-table-column align="center" prop="centerCount" :label="this.user.timeType.customDegreeName + $t('shu-liang')" min-width="150"></el-table-column>
                 <el-table-column align="center" prop="peopleCount" :label="$t('can-yu-ren-ci')" min-width="150"></el-table-column>
                 <el-table-column align="center" prop="tripCount" :label="$t('chu-cha-de-tian-shu')" min-width="150"></el-table-column>
-                <el-table-column align="center" prop="tripPeopleCount" :label="'出差人数'" min-width="150"></el-table-column>
+                <el-table-column align="center" prop="tripPeopleCount" :label="$t('chu-cha-ren-shu')" 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" prop="projectCode" :label="$t('Itemno')" min-width="150"></el-table-column>
+                <el-table-column align="center" prop="projectName" :label="$t('headerTop.projectName')" min-width="150"></el-table-column>
+                <el-table-column align="center" prop="groupName" :label="$t('other.taskGroup')" min-width="150"></el-table-column>
+                <el-table-column align="center" prop="workingTime" :label="$t('fen-zu-he-ji-gong-shi')" 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>
@@ -972,29 +975,29 @@
           </el-table>
         </el-dialog>
 
-        <el-dialog title="按季度导出" :visible.sync="byQuarterDialog" width="500px">
+        <el-dialog :title="$t('an-ji-du-dao-chu')" :visible.sync="byQuarterDialog" width="500px">
           <el-form>
-            <el-form-item label="选择年份">
+            <el-form-item :label="$t('xuan-ze-nian-fen')">
               <el-date-picker
                 v-model="quarterParameter.year"
                 type="year"
                 value-format="yyyy"
                 :clearable="false"
                 style="width:200px"
-                placeholder="选择年">
+                :placeholder="$t('xuan-ze-nian')">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="选择季度">
+            <el-form-item :label="$t('xuan-ze-ji-du')">
               <el-select v-model="quarterParameter.quarter" style="width:200px">
-                <el-option label="第一季度" :value="1"></el-option>
-                <el-option label="第二季度" :value="2"></el-option>
-                <el-option label="第三季度" :value="3"></el-option>
-                <el-option label="第四季度" :value="4"></el-option>
+                <el-option :label="$t('di-yi-ji-du')" :value="1"></el-option>
+                <el-option :label="$t('di-er-ji-du')" :value="2"></el-option>
+                <el-option :label="$t('di-san-ji-du')" :value="3"></el-option>
+                <el-option :label="$t('di-si-ji-du')" :value="4"></el-option>
               </el-select>
             </el-form-item>
           </el-form>
           <div slot="footer" class="dialog-footer" style="text-align: center;">
-            <el-button @click.native="quarterExport" :loading="exportLoading" type="primary">导出</el-button>
+            <el-button @click.native="quarterExport" :loading="exportLoading" type="primary">{{ $t('export.export') }}</el-button>
           </div>
         </el-dialog>
   </section>
@@ -1063,13 +1066,13 @@ 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'), this.$t('ge-fen-zu-yu-jie-duan-gong-shi-biao')],
 
       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'), this.$t('ge-fen-zu-yu-jie-duan-gong-shi-biao')],
 
       ins: 10000,
       user: JSON.parse(sessionStorage.user),
@@ -1262,7 +1265,7 @@ export default {
     getUserList() {
       console.log(this.shuzArr[this.ins])
       this.http.post('/user/getUserListByRole', {
-        tableName: this.shuzArr[this.ins] || '加班情况统计表'
+        tableName: this.shuzArr[this.ins] || this.$t('statisticsofovertimework')
       },
       res => {
           if (res.code == "ok") {
@@ -1572,7 +1575,7 @@ export default {
           sl.month = this.monthPersonnel + '-01'
           sl.departmentId = this.departmentIdArray.length > 0 ? this.departmentIdArray[this.departmentIdArray.length - 1] : ''
         } else if(this.ins == 16) {
-          fName = '各分组阶段工时表' + '.xls'
+          fName = this.$t('ge-fen-zu-jie-duan-gong-shi-biao') + '.xls'
           url += "/exportProjectGroupAndCategoryWorkTime"
           sl.startDate = this.rangeDatas[0]
           sl.endDate = this.rangeDatas[1]
@@ -1610,7 +1613,7 @@ export default {
             res => {
                 if (res.code == "ok") {
                     var filePath = res.data;
-                    var fName = this.$t('personnelfillingtimelyratestatistics') + '(' + this.quarterParameter.year + '第' + this.quarterParameter.quarter  + '季度).xls'
+                    var fName = this.$t('personnelfillingtimelyratestatistics') + '(' + this.quarterParameter.year + this.$t('di') + this.quarterParameter.quarter  + '季度).xls'
                     const a = document.createElement('a'); // 创建a标签
                     a.setAttribute('download', fName);// download属性
                     a.setAttribute('href', filePath);// href链接

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

@@ -164,16 +164,16 @@
                     <el-input type="textarea" v-model="addForm.remark" :rows="5" style="width: 550px" maxlength="100" show-word-limit></el-input>
                 </el-form-item>
                 <!--请假流程显示-->
-                <el-form-item label="审批流程" style="width: 100%">
+                <el-form-item label="审批流程" style="width: 100%;color:#606266" >
                   <span v-for="(item, index) in curWorkflowList" :key="item.id" >
                     <span v-if="index>0"><i class="el-icon-right"></i></span>
                     <span><i class="el-icon-s-custom"></i></span>
                     <span v-if="user.userNameNeedTranslate == 1">
-                      <ww-open-data type='departmentName' :openid='item.auditDeptName' v-if="item.auditorType == 1"></ww-open-data>(主要负责人)
+                      <span v-if="item.auditorType == 1"><ww-open-data type='departmentName' :openid='item.auditDeptName' ></ww-open-data>(主要负责人)</span>
                       <ww-open-data type='userName' :openid='item.userName' v-if="item.auditorType == 2"></ww-open-data>
                     </span>
                     <span v-if="user.userNameNeedTranslate == 0">
-                      {{item.auditorType == 1?item.auditDeptName+'(主要负责人)':item.userName}}
+                      {{item.auditorType == 1?(item.auditDeptName+'(主要负责人)'):item.userName}}
                     </span>
                   </span>
                 </el-form-item>
@@ -469,10 +469,10 @@
         <el-dialog  :title="$t('pleaseselectapprover')" v-if="dialogVisible" :visible.sync="dialogVisible"  width="460px">
               <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-show="user.userNameNeedTranslate != 1"></el-cascader>
+                  <!-- <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-show="user.userNameNeedTranslate != 1"></el-cascader> -->
 
-                  <vueCascader :size="'small'" :widthStr="'200'" :clearable="true" :userName="true" :subject="soption" :radios="true" :distinction="'1'" @vueCasader="vueCasader" v-if="user.userNameNeedTranslate == 1"></vueCascader>
+                  <vueCascader :size="'small'" :widthStr="'200'" :clearable="true" :userName="true" :subjectId="this.selectedAuuid" :subject="soption" :radios="true" :distinction="'1'" @vueCasader="vueCasader" v-if="user.userNameNeedTranslate != 1"></vueCascader>
 
               </el-form-item>
               </el-form>
@@ -925,6 +925,7 @@ export default {
       curWorkflowList:{},
       denyReasonVisible : false,
       auditLogList:[],
+      selectedAuuid: ''
     };
   },
   computed: {},
@@ -1433,8 +1434,10 @@ export default {
                             this.isAdd = false;
                             this.sindex = index;
                             this.curUserId = item.userId;
-                            this.dialogVisible = true;
                             this.curDeptId = item.auditDeptId;
+                            this.selectedAuuid = item.userId || item.auditDeptId
+                            console.log(this.selectedAuuid, '看看数据类')
+                            this.dialogVisible = true;
                         } else {
                             this.$message({
                                 message: res.msg,

fhKeeper/formulahousekeeper/timesheet_h5/src/views/index/index.vue

@@ -30,7 +30,7 @@
             return {
                 isCorpWX:false,
                 isWX:false,
-                user: '',
+                user: null,
                 unreadNum:0,
                 images: [
                     // require('../../assets/img/index/banner_1.png'),
@@ -60,6 +60,7 @@
             let that = this;
             //企业微信是从后台授权后跳转过来的
             if (this.isCorpWX) {
+                //后台自动授权登录的用户
                 if(window.location.href.indexOf('userId') != '-1') {
                     let href = window.location.href;
                     var loginUserId = href.substring(href.indexOf("userId=")+"userId=".length);
@@ -68,7 +69,12 @@
                     }
                     that.getAccountInfo(loginUserId)
                 } else {
-                    this.$router.push("/login");
+                    //存在一部分用户，没有绑定企业微信，进来后跳到登录页面，登录页面输入账号密码进来后不带userId
+                    if (this.user) {
+                        that.getAccountInfo(that.user.id);
+                    } else {
+                        that.$router.push("/login");
+                    }
                 }
             } else {
                 //其他情况，刷新用户信息