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

src/components/Contract/TravelContract.vue

@@ -820,8 +820,8 @@
                     </table>
                 </div>
             </el-form>
-            <div>
-                <input type="button" v-if="CtObj.status==1&&CtObj.auditContract==0" class="normalBtn" style="margin:40px 0 30px 60px;" @click="sendAudit()" value="提交审核"/>
+            <div style="margin-top:20px;">
+                <input type="button" v-if="CtObj.status==1&&CtObj.auditContract==0" class="normalBtn" style="margin:0 0 30px 60px;" @click="sendAudit()" value="提交审核"/>
                 <input type="button" class="normalBtn" @click="submitForm('CtObj')" value="保存"/>
                 <input type="button" class="normalBtn" v-if="CtObj.status==1" @click="goUrl()"  value="预览">
                 <input type="button" class="normalBtn" v-if="CtObj.status==1" @click="getinvalid()" value="作废">
@@ -957,8 +957,8 @@
             agentCall:'',
             contractPlace:'',
             //合同条款
-            totalNumber:0,
-            eachNumber:0, 
+            totalNumber:2,
+            eachNumber:1, 
             productName:'',
             startDate:'',
             returnDate:'',
@@ -1054,6 +1054,9 @@
                   this.CtObj.businessCertificate = '0000000';
                   this.CtObj.tcid = this.$route.query.TCID;
                   this.CtObj.orderId = this.$route.query.orderID;
+                  this.CtObj.totalNumber=2;
+                  this.CtObj.eachNumber=1;
+
                   if(this.CtObj.clientCountryid>0){
                       this.GetSubAreaList(this.CtObj.clientCountryid,1,1);
                   }

src/components/Hotel/roomReservationsDetails.vue

@@ -279,6 +279,9 @@
               <!-- 金额总计 -->
               <td v-if="childIndex==0" :rowspan="6" style="white-space:nowrap;">
                 {{subItem.TotalPrice}}
+                <template v-if="subItem.NewTotalPrice">
+                  <br />{{subItem.NewTotalPrice}}
+                </template>
               </td>
               <!-- 付款方式 -->
               <td v-if="childIndex==0" :rowspan="6">
@@ -286,7 +289,8 @@
                   <tr>
                     <td width="70" style="text-align:right;">币种：</td>
                     <td>
-                      <el-select v-model="subItem.CurrencyId" placeholder="请选择" class='w135 sel'>
+                      <el-select v-model="subItem.CurrencyId" placeholder="请选择" class='w135 sel'
+                        @change="calculationPrice(subItem)">
                         <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
                         <el-option v-for="(item,index) in allCurrencyList" :key="index" :label="item.Name"
                           :value="item.ID">
@@ -346,6 +350,7 @@
                         <el-option label='实物抵扣' :value='3'></el-option>
                         <el-option label='预付' :value='4'></el-option>
                         <el-option label='预付款抵扣' :value='5'></el-option>
+                        <el-option label='领队导游垫付' :value='10'></el-option>
                       </el-select>
                     </td>
                   </tr>
@@ -365,6 +370,7 @@
                         <el-option label='预付' :value='4'></el-option>
                         <el-option label='预付款抵扣' :value='5'></el-option>
                         <el-option label='公司合团支付' :value='6'></el-option>
+                        <el-option label='领队导游垫付' :value='10'></el-option>
                       </el-select>
                     </td>
                   </tr>
@@ -754,6 +760,19 @@
       },
       calculationPrice(obj) {
         let totalPrice = 0;
+        //获取当前选中的对象
+        let currentObj = {};
+        if (obj.CurrencyId != 0) {
+          currentObj = this.allCurrencyList.find(item => {
+            return item.ID === obj.CurrencyId; //筛选出匹配数据
+          });
+        }
+        
+        //日元
+        let jpaObj = this.allCurrencyList.find(item => {
+          return item.ID === 3; //筛选出匹配数据
+        });
+        //this.allCurrencyList 
         obj.OrderDetailsList.forEach((item, index) => {
           var tempPrice = 0;
           var coefficient = 1;
@@ -771,6 +790,20 @@
         })
         totalPrice += obj.ParkFee + obj.CityTax + obj.InTangTax;
         obj.TotalPrice = totalPrice.toFixed(2);
+        if (currentObj && currentObj.ID > 0) {
+          //人民币
+          if (currentObj.ID == 1) {
+            obj.NewTotalPrice = currentObj.Name + ":" + (totalPrice * jpaObj.PayRate).toFixed(2);
+          }
+          //日元
+          else if (currentObj.ID == 3) {
+            obj.NewTotalPrice = "";
+          } else {
+            obj.NewTotalPrice = currentObj.Name + ":" + (totalPrice / currentObj.PayRate).toFixed(2);
+          }
+        } else {
+          obj.NewTotalPrice = "";
+        }
         this.$forceUpdate();
       },
       getHotelList(obj) {

src/components/SalesModule/groupTourOrder.vue

@@ -1820,7 +1820,8 @@
                     </span>
 
               </div>
-              <span class="GO_Contract" @click="goContract(item)" >领取合同</span>
+              <span v-if="item.contractNum==''" class="GO_Contract" @click="goContract(item)" >领取合同</span>
+              <span v-else class="GO_Contract" @click="goContract(item)">{{item.contractNum}}</span>
             </td>
           </tr>
           <tr>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -870,7 +870,11 @@
     line-height: 22px;
     background-color: #f0f2f5;
   }
-
+.GO_Contract{
+    color:blue;
+    display: block;
+    cursor: pointer;
+  }
 </style>
 
 <template>
@@ -2138,7 +2142,8 @@
                     <span @click="gourlTip('FinancialDocumentsDetail',id)" style="text-decoration:underline;color:blue;cursor:pointer" v-for="(id,i) in item.tipFrId" :key="i">{{id}}</span>
 
                     </span>
-
+                    <div v-if="item.contractNum==''" class="GO_Contract" @click="goContract(item)" >领取合同</div>
+                    <div v-else class="GO_Contract" @click="goContract(item)">{{item.contractNum}}</div>
               </div>
 
               </td>
@@ -4797,6 +4802,18 @@
             tab: name
           }
         });
+      },
+       //跳转至领取合同
+      goContract(item){
+        let routeData = this.$router.resolve({
+          name: 'TravelContract',
+          query: {
+            TCID: item.tcid,
+            orderID:item.orderId,
+            blank: 'y'
+          }
+        })
+        window.open(routeData.href, '_blank')
       },
       goUrl(name, path, id, tcmun) {
         this.$router.push({

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -929,7 +929,11 @@
     margin: 0 20px 5px 0;
     width: 100%;
   }
-
+.GO_Contract{
+    color:blue;
+    display: block;
+    cursor: pointer;
+  }
 </style>
 
 <template>
@@ -1773,7 +1777,8 @@
               <!--                <span>暂无名单</span>-->
               <!--              </p>-->
               <span>房间信息：{{item.OrderGuestHouseStr}}</span>
-              
+              <span v-if="item.ContractNum==''" class="GO_Contract" @click="goContract(item)" >领取合同</span>
+              <span v-else class="GO_Contract" @click="goContract(item)">{{item.ContractNum}}</span>
             </td>
           </tr>
           <tr>
@@ -2089,7 +2094,8 @@
                     <span>单据：</span>
                     <span @click="gourlTip('FinancialDocumentsDetail',id)" style="text-decoration:underline;color:blue;cursor:pointer" v-for="(id,i) in childItem.TipFrId" :key="i">{{id}}</span>
                     </span>
-
+                    <span v-if="childItem.ContractNum==''" class="GO_Contract" @click="goContract(childItem)" >领取合同</span>
+                    <span v-else class="GO_Contract" @click="goContract(childItem)">{{childItem.ContractNum}}</span>
               </div>
               </td>
             </tr>
@@ -5048,6 +5054,18 @@
         });
 
       },
+      //跳转至领取合同
+      goContract(item){
+        let routeData = this.$router.resolve({
+          name: 'TravelContract',
+          query: {
+            TCID: item.TCID,
+            orderID:item.OrderId,
+            blank: 'y'
+          }
+        })
+        window.open(routeData.href, '_blank')
+      },
       Discount(TCID) {
         this.SpecialOffer = true
         this.apipost(