页面修改

src/pages/financial/market/empBonusDetail.vue

@@ -13,9 +13,7 @@
         <el-table-column prop="EmployeeName" label="人员名称"> </el-table-column>
         <el-table-column prop="YearNum" label="年份"> </el-table-column>
         <el-table-column prop="MonthNum" label="月份"> </el-table-column>
-        <el-table-column prop="BasicSalary" label="基本薪资"></el-table-column>
         <el-table-column prop="OpenBonus" label="开单奖金"> </el-table-column>
-        <el-table-column prop="WorkAgeSalary" label="工龄工资"> </el-table-column>
         <el-table-column prop="ClueNumSalary" label="线索奖励"> </el-table-column>
         <el-table-column prop="CurGuestNum" width="110" label="当月订单人数"> </el-table-column>
         <el-table-column label="当月奖励金额" width="110">
@@ -26,6 +24,7 @@
                   <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-column prop="OrderState" label="订单状态"> </el-table-column>
                 </el-table>
               </div>
               <el-button slot="reference" type="success" plain size="mini">{{scope.row.CurRewardMoney}}</el-button>
@@ -47,26 +46,28 @@
             <el-popover placement="left" width="420" trigger="click">
               <div class="empDetailDiv">
                 <el-table ref="filterTable" max-height="300" :data="scope.row.DeductionList">
-                  <el-table-column prop="CreateTime" label="抵扣时间"> </el-table-column>
+                  <el-table-column prop="CreateTimeStr" 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" type="success" plain size="mini">{{scope.row.FinishDeductionMoney}}</el-button>
+              <el-button slot="reference" type="success" plain size="mini">{{scope.row.FinishDeductionMoney}}
+              </el-button>
             </el-popover>
           </template>
         </el-table-column>
         <el-table-column prop="IsReachStr" label="是否达标">
-            <template slot-scope="scope">
-                <span class="text-negative" v-if="scope.row.IsReach==0">{{scope.row.IsReachStr}}</span>
-                <span style="color:#67C23A" v-if="scope.row.IsReach==1">{{scope.row.IsReachStr}}</span>
-            </template>
+          <template slot-scope="scope">
+            <span class="text-negative" v-if="scope.row.IsReach==0">{{scope.row.IsReachStr}}</span>
+            <span style="color:#67C23A" v-if="scope.row.IsReach==1">{{scope.row.IsReachStr}}</span>
+          </template>
         </el-table-column>
         <el-table-column label="日志" width="110">
           <template slot-scope="scope">
             <el-popover placement="left" width="420" trigger="click">
               <div class="empDetailDiv">
                 <el-table ref="filterTable" max-height="300" :data="scope.row.BonusLogList">
+                  <el-table-column prop="CreateTimeStr" label="日志时间"> </el-table-column>
                   <el-table-column prop="LogContent" label="备注"> </el-table-column>
                 </el-table>
               </div>