页面修改

src/pages/financial/market/empBonusDetail.vue

@@ -18,27 +18,49 @@
         <el-table-column prop="WorkAgeSalary" label="工龄工资"> </el-table-column>
         <el-table-column prop="ClueNumSalary" label="线索奖励"> </el-table-column>
         <el-table-column prop="CurGuestNum" label="当月订单人数"> </el-table-column>
-        <el-table-column prop="CurRewardMoney" label="当月奖励金额"> </el-table-column>
+        <el-table-column label="当月奖励金额">
+          <template slot-scope="scope">
+            <el-popover placement="left" title="标题" width="420" trigger="click">
+              <div class="empDetailDiv">
+                <el-table ref="filterTable" :data="scope.row.DetailList">
+                  <el-table-column prop="OrderId" label="订单编号"> </el-table-column>
+                  <el-table-column prop="OrderGuestNum" label="订单人数"></el-table-column>
+                  <el-table-column prop="OrderMoney" label="订单金额"> </el-table-column>
+                </el-table>
+              </div>
+              <el-button slot="reference" size="mini">{{scope.row.CurRewardMoney}}</el-button>
+            </el-popover>
+          </template>
+        </el-table-column>
         <el-table-column prop="BeforeMoney" label="以前月份的冲抵金额"></el-table-column>
         <el-table-column prop="CreateByName" label="创建人"> </el-table-column>
         <el-table-column prop="CreateTime" label="创建时间"> </el-table-column>
         <el-table-column prop="CurOrderMoney" label="当月订单金额"> </el-table-column>
         <el-table-column prop="DeductionMoney" label="待抵扣金额"> </el-table-column>
-        <el-table-column prop="FinishDeductionMoney" label="已抵扣金额"> </el-table-column>
+        <el-table-column label="已抵扣金额">
+          <template slot-scope="scope">
+            <el-popover placement="left" title="标题" width="420" trigger="click">
+              <div class="empDetailDiv">
+                <el-table ref="filterTable" :data="scope.row.DeductionList">
+                  <el-table-column prop="CreateTime" label="抵扣时间"> </el-table-column>
+                  <el-table-column prop="DeductionMoney" label="抵扣金额"></el-table-column>
+                  <el-table-column prop="DeductionContent" label="备注"> </el-table-column>
+                </el-table>
+              </div>
+              <el-button slot="reference" size="mini">{{scope.row.FinishDeductionMoney}}</el-button>
+            </el-popover>
+          </template>
+        </el-table-column>
         <el-table-column prop="IsReachStr" label="是否达标"> </el-table-column>
-        <el-table-column label="操作" width="110">
+        <el-table-column label="日志">
           <template slot-scope="scope">
             <el-popover placement="left" title="标题" width="420" trigger="click">
               <div class="empDetailDiv">
-                <el-table ref="filterTable" :data="scope.row.DetailList">
-                  <el-table-column prop="BonusId" label="BonusId"></el-table-column>
-                  <el-table-column prop="OrderGuestNum" label="OrderGuestNum"></el-table-column>
-                  <el-table-column prop="OrderId" label="OrderId"> </el-table-column>
-                  <el-table-column prop="OrderMoney" label="OrderMoney"> </el-table-column>
-                  <el-table-column prop="OrderState" label="OrderState"> </el-table-column>
+                <el-table ref="filterTable" :data="scope.row.BonusLogList">
+                  <el-table-column prop="LogContent" label="备注"> </el-table-column>
                 </el-table>
               </div>
-              <el-button slot="reference" size="mini">点击查看</el-button>
+              <el-button slot="reference" size="mini">日志信息</el-button>
             </el-popover>
           </template>
         </el-table-column>