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

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">