提交代码

src/assets/utils/tripUtils.js

@@ -786,9 +786,8 @@ var tripUtils = {
     if (B2BDomain) {
       var url = "http://" + B2BDomain;
       window.open(
-        url + '/#/OneDayDetailTwo/' +
-        encodeURIComponent(ConfigId) + '/' + tcid +
-        '/preview',
+        url + '/#/detail/' +
+        encodeURIComponent(ConfigId) + '/' + tcid,
         '_blank'
       )
     }
@@ -798,11 +797,9 @@ var tripUtils = {
     if (B2BDomain) {
       var url = "http://" + B2BDomain;
       window.open(
-        url + "/#/detailTwo/" +
-        encodeURIComponent(ConfigId) +
-        "/" +
+        url + "/#/detail/preview/" +
         tcid +
-        "/preview",
+        "/0",
         "_blank"
       );
     }
@@ -812,8 +809,7 @@ var tripUtils = {
         if (B2BDomain) {
           var url = "http://" + B2BDomain;
           window.open(
-            url + "/#/details/" +
-            encodeURIComponent(ConfigId) +
+            url + "/#/detail/" +-encodeURIComponent(ConfigId) +
             "/" +
             tcid ,
             "_blank"
@@ -824,7 +820,7 @@ var tripUtils = {
   GetB2BUrl(B2BDomain, ConfigId, tcid) {
     var url = "";
     if (B2BDomain) {
-      url = "http://" + B2BDomain + "/#/details/" +
+      url = "http://" + B2BDomain + "/#/detail/" +
         encodeURIComponent(ConfigId) +
         "/" +
         tcid;

src/components/FinancialModule/ServiceCommission/ServiceCommissiondetails.vue

@@ -108,7 +108,12 @@
         <!-- <th>订单号</th> -->
         <th>团利润</th>
         <th>订单数量</th>
-        <th>提成</th>
+
+        <th>订单号</th>
+        <th>订单人数</th>
+        <th>订单利润</th>
+
+        <th>提成金额</th>
         <th>提成比例</th>
         <th>期数</th>
         <th width='400'>备注</th>
@@ -131,6 +136,11 @@
         <!-- <td>{{item.OrderId}}</td> -->
         <td>{{item.TCProfit}}</td>
         <td>{{item.OrderCount}}</td>
+
+        <td>{{item.OrderId>0?item.OrderId:'-'}}</td>
+        <td>{{item.GuestNum?item.GuestNum:'-'}}</td>
+        <td>{{item.OrderProfit?item.OrderProfit:'-'}}</td>
+
         <td>{{item.CommissionMoney}}</td>
         <td>{{item.CommissionRate}}%</td>
         <td>{{item.Periods}}</td>

src/components/Hotel/reservation/HotelOrderList.vue

@@ -266,13 +266,20 @@
                 let addList = function(arr){
                   arr.forEach(x=>{
                     x.list = []
+                    x.isMore = false
+                    x.upIcon = false
+                    x.NewDetailList = []
                     // x.Tax = 0
                     // x.Tax2 = 0
                   })
                 }
                 addList(data)
                 data.forEach(item => {
-                  item.DetailList.forEach(x=>{
+                  if(item.DetailList.length>2){
+                    item.isMore = true
+                  }
+                  let dataLists = []
+                  item.DetailList.forEach((x,index)=>{
                     x.Number = 0
                     x.PeopleNumber = 0
                     x.RoomList.forEach(r=>{
@@ -282,7 +289,11 @@
                     x.Tax = x.TaxesPrice*x.Number
                     x.Tax2 = x.PriceInTangTax*x.PeopleNumber
                     x.Money = x.HotelMoeny+x.TaxesPrice
+                    if(index<2){
+                      dataLists.push(x)
+                    }
                   })
+                  item.NewDetailList = JSON.parse(JSON.stringify(dataLists))
                 })
 
                 this.OrderList = data;

src/components/Hotel/reservation/OrderList.vue

@@ -311,7 +311,7 @@
 <template>
   <div>
     <div
-      v-for="(item, index) in OrderList"
+      v-for="(item, index) in OrderList" :key="index"
       class="column bgf radius5 px15 mb20"
     >
       <div class="row-c justify-sb align-c py">
@@ -382,7 +382,7 @@
         </div>
       </div>
       <div class="mb">
-        <el-table :data="item.DetailList" style="width:100%" border>
+        <el-table :data="item.NewDetailList" style="width:100%" border>
           <el-table-column
             label="入住日期"
             min-width="100"
@@ -479,8 +479,9 @@
               {{ item.HandFittingFee ? item.HandFittingFee : "-" }}
             </template>
           </el-table-column>
-          <template slot="append" v-if="item.Remark">
+          <template slot="append" v-if="item.Remark||item.isMore">
             <div style="padding:10px;color:#f1416c">客户备注：{{item.Remark}}</div>
+            <more v-if="item.isMore" @change="ViewMore(item,index)" :upIcon="item.upIcon"></more>
           </template>
         </el-table>
       </div>
@@ -690,10 +691,7 @@
             <span class="fz12 c9e">订单总金额</span>
             <div class="ml">
               <span class="fz15 fbold">{{ item.Money.toFixed(2) }}</span>
-              <span class="fz12 ml">
-                <!-- ¥ -->円
-              </span>
-              <!-- <span class="fz15">{{ item.CurrencyName }}</span> -->
+              <span class="fz12 ml">{{ item.CurrencyName }}</span>
             </div>
           </div>
           <div
@@ -702,11 +700,8 @@
           >
             <span class="fz12 c9e">到店自付</span>
             <div class="ml">
-              <span class="fz10 ml">
-                <!-- ¥ -->円
-              </span>
               <span class="fz14">{{ item.SelfPayMoney.toFixed(2) }}</span>
-              <!-- <span class="fz14">{{ item.CurrencyName }}</span> -->
+              <span class="fz12 ml">{{ item.CurrencyName }}</span>
             </div>
           </div>
           <div
@@ -715,11 +710,8 @@
           >
             <span class="fz12 c9e">出发前付款</span>
             <div class="ml">
-              <span class="fz10 ml">
-                <!-- ¥ -->円
-              </span>
               <span class="fz14">{{ item.BeforeMoney.toFixed(2) }}</span>
-              <!-- <span class="fz14">{{ item.CurrencyName }}</span> -->
+              <span class="fz12 ml">{{ item.CurrencyName }}</span>
             </div>
           </div>
         </div>
@@ -873,7 +865,9 @@
   </div>
 </template>
 <script>
+  import more from '../../public/more.vue';
 export default {
+  components: { more },
   props: ["OrderList","pagesTitle"],
   data() {
     return {
@@ -910,7 +904,7 @@ export default {
       uploadOrderId: 0,
       loading: false,
       fileList:[],
-      GuestFile: ''
+      GuestFile: '',
     };
   },
   watch: {
@@ -924,6 +918,20 @@ export default {
     }
   },
   methods: {
+    ViewMore(x,index){
+        x.upIcon = !x.upIcon
+        if(x.upIcon){
+          x.NewDetailList = JSON.parse(JSON.stringify(x.DetailList))
+        }else{
+          x.NewDetailList = []
+          x.DetailList.forEach((y,index)=>{
+            if(index<2){
+              x.NewDetailList.push(y)
+            }
+          })
+        }
+        
+      },
     uploadFileBtn(file){
       let ft = file.file.name.substring(file.file.name.lastIndexOf('.') + 1, file.file.name.length).toUpperCase();
       let typeOk = false;

src/components/Hotel/singleProduct/components/ListCar.vue

@@ -105,8 +105,8 @@
                         <div>
                             <span class="coloref1416c fz12">订单总金额：</span>
                             <span class="coloref1416c fbold">
-                                <span class="fz13"><!-- ¥ -->円</span>
                                 <span class="fz18">{{parameters.Money}}</span>
+                                <span class="fz13"><!-- ¥ -->{{cars[0].CurrencyName}}</span>
                             </span>
                         </div>
                         <div>

src/components/Hotel/singleProduct/components/TableOperation.vue

@@ -113,7 +113,8 @@
                 TaxesPrice:0,
                 PriceInTangTax:0,
                 PriceIsBreakfast:0,
-                PriceIsDinner:0
+                PriceIsDinner:0,
+                CurrencyName: ''
             },
             total: 0,
             joinHouse: {
@@ -147,7 +148,6 @@
         },
         hotelInfor: {
             handler: function (val, oldVal) {
-                
                 if(this.hotelInfor&&this.hotelInfor.RemainingInventory){
                     this.onlyNum = this.hotelInfor.RemainingInventory
                 }
@@ -214,6 +214,7 @@
             }else{
                 exists = {
                     Date:temp.Date,
+                    CurrencyName: this.parameters.CurrencyName,
                     Hotels:[]
                 }
                 this.cars.push(exists)
@@ -250,6 +251,7 @@
             this.parameters.PriceInTangTax= tempPrice.PriceInTangTax
             this.parameters.PriceIsBreakfast = tempPrice.PriceIsBreakfast
             this.parameters.PriceIsDinner = tempPrice.PriceIsDinner
+            this.parameters.CurrencyName = tempPrice.CurrencyName
 
             this.setDateRange()
             roomTyps.forEach((x, i) => {
@@ -269,7 +271,7 @@
                     Destription: '',
                     TaxesPrice: tempPrice.TaxesPrice,
                     PriceInTangTax: tempPrice.PriceInTangTax,
-                    HotelName: this.HotelRow.HotelName
+                    HotelName: this.HotelRow.HotelName,
                     }
                     this.parameters.DetailList.push(dataMsg)
                 }

src/components/SalesModule/productQueryOne.vue

@@ -801,8 +801,10 @@
                 </p>
                 <p class="d12TC">{{item.TCNUM}}（{{item.TCID}}）</p>
                 <p>{{item.LtName}}</p>
+                
                 <el-tooltip class="item" effect="dark" :content="item.Title" placement="top-start" popper-class="max-w250">
-                  <p class="d12p" @click="getJourney(item.ConfigID,item.LineName)" :title="item.Title">{{item.Title}}</p>
+                  <!-- <p class="d12p" @click="getJourney(item.ConfigID,item.LineName)" :title="item.Title">{{item.Title}}</p> -->
+                  <p class="d12p" @click="goB2Bdetail(item.ConfigID, item.TCID)" :title="item.Title">{{item.Title}}</p>
                 </el-tooltip>
               </div>
             </div>
@@ -1276,6 +1278,8 @@
         ],
         TotalNumber: 0,
         countryList: [],//国籍
+         //当前登录用户信息
+         CurrentUserInfo: {},
       }
     },
     components: {
@@ -1327,6 +1331,15 @@
       }
     },
     methods: {
+      goB2Bdetail(ConfigId, tcid) {
+        var B2BDomain = this.CurrentUserInfo.B2BDomain//'www.oytour.com';
+        this.$tripUtils.GotoB2BPage(B2BDomain,encodeURIComponent(ConfigId),tcid);
+        // var url = "http://" + 'www.oytour.com';
+        // window.open(
+        //   url + "/#/detail/XXcsyIZsyIY%3D/" +tcid +"/" +encodeURIComponent(ConfigId),
+        //   "_blank"
+        // );
+      },
       getCountry() {
         //获取国家
         let msg = {};
@@ -2451,6 +2464,9 @@
         let nowDay =this.FormartDate(new Date());
         this.msg.StartTime = nowDay;
       }
+      let userInfo = this.getLocalStorage()
+      this.CurrentUserInfo = userInfo
+
       this.getEmployee()
       this.getCompanyList()
       this.getList()

src/components/TravelContractDetail.vue

@@ -749,7 +749,7 @@
                   </td>
                   <td>
                     <span>{{dataList.company}}</span>
-                    <img class="esealDiv" v-if="isShowZhang==1" :src="CurrentUserInfo.ZhangImg" alt="" />
+                    <img class="esealDiv" :src="CurrentUserInfo.ZhangImg" alt="" />
                   </td>
                 </tr>
                 <tr>
@@ -1133,6 +1133,7 @@
       },
       //获取是否显示公司章
       getShow(ID) {
+        console.log(ID,'ID')
         if (ID != null && ID != undefined) {
           let msg = {
             ID: ID
@@ -1607,7 +1608,7 @@
       this.msg.guestId = this.$route.query.guestId;
       let TID = this.$route.query.ID;
       this.getList();
-      this.getShow(this.TID);
+      this.getShow(TID);
       this.GetTrip(0, this.msg.TCID);
     }
   };

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -1359,7 +1359,7 @@
       },
       goB2B(ConfigId, tcid) {
         var B2BDomain = this.CurrentUserInfo.B2BDomain;
-        this.$tripUtils.GotoB2BOneDayPage(B2BDomain, ConfigId, tcid);
+        this.$tripUtils.GotoB2BPage(B2BDomain, ConfigId, tcid);
       },
       goTeamBalance(id, OutBranchId) {
         this.$router.push({

src/components/WebSet/WebSiteConfig.vue

@@ -127,6 +127,16 @@
 
 </style>
 <template>
+  <div class="dianshangannualRatio" ref="barparent">
+    <div class="query-box" style="border: 0;padding: 0;">
+      <ul class="clearfix">
+        <li class="hight_query">
+            <span style="text-align: right;color: red;">导入Jalan 酒店基础数据，定时器会更新酒店的报价数据</span>
+            <button class="normalBtn" @click="outerVisible=true">导入</button>
+            
+        </li>
+    </ul>
+    </div>
   <!--网站设定(网站设置)-->
   <div class="WebSiteConfig">
     <el-form label-width="130px">
@@ -578,11 +588,25 @@
       </span>
     </el-dialog>
   </div>
+  <el-dialog custom-class='w700' title="导入" :visible.sync="outerVisible" center>
+    <el-upload style="text-align: center;" drag class="upload-demo"
+              :action="importFileUrl2"
+              :on-success="handleAvatarSuccess"
+              :before-upload="beforeAvatarUpload">
+          <i class="el-icon-upload"></i>
+          <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+          <!-- <div slot="tip" class="el-upload__tip">只能上传Excel文件</div> -->
+        </el-upload>
+    
+  </el-dialog>
+  </div>
 </template>
 <script>
   export default {
     data() {
       return {
+        importFileUrl2: "",
+        outerVisible: false,
         editTitle: "選單",
         //弹窗
         isShowDialog: false,
@@ -700,10 +724,38 @@
       };
     },
     mounted() {
+      let userInfo = this.getLocalStorage();
+      this.importFileUrl2=this.domainManager().UploadFileUrl +
+          "?cmd=dmc_post_LocalFileUpload&Type=16&fileType=1&fileLimit=10&EmployeeId="+userInfo.EmployeeId
+          +'&RB_Group_id='+userInfo.RB_Group_id +'&KingdeeBId=0'
+        ;
       this.getPageTypeList();
       this.getData();
     },
     methods: {
+      //上传
+      handleAvatarSuccess(res, file) {
+            let that = this
+          if (res.resultCode == 1) {
+            this.Success(res.message);
+            this.outerVisible = false;
+            this.getData();
+          }else{
+            that.$confirm(res.message, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+            }).then(() => {
+                
+            }).catch(() => {
+
+            });
+  
+          }
+        },
+        beforeAvatarUpload(file) {
+          return
+        },
       //下拉选择
       changeMenu(type) {
         if (type == 1) {

src/components/WebSet/plug-in/other_dialog.vue

@@ -124,7 +124,9 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="段落內容">
-              <el-input type="textarea" :rows="4" v-model="plugData.ParagraphContent"></el-input>
+              <!-- <el-input type="textarea" :rows="4" v-model="plugData.ParagraphContent"></el-input> -->
+              <my-edit  style="height:60vh"  v-on:edit-value="plugData.ParagraphContent  = arguments[0]" v-bind:editValue="plugData.ParagraphContent"
+                    v-bind:toolbarShow="toolbar"  v-bind:referenceList="DefaultList"></my-edit>
             </el-form-item>
           </el-col>
         </el-row>
@@ -159,11 +161,27 @@
   </div>
 </template>
 <script>
+import MyEdit from "@/components/EditTemplate.vue";
   export default {
     props: ["plugData"],
+    components:{MyEdit},
     data() {
       return {
-        checkIndex: 0
+        checkIndex: 0,
+        toolbar: {
+          clean: true, 
+          font: false, //字体
+          narrative: false, //叙述,
+          image:false,
+          bold: true, //加粗
+          underline: true, //下划线
+          header1: true, //H1
+          header2: true, //H2
+          fontColor: false, //字体颜色
+          fontBackgroundColor: false, //背景颜色
+          innerHeight: '60vh'
+        },
+        DefaultList: [],
       };
     },
     created() {},

src/components/busManagement/BookAcar/CharterPreview.vue

@@ -552,7 +552,7 @@
           <div class="right-Money">
             <div>
               <span>订单总金额：</span>
-              <b>{{ msg.Money.toFixed(2) }}</b>
+              <b>{{ msg.Money.toFixed(2) }} <span class="fz12">{{detailsObj.CurrencyName}}</span></b>
             </div>
           </div>
           <div class="right-Submit">

src/components/busManagement/BookAcar/addEditVehicle.vue

@@ -396,7 +396,7 @@
                             placeholder="输入行程信息"/>
                       <div slot="reference" class="name-wrapper">
                       <el-form-item label="行程信息" :prop="'details.'+scope.$index+'.TripInfo'" :rules="rules.TripInfo">
-                          <el-input v-model="scope.row.TripInfo" placeholder="输入行程信息" disabled/>
+                          <el-input v-model="scope.row.TripInfo" placeholder="输入行程信息" readonly/>
                       </el-form-item>
                       </div>
                     </el-popover>

src/components/busManagement/BookAcar/components/tripBusOrderList.vue

@@ -606,7 +606,7 @@
               >
                 <i
                   class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
-                  @click="makeAdocument(item, index, 3)"
+                  @click="makeAdocument(item, index, 2)"
                 ></i>
               </el-tooltip>
             </div>

src/components/clientConfirm.vue

@@ -1007,7 +1007,7 @@
               <li>
                 <el-row>
                   <el-col :span="12">出境社盖章：</el-col>
-                  <el-col :span="12"><img class="signImg" :src="CurrentUserInfo.ZhangImg" alt="" v-if="dataList.isTravelAgencySignature==1"/></el-col>
+                  <el-col :span="12"><img class="signImg" :src="CurrentUserInfo.ZhangImg" alt=""/></el-col>
                 </el-row>
               </li>
               <li>
@@ -2131,6 +2131,7 @@
       },
       //获取数据
       getList() {
+        console.log(this.msg)
         this.apiJavaPost("/api/contract/getContractInfo", this.msg, res => {
           if (res.data.resultCode === 1) {
             this.dataList = res.data.data;
@@ -2643,8 +2644,9 @@
     },
     mounted() {
       try {
+
         this.CurrentUserInfo = this.getLocalStorage();
-        this.CurrentUserInfo = this.CurrentUserInfo?his.CurrentUserInfo:{}
+        this.CurrentUserInfo = this.CurrentUserInfo?this.CurrentUserInfo:{}
         this.CurrentUserInfo.ZhangImg='http://imgfile.oytour.com/New/Upload/CompanyImage/hepingzhang.png'
         this.msg.TCID = this.$route.query.TCID;
         this.msg.orderID = this.$route.query.orderID;
@@ -2656,7 +2658,7 @@
         this.getCanvas();
         this.GetTrip(0, this.msg.TCID);
       } catch (error) {
-        //alert("mounted："+error.message)
+        alert("mounted："+error.message)
       }
     }
   };

src/components/public/more.vue

+<template>
+    <div style="position: absolute; bottom: 0;width: 100%; display: flex;justify-content: center;padding: 0 0 10px 0 ;" 
+        :style="{'background-image':upIcon?'linear-gradient(-180deg,rgba(255,255,255,0) 70%,#fff 70%)':'linear-gradient(-180deg,rgba(255,255,255,0) 0%,#fff 70%)',
+        }">
+        <span style="width: 100px;color: red;cursor: pointer;" @click="viewMore">
+            <span style="display: flex;align-items: center;" v-if="!upIcon">展开 <span style="margin-top: 5px;"> ﹀</span></span>
+            <span style="display: flex;align-items: center;" v-else>收起 <span style="margin-bottom: 5px;"> ︿</span></span>
+        </span> 
+    </div>
+  </template>
+  
+  <script>
+  export default {
+    props: ["upIcon"],
+    components: {},
+    data() {
+      return {
+        
+      }
+    },
+    watch: {
+        upIcon: {
+            handler(newValue,onldValue) {
+                this.upIcon = newValue
+            },
+            deep:true,
+            immediate: true
+        },
+    },
+    mounted() {
+      
+    },
+    methods: {
+        viewMore() {
+            this.$emit('change')
+        },
+    }
+  }
+  </script>
+  
+  <style scoped>
+  
+  </style>
\ No newline at end of file

src/components/scenicSpot/Singleticket/OrderPreview.vue

@@ -78,6 +78,7 @@
       display: flex;
       flex-direction: row;
       margin-bottom: 15px;
+      border:  0 !important;
     }
     .time-box.center{
       align-items: center;
@@ -228,6 +229,7 @@
     .right-list-right{
       font-size: 13px;
       color: #181C32;
+      padding: 0 0 0 5px;
     }
     .right-Money{
       padding: 20px 0;
@@ -295,9 +297,9 @@
             </div>
             <div class="time-box time-box2 center">
               <span>选择票型：</span>
-              <div style="display: flex;">
+              <div style="display: flex;flex-wrap: wrap;">
                 <template v-for="x in types">
-                  <el-tag class="time-box-width" :type="x.checked?'':'info'" style="margin-right: 10px;cursor: pointer;" 
+                  <el-tag class="time-box-width" :type="x.checked?'':'info'" style="margin-right: 10px;margin-bottom: 5px; cursor: pointer;" 
                   @click="changeDetailListHandler(x)">
                     <a>{{ x.TicketName }}</a>
                     <p style="display: inline-block;margin-left: 5px;">
@@ -324,15 +326,17 @@
           <div class="flexOne-type">
             <b>取票方式：</b>
             <div>
-              <el-radio v-model="msg.MailingState" label="1">自行取票</el-radio>
-              <el-radio v-model="msg.MailingState" label="2" >邮寄票券</el-radio>
+              <el-radio v-model="msg.MailingState" label="1" @change="changePeople">自行取票</el-radio>
+              <el-radio v-model="msg.MailingState" label="2" @change="changePeople">邮寄票券</el-radio>
+              <el-radio v-model="msg.MailingState" label="4" @change="changePeople">电子券</el-radio>
             </div>
           </div>
-          <div class="flexOne-description">
+          <div class="flexOne-description" v-if="msg.MailingState==1">
             <b>自行取票说明</b>
-            <p>自行前往指定位置取票，當您完成付款後我們將通過郵件通知您取票的門票訊息</p>
+            <!-- <p>自行前往指定位置取票，當您完成付款後我們將通過郵件通知您取票的門票訊息</p> -->
+            <p>自取地址：{{SelffetchAddress}}</p>
           </div>
-          <div class="flexOne-infor-box">
+          <div class="flexOne-infor-box" v-if="msg.MailingState!=4">
             <b> {{msg.MailingState==1?'客人讯息':'邮寄讯息'}}</b>
             <el-form label-width="80px" :model="msg" :rules="rules" ref="msg">
             <div class="infor-list">
@@ -361,9 +365,16 @@
                   </el-form-item>
                 </li>
                 <li v-if="msg.MailingState==2">
-                  <el-form-item label="地址" prop="MailingAddress">
-                    <el-input style="border-radius: 3px;" v-model="msg.MailingAddress" placeholder="请输入邮寄地址"/>
+                  <el-popover trigger="click" placement="MailingAddress">
+                    <el-input type="textarea" v-model="msg.MailingAddress"
+                          :autosize="{ minRows: 3, maxRows: 100}"
+                          placeholder="输入邮寄地址"/>
+                    <div slot="reference" class="name-wrapper">
+                    <el-form-item label="邮寄地址" prop="MailingAddress">
+                        <el-input v-model="msg.MailingAddress" placeholder="输入邮寄地址" readonly/>
                     </el-form-item>
+                    </div>
+                  </el-popover>
                 </li>
                 <li class="bottom">
                   <el-form-item label="性别" prop="Sex">
@@ -409,21 +420,32 @@
             </template>
             </template>
             <div v-else class="noData">没有选择票券</div>
+            <div class="right-list" v-if="msg.MailingMoney>0&&msg.Money>msg.MailingMoney">
+              <div>
+                <el-tag size="mini" type="warning">邮寄费</el-tag>
+              </div>
+              <div class="right-list-right">
+                {{msg.MailingMoney}}
+              </div>
+            </div>
           </div>
         </div>
         <div class="right-Money">
+          
           <div>
             <span>订单总金额：</span>
-            <b>{{ msg.Money.toFixed(2) }}</b>
+            <b>{{ msg.Money>msg.MailingMoney?msg.Money.toFixed(2):0.0 }} <span class="fz12" v-if="types&&types.length>0">{{types[0].CurrencyName}}</span></b>
           </div>
         </div>
         <div class="right-Submit">
-          <button v-if="!isCheck" class="hollowFixedBtn" type="primary">
+          <button class="hollowFixedBtn" v-loading="loading" 
+          type="primary" 
+          :disabled="!isCheck" @click="submit">
             提交订单
           </button>
-          <button v-else class="normalBtn"  type="primary" @click="submit">
+          <!-- <button v-else class="normalBtn"  type="primary" @click="submit">
             提交订单
-          </button>
+          </button> -->
         </div>
       </div>
    <!-- 门票详情信息 -->
@@ -441,12 +463,15 @@
           isCheck:true,
           showDetails: false,
           loading: false,
+          SelffetchAddress: '',
           msg: {
             OrderId: 0,
             Money: 0.0,
             Remark: '',
             MailingState: '1',//邮寄状态 1自取 2邮寄
             MailingAddress: '',//MailingState =2 填写邮寄
+            MailingMoney: null,
+            SelffetchAddress: '',//自取地址
             UseDate:'',//门票日期
             Name:'',
             EName:'',
@@ -495,6 +520,7 @@
       },
       methods: {
         submit(){
+          if(this.msg.MailingState!=4){
             this.$refs['msg'].validate((valid) => {
                 if (valid) {
                     this.setFormMsg()
@@ -502,10 +528,16 @@
                     return false;
                 }
             });
+          }else{
+            this.setFormMsg()
+          }
         },
         setFormMsg(){
-          if(this.msg.MailingState=='1'){
+          if(this.msg.MailingState!='2'){
             this.msg.MailingAddress = ''
+            this.msg.MailingMoney = null
+          }if(this.msg.MailingState!='1'){
+            this.msg.SelffetchAddress = ''
           }
           this.msg.DetailList = []
           this.types.forEach(x=>{
@@ -521,6 +553,7 @@
               this.msg.DetailList.push(y)
             }
           })
+            this.loading = true
             this.apipost("ticket_post_SetSaleTicketOrder", this.msg,
                 res => {
                     this.loading = false;
@@ -541,27 +574,32 @@
           this.getNum()
         },
         getNum(){
-          this.types.forEach(x=>{
-              if(x.num>x.RemainingInventory){
-                x.num = x.RemainingInventory
-              }
-          })
+          // 控制门票张数
+          // this.types.forEach(x=>{
+          //     if(x.num>x.RemainingInventory){
+          //       x.num = x.RemainingInventory
+          //     }
+          // })
           setTimeout(()=>{
             this.calcMoneyHandler()
           },50)
         },
         calcMoneyHandler(){
           this.msg.Money=0.0
+          let Money= 0
+          if(this.msg.MailingState == 2){
+            this.msg.MailingMoney = this.detailsObj.MailingMoney
+          }else{
+            this.msg.MailingMoney = 0
+          }
           this.types.forEach(x=>{
             if(x.checked){
-              this.msg.Money+=x.B2BPrice*x.num
+              Money+=x.B2BPrice*x.num
             }
           })
+          this.msg.Money = Number(Money)+Number(this.msg.MailingMoney)
         },
         changeDetailListHandler(e) {
-          if (e.checked) {
-            e.num = 1
-          }
           e.checked = !e.checked
           this.isCheck = this.types.findIndex(x => x.checked) > -1
           if(this.isCheck){
@@ -587,6 +625,8 @@
             res => {
               if (res.data.resultCode == 1) {
                 this.detailsObj = res.data.data;
+                this.msg.SelffetchAddress = this.detailsObj.SelffetchAddress
+                this.SelffetchAddress = this.detailsObj.SelffetchAddress
                 let addList = function (arr) {
                     arr.forEach(item => {
                       item.checked = false
@@ -594,7 +634,7 @@
                     });
                 };
                 addList(res.data.data.TicketPriceList);
-                this.types = res.data.data.TicketPriceList
+                this.types = res.data.data.TicketPriceList.filter(x=>{ return x.B2BPrice>0})
                 this.msg.Money = 0.00
                 if(this.types&&this.types.length==0){
                   this.Error('暂无报价，无法下单')

src/components/scenicSpot/reservation/OrderList.vue

@@ -312,6 +312,10 @@
   background: #4dd0e1;
 }
 
+.orderType.activeNo {
+  background: #E95252;
+}
+
 .copy {
   display: inline-block;
   padding: 3px 15px;
@@ -500,9 +504,10 @@
       <div class="row-c justify-sb align-c py">
         <div class="row-c">
           <div>
-            <div class="orderType cf fz12" :class="{ active: item.MailingState == 1 }">
+            <div class="orderType cf fz12" :class="{ active: item.MailingState == 1,activeNo: item.MailingState == 4 }">
               <template v-if="item.MailingState == 1">自行取件</template>
-              <template v-if="item.MailingState > 1">邮寄票券</template>
+              <template v-if="item.MailingState > 1&&item.MailingState < 4">邮寄票券</template>
+              <template v-if="item.MailingState == 4">电子券</template>
             </div>
           </div>
           <div class="c9e fz12">
@@ -602,7 +607,7 @@
       
       <div class="row justify-sb mt mb20">
         <div class="column px15 bjFFF3E0 radius5 flex-g pa relative">
-          <div class="fz12 row justify-sb">
+          <div class="fz12 row justify-sb" v-if="item.MailingState != 4">
             <span>{{ item.MailingState > 1 ? '收货地址：' : '自取地址：' }}</span>
             <div :class="{ 'cF1416C': item.MailingState == 2, 'c02C854': item.MailingState == 3 }">
               <template v-if="item.MailingState == 2">
@@ -618,8 +623,52 @@
               {{ item.MailingAddress }}
             </template>
             <template v-else>
+              <template v-if="item.MailingAddress==1">
                 {{ item.SelffetchAddress ? item.SelffetchAddress : '等待操作确认后，才能看到自取地址' }}
               </template>
+              <div class="row pt20" style="margin-right: 10px;" v-if="item.MailingState==4">
+                <div class="column">
+                  <template v-if="item.TicketCodeFile">
+                  <div class="wrap fz12 c9e">
+                    电子券
+                  </div>
+                  <div class="row fz12 see-rec mt">
+                    <div class="text-accent q-mr-md c">
+                      {{ item.TicketCodeFile.split("/").at(-1) }}
+                    </div>
+                    <div class="cursor-pointer ml mr rec cf">
+                      <a
+                        class="cf"
+                        style="text-decoration:none"
+                        :href="item.TicketCodeFile"
+                        >下载</a
+                      >
+                    </div>
+                  </div>
+                  </template>
+                  <template v-if="item.MailingState==4&&pagesTitle!='销售'&&!item.TicketCodeFile">
+                      <div class="fz12 mt c9e">
+                        电子券，需要您于
+                        <span class="cff9800">{{item.UseDate}}</span> 前
+                      </div>
+                      <div class="row fz12 see-rec mt">
+                        <el-upload ref="my-upload" 
+                        :http-request="uploadFileBtn" 
+                        v-loading="loadingDZP"
+                          :multiple="true" 
+                          :show-file-list="false" action="">
+                            <div :class="{'cursor-pointer seeLK c059FF6':!loadingDZP,
+                            'cursor-pointer see c04C8C8':loadingDZP}" 
+                            @click="uploadOrderId=item.OrderId">上传电子券</div>
+                          </el-upload>
+                      </div>
+                  </template>
+                  <template v-if="item.MailingState==4&&pagesTitle=='销售'&&!item.TicketCodeFile">
+                    '等待操作确认后，才能看到电子券地址'
+                  </template>
+                </div>
+              </div>
+            </template>
           </div>
         </div>
         <div class="column px15 bgf5 radius5 ml flex-g pa relative">
@@ -668,17 +717,25 @@
           <el-tooltip v-if="item.OrderStatus == 2 && pagesTitle != '销售'" class="item" effect="dark" content="制单"
             placement="top">
             <i class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
-              @click="makeAdocument(item, index, 3)"></i>
+              @click="makeAdocument(item, index, 2)"></i>
           </el-tooltip>
         </div>
         <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20">
-          <div class="row-c justify-sb pb5">
+          <div class="row-c justify-sb pb5" :class="{'borderD':item.MailingMoney>0}">
             <span class="fz12 c9e">订单总金额</span>
             <div class="ml">
               <span class="fz15 fbold">{{ item.Money.toFixed(2) }}</span>
-              <span class="fz12 ml">
-                <!-- ¥ -->円
-              </span>
+              <span class="fz12 ml">{{ item.CurrencyName }}</span>
+            </div>
+          </div>
+          <div
+            class="row-c justify-sb py5"
+            v-if="item.MailingMoney>0"
+          >
+            <span class="fz12 c9e">邮寄费</span>
+            <div class="ml">
+              <span class="fz14">{{ item.MailingMoney.toFixed(2) }}</span>
+              <span class="fz12 ml">{{ item.CurrencyName }}</span>
             </div>
           </div>
         </div>
@@ -703,11 +760,11 @@
             <i v-loading="msg.OrderId == item.OrderId && loading1"></i>
             <span class="cF1416C">邮寄</span>
           </div>
-          <div v-if="item.OrderStatus == 2 && item.MailingState == 1 && pagesTitle != '销售'"
+          <!-- <div v-if="item.OrderStatus == 2 && item.MailingState == 1 && pagesTitle != '销售'"
             class="row-c cursor-pointer radius5 cancel py5" @click="clickRightButtom(item, 3)">
             <i v-loading="loading1"></i>
             <span class="cF1416C">设置自提地址</span>
-          </div>
+          </div> -->
           <!-- <div
             v-if="item.OrderStatus == 2 || item.OrderStatus == 4"
             class="row-c cursor-pointer radius5 change py5"
@@ -970,7 +1027,10 @@ export default {
         { Name: this.$t('OrderList.orderStatus.sun'), ID: '4' },
       ],
       items: null,
-      typeState: ''
+      typeState: '',
+      loadingDZP: false,
+      uploadOrderId: 0,
+      GuestFile: ''
     };
   },
   watch: {
@@ -1044,16 +1104,16 @@ export default {
         this.uploadHandleChange()
       }, 1);
     },
-    // 上传旅客名单
+    // 上传电子券
     uploadHandleChange() {
       if (this.loading) return
       let msg = {
         OrderId: this.uploadOrderId,
-        GuestFileList: [this.GuestFile]
+        TicketCodeFile: this.GuestFile
       }
       this.loading = true
       this.apipost(
-        "dict_post_SetSaleOrderGuestFile", msg,
+        "ticket_post_SetTicketCodeFile", msg,
         res => {
           this.loading = false;
           if (res.data.resultCode == 1) {

src/components/scenicSpot/reservation/ReservationOrder.vue

@@ -284,9 +284,11 @@ export default {
             addList(data)
             data.forEach((x) => {
               x.Money = 0
+              let Money = 0
               x.DetailList.forEach((y) => {
-                x.Money += y.Money
+                Money+=y.Money
               })
+              x.Money= Number(Money+x.MailingMoney)
             })
 
             this.OrderList = data;

src/components/scenicSpot/scenicSpotInfoManage.vue

@@ -858,6 +858,17 @@
               </div>
             </div>
           </div>
+          <el-form-item
+            label="自取地址"
+            prop="SelffetchAddress"
+          >
+            <el-input
+              type="text"
+              v-model="addMsg.SelffetchAddress"
+              maxlength="100"
+              class="w300"
+            ></el-input>
+          </el-form-item>
           <el-form-item
             :label="$t('restaurant.res_BusinessHours')"
             prop="OpeningHours"
@@ -895,7 +906,7 @@
             ref="treeForm"
             @check-change="handleNodeClick"
             >
-</el-tree>
+          </el-tree>
           </div>
           <span class="resource-lititle sheshi">{{
             $t("restaurant.res_detailInformation")
@@ -1362,6 +1373,7 @@ export default {
         PlayTimeHour: "", //游玩小时
         PlayTimeMinutes: "", //游玩分钟
         IsIncludeLeader: 0, //是否包含领队:0-包含,1-不包含
+        SelffetchAddress:'東京都北区滝野川5－41－3　TKビル9階',//邮寄地址
       },
       rules: {
         //表单必填验证
@@ -1411,6 +1423,13 @@ export default {
             trigger: "change",
           },
         ],
+        SelffetchAddress: [
+          {
+            required: true,
+            message: "请输入邮寄地址",
+            trigger: "blur"
+          }
+        ],
       },
     };
   },

src/components/scenicSpot/scenicSpotPackagePrice.vue

@@ -453,8 +453,9 @@ input[type="number"] {
           </el-col>
           <el-col :span="4">
             <el-form-item :label="$t('hotel.hotel_Supplier')" v-if="IsSelfBook" prop="Supplier">
-              <el-select v-model="addMsg.Supplier" filterable :placeholder="$t('hotel.hotel_inputholder')">
-                <el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
+              <!--  :placeholder="$t('hotel.hotel_inputholder')" -->
+              <el-select v-model="addMsg.Supplier" filterable>
+                <!-- <el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option> -->
                 <el-option v-for="item in SupplierList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
               </el-select>
             </el-form-item>
@@ -473,6 +474,11 @@ input[type="number"] {
               <el-input v-model='addMsg.CurrentRate' @keyup.native="checkRate(addMsg,'CurrentRate')"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+            <el-form-item label="邮寄费" prop="MailingMoney">
+              <el-input v-model='addMsg.MailingMoney' @keyup.native="checkRate(addMsg,'MailingMoney')"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item :label="$t('hotel.hotel_remark')" prop="Remark">
               <el-input type="textarea" v-model="addMsg.Remark"></el-input>
@@ -514,7 +520,7 @@ export default {
         ID: 0,
         CouponsId: 0,
         TicketID: 0,
-        Supplier: 0,
+        Supplier: null,
         Inventory: 0,
         B2BPrice: 0.0,
         B2CPrice: 0.0,
@@ -524,7 +530,8 @@ export default {
         StartDate: "",
         EndDate: "",
         CurrencyId: 0,
-        CurrentRate: 0.0
+        CurrentRate: 0.0,
+        MailingMoney: null,//邮寄费
       },
       rules: {
         //表单必填验证
@@ -600,7 +607,7 @@ export default {
         Supplier: [
           {
             required: true,
-            message: "请输选择供应商",
+            message: "请选择供应商",
             trigger: "change"
           }
         ],
@@ -616,7 +623,18 @@ export default {
             message: "请输输入汇率",
             trigger: "change"
           }
-        ]
+        ],
+        MailingMoney: [
+          {
+            required: true,
+            message: "请输入邮寄费",
+            trigger: "blur"
+          },
+          {
+            pattern: this.$commonUtils.Regex.el_Isdecimal,
+            message: "请输入两位小数"
+          }
+        ],
       },
       msg: {
         pageIndex: 1,
@@ -678,7 +696,7 @@ export default {
     //重置信息
     clearInfo() {
       this.addMsg.ID = 0;
-      this.addMsg.Supplier = 0;
+      this.addMsg.Supplier = null;
       this.addMsg.Inventory = "";
       this.addMsg.B2BPrice = "";
       this.addMsg.B2CPrice = "";
@@ -689,6 +707,7 @@ export default {
       this.addMsg.EndDate = "";
       this.addMsg.CurrencyId = 0;
       this.addMsg.CurrentRate = "";
+      this.addMsg.MailingMoney = null
     },
     //修改报价信息
     updateData(ID) {
@@ -757,11 +776,13 @@ export default {
         this.addMsg,
         res => {
           if (res.data.resultCode == 1) {
+            console.log(res.data)
             this.initDataTable();
             this.Success("保存成功！");
             this.isShowDIv = false;
             this.resetForm("addMsg");
-            this.goUrl('ticketManagement',this.CouponsId);
+            // this.goUrl('ticketManagement',this.CouponsId);
+            // location.reload()
           } else {
             this.Error(res.data.message);
           }
@@ -781,7 +802,7 @@ export default {
             if (res.data.resultCode == 1) {
               that.Success("删除成功！");
               that.initDataTable();
-              that.goUrl('ticketManagement',that.CouponsId);
+              // that.goUrl('ticketManagement',that.CouponsId);
             } else {
               that.Error(res.data.message);
             }