Sfoglia il codice sorgente

请假出差部门转译

Lijy 2 anni fa
parent
commit
77e02e8019

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

@@ -1918,7 +1918,7 @@ export default {
                     nodes = {userId: node.value, userName: node.label, auditorType: 2};
                   }
                 } else {
-                  if(node.managerId) {
+                  if(node.type == 'dep') {
                     nodes = {auditDeptId: node.value, auditDeptName: node.label, auditorType: 1};
                   } else {
                     nodes = {userId: node.value, userName: node.label, auditorType: 2};

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

@@ -430,6 +430,7 @@
                     <icon class="iconfont firerock-iconInsertLine addNode" @click="showNodeDialog(0)"></icon>
                     <icon class="iconfont firerock-iconright"></icon>
                     <span v-for="(item, index) in dataArray" :key="item.seq" >
+
                         <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>
@@ -438,6 +439,7 @@
                           <!-- {{item.userName}} -->
                             <ww-open-data type='userName' :openid='item.userName'></ww-open-data>
                         </el-button>
+
                         <el-button type="primary" v-if="item.auditorType == 1 && user.userNameNeedTranslate != 1" @click="editNodeDialog(index, item)">
                           {{item.auditDeptName}}
                         </el-button>
@@ -1452,7 +1454,7 @@ export default {
                     nodes = {userId: node.value, userName: node.label, auditorType: 2};
                   }
                 } else {
-                  if(node.managerId) {
+                  if(node.type == 'dep') {
                     nodes = {auditDeptId: node.value, auditDeptName: node.label, auditorType: 1};
                   } else {
                     nodes = {userId: node.value, userName: node.label, auditorType: 2};