工程专业版审批转译，企业微信反馈问题

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/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>