Lijy преди 1 година
родител
ревизия
3564c0b67e
променени са 61 файла, в които са добавени 521 реда и са изтрити 392 реда
  1. 12 12
      fhKeeper/formulahousekeeper/timesheet/src/components/cascader.vue
  2. 8 8
      fhKeeper/formulahousekeeper/timesheet/src/components/cascaderOption.vue
  3. 7 7
      fhKeeper/formulahousekeeper/timesheet/src/components/select.vue
  4. 14 14
      fhKeeper/formulahousekeeper/timesheet/src/components/taskComponent.vue
  5. 3 1
      fhKeeper/formulahousekeeper/timesheet/src/components/translationOpenData.vue
  6. 11 8
      fhKeeper/formulahousekeeper/timesheet/src/components/translationOpenDataText.vue
  7. 1 1
      fhKeeper/formulahousekeeper/timesheet/src/main.js
  8. 3 3
      fhKeeper/formulahousekeeper/timesheet/src/views/Home.vue
  9. 13 13
      fhKeeper/formulahousekeeper/timesheet/src/views/awayOffice/awayOffice.vue
  10. 2 2
      fhKeeper/formulahousekeeper/timesheet/src/views/contract/index.vue
  11. 31 31
      fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue
  12. 3 3
      fhKeeper/formulahousekeeper/timesheet/src/views/expense/expense.vue
  13. 12 12
      fhKeeper/formulahousekeeper/timesheet/src/views/leave/list.vue
  14. 1 1
      fhKeeper/formulahousekeeper/timesheet/src/views/project/CostBaseline.vue
  15. 1 1
      fhKeeper/formulahousekeeper/timesheet/src/views/project/budgetReview.vue
  16. 1 1
      fhKeeper/formulahousekeeper/timesheet/src/views/project/cost.vue
  17. 1 1
      fhKeeper/formulahousekeeper/timesheet/src/views/project/fileCenter.vue
  18. 7 7
      fhKeeper/formulahousekeeper/timesheet/src/views/project/finance.vue
  19. 8 8
      fhKeeper/formulahousekeeper/timesheet/src/views/project/info.vue
  20. 15 15
      fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue
  21. 22 22
      fhKeeper/formulahousekeeper/timesheet/src/views/project/projectInside.vue
  22. 1 1
      fhKeeper/formulahousekeeper/timesheet/src/views/project/project_gantt.vue
  23. 5 5
      fhKeeper/formulahousekeeper/timesheet/src/views/project/vueGantt.vue
  24. 11 11
      fhKeeper/formulahousekeeper/timesheet/src/views/projectApproval/projectApproval.vue
  25. 11 11
      fhKeeper/formulahousekeeper/timesheet/src/views/settings/timetype.vue
  26. 4 4
      fhKeeper/formulahousekeeper/timesheet/src/views/task/list.vue
  27. 10 10
      fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue
  28. 31 31
      fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue
  29. 15 15
      fhKeeper/formulahousekeeper/timesheet/src/views/workReport/list.vue
  30. 1 1
      fhKeeper/formulahousekeeper/timesheet/src/views/workReport/list_department.vue
  31. 5 5
      fhKeeper/formulahousekeeper/timesheet/src/views/workReport/list_import.vue
  32. 1 1
      fhKeeper/formulahousekeeper/timesheet/src/views/workReport/list_profession.vue
  33. 3 3
      fhKeeper/formulahousekeeper/timesheet/src/views/workReport/weeklyCustomization.vue
  34. 3 3
      fhKeeper/formulahousekeeper/timesheet/src/views/workflow/report.vue
  35. 91 0
      fhKeeper/formulahousekeeper/timesheet_h5/src/components/translationOpenDataText.vue
  36. 3 0
      fhKeeper/formulahousekeeper/timesheet_h5/src/main.js
  37. 1 1
      fhKeeper/formulahousekeeper/timesheet_h5/src/views/audit/audit.vue
  38. 2 2
      fhKeeper/formulahousekeeper/timesheet_h5/src/views/count/count.vue
  39. 16 16
      fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue
  40. 6 6
      fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/weekEdit-01.vue
  41. 6 6
      fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/weekEdit-02.vue
  42. 6 6
      fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/weekEdit-03.vue
  43. 6 6
      fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/weekEdit.vue
  44. 5 5
      fhKeeper/formulahousekeeper/timesheet_h5/src/views/exaLeave/applyLeave.vue
  45. 3 3
      fhKeeper/formulahousekeeper/timesheet_h5/src/views/exaLeave/awayOffice.vue
  46. 2 2
      fhKeeper/formulahousekeeper/timesheet_h5/src/views/exaLeave/exaLeave.vue
  47. 6 6
      fhKeeper/formulahousekeeper/timesheet_h5/src/views/expense/details.vue
  48. 16 16
      fhKeeper/formulahousekeeper/timesheet_h5/src/views/expense/index.vue
  49. 19 1
      fhKeeper/formulahousekeeper/timesheet_h5/src/views/index/index.vue
  50. 12 0
      fhKeeper/formulahousekeeper/timesheet_h5/src/views/login/index.vue
  51. 1 1
      fhKeeper/formulahousekeeper/timesheet_h5/src/views/msg/index.vue
  52. 1 1
      fhKeeper/formulahousekeeper/timesheet_h5/src/views/my/children/center.vue
  53. 6 6
      fhKeeper/formulahousekeeper/timesheet_h5/src/views/project/edit.vue
  54. 5 5
      fhKeeper/formulahousekeeper/timesheet_h5/src/views/project/index.vue
  55. 4 4
      fhKeeper/formulahousekeeper/timesheet_h5/src/views/project/projectInside.vue
  56. 1 1
      fhKeeper/formulahousekeeper/timesheet_h5/src/views/review/department_list.vue
  57. 7 7
      fhKeeper/formulahousekeeper/timesheet_h5/src/views/review/index.vue
  58. 1 1
      fhKeeper/formulahousekeeper/timesheet_h5/src/views/review/profession_list.vue
  59. 2 2
      fhKeeper/formulahousekeeper/timesheet_h5/src/views/task/editask.vue
  60. 14 14
      fhKeeper/formulahousekeeper/timesheet_h5/src/views/view/index.vue
  61. 2 2
      fhKeeper/formulahousekeeper/timesheet_h5/vue.config.js

+ 12 - 12
fhKeeper/formulahousekeeper/timesheet/src/components/cascader.vue

@@ -3,18 +3,18 @@
     <div :class="disabled ? 'disabledTrue' : 'disabledFalse'" @mouseenter="moveIonDiv" @mouseleave="outIonDiv">
         <div :style="`width:${selectWidth}px;height:${selectHeight}px`" :class="classDiv ? 'select selectDiv' : 'select'" @click.stop="selectCli" :ref="disabled ? '' : 'selectDiv'">
             <div :style="'line-height: '+selectHeight+'px;font-size: '+selectFontSize+'px;'" :class="(selectName == $t('defaultText.pleaseChoose') || selectName == $t('qing-xuan-ze-bu-men') || selectName == $t('other.allDepartments')) ? 'selecttex selecttexXuan' : 'selecttex'">
-                <!-- <ww-open-data type='departmentName' :openid='selectName'></ww-open-data> -->
+                <!-- <TranslationOpenDataText type='departmentName' :openid='selectName'></TranslationOpenDataText> -->
                 <!-- {{selectName}} -->
                  <span v-if="userName">
                     <span v-if="selectNameType == 'dep'">
-                        <ww-open-data type='departmentName' :openid='selectName'></ww-open-data>
+                        <TranslationOpenDataText type='departmentName' :openid='selectName'></TranslationOpenDataText>
                     </span>
                     <span v-if="selectNameType == 'user'">
-                        <ww-open-data type='userName' :openid='selectName'></ww-open-data>
+                        <TranslationOpenDataText type='userName' :openid='selectName'></TranslationOpenDataText>
                     </span>
                 </span>
                 <span v-if="!userName">
-                    <ww-open-data type='departmentName' :openid='selectName'></ww-open-data>
+                    <TranslationOpenDataText type='departmentName' :openid='selectName'></TranslationOpenDataText>
                 </span>
             </div>
             <i :class="move ? 'el-icon-arrow-down iostu iostuHover' : 'el-icon-arrow-down iostu'" v-if="!moveIon"></i>
@@ -30,16 +30,16 @@
                         <!-- {{item.label}} -->
                         <span v-if="userName">
                             <span v-if="item.type == 'dep'">
-                                <ww-open-data type='departmentName' :openid='item.label'></ww-open-data>
+                                <TranslationOpenDataText type='departmentName' :openid='item.label'></TranslationOpenDataText>
                             </span>
                             <span v-if="item.type == 'user'">
-                                <ww-open-data type='userName' :openid='item.label'></ww-open-data>
+                                <TranslationOpenDataText type='userName' :openid='item.label'></TranslationOpenDataText>
                             </span>
                         </span>
                         <span v-if="!userName">
-                            <ww-open-data type='departmentName' :openid='item.label'></ww-open-data>
+                            <TranslationOpenDataText type='departmentName' :openid='item.label'></TranslationOpenDataText>
                         </span>
-                        <!-- <ww-open-data type='departmentName' :openid='item.label'></ww-open-data> -->
+                        <!-- <TranslationOpenDataText type='departmentName' :openid='item.label'></TranslationOpenDataText> -->
                     </span>
                     <span v-if="radios && !fistRadio" style="margin-left: -15px">
                         <el-radio v-model="optionsOId" :label="item.value">
@@ -47,16 +47,16 @@
                                 <!-- {{item.label}}  -->
                                 <span v-if="userName">
                                     <span v-if="item.type == 'dep'">
-                                        <ww-open-data type='departmentName' :openid='item.label'></ww-open-data>
+                                        <TranslationOpenDataText type='departmentName' :openid='item.label'></TranslationOpenDataText>
                                     </span>
                                     <span v-if="item.type == 'user'">
-                                        <ww-open-data type='userName' :openid='item.label'></ww-open-data>
+                                        <TranslationOpenDataText type='userName' :openid='item.label'></TranslationOpenDataText>
                                     </span>
                                 </span>
                                 <span v-if="!userName">
-                                    <ww-open-data type='departmentName' :openid='item.label'></ww-open-data>
+                                    <TranslationOpenDataText type='departmentName' :openid='item.label'></TranslationOpenDataText>
                                 </span>
-                                <!-- <ww-open-data type='departmentName' :openid='item.label'></ww-open-data> -->
+                                <!-- <TranslationOpenDataText type='departmentName' :openid='item.label'></TranslationOpenDataText> -->
                             </span>
                         </el-radio>
                     </span>

+ 8 - 8
fhKeeper/formulahousekeeper/timesheet/src/components/cascaderOption.vue

@@ -7,16 +7,16 @@
                     <!-- {{item.label}} -->
                     <span v-if="userName">
                         <span v-if="item.type == 'dep'">
-                            <ww-open-data type='departmentName' :openid='item.label'></ww-open-data>
+                            <TranslationOpenDataText type='departmentName' :openid='item.label'></TranslationOpenDataText>
                         </span>
                         <span v-if="item.type == 'user'">
-                            <ww-open-data type='userName' :openid='item.label'></ww-open-data>
+                            <TranslationOpenDataText type='userName' :openid='item.label'></TranslationOpenDataText>
                         </span>
                     </span>
                     <span v-if="!userName">
-                        <ww-open-data type='departmentName' :openid='item.label'></ww-open-data>
+                        <TranslationOpenDataText type='departmentName' :openid='item.label'></TranslationOpenDataText>
                     </span>
-                    <!-- <ww-open-data type='departmentName' :openid='item.label'></ww-open-data> -->
+                    <!-- <TranslationOpenDataText type='departmentName' :openid='item.label'></TranslationOpenDataText> -->
                 </span>
                 <span v-if="radios" style="margin-left: -15px">
                     <el-radio v-model="departmentId" :label="item.value">
@@ -24,16 +24,16 @@
                             <!-- {{item.label}}  -->
                             <span v-if="userName">
                                 <span v-if="item.type == 'dep'">
-                                    <ww-open-data type='departmentName' :openid='item.label'></ww-open-data>
+                                    <TranslationOpenDataText type='departmentName' :openid='item.label'></TranslationOpenDataText>
                                 </span>
                                 <span v-if="item.type == 'user'">
-                                    <ww-open-data type='userName' :openid='item.label'></ww-open-data>
+                                    <TranslationOpenDataText type='userName' :openid='item.label'></TranslationOpenDataText>
                                 </span>
                             </span>
                             <span v-if="!userName">
-                                <ww-open-data type='departmentName' :openid='item.label'></ww-open-data>
+                                <TranslationOpenDataText type='departmentName' :openid='item.label'></TranslationOpenDataText>
                             </span>
-                            <!-- <ww-open-data type='departmentName' :openid='item.label'></ww-open-data> -->
+                            <!-- <TranslationOpenDataText type='departmentName' :openid='item.label'></TranslationOpenDataText> -->
                         </span>
                     </el-radio>
                 </span>

+ 7 - 7
fhKeeper/formulahousekeeper/timesheet/src/components/select.vue

@@ -5,14 +5,14 @@
     <div :class="disabled ? 'disabledTrue' : 'disabledFalse'" @mouseenter="moveIonDiv" @mouseleave="outIonDiv">
         <div :style="`width:${selectWidth}px;height:${selectHeight}px`" :class="classDiv ? 'select selectDiv' : 'select'" @click="selectCli" :ref="disabled ? '' : 'selectDiv'">
             <div v-if="!multiSelect" :style="'line-height: '+selectHeight+'px;font-size: '+selectFontSize+'px;'" :class="selectName == $t('defaultText.pleaseChoose') ? 'selecttex selecttexXuan' : 'selecttex'">
-                <ww-open-data type='userName' :openid='selectName'></ww-open-data>
+                <TranslationOpenDataText type='userName' :openid='selectName'></TranslationOpenDataText>
                 <!-- {{selectName}} -->
             </div>
             <div v-if="multiSelect" :style="'line-height: '+selectHeight+'px;margin-left: -10px'" :class="selectName == $t('defaultText.pleaseChoose') ? 'selecttex selecttexXuan' : 'selecttex'">
                 <span v-if="multiSelectList.length > 0">
                     <span v-if="!tile" style="width: 100%">
                         <span class="all">
-                            <ww-open-data type='userName' :openid='multiSelectList[0].name'></ww-open-data>
+                            <TranslationOpenDataText type='userName' :openid='multiSelectList[0].name'></TranslationOpenDataText>
                             <!-- {{multiSelectList[0].name}} -->
                             <i class="el-icon-error" v-if="!disabled" @click.stop="deleteMultiSelectList('-1')"></i>
                         </span>
@@ -20,7 +20,7 @@
                     </span>
                     <span v-if="tile" style="width: 100%">
                         <span class="all" style="margin-right: 6px" v-for="(items, indexs) in multiSelectList" :key="indexs">
-                            <ww-open-data type='userName' :openid='items.name'></ww-open-data>
+                            <TranslationOpenDataText type='userName' :openid='items.name'></TranslationOpenDataText>
                             <!-- {{items.name}} -->
                             <span v-if="items.jobNumber" class="spanFllat">{{items.jobNumber}}</span>
                             <i class="el-icon-error" @click.stop="deleteMultiSelectList(indexs)" v-if="!disabled"></i>
@@ -44,10 +44,10 @@
                 <li :class="transitionBoxLiIdx == index ? 'liHover' : ''" v-for="(item, index) in options" :key="index" @mouseover="liMouseOver(index)" @click="liClick(item, index)"> 
                     <span v-if="!multiSelect" style="width: 100%">
                         <span v-if="item.name">
-                            <ww-open-data type='userName' :openid='item.name'></ww-open-data>
+                            <TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText>
                         </span> 
                         <span v-if="item.auditorName">
-                            <ww-open-data type='userName' :openid='item.auditorName'></ww-open-data>
+                            <TranslationOpenDataText type='userName' :openid='item.auditorName'></TranslationOpenDataText>
                         </span>
                         <!-- {{item.name || item.auditorName}} -->
                         <span v-if="item.jobNumber" class="spanFllat">{{item.jobNumber}}</span>
@@ -56,7 +56,7 @@
                     <span v-if="multiSelect" style="width: 100%">
                         <span :class="item.flg ? 'hoverSpan hoverSpanHover' : 'hoverSpan'">
                             <span style="width: 100%;display: inline-block;">
-                                <ww-open-data type='userName' :openid='item.name'></ww-open-data>
+                                <TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText>
                                 <!-- {{item.name}} -->
                                 <span v-if="item.jobNumber" class="spanFllat">{{item.jobNumber}}</span>
                             </span>
@@ -72,7 +72,7 @@
   <div v-if="wxCope" class="waihez">
     <!-- <div @click="dianjis()">点击</div> -->
     <div :style="`width:${selectWidth}px;height:${selectHeight}px;line-height:${selectHeight}px;background:#fff`" class="select selectDandu" @click="dianjis()">
-        <span v-if="!multiSelect"><ww-open-data type='userName' :openid='selectName'></ww-open-data></span>
+        <span v-if="!multiSelect"><TranslationOpenDataText type='userName' :openid='selectName'></TranslationOpenDataText></span>
         <!-- <span>你好</span> -->
     </div>
   </div>

+ 14 - 14
fhKeeper/formulahousekeeper/timesheet/src/components/taskComponent.vue

@@ -155,7 +155,7 @@
                                             {{item.name}}
                                         </span>
                                         <span v-if="user.userNameNeedTranslate == '1'">
-                                            <ww-open-data type='userName' :openid='item.name'></ww-open-data>
+                                            <TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText>
                                         </span>
                                     </span>
                                 </el-checkbox>
@@ -192,7 +192,7 @@
                                     {{recentProgressInfo.creatorName}}
                                 </span>
                                 <span v-if="user.userNameNeedTranslate == '1'">
-                                    <ww-open-data type='userName' :openid='recentProgressInfo.creatorName'></ww-open-data>
+                                    <TranslationOpenDataText type='userName' :openid='recentProgressInfo.creatorName'></TranslationOpenDataText>
                                 </span>
                             </span>
                             {{ $t('geng-xin-yu') }}{{recentProgressInfo.indate | relativeTime}}
@@ -299,7 +299,7 @@
                                     </span>
                                     <span v-else>
                                         <span v-for="item,index in scope.row.executorName" :key="index">
-                                            <ww-open-data type='userName' :openid='item'></ww-open-data>
+                                            <TranslationOpenDataText type='userName' :openid='item'></TranslationOpenDataText>
                                             <span v-if="index < scope.row.executorName.length - 1">,</span>
                                         </span>
                                     </span>
@@ -347,7 +347,7 @@
                         <div>
                             <span v-if="user.userNameNeedTranslate != 1">{{scope.row.creatorName}}</span>
                             <span v-if="user.userNameNeedTranslate == 1">
-                                <ww-open-data type='userName' :openid='scope.row.creatorName'></ww-open-data>
+                                <TranslationOpenDataText type='userName' :openid='scope.row.creatorName'></TranslationOpenDataText>
                             </span>
                         </div>
                     </template>
@@ -419,7 +419,7 @@
                         <span  v-for="(pl, i) in critic" :key="i">
                         <span style="background: #778899" v-if="user.userNameNeedTranslate != 1">{{pl.length > 2 ? pl.substring(pl.length - 2, pl.length) : pl}}</span>
                         <span v-if="user.userNameNeedTranslate == 1">
-                            <ww-open-data type='userName' :openid='pl'></ww-open-data>
+                            <TranslationOpenDataText type='userName' :openid='pl'></TranslationOpenDataText>
                         </span>
                         </span>
                         <!-- <span style="background: #778899">{{pl.length}}</span> -->
@@ -446,7 +446,7 @@
                                     {{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>
+                                    <TranslationOpenDataText type='userName' :openid='item.userName'></TranslationOpenDataText>
                                 </i>
                             </i>
                             <div>
@@ -456,14 +456,14 @@
                                         {{item.userName}}
                                     </p>
                                     <p v-if="user.userNameNeedTranslate == 1">
-                                        <ww-open-data type='userName' :openid='item.userName'></ww-open-data>
+                                        <TranslationOpenDataText type='userName' :openid='item.userName'></TranslationOpenDataText>
                                     </p>
                                 <!-- </p> -->
                                 <em>
                                     <p style="display: inline-block;padding: 0;margin: 0;" v-if="user.userNameNeedTranslate == 1">
                                         <template v-for="listItem in item.newContent">
                                             <template v-if="listItem.type == 'user'">
-                                                <ww-open-data type='userName' :openid='listItem.value'></ww-open-data>
+                                                <TranslationOpenDataText type='userName' :openid='listItem.value'></TranslationOpenDataText>
                                             </template>
                                             <template v-if="listItem.type == 'text'">{{ listItem.value }}</template>
                                         </template>
@@ -474,7 +474,7 @@
                                     <span class="commentSpan" v-if="user.timeType.restartTaskNeedReason == 1 && item.taskPersonLiableList.length > 0">责任人: 
                                         <span v-for="responsibility, responsibilityIndex in item.taskPersonLiableList" :key="responsibilityIndex">
                                             <span v-if="user.userNameNeedTranslate == 1">
-                                                <ww-open-data type='userName' :openid='responsibility.userName'></ww-open-data>
+                                                <TranslationOpenDataText type='userName' :openid='responsibility.userName'></TranslationOpenDataText>
                                             </span>
                                             <span v-if="user.userNameNeedTranslate != 1">{{responsibility.userName}}</span>
                                             <span v-if="responsibilityIndex < item.taskPersonLiableList.length - 1">,</span>
@@ -492,7 +492,7 @@
                             <p>
                                 {{ $t('tian-bao-ren') }}: <span v-if="user.userNameNeedTranslate != 1">{{item2.userName}}</span>
                                 <span v-if="user.userNameNeedTranslate == 1">
-                                    <ww-open-data type='userName' :openid='item2.userName'></ww-open-data>
+                                    <TranslationOpenDataText type='userName' :openid='item2.userName'></TranslationOpenDataText>
                                 </span>
                                 <span style="float: right;">{{item2.createDate}}</span>
                             </p>
@@ -504,7 +504,7 @@
                                                 <!-- 待项目审核人 --> {{$t('other.waitForTheProjectReviewer')}}
                                                 <span v-if="item2.projectAuditorName != null">(
                                                     <span v-if="user.userNameNeedTranslate == '1'">
-                                                        <ww-open-data type='userName' :openid='item2.projectAuditorName'></ww-open-data>
+                                                        <TranslationOpenDataText type='userName' :openid='item2.projectAuditorName'></TranslationOpenDataText>
                                                     </span>
                                                     <span v-if="user.userNameNeedTranslate != '1'">{{item2.projectAuditorName}}</span>
                                                     )</span> 
@@ -515,7 +515,7 @@
                                                 <span v-if="item2.projectAuditorName != null">(
                                                     <!-- {{item2.projectAuditorName}} -->
                                                     <span v-if="user.userNameNeedTranslate == '1'">
-                                                        <ww-open-data type='userName' :openid='item2.projectAuditorName'></ww-open-data>
+                                                        <TranslationOpenDataText type='userName' :openid='item2.projectAuditorName'></TranslationOpenDataText>
                                                     </span>
                                                     <span v-if="user.userNameNeedTranslate != '1'">{{item2.projectAuditorName}}</span>
                                                     )</span>
@@ -525,7 +525,7 @@
                                         <span v-else-if="item2.isDeptAudit==1">
                                             ({{$t('other.await')}}
                                             <span v-if="user.userNameNeedTranslate == '1'">
-                                                <ww-open-data type='departmentName' :openid='item2.auditDeptName'></ww-open-data>
+                                                <TranslationOpenDataText type='departmentName' :openid='item2.auditDeptName'></TranslationOpenDataText>
                                             </span>
                                             <span v-if="user.userNameNeedTranslate != '1'">{{item2.auditDeptName}}</span>
                                             {{$t('other.audit')}})
@@ -549,7 +549,7 @@
                                                 {{item2.projectAuditorName}}
                                             </span>
                                             <span v-if="user.userNameNeedTranslate == 1">
-                                                <ww-open-data type='userName' :openid='item2.projectAuditorName'></ww-open-data>
+                                                <TranslationOpenDataText type='userName' :openid='item2.projectAuditorName'></TranslationOpenDataText>
                                             </span>
                                         )
                                     </span>{{$t('other.audit')}}</span>

+ 3 - 1
fhKeeper/formulahousekeeper/timesheet/src/components/translationOpenData.vue

@@ -114,7 +114,9 @@ export default {
             }
         },
         viewConfiguration() {
-            window.DTOpenData.update(document.querySelectorAll('dt-open-data'));
+            setTimeout(() => {
+                window.DTOpenData.update(document.querySelectorAll('dt-open-data'));
+            }, 100);
         }
     },
 }

+ 11 - 8
fhKeeper/formulahousekeeper/timesheet/src/components/translationOpenDataText.vue

@@ -1,17 +1,18 @@
 <template>
     <div class="translation">
         <!-- 文本 -->
-            <span v-if="corporateWeChat">
-                <ww-open-data :type='type' :openid='openIdValue'></ww-open-data>
-            </span>
-            <span v-else-if="dingdingPlatform">
-                <dt-open-data :open-type='type' :open-id='openIdValue'></dt-open-data>
-            </span>
-            <span v-else>{{ openIdValue }}</span>
+        <span v-if="corporateWeChat">
+            <ww-open-data :type='type' :openid='openIdValue'></ww-open-data>
+        </span>
+        <span v-else-if="dingdingPlatform">
+            <dt-open-data :open-type='type' :open-id='openIdValue'></dt-open-data>
+        </span>
+        <span v-else>{{ openIdValue }}</span>
     </div>
 </template>
 
 <script>
+
 export default {
     name: '',
     components: {},
@@ -74,7 +75,9 @@ export default {
             }
         },
         viewConfiguration() {
-            window.DTOpenData.update(document.querySelectorAll('dt-open-data'));
+            setTimeout(() => {
+                window.DTOpenData.update(document.querySelectorAll('dt-open-data'));
+            }, 100);
         }
     },
 }

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/main.js

@@ -76,8 +76,8 @@ Vue.use(Print)
 
 // 全局转译组件
 import TranslationOpenData from '@/components/translationOpenData.vue'
+import TranslationOpenDataText from '@/components/translationOpenDataText.vue'
 Vue.component('TranslationOpenData', TranslationOpenData)
-import TranslationOpenDataText from '@/components/TranslationOpenDataText.vue'
 Vue.component('TranslationOpenDataText', TranslationOpenDataText)
 
 var addRouFlag = false; 

+ 3 - 3
fhKeeper/formulahousekeeper/timesheet/src/views/Home.vue

@@ -81,7 +81,7 @@
                                             </span>
                                             <span v-if="user.userNameNeedTranslate == 1">
                                                 {{scope.row.omg.textOne}}
-                                                <ww-open-data v-if="user.corpwxUserid != null" type='userName' :openid='scope.row.omg.textTwo'></ww-open-data>
+                                                <TranslationOpenDataText v-if="user.corpwxUserid != null" type='userName' :openid='scope.row.omg.textTwo'></TranslationOpenDataText>
                                                 <dt-open-data v-if="user.dingdingUserid != null" open-type='userName' :open-id='scope.row.omg.textTwo'></dt-open-data>
                                                 {{scope.row.omg.textThree}}
                                             </span>
@@ -104,7 +104,7 @@
                     <span class="el-dropdown-link userinfo-inner">
                         <img src="../assets/image/userHead.png" />
                         <!-- <span v-if="user.userNameNeedTranslate == 1">
-                            <ww-open-data type='userName' :openid='sysUserName'></ww-open-data>
+                            <TranslationOpenDataText type='userName' :openid='sysUserName'></TranslationOpenDataText>
                         </span>
                         <span v-if="user.dingdingUserid">
                             <dt-open-data open-type='userName' :open-id='user.dingdingUserid'></dt-open-data>
@@ -796,7 +796,7 @@
                                                 console.log(window, 'window')
                                                 //  wx.agentConfig成功回调后,WWOpenData 才会注入到 window 对象上面
                                                 if(window.WWOpenData) {
-                                                    window.WWOpenData.bind(document.querySelector('ww-open-data'))
+                                                    window.WWOpenData.bind(document.querySelector('TranslationOpenDataText'))
                                                     if (WWOpenData.initCanvas) {
                                                         WWOpenData.initCanvas()
                                                         console.log('我企业微信 canvas 应该执行了吧')

+ 13 - 13
fhKeeper/formulahousekeeper/timesheet/src/views/awayOffice/awayOffice.vue

@@ -146,8 +146,8 @@
                             <span v-if="index>0"><i class="el-icon-right"></i></span>
                             <span><i class="el-icon-s-custom"></i></span>
                             <span v-if="user.userNameNeedTranslate == 1">
-                            <span v-if="item.auditorType == 1"><ww-open-data type='departmentName' :openid='item.auditDeptName' ></ww-open-data>(主要负责人)</span>
-                            <ww-open-data type='userName' :openid='item.userName' v-if="item.auditorType == 2"></ww-open-data>
+                            <span v-if="item.auditorType == 1"><TranslationOpenDataText type='departmentName' :openid='item.auditDeptName' ></TranslationOpenDataText>(主要负责人)</span>
+                            <TranslationOpenDataText type='userName' :openid='item.userName' v-if="item.auditorType == 2"></TranslationOpenDataText>
                             </span>
                             <span v-if="user.userNameNeedTranslate == 0">
                             {{item.auditorType == 1?(item.auditDeptName+'(主要负责人)'):item.userName}}
@@ -219,7 +219,7 @@
                         <template slot-scope="scope">
                             <span :style="scope.row.dayCount >= 10 ? 'color:#e62412' : ''">
                                 <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>
+                                <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName' :openid='scope.row.ownerName'></TranslationOpenDataText></span>
                             </span>
                         </template>
                     </el-table-column>
@@ -271,7 +271,7 @@
                             <div v-if="scope.row.status == 1" style="color: orange"><span>{{ $t('state.WaitingAudit') }}-</span>
                                 <span v-if="user.userNameNeedTranslate != 1">{{scope.row.auditorName}}</span>
                                 <span v-if="user.userNameNeedTranslate == 1">
-                                <ww-open-data type='userName' :openid='scope.row.auditorName'></ww-open-data>
+                                <TranslationOpenDataText type='userName' :openid='scope.row.auditorName'></TranslationOpenDataText>
                                 </span>
                             </div>
                             <span v-if="scope.row.status == 2" style="color: red">{{ $t('btn.rejected') }}</span>
@@ -358,7 +358,7 @@
                         <template slot-scope="scope">
                             <div v-if="scope.row.ownerName">
                                 <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>
+                                <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName' :openid='scope.row.ownerName'></TranslationOpenDataText></span>
                             </div>
                             <div v-else>
                             <span>{{ $t('nostatisticsonbusinesstripsatpresent') }}</span>
@@ -368,7 +368,7 @@
                     <el-table-column prop="departmentName" :label="$t('lable.department')" width="300">
                         <template slot-scope="scope">
                             <span v-if="user.userNameNeedTranslate != 1">{{scope.row.departmentName}}</span>
-                                <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"><TranslationOpenDataText type='departmentName' :openid='scope.row.departmentName'></TranslationOpenDataText></span>
                         </template>
                     </el-table-column>
                     <el-table-column prop="dayCount" :label="$t('cumulativebusinesstripdays')" width="300">
@@ -397,7 +397,7 @@
                                 <span class="custom-tree-node" slot-scope="{ node, data }">
                                     <!-- <span>{{ node.label }}</span> -->
                                     <span v-if="user.userNameNeedTranslate == '1'">
-                                        <ww-open-data type='departmentName' :openid='node.label'></ww-open-data>
+                                        <TranslationOpenDataText type='departmentName' :openid='node.label'></TranslationOpenDataText>
                                     </span>
                                     <span v-else>
                                         {{ node.label }}
@@ -414,7 +414,7 @@
                             <div style="padding:5px;color:#333;" v-if="depData != null">{{ $t('setup') }} &lt;<span style="color:#20a0ff;">
                                 <!-- {{depData.label}} -->
                                 <span v-if="user.userNameNeedTranslate != 1">{{depData.label}}</span>
-                                <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='departmentName' :openid='depData.label'></ww-open-data></span>
+                                <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='departmentName' :openid='depData.label'></TranslationOpenDataText></span>
                                 &gt;</span> {{ $t('approvalprocessforbusiness') }}
                                 <el-tooltip effect="dark" v-if="depData != null && depData.children!=null" :content="$t('onlyapplicabletotheimmediatestaffofthecurrentdepartment')" placement="top-start">
                                     <i class="el-icon-question"></i>
@@ -431,10 +431,10 @@
                                     
                                     <!-- <el-button type="primary" v-if="item.auditorType == 2" @click="editNodeDialog(index, item)">{{item.userName}}</el-button> -->
                                     <el-button type="primary" v-if="item.auditorType == 1 && user.userNameNeedTranslate == 1" @click="editNodeDialog(index, item)">
-                                        <ww-open-data type='departmentName' :openid='item.auditDeptName'></ww-open-data>
+                                        <TranslationOpenDataText type='departmentName' :openid='item.auditDeptName'></TranslationOpenDataText>
                                     </el-button>
                                     <el-button type="primary" v-if="item.auditorType == 2 && user.userNameNeedTranslate == 1" @click="editNodeDialog(index, item)">
-                                        <ww-open-data type='userName' :openid='item.userName'></ww-open-data>
+                                        <TranslationOpenDataText type='userName' :openid='item.userName'></TranslationOpenDataText>
                                     </el-button>
                                     <el-button type="primary" v-if="item.auditorType == 0" >{{ $t('projectLeader') }}</el-button>
                                     <el-button type="primary" v-if="item.auditorType == 1 && user.userNameNeedTranslate != 1" @click="editNodeDialog(index, item)">
@@ -477,7 +477,7 @@
         <!-- <el-form ref="editItemForm" :model="editItemForm" label-width="80px" :rules="editItemFormRules"> -->
         <el-form ref="editItemForm" :model="editItemForm" label-width="80px" :rules="editItemRules">
             <el-form-item :label="$t('businesspersonnel')" prop="ownerName"  style="width: 300px;display: inline-block;">
-                <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='editItemForm.ownerName'></ww-open-data></span>
+                <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName' :openid='editItemForm.ownerName'></TranslationOpenDataText></span>
                 <span v-else>{{editItemForm.ownerName}}</span>
             </el-form-item>
             <el-form-item :label="$t('onewayroundtrip')" prop="goBack" style="width: 300px;display: inline-block;">
@@ -583,7 +583,7 @@
             <el-table-column prop="ownerName" :label="$t('businesspersonnel')" width="100" fixed="left">
                 <template slot-scope="scope">
                     <div>
-                        <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='scope.row.ownerName'></ww-open-data></span>
+                        <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName' :openid='scope.row.ownerName'></TranslationOpenDataText></span>
                         <span v-if="user.userNameNeedTranslate != 1">{{scope.row.ownerName}}</span>
                     </div>
                 </template>
@@ -733,7 +733,7 @@
         <div style="padding:20px 40px 20px 0">
             <el-timeline :reverse="false">
                 <el-timeline-item v-for="item in auditLogList" :key="item.id" :timestamp="item.indate">
-                  <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='item.auditorName'></ww-open-data> </span>
+                  <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName' :openid='item.auditorName'></TranslationOpenDataText> </span>
                   <span v-if="user.userNameNeedTranslate == 0">{{item.auditorName}}</span>
                   <span> {{item.isPass==0?"驳回了请假申请。":"审核通过。"}}</span>
                   <span v-if="item.isPass == 0">原因:{{item.denyReason}}</span>

+ 2 - 2
fhKeeper/formulahousekeeper/timesheet/src/views/contract/index.vue

@@ -267,7 +267,7 @@
           </el-form-item>
           <el-form-item :label="$t('dismissreason')" v-if="contractForm.status == 2">
             <span v-if="userNameNeedTranslate == 1">
-              <span><ww-open-data type='userName' :openid='contractForm.msg.name'></ww-open-data></span>
+              <span><TranslationOpenDataText type='userName' :openid='contractForm.msg.name'></TranslationOpenDataText></span>
               <span>{{contractForm.msg.text}}</span>
             </span>
             <span v-else>
@@ -275,7 +275,7 @@
             </span>
           </el-form-item>
           <el-form-item :label="$t('founder')">
-            <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='contractForm.creatorName'></ww-open-data></span>
+            <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName' :openid='contractForm.creatorName'></TranslationOpenDataText></span>
             <span v-else>{{contractForm.creatorName}}</span>
           </el-form-item>
           <el-form-item :label="$t('creationtime')">

+ 31 - 31
fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -219,7 +219,7 @@
                 <el-table-column prop="inchargerName" :label="$t('projectmanager')"  width="130">
                   <template slot-scope="scope" >
                     <span v-if="user.userNameNeedTranslate == '1'">
-                      <ww-open-data type='userName' :openid='scope.row.inchargerName'></ww-open-data>
+                      <TranslationOpenDataText type='userName' :openid='scope.row.inchargerName'></TranslationOpenDataText>
                     </span>
                     <span v-if="user.userNameNeedTranslate != '1'">
                       {{scope.row.inchargerName}}
@@ -287,7 +287,7 @@
                   <template slot-scope="scope" >
                     <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>
+                        <TranslationOpenDataText type='userName' :openid='items'></TranslationOpenDataText>
                       </span>
                       <span v-if="user.userNameNeedTranslate != '1'">
                         {{items}}
@@ -563,7 +563,7 @@
                 <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>
+                      <TranslationOpenDataText type='userName' :openid='scope.row.username'></TranslationOpenDataText>
                     </span>
                     <span v-if="user.userNameNeedTranslate != '1'">
                       {{scope.row.username}}
@@ -574,7 +574,7 @@
                 <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>
+                        <TranslationOpenDataText type='departmentName' :openid='scope.row.departmentName'></TranslationOpenDataText>
                       </span>
                       <span v-if="user.userNameNeedTranslate != '1'">
                         {{scope.row.departmentName}}
@@ -604,7 +604,7 @@
               <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>
+                      <TranslationOpenDataText type='userName' :openid='scope.row.username'></TranslationOpenDataText>
                     </span>
                     <span v-if="user.userNameNeedTranslate != '1'">
                       {{scope.row.username}}
@@ -615,10 +615,10 @@
                 <template slot-scope="scope" >
                     <span v-if="user.userNameNeedTranslate == '1'">
                       <span v-for="item, index in scope.row.deptName" :key="index">
-                        <ww-open-data type='departmentName' :openid='item'></ww-open-data>
+                        <TranslationOpenDataText type='departmentName' :openid='item'></TranslationOpenDataText>
                         <span v-if="index < scope.row.deptName.length - 1">/</span>
                       </span>
-                        <!-- <ww-open-data type='departmentName' :openid='scope.row.deptName'></ww-open-data> -->
+                        <!-- <TranslationOpenDataText type='departmentName' :openid='scope.row.deptName'></TranslationOpenDataText> -->
                     </span>
                     <span v-if="user.userNameNeedTranslate != '1'">
                       {{scope.row.deptName}}
@@ -706,7 +706,7 @@
                 <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>
+                      <TranslationOpenDataText type='userName' :openid='scope.row.userName'></TranslationOpenDataText>
                     </span>
                     <span v-if="user.userNameNeedTranslate != '1'">
                       {{scope.row.userName}}
@@ -717,7 +717,7 @@
                 <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>
+                      <TranslationOpenDataText type='departmentName' :openid='scope.row.departmentName'></TranslationOpenDataText>
                     </span>
                     <span v-if="user.userNameNeedTranslate != '1'">
                       {{scope.row.departmentName}}
@@ -754,7 +754,7 @@
                 <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>
+                      <TranslationOpenDataText type='userName' :openid='scope.row.userName'></TranslationOpenDataText>
                     </span>
                     <span v-if="user.userNameNeedTranslate != '1'">
                       {{scope.row.userName}}
@@ -765,7 +765,7 @@
                   <template slot-scope="scope" >
                     <span v-if="user.userNameNeedTranslate == '1'">
                       <span v-for="(item,index) in scope.row.departmentName" :key="index">
-                        <ww-open-data type='departmentName' :openid='item'></ww-open-data>
+                        <TranslationOpenDataText type='departmentName' :openid='item'></TranslationOpenDataText>
                         <span v-if="index < scope.row.departmentName.length - 1">/</span>
                       </span>
                     </span>
@@ -782,7 +782,7 @@
                 <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>
+                      <TranslationOpenDataText type='userName' :openid='scope.row.name'></TranslationOpenDataText>
                     </span>
                     <span v-if="user.userNameNeedTranslate != '1'">
                       {{scope.row.name}}
@@ -793,7 +793,7 @@
                 <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>
+                      <TranslationOpenDataText type='departmentName' :openid='scope.row.departmentName'></TranslationOpenDataText>
                     </span>
                     <span v-if="user.userNameNeedTranslate != '1'">
                       {{scope.row.departmentName}}
@@ -839,7 +839,7 @@
                   <template slot-scope="scope">
                     <div>
                       <span v-if="user.userNameNeedTranslate == '1'">
-                        <ww-open-data type='userName' :openid='scope.row.name'></ww-open-data>
+                        <TranslationOpenDataText type='userName' :openid='scope.row.name'></TranslationOpenDataText>
                       </span>
                       <span v-if="user.userNameNeedTranslate != '1'">
                         {{scope.row.name}}
@@ -896,7 +896,7 @@
                     <div>
                       <span v-if="user.userNameNeedTranslate == '1'">
                         <span v-for="item, index in scope.row.deptName" :key='index'>
-                          <ww-open-data type='departmentName' :openid='item'></ww-open-data>
+                          <TranslationOpenDataText type='departmentName' :openid='item'></TranslationOpenDataText>
                           <span v-if="index < scope.row.deptName.length - 1">/</span>
                         </span>
                       </span>
@@ -950,7 +950,7 @@
                     <div>
                       <span v-for="item, index in scope.row.personLiableNames" :key="index">
                         <span v-if="user.userNameNeedTranslate == '1'">
-                          <ww-open-data type='userName' :openid='item'></ww-open-data>
+                          <TranslationOpenDataText type='userName' :openid='item'></TranslationOpenDataText>
                         </span>
                         <span v-if="user.userNameNeedTranslate != '1'">{{item}}</span>
                         <span v-if="index < scope.row.personLiableNames.length - 1">,</span>
@@ -970,7 +970,7 @@
                   <template slot-scope="scope">
                     <div>
                       <span v-if="user.userNameNeedTranslate == '1'">
-                        <ww-open-data type='userName' :openid='scope.row.userName'></ww-open-data>
+                        <TranslationOpenDataText type='userName' :openid='scope.row.userName'></TranslationOpenDataText>
                       </span>
                       <span v-if="user.userNameNeedTranslate != '1'">
                         {{scope.row.userName}}
@@ -989,7 +989,7 @@
                   <template slot-scope="scope">
                     <div>
                       <span v-if="user.userNameNeedTranslate == '1'">
-                        <ww-open-data type='departmentName' :openid='scope.row.department_name'></ww-open-data>
+                        <TranslationOpenDataText type='departmentName' :openid='scope.row.department_name'></TranslationOpenDataText>
                       </span>
                       <span v-if="user.userNameNeedTranslate != '1'">
                         {{scope.row.department_name}}
@@ -1013,7 +1013,7 @@
                 <template slot-scope="scope">
                   <div>
                     <span v-if="user.userNameNeedTranslate == '1'">
-                      <ww-open-data type='userName' :openid='scope.row.userName'></ww-open-data>
+                      <TranslationOpenDataText type='userName' :openid='scope.row.userName'></TranslationOpenDataText>
                     </span>
                     <span v-if="user.userNameNeedTranslate != '1'">
                       {{scope.row.userName}}
@@ -1056,7 +1056,7 @@
                 <template slot-scope="scope">
                   <div>
                     <span v-if="user.userNameNeedTranslate == '1'">
-                      <ww-open-data type='userName' :openid='scope.row.userName'></ww-open-data>
+                      <TranslationOpenDataText type='userName' :openid='scope.row.userName'></TranslationOpenDataText>
                     </span>
                     <span v-if="user.userNameNeedTranslate != '1'">
                       {{scope.row.userName}}
@@ -1068,7 +1068,7 @@
                 <template slot-scope="scope">
                   <div>
                     <span v-if="user.userNameNeedTranslate == '1'">
-                      <ww-open-data type='departmentName' :openid='scope.row.deptName'></ww-open-data>
+                      <TranslationOpenDataText type='departmentName' :openid='scope.row.deptName'></TranslationOpenDataText>
                     </span>
                     <span v-if="user.userNameNeedTranslate != '1'">
                       {{scope.row.deptName}}
@@ -1108,7 +1108,7 @@
                 <template slot-scope="scope">
                   <div>
                     <span v-if="user.userNameNeedTranslate == '1'">
-                      <ww-open-data type='departmentName' :openid='scope.row.departmentName'></ww-open-data>
+                      <TranslationOpenDataText type='departmentName' :openid='scope.row.departmentName'></TranslationOpenDataText>
                     </span>
                     <span v-if="user.userNameNeedTranslate != '1'">
                       {{scope.row.deptName}}
@@ -1121,7 +1121,7 @@
                 <template slot-scope="scope">
                   <div>
                     <span v-if="user.userNameNeedTranslate == '1'">
-                      <ww-open-data type='userName' :openid='scope.row.userName'></ww-open-data>
+                      <TranslationOpenDataText type='userName' :openid='scope.row.userName'></TranslationOpenDataText>
                     </span>
                     <span v-if="user.userNameNeedTranslate != '1'">
                       {{scope.row.userName}}
@@ -1142,7 +1142,7 @@
                 <template slot-scope="scope">
                   <div>
                     <span v-if="user.userNameNeedTranslate == '1'">
-                      <ww-open-data type='departmentName' :openid='scope.row.corpwxDeptId'></ww-open-data>
+                      <TranslationOpenDataText type='departmentName' :openid='scope.row.corpwxDeptId'></TranslationOpenDataText>
                     </span>
                     <span v-if="user.userNameNeedTranslate != '1'">
                       {{scope.row.departmentName}}
@@ -1179,7 +1179,7 @@
                   <div class="participatingEmployee">
                     <div v-for="(item,index) in scope.row.teamLeader" :key="index">
                       <span v-if="user.userNameNeedTranslate == '1'">
-                        <ww-open-data type='userName' :openid='item.name'></ww-open-data> 
+                        <TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText> 
                       </span>
                       <span v-if="user.userNameNeedTranslate != '1'">
                         {{item.name}}
@@ -1194,7 +1194,7 @@
                   <div class="participatingEmployee">
                     <div v-for="(item,index) in scope.row.userProgress" :key="index">
                       <span v-if="user.userNameNeedTranslate == '1'">
-                        <ww-open-data type='userName' :openid='item.userName'></ww-open-data> 
+                        <TranslationOpenDataText type='userName' :openid='item.userName'></TranslationOpenDataText> 
                         {{item.progress}}
                       </span>
                       <span v-if="user.userNameNeedTranslate != '1'">
@@ -1214,7 +1214,7 @@
                 <template slot-scope="scope">
                   <div>
                     <span v-if="user.userNameNeedTranslate == '1'">
-                      <ww-open-data type='departmentName' :openid='scope.row.departmentName'></ww-open-data>
+                      <TranslationOpenDataText type='departmentName' :openid='scope.row.departmentName'></TranslationOpenDataText>
                     </span>
                     <span v-if="user.userNameNeedTranslate != '1'">
                       {{scope.row.departmentName}}
@@ -1227,7 +1227,7 @@
                 <template slot-scope="scope">
                   <div>
                     <span v-if="user.userNameNeedTranslate == '1'">
-                      <ww-open-data type='userName' :openid='scope.row.userName'></ww-open-data>
+                      <TranslationOpenDataText type='userName' :openid='scope.row.userName'></TranslationOpenDataText>
                     </span>
                     <span v-if="user.userNameNeedTranslate != '1'">
                       {{scope.row.userName}}
@@ -1341,7 +1341,7 @@
                 <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>
+                      <TranslationOpenDataText type='userName' :openid='scope.row.username'></TranslationOpenDataText>
                     </span>
                     <span v-if="user.userNameNeedTranslate != '1'">
                       {{scope.row.username}}
@@ -1351,7 +1351,7 @@
                 <el-table-column  prop="departmentName" :label="$t('departmentsuod')" v-if="this.user.timeType.easyExpense==0">
                   <template slot-scope="scope" >
                     <span v-if="user.userNameNeedTranslate == '1'">
-                      <ww-open-data type='departmentName' :openid='scope.row.departmentName'></ww-open-data>
+                      <TranslationOpenDataText type='departmentName' :openid='scope.row.departmentName'></TranslationOpenDataText>
                     </span>
                     <span v-if="user.userNameNeedTranslate != '1'">
                       {{scope.row.departmentName}}
@@ -1418,7 +1418,7 @@
                 <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>
+                      <TranslationOpenDataText type='userName' :openid='scope.row.username'></TranslationOpenDataText>
                     </span>
                     <span v-if="user.userNameNeedTranslate != '1'">
                       {{scope.row.username}}

+ 3 - 3
fhKeeper/formulahousekeeper/timesheet/src/views/expense/expense.vue

@@ -372,7 +372,7 @@
                     {{ scope.row.ownerName }}
                   </span>
                   <span v-if="user.userNameNeedTranslate == 1">
-                    <ww-open-data type='userName' :openid='scope.row.ownerName'></ww-open-data>
+                    <TranslationOpenDataText type='userName' :openid='scope.row.ownerName'></TranslationOpenDataText>
                   </span>
                 </div>
               </template>
@@ -540,7 +540,7 @@
           <el-table-column v-if="auditTypeItem.auditType == 1" width="172" label="审核人">
             <template slot-scope="scope">
               <span v-if="user.userNameNeedTranslate == 1">
-                <ww-open-data type='userName' :openid='scope.row.projectManagerName'></ww-open-data>
+                <TranslationOpenDataText type='userName' :openid='scope.row.projectManagerName'></TranslationOpenDataText>
               </span>
               <span v-else>{{ scope.row.projectManagerName }}</span>
             </template>
@@ -826,7 +826,7 @@
             <span class="detail-item-title"> <span class="printBox">报销人</span> </span>
             <span class="detail-item-content">
               <span v-if="user.userNameNeedTranslate == 1">
-                <ww-open-data type='userName' :openid='ParticularsList.ownerName'></ww-open-data>
+                <TranslationOpenDataText type='userName' :openid='ParticularsList.ownerName'></TranslationOpenDataText>
               </span>
               <span v-else>{{ ParticularsList.ownerName }}</span>
             </span>

+ 12 - 12
fhKeeper/formulahousekeeper/timesheet/src/views/leave/list.vue

@@ -169,8 +169,8 @@
                     <span v-if="index>0"><i class="el-icon-right"></i></span>
                     <span><i class="el-icon-s-custom"></i></span>
                     <span v-if="user.userNameNeedTranslate == 1">
-                      <span v-if="item.auditorType == 1"><ww-open-data type='departmentName' :openid='item.auditDeptName' ></ww-open-data>(主要负责人)</span>
-                      <ww-open-data type='userName' :openid='item.userName' v-if="item.auditorType == 2"></ww-open-data>
+                      <span v-if="item.auditorType == 1"><TranslationOpenDataText type='departmentName' :openid='item.auditDeptName' ></TranslationOpenDataText>(主要负责人)</span>
+                      <TranslationOpenDataText type='userName' :openid='item.userName' v-if="item.auditorType == 2"></TranslationOpenDataText>
                     </span>
                     <span v-if="user.userNameNeedTranslate == 0">
                       {{item.auditorType == 1?(item.auditDeptName+'(主要负责人)'):item.userName}}
@@ -239,7 +239,7 @@
                     <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>
+                        <TranslationOpenDataText type='userName' :openid='scope.row.ownerName'></TranslationOpenDataText>
                       </span>
                     </div>
                   </template>
@@ -274,7 +274,7 @@
                       <div v-if="scope.row.status == 1" style="color: orange"><span>{{ $t('state.WaitingAudit') }}-</span>
                         <span v-if="user.userNameNeedTranslate != 1">{{scope.row.auditorName}}</span>
                         <span v-if="user.userNameNeedTranslate == 1">
-                          <ww-open-data type='userName' :openid='scope.row.auditorName'></ww-open-data>
+                          <TranslationOpenDataText type='userName' :openid='scope.row.auditorName'></TranslationOpenDataText>
                         </span>
                       </div>
                       <div v-if="scope.row.status == 2" style="color: red">{{ $t('btn.rejected') }}<el-link style="margin-left:5px;" @click="showDenyReason(scope.row.id)">查看原因</el-link></div>
@@ -371,7 +371,7 @@
                 <template slot-scope="scope">
                     <div v-if="scope.row.ownerName">
                       <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>
+                      <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName' :openid='scope.row.ownerName'></TranslationOpenDataText></span>
                     </div>
                     <div v-else>
                       <span>{{ $t('Nstatisticpresent') }}</span>
@@ -405,7 +405,7 @@
                   <span class="custom-tree-node" slot-scope="{ node, data }">
                       <!-- <span>{{ node.label }}</span> -->
                       <span v-if="user.userNameNeedTranslate == '1'">
-                        <ww-open-data type='departmentName' :openid='node.label'></ww-open-data>
+                        <TranslationOpenDataText type='departmentName' :openid='node.label'></TranslationOpenDataText>
                       </span>
                       <span v-else>
                         {{ node.label }}
@@ -422,7 +422,7 @@
                 <div style="padding:5px;color:#333;" v-if="depData != null">{{ $t('setup') }} &lt;<span style="color:#20a0ff;">
                   <!-- {{depData.label}} -->
                     <span v-if="user.userNameNeedTranslate != 1">{{depData.label}}</span>
-                    <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='departmentName' :openid='depData.label'></ww-open-data></span>
+                    <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='departmentName' :openid='depData.label'></TranslationOpenDataText></span>
                   &gt;</span> {{ $t('approvalprocessforleaveofdirect staff') }}
                     <el-tooltip effect="dark" v-if="depData != null && depData.children!=null" content="仅适用于当前部门的直属人员,子部门人员的审批流程需要单独设置" placement="top-start">
                     <i class="el-icon-question"></i>
@@ -438,11 +438,11 @@
 
                         <el-button type="primary" v-if="item.auditorType == 1 && user.userNameNeedTranslate == 1" @click="editNodeDialog(index, item)">
                           <!-- {{item.auditDeptName}} -->
-                          <ww-open-data type='departmentName' :openid='item.auditDeptName'></ww-open-data>
+                          <TranslationOpenDataText type='departmentName' :openid='item.auditDeptName'></TranslationOpenDataText>
                         </el-button>
                         <el-button type="primary" v-if="item.auditorType == 2 && user.userNameNeedTranslate == 1" @click="editNodeDialog(index, item)">
                           <!-- {{item.userName}} -->
-                            <ww-open-data type='userName' :openid='item.userName'></ww-open-data>
+                            <TranslationOpenDataText type='userName' :openid='item.userName'></TranslationOpenDataText>
                         </el-button>
 
                         <el-button type="primary" v-if="item.auditorType == 1 && user.userNameNeedTranslate != 1" @click="editNodeDialog(index, item)">
@@ -531,7 +531,7 @@
                       {{scope.row.userName}}
                     </span>
                     <span v-if="user.userNameNeedTranslate == 1">
-                      <ww-open-data type='userName' :openid='scope.row.userName'></ww-open-data>
+                      <TranslationOpenDataText type='userName' :openid='scope.row.userName'></TranslationOpenDataText>
                     </span>
                   </div>
                 </template>
@@ -542,7 +542,7 @@
                     {{scope.row.department}}
                   </span>
                   <span v-if="user.userNameNeedTranslate == 1">
-                    <ww-open-data type='departmentName' :openid='scope.row.department'></ww-open-data>
+                    <TranslationOpenDataText type='departmentName' :openid='scope.row.department'></TranslationOpenDataText>
                   </span>
                 </template>
               </el-table-column>
@@ -729,7 +729,7 @@
         <div style="padding:20px 40px 20px 0">
             <el-timeline :reverse="false">
                 <el-timeline-item v-for="item in auditLogList" :key="item.id" :timestamp="item.indate">
-                  <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='item.auditorName'></ww-open-data> </span>
+                  <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName' :openid='item.auditorName'></TranslationOpenDataText> </span>
                   <span v-if="user.userNameNeedTranslate == 0">{{item.auditorName}}</span>
                   <span> {{item.isPass==0?"驳回了请假申请。":"审核通过。"}}</span>
                   <span v-if="item.isPass == 0">原因:{{item.denyReason}}</span>

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/project/CostBaseline.vue

@@ -57,7 +57,7 @@
                                             {{scope.row.userName}}
                                         </span>
                                         <span v-if="user.userNameNeedTranslate == 1">
-                                            <ww-open-data type='userName' :openid='scope.row.userName'></ww-open-data>
+                                            <TranslationOpenDataText type='userName' :openid='scope.row.userName'></TranslationOpenDataText>
                                         </span>
                                     </div>
                                 </template>

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/project/budgetReview.vue

@@ -77,7 +77,7 @@
                 <template slot-scope="scope">
                     <div>
                         <span v-if="user.userNameNeedTranslate == '1'">
-                            <ww-open-data type='userName' :openid='scope.row.creator'></ww-open-data>
+                            <TranslationOpenDataText type='userName' :openid='scope.row.creator'></TranslationOpenDataText>
                         </span>
                         <span v-else>
                             {{ scope.row.creator }}

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/project/cost.vue

@@ -1205,7 +1205,7 @@
                                             + _this.$t('yuan')+"<br/>" : '') + 
                                             ((_this.permissions.countHours) ? _this.$t('screening.workTime')+" : " + params[0].data.cost + _this.$t('time.hour') : '');
                                         } else {
-                                            var res = "<ww-open-data type='departmentName' :openid='"+ _this.allListData.costList[params[0].dataIndex].additionName +"'></ww-open-data>" + "<br/>" + 
+                                            var res = "<TranslationOpenDataText type='departmentName' :openid='"+ _this.allListData.costList[params[0].dataIndex].additionName +"'></TranslationOpenDataText>" + "<br/>" + 
                                             ((_this.permissions.countCost) ? _this.$t('workcost')+" : " + params[0].data.money 
                                             + _this.$t('yuan')+"<br/>" : '') + 
                                             ((_this.permissions.countHours) ? _this.$t('screening.workTime')+" : " + params[0].data.cost + _this.$t('time.hour') : '');

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/project/fileCenter.vue

@@ -61,7 +61,7 @@
                     <template slot-scope="scope">
                         <div>
                             <span v-if="user.userNameNeedTranslate != 1">{{scope.row.creatorName}}</span>
-                            <span v-else><ww-open-data type='userName' :openid='scope.row.creatorName'></ww-open-data></span>
+                            <span v-else><TranslationOpenDataText type='userName' :openid='scope.row.creatorName'></TranslationOpenDataText></span>
                         </div>
                     </template>
                 </el-table-column>

+ 7 - 7
fhKeeper/formulahousekeeper/timesheet/src/views/project/finance.vue

@@ -48,7 +48,7 @@
                     <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'"><TranslationOpenDataText type='userName' :openid='scope.row.userName'></TranslationOpenDataText></span>
                                 <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.userName}}</span>
                             </div>
                         </template>
@@ -102,7 +102,7 @@
                     <el-table-column prop="userName" :label="$t('other.operator')" width="100">
                         <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'"><TranslationOpenDataText type='userName' :openid='scope.row.userName'></TranslationOpenDataText></span>
                                 <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.userName}}</span>
                             </div>
                         </template>
@@ -189,7 +189,7 @@
             <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'"><TranslationOpenDataText type='userName' :openid='scope.row.name'></TranslationOpenDataText></span>
                         <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.name}}</span>
                         <!-- {{scope.row.name}} -->
                     </div>
@@ -271,13 +271,13 @@
         <!--用户详细信息弹出框-->
         <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 v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='userDetail.name'></ww-open-data></span>
+                <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='userDetail.name'></TranslationOpenDataText></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 v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='departmentName' :openid='userDetail.departmentName'></ww-open-data></span>
+                <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='departmentName' :openid='userDetail.departmentName'></TranslationOpenDataText></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>
@@ -318,7 +318,7 @@
             <el-table-column prop="jobNumber" label="工号" sortable ></el-table-column>
             <el-table-column prop="name" label="姓名" >
                 <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'"><TranslationOpenDataText type='userName' :openid='scope.row.name'></TranslationOpenDataText></span>
                     <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.name}}</span>
                 </template>
             </el-table-column>
@@ -461,7 +461,7 @@
                     <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'"><TranslationOpenDataText type='userName' :openid='scope.row.name'></TranslationOpenDataText></span>
                                 <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.name}}</span>
                             </div>
                         </template>

+ 8 - 8
fhKeeper/formulahousekeeper/timesheet/src/views/project/info.vue

@@ -17,7 +17,7 @@
                         <el-col :span="5" ><span class="gray_label">{{ $t('subordinatedepartments') }}:</span></el-col><el-col :span="7" ></el-col>
                         <el-col :span="18" >
                             <span v-if="user.userNameNeedTranslate != 1">{{project.departmentName}}</span>
-                            <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='departmentName' :openid='project.departmentName'></ww-open-data></span>
+                            <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='departmentName' :openid='project.departmentName'></TranslationOpenDataText></span>
                         </el-col>
                     </el-row>
                     <el-row :gutter="10">
@@ -120,7 +120,7 @@
                     <div style="margin-top:10px;color:#999;">{{ $t('projectmanager') }}</div>
                     <div><el-link style="margin:10px" @click="showUser(project.inchargerId)">
                         <span v-if="user.userNameNeedTranslate != 1">{{project.inchargerName}}</span>
-                        <span v-else><ww-open-data type='userName' :openid='project.inchargerName'></ww-open-data></span>
+                        <span v-else><TranslationOpenDataText type='userName' :openid='project.inchargerName'></TranslationOpenDataText></span>
                     </el-link></div>
                     <div style="margin-top:10px;color:#999;">{{ user.timeType.reportCc == 1?'日报抄送人':$t('newspaperauditor') }}</div>
                     <div>
@@ -130,7 +130,7 @@
                                 {{item.auditorName}}
                             </span>
                             <span v-if="user.userNameNeedTranslate == 1">
-                                <ww-open-data type='userName' :openid='item.auditorName'></ww-open-data>
+                                <TranslationOpenDataText type='userName' :openid='item.auditorName'></TranslationOpenDataText>
                             </span>
                         </el-link>
                     </div>
@@ -139,7 +139,7 @@
                     <div v-show="project.isPublic == 0" >
                         <el-link v-for="item in project.participationList" :key="item.id" style="margin:10px;" @click="showUser(item.id)">
                             <span v-if="user.userNameNeedTranslate != 1">{{item.name}}</span>
-                            <span v-else><ww-open-data type='userName' :openid='item.name'></ww-open-data></span>
+                            <span v-else><TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText></span>
                         </el-link>
                         <el-button class="el-icon-plus" @click="addMembVisible=true" size="mini"></el-button>
                     </div>
@@ -275,14 +275,14 @@
         <el-dialog :title="$t('Checkthedetails')" v-if="userDetailVisible" :visible.sync="userDetailVisible" :close-on-click-modal="false" customClass="customWidth" width="500px">
             <div class="line"><span>{{ $t('lable.name') }}</span>
                 <span v-if="user.userNameNeedTranslate != 1">{{userDetail.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"><TranslationOpenDataText type='userName' :openid='userDetail.name'></TranslationOpenDataText></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('jiao-se') }}</span><span>{{userDetail.roleName}}</span></div>
             <div class="line"><span>{{ $t('lable.department') }}</span>
                 <span v-if="user.userNameNeedTranslate != 1">{{userDetail.departmentName}}</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"><TranslationOpenDataText type='departmentName' :openid='userDetail.departmentName'></TranslationOpenDataText></span>
             </div>
             <div slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="userDetailVisible = false" >{{ $t('btn.determine') }}</el-button>
@@ -315,7 +315,7 @@
             <el-table :data="contractRecordData" height="500px" :loading="contractRecordLoading" :default-sort="{prop: 'date', order: 'descending'}">
                 <el-table-column :label="$t('other.operator')" prop="name" min-width="100">
                     <template slot-scope="scope">
-                        <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='filterUserContract(scope.row.editUserId)'></ww-open-data></span>
+                        <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName' :openid='filterUserContract(scope.row.editUserId)'></TranslationOpenDataText></span>
                         <span v-else>{{filterUserContract(scope.row.editUserId)}}</span>
                     </template>
                 </el-table-column>
@@ -570,7 +570,7 @@
                                        <span style="margin:0 5px;" v-for="item in scope.row.membList" :key="item.membId">
                                             <span v-if="user.userNameNeedTranslate != 1">{{item.membName}}({{item.percentage}}%)</span>
                                             <span v-if="user.userNameNeedTranslate == 1">
-                                                <ww-open-data type='userName' :openid='item.membName'></ww-open-data>({{item.percentage}}%)
+                                                <TranslationOpenDataText type='userName' :openid='item.membName'></TranslationOpenDataText>({{item.percentage}}%)
                                             </span>
                                         </span>
                                        <el-link @click="showEditPpMembs(scope.row)">

+ 15 - 15
fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -241,7 +241,7 @@
                             {{scope.row.inchargerName}}
                         </span>
                         <span v-if="user.userNameNeedTranslate == 1">
-                            <ww-open-data type='userName' :openid='scope.row.inchargerName'></ww-open-data>
+                            <TranslationOpenDataText type='userName' :openid='scope.row.inchargerName'></TranslationOpenDataText>
                         </span>
                     </el-link>
                 </template>
@@ -275,7 +275,7 @@
                                         {{par.name}}
                                     </span>
                                     <span v-if="user.userNameNeedTranslate == 1">
-                                        <ww-open-data type='userName' :openid='par.name'></ww-open-data>
+                                        <TranslationOpenDataText type='userName' :openid='par.name'></TranslationOpenDataText>
                                     </span>
                                 </el-link>
                             </span>
@@ -286,7 +286,7 @@
                                             {{par.name}}
                                         </span>
                                         <span v-if="user.userNameNeedTranslate == 1">
-                                            <ww-open-data type='userName' :openid='par.name'></ww-open-data>
+                                            <TranslationOpenDataText type='userName' :openid='par.name'></TranslationOpenDataText>
                                         </span>
                                     </el-link>
                                 </span>
@@ -299,7 +299,7 @@
                                 {{par.name}}
                             </el-link>
                             <el-link style="margin-right:10px;" type="primary" :underline="false" @click="showUser(par.id)" v-if="user.userNameNeedTranslate == 1">
-                                <ww-open-data type='userName' :openid='par.name'></ww-open-data>
+                                <TranslationOpenDataText type='userName' :openid='par.name'></TranslationOpenDataText>
                             </el-link>
                         </span>
                     </div>
@@ -546,14 +546,14 @@
                             <div slot="content" style="width:780px">
                                 <span v-for="(item, index) in addFormUserNames" :key="index">
                                     <!-- {{item}} -->
-                                    <ww-open-data type='userName' :openid='item'></ww-open-data>
+                                    <TranslationOpenDataText type='userName' :openid='item'></TranslationOpenDataText>
                                     <span v-if="index < addFormUserNames.length - 1">,</span>
                                 </span>
                             </div>
                             <div @click="showChooseMembTree" style="width: 800px;overflow:hidden;white-space:nowrap;height:40px;border: 1px solid #DCDFE6;border-radius: 4px;box-sizing: border-box;padding: 0 10px">
                                 <span v-for="(item, index) in addFormUserNames" :key="index">
                                     <!-- {{item}} -->
-                                    <ww-open-data type='userName' :openid='item'></ww-open-data>
+                                    <TranslationOpenDataText type='userName' :openid='item'></TranslationOpenDataText>
                                     <span v-if="index < addFormUserNames.length - 1">,</span>
                                 </span>
                             </div>
@@ -814,7 +814,7 @@
                                     <template slot-scope="scope">
                                         <span style="margin:0 5px;" v-for="item in scope.row.membList" :key="item.membId">
                                                 <span v-if="user.userNameNeedTranslate != 1">{{item.membName}}({{item.percentage}}%)</span>
-                                                <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='item.membName'></ww-open-data>({{item.percentage}}%)</span>
+                                                <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName' :openid='item.membName'></TranslationOpenDataText>({{item.percentage}}%)</span>
                                             </span>
                                         <el-link @click="showEditPpMembs(scope.row)">{{(scope.row.membList == null || scope.row.membList.length == 0)?$t('professionalparticipants'):$t('setup')}}</el-link>
                                     </template>
@@ -867,7 +867,7 @@
         <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 v-if="user.userNameNeedTranslate != 1">{{userDetail.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"><TranslationOpenDataText type='userName' :openid='userDetail.name'></TranslationOpenDataText></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>
@@ -875,7 +875,7 @@
             <div class="line"><span>{{ $t('lable.department') }}</span>
 
                 <span v-if="user.userNameNeedTranslate != 1">{{userDetail.departmentName}}</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"><TranslationOpenDataText type='departmentName' :openid='userDetail.departmentName'></TranslationOpenDataText></span>
             </div>
             <div slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="userDetailVisible = false" >{{ $t('btn.determine') }}</el-button>
@@ -1261,10 +1261,10 @@
                         <span class="custom-tree-node" slot-scope="{ node, data }">
                             <span v-if="user.userNameNeedTranslate == '1'">
                                 <span v-if="node.data.children">
-                                    <ww-open-data type='departmentName' :openid='node.label'></ww-open-data>
+                                    <TranslationOpenDataText type='departmentName' :openid='node.label'></TranslationOpenDataText>
                                 </span>
                                 <span v-else>
-                                    <ww-open-data type='userName' :openid='node.label'></ww-open-data>
+                                    <TranslationOpenDataText type='userName' :openid='node.label'></TranslationOpenDataText>
                                 </span>
                             </span>
                             <span v-if="user.userNameNeedTranslate != '1'">
@@ -1359,14 +1359,14 @@
                         <div slot="content" style="width:580px">
                             <span v-for="(item, index) in addGroupPersonDataPersonNames" :key="index">
                                 <!-- {{item}} -->
-                                <ww-open-data type='userName' :openid='item'></ww-open-data>
+                                <TranslationOpenDataText type='userName' :openid='item'></TranslationOpenDataText>
                                 <span v-if="index < addGroupPersonDataPersonNames.length - 1">,</span>
                             </span>
                         </div>
                         <div @click="addGroupPersonP" style="width: 450px;overflow:hidden;white-space:nowrap;height:40px;border: 1px solid #DCDFE6;border-radius: 4px;box-sizing: border-box;padding: 0 10px">
                             <span v-for="(item, index) in addGroupPersonDataPersonNames" :key="index">
                                 <!-- {{item}} -->
-                                <ww-open-data type='userName' :openid='item'></ww-open-data>
+                                <TranslationOpenDataText type='userName' :openid='item'></TranslationOpenDataText>
                                 <span v-if="index < addGroupPersonDataPersonNames.length - 1">,</span>
                             </span>
                         </div>
@@ -1402,10 +1402,10 @@
                         <span class="custom-tree-node" slot-scope="{ node, data }">
                             <span v-if="user.userNameNeedTranslate == '1'">
                                 <span v-if="node.data.children">
-                                    <ww-open-data type='departmentName' :openid='node.label'></ww-open-data>
+                                    <TranslationOpenDataText type='departmentName' :openid='node.label'></TranslationOpenDataText>
                                 </span>
                                 <span v-else>
-                                    <ww-open-data type='userName' :openid='node.label'></ww-open-data>
+                                    <TranslationOpenDataText type='userName' :openid='node.label'></TranslationOpenDataText>
                                 </span>
                             </span>
                             <span v-if="user.userNameNeedTranslate != '1'">

+ 22 - 22
fhKeeper/formulahousekeeper/timesheet/src/views/project/projectInside.vue

@@ -99,7 +99,7 @@
                                 <el-form-item :label="$t('head') + ':'">
                                     <span v-if="user.userNameNeedTranslate != '1'">{{groupDetailData.incharger}}</span>
                                     <span v-if="user.userNameNeedTranslate == '1'">
-                                        <ww-open-data type='userName' :openid='groupDetailData.incharger'></ww-open-data>
+                                        <TranslationOpenDataText type='userName' :openid='groupDetailData.incharger'></TranslationOpenDataText>
                                     </span>
                                 </el-form-item>
                                 <el-form-item :label="$t('participantin') + ':'">
@@ -108,7 +108,7 @@
                                             {{item.userName}} 
                                         </span>
                                         <span v-if="user.userNameNeedTranslate == '1'"> 
-                                            <ww-open-data type='userName' :openid='item.userName'></ww-open-data>
+                                            <TranslationOpenDataText type='userName' :openid='item.userName'></TranslationOpenDataText>
                                         </span>
                                         <span v-if="index < groupDetailData.participators.length - 1">、</span>
                                     </span>
@@ -218,7 +218,7 @@
                                                                     {{exeItem.length>2?exeItem.substring(exeItem.length-2, exeItem.length):exeItem}}
                                                                 </span>
                                                                 <span v-if="user.userNameNeedTranslate == '1'">
-                                                                    <ww-open-data type='userName' :openid='exeItem'></ww-open-data>
+                                                                    <TranslationOpenDataText type='userName' :openid='exeItem'></TranslationOpenDataText>
                                                                 </span>
                                                             </span>
                                                             </span>
@@ -303,7 +303,7 @@
                                         </span>
                                         <span v-else>
                                             <span v-for="(item, index) in scope.row.executorName" :key="index">
-                                                <ww-open-data type='userName' :openid='item'></ww-open-data>
+                                                <TranslationOpenDataText type='userName' :openid='item'></TranslationOpenDataText>
                                                 <span v-if="index < scope.row.executorName.length - 1">,</span>
                                             </span>
                                         </span>
@@ -376,10 +376,10 @@
                         <span class="custom-tree-node" slot-scope="{ node, data }">
                             <span v-if="user.userNameNeedTranslate == '1'">
                                 <span v-if="node.data.children">
-                                    <ww-open-data type='departmentName' :openid='node.label'></ww-open-data>
+                                    <TranslationOpenDataText type='departmentName' :openid='node.label'></TranslationOpenDataText>
                                 </span>
                                 <span v-else>
-                                    <ww-open-data type='userName' :openid='node.label'></ww-open-data>
+                                    <TranslationOpenDataText type='userName' :openid='node.label'></TranslationOpenDataText>
                                 </span>
                             </span>
                             <span v-if="user.userNameNeedTranslate != '1'">
@@ -520,7 +520,7 @@
                                                         {{item.name}}
                                                     </span>
                                                     <span v-if="user.userNameNeedTranslate == '1'">
-                                                        <ww-open-data type='userName' :openid='item.name'></ww-open-data>
+                                                        <TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText>
                                                     </span>
                                                 </span>
                                             </el-checkbox>
@@ -562,7 +562,7 @@
                                                 {{recentProgressInfo.creatorName}}
                                             </span>
                                             <span v-if="user.userNameNeedTranslate == '1'">
-                                                <ww-open-data type='userName' :openid='recentProgressInfo.creatorName'></ww-open-data>
+                                                <TranslationOpenDataText type='userName' :openid='recentProgressInfo.creatorName'></TranslationOpenDataText>
                                             </span>
                                         </span>
                                         {{ $t('geng-xin-yu') }}{{recentProgressInfo.indate | relativeTime}}
@@ -675,7 +675,7 @@
                                                 </span>
                                                 <span v-else>
                                                     <span v-for="item,index in scope.row.executorName" :key="index">
-                                                        <ww-open-data type='userName' :openid='item'></ww-open-data>
+                                                        <TranslationOpenDataText type='userName' :openid='item'></TranslationOpenDataText>
                                                         <span v-if="index < scope.row.executorName.length - 1">,</span>
                                                     </span>
                                                 </span>
@@ -724,7 +724,7 @@
                                     <div>
                                         <span v-if="user.userNameNeedTranslate != 1">{{scope.row.creatorName}}</span>
                                         <span v-if="user.userNameNeedTranslate == 1">
-                                            <ww-open-data type='userName' :openid='scope.row.creatorName'></ww-open-data>
+                                            <TranslationOpenDataText type='userName' :openid='scope.row.creatorName'></TranslationOpenDataText>
                                         </span>
                                     </div>
                                 </template>
@@ -799,7 +799,7 @@
                                     <span  v-for="(pl, i) in critic" :key="i">
                                     <span style="background: #778899" v-if="user.userNameNeedTranslate != 1">{{pl.length > 2 ? pl.substring(pl.length - 2, pl.length) : pl}}</span>
                                     <span v-if="user.userNameNeedTranslate == 1">
-                                        <ww-open-data type='userName' :openid='pl'></ww-open-data>
+                                        <TranslationOpenDataText type='userName' :openid='pl'></TranslationOpenDataText>
                                     </span>
                                     </span>
                                     <!-- <span style="background: #778899">{{pl.length}}</span> -->
@@ -826,7 +826,7 @@
                                                 {{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>
+                                                <TranslationOpenDataText type='userName' :openid='item.userName'></TranslationOpenDataText>
                                             </i>
                                         </i>
                                         <div>
@@ -836,14 +836,14 @@
                                                     {{item.userName}}
                                                 </p>
                                                 <p v-if="user.userNameNeedTranslate == 1">
-                                                    <ww-open-data type='userName' :openid='item.userName'></ww-open-data>
+                                                    <TranslationOpenDataText type='userName' :openid='item.userName'></TranslationOpenDataText>
                                                 </p>
                                             <!-- </p> -->
                                             <em>
                                                 <!-- {{item.content}} -->
                                                 <p style="display: inline-block;padding: 0;margin: 0;" v-if="user.userNameNeedTranslate == 1">
                                                     {{item.content.msg1}}
-                                                    <ww-open-data type='userName' :openid='item.content.msg2'></ww-open-data>
+                                                    <TranslationOpenDataText type='userName' :openid='item.content.msg2'></TranslationOpenDataText>
                                                     {{item.content.msg3}}
                                                 </p>
                                                 <p style="display: inline-block;padding: 0;margin: 0;" v-if="user.userNameNeedTranslate != 1">{{item.content}}</p>
@@ -860,7 +860,7 @@
                                         <p>
                                             {{ $t('tian-bao-ren') }}: <span v-if="user.userNameNeedTranslate != 1">{{item2.userName}}</span>
                                             <span v-if="user.userNameNeedTranslate == 1">
-                                                <ww-open-data type='userName' :openid='item2.userName'></ww-open-data>
+                                                <TranslationOpenDataText type='userName' :openid='item2.userName'></TranslationOpenDataText>
                                             </span>
                                             <span style="float: right;">{{item2.createDate}}</span>
                                         </p>
@@ -872,7 +872,7 @@
                                                             <!-- 待项目审核人 --> {{$t('other.waitForTheProjectReviewer')}}
                                                             <span v-if="item2.projectAuditorName != null">(
                                                                 <span v-if="user.userNameNeedTranslate == '1'">
-                                                                    <ww-open-data type='userName' :openid='item2.projectAuditorName'></ww-open-data>
+                                                                    <TranslationOpenDataText type='userName' :openid='item2.projectAuditorName'></TranslationOpenDataText>
                                                                 </span>
                                                                 <span v-if="user.userNameNeedTranslate != '1'">{{item2.projectAuditorName}}</span>
                                                                 )</span> 
@@ -883,7 +883,7 @@
                                                             <span v-if="item2.projectAuditorName != null">(
                                                                 <!-- {{item2.projectAuditorName}} -->
                                                                 <span v-if="user.userNameNeedTranslate == '1'">
-                                                                    <ww-open-data type='userName' :openid='item2.projectAuditorName'></ww-open-data>
+                                                                    <TranslationOpenDataText type='userName' :openid='item2.projectAuditorName'></TranslationOpenDataText>
                                                                 </span>
                                                                 <span v-if="user.userNameNeedTranslate != '1'">{{item2.projectAuditorName}}</span>
                                                                 )</span>
@@ -893,7 +893,7 @@
                                                     <span v-else-if="item2.isDeptAudit==1">
                                                         ({{$t('other.await')}}
                                                         <span v-if="user.userNameNeedTranslate == '1'">
-                                                            <ww-open-data type='departmentName' :openid='item2.auditDeptName'></ww-open-data>
+                                                            <TranslationOpenDataText type='departmentName' :openid='item2.auditDeptName'></TranslationOpenDataText>
                                                         </span>
                                                         <span v-if="user.userNameNeedTranslate != '1'">{{item2.auditDeptName}}</span>
                                                         {{$t('other.audit')}})
@@ -917,7 +917,7 @@
                                                             {{item2.projectAuditorName}}
                                                         </span>
                                                         <span v-if="user.userNameNeedTranslate == 1">
-                                                            <ww-open-data type='userName' :openid='item2.projectAuditorName'></ww-open-data>
+                                                            <TranslationOpenDataText type='userName' :openid='item2.projectAuditorName'></TranslationOpenDataText>
                                                         </span>
                                                     )
                                                 </span>{{$t('other.audit')}}</span>
@@ -1026,7 +1026,7 @@
                                 {{$t('dai-fen-pei')}}
                             </span>
                             <span v-else>
-                                <ww-open-data type='userName' :openid='scope.row.executorName'></ww-open-data>
+                                <TranslationOpenDataText type='userName' :openid='scope.row.executorName'></TranslationOpenDataText>
                             </span>
                         </span>
                     </template>
@@ -1038,13 +1038,13 @@
         <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 v-if="user.userNameNeedTranslate != 1">{{userDetail.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"><TranslationOpenDataText type='userName' :openid='userDetail.name'></TranslationOpenDataText></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 v-if="user.userNameNeedTranslate != 1">{{userDetail.departmentName}}</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"><TranslationOpenDataText type='departmentName' :openid='userDetail.departmentName'></TranslationOpenDataText></span>
             </div>
             <div class="line"><span>{{ $t('costof') }}</span><span>{{userDetail.cost}}{{ $t('Yuananhour') }}</span></div>
             <div slot="footer" class="dialog-footer">

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/project/project_gantt.vue

@@ -92,7 +92,7 @@
           <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>
+                <TranslationOpenDataText type='userName' :openid='item'></TranslationOpenDataText>
                 <span v-if="index < scope.row.activeUsers.length - 1">,</span>
               </span>
             </span>

+ 5 - 5
fhKeeper/formulahousekeeper/timesheet/src/views/project/vueGantt.vue

@@ -4,8 +4,8 @@
         <el-table-column prop="text" label="姓名" width="240" fixed="left" v-if="stafforpro != '按项目查看'">
           <template slot-scope="scope">
               <!-- user.userNameNeedTranslate == 1 -->
-              <span v-if="user.userNameNeedTranslate == 1 && scope.row.translationType == 'department'"><ww-open-data type='departmentName' :openid='scope.row.text'></ww-open-data></span>
-              <span v-if="user.userNameNeedTranslate == 1 && scope.row.translationType == 'user'"><ww-open-data type='userName' :openid='scope.row.text'></ww-open-data></span>
+              <span v-if="user.userNameNeedTranslate == 1 && scope.row.translationType == 'department'"><TranslationOpenDataText type='departmentName' :openid='scope.row.text'></TranslationOpenDataText></span>
+              <span v-if="user.userNameNeedTranslate == 1 && scope.row.translationType == 'user'"><TranslationOpenDataText type='userName' :openid='scope.row.text'></TranslationOpenDataText></span>
               <span v-if="user.userNameNeedTranslate == 1 && (scope.row.translationType == 'null' || scope.row.translationType == null)">{{scope.row.text}}</span>
               <span v-if="user.userNameNeedTranslate != 1">{{scope.row.text}}</span>
           </template>
@@ -14,8 +14,8 @@
           <template slot-scope="scope">
             <span v-if="user.userNameNeedTranslate == 1 && scope.row.translationType == 'user'">
               <span v-for="(item, index) in scope.row.userNameList" :key="index">
-                <!-- <ww-open-data type='userName' :openid='scope.row.text'></ww-open-data> -->
-                <ww-open-data type='userName' :openid='item'></ww-open-data>
+                <!-- <TranslationOpenDataText type='userName' :openid='scope.row.text'></TranslationOpenDataText> -->
+                <TranslationOpenDataText type='userName' :openid='item'></TranslationOpenDataText>
                 <span v-if="index < scope.row.userNameList.length - 1">,</span>
               </span>
             </span>
@@ -29,7 +29,7 @@
               <template slot-scope="scope">
                 <div>
                   <!-- <span v-if="scope.row.translationType == 'user' && scope.column.label.indexof(scope.row.end_date) != '-1'">
-                    <ww-open-data type='userName' :openid='scope.row.text'></ww-open-data>
+                    <TranslationOpenDataText type='userName' :openid='scope.row.text'></TranslationOpenDataText>
                   </span> -->
                   <span v-if="scope.row.translationType != 'user' && stafforpro != '按项目查看'">
                     <!-- {{scope.row.end_date | dataValue(scope.column, scope.row)}} -->

+ 11 - 11
fhKeeper/formulahousekeeper/timesheet/src/views/projectApproval/projectApproval.vue

@@ -61,7 +61,7 @@
                                         {{scope.row.inchargerName}}
                                     </span>
                                     <span v-if="user.userNameNeedTranslate == 1">
-                                        <ww-open-data type='userName' :openid='scope.row.inchargerName'></ww-open-data>
+                                        <TranslationOpenDataText type='userName' :openid='scope.row.inchargerName'></TranslationOpenDataText>
                                     </span>
                                 </el-link>
                             </template>
@@ -141,14 +141,14 @@
                                         <div slot="content" style="width:780px">
                                             <span v-for="(item, index) in addFormUserNames" :key="index">
                                                 <!-- {{item}} -->
-                                                <ww-open-data type='userName' :openid='item'></ww-open-data>
+                                                <TranslationOpenDataText type='userName' :openid='item'></TranslationOpenDataText>
                                                 <span v-if="index < addFormUserNames.length - 1">,</span>
                                             </span>
                                         </div>
                                         <div @click="showChooseMembTree" style="width: 800px;overflow:hidden;white-space:nowrap;height:40px;border: 1px solid #DCDFE6;border-radius: 4px;box-sizing: border-box;padding: 0 10px">
                                             <span v-for="(item, index) in addFormUserNames" :key="index">
                                                 <!-- {{item}} -->
-                                                <ww-open-data type='userName' :openid='item'></ww-open-data>
+                                                <TranslationOpenDataText type='userName' :openid='item'></TranslationOpenDataText>
                                                 <span v-if="index < addFormUserNames.length - 1">,</span>
                                             </span>
                                         </div>
@@ -272,10 +272,10 @@
                                     <span class="custom-tree-node" slot-scope="{ node, data }">
                                         <span v-if="user.userNameNeedTranslate == '1'">
                                             <span v-if="node.data.children">
-                                                <ww-open-data type='departmentName' :openid='node.label'></ww-open-data>
+                                                <TranslationOpenDataText type='departmentName' :openid='node.label'></TranslationOpenDataText>
                                             </span>
                                             <span v-else>
-                                                <ww-open-data type='userName' :openid='node.label'></ww-open-data>
+                                                <TranslationOpenDataText type='userName' :openid='node.label'></TranslationOpenDataText>
                                             </span>
                                         </span>
                                         <span v-if="user.userNameNeedTranslate != '1'">
@@ -296,7 +296,7 @@
                     <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 v-if="user.userNameNeedTranslate != 1">{{userDetail.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"><TranslationOpenDataText type='userName' :openid='userDetail.name'></TranslationOpenDataText></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>
@@ -304,7 +304,7 @@
                         <div class="line"><span>{{ $t('lable.department') +":"}}</span>
 
                             <span v-if="user.userNameNeedTranslate != 1">{{userDetail.departmentName}}</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"><TranslationOpenDataText type='departmentName' :openid='userDetail.departmentName'></TranslationOpenDataText></span>
                         </div>
                         <div slot="footer" class="dialog-footer">
                             <el-button type="primary" @click="userDetailVisible = false" >{{ $t('btn.determine') }}</el-button>
@@ -324,14 +324,14 @@
                                     {{par.userName}}
                                 </span>
                                 <span v-if="user.userNameNeedTranslate == 1">
-                                    <ww-open-data type='userName' :openid='par.userName'></ww-open-data>
+                                    <TranslationOpenDataText type='userName' :openid='par.userName'></TranslationOpenDataText>
                                 </span>
                                 <span v-if="index < projectApprocalDetail.participationApprovalList.length-1">,</span>
                             </span>
                         </div>
                         <div class="line"><span>{{'项目经理:'}}</span>
                             <span v-if="user.userNameNeedTranslate != 1">{{projectApprocalDetail.inchargerName}}</span>
-                            <span v-if="user.userNameNeedTranslate == 1&&projectApprocalDetail.inchargerName"><ww-open-data type='userName' :openid='projectApprocalDetail.inchargerName'></ww-open-data></span>
+                            <span v-if="user.userNameNeedTranslate == 1&&projectApprocalDetail.inchargerName"><TranslationOpenDataText type='userName' :openid='projectApprocalDetail.inchargerName'></TranslationOpenDataText></span>
                         </div>
                         <div class="line"><span>{{'日报审核人:'}}</span>
                             <span v-for="(par,index) in projectApprocalDetail.projectApprovalAuditorList" :key="par.auditorId">
@@ -339,7 +339,7 @@
                                     {{par.auditorName}}
                                 </span>
                                 <span v-if="user.userNameNeedTranslate == 1">
-                                    <ww-open-data type='userName' :openid='par.auditorName'></ww-open-data>
+                                    <TranslationOpenDataText type='userName' :openid='par.auditorName'></TranslationOpenDataText>
                                 </span>
                                 <span v-if="index < projectApprocalDetail.projectApprovalAuditorList.length-1">,</span>
                             </span>
@@ -363,7 +363,7 @@
                         </div>
                         <div class="line" v-for="(item,index) in approvalLogData">
                             <span v-if="user.userNameNeedTranslate != 1">{{item.userName}} {{item.createTime}} {{approvalTypeStr[item.type]}}了日报</span>
-                            <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='item.userName'></ww-open-data> {{item.createTime}}{{approvalTypeStr[item.type]}}了日报</span>
+                            <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName' :openid='item.userName'></TranslationOpenDataText> {{item.createTime}}{{approvalTypeStr[item.type]}}了日报</span>
                         </div>
                         <div slot="footer" class="dialog-footer">
                             <el-button type="primary" @click="projectApprovalDetailVisible = false" >{{'关闭'}}</el-button>

+ 11 - 11
fhKeeper/formulahousekeeper/timesheet/src/views/settings/timetype.vue

@@ -239,7 +239,7 @@
                             <el-tag style="margin:10px 0 0 10px" v-for="item in whiteList" :key="item.id" closable @close="whiteDelete(item)">
                                 <!-- {{item.label}} -->
                                 <span v-if="user.userNameNeedTranslate != '1'">{{item.label}}</span>
-                                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.label'></ww-open-data></span>
+                                <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.label'></TranslationOpenDataText></span>
                             </el-tag>
                         </div>
 
@@ -464,7 +464,7 @@
                     <div v-if="user.userNameNeedTranslate != '1'">{{ scope.row.targetDeptsNames }}</div>
                     <div v-else>
                         <span v-for="(v,i) in (scope.row.newDeptName || [])">
-                            <ww-open-data type='departmentName' :openid='v'></ww-open-data>
+                            <TranslationOpenDataText type='departmentName' :openid='v'></TranslationOpenDataText>
                             <span v-if="i < (scope.row.newDeptName || []).length - 1">,</span>
                         </span>
                     </div>
@@ -475,7 +475,7 @@
                     <div v-if="user.userNameNeedTranslate != '1'">{{ scope.row.targetUsersNames }}</div>
                     <div v-else>
                         <span v-for="(v,i) in (scope.row.newDeptName || [])">
-                            <ww-open-data type='userName' :openid='v'></ww-open-data>
+                            <TranslationOpenDataText type='userName' :openid='v'></TranslationOpenDataText>
                             <span v-if="i < (scope.row.newUserName || []).length - 1">,</span>
                         </span>
                     </div>
@@ -515,7 +515,7 @@
                         <div class="contents">
                             <el-tag style="margin:10px 0 0 10px" v-for="(item, index) in specialHolidaysDept.labels" :key="item.id" closable @close="specialHolidaysDelete('specialHolidaysDept', index)">
                                 <span v-if="user.userNameNeedTranslate != '1'">{{item}}</span>
-                                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='departmentName' :openid='item'></ww-open-data></span>
+                                <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='departmentName' :openid='item'></TranslationOpenDataText></span>
                             </el-tag>
                         </div>
                     </div>
@@ -524,7 +524,7 @@
                         <div class="contents">
                             <el-tag style="margin:10px 0 0 10px" v-for="(item, index) in specialHolidaysUser.labels" :key="item.id" closable @close="specialHolidaysDelete('specialHolidaysUser', index)">
                                 <span v-if="user.userNameNeedTranslate != '1'">{{item}}</span>
-                                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item'></ww-open-data></span>
+                                <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item'></TranslationOpenDataText></span>
                             </el-tag>
                         </div>
                     </div>
@@ -590,7 +590,7 @@
                         </div>
                         <div v-else>
                             <div v-if="user.userNameNeedTranslate == 1">
-                                <ww-open-data type='departmentName' :openid='scope.row.dname'></ww-open-data>
+                                <TranslationOpenDataText type='departmentName' :openid='scope.row.dname'></TranslationOpenDataText>
                             </div>
                             <div v-else>{{scope.row.dname}}</div>
                         </div>
@@ -636,7 +636,7 @@
                             <span class="custom-tree-node" slot-scope="{ node }">
                                 <span v-if="!user.userNameNeedTranslate == 1">{{ node.label }} </span>
                                 <span v-if="user.userNameNeedTranslate == 1">
-                                    <ww-open-data type='departmentName' :openid='node.label'></ww-open-data>
+                                    <TranslationOpenDataText type='departmentName' :openid='node.label'></TranslationOpenDataText>
                                 </span>
                             </span>
                         </el-tree>
@@ -668,10 +668,10 @@
                         <span class="custom-tree-node" slot-scope="{ node, data }">
                             <span v-if="user.userNameNeedTranslate == '1'">
                                 <span v-if="node.data.children">
-                                    <ww-open-data type='departmentName' :openid='node.label'></ww-open-data>
+                                    <TranslationOpenDataText type='departmentName' :openid='node.label'></TranslationOpenDataText>
                                 </span>
                                 <span v-else>
-                                    <ww-open-data type='userName' :openid='node.label'></ww-open-data>
+                                    <TranslationOpenDataText type='userName' :openid='node.label'></TranslationOpenDataText>
                                 </span>
                             </span>
                             <span v-if="user.userNameNeedTranslate != '1'">
@@ -707,10 +707,10 @@
                         <span class="custom-tree-node" slot-scope="{ node, data }">
                             <span v-if="user.userNameNeedTranslate == '1'">
                                 <span v-if="node.data.children">
-                                    <ww-open-data type='departmentName' :openid='node.label'></ww-open-data>
+                                    <TranslationOpenDataText type='departmentName' :openid='node.label'></TranslationOpenDataText>
                                 </span>
                                 <span v-else>
-                                    <ww-open-data type='userName' :openid='node.label'></ww-open-data>
+                                    <TranslationOpenDataText type='userName' :openid='node.label'></TranslationOpenDataText>
                                 </span>
                             </span>
                             <span v-if="user.userNameNeedTranslate != '1'">

+ 4 - 4
fhKeeper/formulahousekeeper/timesheet/src/views/task/list.vue

@@ -151,7 +151,7 @@
                     <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'"><TranslationOpenDataText type='departmentName' :openid='scope.row.departmentName'></TranslationOpenDataText></span>
                                 <span v-if="user.userNameNeedTranslate != '1'">{{departmentName}}</span>
                             </div>
                         </template>
@@ -161,7 +161,7 @@
                             <!-- <el-link type="primary" @click="showUser(scope.row.executorId)">{{scope.row.executorName}}</el-link> -->
                             <span v-if="user.userNameNeedTranslate == '1'">
                                 <span v-for="(item, index) in scope.row.executorNameList" :key="index">
-                                    <ww-open-data type='userName' :openid='item'></ww-open-data>
+                                    <TranslationOpenDataText type='userName' :openid='item'></TranslationOpenDataText>
                                     <span v-if="index < scope.row.executorNameList.length - 1">,</span>
                                 </span>
                             </span>
@@ -227,13 +227,13 @@
         <!--用户详细信息弹出框-->
         <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 v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='userDetail.name'></ww-open-data></span>
+                <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='userDetail.name'></TranslationOpenDataText></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 v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='departmentName' :openid='userDetail.name'></ww-open-data></span>
+                <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='departmentName' :openid='userDetail.name'></TranslationOpenDataText></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>

+ 10 - 10
fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -27,7 +27,7 @@
                     <span class="custom-tree-node" style="position: relative;box-sizing: border-box;width: 10%;" slot-scope="{ node }" @mouseleave= mouseleave(data,$event) @mouseover= mouseover(data,$event)>
                         <span style="padding-right: 50px;box-sizing: border-box;overflow:hidden;text-overflow:ellipsis;line-height: 36px; display: inline-block;">
                           <span v-if="user.userNameNeedTranslate == '1'">
-                            <ww-open-data type='departmentName' :openid='node.label'></ww-open-data>
+                            <TranslationOpenDataText type='departmentName' :openid='node.label'></TranslationOpenDataText>
                           </span>
                           <span v-else>
                             {{ node.label }} <i v-if="node.data.ddDeptid != null" class="iconfont firerock-icondingding"></i>
@@ -80,8 +80,8 @@
                             <i class="fa fa-pencil-square-o"></i>
                             <!-- {{depData !=null ? depData.label : ''}} -->
                             <span v-if="translation == '1' && user.userNameNeedTranslate == '1'">{{depData != null ?depData.label:""}}</span>
-                            <span v-if="translation == '2' && user.userNameNeedTranslate == '1'"><ww-open-data type='departmentName' :openid='depData.label'></ww-open-data></span>
-                            <span v-if="translation == '3' && user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='depData.label'></ww-open-data></span>
+                            <span v-if="translation == '2' && user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='departmentName' :openid='depData.label'></TranslationOpenDataText></span>
+                            <span v-if="translation == '3' && user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='depData.label'></TranslationOpenDataText></span>
                             <span v-if="user.userNameNeedTranslate != '1'">{{depData != null ?depData.label:""}}</span>
                             <!-- <i class="iconfont firerock-icondingding"></i> -->
                             <!-- {{translation}} -->
@@ -202,7 +202,7 @@
                         <img src="../../assets/image/qiyeweix.png" alt="">
                       </span>
                       <div v-if="user.userNameNeedTranslate == 1">
-                        <ww-open-data type='userName' :openid='scope.row.name'></ww-open-data>
+                        <TranslationOpenDataText type='userName' :openid='scope.row.name'></TranslationOpenDataText>
                       </div>
                       <div v-else>{{scope.row.name}}</div>
                     </div>
@@ -214,7 +214,7 @@
                   <template slot-scope="scope">
                     <div>
                       <div v-if="user.userNameNeedTranslate == 1">
-                        <ww-open-data type='departmentName' :openid='scope.row.departmentName'></ww-open-data>
+                        <TranslationOpenDataText type='departmentName' :openid='scope.row.departmentName'></TranslationOpenDataText>
                       </div>
                       <div v-else>{{scope.row.departmentName}}</div>
                     </div>
@@ -224,7 +224,7 @@
                   <template slot-scope="scope">
                     <div>
                       <div v-if="user.userNameNeedTranslate == 1">
-                        <ww-open-data type='userName' :openid='scope.row.superiorCorpwxUserid'></ww-open-data>
+                        <TranslationOpenDataText type='userName' :openid='scope.row.superiorCorpwxUserid'></TranslationOpenDataText>
                       </div>
                       <div v-else>{{scope.row.superiorName}}</div>
                     </div>
@@ -353,7 +353,7 @@
             <el-form ref="depForm" :model="depForm" :rules="depRules" label-width="100px">
                 <el-form-item :label="$t('departmentname')" prop="name">
                     <el-input v-model="depForm.name" :placeholder="$t('peaseenterthe')" clearable style="width: 100%" v-if="user.userNameNeedTranslate != '1'"></el-input>
-                    <div v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='departmentName' :openid='depForm.name'></ww-open-data></div>
+                    <div v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='departmentName' :openid='depForm.name'></TranslationOpenDataText></div>
                 </el-form-item>
 
                 <!-- 主要负责人 -->
@@ -406,7 +406,7 @@
                       <el-input v-model="insertForm.name" :placeholder="$t('peaseenterthe')" clearable :disabled="user.userNameNeedTranslate == '1'"></el-input>
                   </el-form-item>
                   <el-form-item :label="$t('lable.name')" prop="name"  v-if="user.userNameNeedTranslate == '1'">
-                      <div><ww-open-data type='userName' :openid='insertForm.name'></ww-open-data></div>
+                      <div><TranslationOpenDataText type='userName' :openid='insertForm.name'></TranslationOpenDataText></div>
                   </el-form-item>
                   <el-form-item :label="$t('phone')" prop="phone">
                       <el-input v-model="insertForm.phone" :placeholder="$t('peaseenterthe')" clearable></el-input>
@@ -537,7 +537,7 @@
             <el-table :data="userSalaryList" highlight-current-row v-loading="listLoading" height="300px" style="width: 100%;">
                 <el-table-column prop="userName" :label="$t('lable.name')" >
                   <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"><TranslationOpenDataText type='userName' :openid='scope.row.userName'></TranslationOpenDataText></span>
                     <span v-else>{{scope.row.userName}}</span>
                   </template>
                   
@@ -3631,7 +3631,7 @@ export default {
     //                                 console.log(result, '请求微信成功')
     //                                 console.log(window, 'window')
     //                                 //  wx.agentConfig成功回调后,WWOpenData 才会注入到 window 对象上面
-    //                                 window.WWOpenData.bind(document.querySelector('ww-open-data'))
+    //                                 window.WWOpenData.bind(document.querySelector('TranslationOpenDataText'))
     //                             },
     //                             fail: function (res) {
     //                                 console.log('查看错误信息', res)

+ 31 - 31
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -233,7 +233,7 @@
                                                                     {{item2.projectAuditorName}}
                                                                 </span>
                                                                 <span v-if="user.userNameNeedTranslate == 1">
-                                                                    <ww-open-data type='userName' :openid='item2.projectAuditorName'></ww-open-data>
+                                                                    <TranslationOpenDataText type='userName' :openid='item2.projectAuditorName'></TranslationOpenDataText>
                                                                 </span> -->
                                                                 <TranslationOpenData :configurationItems="{ openType: 'userName', openId: item2.projectAuditorName, renderIndex: 0 }" />
                                                             )
@@ -368,7 +368,7 @@
                         <div class="daitianrbao"  @click="showChooseMembTree" v-if="user.userNameNeedTranslate == 1">
                             <span class="spnn" v-if="workForm.userNames">
                                 <span v-for="(item, index) in workForm.userNames" :key="index">
-                                    <span><ww-open-data type='userName' :openid='item'></ww-open-data></span>
+                                    <span><TranslationOpenDataText type='userName' :openid='item'></TranslationOpenDataText></span>
                                     <span v-if="index < workForm.userNames.length - 1">,</span>
                                 </span>
                             </span>
@@ -569,7 +569,7 @@
                                 
                                 <el-select v-model="domain.projectAuditorId" :disabled="!domain.canEdit" @change="$forceUpdate()" v-if="user.userNameNeedTranslate != '1'" style="width:200px;">
                                     <el-option v-for="item in domain.auditUserList" :label="item.auditorName" :value="item.auditorId" :key="item.id">
-                                        <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'"><TranslationOpenDataText type='userName' :openid='item.auditorName'></TranslationOpenDataText></span>
                                         <span style="float: left" v-if="user.userNameNeedTranslate != '1'">{{item.auditorName}}</span>
                                     </el-option>
                                 </el-select>
@@ -595,7 +595,7 @@
                         <el-form-item :label="$t('other.reviewer')" v-if="user.timeType.reportAuditType == 3">
                             <el-select v-model="domain.auditorFirst" :placeholder="$t('di-yi-shen-he-ren')" :disabled="!domain.canEdit" style="width:200px;">
                                 <el-option v-for="item in allUsersList" :key="item.id" :label="item.name" :value="item.id">
-                                    <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='item.name'></ww-open-data></span>
+                                    <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText></span>
                                     <span v-else>{{item.name}}</span>
                                 </el-option>
                             </el-select>
@@ -604,7 +604,7 @@
                                 <i class="el-icon-right"></i>
                                 <el-select v-model="domain.auditorSec" :placeholder="$t('di-er-shen-he-ren')" :disabled="!domain.canEdit" style="width:200px;">
                                     <el-option v-for="item in allUsersList" :key="item.id" :label="item.name" :value="item.id">
-                                        <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='item.name'></ww-open-data></span>
+                                        <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText></span>
                                         <span v-else>{{item.name}}</span>
                                     </el-option>
                                 </el-select>
@@ -614,7 +614,7 @@
                                 <i class="el-icon-right"></i>
                                 <el-select v-model="domain.auditorThird" :placeholder="$t('di-san-shen-he-ren')" :disabled="!domain.canEdit" style="width:200px;">
                                     <el-option v-for="item in allUsersList" :key="item.id" :label="item.name" :value="item.id">
-                                        <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='item.name'></ww-open-data></span>
+                                        <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText></span>
                                         <span v-else>{{item.name}}</span>
                                     </el-option>
                                 </el-select>
@@ -623,7 +623,7 @@
                         <el-form-item :label="$t('chao-song-ren')" v-if="user.timeType.reportAuditType == 3">
                             <el-select v-model="domain.ccUserid" clearable :disabled="!domain.canEdit" style="width:200px;">
                                 <el-option v-for="item in allUsersList" :key="item.id" :label="item.name" :value="item.id">
-                                    <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='item.name'></ww-open-data></span>
+                                    <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText></span>
                                     <span v-else>{{item.name}}</span>
                                 </el-option>
                             </el-select>
@@ -791,7 +791,7 @@
                             <el-form-item :label="$t('other.projectAuditor')" >
                                 <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" 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'"><TranslationOpenDataText type='userName' :openid='item.auditorName'></TranslationOpenDataText></span>
                                         <span style="float: left" v-if="user.userNameNeedTranslate != '1'">{{item.auditorName}}</span>
                                     </el-option>
                                 </el-select>
@@ -1228,12 +1228,12 @@
                                 <!-- {{(scope.row.leaveDays || scope.row.leaveTimes) ? scope.row.label + (scope.row.leaveDays ? '(' + $t('other.AskForLeave') +scope.row.leaveDays + $t('time.day') +')' : '(' + $t('other.AskForLeave') + scope.row.leaveTimes + 'h)') : scope.row.label}} -->
                                 <span v-if="scope.row.leaveDays || scope.row.leaveTimes">
                                     <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.label}}</span>
-                                    <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='scope.row.label'></ww-open-data></span>
+                                    <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='scope.row.label'></TranslationOpenDataText></span>
                                     <span>{{scope.row.leaveDays ? '(' + $t('other.AskForLeave') +scope.row.leaveDays.toFixed(1) + $t('time.day') +')' : '(' + $t('other.AskForLeave') + scope.row.leaveTimes + 'h)'}}</span>
                                 </span>
                                 <span v-else>
                                     <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.label}}</span>
-                                    <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='scope.row.label'></ww-open-data></span>
+                                    <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='scope.row.label'></TranslationOpenDataText></span>
                                 </span>
                             </span>
                         </template>
@@ -1241,7 +1241,7 @@
                     <el-table-column prop="deptName" :label="$t('lable.department')" >
                         <template slot-scope="scope">
                             <div>
-                                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='departmentName' :openid='scope.row.deptName'></ww-open-data></span>
+                                <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='departmentName' :openid='scope.row.deptName'></TranslationOpenDataText></span>
                                 <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.deptName}}</span>
                             </div>
                         </template>
@@ -1256,19 +1256,19 @@
                             <!-- <span>{{(scope.row.leaveDays || scope.row.leaveTimes) ? scope.row.label + (scope.row.leaveDays ? '(' + leaveTypeName[scope.row.leaveType] + ')' : '(' + leaveTypeName[scope.row.leaveType] + ')') : scope.row.label}}</span> -->
                             <span v-if="scope.row.leaveDays || scope.row.leaveTimes">
                                 <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.label}}</span>
-                                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='scope.row.label'></ww-open-data></span>
+                                <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='scope.row.label'></TranslationOpenDataText></span>
                                 <span>{{scope.row.leaveDays.toFixed(1) ? '(' + leaveTypeName[scope.row.leaveType] + ')' : '(' + leaveTypeName[scope.row.leaveType] + ')'}}</span>
                             </span>
                             <span v-else>
                                 <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.label}}</span>
-                                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='scope.row.label'></ww-open-data></span>
+                                <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='scope.row.label'></TranslationOpenDataText></span>
                             </span>
                         </template>
                     </el-table-column>
                     <el-table-column prop="deptName" :label="$t('lable.department')" >
                         <template slot-scope="scope">
                             <div>
-                                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='departmentName' :openid='scope.row.deptName'></ww-open-data></span>
+                                <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='departmentName' :openid='scope.row.deptName'></TranslationOpenDataText></span>
                                 <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.deptName}}</span>
                             </div>
                         </template>
@@ -1281,7 +1281,7 @@
             <el-table-column prop="label" :label="$t('lable.name')" >
                 <template slot-scope="scope">
                     <div>
-                        <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='scope.row.label'></ww-open-data></span>
+                        <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='scope.row.label'></TranslationOpenDataText></span>
                         <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.label}}</span>
                     </div>
                 </template>
@@ -1289,7 +1289,7 @@
             <el-table-column prop="deptName" :label="$t('lable.department')" >
                 <template slot-scope="scope">
                     <div>
-                        <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='departmentName' :openid='scope.row.deptName'></ww-open-data></span>
+                        <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='departmentName' :openid='scope.row.deptName'></TranslationOpenDataText></span>
                         <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.deptName}}</span>
                     </div>
                 </template>
@@ -1319,10 +1319,10 @@
                     <span class="custom-tree-node" slot-scope="{ node }">
                         <span v-if="user.userNameNeedTranslate == '1'">
                             <span v-if="node.data.children">
-                                <ww-open-data type='departmentName' :openid='node.label'></ww-open-data>
+                                <TranslationOpenDataText type='departmentName' :openid='node.label'></TranslationOpenDataText>
                             </span>
                             <span v-else>
-                                <ww-open-data type='userName' :openid='node.label'></ww-open-data>
+                                <TranslationOpenDataText type='userName' :openid='node.label'></TranslationOpenDataText>
                             </span>
                         </span>
                         <span v-if="user.userNameNeedTranslate != '1'">
@@ -1410,7 +1410,7 @@
             <el-table-column width="105" prop="name" fixed="left" :label="$t('lable.name')">
                 <template slot-scope="scope">
                     <span :style="scope.row.worktimeList.length==0?'color:red':''">
-                        <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"><TranslationOpenDataText type='userName' :openid='scope.row.name'></TranslationOpenDataText></span>
                         <span v-if="user.userNameNeedTranslate != 1">{{scope.row.name}}</span>
                         <!-- {{scope.row.name}} -->
                     </span>
@@ -1418,7 +1418,7 @@
             </el-table-column>
             <el-table-column prop="departmentName" fixed="left" :label="$t('lable.department')">
                 <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"><TranslationOpenDataText type='departmentName' :openid='scope.row.departmentName'></TranslationOpenDataText></span>
                     <span v-if="user.userNameNeedTranslate != 1">{{scope.row.departmentName}}</span>
                 </template>
             </el-table-column>
@@ -1580,13 +1580,13 @@
           >
             <el-table-column min-width="150" :label="$t('lable.department')" prop="department">
                 <template slot-scope="scope">
-                    <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='departmentName' :openid='scope.row.department'></ww-open-data></span>
+                    <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='departmentName' :openid='scope.row.department'></TranslationOpenDataText></span>
                     <span v-if="user.userNameNeedTranslate != 1">{{scope.row.department}}</span>
                 </template>
             </el-table-column>
             <el-table-column min-width="150" prop="name" :label="$t('lable.name')" >
                 <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"><TranslationOpenDataText type='userName' :openid='scope.row.name'></TranslationOpenDataText></span>
                     <span v-if="user.userNameNeedTranslate != 1">{{scope.row.name}}</span>
                 </template>
             </el-table-column>
@@ -1676,14 +1676,14 @@
 
             <el-table-column width="160" prop="name" fixed="left" :label="$t('lable.name')">
                 <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"><TranslationOpenDataText type='userName' :openid='scope.row.name'></TranslationOpenDataText></span>
                     <span v-if="user.userNameNeedTranslate != 1">{{scope.row.name}}</span>
                         <!-- {{scope.row.name}} -->
                 </template>
             </el-table-column>
             <el-table-column prop="departmentName" width="170" fixed="left" :label="$t('lable.department')">
                 <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"><TranslationOpenDataText type='departmentName' :openid='scope.row.departmentName'></TranslationOpenDataText></span>
                     <span v-if="user.userNameNeedTranslate != 1">{{scope.row.departmentName}}</span>
                 </template>
             </el-table-column>
@@ -1773,7 +1773,7 @@
                     <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"><TranslationOpenDataText type='userName' :openid='scope.row.userName'></TranslationOpenDataText></span>
                                 <span v-if="user.userNameNeedTranslate != 1">{{scope.row.userName}}</span>
                             </div>
                         </template>
@@ -1850,7 +1850,7 @@
                 <el-table-column prop="username" :label="$t('screening.employeename')"  >
                     <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"><TranslationOpenDataText type='userName' :openid='scope.row.username'></TranslationOpenDataText></span>
                             <span v-if="user.userNameNeedTranslate != 1">{{scope.row.username}}</span>
                         </div>
                     </template>
@@ -1858,7 +1858,7 @@
                 <el-table-column prop="departmentName" label="部门"  >
                     <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"><TranslationOpenDataText type='departmentName' :openid='scope.row.departmentName'></TranslationOpenDataText></span>
                             <span v-if="user.userNameNeedTranslate != 1">{{scope.row.departmentName}}</span>
                         </div>
                     </template>
@@ -1925,7 +1925,7 @@
                 <span>请选择员工:</span>
                 <el-select v-model="deleteReportParam.userIds" placeholder="请选择" style="width:500px;" filterable multiple>
                     <el-option v-for="item in usersList" :key="item.id" :label="item.name" :value="item.id">
-                        <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='item.name'></ww-open-data></span>
+                        <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText></span>
                         <span v-else>{{item.name}}</span>
                     </el-option>
                 </el-select>
@@ -1973,7 +1973,7 @@
                     v-model="modImportUserId"
                     >
                     <el-option v-for="item in usersList" :key="item.id" :label="item.name" :value="item.id">
-                        <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='item.name'></ww-open-data></span>
+                        <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText></span>
                         <span v-else>{{item.name}}</span>
                     </el-option>
                 </el-select>    
@@ -2019,7 +2019,7 @@
                 <el-table-column prop="username" :label="$t('screening.employeename')"   width="80px" fixed="left">
                     <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"><TranslationOpenDataText type='userName' :openid='scope.row.username'></TranslationOpenDataText></span>
                             <span v-if="user.userNameNeedTranslate != 1">{{scope.row.username}}</span>
                         </div>
                     </template>
@@ -2062,7 +2062,7 @@
                         <!-- {{item.msg}} -->
                         <span v-if="user.userNameNeedTranslate != 1">{{item.msg}}</span>
                         <span v-if="user.userNameNeedTranslate == 1">
-                            <span><ww-open-data type='userName' :openid='item.msgCon.one'></ww-open-data></span>
+                            <span><TranslationOpenDataText type='userName' :openid='item.msgCon.one'></TranslationOpenDataText></span>
                             <span>{{item.msgCon.two}}</span>
                         </span>
                     </el-timeline-item>

+ 15 - 15
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/list.vue

@@ -14,7 +14,7 @@
                 <el-form-item :label="'填报人'" style="width: 210px">
                     <el-select v-if="user.userNameNeedTranslate != '1'" 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'"><TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText></span>
                             <span style="float: left" v-if="user.userNameNeedTranslate != '1'">{{item.name}}</span>
                         </el-option>
                     </el-select>
@@ -26,7 +26,7 @@
                 <el-form-item :label="'审核人'" style="width: 210px">
                     <el-select v-if="user.userNameNeedTranslate != '1'" v-model="search.auditUserId" :placeholder="$t('defaultText.pleaseChoose')" clearable @change="usersSearch(false)" size="mini" style="width: 150px" 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'"><TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText></span>
                             <span style="float: left" v-if="user.userNameNeedTranslate != '1'">{{item.name}}</span>
                         </el-option>
                     </el-select>
@@ -92,14 +92,14 @@
                                                     <span v-if="item.projectAuditState==0">
                                                         {{ $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'"><TranslationOpenDataText type='userName' :openid='item.projectAuditorName'></TranslationOpenDataText></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 v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.projectAuditorName'></ww-open-data></span>
+                                                            <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.projectAuditorName'></TranslationOpenDataText></span>
                                                             <span v-if="user.userNameNeedTranslate != '1'">{{item.projectAuditorName}}</span>
                                                         )</span>{{ $t('state.approved') }}
                                                     </span>
@@ -107,9 +107,9 @@
                                                 <span v-else-if="item.isDeptAudit==1">
                                                     <!-- {{($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'"><TranslationOpenDataText type='departmentName' :openid='item.auditDeptName'></TranslationOpenDataText></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'"><TranslationOpenDataText type='userName' :openid='item.deptAuditorName'></TranslationOpenDataText></span>
                                                     <span v-if="user.userNameNeedTranslate != '1'">{{item.deptAuditorName}}</span>)
                                                     {{$t('other.audit')}})
                                                 </span>
@@ -192,7 +192,7 @@
                 <template slot-scope="scope">
                     <div>
                         <span v-if="user.userNameNeedTranslate == '1'">
-                            <ww-open-data type='userName' :openid='scope.row.name'></ww-open-data>
+                            <TranslationOpenDataText type='userName' :openid='scope.row.name'></TranslationOpenDataText>
                         </span>
                         <span v-else>
                             {{scope.row.name}}
@@ -204,7 +204,7 @@
                 <template slot-scope="scope">
                     <div>
                         <span v-if="user.userNameNeedTranslate == '1'">
-                            <ww-open-data type='departmentName' :openid='scope.row.departmentName'></ww-open-data>
+                            <TranslationOpenDataText type='departmentName' :openid='scope.row.departmentName'></TranslationOpenDataText>
                         </span>
                         <span v-else>
                             {{scope.row.departmentName}}
@@ -239,8 +239,8 @@
                             <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>)
+                                <TranslationOpenDataText type='departmentName' :openid='scope.row.auditDeptName'></TranslationOpenDataText>
+                                (<TranslationOpenDataText type='userName' :openid='scope.row.deptAuditorName'></TranslationOpenDataText>)
                                 {{$t('other.audit')}}
                             </span>
                         </span>
@@ -298,7 +298,7 @@
                         <template slot-scope="scope">
                             <div>
                                 <span v-if="user.userNameNeedTranslate == '1'">
-                                    <ww-open-data type='userName' :openid='scope.row.userName'></ww-open-data>
+                                    <TranslationOpenDataText type='userName' :openid='scope.row.userName'></TranslationOpenDataText>
                                 </span>
                                 <span v-else>{{scope.row.userName}}</span>
                             </div>
@@ -316,7 +316,7 @@
                                         <span v-for="(item, index) in scope.row.membdateList" :key="index">
                                             <!-- {{item.userName}} -->
                                             <span v-if="user.userNameNeedTranslate == 1">
-                                                <ww-open-data type='userName' :openid='item.userName'></ww-open-data>
+                                                <TranslationOpenDataText type='userName' :openid='item.userName'></TranslationOpenDataText>
                                             </span>
                                             <span v-if="user.userNameNeedTranslate != 1">
                                                 {{item.userName}}
@@ -328,7 +328,7 @@
                                         <span v-for="(item, index) in scope.row.membdateList" :key="index">
                                             <!-- {{item.userName}} -->
                                             <span v-if="user.userNameNeedTranslate == 1">
-                                                <ww-open-data type='userName' :openid='item.userName'></ww-open-data>
+                                                <TranslationOpenDataText type='userName' :openid='item.userName'></TranslationOpenDataText>
                                             </span>
                                             <span v-if="user.userNameNeedTranslate != 1">
                                                 {{item.userName}}
@@ -342,7 +342,7 @@
                                     <span v-for="(item, index) in scope.row.membdateList" :key="index">
                                         <!-- {{item.userName}} -->
                                         <span v-if="user.userNameNeedTranslate == 1">
-                                            <ww-open-data type='userName' :openid='item.userName'></ww-open-data>
+                                            <TranslationOpenDataText type='userName' :openid='item.userName'></TranslationOpenDataText>
                                         </span>
                                         <span v-if="user.userNameNeedTranslate != 1">
                                             {{item.userName}}
@@ -397,7 +397,7 @@
                         <template slot-scope="scope">
                             <div>
                                 <span v-if="user.userNameNeedTranslate == '1'">
-                                    <ww-open-data type='userName' :openid='scope.row.userName'></ww-open-data>
+                                    <TranslationOpenDataText type='userName' :openid='scope.row.userName'></TranslationOpenDataText>
                                 </span>
                                 <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.userName}}</span>
                                 <!-- {{scope.row.userName}} -->

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/list_department.vue

@@ -72,7 +72,7 @@
             <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'"><TranslationOpenDataText type='userName' :openid='scope.row.name'></TranslationOpenDataText></span>
                         <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.name}}</span>
                     </div>
                 </template>

+ 5 - 5
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/list_import.vue

@@ -111,7 +111,7 @@
                 <template slot-scope="scope">
                     <div>
                         <span v-if="user.userNameNeedTranslate == '1'">
-                            <ww-open-data type='userName' :openid='scope.row.name'></ww-open-data>
+                            <TranslationOpenDataText type='userName' :openid='scope.row.name'></TranslationOpenDataText>
                         </span>
                         <span v-if="user.userNameNeedTranslate != '1'">
                             {{scope.row.name}}
@@ -173,7 +173,7 @@
                     <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'"><TranslationOpenDataText type='userName' :openid='scope.row.userName'></TranslationOpenDataText></span>
                                 <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.userName}}</span>
                             </div>
                         </template>
@@ -187,14 +187,14 @@
                                     <el-popover placement="top" width="400" trigger="hover">
                                     <div>
                                         <span v-for="(item, index) in scope.row.membdateList" :key="index">
-                                            <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.userName'></ww-open-data></span>
+                                            <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.userName'></TranslationOpenDataText></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">
-                                            <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.userName'></ww-open-data></span>
+                                            <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.userName'></TranslationOpenDataText></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>
@@ -203,7 +203,7 @@
                                 </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">
-                                        <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.userName'></ww-open-data></span>
+                                        <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.userName'></TranslationOpenDataText></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>

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/list_profession.vue

@@ -79,7 +79,7 @@
             <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'"><TranslationOpenDataText type='userName' :openid='scope.row.name'></TranslationOpenDataText></span>
                         <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.name}}</span>
                     </div>
                 </template>

+ 3 - 3
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/weeklyCustomization.vue

@@ -52,11 +52,11 @@
                     <el-table-column prop="projectAuditorId" label="审批人" width="160">
                         <template slot-scope="scope">
                             <!-- <span v-if="user.userNameNeedTranslate != '1'">{{ scope.row.projectAuditorName }}</span>
-                            <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName'
-                                    :openid='scope.row.projectAuditorName'></ww-open-data></span> -->
+                            <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName'
+                                    :openid='scope.row.projectAuditorName'></TranslationOpenDataText></span> -->
                             <span v-if="user.userNameNeedTranslate != '1'">{{ auditorNameFun(scope.row) }}</span>
                             <span v-if="user.userNameNeedTranslate == '1'">
-                                <ww-open-data type='userName' :openid='auditorNameFun(scope.row)'></ww-open-data>
+                                <TranslationOpenDataText type='userName' :openid='auditorNameFun(scope.row)'></TranslationOpenDataText>
                             </span>
                         </template>
                     </el-table-column>

+ 3 - 3
fhKeeper/formulahousekeeper/timesheet/src/views/workflow/report.vue

@@ -15,7 +15,7 @@
                     <span class="custom-tree-node" slot-scope="{ node, data }">
                         <!-- <span>{{ node.label }}</span> -->
                         <span v-if="user.userNameNeedTranslate == '1'">
-                          <ww-open-data type='departmentName' :openid='node.label'></ww-open-data>
+                          <TranslationOpenDataText type='departmentName' :openid='node.label'></TranslationOpenDataText>
                         </span>
                         <span v-else>
                           {{ node.label }}
@@ -30,7 +30,7 @@
             <div class="tree" :style="'height:'+ (tableHeight-120) + 'px'">
                 <div style="padding:5px;color:#333;" v-if="depData != null">{{ $t('setup') }} &lt;<span style="color:#20a0ff;">
                     <span v-if="user.userNameNeedTranslate != 1">{{depData.label}}</span>
-                    <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='departmentName' :openid='depData.label'></ww-open-data></span>
+                    <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='departmentName' :openid='depData.label'></TranslationOpenDataText></span>
                     &gt;</span> {{ $t('workinghoursapprovalprocessofdirectstaff') }}
                     <el-tooltip effect="dark" v-if="depData != null && depData.children!=null" :content="$t('onlyapplicabletotheimmediatestaffofthecurrentdepartment')" placement="top-start">
                     <i class="el-icon-question"></i>
@@ -47,7 +47,7 @@
                         <el-button type="primary" v-if="item.isDeptAudit == 1" @click="editNodeDialog(index, item)">
                             <span v-if="user.userNameNeedTranslate != 1">{{item.auditDeptName}}</span>
                             <span v-if="user.userNameNeedTranslate == 1">
-                                <ww-open-data type='departmentName' :openid='item.auditDeptName'></ww-open-data>
+                                <TranslationOpenDataText type='departmentName' :openid='item.auditDeptName'></TranslationOpenDataText>
                             </span>
                         </el-button>
                         <el-button type="primary" v-if="item.isDeptAudit == 0" >{{ $t('other.projectAuditor') }}</el-button>

+ 91 - 0
fhKeeper/formulahousekeeper/timesheet_h5/src/components/translationOpenDataText.vue

@@ -0,0 +1,91 @@
+<template>
+    <div class="translation">
+        <!-- 文本 -->
+        <span v-if="corporateWeChat">
+            <ww-open-data :type='type' :openid='openIdValue'></ww-open-data>
+        </span>
+        <span v-else-if="dingdingPlatform">
+            <dt-open-data :open-type='type' :open-id='openIdValue'></dt-open-data>
+        </span>
+        <span v-else>{{ openIdValue }}</span>
+    </div>
+</template>
+
+<script>
+
+export default {
+    name: '',
+    components: {},
+    props: {
+        type: {
+            type: String,
+            default: 'userName'
+        },
+        openid: {
+            type: [String, Number],
+            default: ''
+        }
+    },
+    data() {
+        return {
+            // user: JSON.parse(sessionStorage.getItem("user")),
+            user: JSON.parse(localStorage.getItem("userInfo")),
+            corporateWeChat: false, // 企业微信转译
+            dingdingPlatform: false, // 钉钉转译
+
+            openIdValue: ''
+        }
+    },
+    computed: {},
+    watch: {
+        openid: {
+            handler(newVal, oldVal) {
+                this.assignmentValue(newVal)
+            },
+        }
+    },
+    created() { },
+    mounted() {
+        this.dealWith()
+    },
+    methods: {
+        dealWith() {
+            console.log(this.user)
+            const { userNameNeedTranslate, dingdingUserid } = this.user
+            if (userNameNeedTranslate) {
+                this.corporateWeChat = true
+                if (dingdingUserid) {
+                    this.dingdingPlatform = true
+                    this.corporateWeChat = false
+                } else {
+                    this.dingdingPlatform = false
+                }
+            } else {
+                this.corporateWeChat = false
+                this.dingdingPlatform = false
+            }
+            // console.log(this.corporateWeChat, this.dingdingPlatform, this.configurationItems)
+            // console.log(this.corporateWeChat, '<=== 企业微信转译')
+            // console.log(this.dingdingPlatform, '<=== 钉钉转译')
+            this.assignmentValue(this.openid)
+        },
+        assignmentValue(value) {
+            this.openIdValue = value
+            if (this.user.dingdingUserid) {
+                this.viewConfiguration()
+            }
+        },
+        viewConfiguration() {
+            setTimeout(() => {
+                window.DTOpenData.update(document.querySelectorAll('dt-open-data'));
+            }, 100);
+        }
+    },
+}
+</script>
+<style scoped>
+.translation {
+    width: auto;
+    display: inline-block;
+}
+</style>

+ 3 - 0
fhKeeper/formulahousekeeper/timesheet_h5/src/main.js

@@ -46,6 +46,9 @@ Vue.config.productionTip = false;
 import * as echarts from 'echarts';
 Vue.prototype.$echarts = echarts;
 
+import TranslationOpenDataText from '@/components/translationOpenDataText.vue'
+Vue.component('TranslationOpenDataText', TranslationOpenDataText)
+
 // 富文本
 import 'font-awesome/css/font-awesome.css' 
 import VueHtml5Editor from 'vue-html5-editor'

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet_h5/src/views/audit/audit.vue

@@ -5,7 +5,7 @@
         <div class="lis" v-for="item in list" :key="item.id">
             <div class="lis_til">
                 <p>
-                    <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.name'></ww-open-data></span>
+                    <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText></span>
                     <span v-else>{{item.name}}</span>
                     <span style="margin-left:30px;">{{item.date}}</span>
                 </p>

+ 2 - 2
fhKeeper/formulahousekeeper/timesheet_h5/src/views/count/count.vue

@@ -90,11 +90,11 @@
         <template v-else>
             <van-cell v-for="item in showList" :key="item.id" title-style="color:#666">
                 <template #title>
-                    <div style="text-align:left;margin-left:0.42667rem;" v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.name'></ww-open-data></div>
+                    <div style="text-align:left;margin-left:0.42667rem;" v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText></div>
                     <div style="text-align:left;margin-left:0.42667rem;" v-else>{{item.name}}</div>
                 </template>
                 <template #default>
-                    <div style="text-align:right;margin-right:0.42667rem;" v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='departmentName' :openid='item.department'></ww-open-data></div>
+                    <div style="text-align:right;margin-right:0.42667rem;" v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='departmentName' :openid='item.department'></TranslationOpenDataText></div>
                     <div style="text-align:right;margin-right:0.42667rem;" v-else>{{item.department}}</div>
                 </template>
                 <template #label>

+ 16 - 16
fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -8,8 +8,8 @@
                     :value="fillingAgent.name" :label="'代填人员'" placeholder="请选择代填人员"
                     @click="auditorShow = true">
                     <template #input>
-                        <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName'
-                                :openid='fillingAgent.name'></ww-open-data></span>
+                        <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName'
+                                :openid='fillingAgent.name'></TranslationOpenDataText></span>
                         <span v-else>{{ fillingAgent.name }}</span>
                     </template>
                 </van-field>
@@ -153,8 +153,8 @@
                             :value="item.projectAuditorName" :label="user.companyId == 781 ? '审核人' : '项目审核人'"
                             placeholder="请选择审核人" @click="clickPickAuditor(index, item)">
                             <template #input>
-                                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName'
-                                        :openid='item.projectAuditorName'></ww-open-data></span>
+                                <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName'
+                                        :openid='item.projectAuditorName'></TranslationOpenDataText></span>
                                 <span v-else>{{ item.projectAuditorName }}</span>
                             </template>
                         </van-field>
@@ -162,8 +162,8 @@
                             <van-picker show-toolbar :columns="item.auditUserList" value-key="auditorName"
                                 @confirm="choseAuditor" @cancel="item.showPickerAuditor = false; $forceUpdate();">
                                 <template #option="item">
-                                    <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName'
-                                            :openid='item.auditorName'></ww-open-data></span>
+                                    <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName'
+                                            :openid='item.auditorName'></TranslationOpenDataText></span>
                                     <span v-else>{{ item.auditorName }}</span>
                                 </template>
                             </van-picker>
@@ -175,8 +175,8 @@
                         <van-field readonly clickable label="第一审核人" @click="auditorClick(index, 'auditorFirst')">
                             <template #input>
                                 <span v-if="!item.auditorFirst"></span>
-                                <span v-else-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName'
-                                        :openid='item.auditorFirst.name'></ww-open-data></span>
+                                <span v-else-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName'
+                                        :openid='item.auditorFirst.name'></TranslationOpenDataText></span>
                                 <span v-else>{{ item.auditorFirst.name }}</span>
                             </template>
                         </van-field>
@@ -184,8 +184,8 @@
                             v-if="user.timeType.auditLevel > 1">
                             <template #input>
                                 <span v-if="!item.auditorSec"></span>
-                                <span v-else-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName'
-                                        :openid='item.auditorSec.name'></ww-open-data></span>
+                                <span v-else-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName'
+                                        :openid='item.auditorSec.name'></TranslationOpenDataText></span>
                                 <span v-else>{{ item.auditorSec.name }}</span>
                             </template>
                         </van-field>
@@ -193,16 +193,16 @@
                             v-if="user.timeType.auditLevel > 2">
                             <template #input>
                                 <span v-if="!item.auditorThird"></span>
-                                <span v-else-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName'
-                                        :openid='item.auditorThird.name'></ww-open-data></span>
+                                <span v-else-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName'
+                                        :openid='item.auditorThird.name'></TranslationOpenDataText></span>
                                 <span v-else>{{ item.auditorThird.name }}</span>
                             </template>
                         </van-field>
                         <van-field readonly clickable label="抄送人" @click="auditorClick(index, 'ccUserid')">
                             <template #input>
                                 <span v-if="!item.ccUserid"></span>
-                                <span v-else-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName'
-                                        :openid='item.ccUserid.name'></ww-open-data></span>
+                                <span v-else-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName'
+                                        :openid='item.ccUserid.name'></TranslationOpenDataText></span>
                                 <span v-else>{{ item.ccUserid.name }}</span>
                             </template>
                         </van-field>
@@ -216,8 +216,8 @@
                             <van-radio-group v-model="auditor.item">
                                 <van-radio v-for="uitem in auditor.searchList" :key="uitem.id" :name="uitem"
                                     style="padding:10px">
-                                    <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName'
-                                            :openid='uitem.name'></ww-open-data></span>
+                                    <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName'
+                                            :openid='uitem.name'></TranslationOpenDataText></span>
                                     <span v-else>{{ uitem.name ? uitem.name : '' }}</span>
                                 </van-radio>
                             </van-radio-group>

+ 6 - 6
fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/weekEdit-01.vue

@@ -88,7 +88,7 @@
                         :value="item.projectAuditorName" :label="user.companyId==781?'审核人':'项目审核人'" placeholder="请选择审核人" 
                     @click="clickPickAuditor(index, item)">
                         <template #input>
-                            <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.projectAuditorName'></ww-open-data></span>
+                            <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.projectAuditorName'></TranslationOpenDataText></span>
                             <span v-else>{{item.projectAuditorName}}</span>
                         </template>
                     </van-field>
@@ -96,7 +96,7 @@
                         <van-picker show-toolbar :columns="item.auditUserList" value-key="auditorName" @confirm="choseAuditor" 
                         @cancel="item.showPickerAuditor = false;$forceUpdate();">
                             <template #option="item">
-                                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.auditorName'></ww-open-data></span>
+                                <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.auditorName'></TranslationOpenDataText></span>
                                 <span v-else>{{item.auditorName}}</span>
                             </template>
                         </van-picker>
@@ -109,28 +109,28 @@
                     <van-field readonly clickable label="第一审核人" @click="auditorClick(index,'auditorFirst')">
                         <template #input>
                             <span v-if="!item.auditorFirst"></span>
-                            <span v-else-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.auditorFirst.name'></ww-open-data></span>
+                            <span v-else-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.auditorFirst.name'></TranslationOpenDataText></span>
                             <span v-else>{{item.auditorFirst.name}}</span>
                         </template>
                     </van-field>
                     <van-field readonly clickable label="第二审核人" @click="auditorClick(index,'auditorSec')" v-if="user.timeType.auditLevel > 1">
                         <template #input>
                             <span v-if="!item.auditorSec"></span>
-                            <span v-else-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.auditorSec.name'></ww-open-data></span>
+                            <span v-else-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.auditorSec.name'></TranslationOpenDataText></span>
                             <span v-else>{{item.auditorSec.name}}</span>
                         </template>
                     </van-field>
                     <van-field readonly clickable label="第三审核人" @click="auditorClick(index,'auditorThird')" v-if="user.timeType.auditLevel > 2">
                         <template #input>
                             <span v-if="!item.auditorThird"></span>
-                            <span v-else-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.auditorThird.name'></ww-open-data></span>
+                            <span v-else-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.auditorThird.name'></TranslationOpenDataText></span>
                             <span v-else>{{item.auditorThird.name}}</span>
                         </template>
                     </van-field>
                     <van-field readonly clickable label="抄送人" @click="auditorClick(index,'ccUserid')">
                         <template #input>
                             <span v-if="!item.ccUserid"></span>
-                            <span v-else-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.ccUserid.name'></ww-open-data></span>
+                            <span v-else-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.ccUserid.name'></TranslationOpenDataText></span>
                             <span v-else>{{item.ccUserid.name}}</span>
                         </template>
                     </van-field>

+ 6 - 6
fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/weekEdit-02.vue

@@ -102,7 +102,7 @@
                             :value="item.projectAuditorName" :label="user.companyId==781?'审核人':'项目审核人'" placeholder="请选择审核人" 
                         @click="clickPickAuditor(index, item)">
                             <template #input>
-                                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.projectAuditorName'></ww-open-data></span>
+                                <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.projectAuditorName'></TranslationOpenDataText></span>
                                 <span v-else>{{item.projectAuditorName}}</span>
                             </template>
                         </van-field>
@@ -110,7 +110,7 @@
                             <van-picker show-toolbar :columns="item.auditUserList" value-key="auditorName" @confirm="choseAuditor" 
                             @cancel="item.showPickerAuditor = false;$forceUpdate();">
                                 <template #option="item">
-                                    <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.auditorName'></ww-open-data></span>
+                                    <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.auditorName'></TranslationOpenDataText></span>
                                     <span v-else>{{item.auditorName}}</span>
                                 </template>
                             </van-picker>
@@ -123,28 +123,28 @@
                         <van-field readonly clickable label="第一审核人" @click="auditorClick(index,'auditorFirst')">
                             <template #input>
                                 <span v-if="!item.auditorFirst"></span>
-                                <span v-else-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.auditorFirst.name'></ww-open-data></span>
+                                <span v-else-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.auditorFirst.name'></TranslationOpenDataText></span>
                                 <span v-else>{{item.auditorFirst.name}}</span>
                             </template>
                         </van-field>
                         <van-field readonly clickable label="第二审核人" @click="auditorClick(index,'auditorSec')" v-if="user.timeType.auditLevel > 1">
                             <template #input>
                                 <span v-if="!item.auditorSec"></span>
-                                <span v-else-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.auditorSec.name'></ww-open-data></span>
+                                <span v-else-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.auditorSec.name'></TranslationOpenDataText></span>
                                 <span v-else>{{item.auditorSec.name}}</span>
                             </template>
                         </van-field>
                         <van-field readonly clickable label="第三审核人" @click="auditorClick(index,'auditorThird')" v-if="user.timeType.auditLevel > 2">
                             <template #input>
                                 <span v-if="!item.auditorThird"></span>
-                                <span v-else-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.auditorThird.name'></ww-open-data></span>
+                                <span v-else-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.auditorThird.name'></TranslationOpenDataText></span>
                                 <span v-else>{{item.auditorThird.name}}</span>
                             </template>
                         </van-field>
                         <van-field readonly clickable label="抄送人" @click="auditorClick(index,'ccUserid')">
                             <template #input>
                                 <span v-if="!item.ccUserid"></span>
-                                <span v-else-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.ccUserid.name'></ww-open-data></span>
+                                <span v-else-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.ccUserid.name'></TranslationOpenDataText></span>
                                 <span v-else>{{item.ccUserid.name}}</span>
                             </template>
                         </van-field>

+ 6 - 6
fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/weekEdit-03.vue

@@ -107,7 +107,7 @@
                             :value="item.projectAuditorName" :label="user.companyId==781?'审核人':'项目审核人'" placeholder="请选择审核人"  :disabled="item.state<=1"
                         @click="clickPickAuditor(index, item)">
                             <template #input>
-                                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.projectAuditorName'></ww-open-data></span>
+                                <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.projectAuditorName'></TranslationOpenDataText></span>
                                 <span v-else>{{item.projectAuditorName}}</span>
                             </template>
                         </van-field>
@@ -115,7 +115,7 @@
                             <van-picker show-toolbar :columns="item.auditUserList" value-key="auditorName" @confirm="choseAuditor" 
                             @cancel="item.showPickerAuditor = false;$forceUpdate();">
                                 <template #option="item">
-                                    <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.auditorName'></ww-open-data></span>
+                                    <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.auditorName'></TranslationOpenDataText></span>
                                     <span v-else>{{item.auditorName}}</span>
                                 </template>
                             </van-picker>
@@ -128,28 +128,28 @@
                         <van-field readonly clickable label="第一审核人" @click="auditorClick(index,'auditorFirst')">
                             <template #input>
                                 <span v-if="!item.auditorFirst"></span>
-                                <span v-else-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.auditorFirst.name'></ww-open-data></span>
+                                <span v-else-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.auditorFirst.name'></TranslationOpenDataText></span>
                                 <span v-else>{{item.auditorFirst.name}}</span>
                             </template>
                         </van-field>
                         <van-field readonly clickable label="第二审核人" @click="auditorClick(index,'auditorSec')" v-if="user.timeType.auditLevel > 1">
                             <template #input>
                                 <span v-if="!item.auditorSec"></span>
-                                <span v-else-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.auditorSec.name'></ww-open-data></span>
+                                <span v-else-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.auditorSec.name'></TranslationOpenDataText></span>
                                 <span v-else>{{item.auditorSec.name}}</span>
                             </template>
                         </van-field>
                         <van-field readonly clickable label="第三审核人" @click="auditorClick(index,'auditorThird')" v-if="user.timeType.auditLevel > 2">
                             <template #input>
                                 <span v-if="!item.auditorThird"></span>
-                                <span v-else-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.auditorThird.name'></ww-open-data></span>
+                                <span v-else-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.auditorThird.name'></TranslationOpenDataText></span>
                                 <span v-else>{{item.auditorThird.name}}</span>
                             </template>
                         </van-field>
                         <van-field readonly clickable label="抄送人" @click="auditorClick(index,'ccUserid')">
                             <template #input>
                                 <span v-if="!item.ccUserid"></span>
-                                <span v-else-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.ccUserid.name'></ww-open-data></span>
+                                <span v-else-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.ccUserid.name'></TranslationOpenDataText></span>
                                 <span v-else>{{item.ccUserid.name}}</span>
                             </template>
                         </van-field>

+ 6 - 6
fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/weekEdit.vue

@@ -114,7 +114,7 @@
                             :value="item.projectAuditorName" :label="user.companyId==781?'审核人':'项目审核人'" placeholder="请选择审核人"  :disabled="item.state<=1"
                         @click="clickPickAuditor(index, item)">
                             <template #input>
-                                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.projectAuditorName'></ww-open-data></span>
+                                <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.projectAuditorName'></TranslationOpenDataText></span>
                                 <span v-else>{{item.projectAuditorName}}</span>
                             </template>
                         </van-field>
@@ -122,7 +122,7 @@
                             <van-picker show-toolbar :columns="item.auditUserList" value-key="auditorName" @confirm="choseAuditor" 
                             @cancel="item.showPickerAuditor = false;$forceUpdate();">
                                 <template #option="item">
-                                    <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.auditorName'></ww-open-data></span>
+                                    <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.auditorName'></TranslationOpenDataText></span>
                                     <span v-else>{{item.auditorName}}</span>
                                 </template>
                             </van-picker>
@@ -135,28 +135,28 @@
                         <van-field readonly clickable label="第一审核人" @click="auditorClick(index,'auditorFirst')">
                             <template #input>
                                 <span v-if="!item.auditorFirst"></span>
-                                <span v-else-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.auditorFirst.name'></ww-open-data></span>
+                                <span v-else-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.auditorFirst.name'></TranslationOpenDataText></span>
                                 <span v-else>{{item.auditorFirst.name}}</span>
                             </template>
                         </van-field>
                         <van-field readonly clickable label="第二审核人" @click="auditorClick(index,'auditorSec')" v-if="user.timeType.auditLevel > 1">
                             <template #input>
                                 <span v-if="!item.auditorSec"></span>
-                                <span v-else-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.auditorSec.name'></ww-open-data></span>
+                                <span v-else-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.auditorSec.name'></TranslationOpenDataText></span>
                                 <span v-else>{{item.auditorSec.name}}</span>
                             </template>
                         </van-field>
                         <van-field readonly clickable label="第三审核人" @click="auditorClick(index,'auditorThird')" v-if="user.timeType.auditLevel > 2">
                             <template #input>
                                 <span v-if="!item.auditorThird"></span>
-                                <span v-else-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.auditorThird.name'></ww-open-data></span>
+                                <span v-else-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.auditorThird.name'></TranslationOpenDataText></span>
                                 <span v-else>{{item.auditorThird.name}}</span>
                             </template>
                         </van-field>
                         <van-field readonly clickable label="抄送人" @click="auditorClick(index,'ccUserid')">
                             <template #input>
                                 <span v-if="!item.ccUserid"></span>
-                                <span v-else-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.ccUserid.name'></ww-open-data></span>
+                                <span v-else-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.ccUserid.name'></TranslationOpenDataText></span>
                                 <span v-else>{{item.ccUserid.name}}</span>
                             </template>
                         </van-field>

+ 5 - 5
fhKeeper/formulahousekeeper/timesheet_h5/src/views/exaLeave/applyLeave.vue

@@ -26,7 +26,7 @@
                 <!-- 请假人 -->
                 <van-field v-model="editForm.ownerId" label="请假人" @click="ownerIdShow = true" :readonly="!canExamine" clickable required :rules="[{ required: true, message: '请选择请假人' }]">
                     <template #input>
-                        <span v-if="user.userNameNeedTranslate == 1 && formshowText.name"><ww-open-data type='userName' :openid='formshowText.name'></ww-open-data></span>
+                        <span v-if="user.userNameNeedTranslate == 1 && formshowText.name"><TranslationOpenDataText type='userName' :openid='formshowText.name'></TranslationOpenDataText></span>
                         <span v-else>{{formshowText.name}}</span>
                     </template>
                 </van-field>
@@ -34,7 +34,7 @@
                     <div style="minHeight:300px;">
                         <van-radio-group v-model="userRadio" v-if="user.userNameNeedTranslate == '1'">
                             <van-radio v-for="item in userList" :key="item.id" :name="item" class="userCheckbox">
-                                <ww-open-data type='userName' :openid='item.name'></ww-open-data>
+                                <TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText>
                             </van-radio>
                         </van-radio-group>
                         <van-radio-group v-model="userRadio" v-else>
@@ -93,7 +93,7 @@
                 <van-collapse-item v-for="item in leaveList" :key="item.id" title="标题1" :name="item.id">
                     <template #title>
                         <div class="collapse_label_l">请假人:
-                            <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='item.ownerName'></ww-open-data></span>
+                            <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName' :openid='item.ownerName'></TranslationOpenDataText></span>
                             <span v-else>{{item.ownerName}}</span>
                         </div>
                         <div class="collapse_label_r">电话:{{item.tel}}</div>
@@ -120,7 +120,7 @@
                 <van-collapse-item v-for="item in auditList" :key="item.id" title="标题2" :name="item.id">
                     <template #title>
                         <div class="collapse_label_l">请假人:
-                            <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='item.ownerName'></ww-open-data></span>
+                            <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName' :openid='item.ownerName'></TranslationOpenDataText></span>
                             <span v-else>{{item.ownerName}}</span>
                         </div>
                         <div class="collapse_label_r">电话:{{item.tel}}</div>
@@ -153,7 +153,7 @@
                 <van-collapse-item v-for="item in dingDingLeaveQtList" :key="item.id" title="标题2" :name="item.id">
                     <template #title>
                         <div class="collapse_label_l">员工姓名:
-                            <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='item.name'></ww-open-data></span>
+                            <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText></span>
                             <span v-else>{{item.name}}</span>
                         </div>
                         <div class="collapse_label_r">总额度:{{item.quotaInDays}}天</div>

+ 3 - 3
fhKeeper/formulahousekeeper/timesheet_h5/src/views/exaLeave/awayOffice.vue

@@ -78,7 +78,7 @@
                 <van-collapse-item v-for="item in leaveList" :key="item.id" title="标题1" :name="item.id">
                     <template #title>
                         <div class="collapse_label_l">人员:
-                            <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='item.ownerName'></ww-open-data></span>
+                            <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName' :openid='item.ownerName'></TranslationOpenDataText></span>
                             <span v-else>{{item.ownerName}}</span>
                         </div>
                         <div class="collapse_label_r">天数:{{item.dayCount}}</div>
@@ -105,7 +105,7 @@
                     <van-collapse-item v-for="item in auditList" :key="item.id" title="标题2" :name="item.id">
                         <template #title>
                             <div class="collapse_label_l">人员:
-                                <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='item.ownerName'></ww-open-data></span>
+                                <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName' :openid='item.ownerName'></TranslationOpenDataText></span>
                                 <span v-else>{{item.ownerName}}</span>
                             </div>
                             <div class="collapse_label_r">天数:{{item.dayCount}}</div>
@@ -141,7 +141,7 @@
                 <van-collapse-item v-for="item in leaveList" :key="item.id" title="标题1" :name="item.id">
                     <template #title>
                         <div class="collapse_label_l">人员:
-                            <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='item.ownerName'></ww-open-data></span>
+                            <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName' :openid='item.ownerName'></TranslationOpenDataText></span>
                             <span v-else>{{item.ownerName}}</span>
                         </div>
                         <div class="collapse_label_r">天数:{{item.dayCount}}天</div>

+ 2 - 2
fhKeeper/formulahousekeeper/timesheet_h5/src/views/exaLeave/exaLeave.vue

@@ -17,7 +17,7 @@
                         <div class="text_left">申请人</div>
                         <div class="text_right">
                             {{item.ownerName}}
-                            <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.ownerName'></ww-open-data></span>
+                            <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.ownerName'></TranslationOpenDataText></span>
                             <span v-else>{{item.ownerName}}</span>
                         </div>
                     </div>
@@ -25,7 +25,7 @@
                         <div class="text_left">所在部门</div>
                         <div class="text_right">
                             {{item.dept}}
-                            <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='departmentName' :openid='item.dept'></ww-open-data></span>
+                            <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='departmentName' :openid='item.dept'></TranslationOpenDataText></span>
                             <span v-else>{{item.dept}}</span>
                         </div>
                     </div>

+ 6 - 6
fhKeeper/formulahousekeeper/timesheet_h5/src/views/expense/details.vue

@@ -11,22 +11,22 @@
                 required
             >
                 <template #input>
-                    <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='formshowText.name'></ww-open-data></span>
+                    <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName' :openid='formshowText.name'></TranslationOpenDataText></span>
                     <span v-else>{{formshowText.name}}</span>
                 </template>
             </van-field>
             <div v-if="auditTypeItem.auditType == 2">
                 <van-field label="第一审核人" @click="ownerIdShowCli(2)" readonly clickable required :disabled="editForm.reviewProcess > 0">
                     <template #input>
-                        <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName'
-                                :openid='firstCheckerText.name'></ww-open-data></span>
+                        <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName'
+                                :openid='firstCheckerText.name'></TranslationOpenDataText></span>
                         <span v-else>{{ firstCheckerText.name }}</span>
                     </template>
                 </van-field>
                 <van-field label="第二审核人" @click="ownerIdShowCli(3)" readonly clickable required :disabled="editForm.reviewProcess > 1">
                     <template #input>
-                        <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName'
-                                :openid='secondCheckerText.name'></ww-open-data></span>
+                        <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName'
+                                :openid='secondCheckerText.name'></TranslationOpenDataText></span>
                         <span v-else>{{ secondCheckerText.name }}</span>
                     </template>
                 </van-field>
@@ -212,7 +212,7 @@
                     <van-field
                         label="审核人" v-if="item.projectManagerName">
                         <template #input>
-                            <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='item.projectManagerName'></ww-open-data></span>
+                            <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName' :openid='item.projectManagerName'></TranslationOpenDataText></span>
                             <span v-else>{{item.projectManagerName}}</span>
                         </template>
                     </van-field>

+ 16 - 16
fhKeeper/formulahousekeeper/timesheet_h5/src/views/expense/index.vue

@@ -13,23 +13,23 @@
                     <!-- 报销人 -->
                     <van-field label="报销人" @click="ownerIdShowCli(1)" readonly clickable required>
                         <template #input>
-                            <span v-if="user.userNameNeedTranslate == 1 && formshowText.name"><ww-open-data type='userName'
-                                    :openid='formshowText.name'></ww-open-data></span>
+                            <span v-if="user.userNameNeedTranslate == 1 && formshowText.name"><TranslationOpenDataText type='userName'
+                                    :openid='formshowText.name'></TranslationOpenDataText></span>
                             <span v-else>{{ formshowText.name }}</span>
                         </template>
                     </van-field>
                     <div v-if="auditTypeItem.auditType == 2">
                         <van-field label="第一审核人" @click="ownerIdShowCli(2)" readonly clickable required>
                             <template #input>
-                                <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName'
-                                        :openid='firstCheckerText.name'></ww-open-data></span>
+                                <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName'
+                                        :openid='firstCheckerText.name'></TranslationOpenDataText></span>
                                 <span v-else>{{ firstCheckerText.name }}</span>
                             </template>
                         </van-field>
                         <van-field label="第二审核人" @click="ownerIdShowCli(3)" readonly clickable required>
                             <template #input>
-                                <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName'
-                                        :openid='secondCheckerText.name'></ww-open-data></span>
+                                <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName'
+                                        :openid='secondCheckerText.name'></TranslationOpenDataText></span>
                                 <span v-else>{{ secondCheckerText.name }}</span>
                             </template>
                         </van-field>
@@ -40,9 +40,9 @@
                                 <van-radio-group v-model="userRadio" v-if="user.userNameNeedTranslate == '1'">
                                     <div v-for="item in userList" :key="item.id">
                                         <van-radio :name="item" class="popupItem marginNone borderNone" v-if="item.id != user.id || ownerIdShowType == 1">
-                                            <!-- <ww-open-data type='userName' :openid='item.name'></ww-open-data> -->
+                                            <!-- <TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText> -->
                                             <span class="userNameClass_left">
-                                                <ww-open-data type='userName' :openid='item.name'></ww-open-data>
+                                                <TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText>
                                             </span>
                                             <span class="userNameClass_right">
                                                 {{ item.jobNumber }}
@@ -198,8 +198,8 @@
                         <template #title>
                             <div class="collapse_label_l">票据编号:{{ item.code }}</div>
                             <div class="collapse_label_r">报销人:
-                                <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName'
-                                        :openid='item.ownerName'></ww-open-data></span>
+                                <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName'
+                                        :openid='item.ownerName'></TranslationOpenDataText></span>
                                 <span v-else>{{ item.ownerName }}</span>
                             </div>
                             <div class="collapse_label_l">金额: ¥{{ item.totalAmount | numtosum }}</div>
@@ -210,8 +210,8 @@
                             <div><span>票据编号:</span><span>{{ item.code }}</span></div>
                             <div><span>金额:</span><span>¥{{ item.totalAmount | numtosum }}</span></div>
                             <div><span>报销人:</span>
-                                <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName'
-                                        :openid='item.ownerName'></ww-open-data></span>
+                                <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName'
+                                        :openid='item.ownerName'></TranslationOpenDataText></span>
                                 <span v-else>{{ item.ownerName }}</span>
                             </div>
                             <div><span>填报日期:</span><span>{{ item.createDate }}</span></div>
@@ -239,8 +239,8 @@
                         <template #title>
                             <div class="collapse_label_l">票据编号:{{ item.code }}</div>
                             <div class="collapse_label_r">报销人:
-                                <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName'
-                                        :openid='item.ownerName'></ww-open-data></span>
+                                <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName'
+                                        :openid='item.ownerName'></TranslationOpenDataText></span>
                                 <span v-else>{{ item.ownerName }}</span>
                             </div>
                             <div class="collapse_label_l">金额: ¥{{ item.totalAmount | numtosum }}</div>
@@ -267,8 +267,8 @@
                             <div><span>票据编号:</span><span>{{ item.code }}</span></div>
                             <div><span>金额:</span><span>¥{{ item.totalAmount | numtosum }}</span></div>
                             <div><span>报销人:</span>
-                                <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName'
-                                        :openid='item.ownerName'></ww-open-data></span>
+                                <span v-if="user.userNameNeedTranslate == 1"><TranslationOpenDataText type='userName'
+                                        :openid='item.ownerName'></TranslationOpenDataText></span>
                                 <span v-else>{{ item.ownerName }}</span>
                             </div>
                             <div><span>填报日期:</span><span>{{ item.createDate }}</span></div>

+ 19 - 1
fhKeeper/formulahousekeeper/timesheet_h5/src/views/index/index.vue

@@ -107,11 +107,29 @@
             if(this.jobNumberCheckCompanyId.includes(companyId) && !jobNumber) {
                 this.$router.push("/editPerfect");
             }
+
+            if(this.user.dingdingUserid) {
+                this.setDDOpenData()
+            }
         },
         components: {
             Footer
         },
         methods: {
+            setDDOpenData() {
+                const ddUrl = new URL(window.location.href);
+                const ddCorpid = ddUrl.searchParams.get("corpid") || ''
+                let ddOpenDataInit = window.DTOpenData.init(ddCorpid)
+                console.log(ddOpenDataInit, '<=== 钉钉执行 window.DTOpenData.init(ddCorpid) 的判断')
+                if (ddOpenDataInit) {
+                    setTimeout(() => {
+                        console.log('<==== 执行 window.DTOpenData.update(document.querySelectorAll(dt-open-data))')
+                        window.DTOpenData.update(document.querySelectorAll('dt-open-data'));
+                    }, 300)
+                }else {
+                    console.log('钉钉没有触发')
+                }
+            },
             pfdClick(item) {
                 if(item.name == '使用说明') {
                     let url = 'http://celiang.oss-cn-hangzhou.aliyuncs.com/measurement/2022-01/18/75it6phpocqYFV1642488558220118.pdf'
@@ -304,7 +322,7 @@
                                             // console.log(result, '请求微信成功')
                                             // console.log(window, 'window')
                                             //  wx.agentConfig成功回调后,WWOpenData 才会注入到 window 对象上面
-                                            window.WWOpenData.bind(document.querySelector('ww-open-data'))
+                                            window.WWOpenData.bind(document.querySelector('TranslationOpenDataText'))
                                             // that.kefuShow = true
                                         },
                                         fail: function (res) {

+ 12 - 0
fhKeeper/formulahousekeeper/timesheet_h5/src/views/login/index.vue

@@ -177,6 +177,13 @@
                 var weixinUrl="https://open.weixin.qq.com/connect/oauth2/authorize?appid="+appId+"&redirect_uri="+encodeURI(url)+"&response_type=code&scope=snsapi_base&state=0#wechat_redirect";
                 window.location.href = weixinUrl;
             },
+            tryDingDingUrlRedirect() {
+                let currentAddress = window.location.href+'?ddLoginUnique=true';
+                let ddFixedPrefix = 'http://auth.dingtalk.com/login?redirectUri='
+                let ddFixedUrl = 'https://login.dingtalk.com/oauth2/auth?response_type=code&client_id=dingwa4tibze6jwz7mgv&scope=openid&state=dddd&redirect_uri=' + encodeURIComponent(`${ddFixedPrefix}${currentAddress}`)
+                window.location.href = ddFixedUrl;
+                // window.location.href = window.location.href+'?ddLoginUnique=true';
+            },
             loginByUserId(userId) {
                 this.$axios.get("/user/loginByUserId", {params:{userId:userId}})
                     .then(res => {
@@ -291,6 +298,11 @@
                     } else {
                         //检查环境,如果是钉钉有$CORPID$
                         if(href.indexOf("corpid") > 0) {
+                            if(!(window.location.href.indexOf("ddLoginUnique") > 0)) {
+                                this.tryDingDingUrlRedirect()
+                                return
+                            }
+
                             var key = '?corpid=';
                             var jumpkey = '&jumpto=';
                             var url = location.href;

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet_h5/src/views/msg/index.vue

@@ -9,7 +9,7 @@
                 <template #title>
                     <span v-if="user.userNameNeedTranslate == 1 && item.msg != null && item.msg.indexOf('$userName=') != -1">
                         <span>{{item.msg1}}</span>
-                        <ww-open-data type='userName' :openid='item.msg2'></ww-open-data>
+                        <TranslationOpenDataText type='userName' :openid='item.msg2'></TranslationOpenDataText>
                         <span>{{item.msg3}}</span>
                     </span>
                     <span v-else-if="item.msg != null">{{item.msg}}</span>

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet_h5/src/views/my/children/center.vue

@@ -5,7 +5,7 @@
             <div class="beijin"></div>
             <div class="flex aic users pixed" style="width:50%;">
                 <img :src="require('../../../assets/img/personal/userHead.png')" class="imege" />
-                <span class="f16 fff ml-20" v-if="userInfo.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='userInfo.name'></ww-open-data></span>
+                <span class="f16 fff ml-20" v-if="userInfo.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='userInfo.name'></TranslationOpenDataText></span>
                 <span class="f16 fff ml-20" v-else>{{userInfo.name}} </span>
             </div>
         </header>

+ 6 - 6
fhKeeper/formulahousekeeper/timesheet_h5/src/views/project/edit.vue

@@ -72,7 +72,7 @@
                 <span v-if="projectDetail.auditorList.length > 0">
                     <span v-for="(items, indexs) in projectDetail.auditorList" :key="indexs">
                         <span v-if="user.userNameNeedTranslate != '1'">{{items.auditorName}}</span>
-                        <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='items.auditorName'></ww-open-data></span>
+                        <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='items.auditorName'></TranslationOpenDataText></span>
                         <span v-if="projectDetail.auditorList.length - 1 > indexs">,</span>
                     </span>
                 </span>
@@ -83,7 +83,7 @@
                 <van-search v-model="userName" placeholder="输入员工姓名搜索" @search="onSearch" v-if="user.userNameNeedTranslate != '1'"></van-search>
                 <div style="minHeight:300px;">
                 <template v-if="user.userNameNeedTranslate == '1'">
-                    <van-checkbox class="userCheckbox" v-for="(item) in dailyUserList" :key="item.id" v-model="item.isChecked" ><ww-open-data type='userName' :openid='item.name'></ww-open-data></van-checkbox>
+                    <van-checkbox class="userCheckbox" v-for="(item) in dailyUserList" :key="item.id" v-model="item.isChecked" ><TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText></van-checkbox>
                 </template>
                 <template v-else>
                     <van-checkbox class="userCheckbox" v-for="(item) in dailyUserList" :key="item.id" v-model="item.isChecked" >{{item.name}}</van-checkbox>
@@ -98,7 +98,7 @@
                 <span v-if="!projectDetail.userNames"></span>
                 <span v-else-if="user.userNameNeedTranslate == '1'">
                     <span v-for="item,index in projectDetail.userNames.split(',')" :key="item">
-                        <ww-open-data type='userName' :openid='item'></ww-open-data>
+                        <TranslationOpenDataText type='userName' :openid='item'></TranslationOpenDataText>
                         <span v-if="index != (projectDetail.userNames.split(',').length - 1)">,</span>
                     </span>
                 </span>
@@ -109,7 +109,7 @@
                 <van-search v-model="userName" placeholder="输入员工姓名搜索" @search="onSearch" v-if="user.userNameNeedTranslate != '1'"></van-search>
                 <div style="minHeight:300px;">
                 <template v-if="user.userNameNeedTranslate == '1'">
-                    <van-checkbox class="userCheckbox" v-for="(item) in userList" :key="item.id" v-model="item.isChecked" ><ww-open-data type='userName' :openid='item.name'></ww-open-data></van-checkbox>
+                    <van-checkbox class="userCheckbox" v-for="(item) in userList" :key="item.id" v-model="item.isChecked" ><TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText></van-checkbox>
                 </template>
                 <template v-else>
                     <van-checkbox class="userCheckbox" v-for="(item) in userList" :key="item.id" v-model="item.isChecked" >{{item.name}}</van-checkbox>
@@ -120,7 +120,7 @@
         <!-- 项目经理 -->
         <van-field label="项目经理" @click="editProjectMan ? inchargerShow = true : ''" readonly clickable :disabled="!editProjectMan">
             <template #input>
-                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='projectDetail.inchargerName'></ww-open-data></span>
+                <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='projectDetail.inchargerName'></TranslationOpenDataText></span>
                 <span v-else>{{projectDetail.inchargerName}}</span>
             </template>
         </van-field>
@@ -133,7 +133,7 @@
                 @cancel="inchargerShow = false"
                 >
                 <template #option="item">
-                    <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.name'></ww-open-data></span>
+                    <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText></span>
                     <span v-else>{{item.name}}</span>
                 </template>
                 </van-picker>

+ 5 - 5
fhKeeper/formulahousekeeper/timesheet_h5/src/views/project/index.vue

@@ -54,7 +54,7 @@
                         <template #input>
                             <span v-if="user.userNameNeedTranslate == '1'">
                                 <span v-for="item,index in form.userNames.split(',')" :key="item">
-                                    <ww-open-data type='userName' :openid='item'></ww-open-data>
+                                    <TranslationOpenDataText type='userName' :openid='item'></TranslationOpenDataText>
                                     <span v-if="index != (form.userNames.split(',').length - 1)">,</span>
                                 </span>
                             </span>
@@ -64,7 +64,7 @@
                     <van-field readonly clickable  v-model="form.inchargerName"  label="项目经理" 
                     placeholder="请选择项目经理" @click="showPickerIncharger = true">
                         <template #input>
-                            <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='form.inchargerName'></ww-open-data></span>
+                            <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='form.inchargerName'></TranslationOpenDataText></span>
                             <span v-else>{{form.inchargerName}}</span>
                         </template>
                     </van-field>
@@ -78,7 +78,7 @@
                 <!-- <van-search v-model="userName" placeholder="输入员工姓名搜索" @search="onSearch" v-if="user.userNameNeedTranslate != '1'"></van-search>
                 <div style="minHeight:300px;">
                 <template v-if="user.userNameNeedTranslate == '1'">
-                    <van-checkbox class="userCheckbox" v-for="(item) in userList" :key="item.id" v-model="item.isChecked" ><ww-open-data type='userName' :openid='item.name'></ww-open-data></van-checkbox>
+                    <van-checkbox class="userCheckbox" v-for="(item) in userList" :key="item.id" v-model="item.isChecked" ><TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText></van-checkbox>
                 </template>
                 <template v-else>
                     <van-checkbox class="userCheckbox" v-for="(item) in userList" :key="item.id" v-model="item.isChecked" >{{item.name}}</van-checkbox>
@@ -94,7 +94,7 @@
                         <div class="popupConBox" v-if="user.userNameNeedTranslate == '1'">
                             <van-checkbox class="popupItem marginNone borderNone" v-for="(item) in userList" :key="item.id" v-model="item.isChecked" >
                                 <span class="userNameClass_left">
-                                    <ww-open-data type='userName' :openid='item.name'></ww-open-data>
+                                    <TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText>
                                 </span>
                                 <span class="userNameClass_right">
                                     {{ item.jobNumber }}
@@ -118,7 +118,7 @@
             <van-popup v-model="showPickerIncharger" position="bottom">
                 <van-picker show-toolbar :columns="inchargerUserList" value-key="name" @confirm="choseIncharger" @cancel="showPickerIncharger = false">
                     <template #option="item">
-                        <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.name'></ww-open-data></span>
+                        <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText></span>
                         <span v-else>{{item.name}}</span>
                     </template>
                 </van-picker>

+ 4 - 4
fhKeeper/formulahousekeeper/timesheet_h5/src/views/project/projectInside.vue

@@ -37,7 +37,7 @@
                             <van-col span="7">所属部门:</van-col>
                             <van-col span="17">
                                 <span v-if="user.userNameNeedTranslate != 1">{{projectDetail.departmentName}}</span>
-                                <span v-else><ww-open-data type='departmentName' :openid='projectDetail.departmentName'></ww-open-data></span>
+                                <span v-else><TranslationOpenDataText type='departmentName' :openid='projectDetail.departmentName'></TranslationOpenDataText></span>
                             </van-col>
                         </van-row>
                     </van-cell>
@@ -152,7 +152,7 @@
                             <van-col span="7">项目经理:</van-col>
                             <van-col span="17">
                                 <span v-if="user.userNameNeedTranslate != 1">{{projectDetail.inchargerName}}</span>
-                                <span v-else><ww-open-data type='userName' :openid='projectDetail.inchargerName'></ww-open-data></span>
+                                <span v-else><TranslationOpenDataText type='userName' :openid='projectDetail.inchargerName'></TranslationOpenDataText></span>
                             </van-col>
                         </van-row>
                     </van-cell>
@@ -163,7 +163,7 @@
                                 <span v-for="item,index in projectDetail.auditorList" :key="item.id">
                                     <span v-if="index != 0">,</span>
                                     <span v-if="user.userNameNeedTranslate != 1">{{item.auditorName}}</span>
-                                    <span v-else><ww-open-data type='userName' :openid='item.auditorName'></ww-open-data></span>
+                                    <span v-else><TranslationOpenDataText type='userName' :openid='item.auditorName'></TranslationOpenDataText></span>
                                 </span>
                             </van-col>
                             <van-col span="17" v-else>-</van-col>
@@ -176,7 +176,7 @@
                                 <span v-for="item,index in projectDetail.participationList" :key="item.id">
                                     <span v-if="index != 0">,</span>
                                     <span v-if="user.userNameNeedTranslate != 1">{{item.name}}</span>
-                                    <span v-else><ww-open-data type='userName' :openid='item.name'></ww-open-data></span>
+                                    <span v-else><TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText></span>
                                 </span>
                             </van-col>
                         </van-row>

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet_h5/src/views/review/department_list.vue

@@ -5,7 +5,7 @@
             <van-skeleton  v-for="(item,index) in report" :key="index" title avatar :row="3" :loading="false">
                 <van-panel class="one_report" :title="item.name" status="待部门审核">
                     <template #header>
-                        <span class="report_name" v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.name'></ww-open-data></span>
+                        <span class="report_name" v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText></span>
                         <span class="report_name" v-else>{{item.name}}</span>
                     </template>
                     <div class="form_text">

+ 7 - 7
fhKeeper/formulahousekeeper/timesheet_h5/src/views/review/index.vue

@@ -17,7 +17,7 @@
                     <template #default>
                         <span v-if="user.userNameNeedTranslate == '1'">
                             <span v-for="item,index in userNameValue.split(',')" :key="item">
-                                <ww-open-data type='userName' :openid='item'></ww-open-data>
+                                <TranslationOpenDataText type='userName' :openid='item'></TranslationOpenDataText>
                                 <span v-if="index != (userNameValue.split(',').length - 1)">,</span>
                             </span>
                         </span>
@@ -29,7 +29,7 @@
                     <div style="minHeight:300px;">
                         <template v-if="user.userNameNeedTranslate == '1'">
                             <van-checkbox class="userCheckbox" v-for="(item) in showUserList" :key="item.id" v-model="item.isChecked" >
-                                <ww-open-data type='userName' :openid='item.name'></ww-open-data>
+                                <TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText>
                             </van-checkbox>
                         </template>
                         <template v-else>
@@ -48,7 +48,7 @@
                             <div class="popupConBox" v-if="user.userNameNeedTranslate == '1'">
                                 <van-checkbox class="popupItem marginNone borderNone" v-for="(item) in showUserList" :key="item.id" v-model="item.isChecked" >
                                     <span class="userNameClass_left">
-                                        <ww-open-data type='userName' :openid='item.name'></ww-open-data>
+                                        <TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText>
                                     </span>
                                     <span class="userNameClass_right">
                                         {{ item.jobNumber }}
@@ -83,7 +83,7 @@
                         <div class="van-cell van-panel__header">
                             <div class="van-cell__title" style="display:flex;algin-items:center">
                                 <van-checkbox v-model="item.checked" @click="itemChecked" shape="square" style="margin-right:2vw"></van-checkbox>
-                                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.name'></ww-open-data></span>
+                                <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText></span>
                                 <span v-else>{{item.name}}</span>
                             </div>
                             <div class="van-cell__value van-panel__header-value">{{item.state==0?(user.company.packageEngineering == 1 ? (item.data[0].departmentAuditState==-1?'待专业审核': (item.data[0].departmentAuditState==0?'待部门审核': '待项目经理审核')) : '待审核'):item.state==1?'已通过':'已驳回'}}</div>
@@ -104,20 +104,20 @@
                             <span v-if="item1.isDeptAudit==0">
                                 <span v-if="item1.projectAuditState==0">
                                     待项目审核人<span v-if="item1.projectAuditorName != null">(
-                                        <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item1.projectAuditorName'></ww-open-data></span>
+                                        <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item1.projectAuditorName'></TranslationOpenDataText></span>
                                         <span v-else>{{item1.projectAuditorName}}</span>
                                     )</span>审核
                                 </span>
                                 <span style="color:#32CD32;" v-else-if="item1.projectAuditState==1">
                                     项目审核人<span v-if="item1.projectAuditorName != null">(
-                                        <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item1.projectAuditorName'></ww-open-data></span>
+                                        <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item1.projectAuditorName'></TranslationOpenDataText></span>
                                         <span v-else>{{item1.projectAuditorName}}</span>
                                     )</span>审核通过
                                 </span>
                             </span>
                             <span v-else-if="item1.isDeptAudit==1">
-                                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='departmentName' :openid='item1.auditDeptName'></ww-open-data></span>
+                                <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='departmentName' :openid='item1.auditDeptName'></TranslationOpenDataText></span>
                                 <span v-else>{{item1.auditDeptName}}</span>
                                 审核
                             </span>

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet_h5/src/views/review/profession_list.vue

@@ -6,7 +6,7 @@
             <van-skeleton  v-for="(item,index) in report" :key="index" title avatar :row="3" :loading="false">
                 <van-panel class="one_report" :title="item.name" status="待专业审核">
                     <template #header>
-                        <span class="report_name" v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.name'></ww-open-data></span>
+                        <span class="report_name" v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.name'></TranslationOpenDataText></span>
                         <span class="report_name" v-else>{{item.name}}</span>
                     </template>
                     <div class="form_text">

+ 2 - 2
fhKeeper/formulahousekeeper/timesheet_h5/src/views/task/editask.vue

@@ -103,7 +103,7 @@
                         <template #input>
                             <span v-if="!item.executorName"></span>
                             <span v-else-if="user.userNameNeedTranslate != 1">{{item.executorName}}</span>
-                            <span v-else><ww-open-data type='userName' :openid='item.executorName'></ww-open-data></span>
+                            <span v-else><TranslationOpenDataText type='userName' :openid='item.executorName'></TranslationOpenDataText></span>
                         </template>
                     </van-field>
                     
@@ -159,7 +159,7 @@
                             <van-radio-group v-model="executor.item" class="popupItem marginNone borderNone">
                                 <van-radio v-for="uitem in executor.searchList" :key="uitem.id" :name="uitem" style="padding:10px">
                                     <span v-if="user.userNameNeedTranslate != 1" class="userNameClass_left">{{uitem.name}}</span>
-                                    <span v-else class="userNameClass_left"><ww-open-data type='userName' :openid='uitem.name'></ww-open-data></span>
+                                    <span v-else class="userNameClass_left"><TranslationOpenDataText type='userName' :openid='uitem.name'></TranslationOpenDataText></span>
                                     <span class="userNameClass_right">{{ uitem.jobNumber }}</span>
                                 </van-radio>
                             </van-radio-group>

+ 14 - 14
fhKeeper/formulahousekeeper/timesheet_h5/src/views/view/index.vue

@@ -16,7 +16,7 @@
                         <template #default>
                             <span v-if="user.userNameNeedTranslate == '1'">
                                 <span v-if="departmentText">
-                                    <ww-open-data type='departmentName' :openid='departmentText'></ww-open-data>
+                                    <TranslationOpenDataText type='departmentName' :openid='departmentText'></TranslationOpenDataText>
                                 </span>
                             </span>
                             <span v-else>{{ departmentText }}</span>
@@ -33,7 +33,7 @@
                         <template #default>
                             <span v-if="user.userNameNeedTranslate == '1'">
                                 <span v-if="selectPeopleVal.name">
-                                    <ww-open-data type='userName' :openid='selectPeopleVal.name'></ww-open-data>
+                                    <TranslationOpenDataText type='userName' :openid='selectPeopleVal.name'></TranslationOpenDataText>
                                 </span>
                             </span>
                             <span v-else>{{ selectPeopleVal.name }}</span>
@@ -56,8 +56,8 @@
                             <template #header>
                                 <div class="van-cell van-panel__header">
                                     <div class="van-cell__title">
-                                        <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName'
-                                                :openid='item.name'></ww-open-data></span>
+                                        <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName'
+                                                :openid='item.name'></TranslationOpenDataText></span>
                                         <span v-else>{{ item.name }}</span>
                                     </div>
                                     <div class="van-cell__value van-panel__header-value">
@@ -82,23 +82,23 @@
                                             <span v-if="item1.isDeptAudit == 0">
                                                 <span v-if="item1.projectAuditState == 0">
                                                     待项目审核人<span v-if="item1.projectAuditorName != null">(
-                                                        <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName'
-                                                                :openid='item1.projectAuditorName'></ww-open-data></span>
+                                                        <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName'
+                                                                :openid='item1.projectAuditorName'></TranslationOpenDataText></span>
                                                         <span v-else>{{ item1.projectAuditorName }}</span>
                                                         )</span>审核
                                                 </span>
                                                 <span style="color:#32CD32;" v-else-if="item1.projectAuditState == 1">
                                                     项目审核人<span v-if="item1.projectAuditorName != null">(
-                                                        <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName'
-                                                                :openid='item1.projectAuditorName'></ww-open-data></span>
+                                                        <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName'
+                                                                :openid='item1.projectAuditorName'></TranslationOpenDataText></span>
                                                         <span v-else>{{ item1.projectAuditorName }}</span>
                                                         )</span>审核通过
                                                 </span>
                                             </span>
                                             <span v-else-if="item1.isDeptAudit == 1">
-                                                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='departmentName'
-                                                        :openid='item1.auditDeptName'></ww-open-data></span>
+                                                <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='departmentName'
+                                                        :openid='item1.auditDeptName'></TranslationOpenDataText></span>
                                                 <span v-else>{{ item1.auditDeptName }}</span>
                                                 审核
                                             </span>
@@ -210,8 +210,8 @@
                             <van-radio-group v-model="selectPeopleVal">
                                 <van-radio v-for="uitem in showUserList" :key="uitem.id" :name="uitem" style="padding:10px"
                                     class="popupItem marginNone borderNone">
-                                    <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName'
-                                            :openid='uitem.name'></ww-open-data></span>
+                                    <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName'
+                                            :openid='uitem.name'></TranslationOpenDataText></span>
                                     <span v-else>{{ uitem.name ? uitem.name : '' }}</span>
                                 </van-radio>
                             </van-radio-group>
@@ -235,7 +235,7 @@
                         </span>
                         <span v-else>
                             <span v-if="selectDepartmentText.length > 0">
-                                <ww-open-data type='departmentName' :openid='selectDepartmentText[0].label'></ww-open-data>
+                                <TranslationOpenDataText type='departmentName' :openid='selectDepartmentText[0].label'></TranslationOpenDataText>
                             </span>
                             <span v-else>请选择部门</span>
                         </span>
@@ -245,7 +245,7 @@
                             <span class="custom-tree-node" slot-scope="{ node }">
                                 <span v-if="user.userNameNeedTranslate == '1'">
                                     <span>
-                                        <ww-open-data type='departmentName' :openid='node.label'></ww-open-data>
+                                        <TranslationOpenDataText type='departmentName' :openid='node.label'></TranslationOpenDataText>
                                     </span>
                                 </span>
                                 <span v-if="user.userNameNeedTranslate != '1'">

+ 2 - 2
fhKeeper/formulahousekeeper/timesheet_h5/vue.config.js

@@ -4,8 +4,8 @@ const path = require('path');
 const themePath = path.resolve(__dirname,'src/assets/style/theme.less');
 const Timestamp = new Date().getTime();
 
-var ip = '47.101.180.183'
-// var ip = '47.100.37.243'
+// var ip = '47.101.180.183'
+var ip = '47.100.37.243'
 // var ip = '192.168.2.8'
 // var ip = '127.0.0.1'