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

src/components/FinancialModule/ReportForm/CombinedRevenueReport.vue

@@ -796,6 +796,16 @@ export default {
           columnAlign: "left",
           isResize: true,
         },
+        {
+          field: "YouHui",
+          formatter: this.moneyFormat,
+          title: "优惠",
+          width: 100,
+          titleAlign: "left",
+          columnAlign: "right",
+          isResize: true,
+          componentName: "TCIDJumpWang"
+        },
         {
           field: "DaiShou",
           formatter: this.moneyFormat,

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1548,7 +1548,7 @@
           <th width="150" class="nowrap">操作</th>
         </tr>
         <tr>
-          <td v-show="OrderDataList.Length==0" colspan="14" align="center">暂无数据</td>
+          <td v-show="OrderDataList.length==0" colspan="14" align="center">暂无数据</td>
         </tr>
 
         <tr v-if="OrderDataList.leadetList!=null && OrderDataList.leadetList.length>0">
@@ -1982,7 +1982,7 @@
                 <div class="clearfix RL-MARK">
                   <span class="RL-remarkTitle">备注:</span>
                   <p class="RL-redType RL-remarkCon">
-                    <span v-if="childItem.tsIdList.length>0">投诉单号：
+                    <span v-if="childItem.tsIdList&&childItem.tsIdList.length>0">投诉单号：
                       <a clas="underline" v-for="ts in childItem.TsIdList" href="javascript:void(0);"
                         @click="goUrlTS('ComplaintsDetail',ts,childItem.OrderId,'投诉详情')">{{ts}}</a>
                       ;</span>