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

src/components/Complaints/ComplaintsManage.vue

 <style>
   .CM_detail {
     color: #3980C8;
+    cursor: pointer;
   }
 
   .CM_detail:hover {
@@ -18,9 +19,31 @@
     background-color: #FFFFFF;
     color: #333333;
   }
+  .Complain_item span{
+    font-size:14px;
+  }
+  .Complain_item div{
+    margin-top:7px;
+  }
+  .Complain_item div i{
+    font-size:12px;
+  }
   .complain_col{
     height:60px;
   }
+  .Complain_green{
+    color:#1BC594;
+  }
+  .Com_yingfu{
+      font-size:16px;
+      color:#1BC594;
+      font-weight:bold;
+  }
+  .Com_zong{
+      font-size:16px;
+      color: #E95252;
+      font-weight:bold;
+  }
 </style>
 
 <template>
@@ -117,16 +140,18 @@
       <el-row :gutter="20">
         <el-col :span="4" class="complain_col">
           <div class="Complain_item">
-            <p>
-              <span>应赔总金额：{{complainStatistic.compensateTotalMoney}}</span>
-            </p>
+            <div>
+              <i class="iconfont icon-qian Complain_green"></i>
+              <span>应赔总金额：<span class="Com_yingfu">{{complainStatistic.compensateTotalMoney}}</span></span>
+            </div>
           </div>
         </el-col>
         <el-col :span="4" class="complain_col">
           <div class="Complain_item">
-            <p>
-              <span>实赔总金额：{{complainStatistic.backTotalMoney}}</span>
-            </p>
+            <div>
+              <i class="iconfont icon-qian Complain_green"></i>
+              <span>实赔总金额：<span class="Com_zong">{{complainStatistic.backTotalMoney}}</span></span>
+            </div>
           </div>
         </el-col>
       </el-row>

src/components/SalesModule/planeTicketInquiry.vue

@@ -1462,12 +1462,12 @@
               <el-col :span="2">
                 <span class="_lian_style" v-if="item.IsSetUnion==1">联</span>
                 <div class="_oll_img_box">
-                  <span class="TICK_Code PingFangSC">编号：{{item.ID}}</span>
+                  <span class="TICK_Code PingFangSC" style="left:35px;">编号：{{item.ID}}</span>
                   <img v-if="!item.AirlineUrl" class="_oll_img" :src="defaultImg">
-                  <img v-else class="_oll_img" :src="item.AirlineUrl" :onerror="defaultImg">
+                  <img v-else class="_oll_img" :src="item.AirlineUrl" :onerror="defaultImg" style="margin-left:30px;">
                 </div>
               </el-col>
-              <el-col :span="2" class="vmiddle" style="width:85px;">
+              <el-col :span="3" class="vmiddle">
                 <div class="_oll_info">
                   <el-tooltip class="item" effect="dark" :content="item.AirlineName" placement="top-start" popper-class="max-w250">
                     <p class="_oll_tit">{{item.AirlineName}}</p>
@@ -1475,7 +1475,7 @@
                   <span class="_oll_adrr">{{item.FreightSpaceStr}}</span>
                 </div>
               </el-col>
-              <el-col :span="4" class="vmiddle">
+              <el-col :span="5" class="vmiddle">
                 <div class="FlightDivDetails">
                   <div class="_flightList" v-for="subItem in item.flightList">
                     <span class="FlightNumber">{{subItem.Flight_number}}</span>
@@ -1544,78 +1544,7 @@
                   </div>
                 </div>
               </el-col>
-              <el-col :span="3" class="vmiddle">
-                <div class="TK_raduis">
-                  <ul>
-                    <!--一定-->
-                    <li v-if="item.FirstDeposit!=''">
-                      <div @click="goFinacePage(item,1)" :class="getClass(item.FirstDepositStatus)">
-                        <el-tooltip effect="dark" :content="item.FirstDeposit" placement="top" popper-class="max-w250">
-                          <span>1</span>
-                        </el-tooltip>
-                      </div>
-                      <div class="FinaDetailContent">
-                        <span v-if="item.FirstAuditList!=null" v-for="childItem in item.FirstAuditList">
-                          <span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
-                        </span>
-                      </div>
-                    </li>
-                    <!--二定-->
-                    <li v-if="item.SecondDeposit!=''">
-                      <div @click="goFinacePage(item,2)" :class="getClass(item.SecondDepositStatus)">
-                        <el-tooltip effect="dark" :content="item.SecondDeposit" placement="top" popper-class="max-w250">
-                          <span>2</span>
-                        </el-tooltip>
-                      </div>
-                      <div class="FinaDetailContent">
-                        <span v-if="item.SecondAuditList!=null" v-for="childItem in item.SecondAuditList">
-                          <span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
-                        </span>
-                      </div>
-                    </li>
-                    <!--三定-->
-                    <li v-if="item.ThirdDeposit!=''">
-                      <div @click="goFinacePage(item,3)" :class="getClass(item.ThirdDepositStatus)">
-                        <el-tooltip effect="dark" :content="item.ThirdDeposit" placement="top" popper-class="max-w250">
-                          <span>3</span>
-                        </el-tooltip>
-                      </div>
-                      <div class="FinaDetailContent">
-                        <span v-if="item.ThirdAuditList!=null" v-for="childItem in item.ThirdAuditList">
-                          <span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
-                        </span>
-                      </div>
-                    </li>
-                    <!--四定-->
-                    <li v-if="item.FourthDeposit!=''">
-                      <div @click="goFinacePage(item,4)" :class="getClass(item.FourthDepositStatus)">
-                        <el-tooltip effect="dark" :content="item.FourthDeposit" placement="top" popper-class="max-w250">
-                          <span>4</span>
-                        </el-tooltip>
-                      </div>
-                      <div class="FinaDetailContent">
-                        <span v-if="item.FourthAuditList!=null" v-for="childItem in item.FourthAuditList">
-                          <span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
-                        </span>
-                      </div>
-                    </li>
-                    <!--尾款-->
-                    <li v-if="item.FinalPayment!=''">
-                      <div @click="goFinacePage(item,5)" :class="getClass(item.FinalPaymentStatus)">
-                        <el-tooltip effect="dark" :content="item.FinalPayment" placement="top" popper-class="max-w250">
-                          <span>尾</span>
-                        </el-tooltip>
-                      </div>
-                      <div class="FinaDetailContent">
-                        <span v-if="item.FinalAuditList!=null" v-for="childItem in item.FinalAuditList">
-                          <span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
-                        </span>
-                      </div>
-                    </li>
-                  </ul>
-                </div>
-              </el-col>
-              <el-col :span="1" class="vmiddle">
+              <el-col :span="2" class="vmiddle">
                 <div class="TMA_raduis">
                   <ul style="padding:0;">
                     <li class="_head" style="display:block">
@@ -1626,13 +1555,13 @@
                   </ul>
                 </div>
               </el-col>
-              <el-col :span="2" class="vmiddle">
+              <el-col :span="3" class="vmiddle">
                 <div class="_jztime">
                   <p class="PingFangSC">{{item.TicketDeadlineStr}}</p>
                   <p class="_text">{{$t('Airticket.Air_deadTicketTime')}}</p>
                 </div>
               </el-col>
-              <el-col :span="3" class="vmiddle">
+              <el-col :span="1" class="vmiddle">
                 <el-button-group size="mini">
                   <el-tooltip class="item" effect="dark" content="立即下单" placement="top-start">
                     <el-button type="primary" icon="iconfont icon-fukuan1" @click="goBuy(item)"></el-button>
@@ -1642,16 +1571,13 @@
             </el-row>
 
             <el-row :gutter="0">
-              <el-col :span="16">
+              <el-col :span="24">
                 <div class="TCID_cont PingFangSC">
                   团期：
                   <span v-show="item.TCIDList.length==0">暂无</span>
                   <span class="Ticket_TCID" style="display:inline-block;margin-right: 10px;cursor: pointer;" v-for="(subItem, subIndex) in item.TravelInfo" :key="subIndex" @click="goUrlP(subItem.TCID)">{{subItem.TCNUM}}({{subItem.TCID}})</span>
                 </div>
               </el-col>
-              <el-col :span="8">
-                <div class="TCID_cont">PNR：{{item.PNR}}</div>
-              </el-col>
             </el-row>
           </li>
         </ul>
@@ -2303,33 +2229,6 @@
         }
         return FeeTypeName;
       },
-      //跳转财务付款单
-      goFinacePage(item, type) {
-        var TCID = 0;
-        if (item.TCIDList != null && item.TCIDList.length > 0) {
-          TCID = item.TCIDList[0];
-        }
-        let orderObj = {
-          OrderID: null,
-          OrderSource: 4,
-          TCID: null,
-          Obj: {
-            Type: type
-          },
-          SourceID: item.ID,
-          TCIDList: item.TCIDList
-        };
-        this.$router.push({
-          name: "ChoiceAddFinancialDocuments",
-          query: {
-            Type: 2,
-            companyID: -1,
-            path: "TicketFinace",
-            blank: "y",
-            orderObj: JSON.stringify(orderObj)
-          }
-        });
-      },
       //导入
       getImport(command) {
         this.importType = command;

src/components/ShoppingStore/ShoppingStore.vue

@@ -602,7 +602,7 @@
           </tr>
           <tr v-for="(item,index) in importData" :key="item.subCode">
             <td :class="{'redType':item.TCIDExist==-1}">
-              <el-input v-model="item.TCID" class="w150"></el-input>
+              <el-input v-model="item.TCNUM" class="w150"></el-input>
             </td>
             <td :class="{'redType':item.ShoppingNameExist==-1}">
               <el-select clearable class="w150" v-model='item.ShoppingID' filterable :placeholder="$t('hotel.hotel_area')">
@@ -651,8 +651,6 @@
       </el-upload>
     </el-dialog>
   </div>
-
-
 </template>
 
 <script>
@@ -1036,9 +1034,9 @@
         );
       },
       //导游名称
-      getGuider() {
+      getLeaderAndGuide() {
         let msg = {
-          Type: 2
+          Type: 0
         };
         this.apipost(
           "leader_post_GetList",
@@ -1046,23 +1044,6 @@
           res => {
             if (res.data.resultCode == 1) {
               this.guidList = res.data.data;
-            } else {
-              this.Error(res.data.message);
-            }
-          },
-          err => {}
-        );
-      },
-      //领队名称
-      getLeader() {
-        let msg = {
-          Type: 1
-        };
-        this.apipost(
-          "leader_post_GetList",
-          msg,
-          res => {
-            if (res.data.resultCode == 1) {
               this.leaderList = res.data.data;
             } else {
               this.Error(res.data.message);
@@ -1071,6 +1052,7 @@
           err => {}
         );
       },
+
       showTip2(index) {
         this.importData[index].infoShow = true;
       },
@@ -1179,8 +1161,7 @@
       this.getList();
       this.getType();
       this.getShopList();
-      this.getGuider();
-      this.getLeader();
+      this.getLeaderAndGuide();
       this.getDownList();
     }
   };