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

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

@@ -298,7 +298,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                         .atZone(ZoneId.systemDefault()).toLocalDate();
                 expenseSheet.setCreateDate(localDate);
                 Optional<User> first;
-                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
+                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()!=1){
                     first = userList.stream().filter(us -> us.getName().equals(reimburserCell.getStringCellValue())).findFirst();
                 }else {
                     first = userList.stream().filter(us -> us.getName().equals(reimburserCell.getStringCellValue())||(us.getJobNumber()!=null&&us.getJobNumber().equals(reimburserCell.getStringCellValue()))).findFirst();

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

@@ -38,14 +38,14 @@
                     <el-dropdown-menu slot="dropdown">
                         <el-dropdown-item >
                             <div v-if="!isCorpWX">
-                                <div>{{$t('other.sweepWeChatYards')}}</div>
+                                <!-- <div>{{$t('other.sweepWeChatYards')}}</div> -->
+                                <div>扫码添加企业微信客服</div>
                                 <img
                                 style="width: 120px; height: 120px"
                                 src="../assets/image/code.jpg" />
                             </div>
                             <div v-if="isCorpWX">
-                                <!-- <div>{{ $t('ke-fu-wei-xin') }}</div> -->
-                                <div>请扫码添加企业微信客服</div>
+                                <div>{{ $t('ke-fu-wei-xin') }}</div>
                                 <img
                                 style="width: 120px; height: 120px"
                                 src="../assets/image/qwcode.png" />

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

@@ -120,7 +120,7 @@
             <el-option v-for="(item, index) in selUserList" :key="index" :label="item.name" :value="item.id"></el-option>
           </el-select>
 
-          <selectCat :subject="selUserList" :subjectId="userId" :size="mini" @selectCal="selectCal" v-if="(ins == 6 || ins == 8 || ins == 9 || ins == 10 || ins == 11 || ins == 14) && user.userNameNeedTranslate == '1'"></selectCat>
+          <selectCat :subject="selUserList" :subjectId="userId" :clearable="true" :size="mini" @selectCal="selectCal" v-if="(ins == 6 || ins == 8 || ins == 9 || ins == 10 || ins == 11 || ins == 14) && user.userNameNeedTranslate == '1'"></selectCat>
           
 
           <!-- 待审核筛选切换 -->
@@ -1803,7 +1803,7 @@ export default {
         obj.userId = this.userId
       }
       console.log(this.departmentIdArray, '加班情况统计表')
-      if(this.departmentIdArray.length != 0){
+      if(this.departmentIdArray.length != 0 && this.departmentIdArray[0] != ''){
         let deptid = []
         if(this.user.userNameNeedTranslate != '1') {
           for(let i in this.departmentIdArray){

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

@@ -668,8 +668,8 @@
                             </div>
                         </el-tab-pane>
                         <el-tab-pane :label="$t('engineering')" name="engineeringProfession" v-if="user.company.packageEngineering == 1">
-                        <div style="padding-top:10px;">
-                            <el-table :data="projectProfessionList" size="small" :key="Math.random()">
+                        <div style="padding-top:10px;" class="gongcheng">
+                            <el-table :data="projectProfessionList" size="small" :key="Math.random()" :height="'400px'">
                                 <el-table-column prop="professionId" width="200">
                                     <template slot-scope="scope">
                                         <el-select v-model="scope.row.professionId" >
@@ -695,13 +695,13 @@
                                         <el-link @click="showEditPpMembs(scope.row)">{{(scope.row.membList == null || scope.row.membList.length == 0)?$t('professionalparticipants'):$t('setup')}}</el-link>
                                     </template>
                                 </el-table-column>
-                                <el-table-column prop="inchargerName" width="120" :label="$t('head')">
+                                <el-table-column prop="inchargerName" width="200" :label="$t('head')">
                                     <template slot-scope="scope">
                                         <el-select v-model="scope.row.inchargerId" v-if="user.userNameNeedTranslate != 1">
                                             <el-option v-for="item in participator" :key="item.id" :label="item.name" :value="item.id"></el-option>
                                         </el-select>
 
-                                        <!-- <selectCat :size="'mini'" :subject="participator" :subjectId="scope.row.inchargerId" :index="scope.index" :distinction="'4'" style="position: relative;z-index:99999999999 !important;"></selectCat> -->
+                                        <selectCat v-if="user.userNameNeedTranslate == 1" :size="'mini'" :subject="participator" :subjectId="scope.row.inchargerId" :other="scope.$index" :distinction="'4'" @selectCal="selectCal"></selectCat>
 
                                     </template>
                                 </el-table-column>
@@ -1076,6 +1076,7 @@
 
         <!-- 项目专业人员的设置 -->
         <el-dialog :title="$t('setupprojectprofessionals')"  v-if="editPpMembDialog" :visible.sync="editPpMembDialog" :close-on-click-modal="false" customClass="customWidth" width="600px">
+            <div class="gongcheng">
             <el-table :data="curProfessionRow.membList" height="400">
                 <el-table-column prop="name" :label="$t('professionals')">
                     <template slot-scope="scope">
@@ -1083,6 +1084,7 @@
                             <el-option v-for="item in participator" :key="item.id" :label="item.name" :value="item.id">
                             </el-option>
                         </el-select>
+                        <selectCat v-if="user.userNameNeedTranslate == 1" :size="'medium'" :subject="participator" :subjectId="scope.row.membId" :distinction="'11'" :other="scope.$index" @selectCal="selectCal"></selectCat>
                     </template>
                 </el-table-column>
                 <el-table-column prop="percentage" width="120" :label="$t('zhan-bi')">
@@ -1103,6 +1105,7 @@
                 <el-button  @click="editPpMembDialog = false" >{{ $t('btn.cancel') }}</el-button>
                 <el-button type="primary" @click="addPpMemb" >{{ $t('btn.determine') }}</el-button>
             </div>
+            </div>
         </el-dialog>
         <!-- 批量修改自定义维度 -->
         <el-dialog :title="checkoradd ? $t('changes') : $t('pi-liang-tian-jia')" :visible.sync="checkedWuduDialog" v-if="checkedWuduDialog" width="40%">
@@ -4142,7 +4145,7 @@ a {
                 } else if(obj.distinction == '3') {
                     this.addForm.inchargerId = obj.id
                 } else if(obj.distinction =='4') {
-                    this.projectProfessionList[obj.index].inchargerId == obj.id
+                    this.projectProfessionList[obj.other].inchargerId = obj.id
                 } else if(obj.distinction =='5') {
                     this.paramInchargerId = obj.id
                 } else if(obj.distinction == '10') {
@@ -4152,6 +4155,10 @@ a {
                         arr.push(userList[i].id)
                     }
                     this.addForm.auditUserIds = arr
+                } else if(obj.distinction == '11') {
+                    let userList = obj.id
+                    console.log(obj)
+                    this.curProfessionRow.membList[obj.other].membId = userList
                 }
             }
         },
@@ -4281,4 +4288,7 @@ a {
 .wpgCssClass .el-form-item__label{
     font-weight: 600;
 }
+.gongcheng .el-table .cell{
+    overflow: inherit !important;
+}
 </style>

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

@@ -1959,6 +1959,10 @@
                             this.checkLists = [],
                             this.text2 = '',
                             this.radio = 0
+                            let obj = {
+                                id: this.taskIid
+                            }
+                            this.gain(obj)
                         } else {
                             this.$message({
                                 message: res.msg,

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

@@ -1432,6 +1432,10 @@ import { error } from 'dingtalk-jsapi';
                             this.checkLists = [],
                             this.text2 = '',
                             this.radio = 0
+                            let obj = {
+                                id: this.taskIid
+                            }
+                            this.gain(obj)
                         } else {
                             this.$message({
                                 message: res.msg,

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

@@ -8,10 +8,20 @@
         </el-col>
         <p style="padding-top:80px;margin: 0 0 10px 10px;color:#666;">{{$t('timeApprovalProcess')}}</p>
         <div>
-        <el-col :span="6" >
+        <el-col :span="6" > 
             <el-scrollbar style="height:100%;border:1px solid #dddddd;margin-left:15px;" >
             <div class="tree" :style="'height:'+ (tableHeight-120) + 'px'">
-                <el-tree :data="data" :props="defaultProps" @node-click="handleNodeClick" accordion></el-tree>
+                <el-tree :data="data" :props="defaultProps" @node-click="handleNodeClick" accordion>
+                    <span class="custom-tree-node" slot-scope="{ node, data }">
+                        <!-- <span>{{ node.label }}</span> -->
+                        <span v-if="user.userNameNeedTranslate == '1'">
+                          <ww-open-data type='departmentName' :openid='node.label'></ww-open-data>
+                        </span>
+                        <span v-else>
+                          {{ node.label }}
+                        </span>
+                    </span>
+                </el-tree>
             </div>
             </el-scrollbar>
         </el-col>