提交最新代码（加个标识备注）

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

@@ -0,0 +1,87 @@
+<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")),
+            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() {
+            window.DTOpenData.update(document.querySelectorAll('dt-open-data'));
+        }
+    },
+}
+</script>
+<style scoped lang='scss'>
+.translation {
+    width: auto;
+    display: inline-block;
+}
+</style>

fhKeeper/formulahousekeeper/timesheet/src/main.js

@@ -77,6 +77,8 @@ Vue.use(Print)
 // 全局转译组件
 import TranslationOpenData from '@/components/translationOpenData.vue'
 Vue.component('TranslationOpenData', TranslationOpenData)
+import TranslationOpenDataText from '@/components/TranslationOpenDataText.vue'
+Vue.component('TranslationOpenDataText', TranslationOpenDataText)
 
 var addRouFlag = false; 
 //角色权限对应关系

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

@@ -48,22 +48,10 @@
                                 </el-select>
                             </div>
                             <div>
-                                <!-- <el-tree :data="data" @node-click="handleNodeClick" @node-collapse="nodeChange" @node-expand="nodeChange" node-key="id" :default-expanded-keys="expandDate" v-loading="dataLoading"> -->
                                 <el-tree :data="data" @node-click="handleNodeClick" @node-collapse="nodeChangeCollapse" @node-expand="nodeChangeExpand" ref="treeDataRef" :default-expanded-keys="nodeModelData" node-key="id" v-loading="dataLoading">
                                     <span class="custom-tree-node"  style="position: relative;box-sizing: border-box;width: 10%;" slot-scope="{ node, data}">
-                                        <!-- <span>{{ node.label }}</span> -->
                                         <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'">
-                                                <span v-if="node.data.children">
-                                                    <ww-open-data type='departmentName' :openid='node.label'></ww-open-data>
-                                                </span>
-                                                <span v-else>
-                                                    <ww-open-data type='userName' :openid='node.label'></ww-open-data>
-                                                </span>
-                                            </span>
-                                            <span v-if="user.userNameNeedTranslate != '1'">
-                                                {{ node.label }}
-                                            </span>
+                                            <TranslationOpenData :configurationItems="{ openType: node.data.children ? 'departmentName' : 'userName', openId: node.label, renderIndex: 0 }"/>
                                             
                                             <span v-if="data.membCount != null && data.isUser == null">({{data.membCount}})</span>
                                         </span>
@@ -118,8 +106,12 @@
                                     <span v-if="permissions.reportsCompany||user.manageDeptId != 0 || permissions.reportsDept"> | 
                                         <!-- {{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'">
+                                            <TranslationOpenData :configurationItems="{ openType: 'departmentName', openId: depData.label, renderIndex: 0 }" />
+                                        </span>
+                                        <span v-if="translation == '3' && user.userNameNeedTranslate == '1'">
+                                            <TranslationOpenData :configurationItems="{ openType: 'userName', openId: depData.label, renderIndex: 0 }" />
+                                        </span>
                                         <span v-if="user.userNameNeedTranslate != '1'">{{depData != null ?depData.label:""}}</span>
                                     <span v-if="targetUid == null">
                                     <!-- - 已提交 -->
@@ -158,7 +150,7 @@
                                     <i class="fa fa-circle"></i>
                                     <!-- {{item1.name}} -->
                                     <span v-if="user.userNameNeedTranslate == '1'">
-                                        <ww-open-data type='userName' :openid='item1.name'></ww-open-data>
+                                        <TranslationOpenData :configurationItems="{ openType: 'userName', openId: item1.name, renderIndex: 0 }" />
                                     </span>
                                     <span v-if="user.userNameNeedTranslate != '1'">
                                         {{item1.name}}
@@ -202,10 +194,7 @@
                                                                 <!-- 待项目审核人 --> {{$t('other.waitForTheProjectReviewer')}}
                                                                 <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>
-                                                                    </span>
-                                                                    <span v-if="user.userNameNeedTranslate != '1'">{{item2.projectAuditorName}}</span>
+                                                                    <TranslationOpenData :configurationItems="{ openType: 'userName', openId: item2.projectAuditorName, renderIndex: 0 }" />
                                                                     )</span> 
                                                                 <!-- 审核 --> {{$t('other.audit')}}
                                                             </span>
@@ -213,10 +202,7 @@
                                                                 <!-- 项目审核人 --> {{$t('other.projectAuditor')}}
                                                                 <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>
-                                                                    </span>
-                                                                    <span v-if="user.userNameNeedTranslate != '1'">{{item2.projectAuditorName}}</span>
+                                                                    <TranslationOpenData :configurationItems="{ openType: 'userName', openId: item2.projectAuditorName, renderIndex: 0 }" />
                                                                     )</span>
                                                                 <!-- 审核通过 --> {{$t('state.approved')}}
                                                             </span>
@@ -224,10 +210,7 @@
                                                         <span v-else-if="item2.isDeptAudit==1">
                                                             <!-- {{($t('other.await') +' '+ item2.auditDeptName +' '+ $t('other.audit'))}} -->
                                                             ({{$t('other.await')}}
-                                                            <span v-if="user.userNameNeedTranslate == '1'">
-                                                                <ww-open-data type='departmentName'   :openid='user.timeType.reportAuditType==4?item2.buDepartmentName:item2.auditDeptName'></ww-open-data>
-                                                            </span>
-                                                            <span v-if="user.userNameNeedTranslate != '1'">{{user.timeType.reportAuditType==4?item2.buDepartmentName:item2.auditDeptName}}</span>
+                                                            <TranslationOpenData :configurationItems="{ openType: 'departmentName', openId: user.timeType.reportAuditType==4?item2.buDepartmentName:item2.auditDeptName, renderIndex: 0 }" />
                                                             {{$t('other.audit')}})
                                                         </span>
                                                         ]</span> 
@@ -246,12 +229,13 @@
                                                         <span style="margin-left:15px;color:#DAA520;" v-if="item2.state == 0 && item2.departmentAuditState == 0">[ {{$t('other.waitingForDepartmentReview')}} ]</span>
                                                         <span style="margin-left:15px;color:#DAA520;" v-if="item2.state == 0 && item2.departmentAuditState == 1">[ {{$t('other.waitForTheProjectReviewer')}}<span v-if="item2.projectAuditorName != null">
                                                             (
-                                                                <span v-if="user.userNameNeedTranslate != 1">
+                                                                <!-- <span v-if="user.userNameNeedTranslate != 1">
                                                                     {{item2.projectAuditorName}}
                                                                 </span>
                                                                 <span v-if="user.userNameNeedTranslate == 1">
                                                                     <ww-open-data type='userName' :openid='item2.projectAuditorName'></ww-open-data>
-                                                                </span>
+                                                                </span> -->
+                                                                <TranslationOpenData :configurationItems="{ openType: 'userName', openId: item2.projectAuditorName, renderIndex: 0 }" />
                                                             )
                                                         </span>{{$t('other.audit')}} ]</span>
                                                         <span style="margin-left:15px;color:#32CD32;" v-else-if="item2.state == 1">[ {{$t('state.alreadyPassed')}} ]</span>