费用报销模块调整

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -4,8 +4,8 @@ var path = require('path')
 // var ip = '192.168.2.36'
 
  
-var ip = '47.100.37.243'
-// var ip = '192.168.2.85'
+// var ip = '47.100.37.243'
+var ip = '192.168.2.105'
 
 // var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
 

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

@@ -197,15 +197,19 @@
       <div v-if="displayTable">
         <div style="padding-left:10px;padding-right:10px;">
           <div>
-          <el-form label-width="80px" inline >
-            <!-- 填报日期 -->
+          <el-form label-width="70px" inline >
+            <!-- 报销人 -->
+            <el-form-item label="报销人">
+              <el-select v-model="ownerId" size="small" clearable placeholder="选择报销人" style="width: 120px" :disabled="user.role == 0" filterable="true">
+                <span v-for="(item, index) in users" :key="index">
+                  <el-option :label="item.name" :value="item.id"></el-option>
+                </span> 
+              </el-select>
+            </el-form-item>
+            <!-- 单据编号 -->
             <el-form-item label="单据编号" >
               <el-input v-model="code" size="small" placeholder="单据编号" clearable="true"></el-input>
             </el-form-item>
-            <!-- 填报日期 -->
-            <el-form-item label="填报日期" >
-              <el-date-picker type="date" size="small" clearable="true" placeholder="选择日期" value-format="yyyy-MM-dd" v-model="date" style="width: 200px;"></el-date-picker>
-            </el-form-item>
             <!-- 费用类型 -->
             <el-form-item label="费用类型">
               <el-select v-model="type" size="small" placeholder="请选择费用类型" clearable="true" style="width: 150px">
@@ -214,6 +218,19 @@
                 <el-option label="外包费用" value="2"></el-option>
               </el-select>
             </el-form-item>
+            <!-- 填报日期 -->
+            <el-form-item label="填报日期" >
+              <el-date-picker
+                v-model="date"
+                type="daterange"
+                value-format="yyyy-MM-dd"
+                size="small"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                style="width: 200px">
+              </el-date-picker>
+            </el-form-item>
             <el-form-item>
               <el-button @click="getList" size="small">查找</el-button>
             </el-form-item>
@@ -221,7 +238,7 @@
         </div>
         <el-divider ></el-divider>
         <!--列表-->
-          <el-table :data="list" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;">
+          <el-table :data="list" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;"  show-summary>
               <el-table-column prop="code" label="票据编号"></el-table-column>
               <el-table-column prop="totalAmount" label="金额(元)" ></el-table-column>
               <el-table-column prop="ownerName" label="报销人" ></el-table-column>
@@ -738,10 +755,19 @@ export default {
     },
     //获取单据列表
     getList() {
+      console.log(this.date)
+      var stat = ''
+      var end = ''
+      if(this.date) {
+        stat = this.date[0]
+        end = this.date[1]
+      }
       var param = {pageIndex: this.page,
                     pageSize: this.size,
                     code: this.code,
-                    createDate: this.date,
+                    // createDate: this.date,
+                    startDate: stat,
+                    endDate: end,
                     ownerId:this.ownerId,
                     type:this.type,
                     };