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

src/components/SalesModule/groupTourOrder.vue

@@ -1846,14 +1846,14 @@
                     </span>
 
               </div>
-              <div v-if="item.ContractNum.length==0">
+              <!-- <div v-if="item.ContractNum.length==0">
                 <span class="GO_Contract" @click="goContract(item,{})">领取合同</span>
-              </div>
-              <div v-else>
+              </div> -->
+              <!-- <div v-else>
                 <span v-for="sItem in childItem.ContractNum" class="GO_Contract" @click="goContract(item,sItem)">
                     {{sItem.Client_Name+''+sItem.ContractNum}}
                 </span>
-              </div>
+              </div> -->
             </td>
           </tr>
           <tr>

src/components/ShoppingStore/ShoppingReimbursement.vue

@@ -23,6 +23,12 @@
             </el-select>
           </span>
         </li>
+        <li>
+          <span>
+            <em>合团号</em>
+            <el-input v-model='msg.CombinationNum'></el-input>
+          </span>
+        </li>
         <li>
           <span>
             <em>团号</em>
@@ -80,7 +86,7 @@
                     {{subItem.StartCityNames}}
                   </td>
                   <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
-                    {{subItem.TCNUMS}}
+                    {{subItem.TCNUMS}}({{subItem.TCID}})
                   </td>
                   <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
                     {{subItem.LeaderName}}
@@ -94,7 +100,7 @@
                     {{subItem.StartCityNames}}
                   </td>
                   <td>
-                    {{subItem.TCNUMS}}
+                    {{subItem.TCNUMS}}({{subItem.TCID}})
                   </td>
                   <td>
                     {{subItem.LeaderName}}
@@ -147,7 +153,8 @@
                   </div>
                 </td>
                 <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
-                  <p style="cursor: pointer;color:blue;" @click="isShowFinaceDailog=true,CurrentOutItem=outItem">生成单据</p>
+                  <p style="cursor: pointer;color:blue;" @click="isShowFinaceDailog=true,CurrentOutItem=outItem">生成单据
+                  </p>
                   <p style="cursor: pointer;color:blue;margin-top:5px;"
                     @click="goHuiZhi(outItem.TCIDs, item.LeaderName, item.GuideName, item.StartCityNames, item.TCNUMS)">
                     选择购物店</p>
@@ -217,7 +224,8 @@
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <button class="hollowFixedBtn" @click="isShowFinaceDailog=false,CurrentOutItem={}">{{$t('pub.cancelBtn')}}</button>
+          <button class="hollowFixedBtn"
+            @click="isShowFinaceDailog=false,CurrentOutItem={}">{{$t('pub.cancelBtn')}}</button>
           <button class="normalBtn" type="primary" @click="CreateBill()">{{$t('pub.sureBtn')}}</button>
         </div>
       </template>
@@ -229,7 +237,7 @@
     data() {
       return {
         loading: false,
-        PayType:1,//付款方式
+        PayType: 1, //付款方式
         msg: {
           pageIndex: 1,
           pageSize: 8,
@@ -241,16 +249,18 @@
           EndDate: '',
           currentPage: 1,
           total: 0,
+          CombinationNum:"",//合团号
+          TCNUM:"",//团号
         },
         LineList: [],
         LineTeamList: [],
         shopDataList: [],
         CreateHandBillList: [],
         zhuanjiaoBox: false,
-        isShowFinaceDailog:false,//是否显示生成财务单据对话框
+        isShowFinaceDailog: false, //是否显示生成财务单据对话框
         CreateHandBillID: '',
         CreateHandObj: {},
-        CurrentOutItem:{}//当前选中的团
+        CurrentOutItem: {} //当前选中的团
       }
     },
     methods: {
@@ -425,17 +435,27 @@
 
           var nMsg = {
             TCIDs: that.CurrentOutItem.TCIDs,
-            PayType:that.PayType,
+            PayType: that.PayType,
             uid: that.getLocalStorage().EmployeeId
           };
+          that.apipost("dmcstatistics_post_CheckShopDetailsDMCRate", nMsg, res => {
+            if (res.data.resultCode == 1) {
+              if (res.data.data == 0) {
+                that.Error("请检查汇率有为0的数据,请先在【操作】里面修改汇率再生成财务单据!");
+                that.loading = false;
+                that.isShowFinaceDailog = false;
+              } else {
                 let fileName = "生成[" + that.CurrentOutItem.NewCombinationNum + "]购物店数据.xls";
                 that.GetLocalFile("dmcstatistics_post_ShopCreateBillAndExport", nMsg, fileName,
                   res => {
                     that.loading = false;
-              this.isShowFinaceDailog=false;
+                    this.isShowFinaceDailog = false;
                     that.Success("导入成功!");
                     that.getList();
                   });
+              }
+            }
+          });
         });
       },
     },
@@ -448,8 +468,8 @@
         "-" +
         myDate.getDate();
       this.msg.StartDate = nowDate;
-      // this.msg.StartDate='';
-      // this.msg.TCNUM='NRTCA08190613A';
+      // this.msg.StartDate = '';
+      // this.msg.TCNUM = 'NRTCA07190704A';
       this.getLineList();
       this.getList();
     },
@@ -464,7 +484,6 @@
 
   .more_td>div {
     height: 40px;
-    /*line-height: 40px;*/
     border-bottom: 1px solid rgb(204, 204, 204);
   }
 

src/components/ShoppingStore/ShoppingReimbursementDetails.vue

@@ -10,14 +10,14 @@
     <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; ">
       <table border="0" cellspacing="1" cellpadding="0" class="roomReservationsTalbe" v-loading="loading">
         <tr>
-          <th colspan="6">导游操作</th>
+          <th colspan="5">导游操作</th>
           <th colspan="8">地接OP</th>
         </tr>
         <tr>
           <th width="120" style="display:none;">进店团号</th>
           <th width="180">店名</th>
           <th width="90">公司</th>
-          <th width="120">进店时间</th>
+          <th width="120" style="display:none">进店时间</th>
           <th width="80">进店人数</th>
           <th width="100">总金额</th>
           <th width="100">佣金领取状况</th>
@@ -49,7 +49,7 @@
               {{subItem.BName}} &nbsp;
               <span @click="DeleteItem(subItem)" style="color:blue;cursor:pointer;text-decoration:underline;">删除</span>
             </td>
-            <td class="more_td" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length">
+            <td class="more_td" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length" style="display:none">
               <el-input v-model="item.ShopDetailsList[0].EnterTime" placeholder="2019-01-01"
                 @change="formatDateTime(item.ShopDetailsList[0].EnterTime,item)"></el-input>
               <!--EnterTime 进店时间-->

src/components/TravelContractDetail.vue

@@ -911,6 +911,7 @@
         let urlObj = this.domainManager();
         let msg = {
           TCID: this.$route.query.TCID,
+          GuestId: this.msg.guestId,
           orderID: this.$route.query.orderID,
         };
         this.pdfLoading=true;

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -122,15 +122,24 @@
       },
       //保存数据
       SaveData() {
+        var currencyNumList = [];
+        if (this.CurrencyNumberListExt != null && this.CurrencyNumberListExt.length > 0) {
+          this.CurrencyNumberListExt.forEach((item, index) => {
+            item.currencyNumberList.forEach(subItem => {
+              currencyNumList.push(subItem);
+            });
+          });
+        }
         var nObj = {
           config: this.postData,
           dayCostPriceList: this.dayCostPriceList,
           otherPrice: this.otherPrice,
           teamPrice: this.teamPrice,
           CostCurrencyList: this.CostCurrencyList,
-          CostNumberList: this.CostNumberList
+          CostNumberList: this.CostNumberList,
+          CurrencyNumberListExt: currencyNumList
         };
-        console.log("请求参数", nObj);
+        
         this.apipost(
           "travel_post_SetConfigOffer_V2", nObj,
           res => {
@@ -161,7 +170,6 @@
           "travel_get_GetMyTravelInfo_V2",
           msg,
           res => {
-            console.log("res.data.data", res.data);
             if (res.data.resultCode == 1) {
               var tempData = res.data.data;
               if (tempData.ID && tempData.ID > 0) {
@@ -205,13 +213,16 @@
               if (tempData.teamPrice) {
                 this.teamPrice = tempData.teamPrice;
               }
-              if(tempData.CostNumberList && tempData.CostNumberList!=null && tempData.CostNumberList.length>0)
-              {
-                this.CostNumberList=tempData.CostNumberList;
+              if (tempData.CostNumberList && tempData.CostNumberList != null && tempData.CostNumberList.length > 0) {
+                this.CostNumberList = tempData.CostNumberList;
+              }
+              if (tempData.CostCurrencyList && tempData.CostCurrencyList != null && tempData.CostCurrencyList.length >
+                0) {
+                this.CostCurrencyList = tempData.CostCurrencyList;
               }
-              if(tempData.CostCurrencyList && tempData.CostCurrencyList!=null && tempData.CostCurrencyList.length>0)
-              {
-                this.CostCurrencyList=tempData.CostCurrencyList;
+              if (tempData.CurrencyNumberListExt && tempData.CurrencyNumberListExt != null && tempData
+                .CurrencyNumberListExt.length > 0) {
+                this.CurrencyNumberListExt = tempData.CurrencyNumberListExt;
               }
             } else {
               this.Error(res.data.message);
@@ -219,7 +230,8 @@
           },
           err => {}
         );
-      }
+      },
+       
     },
     created() {
       this.getPostData();
@@ -228,5 +240,4 @@
       DirectQuotation: DirectQuotation
     }  
   };
-
 </script>
\ No newline at end of file