2022.9.9 日报导出添加状态，报表css，组织架构调整

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

@@ -54,7 +54,8 @@
     "untrial": "untrial",
     "undone": "undone",
     "yes": "yes",
-    "no": "no"
+    "no": "no",
+    "alreadyPassedAndWaitingAudit": "already passed and Waiting audit"
   },
   "time": {
     "dueDate": "Due date",
@@ -241,7 +242,7 @@
     "allProject": "All project",
     "selectdepartment": "Select department",
     "allDepartments": "All departments",
-    "doesItContain": "Does it contain",
+    "doesItContain": "Status of Report",
     "doesNotIncludeUnreviewed": "Does not include unreviewed",
     "containsUnreviewed": "contains unreviewed",
     "laborStatisticsExport": "Labor Statistics Export",

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

@@ -54,7 +54,8 @@
     "untrial": "未审",
     "undone": "已撤销",
     "yes": "是",
-    "no": "否"
+    "no": "否",
+    "alreadyPassedAndWaitingAudit": "已通过和待审核"
   },
   "time": {
     "dueDate": "到期日期",
@@ -241,7 +242,7 @@
     "allProject": "全部项目",
     "selectdepartment": "选择部门",
     "allDepartments": "全部部门",
-    "doesItContain": "是否包含",
+    "doesItContain": "日报状态",
     "doesNotIncludeUnreviewed": "不包含未审核",
     "containsUnreviewed": "包含未审核",
     "laborStatisticsExport": "工时统计导出",

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

@@ -170,7 +170,7 @@
                 </el-dialog>
 
                 <!--修改信息-->
-                <el-dialog :title="$t('lable.modifyTheInformation')" width='450px' v-if="editInformation" :visible.sync="editInformation" :close-on-click-modal="false" customClass="customWidth">
+                <el-dialog :title="$t('title.modifyTheInformation')" width='450px' v-if="editInformation" :visible.sync="editInformation" :close-on-click-modal="false" customClass="customWidth">
                     <el-form :model="editInfoForm" label-width="auto" :rules="passRule" ref="editInfoForm">
                         <el-form-item :label="$t('lable.name')" prop="username">
                             <el-input v-model="editInfoForm.username" autocomplete="off" :placeholder="$t('defaultText.PleaseEnterYourName')"></el-input>

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

@@ -115,7 +115,7 @@
       <p style="float: right;margin-right: 25px;width:10%" ><el-button type="primary" @click="exportExcel" size="mini">报表导出</el-button></p>
     </div>
     <div ref="staff" style="margin: 5px 0px 0px 10px; width: 98%">
-        <div class="staff" ref="tabless" :style="'width:'+(windowWidth - 410)+'px'">
+        <div class="staff" ref="tabless" :style="'width:'+(windowWidth - 430)+'px'">
             <!--项目报表 -->
             <el-table v-if="ins == 0" key="0" border :data="list0" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;">
                 <el-table-column  prop="projectCode" label="项目编号"  width="120"></el-table-column>

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -260,7 +260,7 @@
                     </el-select>
                 </el-form-item>
                 <!-- 直属领导 -->
-                <el-form-item label="直属领导" prop="reportAuditUserid">
+                <el-form-item label="直属领导" prop="reportAuditUserid" v-if="user.timeType.needDeptAudit">
                     <el-select v-model="depForm.reportAuditUserid" filterable  clearable  placeholder="请选择直属领导" style="width: 100%">
                         <el-option v-for="item in users" :key="item.id" :label="item.name" :value="item.id"></el-option>
                     </el-select>
@@ -2613,7 +2613,7 @@ export default {
             form.managerId = this.depForm.managerId;
           }
           // console.log(this.depForm)
-          if (this.depForm.reportAuditUserid) {
+          if (this.depForm.reportAuditUserid && this.user.timeType.needDeptAudit) {
             form.reportAuditUserid = this.depForm.reportAuditUserid;
           }
           // 其他负责人

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

@@ -848,8 +848,9 @@
                 </el-form-item>
                 <el-form-item prop="stateKey" :label="$t('other.doesItContain')">
                     <el-select v-model="stateKey" :placeholder="$t('defaultText.pleaseChoose')" filterable style="width:350px;">
-                        <el-option :label="$t('other.doesNotIncludeUnreviewed')" value="0"></el-option>
-                        <el-option :label="$t('other.containsUnreviewed')" value="1"></el-option>
+                        <el-option :label="$t('state.alreadyPassed')" value="0"></el-option>
+                        <el-option :label="$t('state.WaitingAudit')" value="2"></el-option>
+                        <el-option :label="$t('state.alreadyPassedAndWaitingAudit')" value="1"></el-option>
                     </el-select>
                 </el-form-item>
             </el-form>