解决转译遗留下来的问题

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

@@ -19,7 +19,7 @@
                     </span>
                     <span v-if="tile">
                         <span class="all" style="margin-right: 6px" v-for="(items, indexs) in multiSelectList" :key="indexs">
-                            <ww-open-data type='userName' :openid='multiSelectList[0].name'></ww-open-data>
+                            <ww-open-data type='userName' :openid='items.name'></ww-open-data>
                             <!-- {{items.name}} -->
                             <i class="el-icon-error" @click.stop="deleteMultiSelectList(indexs)" v-if="!disabled"></i>
                         </span>

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

@@ -55,7 +55,22 @@
                         <el-table-column property="type" :label="$t('other.messageContent')" align="left">
                             <template slot-scope="scope">
                                 <el-link type="primary" :underline="false" @click="locationHerf(scope.row.id,scope.row.content, scope.row.type)">
-                                    <span style="font-size:13px;">{{scope.row.msg==null?msgTypeTxt[scope.row.type]:scope.row.msg}}</span>
+                                    <span style="font-size:13px;">
+                                        <span v-if="scope.row.msg == null">
+                                            {{msgTypeTxt[scope.row.type]}}
+                                        </span>
+                                        <span v-else>
+                                            <span v-if="user.userNameNeedTranslate != 1">
+                                                {{scope.row.msg}}
+                                            </span>
+                                            <span v-if="user.userNameNeedTranslate == 1">
+                                                {{scope.row.omg.textOne}}
+                                                <ww-open-data type='userName' :openid='scope.row.omg.textTwo'></ww-open-data>
+                                                {{scope.row.omg.textThree}}
+                                            </span>
+                                        </span>
+                                        <!-- {{scope.row.msg==null?msgTypeTxt[scope.row.type]:scope.row.msg}} -->
+                                    </span>
                                 </el-link>
                             </template> 
                         </el-table-column>
@@ -404,6 +419,28 @@
                 res => {
                     if (res.code == "ok") {
                         var list = res.data;
+                        if(this.user.userNameNeedTranslate == 1) {
+                            let msgArr = res.data
+                            for(var i in msgArr) {
+                                if(msgArr[i].msg) {
+                                    let caozuo = JSON.parse(JSON.stringify(msgArr[i].msg))
+                                    let textOne = caozuo.split('$userName=')[0]
+                                    let textTwo = caozuo.split('$userName=')[1].split('$')[0]
+                                    let textThree = caozuo.split('$userName=')[1].split('$')[1]
+                                    msgArr[i].omg = {
+                                        textOne: textOne,
+                                        textTwo: textTwo,
+                                        textThree: textThree
+                                    }
+                                } else {
+                                    msgArr[i].omg = {
+                                        textOne: '',
+                                        textTwo: '',
+                                        textThree: ''
+                                    }
+                                }
+                            }
+                        }
                         this.popoverData = res.data;
                         var num = 0;
                         for(var i in list) {
@@ -426,7 +463,6 @@
                     });
                 });
             },
-
             //点击消息的跳转
             locationHerf(id, date, type) {
                 this.http.post( this.port.manage.check, { id: id },

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

@@ -184,11 +184,14 @@
                 </el-table-column>
                 <el-table-column prop="executor_name" :label="$t('zhi-hang-ren')"  width="200">
                   <template slot-scope="scope" >
-                    <span v-if="user.userNameNeedTranslate == '1'">
-                      <ww-open-data type='userName' :openid='scope.row.executor_name'></ww-open-data>
-                    </span>
-                    <span v-if="user.userNameNeedTranslate != '1'">
-                      {{scope.row.executor_name}}
+                    <span v-for="(items, indexs) in scope.row.executor_name" :key="indexs">
+                      <span v-if="user.userNameNeedTranslate == '1'">
+                        <ww-open-data type='userName' :openid='items'></ww-open-data>
+                      </span>
+                      <span v-if="user.userNameNeedTranslate != '1'">
+                        {{items}}
+                      </span>
+                      <span v-if="indexs < scope.row.executor_name.length - 1">,</span>
                     </span>
                   </template>
                 </el-table-column>
@@ -1567,6 +1570,11 @@ export default {
                 } else {
                   res.data.records[i].customName = res.data.records[i].project_name
                 }
+              }
+              for(var i in res.data.records) {
+                if(res.data.records[i].executor_name) {
+                  res.data.records[i].executor_name = res.data.records[i].executor_name.split(',')
+                }
               }
                 this.list1 = res.data.records;
                 this.listArr1 = []

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

@@ -63,11 +63,14 @@
             <!-- 报销人 -->
             <el-form-item :label="$t('peopleconcerned')" prop="ownerId">
               <!--普通员工只能自己填报自己的 -->
-              <el-select v-model="addForm.ownerId" :placeholder="$t('pleaseselecttheapplicant')" style="width: 150px" :disabled="!permissions.costAudit" filterable="true">
+              <el-select v-if="user.userNameNeedTranslate != '1'" v-model="addForm.ownerId" :placeholder="$t('pleaseselecttheapplicant')" style="width: 150px" :disabled="!permissions.costAudit" filterable="true">
                 <span v-for="(item, index) in users" :key="index">
                   <el-option :label="item.name" :value="item.id"></el-option>
                 </span> 
               </el-select>
+
+              <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'medium'" :widthStr="'150'" :distinction="'1'" :subject="users" :disabled="!permissions.costAudit" :subjectId="addForm.ownerId" ref="selectCat" @selectCal="selectCal"></selectCat>
+
             </el-form-item>
             <!-- 填报日期 -->
             <el-form-item :label="$t('fillinthedate')" style="position: relative;top: 38px;" prop="createDate">
@@ -198,11 +201,13 @@
           <el-form label-width="70px" inline >
             <!-- 报销人 -->
             <el-form-item :label="$t('peopleconcerned')">
-              <el-select v-model="ownerId" size="small" clearable :placeholder="$t('selecttheapplicant')" style="width: 120px" :disabled="!permissions.costAudit" filterable="true">
+              <el-select v-if="user.userNameNeedTranslate != '1'" v-model="ownerId" size="small" clearable :placeholder="$t('selecttheapplicant')" style="width: 120px" :disabled="!permissions.costAudit" filterable="true">
                 <span v-for="(item, index) in users" :key="index">
                   <el-option :label="item.name" :value="item.id"></el-option>
                 </span> 
               </el-select>
+
+              <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'small'" :widthStr="'120'" :distinction="'2'" :clearable="true" :subject="users" :disabled="!permissions.costAudit" :subjectId="ownerId" ref="selectCat" @selectCal="selectCal"></selectCat>
             </el-form-item>
             <!-- 单据编号 -->
             <el-form-item :label="$t('receiptnumber')" >
@@ -243,7 +248,18 @@
                   <span style="float:right;margin-right:20px">{{scope.row.totalAmount ? scope.row.totalAmount.toFixed(2) : '0'}}</span>
                 </template>
               </el-table-column>
-              <el-table-column prop="ownerName" :label="$t('peopleconcerned')" ></el-table-column>
+              <el-table-column prop="ownerName" :label="$t('peopleconcerned')" >
+                <template slot-scope="scope">
+                  <div>
+                    <span v-if="user.userNameNeedTranslate != 1">
+                      {{scope.row.ownerName}}
+                    </span>
+                    <span v-if="user.userNameNeedTranslate == 1">
+                      <ww-open-data type='userName' :openid='scope.row.ownerName'></ww-open-data>
+                    </span>
+                  </div>
+                </template>
+              </el-table-column>
               <el-table-column prop="createDate" :label="$t('fillinthedate')" ></el-table-column>
               <el-table-column prop="ticketNum" :label="$t('invoicenumber')" ></el-table-column>
               <el-table-column prop="type" :label="$t('ppertype')" >
@@ -306,11 +322,14 @@
           <el-form :model="ParticularsList" label-width="80px">
             <el-form-item :label="$t('peopleconcerned')" style="width: 270px" :rules="{ required: true, message: $t('pleaseselecttheapplicant'), trigger: 'blur' }">
               <!-- <el-input v-show="flg" v-model="ParticularsList.ownerName" disabled ></el-input> -->
-              <el-select v-model="ParticularsList.ownerId" :placeholder="$t('pleaseselecttheapplicant')" style="width: 150px" :disabled="flg || ParticularsList.ownerId == ParticularsList.operatorId">
+              <!-- <el-select v-model="ParticularsList.ownerId" :placeholder="$t('pleaseselecttheapplicant')" style="width: 150px" :disabled="flg || ParticularsList.ownerId == ParticularsList.operatorId">
                 <span v-for="(item, index) in users" :key="index">
                   <el-option :label="item.name" :value="item.id"></el-option>
                 </span>
-              </el-select>
+              </el-select> -->
+
+              <selectCat v-if="user.userNameNeedTranslate != '1'" :size="'medium'" :widthStr="'150'" :distinction="'3'" :subject="users" :disabled="flg || ParticularsList.ownerId == ParticularsList.operatorId" :subjectId="ParticularsList.ownerId" ref="selectCat" @selectCal="selectCal"></selectCat>
+
             </el-form-item>
             <el-form-item :label="$t('fillinthedate')">
               <!-- <el-input v-model="ParticularsList.createDate" :disabled="flg"></el-input> -->
@@ -981,6 +1000,7 @@ export default {
                 if (!this.permissions.costAudit) {
                     this.addForm.ownerId = this.user.id;
                     this.addForm.status = 1;
+                    this.$forceUpdate()
                 }
             } else {
                 this.$message({
@@ -1465,6 +1485,16 @@ export default {
         // console.log(sums, 123)
         this.$nextTick(()=>{ this.$refs.tab.doLayout()})
         return sums;
+      },
+      // 自定义组件事件
+      selectCal(obj) {
+        if(obj.distinction == '1') {
+          this.addForm.ownerId = obj.id
+        } else if(obj.distinction == '2') {
+          this.ownerId = obj.id
+        } else if(obj.distinction == '3') {
+          this.ParticularsList.ownerId = obj.id
+        }
       }
   },
 };

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

@@ -50,7 +50,18 @@
                                 </template>
                             </el-table-column>
                             <el-table-column :label="$t('xiabo')" prop="indate" align="center" min-width="200"></el-table-column>
-                            <el-table-column :label="$t('caozuo')" prop="userName" align="center" min-width="120"></el-table-column>
+                            <el-table-column :label="$t('caozuo')" prop="userName" align="center" min-width="120">
+                                <template slot-scope="scope">
+                                    <div>
+                                        <span v-if="user.userNameNeedTranslate != 1">
+                                            {{scope.row.userName}}
+                                        </span>
+                                        <span v-if="user.userNameNeedTranslate == 1">
+                                            <ww-open-data type='userName' :openid='scope.row.userName'></ww-open-data>
+                                        </span>
+                                    </div>
+                                </template>
+                            </el-table-column>
                             <el-table-column :label="$t('bei-zhu')" prop="remark" align="left" header-align="left" show-overflow-tooltip min-width="200"></el-table-column>
                             <el-table-column label="" align="center" fixed="right" v-if="permissions.projectAllocate">
                                 <template slot-scope="scope">

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

@@ -105,7 +105,14 @@
                     <div style="margin-top:10px;color:#999;">{{ $t('newspaperauditor') }}</div>
                     <div>
                         <span v-if="project.auditorList.length == 0" style="margin:10px;">-</span>
-                        <el-link v-for="item in project.auditorList" :key="item.id" style="margin:10px;" @click="showUser(item.auditorId)">{{item.auditorName}}</el-link>
+                        <el-link v-for="item in project.auditorList" :key="item.id" style="margin:10px;" @click="showUser(item.auditorId)">
+                            <span v-if="user.userNameNeedTranslate != 1">
+                                {{item.auditorName}}
+                            </span>
+                            <span v-if="user.userNameNeedTranslate == 1">
+                                <ww-open-data type='userName' :openid='item.auditorName'></ww-open-data>
+                            </span>
+                        </el-link>
                     </div>
                    
                     <div v-show="project.isPublic == 0" style="color:#999;">{{ $t('participantin') }}</div>

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

@@ -504,18 +504,21 @@
                 </el-form-item>
                 <el-form-item :label="$t('projectmanager')" :class="title == $t('newproject') && user.companyId == 936 ? 'wpgCssClass' : ''">
                     <!-- <el-select v-model="addForm.inchargerId"  :disabled="(addForm.userId.length==0 && addForm.isPublic == 0) || (!permissions.projectManagement && user.id != addForm.creatorId)" filterable placeholder="请选择项目经理" style="width:32%;" > -->
+
                     <el-select v-if="user.userNameNeedTranslate != 1" v-model="addForm.inchargerId" filterable :placeholder="$t('defaultText.pleaseChoose')" style="width:32%;" >
                         <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="'small'" :subject="participator" :subjectId="addForm.inchargerId" :distinction="'3'"></selectCat>
+                    <selectCat v-if="user.userNameNeedTranslate == 1" :size="'medium'" :subject="participator" :subjectId="addForm.inchargerId" :distinction="'3'" @selectCal="selectCal"></selectCat>
 
                 </el-form-item>
                 <el-form-item :label="$t('newspaperauditor')" v-show="user.timeType.reportAuditType==0">
                     <el-select v-if="user.userNameNeedTranslate != '1'" v-model="addForm.auditUserIds" multiple="true" :disabled=" !(permissions.projectManagement|| user.id == addForm.inchargerId || user.id == addForm.creatorId)" filterable :placeholder="$t('defaultistheprojectleader')" style="width:100%;" >
                         <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'" :tile="true" :widthStr="'800'" :disabled="!(permissions.projectManagement|| user.id == addForm.inchargerId || user.id == addForm.creatorId)" :subjectId="addForm.auditUserIds" :subject="participator" :clearable="false" :distinction="'10'"  :multiSelect="true" @selectCal="selectCal"></selectCat>
+
                 </el-form-item>
                 <!--专业项目协作版本功能 -->
                 <el-form-item :label="$t('ji-bie')" :class="title == $t('newproject') && user.companyId == 936 ? 'wpgCssClass' : ''" v-if="user.company.packageProject==1">

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

@@ -85,7 +85,20 @@
     <el-table height="90%" :loading="demandListLoading" :data="demandList">
       <el-table-column label="项目编号" prop="projectCode" width="160"></el-table-column>
       <el-table-column label="项目名称" prop="projectName" min-width="240"></el-table-column>
-      <el-table-column label="近七日活跃人员" prop="activeUsers" min-width="240"></el-table-column>
+      <el-table-column label="近七日活跃人员" prop="activeUsers" min-width="240">
+        <template slot-scope="scope">
+          <div>
+            <span v-if="user.userNameNeedTranslate == 1">
+              <span v-for="(item, index) in scope.row.activeUsers" :key="index">
+                <ww-open-data type='userName' :openid='item'></ww-open-data>
+              </span>
+            </span>
+            <span v-if="user.userNameNeedTranslate != 1">
+              {{scope.row.activeUsers}}
+            </span>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column label="开始时间 - 结束时间" min-width="240">
         <template slot-scope="scope">
           <span>{{scope.row.startDate ? scope.row.startDate + ' ~ ' + scope.row.endDate : ''}}</span>
@@ -544,6 +557,13 @@ export default {
           if(res.code == 'ok'){
             this.demandListLoading = false
             this.total = res.data.total
+            if(this.user.userNameNeedTranslate == 1) {
+              for(let i in res.data.records) {
+                if(res.data.records[i].activeUsers){
+                  res.data.records[i].activeUsers = res.data.records[i].activeUsers.split(',')
+                }
+              }
+            }
             this.demandList = res.data.records
           }else {
             this.demandListLoading = false

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

@@ -276,19 +276,40 @@
                                     <el-popover placement="top" width="400" trigger="hover">
                                     <div>
                                         <span v-for="(item, index) in scope.row.membdateList" :key="index">
-                                            {{item.userName}}/{{item.createDate}} <span v-if="scope.row.membdateList.length > 1 && scope.row.membdateList.length - 1 != index">,</span>
+                                            <!-- {{item.userName}} -->
+                                            <span v-if="user.userNameNeedTranslate == 1">
+                                                <ww-open-data type='userName' :openid='item.userName'></ww-open-data>
+                                            </span>
+                                            <span v-if="user.userNameNeedTranslate != 1">
+                                                {{item.userName}}
+                                            </span>
+                                            /{{item.createDate}} <span v-if="scope.row.membdateList.length > 1 && scope.row.membdateList.length - 1 != index">,</span>
                                         </span>
                                     </div>
                                     <div slot="reference" style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width: 180px;">
                                         <span v-for="(item, index) in scope.row.membdateList" :key="index">
-                                            {{item.userName}}/{{item.createDate}} <span v-if="scope.row.membdateList.length > 1 && scope.row.membdateList.length - 1 != index">,</span>
+                                            <!-- {{item.userName}} -->
+                                            <span v-if="user.userNameNeedTranslate == 1">
+                                                <ww-open-data type='userName' :openid='item.userName'></ww-open-data>
+                                            </span>
+                                            <span v-if="user.userNameNeedTranslate != 1">
+                                                {{item.userName}}
+                                            </span>
+                                            /{{item.createDate}} <span v-if="scope.row.membdateList.length > 1 && scope.row.membdateList.length - 1 != index">,</span>
                                         </span>
                                     </div>
                                     </el-popover>
                                 </div>
                                 <div style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width: 180px;" v-else>
                                     <span v-for="(item, index) in scope.row.membdateList" :key="index">
-                                        {{item.userName}}/{{item.createDate}} <span v-if="scope.row.membdateList.length > 1 && scope.row.membdateList.length - 1 != index">,</span>
+                                        <!-- {{item.userName}} -->
+                                        <span v-if="user.userNameNeedTranslate == 1">
+                                            <ww-open-data type='userName' :openid='item.userName'></ww-open-data>
+                                        </span>
+                                        <span v-if="user.userNameNeedTranslate != 1">
+                                            {{item.userName}}
+                                        </span>
+                                        /{{item.createDate}} <span v-if="scope.row.membdateList.length > 1 && scope.row.membdateList.length - 1 != index">,</span>
                                     </span>
                                 </div>
                             </div>