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

src/components/FinancialModule/FProcessManagement.vue

@@ -221,9 +221,9 @@
                     <el-tooltip class="item" effect="dark" content="修改"  placement="top">
                         <i  class="iconfont icon-liuchengsheji" v-show="item.Status==1"  @click="goUrl('addFinancialProcess',item.Id,8)"></i>
                     </el-tooltip> 
-                    <el-tooltip  class="item" effect="dark" content="删除"  placement="top">
+                    <!-- <el-tooltip  class="item" effect="dark" content="删除"  placement="top">
                         <i  class="edit el-icon-delete" v-show="item.Status==1" @click="deletTemplate(item.Id,item.Name)"></i>
-                    </el-tooltip> 
+                    </el-tooltip>  -->
                     
                 </div>
             </li>

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -1099,7 +1099,16 @@ export default {
         {
           field: "YingYeE",
           formatter: this.moneyFormat,
-          title: "营业额",
+          title: "联运营业额",
+          width: 90,
+          titleAlign: "left",
+          columnAlign: "left",
+          isResize: true
+        },       
+        {
+          field: "RealIncome",
+          formatter: this.moneyFormat,
+          title: "实际营业额",
           width: 90,
           titleAlign: "left",
           columnAlign: "left",

src/components/SalesModule/addPassenger.vue

@@ -2018,6 +2018,7 @@ export default {
     //this.getVisaApplyForTypeEnum();
     // this.getChinaAirportList();
     // this.getJapanAirportList();
+    //1231
     this.getCountry();
     this.getMarriageType();
     this.getVisaDeparturesType();

src/components/Ticketing/TicketManager.vue

@@ -69,13 +69,13 @@
   }
 
   .PlaneTicket ._ol_list > li {
-    height: 107px;
+    /* height: 107px; */
     margin: 20px 0 0px 0px;
     transition: linear all 0.5s;
     background-color: #fff;
     border: 1px solid #dddddd;
     border-left: 0;
-    overflow: hidden;
+    /* overflow: hidden; */
     position: relative;
   }
 
@@ -1179,14 +1179,13 @@
   }
 
   .TCID_cont {
-    height: 28px;
-    line-height: 28px;
+    min-height: 28px;
     border-top: 1px dashed #ccc;
-    text-indent: 20px;
   }
 
   .Ticket_TCID {
-    margin-right: 2px;
+    margin:5px 25px 5px 0;
+    display: inline-block;
   }
 
   /*航班详情*/
@@ -1231,6 +1230,12 @@
   .FinaceDanList {
     cursor: pointer;
   }
+  .teamTitle{
+    text-indent:10px;
+    min-height:28px;
+    border-top:1px solid #ccc;
+    line-height:28px;
+  }
 </style>
 <template>
   <div class="flexOne PlaneTicket">
@@ -1600,9 +1605,11 @@
             </el-row>
 
             <el-row :gutter="0">
-              <el-col :span="8">
+              <el-col :span="1">
+                  <div class="teamTitle">团期：</div>
+              </el-col>
+              <el-col :span="15">
                 <div class="TCID_cont PingFangSC">
-                  团期：
                   <span v-show="item.PriceList==null ||item.PriceList.length==0">暂无</span>
                   <span class="Ticket_TCID" v-for="subItem in item.PriceList">
                     <a style="color:blue;cursor:pointer" @click='goUrlT("RegistrationList",subItem.TCID,"报名清单")'> ({{subItem.TCID}}){{subItem.TCNUM}} </a>
@@ -1611,10 +1618,7 @@
                 </div>
               </el-col>
               <el-col :span="8">
-                <div class="TCID_cont"></div>
-              </el-col>
-              <el-col :span="8">
-                <div class="TCID_cont">PNR：{{item.PNR}}</div>
+                <div class="TCID_cont" style="padding-top:5px;">PNR：{{item.PNR}}</div>
               </el-col>
             </el-row>
           </li>

src/components/dmc/manager/tripsManager.vue

@@ -369,7 +369,7 @@
               </el-select>
             </span>
           </li>
-         <li style="display:none">
+         <li>
             <span>
               <em>出团公司</em>
               <el-select class="w150" v-model="queryMsg.OutBranchId" filterable :placeholder="$t('pub.pleaseSel')">
@@ -587,7 +587,7 @@
 			    			 }else{
 			    			 	 this.$message.error(res.data.message)
 			    			 }
-			    	},err=>{})	
+			    	},err=>{})
 				}).catch(() => {
 					this.$message({
 						type: 'info',