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

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1958,7 +1958,7 @@
                           <th>金额</th>
                           <th>类型</th>
                           <th>描述</th>
-                          <th>时间</th>
+                          <th>时间（<span @click="goUrlHappy(item)" style="cursor: pointer;" colspan="4" align="center">查看更多</span>）</th>
                         </tr>
                         <tr v-for="(item2,index2) in redBagList"
                           :key="index2">

src/components/ShoppingStore/ShoppingReimbursement.vue

@@ -139,15 +139,15 @@
                     v-if="img !== ''" style="cursor: pointer;color:blue;">{{ '凭证' + (imgIndex + 1)}}</p>
                 </td>
                 <td width="80" :rowspan="item.ShopDetailsList.length" v-if='subIndex==0'>
-                    {{subItem.Remarks}}
+                  {{subItem.Remarks}}
                 </td>
                 <td :rowspan="item.ShopDetailsList.length" v-if='subIndex==0' style="">
-                  <div >
+                  <div>
                     <p style="cursor: pointer;color:blue;margin-top:10px;" @click="CreateHandBill(outItem)">手动生成单据</p>
                   </div>
                 </td>
-                <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">   
-                  <p style="cursor: pointer;color:blue;" @click="CreateBill(item.ShopDetailsList,outItem)">生成单据</p>
+                <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;margin-top:5px;"
                     @click="goHuiZhi(outItem.TCIDs, item.LeaderName, item.GuideName, item.StartCityNames, item.TCNUMS)">
                     选择购物店</p>
@@ -196,7 +196,7 @@
         <el-form label-width="100px">
           <el-form-item label="团号：">
             <div v-for="item in CreateHandBillList">
-              <el-radio  v-model="CreateHandBillID" :key="item.id" :label="item.id"></el-radio>
+              <el-radio v-model="CreateHandBillID" :key="item.id" :label="item.id"></el-radio>
             </div>
           </el-form-item>
         </el-form>
@@ -204,8 +204,24 @@
           <button class="hollowFixedBtn" @click="zhuanjiaoBox=false">{{$t('pub.cancelBtn')}}</button>
           <button class="normalBtn" type="primary" @click="goCreateHandBill()">{{$t('pub.sureBtn')}}</button>
         </div>
-    </template>
-  </el-dialog>
+      </template>
+    </el-dialog>
+    <el-dialog title="生成财务单据" :visible.sync="isShowFinaceDailog" custom-class='w400' center>
+      <template>
+        <el-form label-width="100px">
+          <el-form-item label="付款方式">
+              <el-select v-model="PayType">
+                 <el-option label="常规付款" :value="1" :key="1"></el-option>
+                 <el-option label="资金池付款" :value="2" :key="2"></el-option>
+              </el-select>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <button class="hollowFixedBtn" @click="isShowFinaceDailog=false,CurrentOutItem={}">{{$t('pub.cancelBtn')}}</button>
+          <button class="normalBtn" type="primary" @click="CreateBill()">{{$t('pub.sureBtn')}}</button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -213,6 +229,7 @@
     data() {
       return {
         loading: false,
+        PayType:1,//付款方式
         msg: {
           pageIndex: 1,
           pageSize: 8,
@@ -230,23 +247,25 @@
         shopDataList: [],
         CreateHandBillList: [],
         zhuanjiaoBox: false,
+        isShowFinaceDailog:false,//是否显示生成财务单据对话框
         CreateHandBillID: '',
         CreateHandObj: {},
+        CurrentOutItem:{}//当前选中的团
       }
     },
     methods: {
       goCreateHandBill: function () {
         let obj = {}
-        for(let i = 0; i < this.CreateHandBillList.length; i++) {
+        for (let i = 0; i < this.CreateHandBillList.length; i++) {
           if (this.CreateHandBillList[i].id == this.CreateHandBillID) {
-             obj = this.CreateHandBillList[i]
+            obj = this.CreateHandBillList[i]
           }
         }
         let orderObj = {
-          OrderID: '', 
+          OrderID: '',
           OrderSource: 8,
           Obj: {},
-          SourceID: '', 
+          SourceID: '',
           TCIDList: [obj.TCID]
         };
         this.$router.push({
@@ -264,7 +283,7 @@
       CreateHandBill: function (obj) {
         this.CreateHandObj = obj
         let newList = []
-        for(let i = 0 ; i < obj.TCList.length; i++) {
+        for (let i = 0; i < obj.TCList.length; i++) {
           newList.push({
             TCID: obj.TCList[i].TCID,
             id: obj.TCList[i].TCNUMS,
@@ -375,7 +394,7 @@
         }, err => {})
       },
       //生成单据
-      CreateBill(ShopDetailsList, outItem) {
+      CreateBill() {
         var that = this;
         this.Confirm('是否生成财务单据？', function () {
           that.loading = true;
@@ -403,19 +422,20 @@
           //     that.Error(res.data.message);
           //   }
           // }, err => {})
-          
-          var nMsg={
-            TCIDs:outItem.TCIDs,
+
+          var nMsg = {
+            TCIDs: that.CurrentOutItem.TCIDs,
+            PayType:that.PayType,
             uid: that.getLocalStorage().EmployeeId
           };
-          let fileName = "生成[" + outItem.NewCombinationNum + "]购物店数据.xls";
-           that.GetLocalFile("dmcstatistics_post_ShopCreateBillAndExport", nMsg, fileName,
+          let fileName = "生成[" + that.CurrentOutItem.NewCombinationNum + "]购物店数据.xls";
+          that.GetLocalFile("dmcstatistics_post_ShopCreateBillAndExport", nMsg, fileName,
             res => {
               that.loading = false;
+              this.isShowFinaceDailog=false;
               that.Success("导入成功!");
               that.getList();
             });
-
         });
       },
     },
@@ -428,6 +448,7 @@
         "-" +
         myDate.getDate();
       this.msg.StartDate = nowDate;
+      //this.msg.StartDate = '2019-06-26'
       this.getLineList();
       this.getList();
     },

src/components/TravelManager/TravelList/TravelPassengerList2.vue

@@ -141,6 +141,7 @@
           currentPage: 1,
           isGetTicket: 1, //不查询机票
           isGetZiYouXing: 0, //查询自由行
+          isOnlyFenFang:1,//只查询已分房的
         },
         IsHaveLeader: 1, //1-有领队,0-无领队
         IsLeaderGuide: 0, //1-领兼导,0-领队
@@ -220,6 +221,7 @@
           TCID: this.msg.TCID,
           isGetTicket: 1, //不查询机票
           isGetZiYouXing: 0, //查询自由行
+          isOnlyFenFang:1,//只查询已分房的
         };
         var fileName = "旅客名单.xls";
         if (this.QueryMsg.TeamInfoData != null) {