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

src/assets/css/tripIndexNew.css

+*{
+  /* font-family: FZCuSong-B09S; */
+}
+.pkey {
+    color: grey !important;
+}
+.pvalue {
+    color: #000;
+    font-weight: 700;
+}
+.detail-box .hangban-info {
+    width: 100%;
+    background: unset;
+    paddong: 0px;
+}
+.detail-box .hangban-info {
+    background-color: #f7f7f7;
+    padding: 20px 0px 15px 0px;
+    width: 960px;
+    margin: 0 auto;
+    box-sizing: border-box;
+}
+.hangban-info {
+    background: #FFF !important;
+}
+.trip-v3-base {
+    margin-top: 20px !important;
+    width: 100% !important;
+    border-collapse: collapse !important;
+}
+.travelControlTrip * {
+    page-break-inside: avoid;
+}
+.baseTable .essential-item.jianju {
+    border-right: 5px solid #FFF;
+    border-bottom: 5px solid #FFF;
+}
+.baseTable .essential-item {
+    background: #eee;
+}
+.travelControlTrip .essential-item {
+    width: 320px;
+    height: 100px;
+    box-sizing: border-box;
+    padding-left: 20px;
+}
+.baseTable .essential-item.jianju_b {
+    border-bottom: 5px solid #FFF;
+}
+.travelControlTrip .essential-item p.pvalue {
+    font-size: 18px;
+    color: #000;
+    margin-top: 5px;
+}
+.trip-v3-title.small-margin {
+    margin-bottom: 20px;
+}
+.trip-v3-title {
+    font-size: 36px !important;
+    font-weight: bolder !important;
+    margin-top: 40px !important;
+    text-align: center;
+}
+.LeaveGroupDownload-form .flight_header th {
+  font-size: 20px !important;
+  font-weight: 700 !important;
+  color: #000000 !important;
+  padding-bottom: 8px;
+  border-bottom: 1px solid #929292;
+  text-align: left;
+}
+.LeaveGroupDownload-form .flight_header th span {
+  font-size: 12px;
+  font-weight: 400;
+  vertical-align: 3px;
+  margin-left: 1px;
+  color: #CCC;
+}
+.LeaveGroupDownload-form .flight_list tbody tr:first-child td {
+  padding-top: 12px !important;
+}
+.LeaveGroupDownload-form .flight_list td {
+  font-size: 15px;
+  height: 34px;
+  vertical-align: middle;
+  background: #ffffff;
+}

src/components/FinancialModule/BasicDocuments.vue

@@ -1278,6 +1278,11 @@
               <div style="float:left">
                 <el-radio v-model="AuditOrRefundMsg.Status" label="5">通过</el-radio>
                 <el-radio v-model="AuditOrRefundMsg.Status" label="3">驳回</el-radio>
+                <span v-if="is_financeShow && GetDetail.Type==2 && item.AuditDescription.indexOf('会计')!=-1">
+                    &nbsp;&nbsp;&nbsp;|&nbsp;<span style="font-size: 12px;">金蝶发票：</span>&nbsp;&nbsp;
+                  <el-radio v-model="AuditOrRefundMsg.KingdeeInvoice" label="1">有票</el-radio>
+                  <el-radio v-model="AuditOrRefundMsg.KingdeeInvoice" label="2">无票</el-radio>
+                </span>
               </div>
               <div style="float:right" v-if="isShowChoice&&AuditOrRefundMsg.Status=='5'">
                 <el-radio v-model="choiceMsg.Status" label="1">常规</el-radio>
@@ -1581,6 +1586,11 @@
                 <div style="float:left">
                   <el-radio v-model="AuditOrRefundMsg.Status" label="5">通过</el-radio>
                   <el-radio v-model="AuditOrRefundMsg.Status" label="3">驳回</el-radio>
+                  <span v-if="is_financeShow && GetDetail.Type==2 && item.AuditDescription.indexOf('会计')!=-1">
+                    &nbsp;&nbsp;&nbsp;|&nbsp;<span style="font-size: 12px;">金蝶发票：</span>&nbsp;&nbsp;
+                  <el-radio v-model="AuditOrRefundMsg.KingdeeInvoice" label="1">有票</el-radio>
+                  <el-radio v-model="AuditOrRefundMsg.KingdeeInvoice" label="2">无票</el-radio>
+                </span>
                 </div>
                 <div style="float:right" v-if="isShowChoice&&AuditOrRefundMsg.Status=='5'">
                   <el-radio v-model="choiceMsg.Status" label="1">常规</el-radio>
@@ -2057,6 +2067,7 @@
           CourseId: null,
           CourseName: '',//收款类型 银行卡/支付宝/微信
           PayReceiptNo: '',
+          KingdeeInvoice: '0'
         },
         AuditListData: {
           AuditList: []
@@ -2164,6 +2175,7 @@
         LeadState: false,
         huijiShow: false,
         F_PayMoney_CapitalPool: false,
+        is_financeShow: false
       }
     },
     components: {
@@ -3845,6 +3857,9 @@
       if (ActionMenuCode.indexOf('F_Update_KJCostType') != -1) {
         this.huijiShow = true;
       }
+      if (ActionMenuCode.indexOf('F_AccountantFinanceMerge') != -1) {
+        this.is_financeShow = true;
+      }
       this.ID = this.$route.query.id;
       // 判断是否销售
       if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1||ActionMenuCode.indexOf('S_CheckAllOrder') != -1) {

src/components/LeaveGroupDownload/index.vue

+<template>
+  <div id="pdfNode" class="LeaveGroupDownload-form">
+    <div id="pdfDom" style="padding:0 20px;">
+      <div id="pdf_1" v-if="orderMsg">
+        <div class="logo-div">
+          <img
+            :src="
+              vshowJ === true
+                ? domainManager().ViittoFileUrl +
+                  '/Upload/PictureMaterial/Web/headerImg.jpg'
+                : domainManager().ViittoFileUrl +
+                  '/Upload/PictureMaterial/Web/headerImg2.jpg'
+            "
+          />
+        </div>
+
+        <div class="trip-adviser">
+          <h1 class="trip-nav-title">
+            <span>{{ vshowL ? "出团通知书：" : "" }}</span>
+            {{ orderMsg.lineteamName }}{{ orderMsg.dayNum }}日游
+          </h1>
+          <p>
+            尊敬的旅客：<br />感谢您选择我们的旅游服务。为了确保各位旅客有更好的旅游体验，请详细阅读《出团通知书》的各项内容。如有任何问题，请拨打通知书内的本团领队电话或机场服务人员电话。
+            在此，预祝您旅途愉快！希望您在本次旅程中留下此生中最美好的回忆！
+          </p>
+        </div>
+        <table class="baseTable trip-v3-base">
+          <tbody>
+            <tr>
+              <td class="essential-item jianju">
+                <p class="pkey">线路</p>
+                <p class="pvalue">{{ orderMsg.lineName }}</p>
+              </td>
+              <td class="essential-item jianju">
+                <p class="pkey">出发日期</p>
+                <p class="pvalue">{{ orderMsg.startDate }}</p>
+              </td>
+              <td class="essential-item jianju">
+                <p class="pkey">返回日期</p>
+                <p class="pvalue">{{ orderMsg.endDate }}</p>
+              </td>
+              <td class="essential-item jianju_b">
+                <p class="pkey">行程天数</p>
+                <p class="pvalue">{{ orderMsg.dayNum }}</p>
+              </td>
+              <td rowspan="2">
+                <div style="width: 160px; height:160px;margin-left:20px;">
+                  <img
+                    style="width: 160px; height:160px;"
+                    :src="'data:image/png;base64,' + WeiXinShareImgSrc"
+                    alt="获取微信小程序分享链接"
+                  />
+                </div>
+              </td>
+            </tr>
+            <tr>
+              <td class="essential-item jianju" colspan="2">
+                <p class="pkey">系列</p>
+                <p class="pvalue">{{ orderMsg.lineteamName }}</p>
+              </td>
+              <td class="essential-item jianju_b" colspan="2">
+                <p class="pkey">团队编号</p>
+                <p class="pvalue">{{ orderMsg.tcnum }}</p>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        <div class="trip-v3-title small-margin">
+          <h2>集合地点&amp;联系人</h2>
+        </div>
+        <table class="baseTable trip-v3-base">
+          <tbody>
+            <tr>
+              <td class="essential-item jianju">
+                <p class="pkey">本团领队</p>
+                <p class="pvalue">
+                  {{
+                    orderTripdiff != null
+                      ? orderTripdiff.leaderInfo
+                      : orderMsg.leaderName +
+                        (orderMsg.leaderMobile != null
+                          ? "/" + orderMsg.leaderMobile
+                          : "")
+                  }}
+                </p>
+              </td>
+              <td class="essential-item jianju">
+                <p class="pkey">集合时间</p>
+                <p class="pvalue">
+                  {{
+                    orderTripdiff != null
+                      ? orderTripdiff.gatheringTime
+                      : orderMsg.gatheringTime
+                  }}
+                </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>
+                </p>
+              </td>
+              <td class="essential-item jianju_b">
+                <p class="pkey">集合标识</p>
+                <p class="pvalue">
+                  {{
+                    orderTripdiff != null
+                      ? orderTripdiff.gatherIdent
+                      : orderMsg.bName
+                  }}
+                </p>
+              </td>
+            </tr>
+            <tr>
+              <td class="essential-item jianju" colspan="2">
+                <p class="pkey">紧急联系人</p>
+                <p class="pvalue">
+                  <span v-if="vshowLLR">
+                    <template v-if="orderMsg.emergencyContact != ''">
+                      {{ orderMsg.emergencyContact }}
+                    </template>
+                  </span>
+                </p>
+              </td>
+              <td class="essential-item jianju_b" colspan="2">
+                <p class="pkey">集合地点</p>
+                <p class="pvalue">
+                  {{
+                    orderTripdiff != null
+                      ? orderTripdiff.gatheringAddress
+                      : orderMsg.gatheringAddress
+                  }}
+                </p>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        <template v-if='vshowB'>
+        <div class="trip-v3-title small-margin">
+          参考航班
+        </div>
+        <div class="hangban-info">
+          <table
+            border="0"
+            align="center"
+            cellspacing="0"
+            cellpadding="0"
+            class="flight_list"
+            :class="{'guoneiLine':lineId==90}"
+          >
+            <thead class="flight_header">
+              <tr>
+                <th width="140">出发时间<span>(当地)</span></th>
+                <th width="160">抵达时间<span>(当地)</span></th>
+                <th width="160">
+                  <template v-if="lineId==90">起飞机场/出发城市</template>
+                  <template v-else>起飞机场</template>
+                </th>
+                <th width="18" class="gap">&nbsp;</th>
+                <th width="160">
+                  <template v-if="lineId==90">抵达机场/到达城市</template>
+                  <template v-else>抵达机场</template>
+                </th>
+                <th width="18" class="gap">&nbsp;</th>
+                <th width="140">航空公司</th>
+                <th width="90">航班编号</th>
+                <th width="18" class="gap">&nbsp;</th>
+                <th width="100">经停城市</th>
+              </tr>
+            </thead>
+            <tbody style="padding-top:12px;"
+            v-if="orderTripdiff&&orderTripdiff.travelOrderFlightList&& orderTripdiff.travelOrderFlightList.length>0">
+            <tr v-for="(flight,ftIndex) in orderTripdiff.travelOrderFlightList" :key="ftIndex">
+              <td width="140"><span class="nth-day">{{flight.startDate.substring(5)}}</span>&nbsp;<span
+                  class="num">{{flight.departureTime}}</span></td>
+              <td width="160"><span class="nth-day">{{flight.arriveDate.substring(5)}}</span>&nbsp;<span
+                  class="num">{{flight.arrivalTime}}</span></td>
+              <td width="160">{{flight.departureAirPortName}}<span class="citycode"></span></td>
+              <td width="18" class="gap">&nbsp;</td>
+              <td width="160">{{flight.arrivalAirPortName}}<span class="citycode"></span></td>
+              <td width="18" class="gap">&nbsp;</td>
+              <td width="140">{{flight.alName}}</td>
+              <td width="110">{{flight.flightNumber}}
+                <span style="color:green;">{{(flight.flightState==1)?"OK":"暂定"}}</span></td>
+              <td width="18" class="gap">&nbsp;</td>
+              <td width="100">{{flight.stopoverAirPortName}}</td>
+            </tr>
+            </tbody>
+            <tbody>
+              <tr>
+                <td
+                  colspan="10"
+                  align="center"
+                  style="color:#333;font-size:14px;"
+                >
+                  1.本航班表僅提供參考，正確航班請點選您的出發日期。 2.
+                  不同航班，餐食及行程安排皆有所不同，正確行程，請點選您的出發日期。
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </template>
+        <div style="width: 100%;height:20px;"></div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  components: {},
+  props: [
+    "vshowJ",
+    "vshowL",
+    "orderMsg",
+    "WeiXinShareImgSrc",
+    "orderTripdiff",
+    "vshowLLR",
+    "vshowB",
+    "lineId"
+  ],
+  data() {
+    return {};
+  },
+
+  methods: {},
+  computed: {},
+  watch: {
+    // FeatureData: {
+    //   handler(val, oldVal) {
+    //   },
+    //   deep: true,
+    //   immediate: true
+    // },
+  },
+  mounted() {}
+};
+</script>
+
+<style>
+@import url("../../assets/css/tripIndexNew.css");
+</style>

src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/travelDays.vue → src/components/LeaveGroupDownload/travelDays.vue

 <template>
   <div class="travelDays-form">
     <div class="travelDays-box absolute z-index1">
-      <div class="travelDays-Title">===============</div>
+      <Header :TripColor="TripColor" :FeatureItem="item"></Header>
+      <div class="travelDays-Title">
+        <div>
+          <div><vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.MainDesc"></vEditDiv></p>
+          <div>DAY</div>
+        </div>
+      </div>
     </div>
-    <el-dialog custom-class="resourceImgAdd" :title="$t('sm.chooseImg')" center :visible.sync="isShowScenicImg">
-      <!--imgType:1-酒店,2-餐厅,3-景点,4-票务,5-车辆,6-领队,7-购物店,isCheckmore:是否多选图片-->
-      <DMCchooseImg @closeImg="closeDMCchooseImg" ref="DMCchooseImg1" @headCallBack="getDMCimg" v-bind:isCheckmore="1"
-        v-bind:imgType="choseType" v-bind:queryItem="queryItem" v-bind:IsShowAdd="true" v-bind:IsShowVideo="true">
-      </DMCchooseImg>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-  import MasterMapList from "./components/MasterMapList";
-  import subheading from "./components/subheading";
-  import vEditDiv from "../TravelTemp/VEditDiv";
-  import FeatureControls from "./components/featureControls";
-  import DMCchooseImg from "../../../commonPage/DMCchooseImg.vue";
+  import Header from "../newTravelmanager/TravelGroupControl/UpgradedVersion/components/header";
   export default {
     components: {
-      MasterMapList,
-      subheading,
-      vEditDiv,
-      FeatureControls,
-      DMCchooseImg
+      Header
     },
     props: [
       'TripColor',

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

@@ -10,7 +10,6 @@
         @toAddPages="AddPages" @toDeletePages="DeletePages"></featureHome>
       <!-- 其余页 -->
       <div v-else>
-        <template v-if="item.pageType>1&&item.pageType<7">
           <headerTitle :FeatureItem="item" :TripColor="TripColor"></headerTitle>
           <!-- 介绍、宿食景页 -->
           <otherJourney :index="index" :FeatureItem="item" :TripColor="TripColor" @toAddPages="AddPages"
@@ -19,8 +18,6 @@
           <!-- 食详情页 -->
           <UpgradedVersionDetails :index="index" :FeatureData="item" :TripColor="TripColor" @toAddPages="AddPages"
             @toDeletePages="DeletePages" v-if="item.pageType==3"></UpgradedVersionDetails>
-        </template>
-        <travelDays v-else></travelDays>
         <!-- otherJourney-footer 食景 食详情 -->
         <div v-if="item.pageType!=1"
           :class="{'otherJourney-footer':item.pageType==5||item.pageType==6||item.pageType==3}">
@@ -49,7 +46,6 @@
   import featureHome from "./featureHome";
   import otherJourney from "./otherJourney";
   import UpgradedVersionDetails from "./UpgradedVersionDetails";
-  import travelDays from "./travelDays";
   import vEditDiv from "../TravelTemp/VEditDiv";
 
   export default {
@@ -59,7 +55,6 @@
       featureHome,
       otherJourney,
       UpgradedVersionDetails,
-      travelDays,
       vEditDiv,
     },
     props: [
@@ -110,13 +105,6 @@
             isDeletePage: false,
             pageTemplate: 3,
             dataObj: {},
-          },
-          {
-            pageTitle: '行程天数',
-            pageType: 7,
-            isDeletePage: false,
-            pageTemplate: 1,
-            dataObj: {},
           }
         ]
       };
@@ -272,21 +260,6 @@
                 }];
                 newObj.MainDesc = "行程景点描述信息";
               }
-            }
-             //行程天数
-             else if (pItem.pageType == 7) {
-              newObj.SubName = "特色行程天数";
-              if (tripObj.scenicArray && tripObj.scenicArray.length > 0) {
-                newObj.MainName = tripObj.scenicArray[0].MainName;
-                newObj.ImgList = tripObj.scenicArray[0].ImgList;
-                newObj.MainDesc = tripObj.scenicArray[0].MainDesc;
-              } else {
-                newObj.MainName = "行程天数";
-                newObj.ImgList = [{
-                  url: "http://imgfile.oytour.com/Upload/DMC/20200201061804955.jpg"
-                }];
-                newObj.MainDesc = "行程天数描述信息";
-              }
             }
             if(pItem.pageType == 4||pItem.pageType == 5||pItem.pageType == 6){
               newObj.SubList = [

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

@@ -116,10 +116,10 @@
         this.MasterMapIndex = index?index:0
         if(type) this.StencilDrawing = true
         else this.StencilDrawing = false
-        if(this.FeatureData.pageType==3) this.choseType = 2
-        else if(this.FeatureData.pageType==4) this.choseType = 1
-        else if(this.FeatureData.pageType==5) this.choseType = 2
-        else if(this.FeatureData.pageType==6) this.choseType = 3
+        if(this.FeatureItem.pageType==3) this.choseType = 2
+        else if(this.FeatureItem.pageType==4) this.choseType = 1
+        else if(this.FeatureItem.pageType==5) this.choseType = 2
+        else if(this.FeatureItem.pageType==6) this.choseType = 3
         else this.choseType = 0
         this.isShowScenicImg = true
       },

src/router/config.js

@@ -79,6 +79,14 @@ export default {
         title: '出团通知书下载'
       },
     },
+    {
+      path: '/confirmationOrderDownLoadNew',
+      name: 'confirmationOrderDownLoadNew',
+      component: resolve => require(['@/components/confirmationOrderDownLoadNew'], resolve),
+      meta: {
+        title: '出团通知书下载新'
+      },
+    },
     {
       path: '/SalesconfirmationOrder', //销售出团通知
       name: 'SalesconfirmationOrder',
@@ -2742,21 +2750,21 @@ export default {
                 title: '返佣查询'
               },
             },
-            { 
+            {
               path: '/Returnratio',// 销售=>返佣比例管理
               name: 'Returnratio',
               component: resolve => require(['@/components/SalesModule/Returnratio'], resolve),
               meta: {
                 title: '返佣比例管理'
               },
-            }, { 
+            }, {
               path: '/demandStatistics',// 销售=> 统计
               name: 'demandStatistics',
               component: resolve => require(['@/components/SalesModule/demandStatistics'], resolve),
               meta: {
                 title: '销售统计'
               },
-            }, { 
+            }, {
               path: '/quoTation',//团控=>报价单
               name: 'quoTation',
               component: resolve => require(['@/components/TravelManager/TravelQuotationCenter/quoTation'], resolve),