* ~~报销信息添加备注：用于记录~~

* ~~报销的时候，展示剩余报销天数~~
* ~~开票日期没能导入（bug）~~
* ~~补差不记录到报销额度计算中~~
* ~~业务编号导入时，判断业务编号是否存在，如果存在，则将对应的发票存入以前的业务编号~~
* ~~业务编码可选择 临时立项号，~~
* ~~兴光会计，业务编码自动生成~~
* ~~根据开票时间进行筛选（立项号可重复，但同年份不可重复，需合并）~~
* ~~选择发票信息添加收入筛选~~
* ~~添加购方企业名称筛选项~~

src/views/modules/reimbursementSys/accountant/reimbursementBusinessForm.vue

@@ -55,6 +55,12 @@
             <el-input v-model="inputForm.reimbursementDay" class="bg-grey" size="small" placeholder="报销天数" style="width: 100%;" @keyup.native="inputForm.reimbursementDay = checkInputs(inputForm.reimbursementDay)"></el-input>
           </el-form-item>
         </el-col>
+
+        <el-col :span="12" v-if="this.show">
+          <el-form-item label="剩余报销天数" prop="surplusReimbursementDay" :rules="[{ max: 10, trigger:'blur'}]">
+            <el-input v-model="inputForm.surplusReimbursementDay" class="bg-grey" size="small" placeholder="剩余报销天数" style="width: 100%;" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="报销金额" prop="reimbursementAmount":rules="[{required: true, max: 10, message:'报销金额不可为空', max: 10,trigger:'blur'}]">
             <el-input id="reimbursementAmount" v-model="inputForm.reimbursementAmount" class="bg-grey" size="small" placeholder="报销金额" style="width: 100%;" v-bind:disabled="this.show" @keyup.native="inputForm.reimbursementAmount = checkReimbursementAmount(inputForm.reimbursementAmount)">
@@ -97,6 +103,12 @@
           </el-form-item>
         </el-col>
 
+        <el-col :span="24">
+          <el-form-item label="备注" prop="remarks" :rules="[{max: 255, trigger:'blur'}]">
+            <el-input type="textarea" v-model="inputForm.remarks" oninput="if(value.length>255)value=value.slice(0,254)" placeholder="备注" > </el-input>
+          </el-form-item>
+        </el-col>
+
       </el-row>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -128,7 +140,10 @@
           reimbursementQuotaDay: '', // 日报销额度
           canReimbursementAmount: '', // 业务可报销额度
           surplusReimbursementAmount: '', // 业务剩余可报销额度
-          reimbursementDay: '' // 报销天数
+          reimbursementDay: '', // 报销天数
+          surplusReimbursementDay: '', // 剩余报销天数
+          oldSurplusReimbursementDay: '', // 剩余报销天数(比较数据)
+          remarks: '' // 备注
 
         }
       }
@@ -165,7 +180,9 @@
         // 获取日报销额度
         let reimbursementQuotaDayNumber = this.inputForm.reimbursementQuotaDay
         if (reimbursementQuotaDayNumber) {
+          var oldSurplusReimbursementDay = this.inputForm.oldSurplusReimbursementDay
           this.inputForm.reimbursementAmount = (str * reimbursementQuotaDayNumber).toString()
+          this.inputForm.surplusReimbursementDay = (oldSurplusReimbursementDay - str).toString()
         }
         return str
       },
@@ -207,23 +224,28 @@
             this.inputForm.reimbursementQuotaDay = this.yearList[0].reimbursementQuotaDay
             this.inputForm.reimbursementQuota = this.yearList[0].reimbursementQuota
             this.inputForm.remainReimbursementAmount = this.yearList[0].remainReimbursementAmount
+            this.inputForm.surplusReimbursementDay = this.yearList[0].surplusReimbursementDay
+            this.inputForm.oldSurplusReimbursementDay = this.yearList[0].surplusReimbursementDay
 
             // 获取日报销额度
             let reimbursementQuotaDayNumber = this.inputForm.reimbursementQuotaDay
             let reimbursementDayNumber = this.inputForm.reimbursementDay
             if (reimbursementQuotaDayNumber && reimbursementDayNumber) {
+              var oldSurplusReimbursementDay = this.inputForm.oldSurplusReimbursementDay
               this.inputForm.reimbursementAmount = (reimbursementDayNumber * reimbursementQuotaDayNumber).toString()
+              this.inputForm.surplusReimbursementDay = (oldSurplusReimbursementDay - reimbursementDayNumber).toString()
             }
           } else {
             this.inputForm.year = ''
             this.inputForm.reimbursementQuotaDay = ''
             this.inputForm.reimbursementQuota = ''
             this.inputForm.remainReimbursementAmount = ''
+            this.inputForm.surplusReimbursementDay = ''
+            this.inputForm.oldSurplusReimbursementDay = ''
           }
         })
       },
       selectReimbursementType (reimbursementType) {
-        console.log(11111)
         if (reimbursementType === '1') {
           // reimbursementAmount.isdisabled = true
           this.show = true

src/views/modules/reimbursementSys/accountant/reimbursementBusinessList.vue

@@ -50,6 +50,12 @@
               label="报销时间"
             >
             </el-table-column>
+            <el-table-column
+              prop="remarks"
+              label="备注"
+              width="200px"
+            >
+            </el-table-column>
           </el-table>
         </el-col>
       </el-row>
@@ -79,6 +85,7 @@
           reimbursementQuota: '',  // 报销额度
           alreadyReimbursementAmount: '',  // 已报销额度
           surplusReimbursementAmount: '',  // 剩余报销额度
+          remarks: '',  // 备注
           columnList: []
         }
       }

src/views/modules/reimbursementSys/accountant/reimbursementForm.vue

@@ -5,10 +5,18 @@
      v-dialogDrag
     :visible.sync="visible">
     <el-form size="small" :model="inputForm" ref="inputForm" @keyup.enter.native="doSubmit()"
-             label-width="80px" v-loading="loading" :class="method==='view'?'readonly':''" :disabled="method==='view'" @submit.native.prevent>
+             label-width="120px" v-loading="loading" :class="method==='view'?'readonly':''" :disabled="method==='view'" @submit.native.prevent>
       <el-row :gutter="15">
-
         <el-col :span="12">
+          <el-form-item label="随机业务编码" prop="randomType">
+            <el-radio-group v-model="inputForm.randomType" @change="changeRadio(inputForm.randomType)">
+              <el-radio label="1">是</el-radio>
+              <el-radio label="0">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12" v-if="this.isShow">
           <el-form-item label="业务编码" prop="businessCode" :rules=" [{required: true,max: 50, message: '业务编号不能为空', trigger: 'blur'}]">
             <el-input v-model="inputForm.businessCode" placeholder="业务编码"></el-input>
           </el-form-item>
@@ -28,6 +36,7 @@
   export default {
     data () {
       return {
+        isShow: false,
         title: '',
         method: '',
         visible: false,
@@ -35,6 +44,7 @@
         inputForm: {
           id: '',
           name: '',
+          randomType: '',
           parent: {
             id: ''
           },
@@ -64,6 +74,11 @@
             this.loading = true
             this.reimbursementSys.queryBusinessById(this.inputForm.id).then(({data}) => {
               this.inputForm = this.recover(this.inputForm, data)
+              if (this.inputForm.randomType === '1') {
+                this.isShow = false
+              } else {
+                this.isShow = true
+              }
               this.loading = false
             })
           }
@@ -71,11 +86,23 @@
             this.loading = true
             this.reimbursementSys.queryBusinessByInvoiceId(this.inputForm.id).then(({data}) => {
               this.inputForm = this.recover(this.inputForm, data)
+              if (this.inputForm.randomType === '1') {
+                this.isShow = false
+              } else {
+                this.isShow = true
+              }
               this.loading = false
             })
           }
         })
       },
+      changeRadio (randomType) {
+        if (randomType === '1') {
+          this.isShow = false
+        } else {
+          this.isShow = true
+        }
+      },
       // 表单提交
       doSubmit () {
         this.$refs['inputForm'].validate((valid) => {

src/views/modules/reimbursementSys/accountant/reimbursementList.vue

@@ -8,12 +8,51 @@
       <el-form-item prop="invoiceNumber">
         <el-input size="small"  v-model="searchForm.invoiceNumber"   placeholder="发票号码"   clearable></el-input>
       </el-form-item>
+
+      <el-form-item prop="firmName">
+        <el-input size="small"  v-model="searchForm.firmName"   placeholder="购方企业名称"   clearable></el-input>
+      </el-form-item>
+
       <el-form-item prop="proposer">
         <el-input size="small"  v-model="searchForm.proposer"   placeholder="项目经理"   clearable></el-input>
       </el-form-item>
       <el-form-item prop="partner">
         <el-input size="small"  v-model="searchForm.partner"   placeholder="部门"   clearable></el-input>
       </el-form-item>
+
+      <el-form-item
+        label="收入"
+        class="priceFormItem"
+        prop="income"
+      >
+        <el-input
+          v-model="searchForm.beginIncome"
+          onkeyup="value=value.replace(/[^\d]/g,'')"
+          class="priceInput"
+          style="width: 130px; margin-right: 10px"
+        />-<el-input
+        v-model="searchForm.endIncome"
+        class="priceInput"
+        onkeyup="value=value.replace(/[^\d]/g,'')"
+        style="width: 130px; margin-left: 10px"
+      />
+      </el-form-item>
+
+      <el-form-item label="开票日期" prop="makeTime">
+        <el-date-picker
+          v-model="searchDates"
+          type="daterange"
+          size="small"
+          align="right"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :picker-options="pickerOptions">
+        </el-date-picker>
+      </el-form-item>
+
       <el-form-item>
         <el-button  type="primary" @click="refreshList()" size="small" icon="el-icon-search">查询</el-button>
         <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>
@@ -110,6 +149,7 @@
           <vxe-column title="操作" width="300px" fixed="right" align="center">
             <template slot-scope="scope">
               <el-button v-if="hasPermission('accountant:reimbursement:edit')  && scope.row.businessFlag === '1'" type="text" icon="el-icon-edit" size="small" @click="editInvoiceBusiness(scope.row.id)">新增业务编码</el-button>
+              <el-button v-if="hasPermission('accountant:reimbursement:edit') && scope.row.businessCode!=='' && scope.row.parentId === '0' && scope.row.randomType === '1' " type="text" icon="el-icon-edit" size="small" @click="editBusiness(scope.row.id)">编辑业务编码</el-button>
               <el-button v-if="hasPermission('accountant:reimbursement:edit') && (scope.row.businessCode==='' && scope.row.parentId === '0' && scope.row.businessFlag === '0')" type="text" icon="el-icon-edit" size="small" @click="editBusiness(scope.row.id)">新增业务编码</el-button>
               <el-button v-if="hasPermission('accountant:reimbursement:edit') && scope.row.businessCode !== '' && !scope.row.reimbursementRatio && scope.row.parentId === '0'" type="text" icon="el-icon-edit" size="small" @click="editBusinessRatio(scope.row.id)">报销比例</el-button>
               <el-button v-if="hasPermission('accountant:reimbursementBusiness:add') && scope.row.businessCode !== '' && scope.row.reimbursementRatio && scope.row.parentId === '0' && scope.row.reimbursementStatus === '0'" type="text" icon="el-icon-plus" size="small" @click="addBusinessInfo(scope.row.id, scope.row.businessCode)">业务报销</el-button>
@@ -161,13 +201,20 @@ export default {
   data () {
     return {
       dataList: [],
+      searchDates: '',
       searchForm: {
         businessFlag: '',
         businessCode: '',
         invoiceNumber: '',
         proposer: '',
         partner: '',
-        reimbursementRatio: ''
+        reimbursementRatio: '',
+        randomType: '',
+        firmName: '',
+        beginDate: '',
+        endDate: '',
+        beginIncome: '',
+        endIncome: ''
       },
       tablePage: {
         total: 0,
@@ -175,7 +222,45 @@ export default {
         pageSize: 10,
         orders: [{column: 'a.create_date', asc: false}]
       },
-      loading: false
+      loading: false,
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick (picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick (picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick (picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      }
+    }
+  },
+  watch: {
+    searchDates () {
+      if (this.searchDates) {
+        this.searchForm.beginDate = this.searchDates[0]
+        this.searchForm.endDate = this.searchDates[1]
+      } else {
+        this.searchForm.beginDate = ''
+        this.searchForm.endDate = ''
+      }
     }
   },
   components: {

src/views/modules/reimbursementSys/accountant/user/reimbursementUserBusinessList.vue

@@ -56,6 +56,12 @@
               label="报销时间"
             >
             </el-table-column>
+            <el-table-column
+              prop="remarks"
+              label="备注"
+              width="200px"
+            >
+            </el-table-column>
           </el-table>
         </el-col>
       </el-row>
@@ -90,6 +96,7 @@
           reimbursementQuota: '',  // 报销额度
           alreadyReimbursementAmount: '',  // 已报销额度
           surplusReimbursementAmount: '',  // 剩余报销额度
+          remarks: '',  // 备注
           columnList: []
         }
       }

src/views/modules/reimbursementSys/reimbursementBusinessForm.vue

@@ -55,6 +55,12 @@
             <el-input v-model="inputForm.reimbursementDay" class="bg-grey" size="small" placeholder="报销天数" style="width: 100%;" @keyup.native="inputForm.reimbursementDay = checkInputs(inputForm.reimbursementDay)"></el-input>
           </el-form-item>
         </el-col>
+
+        <el-col :span="12" v-if="this.show">
+          <el-form-item label="剩余报销天数" prop="surplusReimbursementDay" :rules="[{ max: 10, trigger:'blur'}]">
+            <el-input v-model="inputForm.surplusReimbursementDay" class="bg-grey" size="small" placeholder="剩余报销天数" style="width: 100%;" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="报销金额" prop="reimbursementAmount":rules="[{required: true, max: 10, message:'报销金额不可为空', max: 10,trigger:'blur'}]">
             <el-input id="reimbursementAmount" v-model="inputForm.reimbursementAmount" class="bg-grey" size="small" placeholder="报销金额" style="width: 100%;" v-bind:disabled="this.show" @keyup.native="inputForm.reimbursementAmount = checkReimbursementAmount(inputForm.reimbursementAmount)">
@@ -97,6 +103,12 @@
           </el-form-item>
         </el-col>
 
+        <el-col :span="24">
+          <el-form-item label="备注" prop="remarks" :rules="[{max: 255, trigger:'blur'}]">
+            <el-input type="textarea" v-model="inputForm.remarks" oninput="if(value.length>255)value=value.slice(0,254)" placeholder="备注" > </el-input>
+          </el-form-item>
+        </el-col>
+
       </el-row>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -128,7 +140,10 @@
           reimbursementQuotaDay: '', // 日报销额度
           canReimbursementAmount: '', // 业务可报销额度
           surplusReimbursementAmount: '', // 业务剩余可报销额度
-          reimbursementDay: '' // 报销天数
+          reimbursementDay: '', // 报销天数
+          surplusReimbursementDay: '', // 剩余报销天数
+          oldSurplusReimbursementDay: '', // 剩余报销天数(比较数据)
+          remarks: '' // 备注
 
         }
       }
@@ -165,7 +180,9 @@
         // 获取日报销额度
         let reimbursementQuotaDayNumber = this.inputForm.reimbursementQuotaDay
         if (reimbursementQuotaDayNumber) {
+          var oldSurplusReimbursementDay = this.inputForm.oldSurplusReimbursementDay
           this.inputForm.reimbursementAmount = (str * reimbursementQuotaDayNumber).toString()
+          this.inputForm.surplusReimbursementDay = (oldSurplusReimbursementDay - str).toString()
         }
         return str
       },
@@ -207,23 +224,28 @@
             this.inputForm.reimbursementQuotaDay = this.yearList[0].reimbursementQuotaDay
             this.inputForm.reimbursementQuota = this.yearList[0].reimbursementQuota
             this.inputForm.remainReimbursementAmount = this.yearList[0].remainReimbursementAmount
+            this.inputForm.surplusReimbursementDay = this.yearList[0].surplusReimbursementDay
+            this.inputForm.oldSurplusReimbursementDay = this.yearList[0].surplusReimbursementDay
 
             // 获取日报销额度
             let reimbursementQuotaDayNumber = this.inputForm.reimbursementQuotaDay
             let reimbursementDayNumber = this.inputForm.reimbursementDay
             if (reimbursementQuotaDayNumber && reimbursementDayNumber) {
+              var oldSurplusReimbursementDay = this.inputForm.oldSurplusReimbursementDay
               this.inputForm.reimbursementAmount = (reimbursementDayNumber * reimbursementQuotaDayNumber).toString()
+              this.inputForm.surplusReimbursementDay = (oldSurplusReimbursementDay - reimbursementDayNumber).toString()
             }
           } else {
             this.inputForm.year = ''
             this.inputForm.reimbursementQuotaDay = ''
             this.inputForm.reimbursementQuota = ''
             this.inputForm.remainReimbursementAmount = ''
+            this.inputForm.surplusReimbursementDay = ''
+            this.inputForm.oldSurplusReimbursementDay = ''
           }
         })
       },
       selectReimbursementType (reimbursementType) {
-        console.log(11111)
         if (reimbursementType === '1') {
           // reimbursementAmount.isdisabled = true
           this.show = true

src/views/modules/reimbursementSys/reimbursementBusinessList.vue

@@ -50,6 +50,12 @@
               label="报销时间"
             >
             </el-table-column>
+            <el-table-column
+              prop="remarks"
+              label="备注"
+              width="200px"
+            >
+            </el-table-column>
           </el-table>
         </el-col>
       </el-row>

src/views/modules/reimbursementSys/reimbursementForm.vue

@@ -5,11 +5,19 @@
      v-dialogDrag
     :visible.sync="visible">
     <el-form size="small" :model="inputForm" ref="inputForm" @keyup.enter.native="doSubmit()"
-             label-width="80px" v-loading="loading" :class="method==='view'?'readonly':''" :disabled="method==='view'" @submit.native.prevent>
+             label-width="120px" v-loading="loading" :class="method==='view'?'readonly':''" :disabled="method==='view'" @submit.native.prevent>
       <el-row :gutter="15">
-
         <el-col :span="12">
-          <el-form-item label="业务编码" prop="businessCode" :rules=" [{required: true,max: 50, message: '业务编号不能为空', trigger: 'blur'}]">
+          <el-form-item label="随机业务编码" prop="randomType">
+            <el-radio-group v-model="inputForm.randomType" @change="changeRadio(inputForm.randomType)">
+              <el-radio label="1">是</el-radio>
+              <el-radio label="0">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12"  v-if="this.isShow">
+          <el-form-item label="业务编码" prop="businessCode" :rules=" [{required: true ,max: 50, message: '业务编号不能为空', trigger: 'blur'}]">
             <el-input v-model="inputForm.businessCode" placeholder="业务编码"></el-input>
           </el-form-item>
         </el-col>
@@ -28,6 +36,7 @@
   export default {
     data () {
       return {
+        isShow: false,
         title: '',
         method: '',
         visible: false,
@@ -35,6 +44,7 @@
         inputForm: {
           id: '',
           name: '',
+          randomType: '',
           parent: {
             id: ''
           },
@@ -64,11 +74,23 @@
             this.loading = true
             this.reimbursementSys.queryBusinessById(this.inputForm.id).then(({data}) => {
               this.inputForm = this.recover(this.inputForm, data)
+              if (this.inputForm.randomType === '1') {
+                this.isShow = false
+              } else {
+                this.isShow = true
+              }
               this.loading = false
             })
           }
         })
       },
+      changeRadio (randomType) {
+        if (randomType === '1') {
+          this.isShow = false
+        } else {
+          this.isShow = true
+        }
+      },
       // 表单提交
       doSubmit () {
         this.$refs['inputForm'].validate((valid) => {

src/views/modules/reimbursementSys/reimbursementList.vue

@@ -8,12 +8,49 @@
       <el-form-item prop="invoiceNumber">
         <el-input size="small"  v-model="searchForm.invoiceNumber"   placeholder="发票号码"   clearable></el-input>
       </el-form-item>
+      <el-form-item prop="firmName">
+        <el-input size="small"  v-model="searchForm.firmName"   placeholder="购方企业名称"   clearable></el-input>
+      </el-form-item>
       <el-form-item prop="proposer">
         <el-input size="small"  v-model="searchForm.proposer"   placeholder="项目经理"   clearable></el-input>
       </el-form-item>
       <el-form-item prop="partner">
         <el-input size="small"  v-model="searchForm.partner"   placeholder="部门"   clearable></el-input>
       </el-form-item>
+
+      <el-form-item
+        label="收入"
+        class="priceFormItem"
+        prop="income"
+      >
+        <el-input
+          v-model="searchForm.beginIncome"
+          onkeyup="value=value.replace(/[^\d]/g,'')"
+          class="priceInput"
+          style="width: 130px; margin-right: 10px"
+        />-<el-input
+        v-model="searchForm.endIncome"
+        class="priceInput"
+        onkeyup="value=value.replace(/[^\d]/g,'')"
+        style="width: 130px; margin-left: 10px"
+      />
+      </el-form-item>
+
+      <el-form-item label="开票日期" prop="makeTime">
+        <el-date-picker
+          v-model="searchDates"
+          type="daterange"
+          size="small"
+          align="right"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :picker-options="pickerOptions">
+        </el-date-picker>
+      </el-form-item>
+
       <el-form-item>
         <el-button  type="primary" @click="refreshList()" size="small" icon="el-icon-search">查询</el-button>
         <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>
@@ -108,6 +145,7 @@
           <vxe-column title="操作" width="300px" fixed="right" align="center">
             <template slot-scope="scope">
               <el-button v-if="hasPermission('reimbursement:edit') && scope.row.businessCode==='' && scope.row.parentId === '0'" type="text" icon="el-icon-edit" size="small" @click="editBusiness(scope.row.id)">新增业务编码</el-button>
+              <el-button v-if="hasPermission('reimbursement:edit') && scope.row.businessCode!=='' && scope.row.parentId === '0' && scope.row.randomType === '1' " type="text" icon="el-icon-edit" size="small" @click="editBusiness(scope.row.id)">编辑业务编码</el-button>
               <el-button v-if="hasPermission('reimbursement:edit') && scope.row.businessCode !== '' && !scope.row.reimbursementRatio && scope.row.parentId === '0'" type="text" icon="el-icon-edit" size="small" @click="editBusinessRatio(scope.row.id)">报销比例</el-button>
               <el-button v-if="hasPermission('reimbursementBusiness:add') && scope.row.businessCode !== '' && scope.row.reimbursementRatio && scope.row.parentId === '0' && scope.row.reimbursementStatus === '0'" type="text" icon="el-icon-plus" size="small" @click="addBusinessInfo(scope.row.id, scope.row.businessCode)">业务报销</el-button>
               <el-button v-if="hasPermission('reimbursementBusiness:view') && scope.row.businessCode !== '' && scope.row.reimbursementRatio && scope.row.parentId === '0'" type="text" icon="el-icon-view" size="small" @click="viewBusinessInfo(scope.row.id)">业务报销详情</el-button>
@@ -156,12 +194,19 @@ export default {
   data () {
     return {
       dataList: [],
+      searchDates: '',
       searchForm: {
         businessCode: '',
         invoiceNumber: '',
         proposer: '',
         partner: '',
-        reimbursementRatio: ''
+        firmName: '',
+        reimbursementRatio: '',
+        randomType: '',
+        beginDate: '',
+        endDate: '',
+        beginIncome: '',
+        endIncome: ''
       },
       tablePage: {
         total: 0,
@@ -169,7 +214,45 @@ export default {
         pageSize: 10,
         orders: [{column: 'a.create_date', asc: false}]
       },
-      loading: false
+      loading: false,
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick (picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick (picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick (picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      }
+    }
+  },
+  watch: {
+    searchDates () {
+      if (this.searchDates) {
+        this.searchForm.beginDate = this.searchDates[0]
+        this.searchForm.endDate = this.searchDates[1]
+      } else {
+        this.searchForm.beginDate = ''
+        this.searchForm.endDate = ''
+      }
     }
   },
   components: {

src/views/modules/reimbursementSys/user/reimbursementUserBusinessList.vue

@@ -56,6 +56,12 @@
               label="报销时间"
             >
             </el-table-column>
+            <el-table-column
+              prop="remarks"
+              label="备注"
+              width="200px"
+            >
+            </el-table-column>
           </el-table>
         </el-col>
       </el-row>