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

src/components/TravelManager/TravelTeam/priceGroup.vue

@@ -634,9 +634,10 @@
             </div>
             <div class="el-col w_10">
               <div class="p20">
+                <div class="mb">
                 <el-button class="mb" @click.native='goBuy(item)' type="primary" size="mini"
                   style="background:#00C6FF; border-color:#00C6FF">下单
-                </el-button>
+                </el-button></div>
                 <el-dropdown trigger="click">
                   <span class="el-dropdown-link">更多
                     <i class="el-icon-arrow-down el-icon--right"></i>

src/components/TravelManager/TravelTeam/travelPayList.vue

@@ -20,7 +20,28 @@
   .p20 {
     padding: 20px;
   }
+.flex {
+  display: flex;
+}
+.col-1 {
+  width: 10%;
+}
+.text-center {
+  text-align: center;
+}
+.q-py-md {
+  padding: 12px 0;
+}
+.item:hover {
+  background: #eee;
+}
 
+.none {
+  text-align: center;
+  margin: 20px;
+  color: #666;
+  font-size: 16px;
+}
 </style>
 <template>
   <div class="TC_Content">
@@ -29,61 +50,36 @@
         <el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
           layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" :total="queryMsg.total">
         </el-pagination>
-        <ul>
-          <li v-for="(item,index) in queryDataObj.dataList" :key="item.GTeamId"
-            :class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}">
-            <div class="TC_remarkContent">
-              <div class="el-col w_20">
-                <div class="p20">
-                  <div class="mb title"><i class="iconfont icon-biaoti1"></i><span>包机信息</span></div>
-                  <div>合作伙伴:<span>{{item.ContactName}}</span></div>
-                  <div>已入名单人数：<span>{{item.EntGuestNum}}</span></div>
-                  <div>已入名单人数：<span>{{item.IsHaveFinance}}</span></div>
-                  <div>报名总人数:<span>{{item.GuestNum}}</span></div>
-                  <div>应收总金额：<span>{{item.PreferPrice}}</span></div>
-                  <div>退款金额：<span>{{item.Refund}}</span></div>
-                  <div>平台税金:<span>{{item.PlatformTax}}</span></div>
-                  <div>实收：<span>{{item.Income}}</span></div>
-                  <div>在途金额：<span>{{item.ZaiTuMoney}}</span></div>
-                  <div>折扣金额:<span>{{item.DiscountMoney}}</span></div>
-                  <div>大红包抵扣金额：<span>{{item.RedEnvelopeMoney}}</span></div>
-                  <div>代收总金额：<span>{{item.DueInMoney}}</span></div>
-                  <div>利润（先给这个字段，规则还没有）：<span>{{item.CommissionRate}}</span></div>
-                  
-                </div>
-              </div>
-              <div class="el-col w_20">
-                <div class="p20">
-                  <div class="mb title"><i class="iconfont icon-hangban1"></i><span>航班信息</span></div>
-                </div>
-              </div>
-              <div class="el-col w_10">
-                <div class="p20">
-                  <div class="mb title"><i class="iconfont icon-jiage"></i><span>机位信息</span></div>
-                </div>
-              </div>
-              <div class="el-col w_10">
-                <div class="p20">
-                  <div class="mb title"><i class="iconfont icon-jiage"></i><span>价格信息</span></div>
-                </div>
-              </div>
-              <div class="el-col w_20">
-                <div class="p20">
-                  <div class="mb title"><i class="iconfont icon-tuandui"></i><span>合作伙伴</span></div>
-                </div>
-              </div>
-              <div class="el-col w_10">
-                <div class="p20">
-                  <div class="mb title"><i class="iconfont icon-yuangong"></i><span>发起信息</span></div>
-                </div>
-              </div>
-              <div class="el-col w_10">
-                <div class="p20">
-                </div>
-              </div>
-            </div>
-          </li>
-        </ul>
+        <div class="flex q-py-md">
+    
+    <div class="col-1">合作伙伴</div>
+    <div class="col-1">已入名单人数</div>
+    <div class="col-1">报名总人数</div>
+    <div class="col-1">应收总金额</div>
+    <div class="col-1">退款金额</div>
+    <div class="col-1">平台税金</div>
+    <div class="col-1">实收</div>
+    <div class="col-1">在途金额</div>
+    <div class="col-1">折扣金额</div>
+    <div class="col-1">大红包抵扣金额</div>
+    <div class="col-1">代收总金额</div>
+    <div class="col-1">利润</div>
+  </div>
+  <div class="flex q-py-md item" v-for="(item,index) in queryDataObj.dataList" :key="item.GTeamId">
+    <div class="col-1"><span>{{item.ContactName}}</span></div>
+    <div class="col-1 text-center"><span>{{item.EntGuestNum}}</span></div>
+    <div class="col-1"><span>{{item.GuestNum}}</span></div>
+    <div class="col-1"><span>{{item.PreferPrice}}</span></div>
+    <div class="col-1"><span>{{item.Refund}}</span></div>
+    <div class="col-1"><span>{{item.PlatformTax}}</span></div>
+    <div class="col-1"><span>{{item.Income}}</span></div>
+    <div class="col-1"><span>{{item.ZaiTuMoney}}</span></div>
+    <div class="col-1"><span>{{item.DiscountMoney}}</span></div>
+    <div class="col-1"><span>{{item.RedEnvelopeMoney}}</span></div>
+    <div class="col-1"><span>{{item.DueInMoney}}</span></div>
+    <div class="col-1"><span>{{item.CommissionRate}}</span></div>
+  </div>
+  <div v-if="!queryDataObj.dataList.length" class="none">暂无数据</div>
         <div class="noData" v-show="queryMsg.noData">{{$t('system.content_noData')}}</div>
         <el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
           layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" :total="queryMsg.total">