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

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

@@ -80,7 +80,8 @@ export default {
             if (userNameNeedTranslate) {
                 this.corporateWeChat = true
                 if (dingdingUserid) {
-                    this.dingdingPlatform = true
+                    // this.dingdingPlatform = true
+                    this.dingdingPlatform = false
                     this.corporateWeChat = false
                 } else {
                     this.dingdingPlatform = false
@@ -113,9 +114,9 @@ export default {
                     break;
             }
             // console.log(this.translationValue, '<=== 转译文本')
-            if (this.user.dingdingUserid) {
-                this.viewConfiguration()
-            }
+            // if (this.user.dingdingUserid) {
+            //     this.viewConfiguration()
+            // }
         },
         viewConfiguration() {
             setTimeout(() => {

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

@@ -54,12 +54,13 @@ export default {
         this.dealWith()
     },
     methods: {
-        dealWith() {
+        dealWith() { 
             const { userNameNeedTranslate, dingdingUserid } = this.user
             if (userNameNeedTranslate) {
                 this.corporateWeChat = true
                 if (dingdingUserid) {
-                    this.dingdingPlatform = true
+                    // this.dingdingPlatform = true
+                    this.dingdingPlatform = false // 钉钉目前不需要转译
                     this.corporateWeChat = false
                 } else {
                     this.dingdingPlatform = false
@@ -74,10 +75,10 @@ export default {
             this.assignmentValue(this.openid)
         },
         assignmentValue(value) {
-            this.openIdValue = value
-            if (this.user.dingdingUserid) {
-                this.viewConfiguration()
-            }
+            // this.openIdValue = value
+            // if (this.user.dingdingUserid) {
+            //     this.viewConfiguration() // 钉钉目前不需要转译
+            // }
         },
         viewConfiguration() {
             setTimeout(() => {

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

@@ -4419,10 +4419,6 @@ export default {
         if(this.tabsType != 'all') {
           return
         }
-        if(this.tabPosition == 0) {
-          this.proJuctId = ''
-          return
-        }
         // this.groupConsumptionLoading = true
         this.listLoading = true
         let { data } = await this.postData('/project/groupExpendProcessListForChart', {

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

@@ -32,8 +32,8 @@
                 <el-radio-button :label="$t('other.project')"></el-radio-button>
                 <el-radio-button :label="$t('zhu-xiang-mu')" v-if="user.timeType.mainProjectState"></el-radio-button>
                 <el-radio-button :label="$t('projectclassification')" v-if="user.companyId != '1071'"></el-radio-button>
-                <el-radio-button :label="$t('lable.department')" v-if="(permissions.viewAllSummary || permissions.viewMagDeptSummary) && !user.dingdingUserid"></el-radio-button>
-                <el-radio-button :label="$t('ren-yuan')" v-if="permissions.countPersonnel && !user.dingdingUserid"></el-radio-button>
+                <el-radio-button :label="$t('lable.department')" v-if="(permissions.viewAllSummary || permissions.viewMagDeptSummary)"></el-radio-button>
+                <el-radio-button :label="$t('ren-yuan')" v-if="permissions.countPersonnel"></el-radio-button>
                 <el-radio-button :label="namess" v-if="jichu.customDegreeActive == 1 && !jichu.customDegreeMultiple"></el-radio-button>
                 <el-radio-button v-for="item in theCustomList" :key="item.id" :label="item.name"></el-radio-button>
             </el-radio-group>

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -619,7 +619,7 @@
                         <el-option v-for="item in allActiveUsers" :key="item.id" :value="item.id" :label="item.name">
                         </el-option>
                     </el-select>
-                    <selectCat :size="'medium'" :widthStr="'300'" v-if="user.userNameNeedTranslate == '1'" :subject="allActiveUsers" :subjectId="toUserId" :distinction="'12'" @selectCal="selectCal"></selectCat>
+                    <selectCat :size="'medium'" :widthStr="'300'" :filterable="true" v-if="user.userNameNeedTranslate == '1'" :subject="allActiveUsers" :subjectId="toUserId" :distinction="'12'" @selectCal="selectCal"></selectCat>
                 </el-form-item>
                 <el-form-item :label="$t('transferoftheirrole')" >
                     <el-select v-model="myRoleId" style="width:300px">