项目概览转译和数据统计的报表调整

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

@@ -264,10 +264,11 @@ export default {
                     }
                 }
             }
-            if(this.multiSelect) {
+            console.log(this.options, this.subjectId)
+            if(this.multiSelect) { 
                 for(var i in this.options) {
-                    for(var j in this.optionsOId) {
-                        if( this.options[i].auditorId == this.optionsOId[j] || this.options[i].id == this.optionsOId[j]) {
+                    for(var j in this.subjectId) {
+                        if(this.options[i].id == this.subjectId[j] || this.options[i].auditorId == this.subjectId[j]) {
                             this.multiSelectList.push(this.options[i])
                             this.options[i].flg = true
                         }
@@ -275,7 +276,7 @@ export default {
                 }
             }
         }
-        console.log(this.subject)
+        console.log(this.subject, this.subjectId)
         this.dailyListIndex = this.idx
     },
     methods: {

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

@@ -210,7 +210,7 @@
                 //     })
                 // })
                 var appId = "wwf11426cf618e1703";//企业微信第三方的SUIT ID
-                var url = "http://worktime.ttkuaiban.com/api/wxcorp/corpWeiXinScanningCodeLogin";//授权回调页面
+                var url = "http://worktime.ttkuaiban.com/api/corpWXScanningAuth";//授权回调页面
                 var weixinUrl=`https://open.work.weixin.qq.com/wwopen/sso/3rd_qrConnect?appid=${appId}&redirect_uri=${url}&state=99276&usertype=member`;
                 window.location.href = weixinUrl;
             },

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

@@ -448,15 +448,17 @@
         <el-dialog :title="$t('editParticipants')" v-if="pVisible" :visible.sync="pVisible" :close-on-click-modal="false" customClass="customWidth" width="600px">
             <el-form ref="participForm" :model="addForm" :rules="rules" label-width="120px">
                 <el-form-item :label="$t('Allparticipants')">
-                    <el-select v-model="addForm.userId" multiple filterable :placeholder="$t('defaultText.pleaseChoose')" style="width:100%;" @change="changeParticipator">
+                    <el-select v-model="addForm.userId" multiple filterable :placeholder="$t('defaultText.pleaseChoose')" style="width:100%;" @change="changeParticipator" v-if="user.userNameNeedTranslate != 1">
                         <el-option v-for="item in users" :key="item.id" :label="item.name" :value="item.id"></el-option>
                     </el-select>
+
+                    <selectCat v-if="user.userNameNeedTranslate == 1" :multiSelect="true" :widthStr="'430'" :size="'medium'" :subject="users" :subjectId="addForm.userId" :distinction="'12'" @selectCal="selectCal"></selectCat>
                 </el-form-item>
                 <el-form-item :label="$t('projectmanager')" >
                     <el-select v-if="user.userNameNeedTranslate != 1" v-model="addForm.inchargerId"  filterable :placeholder="$t('defaultText.pleaseChoose')" style="width:100%;" >
                         <el-option v-for="item in project.participationList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                     </el-select>
-                    <selectCat v-if="user.userNameNeedTranslate == 1" :size="'mini'" :subject="project.participationList" :subjectId="addForm.inchargerId" :distinction="'1'" @selectCal="selectCal"></selectCat>
+                    <selectCat v-if="user.userNameNeedTranslate == 1" :widthStr="'430'" :size="'medium'" :subject="project.participationList" :subjectId="addForm.inchargerId" :distinction="'1'" @selectCal="selectCal"></selectCat>
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -469,9 +471,11 @@
         <el-dialog :title="$t('addingParticipant')" v-if="addMembVisible" :visible.sync="addMembVisible" :close-on-click-modal="false" customClass="customWidth" width="600px">
             <el-form ref="addMembForm" :model="addMembForm"  label-width="120px">
                 <el-form-item :label="$t('addAdding')">
-                    <el-select v-model="addMembForm.userId" multiple filterable :placeholder="$t('defaultText.pleaseChoose')" style="width:100%;" >
+                    <el-select v-model="addMembForm.userId" multiple filterable :placeholder="$t('defaultText.pleaseChoose')" style="width:100%;" v-if="user.userNameNeedTranslate != 1">
                         <el-option v-for="item in users" :key="item.id" :label="item.name" :value="item.id"></el-option>
                     </el-select>
+
+                    <selectCat v-if="user.userNameNeedTranslate == 1" :multiSelect="true" :widthStr="'430'" :size="'medium'" :subject="users" :subjectId="addMembForm.userId" :distinction="'13'" @selectCal="selectCal"></selectCat>
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -1998,6 +2002,20 @@
                 } else if(obj.distinction == '3') {
                     let userList = obj.id
                     this.curProfessionRow.membList[obj.other].membId = userList
+                } else if(obj.distinction == '12') {
+                    let arrList = obj.arrUserList
+                    let arr = []
+                    for(var i in arrList) {
+                        arr.push(arrList[i].id)
+                    }
+                    this.addForm.userId = arr
+                } else if(obj.distinction == '13') {
+                    let arrList = obj.arrUserList
+                    let arr = []
+                    for(var i in arrList) {
+                        arr.push(arrList[i].id)
+                    }
+                    this.addMembForm.userId = arr
                 }
             }
         },

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

@@ -202,6 +202,7 @@
                               top: "center"
                             },
                             toolbox: {
+                                right: 25,
                                 show: true,
                                 feature:{
                                     saveAsImage:{
@@ -296,6 +297,7 @@
                               top: "center"
                             },
                             toolbox: {
+                                right: 25,
                                 show: true,
                                 feature:{
                                     saveAsImage:{
@@ -373,6 +375,7 @@
                               top: "center"
                             },
                             toolbox: {
+                                right: 25,
                                 show: true,
                                 feature:{
                                     saveAsImage:{
@@ -501,6 +504,7 @@
                       top: "center"
                     },
                     toolbox: {
+                        right: 25,
                         show: true,
                         feature:{
                             saveAsImage:{