1

src/views/profitable/oilcost.vue

@@ -20,7 +20,8 @@
           <div style="flex-direction: row-reverse;" class="datascreen">
              <el-button class="find" type="primary" @click="find()"><img width="16" height="16" style="left: -8px;"
                 src="../../../public/img/sousuo.png" alt="" /></el-button>
-            <el-input placeholder="可按司机名、车牌号查找" class="input_css" v-model="searchKeyWord" clearable></el-input>
+            <el-input placeholder="可按司机名、车牌号查找" v-if="strokeType == 1" class="input_css" v-model="searchKeyWord" clearable></el-input>
+            <el-input placeholder="可按仓库名查找" v-if="strokeType == 3" class="input_css" v-model="searchKeyWord" clearable></el-input>
           </div>
         </el-col>
       </el-row>
@@ -28,9 +29,9 @@
         <el-col :span="18">
           <el-button style="margin-left:10px" @click="typeChange('')" :type="searchType == ''?'primary':''">全部</el-button>
           <el-button @click="typeChange(1)" :type="searchType == 1?'primary':''">待审核</el-button>
-          <el-button @click="typeChange(1)" :type="searchType == 1?'primary':''">已通过</el-button>
-          <el-button @click="typeChange(1)" :type="searchType == 1?'primary':''">已驳回</el-button>
-          <el-button @click="typeChange(2)" :type="searchType == 2?'primary':''">已付款</el-button>
+          <el-button @click="typeChange(2)" :type="searchType == 2?'primary':''">已通过</el-button>
+          <el-button @click="typeChange(3)" :type="searchType == 3?'primary':''">已驳回</el-button>
+          <!-- <el-button @click="typeChange(2)" :type="searchType == 4?'primary':''">已付款</el-button> -->
         </el-col>
         <el-col style='text-align:right;' :span="6">
         </el-col>
@@ -75,7 +76,7 @@
           <el-table-column prop="approveStatus" width="100" label="状态">
             <template slot-scope="scope">
               <span v-if="scope.row.approveStatus">{{scope.row.approveStatus}}</span>
-              <span v-else-if="scope.row.status=='待付款'">{{scope.row.status}}</span>
+              <span v-else-if="scope.row.status=='待付款'||scope.row.status=='已通过'">{{scope.row.status}}</span>
               <span v-else>{{scope.row.travelStatus}}</span>
             </template>
           </el-table-column>
@@ -393,8 +394,8 @@
             searchKeyWord:this.searchKeyWord,
             currentPage: this.currentPage,
             pageSize:this.pageSize ,
-            strokeType:this.strokeType
-            // searchType:this.searchType
+            strokeType:this.strokeType,
+            searchType:this.searchType
           })
           .toPromise()
           .then(response => {