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

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -923,6 +923,15 @@ export default {
             return 0
           }
         },
+        {
+          field: "CompensationMoney",
+          title: "赔偿",
+          formatter: this.moneyFormat,
+          width: 100,
+          titleAlign: "left",
+          columnAlign: "left",
+          isResize: true
+        },        
         {
           field: "QiTa",
           formatter: this.moneyFormat,
@@ -1561,6 +1570,7 @@ export default {
       if (field === "GuoNeiLianYunJiPiao")
         return this.priceFormat(rowData.GuoNeiLianYunJiPiao);
       if (field === "Visa") return this.priceFormat(rowData.Visa);
+      if (field === "CompensationMoney") return this.priceFormat(rowData.CompensationMoney);
       if (field === "QiTa") return this.priceFormat(rowData.QiTa);
       if (field === "DiJieZhiChu") return this.priceFormat(rowData.DiJieZhiChu);
       if (field === "DiJieShouRu") return this.priceFormat(rowData.DiJieShouRu);

src/components/SalesModule/productQuery.vue

@@ -642,6 +642,7 @@
                           <th width="150">起飞时间</th>
                           <th width="80">到达时间</th>
                           <th width="100">经停城市</th>
+                          <th width="60">状态</th>
                         </tr>
                         <tr v-for="(ds,din) in tripDetails" :key="din" style="text-align:center;">
                           <td class="_d_name _color_666">
@@ -662,6 +663,10 @@
                             <div style="margin-top:5px;">{{ds.aName}}</div>
                           </td>
                           <td>{{ds.StopoverName}}</td>
+                          <td>
+                            <span v-if="ds.FlightState==1" style="color: rgb(71, 191, 140)!important;">正常</span>
+                            <span v-else style="color: red !important;">暂定</span>
+                          </td>
                         </tr>
                       </table>
                       <span slot="reference" @click="getDetails(index)">往返</span>