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

src/assets/css/tripIndexNewHV.css

@@ -15,6 +15,7 @@
   border-radius: 60px 0px 60px 0px;
 }
 .travelDaysHV-Description{
+  height: 160px;
   font-size: 24px;
   line-height: 34px;
   color: #484647;
@@ -29,8 +30,8 @@
   margin-top: 10px;
 }
 .travelDaysHV-Description.travelDaysHV-Description3{
-  height: 295px;
-  -webkit-line-clamp: 9;
+  height: 275px;
+  -webkit-line-clamp:8;
   margin-top: 20px;
 }
 .travelDaysHV-CouponsName span.CouponsNameM{
@@ -111,6 +112,7 @@
 .travelDaysHVContent-text .textBold{
   font-size: 30px;
   margin-bottom: 29px;
+  font-weight: bold;
 }
 .travelDaysHVContent-text:last-child{
   margin-bottom: 0;
@@ -118,9 +120,9 @@
 .travelDaysHVContent-text{
   font-size: 26px;
   font-family: DengXian;
-  font-weight: bold;
+  font-weight: 400;
   color: #FFFFFF;
-  line-height: 26px;
+  line-height: 40px;
   margin-bottom: 40px;
 }
 .travelDaysHVdetailsBJ{
@@ -133,6 +135,7 @@
   padding: 0 47px 40px 47px;
 }
 .travelDaysHVContent{
+  max-height: 695px;
   padding: 42px 55px;
   background: rgba(23,23,23,0.4);
   margin: 0 57px;

src/components/FinancialModule/PrestorageManagement/prestoreList.vue

@@ -38,7 +38,7 @@
           <ul class="clearfix">
               <li class="hight_query">
                   <button class="hollowFixedBtn" @click="resetPageIndex()">{{$t('pub.searchBtn')}}</button>
-                  <!-- <button class="normalBtn" @click="method5()">导出</button> -->
+                  <button class="normalBtn" @click="method5()">导出</button>
               </li>
           </ul>
       </div>
@@ -88,6 +88,11 @@
               </template>
             </template>
           </el-table-column>
+          <el-table-column label="操作">
+            <template slot-scope="scope">
+              <span style="cursor: pointer;color: #00C6FF;" @click="downloadDetail(scope.row)">下载明细</span>
+            </template>
+          </el-table-column>
         </el-table>
           <div style="padding-bottom:15px">
               <el-pagination background @current-change="handleCurrentChange"
@@ -117,7 +122,8 @@ export default {
             ClientIdStr:'',
             QStartDate:'',
             QEndDate:'',
-            RB_Branch_Id:-1
+            RB_Branch_Id:-1,
+            EmployeeId:'',
         },
         loading: false,
         total: 0,
@@ -129,6 +135,8 @@ export default {
 
   },
   mounted(){
+      let userInfo=this.getLocalStorage();
+      this.msg.EmployeeId= userInfo.EmployeeId;
       this.getPageList();
       this.getBranchList();
       this.msg.ClientIdStr = this.$route.query.ClientIdStr?this.$route.query.ClientIdStr:""
@@ -171,10 +179,15 @@ export default {
           this.msg.QStartDate = this.productionDate[0];
           this.msg.QEndDate = this.productionDate[1];
       },
-      method5: function() {
+      method5() {
+          let time = this.getBeforeDate(0,new Date().Format("yyyy-MM-dd"))
+          var fileName = `客户预存余额${time}.xls`;          
+          this.GetLocalFile("Financial_post_DownLoadFinanceDeposit", this.msg,fileName);
+      },
+      downloadDetail(item) {
           let time = this.getBeforeDate(0,new Date().Format("yyyy-MM-dd"))
-          var fileName = `成本月结表${time}.xls`;
-          this.GetLocalFile("Financial_get_GetCostMonthALLExport", this.msg,fileName);
+          var fileName = `客户预存明细${time}.xls`;          
+          this.GetLocalFile("Financial_post_DownLoadFinanceDepositLog", {DepositCustomerId:item.CustomerId,EmployeeId:this.msg.EmployeeId},fileName);
       } ,
       handleCurrentChange(val) { //翻页
           this.msg.pageIndex = val;

src/components/FinancialModule/addFinancialDocuments.vue

@@ -1043,7 +1043,8 @@
           PayDate: '',
           CallType: 0,
           Type: 0,
-          GuestInfoList: []
+          GuestInfoList: [],
+          LineName: 0
         },
         detailList: {
           ID: 0,
@@ -1703,6 +1704,7 @@
           this.msg.EduCommissionEmp = this.orderObj.EduCommissionEmp ? this.orderObj.EduCommissionEmp : null
           this.msg.MatchFrId = this.orderObj.MatchFrId ? this.orderObj.MatchFrId : 0;
           this.msg.StandardCurrencyName = this.orderObj.StandardCurrencyName ? this.orderObj.StandardCurrencyName : ''
+          this.msg.LineName = this.orderObj.LineId? this.orderObj.LineId:0;
         }
         if (this.orderObj && this.orderObj.OtherType && this.orderObj.OtherType == 75 && this.orderObj.ReFinances ==
           '') {

src/components/TravelContractNew.vue

@@ -894,12 +894,12 @@
             <table class="TcTravel_Table">
               <tbody>
                 <tr>
-                  <td colspan="5">
+                  <td colspan="5" contenteditable="true">
                     组团社：印象之旅
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="5">
+                  <td colspan="5" contenteditable="true">
                     旅游线路名称：{{CtObj.productName}}&nbsp;&nbsp;&nbsp;&nbsp;行程共计：{{CtObj.dayNum}}天
                     {{CtObj.nightNum}}晚（含在途时间）
                   </td>

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -198,7 +198,17 @@
     overflow: auto;
     margin-bottom: 0 !important;
   }
-
+  .PayDayContent {
+    float: left;
+    margin-left: 2px;
+    text-align: left;
+    word-break: break-all;
+    text-overflow: ellipsis;
+    display: -webkit-box; /** 对象作为伸缩盒子模型显示 **/
+    -webkit-box-orient: vertical; /** 设置或检索伸缩盒对象的子元素的排列方式 **/
+    -webkit-line-clamp: 1; /** 显示的行数 **/
+    overflow: hidden;  /** 隐藏超出的内容 **/
+  }
 </style>
 
 <template>
@@ -998,6 +1008,7 @@
           <tr>
             <th width="180">单号</th>
             <th width="200">费用类型</th>
+            <th width="200">使用日期</th>
             <th width="200">付款对象</th>
             <th width="400">交易明细</th>
             <th width="300">本位币</th>
@@ -1013,6 +1024,7 @@
                 <span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
               </td>
               <td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}<br /></span></td>
+              <td><span class="PayDayContent" v-for="subItem in item.DescriptionList">{{subItem}}<br/></span></td>
               <td>{{item.ClientName}}</td>
               <td>
                 <div class="Team_ComCoin" v-for="childItem in item.TradeWayList">
@@ -1053,6 +1065,7 @@
           <tr>
             <th width="180">单号</th>
             <th width="200">费用类型</th>
+            <th width="200">使用日期</th>
             <th width="200">付款对象</th>
             <th width="400">交易明细</th>
             <th width="300">金额</th>
@@ -1068,6 +1081,7 @@
                 <span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
               </td>
               <td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}<br /></span></td>
+              <td><span class="PayDayContent" v-for="subItem in item.DescriptionList">{{subItem}}<br/></span></td>
               <td>{{item.ClientName}}</td>
               <td>
                 <div class="Team_ComCoin" v-for="childItem in item.TradeWayList">
@@ -1107,6 +1121,7 @@
           <tr>
             <th width="180">单号</th>
             <th width="200">费用类型</th>
+            <th width="200">使用日期</th>
             <th width="200">付款对象</th>
             <th width="400">交易明细</th>
             <th width="300">金额</th>
@@ -1124,6 +1139,7 @@
                 <span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
               </td>
               <td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}<br /></span></td>
+              <td><span class="PayDayContent" v-for="subItem in item.DescriptionList">{{subItem}}<br/></span></td>
               <td>{{item.ClientName}}</td>
               <td>
                 <div class="Team_ComCoin" v-for="childItem in item.TradeWayList">
@@ -1164,6 +1180,7 @@
           <tr>
             <th width="180">单号</th>
             <th width="200">费用类型</th>
+            <th width="200">使用日期</th>
             <th width="200">付款对象</th>
             <th width="400">交易明细</th>
             <th width="300">金额</th>
@@ -1179,6 +1196,7 @@
                 <span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
               </td>
               <td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}<br /></span></td>
+              <td><span class="PayDayContent" v-for="subItem in item.DescriptionList">{{subItem}}<br/></span></td>
               <td>{{item.ClientName}}</td>
               <td>
                 <div class="Team_ComCoin" v-for="childItem in item.TradeWayList">
@@ -1656,6 +1674,7 @@
           <tr>
             <th width="180">单号</th>
             <th width="200">费用类型</th>
+            <th width="200">使用日期</th>
             <th width="200">付款对象</th>
             <th width="400">交易明细</th>
             <th width="300">金额</th>
@@ -1699,6 +1718,7 @@
                 <span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
               </td>
               <td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}<br /></span></td>
+              <td><span class="PayDayContent" v-for="subItem in item.DescriptionList">{{subItem}}<br/></span></td>
               <td>{{item.ClientName}}</td>
               <td>
                 <div class="Team_ComCoin" v-for="childItem in item.TradeWayList">

src/components/dmc/manager/teamRevenueExpenditure.vue

@@ -556,7 +556,8 @@
           OrderSource: _orderSource,
           Obj: {},
           SourceID: this.$route.query.id,
-          TCIDList: TCIDARR
+          TCIDList: TCIDARR,
+          LineId : this.LineId
         }
         id = id.length > 0 ? JSON.stringify(id) : null;