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

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

@@ -1369,7 +1369,7 @@ export default {
         //首先判断文件类型
         let str = item.file.name.split(".");
         let format = str[str.length - 1];
-        if (format != "jpg" && format != "png") {
+        if (format != "jpg" && format != "png" && format != "pdf") {
             this.$message({
                 message: this.$t('pleaseselectpictures'),
                 type: "error"
@@ -1418,7 +1418,7 @@ export default {
         //首先判断文件类型
         let str = item.file.name.split(".");
         let format = str[str.length - 1];
-        if (format != "jpg" && format != "png") {
+        if (format != "jpg" && format != "png" && format != "pdf") {
             this.$message({
                 message: this.$t('pleaseselectpictures'),
                 type: "error"

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

@@ -1771,7 +1771,6 @@ export default {
         });
     },
     billss() {
-      this.page = 1
       var param = {pageIndex: this.page,
                     pageSize: this.size,
                     status: this.code,
@@ -1974,6 +1973,7 @@ export default {
         this.addForm.timeHours = parseInt(this.addForm.timeHours)
     },
     handleSizeChange(val){
+      this.page = 1
       this.size = val;
       this.bills()
     },