Merge branch 'master' of http://gitlab.oytour.com/huaguohao/crm

src/components/planeTicketOrder/index.vue

@@ -169,7 +169,7 @@
         <el-table-column fixed prop="OrderId" label="订单号">
            <template slot-scope="scope">
             <div v-if="scope.row.OrderId === 0">
-              ---
+              -
             </div>
             <div v-else @click="toOrder(scope.row.OrderId)" class="hover">
               {{scope.row.OrderId}}
@@ -179,7 +179,7 @@
         <el-table-column fixed prop="GuestName" label="客人名">
            <template slot-scope="scope">
             <div v-if="scope.row.OrderId === 0">
-              ---
+              -
             </div>
             <div v-else>
               {{scope.row.GuestName}}
@@ -189,7 +189,7 @@
         <el-table-column prop="city" label="性质">
           <template slot-scope="scope">
              <div v-if="scope.row.OrderId === 0">
-              ---
+              -
             </div>
             <div v-else>
               <span v-if="scope.row.GuestCount == 1">单人</span>
@@ -200,7 +200,7 @@
         <el-table-column prop="StartCityName" label="行程时间" width="120">
             <template slot-scope="scope">
             <div v-if="scope.row.OrderId === 0">
-              ---
+              -
             </div>
             <div v-else>
               {{scope.row.StartCityName}}
@@ -211,7 +211,7 @@
         <el-table-column prop="TicketStatusName" label="状态">
            <template slot-scope="scope">
             <div v-if="scope.row.OrderId === 0">
-              ---
+              -
             </div>
             <div v-else>
               {{scope.row.TicketStatusName}}
@@ -222,7 +222,7 @@
           <el-table-column prop="TicketMoney" label="单机票款" width="100">
             <template slot-scope="scope">
 
-              <p v-if="scope.row.TicketMoney == 0">---</p>
+              <p v-if="scope.row.TicketMoney == 0">-</p>
               <p v-else><span>{{ scope.row.TicketMoney }}</span
               >/<span
                 :style="{
@@ -238,7 +238,7 @@
           <el-table-column label="单签证款" width="100">
             <template slot-scope="scope">
 
-              <p v-if="scope.row.VisaMoney == 0">---</p>
+              <p v-if="scope.row.VisaMoney == 0">-</p>
               <p v-else> <span>{{ scope.row.VisaMoney }}</span>/<span
                 :style="{
                   color:
@@ -251,7 +251,7 @@
           <el-table-column label="单地接款" width="100">
             <template slot-scope="scope">
 
-              <p v-if="scope.row.DiJieMoney == 0">---</p>
+              <p v-if="scope.row.DiJieMoney == 0">-</p>
               <p v-else>   <span>{{ scope.row.DiJieMoney }}</span
               >/<span
                 :style="{
@@ -267,7 +267,7 @@
           <el-table-column prop="MealMoney" label="套餐款" width="120">
             <template slot-scope="scope">
 
-              <p v-if="scope.row.MealMoney == 0">---</p>
+              <p v-if="scope.row.MealMoney == 0">-</p>
               <p v-else>
                  <span>{{ scope.row.MealMoney }}</span
               >/<span
@@ -295,7 +295,7 @@
         <el-table-column label="营业成本">
           <el-table-column prop="TicketCost" label="机票成本">
           </el-table-column>
-          <el-table-column prop="TicketCost" label="签证成本">
+          <el-table-column prop="VisaCost" label="签证成本">
           </el-table-column>
           <el-table-column prop="DiJieCost" label="地接成本"> </el-table-column>
           <el-table-column prop="MealCost" label="套餐成本"> </el-table-column>