提交调整

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

@@ -19,23 +19,23 @@
                   <i class="iconfont firerock-iconbaobiao"></i>
                   <span>{{ $t('navigation.projectReportingService') }}</span>
                 </template>
-                  <el-menu-item index="1-1" v-if="permissions.reportProject || permissions.reportAllProject"><p @click="ssl(0)">{{ $t('projectreport') }}</p></el-menu-item>
-                  <el-menu-item index="1-2" v-if="permissions.reportTask || permissions.reportAllTask"><p @click="ssl(1)">{{ $t('projectTaskReport') }}</p></el-menu-item>
-                  <el-menu-item index="1-3" v-if="permissions.reportCostOf || permissions.reportAllCostOf"><p @click="ssl(2)">{{ $t('projectcoststatement') }}</p></el-menu-item>
-                  <el-menu-item index="1-14" v-if="permissions.reportAllOutputValue || permissions.reportOutputValue"><p @click="ssl(13)">{{ $t('projectcostbaselinetable') }}</p></el-menu-item>
-                  <el-menu-item index="1-9" v-if="permissions.reportAllTimeDivide || permissions.reportTimeDivide"><p @click="ssl(8)">{{ $t('personneltimeallocationtable') }}</p></el-menu-item>
-                  <el-menu-item index="1-4" v-if="permissions.reportCostWarning"><p @click="ssl(7)">{{ $t('timecostearlywarningtable') }}</p></el-menu-item>
-                  <el-menu-item index="1-5" v-if="permissions.reportBalance || permissions.reportAllBalance"><p @click="ssl(3)">{{ $t('projectbalancesheet') }}</p></el-menu-item>
-                  <el-menu-item index="1-6" v-if="user.company.packageCustomer == 1 && permissions.reportProfits"><p @click="ssl(4)">{{ $t('customerprojectincomestatement') }}</p></el-menu-item>
-                  <el-menu-item index="1-7" v-if="permissions.reportPhase || permissions.reportAllPhase"><p @click="ssl(5)">{{ $t('projectphasetimesheet') }}</p></el-menu-item>
-                  <el-menu-item index="1-13" v-if="permissions.reportAllGroup || permissions.reportGroup"><p @click="ssl(12)">{{ $t('taskgrouptimesheet') }}</p></el-menu-item>
-                  <el-menu-item index="1-8" v-if="permissions.reportAllOvertime || permissions.reportOvertime"><p @click="ssl(6)">{{ $t('statisticsofovertimework') }}</p></el-menu-item>
+                  <el-menu-item index="1-1" v-if="permissions.reportProject || permissions.reportAllProject" @click="ssl(0)"><p>{{ $t('projectreport') }}</p></el-menu-item>
+                  <el-menu-item index="1-2" v-if="permissions.reportTask || permissions.reportAllTask" @click="ssl(1)"><p>{{ $t('projectTaskReport') }}</p></el-menu-item>
+                  <el-menu-item index="1-3" v-if="permissions.reportCostOf || permissions.reportAllCostOf" @click="ssl(2)"><p>{{ $t('projectcoststatement') }}</p></el-menu-item>
+                  <el-menu-item index="1-14" v-if="permissions.reportAllOutputValue || permissions.reportOutputValue" @click="ssl(13)"><p>{{ $t('projectcostbaselinetable') }}</p></el-menu-item>
+                  <el-menu-item index="1-9" v-if="permissions.reportAllTimeDivide || permissions.reportTimeDivide" @click="ssl(8)"><p>{{ $t('personneltimeallocationtable') }}</p></el-menu-item>
+                  <el-menu-item index="1-4" v-if="permissions.reportCostWarning" @click="ssl(7)"><p>{{ $t('timecostearlywarningtable') }}</p></el-menu-item>
+                  <el-menu-item index="1-5" v-if="permissions.reportBalance || permissions.reportAllBalance" @click="ssl(3)"><p>{{ $t('projectbalancesheet') }}</p></el-menu-item>
+                  <el-menu-item index="1-6" v-if="user.company.packageCustomer == 1 && permissions.reportProfits" @click="ssl(4)"><p>{{ $t('customerprojectincomestatement') }}</p></el-menu-item>
+                  <el-menu-item index="1-7" v-if="permissions.reportPhase || permissions.reportAllPhase" @click="ssl(5)"><p>{{ $t('projectphasetimesheet') }}</p></el-menu-item>
+                  <el-menu-item index="1-13" v-if="permissions.reportAllGroup || permissions.reportGroup" @click="ssl(12)"><p>{{ $t('taskgrouptimesheet') }}</p></el-menu-item>
+                  <el-menu-item index="1-8" v-if="permissions.reportAllOvertime || permissions.reportOvertime" @click="ssl(6)"><p>{{ $t('statisticsofovertimework') }}</p></el-menu-item>
 
-                  <el-menu-item index="1-10" v-if="permissions.reportAllTimely || permissions.reportTimely"><p @click="ssl(9)">{{ $t('employeereporttimelinessrate') }}</p></el-menu-item>
-                  <el-menu-item index="1-11" v-if="permissions.reportAuditRate"><p @click="ssl(10)">{{ $t('dailyreporttobereviewedstatistics') }}</p></el-menu-item>
-                  <el-menu-item index="1-12" v-if="permissions.reportPersonnel || permissions.reportResponsible"><p @click="ssl(11)">{{ $t('statisticsofpersonnelhours') }}</p></el-menu-item>
-                  <el-menu-item index="1-15" v-if="permissions.reportMonthlyPersonnel || permissions.reportResponsiblePersonnel"><p @click="ssl(14)">{{ $t('ren-yuan-yue-du-gong-shi-biao') }}</p></el-menu-item>
-                  <el-menu-item index="1-16" v-if="permissions.reportAllDepartmentParticipation || permissions.reportResponsibleDepartmentParticipation"><p @click="ssl(15)">{{ $t('bumenchanyuqingkuang') }}</p></el-menu-item>
+                  <el-menu-item index="1-10" v-if="permissions.reportAllTimely || permissions.reportTimely" @click="ssl(9)"><p>{{ $t('employeereporttimelinessrate') }}</p></el-menu-item>
+                  <el-menu-item index="1-11" v-if="permissions.reportAuditRate" @click="ssl(10)"><p>{{ $t('dailyreporttobereviewedstatistics') }}</p></el-menu-item>
+                  <el-menu-item index="1-12" v-if="permissions.reportPersonnel || permissions.reportResponsible" @click="ssl(11)"><p>{{ $t('statisticsofpersonnelhours') }}</p></el-menu-item>
+                  <el-menu-item index="1-15" v-if="permissions.reportMonthlyPersonnel || permissions.reportResponsiblePersonnel" @click="ssl(14)"><p>{{ $t('ren-yuan-yue-du-gong-shi-biao') }}</p></el-menu-item>
+                  <el-menu-item index="1-16" v-if="permissions.reportAllDepartmentParticipation || permissions.reportResponsibleDepartmentParticipation" @click="ssl(15)"><p>{{ $t('bumenchanyuqingkuang') }}</p></el-menu-item>
                   <!-- <el-menu-item index="1-12"><p @click="ssl(11)">人员工时统计表</p></el-menu-item> -->
                 </el-submenu>
               </el-menu>

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

@@ -1031,7 +1031,7 @@
                 
             </el-form>
             <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="exportUserTime" style="width:100%;" >{{$t('export.export')}}</el-button>
+                <el-button type="primary" @click="exportUserTime" style="width:100%;" :loading="listLoading">{{$t('export.export')}}</el-button>
             </div>
         </el-dialog>
         <!--人员列表 -->
@@ -1189,7 +1189,7 @@
               
               <!-- 222 -->
             </div>
-            <div>
+            <div v-if="user.userNameNeedTranslate != 1">
                 <el-input style="float:left;width:22%" v-model="searchKeyword" class="input-with-select" :placeholder="$t('defaultText.pleaseEnterNametoSearch')" clearable="true" size="small">
                     <el-button slot="append" @click="searchScreen(0)" icon="el-icon-search"></el-button>
                 </el-input>
@@ -1359,7 +1359,7 @@
               <el-button size="small" @click="getThisWeek()">{{$t('time.nextWeek')}}</el-button>
               
             </div>
-            <div>
+            <div v-if="user.userNameNeedTranslate != 1">
                 <el-input style="float:left;width:22%" v-model="searchKeyword" class="input-with-select" :placeholder="$t('defaultText.pleaseEnterNametoSearch')" clearable="true" size="small">
                     <el-button slot="append" @click="searchScreen(1)" icon="el-icon-search"></el-button>
                 </el-input>