no message

src/assets/common/lang/zhCN/fill.js

@@ -8157,6 +8157,8 @@ export const obj = {
     dakuanzhong: '打款中',
     lianmenght: '联盟合同',
     shenqinjsr: '申请结算日期',
+    lianmeng: '联盟',
+    fanyongjefw: '返佣交易金额范围',
   },
   //#endregion
 }

src/components/administrative/AllianceContract.vue

 <style scoped>
-/* ._icon_btn .el-button {
-    width: 30px;
-    height: 30px;
-    line-height:0px;
-    text-align: center;
-  }
-._icon_btn .el-button i {
-    color: #fff;
-  }
-._icon_btn .icon-chakan {
-    position: relative;
-    top: -3px;
-    left: 5px;
-  } */
   .heightauto .el-input {
     height: auto !important;
   }
-
-  /* .LianMengManagement ._icon_btn i {
-     width: 30px;
-    height: 30px;
-    display: inline-block;
-    color: white !important;
-    border-radius: 50%;
-    text-align: center;
-    line-height: 30px;
-    margin-right: 10px;
-    cursor: pointer;
-    outline: none;
+  /deep/.el-table th.el-table__cell {
+    background-color: #E6E6E6;
   }
-
-  .LianMengManagement ._icon_btn i.el-icon-edit {
-    background-color: #47BF8C;
+  /deep/.el-form-item{
+    margin-bottom:5px;
   }
-
-  .LianMengManagement ._icon_btn i.el-icon-check {
-    background-color: #E95252;
+  /deep/.el-table .el-table__cell {
+    padding: 5px 0;
   }
-
-  .LianMengManagement ._icon_btn i.el-icon-search {
-    background-color: #E6A23C;
-  } */
-
 </style>
 <template>
   <div class="LianMengManagement">
@@ -67,6 +36,11 @@
         <th>{{$t('objFill.v102.shenqinjsr')}}</th>
         <th>{{$t('objFill.v102.jiesuanshijian')}}</th>
         <th>{{$t('objFill.hetongzt')}}</th>
+        <th>{{$t('objFill.v102.fanyongjefw')}}</th>
+        <th>{{$t('restaurant.res_commissionColumn')}}</th>
+        <th>{{$t('salesModule.TransactionMon')}}</th>
+        <th>{{$t('restaurant.res_fy')}}</th>
+        <th>{{$t('objFill.v102.lianmeng')}}</th>
         <th width="130">{{$t('hotel.table_operat')}}</th>
       </tr>
       <tr v-for="(item,index) in dataList" :key="index">
@@ -91,6 +65,41 @@
          </td>
          
          <!-- <td>{{ item.TravelAgency_SignAddress }}</td> -->
+          <td>{{ item.Money?item.Money:'' }}~{{ item.MaxMoney?item.Money:'' }}</td>
+          <td>{{ item.Ratio?item.Ratio:'-' }}</td>
+          <td>{{ item.TradeMoney?item.TradeMoney:'-' }}</td>
+          <td>{{ item.TotalClosePrice?item.TotalClosePrice:'-' }}</td>
+         <td>
+          <el-popover width="500" trigger="click">
+              <el-table
+              :data="item.CllianceChildList"
+              style="width: 100%" border>
+                <el-table-column
+                  prop="CustomerName"
+                  :label="$t('salesModule.storeName')"
+                  width="150">
+                </el-table-column>
+                <el-table-column prop="PredictPrice" :label="$t('restaurant.res_fy')">
+                  <template slot-scope="scope">
+                      {{scope.row.PredictPrice.toFixed(2)}}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="TotalGuestNum" :label="$t('objFill.v101.administrative.lvkeshu')">
+                  <template slot-scope="scope">
+                      {{scope.row.TotalGuestNum?scope.row.TotalGuestNum:'-'}}
+                  </template>
+                </el-table-column>
+                <el-table-column :label="$t('hotel.table_TotalPrice')">
+                  <template slot-scope="scope">
+                      {{scope.row.TradeMoney.toFixed(2)}}
+                  </template>
+                </el-table-column>
+              </el-table>
+              <span slot="reference" style="cursor: pointer;color: #33B3FF;">
+                {{ item.CllianceChildList[0].CustomerName }}
+              </span>
+          </el-popover>
+         </td>
          <td class="_icon_btn">
             <!-- <el-tooltip class="item" effect="dark" :content="$t('objFill.xz')+$t('objFill.v102.lianmenght')" placement="top-start">
                 <el-button type="success" size="small" icon="el-icon-download" circle @click="DownLoadContract(item)">

src/components/administrative/LianMengManagement.vue

-<style>
+<style scoped>
   .heightauto .el-input {
     height: auto !important;
   }
@@ -73,9 +73,9 @@
             <el-tooltip class="item" effect="dark" :content="$t('objFill.jiesuan')" placement="top">
               <i class="edit el-icon-check"  v-if="item.IsClearing == 1" @click="jiesuan(item.ID, 'happyMoney')" ></i>
             </el-tooltip>
-            <el-tooltip class="item" effect="dark" :content="$t('fnc.xiangqing')" placement="top">
+            <!-- <el-tooltip class="item" effect="dark" :content="$t('fnc.xiangqing')" placement="top">
               <i class="edit el-icon-search"  v-if="item.IsClearing == 2" @click="jiesuan(item.ID, 'happyMoneyDetails')" ></i>
-            </el-tooltip>
+            </el-tooltip> -->
          </td>
       </tr>
     </table>

src/components/administrative/LianMengManagementList.vue

-<style>
+<style scoped>
 .LianMengManagement ._icon_btn i {
     width: 30px;
     height: 30px;
@@ -32,9 +32,9 @@
             <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.administrative.shiezhizmd')" placement="top">
               <i class="iconfont icon-guanli2" @click="clickSetAdmin(item)"></i>
             </el-tooltip>
-              <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.administrative.yichumend')" placement="top">
+              <!-- <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.administrative.yichumend')" placement="top">
               <i class="iconfont icon-img_delete_small icon-guanli2" @click="DelAllianceChild(item)"></i>
-            </el-tooltip>
+            </el-tooltip> -->
           </td>
       </tr>
     </table>