Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper into master

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

@@ -1390,5 +1390,6 @@
   "shan-chu-ji-lu": "Delete Record",
   "wanttodeletefirst": "Please select the record to delete first",
   "xuan-ze": "choose",
-  "dui-yi-you-xiang-mu-jin-hang-xin-xi-geng-xin": "Update information on existing projects"
+  "dui-yi-you-xiang-mu-jin-hang-xin-xi-geng-xin": "Update information on existing projects",
+  "dao-chu-qing-jia-dan": "Export leave request"
 }

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

@@ -1390,5 +1390,6 @@
   "profitratetrendchart": "利润率趋势图",
   "li-run-shuai": "利润率(%)",
   "bai-fen-bi": "百分比",
-  "dui-yi-you-xiang-mu-jin-hang-xin-xi-geng-xin": "对已有项目进行信息更新"
+  "dui-yi-you-xiang-mu-jin-hang-xin-xi-geng-xin": "对已有项目进行信息更新",
+  "dao-chu-qing-jia-dan": "导出请假单"
 }

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

@@ -209,7 +209,7 @@
                 <el-date-picker v-model="createDate" type="daterange" :range-separator="$t('other.to')" :start-placeholder="$t('time.startDate')" :end-placeholder="$t('time.endDate')" @change="chufas()" value-format="yyyy-MM-dd" :placeholder="$t('optiondate')" size="small" clearable style="width:280px"></el-date-picker>
             </div>
             <div>
-              <el-button type="primary" size="small" style="margin-left:20px" @click="exportLeave()">导出请假单</el-button>
+              <el-button type="primary" size="small" style="margin-left:20px" @click="exportLeave()">{{ $t('dao-chu-qing-jia-dan') }}</el-button>
             </div>
           </div>
             <el-table v-loading="loading" :data="tableData" style="width: 100%" height="94%">

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

@@ -389,7 +389,7 @@
                 <el-form-item :label="$t('projectclassification')" v-if="user.timeType.mainProjectState != '1'">
                     <!-- <el-select v-model="addForm.category"  style="width:32%;" clearable :disabled="!permissions.projectManagement && addForm.creatorId != user.id"> -->
                     <el-select v-model="addForm.category"  style="width:32%;" clearable>
-                        <el-option v-for="(item) in baseClfList" :key="item.id" :value="item.id" ::label="item.name"></el-option>
+                        <el-option v-for="(item) in baseClfList" :key="item.id" :value="item.id" :label="item.name"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item :label="$t('headerTop.projectName')" prop="name">