修改bug

src/views/maintenance/merchant/index.vue

@@ -47,7 +47,7 @@
             <el-row style="border-bottom: 1px solid #d5d5d5;margin: 10px 0;"></el-row>
 
             <el-row type="flex" style="flex-wrap: wrap;">
-                <div v-for="(item, index) in data" style="width: 500px;padding-bottom: 20px;border-bottom: 1px solid #d5d5d5;">
+                <div v-for="(item, index) in data" :key="'merchant'+index" style="width: 500px;padding-bottom: 20px;">
                     <el-form label-position="right" label-width="120px">
                         <el-form-item label="订单编号">
                             {{item.businessId}}
@@ -108,8 +108,8 @@ export default {
     methods: {
         searchInfo() {
             let params = {
-                orderId: this.orderId,
-                paymentId: '',
+                orderId: '',
+                paymentId: this.orderId,
                 status: ''
             }
             this.data = [];

src/views/maintenance/waybill/index.vue

@@ -45,7 +45,7 @@
 
                 <el-row v-if="isShow">
                     <el-button v-if="dataSource.waybillStatus == '1'" type="primary" style="padding: 5px 20px;" @click="synchronization">同步司机信息</el-button>
-                    <el-button v-if="dataSource.waybillStatus > 1 && dataSource.waybillStatus < 6" type="warning" style="padding: 5px 20px;" @click="force" :loading="forceLoading">强制完单</el-button>
+                    <el-button v-if="dataSource.waybillStatus >= 1 && dataSource.waybillStatus < 6" type="warning" style="padding: 5px 20px;" @click="force" :loading="forceLoading">强制完单</el-button>
                 </el-row>
             </el-row>