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

src/components/administrative/model/unTravelMessage.vue

+<template>
+  <el-dialog custom-class='PingFangSC' title="未收齐团款/未结团提醒" :visible.sync="outerVisibleNot" center
+      :before-close="closeChangeMachie" width="1100px">
+      <div v-if="UnTravelDate && UnTravelDate.rlist&&UnTravelDate.rlist.length>0" style="margin-top: 10px;">
+        <p style="font-size: 18px;font-weight: bold;background: #d1d1d1;padding: 5px 10px;">未完款订单列表</p>
+        <el-table :data="UnTravelDate.rlist" tooltip-effect="dark" style="width: 100%">
+          <!-- <el-table-column label="机票编码" width="">
+            <template slot-scope="scope">
+              {{scope.row.ID}}
+            </template>
+          </el-table-column> -->
+          <el-table-column prop="OrderId" label="订单号"></el-table-column>
+          <el-table-column label="团号" width="">
+            <template slot-scope="scope">
+              {{scope.row.TCID}}
+              <p>{{scope.row.TCNUM}}</p>
+            </template>
+          </el-table-column>
+          <el-table-column prop="EnterName" label="销售"></el-table-column>
+          <el-table-column prop="StartDate" label="出团日期"></el-table-column>
+          <el-table-column prop="PreferPrice" label="应收"></el-table-column>
+          <el-table-column prop="DueinMoney" label="待收"></el-table-column>
+          <el-table-column prop="CreateDate" label="创建日期"></el-table-column>
+        </el-table>
+      </div>
+      <div v-if="UnTravelDate && UnTravelDate.olist&&UnTravelDate.olist.length>0">
+        <p style="font-size: 18px;font-weight: bold;background: #d1d1d1;padding: 5px 10px;">未结团列表</p>
+        <el-table :data="UnTravelDate.olist" tooltip-effect="dark" style="width: 100%">
+          <!-- <el-table-column label="团ID/团号" width="">
+            <template slot-scope="scope">
+              {{scope.row.TCID}}
+              <p>{{scope.row.TCNUM}}</p>
+            </template>
+          </el-table-column> -->
+          <!-- <el-table-column prop="StartDate" label="出团日期">
+            <template slot-scope="scope">
+              {{getBeforeDate(0, new Date(scope.row.StartDate).Format("yyyy-MM-dd"))}}
+            </template>
+          </el-table-column> -->
+          <el-table-column prop="QStartDate" label="月份"></el-table-column>
+          <el-table-column prop="TeamTypeName" label="团队类型"></el-table-column>
+          <el-table-column prop="OPName" label="操作OP"></el-table-column>
+          <el-table-column prop="TCIDStr" label="团队信息"></el-table-column>
+        </el-table>
+      </div>
+      <div v-if="UnTravelDate && UnTravelDate.olist&&UnTravelDate.olist.length==0
+      &&UnTravelDate.rlist&&UnTravelDate.rlist.length==0" style="padding: 40px 0;text-align: center;">
+        暂无数据
+      </div>
+  </el-dialog>
+</template>
+
+<script>
+  export default {
+    props:["UnTravelDate"],
+    data() {
+      return {
+        outerVisibleNot: true
+      }
+    },
+    watch: {
+
+    },
+    methods: {
+      closeChangeMachie(done) {
+        this.$emit('unTravelVisible')
+      },
+    }
+  }
+</script>

src/components/confirmationOrderDownLoadNew.vue

@@ -38,8 +38,7 @@
 </style>
 
 <template>
-  <div class="travelControlTrip"
-  :style="{'width':dataAll&&dataAll.featurePageType==2?'1123px':'1754px'}">
+  <div class="travelControlTrip" :style="{'width':dataAll&&dataAll.featurePageType==2?'1123px':'1754px'}">
     <div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div>
     <el-row style="padding: 0 0 20px 0;box-shadow: 1px 10px 10px#e6e6e6;">
       <el-col :span="14" class="row-aic">
@@ -74,20 +73,23 @@
       </el-col>
     </el-row>
     <div id="pdfNode" class="LeaveGroupDownload-form LeaveGroupDownload-formHV">
-      <div id="pdfDom" :class="[dataAll.featurePageType==1?'pdfDomHV':'']">
+      <div id="pdfDom" :class="[dataAll&&dataAll.featurePageType==1?'pdfDomHV':'']">
         <!-- 首页 -->
         <LeaveGroupDownload :dataAll="dataAll" :vshowJ="vshowJ" :vshowL="vshowL" :WeiXinShareImgSrc="WeiXinShareImgSrc"
           :orderMsg="orderMsg" :orderTripdiff="orderTripdiff" :vshowLLR="vshowLLR" :vshowB="vshowB" :lineId="lineId"
           :priceList="priceList">
         </LeaveGroupDownload>
         <!-- 行程特色 -->
-        <ItineraryFeatures :dataAll="dataAll" :feature="feature" :vshowC="vshowC" :showType="showType"></ItineraryFeatures>
+        <ItineraryFeatures :dataAll="dataAll" :feature="feature" :vshowC="vshowC" :showType="showType">
+        </ItineraryFeatures>
 
         <!-- 行程天数 -->
-        <travelDays v-if="dataAll&&dataAll.featurePageType==2" :dataAll="dataAll" :orderMsg="orderMsg" :orderTripdiff="orderTripdiff" :tripList="tripList"
-          :vshowD="vshowD" :vshowK="vshowK" :feature="feature"></travelDays>
-        <travelDaysHV v-if="dataAll&&dataAll.featurePageType==1"  :dataAll="dataAll" :orderMsg="orderMsg" :orderTripdiff="orderTripdiff" :tripList="tripList"
-        :vshowD="vshowD" :vshowK="vshowK" :feature="feature"></travelDaysHV>
+        <travelDays v-if="dataAll&&dataAll.featurePageType==2" :dataAll="dataAll" :orderMsg="orderMsg"
+          :orderTripdiff="orderTripdiff" :tripList="tripList" :vshowD="vshowD" :vshowK="vshowK" :feature="feature">
+        </travelDays>
+        <travelDaysHV v-if="dataAll&&dataAll.featurePageType==1" :dataAll="dataAll" :orderMsg="orderMsg"
+          :orderTripdiff="orderTripdiff" :tripList="tripList" :vshowD="vshowD" :vshowK="vshowK" :feature="feature">
+        </travelDaysHV>
         <!-- 团队费用说明 -->
         <TourFareDescription :vshowE="vshowE" :vshowF="vshowF" :dataList="dataList" :feature="feature">
         </TourFareDescription>
@@ -558,7 +560,7 @@
           title += this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游';
         }
         var fileName = title + ".pdf";
-          that.pdfDownLoad(fileName, msg);
+        that.pdfDownLoad(fileName, msg);
         // if (this.orderId && this.orderId > 0) {
         //   //出团通知书下载
         //   this.pdfDownLoad(fileName, msg);

src/components/index.vue

@@ -1211,7 +1211,9 @@
     <!-- 机票未绑团提示 -->
     <unbundlingMessage v-if="unbundlingVisible" :UnboundDate="UnboundDate" @unbundlingVisible="unbundlingVisible=false">
     </unbundlingMessage>
-
+    <!-- 机票未绑团提示 -->
+    <unTravelMessage v-if="unTravelVisible" :UnTravelDate="UnTravelDate" @unTravelVisible="unTravelVisible=false">
+    </unTravelMessage>
     <!-- 改价提醒/审核改价提醒 -->
     <ChangeThePriceMessage v-if="ChangeThePriceVisible||ExamineThePriceVisible" :type="1" :msg="ExamineThePriceMsg"
       :ChangeThePriceObj="ChangeThePriceObj"
@@ -1242,6 +1244,7 @@
   import commissionDetail from "./commonPage/commissionDetail.vue";
   import Voting from "../components/administrative/model/Voting";
   import unbundlingMessage from "../components/administrative/model/unbundlingMessage";
+  import unTravelMessage from "../components/administrative/model/unTravelMessage";
   import ChangeThePriceMessage from "../components/administrative/model/ChangeThePriceMessage";
   import pptIframe from './commonPage/pptIframe/index';
 
@@ -1258,6 +1261,7 @@
       unbundlingMessage,
       ChangeThePriceMessage,
       pptIframe,
+      unTravelMessage,
     },
     data() {
       return {
@@ -1285,7 +1289,9 @@
           ChangeThePriceData: [],
         },
         UnboundDate: {},
+        UnTravelDate: {},
         unbundlingVisible: false, //未绑团提醒
+        unTravelVisible: false,//销售未完款提醒
         b2bDomain: "",
         useRed: false,
         //提成账单弹窗
@@ -1895,6 +1901,7 @@
       if (!localStorage.getItem("UnboundDateTime") ||
         (localStorage.getItem("UnboundDateTime") != this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))) {
         this.GetTravelAirNotBind()
+        this.GetSaleOrOPRemind();
       } else {
         if (localStorage.getItem("UnboundDate")) {
           if (this.userInfo.DepartName.indexOf("操作部") != -1 || this.userInfo.DepartName.indexOf("总部财务部") != -1 ||
@@ -2083,15 +2090,32 @@
                 if ((res.data.data.TravelList && res.data.data.TravelList.length > 0) ||
                   (res.data.data.AirList && res.data.data.AirList.length > 0)) {
                   localStorage.setItem("UnboundDate", JSON.stringify(res.data.data));
-                  localStorage.setItem("UnboundDateTime", this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")));
                   this.UnboundDate = res.data.data
                   this.unbundlingVisible = true
                 }
+                localStorage.setItem("UnboundDateTime", this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")));
               }
             }
           );
         }
       },
+      // 获取未完款的数据
+      GetSaleOrOPRemind() {
+        this.UnTravelDate = {}
+          this.apipost(
+            "opcommission_GetSaleOrOPRemind", {},
+            res => {
+              if (res.data.resultCode == 1) {
+                if ((res.data.data.rlist && res.data.data.rlist.length > 0) ||
+                  (res.data.data.olist && res.data.data.olist.length > 0)) {
+                  this.UnTravelDate = res.data.data
+                  this.unTravelVisible = true
+                  }
+                  localStorage.setItem("UnboundDateTime", this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")));
+                }
+            }
+          );
+      },
       testApi() {
         // var postMsg = {};
         // var cmd = "";