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

src/components/TravelManager/TravelTeam/editTeamInfo.vue

@@ -206,10 +206,9 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            
             <el-form-item label="航班信息">
-            <el-radio v-model="isVirtuallyFlight" :label="0">虚拟航班</el-radio>
-            <el-radio v-model="isVirtuallyFlight" :label="1">真实机票</el-radio>
+              <el-radio v-model="isVirtuallyFlight" :label="0">虚拟航班</el-radio>
+              <el-radio v-model="isVirtuallyFlight" :label="1">真实机票</el-radio>
             </el-form-item>
           </el-col>
         </el-row>
@@ -480,7 +479,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="婴儿附加费" prop="BabyChargePrice">
+            <el-form-item label="儿童附加费" prop="BabyChargePrice">
               <el-input v-model="editForm.BabyChargePrice"></el-input>
             </el-form-item>
           </el-col>
@@ -497,8 +496,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="杂费" prop="OtherPrice">
-              <el-input v-model="editForm.OtherPrice"></el-input>
+            <el-form-item label="退签证费" prop="BackVisaPrice">
+              <el-input v-model="editForm.BackVisaPrice"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -507,6 +506,19 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="杂费" prop="OtherPrice">
+              <el-input v-model="editForm.OtherPrice"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+
+          </el-col>
+          <el-col :span="8">
+
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="合作伙伴">
@@ -542,10 +554,10 @@
           </el-col>
         </el-row>
         <el-row type="flex" justify="center">
-            <el-button @click="closeForm()">关闭</el-button>&nbsp;
-            <el-button @click="submit" type="primary" :loading="saveLoading">
-              保存
-            </el-button>
+          <el-button @click="closeForm()">关闭</el-button>&nbsp;
+          <el-button @click="submit" type="primary" :loading="saveLoading">
+            保存
+          </el-button>
         </el-row>
       </div>
     </el-form>
@@ -632,6 +644,7 @@
           SingleRoomPrice: 0, //单房差
           TicketNum: 0, //绑定机票数量
           PurchaseId: 0, //采购机票编号
+          BackVisaPrice: 0, //退签证费
         },
         //去程
         addGoFlight: {