Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/ImpressionTicketing/ImpressionTicketDetails.vue

@@ -104,7 +104,7 @@
           <td>{{item.OrderProfit}}</td>
           <td>{{item.YCommission}}</td>
           <td>{{item.Commission}}</td>
-          <td>{{item.LimitCommission>0?item.LimitCommission:'-'}}</td>
+          <td>{{item.LimitCommission != 0?item.LimitCommission:'-'}}</td>
           <td>{{item.CommissionRate}}%</td>
           <td @click="GenerateScale(item)">
             <span

src/components/FinancialModule/ImpressionTicketing/ImpressionTicketUserDetails.vue

@@ -200,7 +200,7 @@
                     :class="item.WageReId?'cursor-p':''">{{item.WageType==1?'新员工比例':item.WageType==2?'上季度定档':'-'}}</span>
                 </td>
                 <td>{{item.Commission}}</td>
-                <td>{{item.LimitCommission>0?item.LimitCommission:'-'}}</td>
+                <td>{{item.LimitCommission != 0?item.LimitCommission:'-'}}</td>
                 <td>{{item.CommissionRate}}%</td>
                 <td>{{item.EmName!='微途'?item.BonusMoney:'-'}}</td>
                 <td>{{item.EmName!='微途'?item.BonusRate+'%':'-'}}</td>

src/components/busManagement/tripBusOrder.vue

@@ -26,12 +26,14 @@
             <el-date-picker v-model='msg.EndTime' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
           </span>
         </li>
-        <!-- <li><span><em>确认状态</em></span>
-          <el-select v-model='msg.QSureState'>
-            <el-option label='已确认' value='1' key='1'></el-option>
-            <el-option label='未确认' value='2' key='2'></el-option>
+        <li><span><em>状态</em></span>
+          <el-select v-model='msg.OfferState' clearable>
+            <el-option label='等待报价' value='2' key='2'></el-option>
+            <el-option label='已报价' value='3' key='3'></el-option>
+            <el-option label='确认报价' value='4' key='4'></el-option>
+            <el-option label='取消报价' value='5' key='5'></el-option>
           </el-select>
-        </li> -->
+        </li>
         <li>
           <input type="button" class="normalBtn" value="查询" @click="getList(); resetPageIndex()" />
         </li>
@@ -107,11 +109,11 @@
             <td>
               <div class="link" style="display: flex;
               flex-flow: wrap; width: 135px;justify-content: space-around;">
-                <el-button size="mini" v-if="item.OfferState == 2" @click="SetTripBusPrice(item, 1)"
-                  type="primary">报价</el-button>
+                <el-button size="mini" v-if="item.OfferState == 2" @click="SetTripBusPrice(item, 1)" type="primary">报价
+                </el-button>
                 <el-button size="mini" @click="SetTripBusPrice(item, 2)" type="primary">详情</el-button>
-                <!-- <el-button style="margin-top: 10px;" size="mini" @click="driver(item.Id)"
-                  type="primary">添加司机车牌号</el-button> -->
+                <el-button v-if="item.OfferState==4" style="margin-top: 10px;" size="mini" @click="driver(item.Id)"
+                  type="primary">添加司机车牌号</el-button>
               </div>
             </td>
           </tr>
@@ -318,7 +320,7 @@
 </template>
 
 <script>
-export default {
+  export default {
     data() {
       return {
         drivermsg: {
@@ -341,7 +343,7 @@ export default {
           TeamName: "", //团体名称
           StartTime: "", //开始时间
           EndTime: "", //结束时间
-        QSureState: "", //确认状态
+          OfferState: "", //报价状态
         },
         boxHeight: 0,
         offsetwidth: 0,
@@ -412,14 +414,14 @@ export default {
           } else {
             this.Error(res.data.message);
           }
-      }, err => { })
+        }, err => {})
       },
       handleClose(done) {
         this.$confirm('确认关闭？')
           .then(_ => {
             done();
           })
-        .catch(_ => { });
+          .catch(_ => {});
       },
       // 司机确定
       driverdetermine() {
@@ -430,7 +432,7 @@ export default {
           } else {
             this.Error(res.data.message);
           }
-      }, err => { })
+        }, err => {})
       },
       // 添加司机车号
       driver(id) {
@@ -488,7 +490,7 @@ export default {
           } else {
             this.Error(res.data.message);
           }
-      }, err => { })
+        }, err => {})
       },
       //计算价格
       calcPrice() {
@@ -529,7 +531,7 @@ export default {
           } else {
             this.Error(res.data.message);
           }
-      }, err => { })
+        }, err => {})
       }
     },
     mounted() {
@@ -548,128 +550,130 @@ export default {
       this.offsetwidth = width;
       this.getList();
     },
-}
+  }
 
 </script>
 <style>
-.splitTrCss td {
+  .splitTrCss td {
     background: #eee !important;
-}
+  }
 
-.busIconStyle>span {
+  .busIconStyle>span {
     margin-right: 20px;
     font-weight: bold;
-}
+  }
 
-.busStatisticsTalbe {
+  .busStatisticsTalbe {
     background: #ccc;
-}
+  }
 
-.busStatisticsTalbe tr th {
+  .busStatisticsTalbe tr th {
     background: #E6E6E6;
     height: 40px;
     font-size: 12px;
     color: #333;
-}
+  }
 
-.busStatisticsTalbe tr {
+  .busStatisticsTalbe tr {
     background: #fff;
     text-align: center;
     height: 40px;
-}
+  }
 
-.busStatisticsTalbe tr td {
+  .busStatisticsTalbe tr td {
     font-size: 12px;
-}
+  }
 
-.busStatisticsTalbe tr td .pDateStyle {
+  .busStatisticsTalbe tr td .pDateStyle {
     border-bottom: 1px solid #ccc;
     min-height: 24px;
     line-height: 24px;
     margin-top: 0;
     box-sizing: content-box;
     padding: 0 10px;
-}
+  }
 
-.busStatisticsTalbe tr td .pDateStyle:last-child {
+  .busStatisticsTalbe tr td .pDateStyle:last-child {
     border-bottom: none;
-}
+  }
 
-.busStatisticsTalbe tr td .link p:hover {
+  .busStatisticsTalbe tr td .link p:hover {
     text-decoration: underline;
     cursor: pointer;
-}
+  }
 
-.busStatisticsTalbe tr td .link span:hover {
+  .busStatisticsTalbe tr td .link span:hover {
     text-decoration: underline;
     cursor: pointer;
-}
+  }
 
-.busStatistics_tripDetails {
+  .busStatistics_tripDetails {
     padding: 0;
     box-shadow: 0px 1px 3px 0px #dedede;
     max-height: 400px;
     overflow-y: auto;
-}
+  }
 
-.busStatistics_tripDetails .popper__arrow::after {
+  .busStatistics_tripDetails .popper__arrow::after {
     border-bottom-color: #ededed !important;
-}
+  }
 
-.busStatistics_tripDetails table {
+  .busStatistics_tripDetails table {
     padding: 10px 0 0 20px;
     background-color: #ededed;
     border-collapse: collapse;
     border: 1px solid #d2d2d2;
     font-size: 12px;
-}
+  }
 
-.busStatistics_tripDetails table th {
+  .busStatistics_tripDetails table th {
     background-color: #ededed;
     padding: 5px;
-}
+  }
 
-.busStatistics_tripDetails table td {
+  .busStatistics_tripDetails table td {
     background-color: #ffffff;
     padding: 9px 15px;
     color: #333333;
     border: 1px solid #d2d2d2;
-}
+  }
 
-.busStatistics_tripDetails table td._d_name {
+  .busStatistics_tripDetails table td._d_name {
     background-color: #ededed;
-}
+  }
 
-.busStatistics_tripDetails table ._color_666 {
+  .busStatistics_tripDetails table ._color_666 {
     color: #666666;
-}
+  }
 
-.busStatistics_tripDetails table tr._color_666 th {
+  .busStatistics_tripDetails table tr._color_666 th {
     padding: 9px 15px;
-}
+  }
 
-.Bus_HotelPop {
+  .Bus_HotelPop {
     overflow: auto;
     max-height: 350px;
-}
+  }
+
 </style>
 <style scoped>
-/deep/.el-form-item {
+  /deep/.el-form-item {
     margin-bottom: 0px;
-}
+  }
 
-.total {
+  .total {
     display: flex;
     width: 100%;
     justify-content: center;
     font-weight: bold;
     margin-bottom: 20px;
     margin-top: 10px;
-}
+  }
 
-.flex {
+  .flex {
     display: flex;
     width: 100%;
     justify-content: space-between;
-}
+  }
+
 </style>