请假增加了类型，财务导入调整

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

@@ -4,8 +4,8 @@
       <h3><i class="iconfont firerock-iconbaoxiao" style="padding-right: 10px"></i>请假管理</h3>
       <el-divider ></el-divider>
       <el-col :span="12">
-        <el-menu default-active="1-1" class="el-menu-vertical-demo" @select="staffs" background-color="#ffffff" text-color="#666666" active-text-color="#20A0FF" style="width:100%">
-          <el-submenu index="1">
+        <el-menu default-active="1" class="el-menu-vertical-demo" @select="staffs" background-color="#ffffff" text-color="#666666" active-text-color="#20A0FF" style="width:100%">
+          <!-- <el-submenu index="1">
             <template slot="title">
               <i class="iconfont firerock-icontianbao"></i>
               <span>员工请假填报</span>
@@ -14,7 +14,11 @@
               <el-menu-item index="1-2"><p @click="ssl(1)">请病假</p></el-menu-item>
               <el-menu-item index="1-3"><p @click="ssl(2)">请年假</p></el-menu-item>
               <el-menu-item index="1-4"><p @click="ssl(3)">请产假</p></el-menu-item>
-          </el-submenu>
+          </el-submenu> -->
+          <el-menu-item index="1">
+            <i class="iconfont firerock-icontianbao"></i>
+            <span slot="title">员工请假填报</span>
+          </el-menu-item>
           <el-submenu index="2" v-if="user.role != 0">
             <template slot="title">
               <i class="iconfont firerock-iconbaoxiaodan"></i>
@@ -52,6 +56,13 @@
         <div class="ctons">
             <!-- 表单 -->
             <el-form ref="addForm" :model="addForm" label-width="80px" :rules="addFormRules">
+                <!-- 请假类型 -->
+                <el-form-item label="请假类型" prop="leaveType" style="width: 100%">
+                    <!--普通员工只能自己填报自己的 -->
+                    <el-select v-model="addForm.leaveType" @change="selts()" placeholder="请选择请假类型" style="width: 240px">
+                          <el-option v-for="item in qjType" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                    </el-select>
+                </el-form-item>
                 <!-- 请假人 -->
                 <el-form-item label="请假人" prop="ownerId"  style="width: 300px">
                     <!--普通员工只能自己填报自己的 -->
@@ -151,10 +162,11 @@
                 <el-table-column prop="tel" label="电话" width="120"></el-table-column>
                 <el-table-column prop="leaveType" label="请假类型" width="120">
                   <template slot-scope="scope">
-                    <div v-if="scope.row.leaveType == 0">事假</div>
+                    <!-- <div v-if="scope.row.leaveType == 0">事假</div>
                     <div v-if="scope.row.leaveType == 1">病假</div>
                     <div v-if="scope.row.leaveType == 2">年假</div>
-                    <div v-if="scope.row.leaveType == 3">产假</div>
+                    <div v-if="scope.row.leaveType == 3">产假</div> -->
+                    {{qjType[scope.row.leaveType].name}}
                   </template>
                 </el-table-column>
                 <el-table-column prop="startDate" label="请假开始时间" width="150"></el-table-column>
@@ -390,7 +402,8 @@ export default {
       addFormRules: {
         ownerId: [{ required: true, message: "请选择请假人", trigger: "blur" }],
         tel: [{required: true, validator: checkTel, trigger: 'blur'}],
-        timeDays: [{required: true, validator: checks, trigger: 'blur'}]
+        timeDays: [{required: true, validator: checks, trigger: 'blur'}],
+        leaveType: [{ required: true, message: "请选择请假类型", trigger: "blur" }]
       },
       user: JSON.parse(sessionStorage.getItem("user")),
       shuz: ['事假填报', '病假填报', '年假填报', '产假填报'],
@@ -490,7 +503,8 @@ export default {
       falg: 0,
       dialog: false,
       adform: {},
-      affId: ''
+      affId: '',
+      qjType: [{name: '事假',id: 0},{name: '病假',id: 1},{name: '年假',id: 2},{name: '产假',id: 3},{name: '婚假',id: 4},{name: '丧假',id: 5},{name: '调休假',id: 6},{name: '陪产假',id: 7},{name: '其他', id: 8}]
     };
   },
   computed: {},

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

@@ -117,7 +117,8 @@
          <el-dialog title="财务数据导入" v-if="importDialog" :visible.sync="importDialog" :close-on-click-modal="false" customClass="customWidth" width="500px">
             <el-form ref="form3" :model="importParam" >
                 <el-form-item label="导入月份" >
-                    <div style="color:orange;">{{date}}</div>
+                    <!-- <div style="color:orange;">{{date}}</div> -->
+                    <el-date-picker v-model="date" type="month" placeholder="选择月份" format="yyyy-MM" value-format="yyyy-MM"></el-date-picker>
                 </el-form-item>
                 <el-form-item prop="syncHistoryReport"  >
                     <el-checkbox label="重新计算该月已填日报成本" v-model="importParam.syncHistoryReport"></el-checkbox>