加上自定义下拉选中框

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

@@ -0,0 +1,249 @@
+<template>
+  <div tabindex="0" @blur="selectClihide()" style="display: inline-block;">  
+    <div :style="'width:' + selectWidth + 'px;height:' + selectHeight + 'px'" :class="classDiv ? 'select selectDiv' : 'select'" @click="selectCli" ref="selectDiv">
+        <div :class="selectName == $t('defaultText.pleaseChoose') ? 'selecttex selecttexXuan' : 'selecttex'">
+            <ww-open-data type='userName' :openid='selectName'></ww-open-data>
+            {{selectName}}
+        </div>
+        <i class="el-icon-arrow-down iostu"></i>
+    </div>
+    <transition name="el-zoom-in-top">
+      <div v-show="show" style="position: relative;z-index: 99;">
+        <div class="transitionBox">
+            <ul class="transitionBoxUl">
+                <li :class="transitionBoxLiIdx == index ? 'liHover' : ''" v-for="(item, index) in options" :key="index" @mouseover="liMouseOver(index)" @click="liClick(item)"> 
+                    <span v-if="item.name">
+                        <!-- {{item.name || item.auditorName}} -->
+                        <ww-open-data type='userName' :openid='item.name'></ww-open-data>
+                    </span> 
+                    <span v-if="item.auditorName">
+                        <ww-open-data type='userName' :openid='item.auditorName'></ww-open-data>
+                    </span>
+                    <!-- {{item.name || item.auditorName}} -->
+                </li>
+            </ul>
+        </div>
+      </div>
+    </transition>
+  </div>
+</template>
+
+<script>
+export default {
+    props: {
+        subject:{
+            type: Array
+        },
+        size: {
+            type: String
+        },
+        subjectId: {
+            type: String
+        },
+        distinction: {
+            type: String,
+            default: '1',
+        },
+        // 真对填写日报单独处理
+        idx: {
+            type: String
+        },
+        flg: {
+            type: Boolean,
+            default: false, // 默认值，不是填写日报
+        },
+        // 针对查任务的处理
+        index: {
+            type: String
+        }
+    },
+    components: {
+        selectWidth: '150',
+        selectHeight: '28'
+    },
+    data() {
+        return {
+            selectWidth: '150',
+            selectHeight: '28',
+            show: false, // 下拉框
+            options: [], // 列表数据
+            transitionBoxLiIdx: '', // hover 背景色
+            selectName: this.$t('defaultText.pleaseChoose'), // 显示的文字
+            classDiv: false, // 获得焦点样式
+            optionsOId: '', // 选中人的id
+            dailyListObj: null, // 填写日报的数据
+            dailyListIndex: null, // 日报点的索引
+        };
+    },
+    computed: {},
+    watch: {
+        subject: {
+            handler(newValue, oldValue) {
+                this.options = newValue
+                if(this.flg) {
+                    if(newValue) {
+                        this.selectName = newValue[0].name || newValue[0].auditorName
+                        this.optionsOId = newValue[0].id || newValue[0].auditorId
+                    }
+                }
+            },
+        },
+        // 日报点的索引, 真对填写的日报
+        idx: {
+            handler(newValue, oldValue) {
+                console.log(newValue, oldValue)
+                this.dailyListIndex = newValue
+            },
+        }
+    },
+    created() {},
+    mounted() {
+        if(this.size == 'mini') {
+            this.selectWidth = '150'
+            this.selectHeight = '28'
+        } else if(this.size == 'small') {
+            this.selectWidth = '191'
+            this.selectHeight = '32'
+        } 
+        if(this.subject) {
+            this.options = JSON.parse(JSON.stringify(this.subject))
+        }
+        if(this.subjectId) {
+            this.optionsOId = JSON.parse(JSON.stringify(this.subjectId))
+            for(let i in this.options) {
+                if(this.options[i].id == this.optionsOId || this.options[i].auditorId == this.optionsOId) {
+                     this.selectName = this.options[i].name || this.options[i].auditorName
+                }
+            }
+        }
+        console.log(this.options, this.optionsOId)
+        this.dailyListIndex = this.idx
+    },
+    methods: {
+        selectCli() {
+            this.$refs.selectDiv.focus()
+            this.classDiv = !this.classDiv
+            this.show = !this.show
+        },
+        selectClihide() {
+            if(this.classDiv) {
+                this.transitionBoxLiIdx = ''
+                this.show = !this.show
+                this.classDiv = false
+            }
+        },
+        liMouseOver(index) {
+            this.transitionBoxLiIdx = index
+        },
+        liClick(item) {
+            let nameId = item.id || item.auditorId
+            if(this.flg) {
+                let obj = {
+                    id: nameId,
+                    idx: this.dailyListIndex
+                }
+                this.$emit("selectCatCli", obj);
+            } else {
+                let obj = {
+                    id: nameId,
+                    distinction: this.distinction,
+                    index: this.index, // 选中的索引
+                }
+                this.$emit("selectCal", obj)
+            }
+            this.selectName = item.name || item.auditorName
+            this.transitionBoxLiIdx = ''
+            this.show = !this.show
+            this.classDiv = false
+        },
+    },
+    triggerOption(){
+
+    },
+    choose(item,value){
+      
+    },
+
+};
+</script>
+
+<style scoped lang="scss">
+    .selectDiv {
+        border-color: #409EFF !important;
+    }
+    .select {
+        -webkit-appearance: none;
+        background-color: #FFF;
+        background-image: none;
+        border-radius: 4px;
+        border: 1px solid #DCDFE6;
+        -webkit-box-sizing: border-box;
+        box-sizing: border-box;
+        color: #606266;
+        display: inline-block;
+        font-size: inherit;
+        height: 40px;
+        line-height: 40px;
+        outline: 0;
+        padding: 0 15px;
+        -webkit-transition: border-color .2s cubic-bezier(.645,.045,.355,1);
+        transition: border-color .2s cubic-bezier(.645,.045,.355,1);
+        width: 100%;
+        position: relative;
+        cursor: pointer;
+    }
+    .selecttex {
+        height: 28px;
+        line-height: 28px;
+        text-overflow: ellipsis;
+        font-size: 12px;
+    }
+    .iostu {
+        position: absolute;
+        top: 50%;
+        margin-top: -4px;
+        right: 8px;
+        color: #C0C4CC;
+    }
+    .transitionBox {
+        background: #FFF;
+        position: absolute; 
+        width: 100%;
+        border-radius: 2em;
+        border: 1px solid #E4E7ED;
+        border-radius: 4px;
+        background-color: #FFF;
+        box-sizing: border-box;
+        margin: 5px 0;
+        box-shadow: 0 2px 12px #dfdfdf;
+        max-height: 274px;
+        overflow: auto;
+    }
+    .transitionBoxUl {
+        list-style: none;
+        padding: 6px 0;
+        margin: 0;
+        -webkit-box-sizing: border-box;
+        box-sizing: border-box;
+    }
+    .transitionBoxUl li {
+        font-size: 14px;
+        padding: 0 20px;
+        position: relative;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        color: #606266;
+        height: 34px;
+        line-height: 34px;
+        -webkit-box-sizing: border-box;
+        box-sizing: border-box;
+        cursor: pointer;
+    }
+    .liHover {
+        background-color: #F5F7FA;
+    }
+    .selecttexXuan {
+        color: #C0C4CC;;
+    }
+</style>

fhKeeper/formulahousekeeper/timesheet/src/i18n/en.json

@@ -166,8 +166,7 @@
     "nextStep": "Next step",
     "selectAll": "select all",
     "choose": "choose",
-    "previousstep": "Previous step",
-    "nextstep": "Next step"
+    "previousstep": "Previous step"
   },
   "textLink": {
     "fillInTheWork": "Fill out the daily",

fhKeeper/formulahousekeeper/timesheet/src/i18n/zh.json

@@ -166,8 +166,7 @@
     "nextStep": "下一步",
     "selectAll": "全选",
     "choose": "已选中",
-    "previousstep": "上一步",
-    "nextstep": "上一步"
+    "previousstep": "上一步"
   },
   "textLink": {
     "fillInTheWork": "填写日报",

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

@@ -98,10 +98,13 @@
           </el-select>
 
           <!-- 人员筛选 -->
-          <el-select v-if="ins == 6 || ins == 8 || ins == 9 || ins == 10 || ins == 11" v-model="userId" :placeholder="$t('pleaseselectpersonnel')" @change="selcts()" clearable filterable size="small" style="margin-left:10px;width:150px">
+          <el-select v-if="(ins == 6 || ins == 8 || ins == 9 || ins == 10 || ins == 11)  && user.userNameNeedTranslate != '1'" v-model="userId" :placeholder="$t('pleaseselectpersonnel')" @change="selcts()" clearable filterable size="small" style="margin-left:10px;width:150px">
             <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) && user.userNameNeedTranslate == '1'"></selectCat>
+          
+
           <!-- 待审核筛选切换 -->
           <el-radio-group v-model="stateKey" size="small" v-if="ins == 10 && user.timeType.reportWorkflow == 1" style="margin-left:10px;margin-top:-3.33px" @change="stateKeySel">
             <el-radio-button :label="1">{{ $t('projectbereviewed') }}</el-radio-button>
@@ -126,7 +129,12 @@
                 </el-table-column>
                 <el-table-column prop="inchargerName" :label="$t('projectmanager')"  width="130">
                   <template slot-scope="scope" >
-                    {{scope.row.inchargerName}}
+                    <span v-if="user.userNameNeedTranslate == '1'">
+                      <ww-open-data type='userName' :openid='scope.row.inchargerName'></ww-open-data>
+                    </span>
+                    <span v-if="user.userNameNeedTranslate != '1'">
+                      {{scope.row.inchargerName}}
+                    </span>
                   </template>
                 </el-table-column>
                 <el-table-column prop="contractAmount" :label="$t('he-tong-jine-yuan')" align="right">
@@ -171,7 +179,16 @@
                     {{scope.row.name}}
                   </template>
                 </el-table-column>
-                <el-table-column prop="executor_name" :label="$t('zhi-hang-ren')"  width="200"></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>
+                  </template>
+                </el-table-column>
                 <el-table-column prop="plan_hours" :label="$t('plantime')+'(h)'"  width="150">
                   <template slot-scope="scope">
                         {{scope.row.plan_hours == null? 0:scope.row.plan_hours.toFixed(1)}}
@@ -399,9 +416,27 @@
                 <el-table-column prop="projectCode" :label="$t('Itemno')" width="220"></el-table-column>
                 <el-table-column prop="projectName" :label="$t('headerTop.projectName')" width="220"></el-table-column>
                 <el-table-column prop="degreeName" :label="user.timeType.customDegreeName" width="180" v-if="user.timeType.customDegreeActive == 1"></el-table-column>
-                <el-table-column prop="username" :label="$t('lable.name')" width="120"></el-table-column>
+                <el-table-column prop="username" :label="$t('lable.name')" width="120">
+                  <template slot-scope="scope" >
+                    <span v-if="user.userNameNeedTranslate == '1'">
+                      <ww-open-data type='userName' :openid='scope.row.username'></ww-open-data>
+                    </span>
+                    <span v-if="user.userNameNeedTranslate != '1'">
+                      {{scope.row.username}}
+                    </span>
+                  </template>
+                </el-table-column>
                 <el-table-column prop="jobNumber" :label="$t('Worknumber')" width="120"></el-table-column>
-                <el-table-column prop="departmentName" :label="$t('lable.department')" width="140"></el-table-column>
+                <el-table-column prop="departmentName" :label="$t('lable.department')" width="140">
+                  <template slot-scope="scope" >
+                    <span v-if="user.userNameNeedTranslate == '1'">
+                      <ww-open-data type='departmentName' :openid='scope.row.departmentName'></ww-open-data>
+                    </span>
+                    <span v-if="user.userNameNeedTranslate != '1'">
+                      {{scope.row.departmentName}}
+                    </span>
+                  </template>
+                </el-table-column>
                 <el-table-column prop="createDate" :label="$t('screening.workingDate')" width="120"></el-table-column>
                 <el-table-column prop="workingTime" :label="$t('screening.workTime')+ '(h)'" width="100" align="right">
                   <template slot-scope="scope">
@@ -422,7 +457,16 @@
 
               <!-- 人员工时分配表 -->
             <el-table v-if="ins == 8" key="8" border :data="userWorkHoursList" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;">
-              <el-table-column prop="username" :label="$t('ren-yuan')" width="150"></el-table-column>
+              <el-table-column prop="username" :label="$t('ren-yuan')" width="150">
+                <template slot-scope="scope" >
+                    <span v-if="user.userNameNeedTranslate == '1'">
+                      <ww-open-data type='userName' :openid='scope.row.username'></ww-open-data>
+                    </span>
+                    <span v-if="user.userNameNeedTranslate != '1'">
+                      {{scope.row.username}}
+                    </span>
+                  </template>
+              </el-table-column>
               <el-table-column prop="jobNumber" :label="$t('Worknumber')" width="150"></el-table-column>
               <el-table-column prop="unPublic" :label="$t('ordinaryprojecthours')" min-width="160" align="right">
                 <template slot-scope="scope">
@@ -494,9 +538,27 @@
 
             <!-- 员工填报及时率 -->
             <el-table v-if="ins == 9" key="9" border :data="reportTimelyList" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;">
-                <el-table-column prop="userName" :label="$t('ren-yuan')" min-width="200" align="center"></el-table-column>
+                <el-table-column prop="userName" :label="$t('ren-yuan')" min-width="200" align="center">
+                  <template slot-scope="scope" >
+                    <span v-if="user.userNameNeedTranslate == '1'">
+                      <ww-open-data type='userName' :openid='scope.row.username'></ww-open-data>
+                    </span>
+                    <span v-if="user.userNameNeedTranslate != '1'">
+                      {{scope.row.username}}
+                    </span>
+                  </template>
+                </el-table-column>
                 <el-table-column prop="jobNumber" :label="$t('Worknumber')" min-width="200" align="center"></el-table-column>
-                <el-table-column prop="departmentName" :label="$t('subordinatedepartments')" min-width="200" align="center"></el-table-column>
+                <el-table-column prop="departmentName" :label="$t('subordinatedepartments')" min-width="200" align="center">
+                  <template slot-scope="scope" >
+                    <span v-if="user.userNameNeedTranslate == '1'">
+                      <ww-open-data type='departmentName' :openid='scope.row.departmentName'></ww-open-data>
+                    </span>
+                    <span v-if="user.userNameNeedTranslate != '1'">
+                      {{scope.row.departmentName}}
+                    </span>
+                  </template>
+                </el-table-column>
                 <el-table-column prop="timelinessRate" :label="$t('timelyreportingrate')" min-width="200" align="center">
                   <template slot-scope="scope">
                     <el-link v-if="scope.row.dataList != null" style="color:#409eff;" @click="timelyDetail(scope.row.dataList)">{{scope.row.timelinessRate}}</el-link>
@@ -512,16 +574,52 @@
 
             <!-- 日报待审核统计 -->
             <el-table v-if="ins == 10" key="10" border :data="auditRateList" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;">
-                <el-table-column prop="userName" :label="$t('other.reviewer')" min-width="200" align="center"></el-table-column>
-                <el-table-column prop="departmentName" :label="$t('subordinatedepartments')" min-width="200" align="center"></el-table-column>
+                <el-table-column prop="userName" :label="$t('other.reviewer')" min-width="200" align="center">
+                  <template slot-scope="scope" >
+                    <span v-if="user.userNameNeedTranslate == '1'">
+                      <ww-open-data type='userName' :openid='scope.row.userName'></ww-open-data>
+                    </span>
+                    <span v-if="user.userNameNeedTranslate != '1'">
+                      {{scope.row.userName}}
+                    </span>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="departmentName" :label="$t('subordinatedepartments')" min-width="200" align="center">
+                  <template slot-scope="scope" >
+                    <span v-if="user.userNameNeedTranslate == '1'">
+                      <ww-open-data type='departmentName' :openid='scope.row.departmentName'></ww-open-data>
+                    </span>
+                    <span v-if="user.userNameNeedTranslate != '1'">
+                      {{scope.row.departmentName}}
+                    </span>
+                  </template>
+                </el-table-column>
                 <el-table-column prop="num" :label="$t('numberitemstobereviewed')" min-width="200" align="center"></el-table-column>
             </el-table>
 
             <!-- 人员工时统计表 -->
             <el-table v-if="ins == 11" key="11" border :data="personnelList" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;">
-                <el-table-column prop="name" :label="$t('lable.name')" min-width="200" align="center"></el-table-column>
+                <el-table-column prop="name" :label="$t('lable.name')" min-width="200" align="center">
+                  <template slot-scope="scope" >
+                    <span v-if="user.userNameNeedTranslate == '1'">
+                      <ww-open-data type='userName' :openid='scope.row.name'></ww-open-data>
+                    </span>
+                    <span v-if="user.userNameNeedTranslate != '1'">
+                      {{scope.row.name}}
+                    </span>
+                  </template>
+                </el-table-column>
                 <el-table-column prop="jobNumber" :label="$t('Worknumber')" min-width="200" align="center"></el-table-column>
-                <el-table-column prop="departmentName" :label="$t('lable.department')" min-width="200" align="center"></el-table-column>
+                <el-table-column prop="departmentName" :label="$t('lable.department')" min-width="200" align="center">
+                  <template slot-scope="scope" >
+                    <span v-if="user.userNameNeedTranslate == '1'">
+                      <ww-open-data type='departmentName' :openid='scope.row.departmentName'></ww-open-data>
+                    </span>
+                    <span v-if="user.userNameNeedTranslate != '1'">
+                      {{scope.row.departmentName}}
+                    </span>
+                  </template>
+                </el-table-column>
                 <el-table-column prop="planHours" :label="$t('plantime')" min-width="200" align="center">
                   <template slot-scope="scope">
                     <div v-if="scope.row.planHours">
@@ -640,8 +738,26 @@
         </el-dialog>
         <el-dialog :title="curProject.projectName+'-'+$t('detailsofreimbursementexpenses')" show-summary=true v-if="detailVisible" :summary-method="getSummaries" :visible.sync="detailVisible" :close-on-click-modal="false" customClass="customWidth" width="1000px">
         <el-table  :key="ins" border :data="detailList" highlight-current-row v-loading="detailListLoading" :height="500" style="width: 100%;">
-                <el-table-column  prop="username" :label="$t('screening.employeename')"  ></el-table-column>
-                <el-table-column  prop="departmentName" :label="$t('departmentsuod')" ></el-table-column>
+                <el-table-column  prop="username" :label="$t('screening.employeename')"  >
+                  <template slot-scope="scope" >
+                    <span v-if="user.userNameNeedTranslate == '1'">
+                      <ww-open-data type='userName' :openid='scope.row.username'></ww-open-data>
+                    </span>
+                    <span v-if="user.userNameNeedTranslate != '1'">
+                      {{scope.row.username}}
+                    </span>
+                  </template>
+                </el-table-column>
+                <el-table-column  prop="departmentName" :label="$t('departmentsuod')" >
+                  <template slot-scope="scope" >
+                    <span v-if="user.userNameNeedTranslate == '1'">
+                      <ww-open-data type='departmentName' :openid='scope.row.departmentName'></ww-open-data>
+                    </span>
+                    <span v-if="user.userNameNeedTranslate != '1'">
+                      {{scope.row.departmentName}}
+                    </span>
+                  </template>
+                </el-table-column>
                 <el-table-column  prop="happenDate" :label="$t('forthedate')" ></el-table-column>
                 <el-table-column prop="invoiceType" :label="$t('costtype')"    >
                   <template slot-scope="scope">
@@ -686,7 +802,16 @@
         <el-dialog :title="$t('workovertimedetails')" :visible.sync="dialogVisibleDetails" width="800px" v-loading="listLoading" :before-close="handleClose">
           <div>
              <el-table :data="detailsList" style="width: 100%" height="400px">
-                <el-table-column prop="username" :label="$t('lable.name')" width="120"></el-table-column>
+                <el-table-column prop="username" :label="$t('lable.name')" width="120">
+                  <template slot-scope="scope" >
+                    <span v-if="user.userNameNeedTranslate == '1'">
+                      <ww-open-data type='userName' :openid='scope.row.username'></ww-open-data>
+                    </span>
+                    <span v-if="user.userNameNeedTranslate != '1'">
+                      {{scope.row.username}}
+                    </span>
+                  </template>
+                </el-table-column>
                 <el-table-column prop="projectName" :label="$t('headerTop.projectName')" width="200"></el-table-column>
                 <el-table-column prop="projectCode" :label="$t('Itemno')" width="200"></el-table-column>
                 <el-table-column prop="createDate" :label="$t('workovertimedate')" width="120"></el-table-column>
@@ -708,9 +833,15 @@
 </template>
 
 <script>
+
+// 自定义select组件
+import selectCat from "@/components/select.vue"
+
 export default {
   name: "expense",
-  components: {},
+  components: {
+    selectCat
+  },
   props: {},
   data() {
     return {
@@ -1936,6 +2067,13 @@ export default {
               type: "error"
           });
       });
+    },
+    // 自定义点击事件
+    selectCal(obj) {
+      if(obj.distinction == 1) {
+        this.userId = obj.id
+        this.selcts()
+      }
     }
   },
 };
@@ -1955,6 +2093,7 @@ export default {
   display: flex;
   justify-content: space-between;
   align-items: center;
+  z-index: 2;
 }
 .headine h3 {
   margin: 0;

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

@@ -524,9 +524,13 @@
 </template>
 
 <script>
+// 自定义select组件
+import selectCat from "@/components/select.vue"
 export default {
   name: "expense",
-  components: {},
+  components: {
+    selectCat
+  },
   props: {},
   data() {
     return {

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

@@ -44,7 +44,14 @@
         <el-dialog :title="$t('Salaryuploadrecord')" :visible.sync="xzImportVisible" width="1100px" :before-close="handleClose">
             <div>
                 <el-table :data="xzList" style="width: 100%" :height="400">
-                    <el-table-column prop="userName" :label="$t('other.operator')"></el-table-column>
+                    <el-table-column prop="userName" :label="$t('other.operator')">
+                        <template slot-scope="scope">
+                            <div>
+                                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='scope.row.userName'></ww-open-data></span>
+                                <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.userName}}</span>
+                            </div>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="ymonth" :label="$t('BelongsIn')"></el-table-column>
                     <el-table-column prop="fileName" :label="$t('filename')">
                         <template slot-scope="scope">
@@ -91,7 +98,14 @@
                 </el-radio-group>
                 
                 <el-table :data="reviewLis" style="width: 100%" :height="400">
-                    <el-table-column prop="userName" :label="$t('other.operator')"></el-table-column>
+                    <el-table-column prop="userName" :label="$t('other.operator')">
+                        <template slot-scope="scope">
+                            <div>
+                                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='scope.row.userName'></ww-open-data></span>
+                                <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.userName}}</span>
+                            </div>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="ymonth" :label="$t('BelongsIn')"></el-table-column>
                     <el-table-column prop="fileName" :label="$t('filename')">
                         <template slot-scope="scope">
@@ -132,9 +146,13 @@
         <el-dialog :title="$t('Setupauditor')" :visible.sync="reviewerVisible" width="350px" :before-close="handleCloses">
             <el-form :model="reviewerRuleForm" ref="reviewerRuleForm" label-width="100px" class="demo-ruleForm">
                 <el-form-item :label="$t('SelectionofAuditor')" prop="auditorId" :rules="{required: true, message: $t('reviewercannotbeempty'), trigger: 'blur'}">
-                    <el-select v-model="reviewerRuleForm.auditorId" clearable :placeholder="$t('SelectionofAuditor')" >
+
+                    <el-select v-model="reviewerRuleForm.auditorId" clearable :placeholder="$t('SelectionofAuditor')" v-if="user.userNameNeedTranslate != '1'" >
                         <el-option v-for="(item, index) in people" :key="index" :label="item.name" :value="item.id"></el-option>
                     </el-select>
+
+                    <selectCat v-if="user.userNameNeedTranslate == '1'" @selectCal="selectCal" :subject="people" :subjectId="reviewerRuleForm.auditorId" :distinction="'1'" :size="'mini'"></selectCat>
+
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="submitreviewerRuleForm('reviewerRuleForm')">{{ $t('btn.submit') }}</el-button>
@@ -167,7 +185,14 @@
         :height="300" style="width: 100%;">
             <el-table-column type="selection" width="80" fixed="left"></el-table-column>
             <el-table-column prop="jobNumber" v-if="user.timeType.financeJobnumEnabled==1" :label="$t('Worknumber')" sortable width="100" fixed="left"></el-table-column>
-            <el-table-column prop="name" :label="$t('lable.name')" sortable width="150" fixed="left"></el-table-column>
+            <el-table-column prop="name" :label="$t('lable.name')" sortable width="150" fixed="left">
+                <template slot-scope="scope">
+                    <div>
+                        <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='scope.row.name'></ww-open-data></span>
+                        <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.name}}</span>
+                    </div>
+                </template>
+            </el-table-column>
             <template v-if="user.timeType.isSecretSalary==0">
                 <el-table-column :prop="headerCols[index]" :label="item" sortable show-overflow-tooltip v-for="(item, index) in tblCols" :key="index" width="130px" align="right">
                 <template slot-scope="scope">
@@ -246,10 +271,16 @@
 
         <!--用户详细信息弹出框-->
         <el-dialog :title="$t('Checkthedetails')" v-if="userDetailVisible" :visible.sync="userDetailVisible" :close-on-click-modal="false" customClass="customWidth" width="400px">
-            <div class="line"><span>{{ $t('lable.name') }}</span><span>{{userDetail.name}}</span></div>
+            <div class="line"><span>{{ $t('lable.name') }}</span>
+                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='userDetail.name'></ww-open-data></span>
+                <span v-if="user.userNameNeedTranslate != '1'">{{userDetail.name}}</span>
+            </div>
             <div class="line"><span>{{ $t('Worknumber') }}</span><span>{{userDetail.jobNumber}}</span></div>
             <div class="line"><span>{{ $t('lable.phone') }}</span><span>{{userDetail.phone}}</span></div>
-            <div class="line"><span>{{ $t('lable.department') }}</span><span>{{userDetail.departmentName}}</span></div>
+            <div class="line"><span>{{ $t('lable.department') }}</span>
+                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='departmentName' :openid='userDetail.departmentName'></ww-open-data></span>
+                <span v-if="user.userNameNeedTranslate != '1'">{{userDetail.departmentName}}</span>
+            </div>
             <div class="line"><span>{{ $t('costof') }}</span><span>{{userDetail.cost}}{{$t('Yuananhour')}}</span></div>
             <div slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="userDetailVisible = false" >{{ $t('btn.determine') }}</el-button>
@@ -411,7 +442,14 @@
                      ref="settingTable"  @selection-change="handleSelectionChange" 
                     :height="400" style="width: 100%;">
                     <el-table-column type="selection" width="55"></el-table-column>
-                    <el-table-column prop="name" :label="$t('lable.name')" sortable width="90" fixed="left"></el-table-column>
+                    <el-table-column prop="name" :label="$t('lable.name')" sortable width="90" fixed="left">
+                        <template slot-scope="scope">
+                            <div>
+                                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='scope.row.name'></ww-open-data></span>
+                                <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.name}}</span>
+                            </div>
+                        </template>
+                    </el-table-column>
                     
                     <el-table-column :label="item.projectName" v-for="(item) in projectCols" width="180" size="small"
                         :key="item.id" align="center">
@@ -458,10 +496,14 @@
             :close-on-click-modal="false" customClass="customWidth" width="600px" >
             <div style="margin:0px 10px 10px 10px;">
                 <span>{{ $t('Selecttheemployee') }}</span>
-                <el-select v-model="chosenNoReportUserIds" multiple filterable clearable style="width:330px;" collapse-tags>
-                        <el-option v-for="item in noReportUserList" :label="item.name" :key="item.id" :value="item.userId"></el-option>
-                    </el-select>
-                    <el-button @click="averageCost" >{{ $t('Automaticallocation') }}</el-button>
+
+                <el-select v-if="user.userNameNeedTranslate != '1'" v-model="chosenNoReportUserIds" multiple filterable clearable style="width:330px;" collapse-tags>
+                    <el-option v-for="item in noReportUserList" :label="item.name" :key="item.id" :value="item.userId"></el-option>
+                </el-select>
+
+                <selectCat v-if="user.userNameNeedTranslate == '1'" @selectCal="selectCal" :subject="noReportUserList" :subjectId="chosenNoReportUserIds" :distinction="'2'" :size="'mini'"></selectCat>
+
+                <el-button @click="averageCost" >{{ $t('Automaticallocation') }}</el-button>
             </div>
             <el-divider ></el-divider>
             <!--项目列表 -->
@@ -526,7 +568,13 @@
 import { error } from 'dingtalk-jsapi';
     import util from "../../common/js/util";
 
+// 自定义select组件
+    import selectCat from "@/components/select.vue"
+    
     export default {
+        components: {
+            selectCat
+        },
         data() {
             return {
                 groupByCategory:0,
@@ -1632,6 +1680,14 @@ import { error } from 'dingtalk-jsapi';
                 event.preventDefault() // 阻止浏览器默认事件
                 this.domObj.scrollLeft = this.domObj.scrollLeft + step
             },
+            // 自定义组件事件
+            selectCal(obj) {
+                if(obj.distinction == '1') {
+                    this.reviewerRuleForm.auditorId = obj.id
+                } else if(obj.distinction == '2') {
+                    this.chosenNoReportUserIds = obj.id
+                }
+            }
 
         },
         created() {

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

@@ -119,7 +119,14 @@
                         </template>
                     </el-table-column>
                     <!-- <el-table-column prop="projectCategorySub" label="项目分组" sortable width="300" v-if="user.companyId == '428'"></el-table-column> -->
-                    <el-table-column prop="departmentName" :label="$t('subordinatedepartments')" sortable width="300" v-if="user.timeType.projectWithDept"></el-table-column>
+                    <el-table-column prop="departmentName" :label="$t('subordinatedepartments')" sortable width="300" v-if="user.timeType.projectWithDept">
+                        <template slot-scope="scope">
+                            <div>
+                                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='departmentName' :openid='scope.row.departmentName'></ww-open-data></span>
+                                <span v-if="user.userNameNeedTranslate != '1'">{{departmentName}}</span>
+                            </div>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="projectName" :label="$t('headerTop.projectName')" sortable width="260" show-overflow-tooltip>
                         <template slot-scope="scope">
                             <el-link type="primary" :href="'#/projectInside/'+scope.row.projectId">{{scope.row.projectName}}</el-link>
@@ -128,7 +135,8 @@
                     <el-table-column prop="executorName" :label="$t('zhi-hang-ren')" sortable width="130">
                         <template slot-scope="scope">
                             <!-- <el-link type="primary" @click="showUser(scope.row.executorId)">{{scope.row.executorName}}</el-link> -->
-                            <span>{{scope.row.executorName}}</span>
+                            <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='scope.row.departmentName'></ww-open-data></span>
+                            <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.executorName}}</span>
                         </template>
                     </el-table-column>
                     
@@ -163,10 +171,16 @@
         </div>
         <!--用户详细信息弹出框-->
         <el-dialog :title="$t('Checkthedetails')" v-if="userDetailVisible" :visible.sync="userDetailVisible" :close-on-click-modal="false" customClass="customWidth" width="400px">
-            <div class="line"><span>{{ $t('lable.name') }}</span><span>{{userDetail.name}}</span></div>
+            <div class="line"><span>{{ $t('lable.name') }}</span>
+                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='userDetail.name'></ww-open-data></span>
+                <span v-if="user.userNameNeedTranslate != '1'">{{userDetail.name}}</span>
+            </div>
             <div class="line"><span>{{ $t('Worknumber') }}</span><span>{{userDetail.jobNumber}}</span></div>
             <div class="line"><span>{{ $t('lable.phone') }}</span><span>{{userDetail.phone}}</span></div>
-            <div class="line"><span>{{ $t('lable.department') }}</span><span>{{userDetail.departmentName}}</span></div>
+            <div class="line"><span>{{ $t('lable.department') }}</span>
+                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='departmentName' :openid='userDetail.name'></ww-open-data></span>
+                <span v-if="user.userNameNeedTranslate != '1'">{{userDetail.departmentName}}</span>
+            </div>
             <div class="line"><span>{{ $t('costof') }}</span><span>{{userDetail.cost}}{{ $t('Yuananhour') }}</span></div>
             <div slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="userDetailVisible = false" >{{ $t('btn.determine') }}</el-button>
@@ -227,12 +241,16 @@
                     </el-form-item>
                 <div style="border: 1px solid #ddd;margin:5px 0;padding:5px 0;">
                 <el-form-item :label="$t('zhi-hang-ren')+(index+1)" v-for="(executorItem, index) in addForm.executorListFront" :key="index">
-                    <el-select v-model="executorItem.executorId" :disabled="(addForm.id != null && user.id != addForm.createrId && currentProject.inchargerId != user.id) && !permissions.projectManagement" size="small" filterable clearable :placeholder="$t('pleaseselectanexecutor')" style="width:40%;" @change="$forceUpdate()">
+
+                    <el-select v-if="user.userNameNeedTranslate != '1'" v-model="executorItem.executorId" :disabled="(addForm.id != null && user.id != addForm.createrId && currentProject.inchargerId != user.id) && !permissions.projectManagement" size="small" filterable clearable :placeholder="$t('pleaseselectanexecutor')" style="width:40%;" @change="$forceUpdate()">
                         <el-option v-for="item in users" :key="item.id" :label="item.name" :value="item.id">
                             <span style="float: left">{{ item.name }}</span>
                             <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 20px" v-if="item.jobNumber">{{ item.jobNumber }}</span>
                         </el-option>
                     </el-select>
+                    
+                    <selectCat :subject="users" :subjectId="executorItem.executorId" :index="index" @selectCal="selectCal" :size="'mini'" v-if="user.userNameNeedTranslate == '1'"></selectCat>
+
                     <span style="margin-left:30px;margin-right:10px;">{{ $t('plantime') }}</span>
                     <el-input-number size="small" :disabled="(addForm.id != null && user.id != addForm.createrId && currentProject.inchargerId != user.id) && !permissions.projectManagement" v-model="executorItem.planHours" style="width:30%;" :min="1" :max="100"  :placeholder="$t('pleaseentertheplannedworking')" ></el-input-number ><span style="margin-left:10px;">{{ $t('time.hour') }}</span>
                     <!--移除执行人 -->
@@ -379,8 +397,8 @@
                             <p @click="chan">{{ $t('participantin') }}</p>
                             <span  v-for="(pl, i) in critic" :key="i">
                             <div class="bj" style="width: 14%">
-                                <span style="background: #778899">{{pl.length > 2 ? pl.substring(pl.length - 2, pl.length) : pl}}</span>
-                                <!-- <span style="background: #778899">{{pl.length}}</span> -->
+                                <span style="background: #778899" v-if="user.userNameNeedTranslate != '1'">{{pl.length > 2 ? pl.substring(pl.length - 2, pl.length) : pl}}</span>
+                                <span style="background: #778899" v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='pl'></ww-open-data></span>
                             </div>
                             </span>
                         </div>
@@ -399,11 +417,17 @@
                                     <!-- <el-image style="width: 30px; height: 30px" :src="url" :fit="fit"></el-image> -->
                                     <!-- <i :style="'background' + item.userColor"> -->
                                     <i :style="'background' + item.userColor">
-                                        {{item.userName.length > 2 ? item.userName.substring(item.userName.length - 2, item.userName.length) : item.userName}}
+                                        <i v-if="user.userNameNeedTranslate != '1'">
+                                            {{item.userName.length > 2 ? item.userName.substring(item.userName.length - 2, item.userName.length) : item.userName}}
+                                        </i>
+                                        <i v-if="user.userNameNeedTranslate == '1'">
+                                            <ww-open-data type='userName' :openid='item.userName'></ww-open-data>
+                                        </i>
                                     </i>
                                     <div>
                                         <!-- <p>{{item.userName}}</p> -->
-                                        <p>{{item.userName}}</p>
+                                        <p v-if="user.userNameNeedTranslate != '1'">{{item.userName}}</p>
+                                        <p v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.userName'></ww-open-data></p>
                                         <em>{{item.content}}</em>
                                     </div>
                                     <span>{{item.createTime | relativeTime}}</span>
@@ -598,6 +622,10 @@
 <script>
 import { error } from 'dingtalk-jsapi';
     import util from "../../common/js/util";
+
+    // 引入自定义组件
+    import selectCat from "@/components/select.vue"
+
         // 富文本样式
     import 'quill/dist/quill.core.css'
     import 'quill/dist/quill.snow.css'
@@ -616,7 +644,8 @@ import { error } from 'dingtalk-jsapi';
             // ProjectInfo,
             // Summary,
             // Earning,
-            quillEditor // 富文本
+            quillEditor, // 富文本
+            selectCat
         },
         data() {
             return {
@@ -1683,6 +1712,11 @@ import { error } from 'dingtalk-jsapi';
                 }
                 return arr;
             },
+            selectCal(obj) {
+                if(obj.distinction == '1') {
+                    this.addForm.executorListFront[obj.index].executorId = obj.id
+                }
+            }
         },
         created() {
             let height = window.innerHeight;

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

@@ -439,13 +439,16 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item :label="user.companyId==781? $t('other.reviewer') : $t('other.projectAuditor')">
-                        <el-select v-model="domain.projectAuditorId" :disabled="!domain.canEdit" @change="$forceUpdate()">
+
+                        <el-select v-model="domain.projectAuditorId" :disabled="!domain.canEdit" @change="$forceUpdate()" v-if="user.userNameNeedTranslate != '1'">
                             <el-option v-for="item in domain.auditUserList" :label="item.auditorName" :value="item.auditorId" :key="item.id">
-                                <!-- <span style="float: left">{{ item.auditorName }}</span> -->
                                 <span style="float: left" v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.auditorName'></ww-open-data></span>
                                 <span style="float: left" v-if="user.userNameNeedTranslate != '1'">{{item.auditorName}}</span>
                             </el-option>
                         </el-select>
+
+                        <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'small'" :subject="domain.auditUserList" :idx="index" :subjectId="domain.projectAuditorId" ref="selectCat" :flg="true" @selectCatCli="selectCatCli"></selectCat>
+
                     </el-form-item>
                     <!-- 相关维度/自定义维度 -->
                     <el-form-item :label="yonghuUser.customDegreeName" v-if="domain.projectId && yonghuUser.customDegreeActive == 1" :rules="user.timeType.customDegreeStatus == 1 && domain.wuduList != undefined && domain.wuduList.length != 0 ? { required: true, message: $t('defaultText.pleaseChoose') + yonghuUser.customDegreeName, trigger: ['change','blur'] } : null" :prop="'domains.' + index + '.degreeId'">
@@ -556,14 +559,17 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item :label="$t('other.projectAuditor')" >
-                            <el-select v-model="domain.projectAuditorId" :disabled="!domain.canEdit" @change="$forceUpdate()">
+                            <el-select v-model="domain.projectAuditorId" :disabled="!domain.canEdit" @change="$forceUpdate()" v-if="user.userNameNeedTranslate != '1'">
                                 <el-option v-for="item in domain.auditUserList" :label="item.auditorName" :value="item.auditorId" :key="item.id">
-                                    <!-- <span style="float: left">{{ item.auditorName }}</span> -->
                                     <span style="float: left" v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.auditorName'></ww-open-data></span>
                                     <span style="float: left" v-if="user.userNameNeedTranslate != '1'">{{item.auditorName}}</span>
                                 </el-option>
                             </el-select>
+
+                            <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'small'" :subject="domain.auditUserList" :idx="index" :subjectId="domain.projectAuditorId" ref="selectCat" :flg="true" @selectCatCli="selectCatCli"></selectCat>
                         </el-form-item>
+                        
+
                         <!--工程专业版本模式下， 各个专业的进度填报 -->
                         <el-form-item :label="$t('other.professionalProgress')" :prop="'domains.' + index + '.professionProgress'" v-if="user.company.packageEngineering==1">
                             <span v-for="item in domain.professionProgress" :key="item.professionId" style="margin-right:10px;">
@@ -1450,9 +1456,16 @@
     // 左右滑动
     import dragMixin from "@/common/js/tensile.js";
     import util from "../../common/js/util";
+
+    // 自定义select组件
+    import selectCat from "@/components/select.vue"
+    
     let _that = this
     export default {
         mixins: [dragMixin],
+        components: {
+            selectCat
+        },
         data() {
             return {
                 translation: '1', // 1、文字, 2、部门, 3、人员
@@ -1569,6 +1582,7 @@
                         multiWorktime:0,
                         worktimeList:[],
                         degreeId: null,
+                        auditUserList: []
                     }],
                 },
                 workRules: {
@@ -5709,6 +5723,11 @@
                     }
                 })
             },
+            // 触发 selectCat 组件更改他的值
+            selectCatCli(obj) {
+                // obj.id 是 选中人员的id， obj.idx 是 当前的索引
+                this.workForm.domains[obj.idx].projectAuditorId = obj.id
+            },
             //分页
             handleCurrentChange(val) {
                 this.toViewForm.pageIndex = val;

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

@@ -6,15 +6,23 @@
                 <el-form-item :label="$t('lable.department')" style="width: 165px">
                     <el-cascader v-model="search.departmentIdArray" :placeholder="$t('defaultText.pleaseChoose')" style="width: 125px"
                     :options="option" :props="{ checkStrictly: false,expandTrigger: 'hover' }" :show-all-levels="false" clearable
-                    @change="getList(1)" size="mini"
-                    ></el-cascader>
-                    <!-- <el-button @click="test" size="mini">test</el-button> -->
+                    @change="getList(1)" size="mini">
+                        <template slot-scope="{ data }">
+                            <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='departmentName' :openid='data.label'></ww-open-data></span>
+                            <span v-if="user.userNameNeedTranslate != '1'">{{data.label}}</span>
+                        </template>
+                    </el-cascader>
                 </el-form-item>
+
                 <el-form-item :label="$t('ren-yuan')" style="width: 210px">
-                        <el-select v-model="search.userIdArray" :placeholder="$t('defaultText.pleaseChoose')" clearable @visible-change="usersSearch" @remove-tag="usersSearch(false)" @clear="usersSearch(false)" filterable="true" size="mini" style="width: 150px" multiple collapse-tags>
-                            <el-option v-for="item in searchUsersList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-                        </el-select>
-                    </el-form-item>
+                    <el-select v-model="search.userIdArray" :placeholder="$t('defaultText.pleaseChoose')" clearable @visible-change="usersSearch" @remove-tag="usersSearch(false)" @clear="usersSearch(false)" filterable="true" size="mini" style="width: 150px" multiple collapse-tags>
+                        <el-option v-for="item in searchUsersList" :key="item.id" :label="item.name" :value="item.id">
+                            <span style="float: left" v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.name'></ww-open-data></span>
+                            <span style="float: left" v-if="user.userNameNeedTranslate != '1'">{{item.name}}</span>
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+
                 <el-form-item :label="$t('other.project')" style="width: 215px">
                     <el-select v-model="search.projectId" :placeholder="$t('defaultText.pleaseChoose')" clearable @change="getList()" filterable="true" size="mini" style="width: 175px" popper-class="projectSelectPopperClass">
                         <el-option v-for="item in projectList" :key="item.id" :label="item.projectName + item.projectCode" :value="item.id">
@@ -49,6 +57,11 @@
                     <el-form-item style="margin-left:20px;">
                     <el-link type="primary" @click="recordList(),recordDialogVisible = true,pageIndexList = 1,pageSizeList = 20">{{ $t('Auditrecords') }}</el-link>
                     </el-form-item>
+
+                    <!-- 调试 -->
+                    <!-- <el-form-item :label="$t('ren-yuan')" style="width: 215px">
+                        <selectCat :size="'mini'" :subject="searchUsersList"/>
+                    </el-form-item> -->
                 <!-- </div> -->
             </el-form>
         </el-col>
@@ -65,14 +78,28 @@
                                 <span style="margin-left:15px;color:#DAA520;" >[ 
                                                 <span v-if="item.isDeptAudit==0">
                                                     <span v-if="item.projectAuditState==0">
-                                                        {{ $t('other.waitForTheProjectReviewer') }}<span v-if="item.projectAuditorName != null">({{item.projectAuditorName}})</span>{{ $t('other.audit') }}
+                                                        {{ $t('other.waitForTheProjectReviewer') }}<span v-if="item.projectAuditorName != null">(
+                                                            <!-- {{item.projectAuditorName}} -->
+                                                            <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.projectAuditorName'></ww-open-data></span>
+                                                            <span v-if="user.userNameNeedTranslate != '1'">{{item.projectAuditorName}}</span>
+                                                            )</span>{{ $t('other.audit') }}
                                                     </span>
                                                     <span style="color:#32CD32;" v-else-if="item.projectAuditState==1">
-                                                        {{ $t('other.projectAuditor') }}<span v-if="item.projectAuditorName != null">({{item.projectAuditorName}})</span>{{ $t('state.approved') }}
+                                                        {{ $t('other.projectAuditor') }}<span v-if="item.projectAuditorName != null">(
+                                                            <!-- {{item.projectAuditorName}} -->
+                                                            <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.projectAuditorName'></ww-open-data></span>
+                                                            <span v-if="user.userNameNeedTranslate != '1'">{{item.projectAuditorName}}</span>
+                                                        )</span>{{ $t('state.approved') }}
                                                     </span>
                                                 </span>
                                                 <span v-else-if="item.isDeptAudit==1">
-                                                    {{($t('other.await') +item.auditDeptName+('('+item.deptAuditorName+')')+ $t('other.audit'))}}
+                                                    <!-- {{($t('other.await') +item.auditDeptName+('('+item.deptAuditorName+')')+ $t('other.audit'))}} -->
+                                                    ({{$t('other.await')}}
+                                                    <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='departmentName' :openid='item.auditDeptName'></ww-open-data></span>
+                                                    <span v-if="user.userNameNeedTranslate != '1'">{{item.auditDeptName}}</span>
+                                                    (<span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.deptAuditorName'></ww-open-data></span>
+                                                    <span v-if="user.userNameNeedTranslate != '1'">{{item.deptAuditorName}}</span>)
+                                                    {{$t('other.audit')}})
                                                 </span>
                                                  ]
                                 </span>
@@ -131,8 +158,30 @@
                 </template>
             </el-table-column>
             
-            <el-table-column prop="name" :label="$t('lable.name')" sortable></el-table-column>
-            <el-table-column prop="departmentName" :label="$t('lable.department')" sortable></el-table-column>
+            <el-table-column prop="name" :label="$t('lable.name')" sortable>
+                <template slot-scope="scope">
+                    <div>
+                        <span v-if="user.userNameNeedTranslate == '1'">
+                            <ww-open-data type='userName' :openid='scope.row.name'></ww-open-data>
+                        </span>
+                        <span v-else>
+                            {{scope.row.name}}
+                        </span>
+                    </div>
+                </template>
+            </el-table-column>
+            <el-table-column prop="departmentName" :label="$t('lable.department')" sortable>
+                <template slot-scope="scope">
+                    <div>
+                        <span v-if="user.userNameNeedTranslate == '1'">
+                            <ww-open-data type='departmentName' :openid='scope.row.departmentName'></ww-open-data>
+                        </span>
+                        <span v-else>
+                            {{scope.row.departmentName}}
+                        </span>
+                    </div>
+                </template>
+            </el-table-column>
             <el-table-column prop="dateStr" :label="$t('weekDay.date')" sortable>
             </el-table-column>
             <el-table-column prop="reportTime" :label="$t('screening.workTime') + '(h)'" >
@@ -147,7 +196,20 @@
             </el-table-column>
             <el-table-column prop="state" :label="$t('state.states')" sortable>
                 <template slot-scope="scope">
-                    <span v-if="scope.row.state == 0" style="color:#DAA520;">{{scope.row.isDeptAudit==0?$t('other.Tobereviewedbytheprojectreviewer'):($t('other.await')+scope.row.auditDeptName+('('+scope.row.deptAuditorName+')')+$t('other.audit'))}}</span>
+                    <span v-if="scope.row.state == 0" style="color:#DAA520;">
+                        <span v-if="user.userNameNeedTranslate != '1'">
+                            {{scope.row.isDeptAudit==0?$t('other.Tobereviewedbytheprojectreviewer'):($t('other.await')+scope.row.auditDeptName+('('+scope.row.deptAuditorName+')')+$t('other.audit'))}}
+                        </span>
+                        <span v-if="user.userNameNeedTranslate == '1'">
+                            <span v-if="scope.row.isDeptAudit==0">{{$t('other.Tobereviewedbytheprojectreviewer')}}</span>
+                            <span v-else>
+                                {{$t('other.await')}}
+                                <ww-open-data type='departmentName' :openid='scope.row.auditDeptName'></ww-open-data>
+                                (<ww-open-data type='userName' :openid='scope.row.deptAuditorName'></ww-open-data>)
+                                {{$t('other.audit')}}
+                            </span>
+                        </span>
+                    </span>
                     <span v-else-if="scope.row.state == 1" style="color:#32CD32;">{{ $t('state.alreadyPassed') }}</span>
                     <span v-else-if="scope.row.state == 2" style="color:#FF0000;">{{ $t('state.rejected') }}</span>
                 </template>
@@ -197,7 +259,16 @@
         <el-dialog :title="$t('Auditrecords')" :visible.sync="recordDialogVisible" width="1000px" :before-close="handleClose">
             <div style="height: 430px">
                 <el-table :data="recordLists" style="width: 100%" height="400">
-                    <el-table-column prop="userName" :label="$t('other.operator')" width="120"></el-table-column>
+                    <el-table-column prop="userName" :label="$t('other.operator')" width="120">
+                        <template slot-scope="scope">
+                            <div>
+                                <span v-if="user.userNameNeedTranslate == '1'">
+                                    <ww-open-data type='userName' :openid='scope.row.userName'></ww-open-data>
+                                </span>
+                                <span v-else>{{scope.row.userName}}</span>
+                            </div>
+                        </template>
+                    </el-table-column>
                     
                     <el-table-column prop="indate" :label="$t('AuditTime')"></el-table-column>
                     <el-table-column prop="result" :label="$t('Reviewtheresults')" width="120" show-overflow-tooltip></el-table-column>
@@ -269,7 +340,12 @@
                     <el-table-column prop="userName" :label="$t('EmployeeDate')">
                         <template slot-scope="scope">
                             <div>
-                                {{scope.row.userName}}/{{scope.row.createDate}}
+                                <span v-if="user.userNameNeedTranslate == '1'">
+                                    <ww-open-data type='userName' :openid='scope.row.userName'></ww-open-data>
+                                </span>
+                                <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.userName}}</span>
+                                <!-- {{scope.row.userName}} -->
+                                /{{scope.row.createDate}}
                             </div>
                         </template>
                     </el-table-column>
@@ -306,7 +382,13 @@
 <script>
     import util from "../../common/js/util";
 
+    // 引入自定义组件
+    import selectCat from "@/components/select.vue"
+
     export default {
+        components: {
+            selectCat
+        },
         data() {
             return {
                 batchDenyLoading: false,

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

@@ -69,7 +69,14 @@
                 </template>
             </el-table-column>
             
-            <el-table-column prop="name" label="姓名" sortable></el-table-column>
+            <el-table-column prop="name" label="姓名" sortable>
+                <template slot-scope="scope">
+                    <div>
+                        <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='scope.row.name'></ww-open-data></span>
+                        <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.name}}</span>
+                    </div>
+                </template>
+            </el-table-column>
             <el-table-column prop="dateStr" label="日期" sortable>
             </el-table-column>
             <el-table-column prop="reportTime" label="工作时长(h)" >

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

@@ -106,7 +106,18 @@
                 </template>
             </el-table-column> -->
             
-            <el-table-column prop="name" :label="$t('lable.name')" sortable></el-table-column>
+            <el-table-column prop="name" :label="$t('lable.name')" sortable>
+                <template slot-scope="scope">
+                    <div>
+                        <span v-if="user.userNameNeedTranslate == '1'">
+                            <ww-open-data type='userName' :openid='scope.row.name'></ww-open-data>
+                        </span>
+                        <span v-if="user.userNameNeedTranslate != '1'">
+                            {{scope.row.name}}
+                        </span>
+                    </div>
+                </template>
+            </el-table-column>
             <el-table-column prop="date" :label="$t('weekDay.date')" sortable>
             </el-table-column>
             <el-table-column prop="project" :label="$t('other.project')" >
@@ -155,10 +166,17 @@
         </el-col>
 
         <!-- 审核记录弹窗 -->
-        <el-dialog title="$t('Auditrecords')" :visible.sync="recordDialogVisible" width="800px" :before-close="handleClose">
+        <el-dialog :title="$t('Auditrecords')" :visible.sync="recordDialogVisible" width="800px" :before-close="handleClose">
             <div style="height: 430px">
                 <el-table :data="recordLists" style="width: 100%" height="400" v-loading="recordLoading">
-                    <el-table-column prop="userName" :label="$t('other.operator')" width="150"></el-table-column>
+                    <el-table-column prop="userName" :label="$t('other.operator')" width="150">
+                        <template slot-scope="scope">
+                            <div>
+                                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='scope.row.userName'></ww-open-data></span>
+                                <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.userName}}</span>
+                            </div>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="indate" :label="$t('AuditTime')"></el-table-column>
                     <el-table-column prop="result" :label="$t('Reviewtheresults')"></el-table-column>
                     <el-table-column prop="date" :label="$t('EmployeeDate')" width="200">
@@ -168,19 +186,25 @@
                                     <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>
+                                            <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>
+                                            <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>
+                                        <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>

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

@@ -73,7 +73,14 @@
                 </template>
             </el-table-column>
             
-            <el-table-column prop="name" label="姓名" sortable></el-table-column>
+            <el-table-column prop="name" label="姓名" sortable>
+                <template slot-scope="scope">
+                    <div>
+                        <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='scope.row.name'></ww-open-data></span>
+                        <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.name}}</span>
+                    </div>
+                </template>
+            </el-table-column>
             <el-table-column prop="dateStr" label="日期" sortable>
             </el-table-column>
             <el-table-column prop="reportTime" label="工作时长(h)" >