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

src/assets/css/newTravelManager.css

@@ -49,7 +49,7 @@
   .TTwo{margin:0 105px 0 105px;}
   .Travel_TT{display: inline-block;padding:3px 8px;background-color: #333333;
       color:#fff;border-radius:4px;font-size:12px;margin-left:20px;}
-  .Travel_Line{display: inline-block;width:1016px;border-bottom:1px dashed #BFBFBF;}
+  .Travel_Line{display: inline-block;width:100%;border-bottom:1px dashed #BFBFBF;}
   .TCswitch{display: inline-block;margin-left:18px;}
   .ComSwitchTitle{display:inline-block;vertical-align:top;width:75px;text-align: right;margin-top:2px;color:#606266;}
   .LowNum .el-input__inner{
@@ -842,7 +842,7 @@
 		position: relative;
 		top:2px;
 		text-align: center;
-		line-height: 25px;
+		line-height: 22px;
 		color:#bbb;
 		border:1px solid #bbb;
 		border-radius:50%;
@@ -2899,4 +2899,4 @@
 .showOther{
 	display:none!important;
 }
-.el-popover{text-align: inherit}
+.el-popover{text-align: inherit}
\ No newline at end of file

src/assets/css/tripIndexNew.css

@@ -388,29 +388,40 @@ html, body{
 
 .travelDaysdetailsBJ {
     border-radius: 100px;
-    flex-wrap: wrap;
+    flex-wrap: nowrap;
     padding: 20px 35px;
     -webkit-border-radius: 100px;
     -moz-border-radius: 100px;
     -ms-border-radius: 100px;
     -o-border-radius: 100px;
 }
-
+.travelDaysdetails-textBox{
+  flex: 1;
+}
+.travelDaysdetails-textBox:last-child .travelDaysdetails-text{
+  height: 105px;
+  word-break: break-all;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 3;
+  overflow: hidden;
+}
 .travelDaysdetails-text {
-    flex-wrap: nowrap;
+    flex-wrap: wrap;
     margin-right: 46px;
 }
 
-    .travelDaysdetails-text span {
-        font-size: 21px;
+    .travelDaysdetails-text0 {
         font-family: PingFang SC;
         font-weight: 800;
         color: #2A2A2A;
         line-height: 34px;
+        flex-shrink: 0;
     }
 
-    .travelDaysdetails-text div p {
-        font-size: 21px;
+    .travelDaysdetails-text {
+        font-size: 16px;
         font-weight: 100;
         color: #2A2A2A;
         line-height: 34px;
@@ -418,7 +429,21 @@ html, body{
         display: inline-block;
         padding: 0;
         margin: 0;
-        margin-right: 10px;
+    }
+    .travelDaysdetails-text1{
+      font-size: 16px !important;
+      font-weight: 100 !important;
+      color: #2A2A2A;
+    }
+    .travelDaysdetails-textBox:last-child span{
+      float: left;
+    }
+    .travelDaysdetails-text p,.travelDaysdetails-text1 p{
+      padding: 0 !important;
+      margin: 0 !important;
+      margin-top: 0 !important;
+      margin-bottom: 0 !important;
+      float: left;
     }
 
 .LeaveGroupDownload-form .travelControlTrip .module-title {
@@ -582,3 +607,7 @@ html, body{
 .otherJourney-footer .edit_div {
     display: none;
 }
+.featureDay-vToolBar{
+  left: 0;
+  top: 0;
+}

src/components/FinancialModule/HandFee/HandFeeStatistics.vue

@@ -217,7 +217,8 @@
         </div>
         <div slot="footer" class="dialog-footer">
           <button class="hollowFixedBtn" @click="iszhidanBox=false">{{$t('pub.cancelBtn')}}</button>
-          <button class="normalBtn" type="primary" @click="getMaking()">{{$t('pub.sureBtn')}}</button>
+          <el-button class="normalBtn" type="primary" @click="getMaking()"
+          :loading="loadingStandard">{{$t('pub.sureBtn')}}</el-button>
         </div>
       </template>
     </el-dialog>
@@ -256,6 +257,7 @@
   export default {
     data() {
       return {
+        loadingStandard: false,
         showDialog: false,
         shezhiMsg: {
           FinanceId: 0,
@@ -460,11 +462,13 @@
         this.getMoney()
         this.BillMakingMsg.Money = this.totalZD
         this.iszhidanBox = true
+        this.loadingStandard = true
         this.apipost('Financial_post_SetFinanceHandFeeCode', {
           FrIds: ids.join(',')
         }, res => {
           if (res.data.resultCode == 1) {
             this.BillMakingMsg.StandardCurrencyName = res.data.data
+            this.loadingStandard = false
             // this.showDialog = true
           } else {
             this.Error(res.data.message);
@@ -524,8 +528,10 @@
       },
       //设置转交
       getMaking() {
-        this.iszhidanBox = false;
-        this.makeAdocument(1)
+        if(!this.loadingStandard&&this.BillMakingMsg.StandardCurrencyName){
+          this.iszhidanBox = false;
+          this.makeAdocument(1)
+        }
       },
       // 制作单据
       makeAdocument(num, StandardCurrencyName) {

src/components/Hotel/reservation/OrderList.vue

@@ -683,11 +683,13 @@
           <div class="row wrap orderNo fz12 py">
             <span
             class="cursor-pointer radius5 mr px5"
-            :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
-            'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
+            :class="{'bgD9F3FF':x.InvoiceApplyState===6,'bgFAEAED':x.InvoiceApplyState===1||x.InvoiceApplyState===3,
+            'bjFFF3E0':x.InvoiceApplyState===2||x.InvoiceApplyState===4||x.InvoiceApplyState===5,
+            'c3FC4FF':x.InvoiceApplyState===6,'cF1416C':x.InvoiceApplyState===1||x.InvoiceApplyState===3,
+            'cff9800':x.InvoiceApplyState===2||x.InvoiceApplyState===4||x.InvoiceApplyState===5}"
               v-for="(x, i) in item.InvoiceApplyList"
               @click="openDetails(x)"
-              >{{ x.FrID }}</span
+              >{{ x.ID }}</span
             >
             <span v-if="item.InvoiceApplyList&&item.InvoiceApplyList.length == 0" class="c9e fz12">
               暂无发票单据
@@ -1108,7 +1110,7 @@ export default {
     // 单据详情
     openDetails(item) {
       let query = {
-        id: item.FrID,
+        id: item.FrID?item.FrID:item.ID,
         blank: "y",
       };
       this.$router.push({

src/components/LeaveGroupDownload/index.vue

@@ -4,24 +4,24 @@
       <div class="absolute z-index1 column" style="left: 0;right: 0; top: 0;bottom: 0;">
         <Header :TripColor="dataAll&&dataAll.tripColor" :orderMsg="orderMsg"></Header>
 
-          <div class="travelDaysTitlle row-aic">
-            <div class="travelDaysTitlle-left">
-              <div class="travelDaysTitlle-left-text column-ajc">
-                <div class="travelDaysTitlle-left-textOne">
-                  <span></span>
-                </div>
-                <div class="travelDaysTitlle-left-textTwo">
-                  <span></span>
-                </div>
+        <div class="travelDaysTitlle row-aic">
+          <div class="travelDaysTitlle-left">
+            <div class="travelDaysTitlle-left-text column-ajc">
+              <div class="travelDaysTitlle-left-textOne">
+                <span></span>
+              </div>
+              <div class="travelDaysTitlle-left-textTwo">
+                <span></span>
               </div>
             </div>
-            <div class="travelDaysTitlle-right">
-              <div class="travelDaysTitlle-right-text row-aic"
+          </div>
+          <div class="travelDaysTitlle-right">
+            <div class="travelDaysTitlle-right-text row-aic"
               :style="{'background': dataAll&&dataAll.tripColor,'font-size': getFontSize(orderMsg.lineteamName+orderMsg.dayNum),'color':textColor}">
-                {{ orderMsg.lineteamName }}{{ orderMsg.dayNum }}日游
-              </div>
+              {{ orderMsg.lineteamName }}{{ orderMsg.dayNum }}日游
             </div>
           </div>
+        </div>
         <div style="margin: 0 30px;">
           <div class="trip-adviser" style="margin-top: 20px;">
             <!-- <h1 class="trip-nav-title">
@@ -80,46 +80,27 @@
                 <td class="essential-item jianju">
                   <p class="pkey">本团领队</p>
                   <p class="pvalue">
-                    {{
-                          orderTripdiff != null
-                            ? orderTripdiff.leaderInfo
-                            : orderMsg.leaderName +
-                              (orderMsg.leaderMobile != null
-                                ? "/" + orderMsg.leaderMobile
-                                : "")
-                        }}
+                    {{orderMsg.leaderInfo}}
                   </p>
                 </td>
                 <td class="essential-item jianju">
                   <p class="pkey">集合时间</p>
                   <p class="pvalue">
-                    {{
-                          orderTripdiff != null
-                            ? orderTripdiff.gatheringTime
-                            : orderMsg.gatheringTime
-                        }}
+                    {{ orderMsg.gatheringTimeInfo }}
                   </p>
                 </td>
                 <td class="essential-item jianju">
                   <p class="pkey">机场服务</p>
                   <p class="pvalue">
-                    <template v-if="
-                            orderMsg &&
-                              orderMsg.airportServicePerson &&
-                              orderMsg.airportServicePerson != ''
-                          ">
-                      {{ orderMsg.airportServicePerson }}
-                    </template>
+                    {{orderMsg.airportServiceInfo}}
                   </p>
                 </td>
                 <td class="essential-item jianju_b">
                   <p class="pkey">集合标识</p>
                   <p class="pvalue">
                     {{
-                          orderTripdiff != null
-                            ? orderTripdiff.gatherIdent
-                            : orderMsg.bName
-                        }}
+                      orderMsg.gatherIdentInfo
+                    }}
                   </p>
                 </td>
               </tr>
@@ -128,20 +109,14 @@
                   <p class="pkey">紧急联系人</p>
                   <p class="pvalue">
                     <span v-if="vshowLLR">
-                      <template v-if="orderMsg.emergencyContact != ''">
-                        {{ orderMsg.emergencyContact }}
-                      </template>
+                      {{orderMsg.emergencyContactInfo}}
                     </span>
                   </p>
                 </td>
                 <td class="essential-item jianju_b" colspan="2">
                   <p class="pkey">集合地点</p>
                   <p class="pvalue">
-                    {{
-                          orderTripdiff != null
-                            ? orderTripdiff.gatheringAddress
-                            : orderMsg.gatheringAddress
-                        }}
+                    {{ orderMsg.gatheringAddressInfo}}
                   </p>
                 </td>
               </tr>
@@ -238,10 +213,10 @@
     },
 
     methods: {
-      getFontSize(title){
-        if(title.length+2>60){
-          return 929/60 +'px'
-        }else{
+      getFontSize(title) {
+        if (title.length + 2 > 60) {
+          return 929 / 60 + 'px'
+        } else {
           return '30px'
         }
       },
@@ -250,15 +225,15 @@
     watch: {
       dataAll: {
         handler(val, oldVal) {
-          if(val&&val.tripColor){
+          if (val && val.tripColor) {
             this.backgroundColor = this.hexToRgb(val.tripColor, 0.2)
             let rgba = this.hexToRgb(val.tripColor, 1)
             rgba = rgba.split(',')
             let rgba0 = rgba[0].split('(')
-            let arr = [rgba0[1],rgba[1],rgba[2]]
-            if(this.getRgbLevel(arr)>50){
+            let arr = [rgba0[1], rgba[1], rgba[2]]
+            if (this.getRgbLevel(arr) > 50) {
               this.textColor = "#fff"
-            }else{
+            } else {
               this.textColor = "#333"
             }
           }

src/components/busManagement/BookAcar/components/orderList.vue

@@ -790,11 +790,13 @@
           <div class="row wrap orderNo fz12 py">
             <span
             class="cursor-pointer radius5 mr px5"
-            :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
-            'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
+            :class="{'bgD9F3FF':x.InvoiceApplyState===6,'bgFAEAED':x.InvoiceApplyState===1||x.InvoiceApplyState===3,
+            'bjFFF3E0':x.InvoiceApplyState===2||x.InvoiceApplyState===4||x.InvoiceApplyState===5,
+            'c3FC4FF':x.InvoiceApplyState===6,'cF1416C':x.InvoiceApplyState===1||x.InvoiceApplyState===3,
+            'cff9800':x.InvoiceApplyState===2||x.InvoiceApplyState===4||x.InvoiceApplyState===5}"
               v-for="(x, i) in item.InvoiceApplyList"
               @click="openDetails(x)"
-              >{{ x.FrID }}</span
+              >{{ x.ID }}</span
             >
             <span v-if="item.InvoiceApplyList&&item.InvoiceApplyList.length == 0" class="c9e fz12">
               暂无发票单据
@@ -1319,7 +1321,7 @@ export default {
     // 单据详情
     openDetails(item) {
       let query = {
-        id: item.FrID,
+        id: item.FrID?item.FrID:item.ID,
         blank: "y",
       };
       this.$router.push({

src/components/confirmationOrderDownLoad.vue

@@ -204,8 +204,11 @@
                   <div><img src="../assets/img/TravelControlTripIcon13.png" />紧急联系人</div>
                   <template>
                     <span v-if='vshowLLR'>
-                      <template v-if="orderMsg.emergencyContact!=''">
-                        {{orderMsg.emergencyContact}}
+                      <template v-if="orderTripdiff!=null&&orderTripdiff.emergencyContact!=''">
+                        {{orderTripdiff.emergencyContact}}
+                      </template>
+                      <template v-else-if="orderMsg.branchManager!=''&&orderMsg.mobilePhone!=''">
+                        {{orderMsg.branchManager+"/"+orderMsg.mobilePhone}}
                       </template>
                     </span>
                   </template>

src/components/confirmationOrderDownLoadNew.vue

@@ -82,7 +82,8 @@
         <OrderNotice :vshowG="vshowG" :feature="feature"></OrderNotice>
 
         <!-- 签证信息 -->
-        <VisaInformation :vshowG="vshowG" :vshowM="vshowM" :vshowJ="vshowJ" :vshowI="vshowI" :feature="feature" :orderMsg="orderMsg">
+        <VisaInformation :vshowG="vshowG" :vshowM="vshowM" :vshowJ="vshowJ" :vshowI="vshowI" :feature="feature"
+          :orderMsg="orderMsg">
         </VisaInformation>
       </div>
     </div>
@@ -594,20 +595,12 @@
             this.SourceData.Id = 0;
             if (this.$route.query.orderId > 0) {
               this.SourceData.orderId = this.$route.query.orderId;
-              var str = "";
-              if (this.orderMsg.leaderName) {
-                str = this.orderMsg.leaderName;
-              }
-              if (this.orderMsg.leaderMobile) {
-                str += "/" + this.orderMsg.leaderMobile;
-              }
-              this.SourceData.leaderInfo = str;
-              this.SourceData.gatheringTime = this.orderMsg.gatheringTime;
-              this.SourceData.airportService = this.orderMsg.airportServicePerson + "/" + this.orderMsg
-                .airportServicePhone;
-              this.SourceData.gatherIdent = this.orderMsg.bName;
-              this.SourceData.emergencyContact = this.orderMsg.sellName + "/" + this.orderMsg.sellTel;
-              this.SourceData.gatheringAddress = this.orderMsg.gatheringAddress;
+              this.SourceData.leaderInfo = this.orderMsg.leaderInfo;
+              this.SourceData.gatheringTime = this.orderMsg.gatheringTimeInfo;
+              this.SourceData.airportService = this.orderMsg.airportServiceInfo;
+              this.SourceData.gatherIdent = this.orderMsg.gatherIdentInfo;
+              this.SourceData.emergencyContact = this.orderMsg.emergencyContactInfo;
+              this.SourceData.gatheringAddress = this.orderMsg.gatheringAddressInfo;
               if (data.priceList != null && data.priceList.length > 0) {
                 var array = JSON.parse(JSON.stringify(data.priceList[0].priceFlight));
                 this.SourceData.travelOrderFlightList = [];
@@ -657,6 +650,27 @@
           })
         }, err => {})
       },
+      //上移下移(IsUp:0上移，1下移)
+      MoveItem(item, subIndex, IsUp) {
+        var currentItem = this.editForm.travelOrderFlightList[subIndex];
+        //上移
+        if (IsUp == 0) {
+          if (subIndex > 0) {
+            var upItem = this.editForm.travelOrderFlightList[subIndex - 1];
+            this.$set(this.editForm.travelOrderFlightList, subIndex - 1, currentItem);
+            this.$set(this.editForm.travelOrderFlightList, subIndex, upItem);
+            this.$forceUpdate();
+          }
+        } else {
+          //下移
+          if (subIndex != this.editForm.travelOrderFlightList.length - 1) {
+            var downItem = this.editForm.travelOrderFlightList[subIndex + 1];
+            this.$set(this.editForm.travelOrderFlightList, subIndex + 1, currentItem);
+            this.$set(this.editForm.travelOrderFlightList, subIndex, downItem);
+            this.$forceUpdate();
+          }
+        }
+      },
       //初始化行程
       initTrip(res, data) {
         this.tripList = res.data.data.dayList;

src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/featureControls.vue

@@ -21,7 +21,7 @@
           <i class="el-icon-delete"></i>
         </div>
       </el-tooltip>
-      <el-tooltip class="item" effect="dark" content="尺寸" placement="top" v-if="x&&y">
+      <el-tooltip class="item" effect="dark" :content="'尺寸'+x+'*'+y" placement="top" v-if="x&&y">
         <div class="cursorInitial fz14">{{x}} * {{y}}</div>
       </el-tooltip>
     </div>

src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue

@@ -68,41 +68,41 @@
             pageTitle: '首页',
             pageType: 1,
             pageTemplate: 0,
-            isDeletePage: false,
+            isDeletePage: true,
             dataObj: {},
           },
           {
             pageTitle: '介绍',
             pageType: 2,
             pageTemplate: 0,
-            isDeletePage: false,
+            isDeletePage: true,
             dataObj: {},
           },
           {
             pageTitle: '食详情',
             pageType: 3,
             pageTemplate: 0,
-            isDeletePage: false,
+            isDeletePage: true,
             dataObj: {},
           },
           {
             pageTitle: '宿',
             pageType: 4,
-            isDeletePage: false,
+            isDeletePage: true,
             pageTemplate: 1,
             dataObj: {},
           },
           {
             pageTitle: '食',
             pageType: 5,
-            isDeletePage: false,
+            isDeletePage: true,
             pageTemplate: 2,
             dataObj: {},
           },
           {
             pageTitle: '景',
             pageType: 6,
-            isDeletePage: false,
+            isDeletePage: true,
             pageTemplate: 3,
             dataObj: {},
           }
@@ -128,7 +128,7 @@
           pageTitle: '首页', //页面名称
           pageType: 1, //页面类型1-首页，2-介绍页面，3-详情, 4-酒店，5-餐，6-景点
           pageTemplate: 0,
-          isDeletePage: false,
+          isDeletePage: true,
           dataObj: {},
         };
         return pageObj;

src/components/rank/salesVolumeRank.vue

@@ -123,8 +123,7 @@
     </el-table-column>
     <el-table-column
       property="name"
-      label="名称"
-      width="80">
+      label="名称">
     </el-table-column>
     <el-table-column
       property="SumPreferPrice"
@@ -170,6 +169,11 @@
       label="客单价"
       width="" sortable>
     </el-table-column>
+    <el-table-column
+      property="XiaoBaoTuanCount"
+      label="小包团团数"
+      width="">
+    </el-table-column>
     <el-table-column
       property="zanBi"
       label="销售额占比"

src/components/scenicSpot/reservation/OrderList.vue

@@ -763,11 +763,13 @@
           <div class="row wrap orderNo fz12 py">
             <span
             class="cursor-pointer radius5 mr px5"
-            :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
-            'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
+            :class="{'bgD9F3FF':x.InvoiceApplyState===6,'bgFAEAED':x.InvoiceApplyState===1||x.InvoiceApplyState===3,
+            'bjFFF3E0':x.InvoiceApplyState===2||x.InvoiceApplyState===4||x.InvoiceApplyState===5,
+            'c3FC4FF':x.InvoiceApplyState===6,'cF1416C':x.InvoiceApplyState===1||x.InvoiceApplyState===3,
+            'cff9800':x.InvoiceApplyState===2||x.InvoiceApplyState===4||x.InvoiceApplyState===5}"
               v-for="(x, i) in item.InvoiceApplyList"
               @click="openDetails(x)"
-              >{{ x.FrID }}</span
+              >{{ x.ID }}</span
             >
             <span v-if="item.InvoiceApplyList&&item.InvoiceApplyList.length == 0" class="c9e fz12">
               暂无发票单据
@@ -1321,7 +1323,7 @@
     // 单据详情
     openDetails(item) {
       let query = {
-        id: item.FrID,
+        id: item.FrID?item.FrID:item.ID,
         blank: "y",
       };
       this.$router.push({