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

src/components/FinancialModule/ReportForm/CombinedRevenueReport.vue

@@ -389,7 +389,7 @@ tr._item_list td:last-child {
 </style>
 
 <template>
-  <div class="page_fnDm page_RecPayQuery">
+  <div class="page_fnDm page_RecPayQuery" @keyup.enter="resetPageIndex(),getPageList()">
     <div class="query-box">
       <el-form class="_info_box clearfix" label-width="110px">
         <el-row style="padding:15px 20px 0 0;">
@@ -966,7 +966,7 @@ export default {
         },
         {
           field: "BName",
-          title: "公司别",
+          title: "出团公司",
           width: 90,
           titleAlign: "left",
           columnAlign: "left",
@@ -1314,7 +1314,7 @@ export default {
         "毛利率",
         "实际利润",
         "备注",
-        "公司别",
+        "出团公司",
         "成都",
         "昆明",
         "重庆",

src/components/ShoppingStore/ShoppingReimbursement.vue

@@ -29,11 +29,12 @@
       </ul>
     </div>
     <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; ">
-      <table border="0" cellspacing="1" cellpadding="0" class="roomReservationsTalbe" style="border: 1px solid rgb(230, 230, 230);background: #ccc;min-width: 1600px">
+      <table border="0" cellspacing="1" cellpadding="0" class="roomReservationsTalbe" style="border: 1px solid rgb(230, 230, 230);background: #ccc;min-width: 1600px"
+        v-loading="loading">
         <tr>
           <th colspan="5">公司通用信息</th>
           <th colspan="8">导游操作</th>
-          <th colspan="9">地接OP</th>
+          <th colspan="10">地接OP</th>
         </tr>
         <tr>
           <th width="115">序号</th>
@@ -56,12 +57,13 @@
           <th width="80">返佣总计</th>
           <th width="80">汇率</th>
           <th width="80">凭证</th>
+          <th width="80" style="display:none">财务单据</th>
           <th width="80">操作</th>
         </tr>
         <tr v-if="list.length==0">
           <td colspan="22">暂无数据</td>
         </tr>
-        <tbody v-for="(outItem,outindex) in list" :class="{roomReservationsSplitTrCss:outindex%2!=0}" v-loading="loading">
+        <tbody v-for="(outItem,outindex) in list" :class="{roomReservationsSplitTrCss:outindex%2!=0}">
           <template v-for="(item,index) in outItem.StaticsReportList">
             <tr>
               <td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
@@ -113,8 +115,8 @@
               <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
                 <!--凭证上传-->
                 <div v-for="subItem in item.CommonReport.PriceShopList">
-                  <p v-for="(img, imgIndex) in subItem.ShopDetailsList[0].imgList" title="点击下载" @click="downLoadPZ(img)" v-if="img !== ''"
-                    style="cursor: pointer;">{{ '凭证' + (imgIndex + 1)}}</p>
+                  <p v-for="(img, imgIndex) in subItem.ShopDetailsList[0].imgList" title="点击下载" @click="downLoadPZ(img)"
+                    v-if="img !== ''" style="cursor: pointer;">{{ '凭证' + (imgIndex + 1)}}</p>
                 </div>
               </td>
               <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
@@ -148,12 +150,21 @@
               <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
                 <!--地接OP凭证-->
                 <div v-for="subItem in item.CommonReport.PriceShopList">
-                  <p v-for="(img, imgIndex) in subItem.ShopDetailsList[0].dmcImageList" title="点击下载" @click="downLoadPZ(img)" v-if="img !== ''"
-                    style="cursor: pointer;">{{ '凭证' + (imgIndex + 1)}}</p>
+                  <p v-for="(img, imgIndex) in subItem.ShopDetailsList[0].dmcImageList" title="点击下载" @click="downLoadPZ(img)"
+                    v-if="img !== ''" style="cursor: pointer;">{{ '凭证' + (imgIndex + 1)}}</p>
                 </div>
               </td>
+              <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0' style="display:none">
+                <template v-for="subItem in item.CommonReport.PriceShopList">
+                  <div>
+                    <!--subItem.ShopDetailsList-->
+                    <p style="cursor: pointer;color:blue; display:none;" @click="CreateBill(subItem.ShopDetailsList,outItem.StaticsReportList)">生成单据</p>
+                  </div>
+                </template>
+
+              </td>
               <td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
-                <p style="cursor: pointer;color:blue" @click="goHuiZhi(outItem.TCIDs, item.LeaderName, item.GuideName, item.StartCityNames, item.TCNUMS)">选择购物店</p>
+                <p style="cursor: pointer;color:blue;margin-top:5px;" @click="goHuiZhi(outItem.TCIDs, item.LeaderName, item.GuideName, item.StartCityNames, item.TCNUMS)">选择购物店</p>
                 <p style="cursor: pointer;color:blue;margin-top:10px" @click="goUrlT('ShoppingReimbursementDetails',outItem.TCIDs,'购物报账详情')">操作</p>
               </td>
             </tr>
@@ -281,7 +292,7 @@
         this.currentPage = 1;
       },
       getList() {
-        this.loading = true
+        this.loading = true;
         this.apipost('dmcstatistics_post_GetUniteCombinationNumService', this.msg, res => {
           this.loading = false
           if (res.data.resultCode == 1) {
@@ -301,6 +312,34 @@
           }
         }, err => {})
       },
+      //生成单据
+      CreateBill(ShopDetailsList, outItem) {
+        this.loading = true;
+        var array = [];
+        outItem.forEach(subItem => {
+          var obj = {
+            LeaderId: subItem.LeaderId != null ? subItem.LeaderId : 0,
+            LeaderName: subItem.LeaderName != null ? subItem.LeaderName : "",
+            TCID: subItem.TCID,
+            GuideId: subItem.GuideId != null ? subItem.GuideId : 0,
+            GuideName: subItem.GuideName != null ? subItem.GuideName : "",
+            TCNUM: subItem.TCNUMS,
+          }
+          array.push(obj)
+        });
+        var billMsg = {
+          ShopDetailsList: ShopDetailsList,
+          LeaderGuide: array
+        };
+        this.apipost('dmcstatistics_post_ShopCreateBill', billMsg, res => {
+          this.loading = false;
+          if (res.data.resultCode == 1) {
+            this.Info(res.data.message);
+          } else {
+            this.$message.error(res.data.message)
+          }
+        }, err => {})
+      },
     },
     mounted() {
       let myDate = new Date();
@@ -310,7 +349,8 @@
         parseInt(myDate.getMonth() + 1) +
         "-" +
         myDate.getDate();
-      this.msg.StartDate = nowDate;
+      //this.msg.StartDate = nowDate;
+      this.msg.StartDate = '2019-01-01';
       this.getLineTeamList();
       this.getList()
     },

src/components/TravelManager/TravelList/DistributionTransport.vue

@@ -228,7 +228,7 @@
               <span v-else>{{item.BackEvaluatePrice}}</span>
             </td>
             <td>
-              <el-input class="w95" v-model="item.AddBackCostPrice" @keyup.native="checkPrice(item,'AddBackCostPrice',true)"></el-input>
+              <el-input class="w95" v-model="item.BackAddPrice" @keyup.native="checkPrice(item,'BackAddPrice',true)"></el-input>
             </td>
           </tr>
         </tbody>

src/components/VisaPersonalFormSell.vue

@@ -76,10 +76,10 @@
                     </p>
                     <p class="_tips"><span v-if="infoData.IsWH==false" class="_left">(年)/(月)/(日)</span><span v-else class="_left">(日)/(月)/(年)</span><span class="_right">(省)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(市)</span></p>
                     <p class="_f_sex">
-                        <span class="_fx_left">性别 <span> 男<i v-if="infoData.PeopleModel.Sex!='1'"></i><i v-else>X</i></span><span>女<i v-if="infoData.PeopleModel.Sex!='2'"></i><i v-else>X</i></span> 
+                        <span class="_fx_left">性别 <span> 男<i v-if="infoData.PeopleModel.Sex!='1'"></i><i v-else><span v-if="infoData.IsWH==true">X</span><span v-else>√</span></i></span><span>女<i v-if="infoData.PeopleModel.Sex!='2'"></i><i v-else><span v-if="infoData.IsWH==true">X</span><span v-else>√</span></i></span> 
                         </span>
                         <span class="_fn_right">婚姻状况
-                            <span v-for="mar in MarriageType" class="_mr10 _MarriageType"><span>{{mar.Name}} <i v-if="infoData.PeopleModel.Marriage!=mar.Id"></i><i v-else>X</i></span></span>
+                            <span v-for="mar in MarriageType" class="_mr10 _MarriageType"><span>{{mar.Name}} <i v-if="infoData.PeopleModel.Marriage!=mar.Id"></i><i v-else><span v-if="infoData.IsWH==true">X</span><span v-else>√</span></i></span></span>
                         </span>
                     </p>
                     <p><span>国籍（或公民身份）<input disabled style="width: 100%;" type="text" v-model="infoData.PeopleModel.NationalityName"></span></p>
@@ -87,7 +87,7 @@
                     <p><span>身份证号码<input  style="width: 100%;" type="text" v-model="infoData.PeopleModel.IdCard"></span></p>
                     <p><span>护照类别</span>
                     <!-- PassportType -->
-                        <span v-for="Pass in PassportTypeList" class="_mr10 _MarriageType"><span>{{Pass.Name}} <i v-if="Pass.Id==infoData.PeopleModel.PassportType">X</i><i v-else></i></span></span>
+                        <span v-for="Pass in PassportTypeList" class="_mr10 _MarriageType"><span>{{Pass.Name}} <i v-if="Pass.Id==infoData.PeopleModel.PassportType"><span v-if="infoData.IsWH==true">X</span><span v-else>√</span></i><i v-else></i></span></span>
                     </p>
                     <p><span>护照号码<input  style="width:100%;" type="text" v-model="infoData.PeopleModel.PassportNo"></span></p>
                     <p class="_mb0">
@@ -444,6 +444,9 @@ export default {
                         this.creatQRCode()
                     }
                     this.infoData.PeopleModel.Sex = this.infoData.PeopleModel.Sex.toString()
+                    if(this.infoData.IsWH==true){
+                        this.infoData.PeopleModel.NationalityName="CHINA";
+                    }
                 }else{
                     this.$message.error(res.data.message)
                 }