费用报销列表字段补全

src/components/common/singleRadioTool.vue

 <template>
   <section>
     <el-radio-group size="mini" v-model="item">
+      <slot name="default"></slot>
       <el-radio-button v-for="(radio, key) in optionsList" :key="key" :label="radio.key" :value="radio.name">{{ radio.name }}</el-radio-button>
     </el-radio-group>
   </section>

src/components/common/timeSearchForm.vue

@@ -3,13 +3,11 @@
     <el-row class="form-content-time-top">
       <el-form ref="clientTimeForm" :model="clientTimeForm" size="mini">
         <el-col :span="8" :xs="24">
-          <el-form-item label="成交日期:" label-width="42">
+          <el-form-item label="提交时间:" label-width="42">
             <el-radio-group v-model="clientTimeForm[formSearchKey + '[period]']" size="mini">
-              <el-radio-button label="thisweek">本周</el-radio-button>
-              <el-radio-button label="lastweek">上周</el-radio-button>
+              <el-radio-button label="all">全部</el-radio-button>
               <el-radio-button label="thismonth">本月</el-radio-button>
               <el-radio-button label="lastmonth">上月</el-radio-button>
-              <el-radio-button label="nextmonth">下月</el-radio-button>
             </el-radio-group>
           </el-form-item>
         </el-col>

src/components/reimbursement_list/reimbursementHome.vue

@@ -25,6 +25,7 @@
             :form-item="reimType"
             :options-list="result.navCount"
             @update:item="val => {reimType = val}">
+            <el-radio-button solt="default" key="default" label="default" value="报销单">报销单</el-radio-button>
           </singleRadioTool>
         </div>
         <div class="mb10">
@@ -37,7 +38,7 @@
           :item="item"
           :key="item.id">
           <span slot="opearate" class="obear-opearate-button">
-            <el-button type="primary" size="mini" @click.prevent.stop="leaveMessageSch(item)"><span class="badge" v-if="item.unread">{{ item.unread ? item.unread : '' }}</span><i class="fa fa-commenting"></i>留言</el-button>
+            <el-button type="primary" size="mini" @click.prevent.stop="leaveMessageSch(item)"><span class="badge" v-if="item.commentCount.comment">{{ item.commentCount.comment ? item.commentCount.comment : '' }}</span><i class="fa fa-commenting"></i>留言</el-button>
             <el-button type="primary" size="mini" @click.prevent.stop="editSch(item)" :disabled="!item.can_update"><i class="fa fa-edit animated"></i>编辑</el-button>
             <el-button type="primary" size="mini" @click.prevent.stop="deleteSch(item.id)" :disabled="!item.can_delete"><i class="fa fa-trash-o animated-hove"></i>删除</el-button>
           </span>
@@ -133,7 +134,7 @@ export default {
       form: {
         'ClientSearch[keyword]': ''
       },
-      reimType: '',
+      reimType: 'default',
       // reimTypeArray: [],
       pagenation: {
         thispage: 1,
@@ -164,7 +165,6 @@ export default {
   methods: {
     init () {
       this.getFilter()
-      this.getList()
     },
 
     timeSearchForm (search) {
@@ -184,8 +184,11 @@ export default {
     },
 
     updateForm (search) {
-      Object.assign(this.form, search)
-      this.getList()
+      let params = this.setParams({
+        ...this.form,
+        page: this.pagenation.thispage
+      }, search)
+      this.getList(params)
     },
 
     updatePage (pager) {
@@ -249,7 +252,7 @@ export default {
         this.result.list = list
         this.result.countArr = countArr
         this.result.navCount = navCount
-        this.reimType = navCount[0].key
+        // this.reimType = navCount[0].key
         this.result.pagenation = pagenation
         this.result.thisUser = thisUser
       })
@@ -280,6 +283,8 @@ export default {
     white-space: nowrap;
     vertical-align: baseline;
     border-radius: .25rem;
+    background: white;
+    color: black; 
   }
   i {
     display: inline-block;

src/components/reimbursement_list/reimbursementItem.vue

 <template>
   <section class="obear-schedule-item">
     <el-row class="obear-schedule-row">
-      <el-col :span="4" :xs="24" class="obear-schedule-left">
+      <el-col :span="4" :xs="24" class="obear-schedule-left" :style="{background: item.bgcolor}">
         <el-row :gutter="10">
           <el-col :span="24">
             <span>{{ item.type.name }}</span>
@@ -22,7 +22,7 @@
             <span>费用类型：</span><span class="obear-schedule-right__content">{{ item.costType.name }}</span>
           </el-col>
           <el-col :span="6" :xs="24">
-            <span>报销状态：</span><span class="obear-schedule-right__content">{{ item.status_display }}</span>
+            <span>报销状态：</span><span class="obear-schedule-right__content" :style="{'border-color': item.bgcolor, color: item.bgcolor}">{{ item.status_display }}</span>
           </el-col>
           <el-col :span="6" :xs="24">
             <span>附件：</span>
@@ -33,16 +33,19 @@
         </el-row>
         <el-row :gutter="10">
           <el-col :span="6" :xs="24">
-            <span>客户名称：</span><span class="colBlue">{{ item.client.name }}</span>
+            <span>客户名称：</span><span class="collightBlue">{{ item.client.name }}</span>
           </el-col>
           <el-col :span="6" :xs="24">
             <span>项目名称：</span><span class="collightBlue">{{ item.project.name }}</span>
           </el-col>
           <el-col :span="6" :xs="24">
-            <span>审核人：</span>
+            <span>审核人：{{ reimVerifyRelsArray && reimVerifyRelsArray.join('->')}}</span>
           </el-col>
           <el-col :span="6" :xs="24">
-            <span>抄送：</span><span></span>
+            <span>抄送：</span>
+            <span v-for="item in reimCarbonCopyRelsArray">
+              <img class="user-avatar rounded-circle" :src="item.icon">{{ item.name }}
+            </span>
           </el-col>
         </el-row>
         <el-row :gutter="10">
@@ -89,6 +92,18 @@ export default {
   },
 
   computed: {
+    reimVerifyRelsArray () {
+      return this.item.reimbursementVerifyRels.map(item => item.user.name)
+    },
+
+    reimCarbonCopyRelsArray () {
+      return this.item.reimbursementCarbonCopyRels.map(item => {
+        return {
+          name: item.user.name,
+          icon: item.user.avatar.name
+        }
+      })
+    }
   },
 
   mounted () {
@@ -219,11 +234,11 @@ export default {
     }
     @include e('content') {
       display: inline-block;
-      border: 1px solid red;
+      border: 1px solid #dc3545;
       border-radius:5px;
       height:20px;
       padding: 0 5px 0 5px;
-      color: red;
+      color: #dc3545;
     }
   }
 </style>