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

src/api/finance/index.js

@@ -766,6 +766,17 @@ export function GetBonusPlan(data) {
   });
 }
 
+/**
+ * 业绩提成 提成明细界面 查询应发提成 变更记录
+ */
+ export function getSellAchievementsChangeLog(data) {
+  return request({
+    url: '/SellAchievements/GetSellAchievementsChangeLog',
+    method: 'post',
+    data
+  });
+}
+
 
 
 

src/pages/financial/market/AchievementsForOrderList.vue

@@ -88,7 +88,14 @@
         </el-table-column>
         <el-table-column width='130' prop="TotalCommissionMoney" label="订单发放信息">
           <template slot-scope="scope">
-            <div v-if="scope.row.TotalCommissionMoney" style="color: rgb(255, 156, 0);">应发:{{scope.row.TotalCommissionMoney}}</div>
+            <div v-if="scope.row.TotalCommissionMoney" style="color: rgb(255, 156, 0);cursor: pointer;text-decoration: underline;" @click="getmingxi(scope.row)">
+            应发:{{scope.row.TotalCommissionMoney}}
+            <q-popup-proxy transition-show="flip-up" transition-hide="flip-down">
+                <div style="padding: 10px;border-radius: 4px;background: #FFF;max-width: 500px;">
+                  {{ChangeLog}}
+                </div>
+              </q-popup-proxy>
+            </div>
             <div v-if="scope.row.OtherMoney">额外奖励:{{scope.row.OtherMoney}}</div>
             <div v-if="scope.row.BackMoney">额外扣除:{{scope.row.BackMoney}}</div>
             <div v-if="scope.row.GiveOutMoney">累计已发:{{scope.row.GiveOutMoney}}</div>
@@ -150,6 +157,7 @@
   } from '../../../api/system/index';
   import {
     getSellAchievementsForOrderList,
+    getSellAchievementsChangeLog
   } from '../../../api/finance/index'
   import {
     getClassDropDownList,
@@ -183,6 +191,7 @@
         DeptNamelist: [],
         UserNamelist: [],
         see_tcdetailed: false,
+        ChangeLog:'',
 
       }
     },
@@ -341,6 +350,18 @@
           // EnterID:row.UserId
         });
       },
+      getmingxi(row){//明细
+        getSellAchievementsChangeLog({
+          OrderId: row.OrderId,
+          UserId: row.UserId,
+          UserType: row.UserType,
+          IsDept: row.IsDept,
+        }).then(res => {
+          if (res.Code == 1) {
+            this.ChangeLog = res.Data
+          }
+        });
+      }
 
 
 

src/pages/financial/market/AchievementsUserDetailList.vue

@@ -171,10 +171,15 @@
 
         <el-table-column width="130" prop="TotalCommissionMoney" label="订单发放信息">
           <template slot-scope="scope">
-            <div
-              v-if="scope.row.TotalCommissionMoney"
-              style="color: rgb(255, 156, 0);"
-            >应发:{{ scope.row.TotalCommissionMoney }}</div>
+           
+             <div v-if="scope.row.TotalCommissionMoney" style="color: rgb(255, 156, 0);cursor: pointer;text-decoration: underline;" @click="getmingxi(scope.row)">
+              应发:{{scope.row.TotalCommissionMoney}}
+              <q-popup-proxy transition-show="flip-up" transition-hide="flip-down">
+                  <div style="padding: 10px;border-radius: 4px;background: #FFF;max-width: 500px;">
+                    {{ChangeLog}}
+                  </div>
+                </q-popup-proxy>
+            </div>
             <div v-if="scope.row.OtherMoney">额外奖励:{{ scope.row.OtherMoney }}</div>
             <div v-if="scope.row.BackMoney">额外扣除:{{ scope.row.BackMoney }}</div>
             <div v-if="scope.row.GiveOutMoney">累计已发:{{ scope.row.GiveOutMoney }}</div>
@@ -201,19 +206,7 @@
             >当期课时：{{ scope.row.CurrentHours >= 0 ? scope.row.CurrentHours : '-' }}</div>
           </template>
         </el-table-column>
-        <!-- <el-table-column prop="TotalHours" label="总课时"> </el-table-column>
-        <el-table-column width='110' prop="TotalLearn" label="已学习课时"> 
-          <template slot-scope="scope">
-            <div >
-              {{scope.row.TotalLearn}} 
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column width='110' prop="CurrentHours" label="当期消费课时">
-          <template slot-scope="scope">
-            <div>{{scope.row.CurrentHours>=0 ?scope.row.CurrentHours:'-'}}</div>
-          </template>
-        </el-table-column>-->
+
         <el-table-column width="160" prop="CurrentPeriodMoney" label="当期发放信息">
           <template slot-scope="scope">
             <div
@@ -243,6 +236,7 @@ import {
 } from '../../../api/system/index';
 import {
   getSellAchievementsUserDetailList,
+  getSellAchievementsChangeLog
 } from '../../../api/finance/index'
 import {
   getClassDropDownList,
@@ -276,6 +270,7 @@ export default {
       department: [],
       ClassList: [],
       allClassList: [],
+      ChangeLog:'',
     }
   },
   created() { },
@@ -441,7 +436,20 @@ export default {
         EndMonth: EndMonth,
         comefrom: 1,
       });
-    }
+    },
+    getmingxi(row){//明细
+        getSellAchievementsChangeLog({
+          OrderId: row.OrderId,
+          UserId: row.UserId,
+          UserType: row.UserType,
+          IsDept: row.IsDept,
+        }).then(res => {
+          if (res.Code == 1) {
+            this.ChangeLog = res.Data
+          }
+        });
+      }
+
   },
 }
 </script>

src/pages/financial/market/marketStatistics.vue

@@ -144,7 +144,14 @@
             </el-table-column>
             <el-table-column width='130' prop="TotalCommissionMoney" label="订单发放信息"> 
                 <template slot-scope="scope">
-                    <div style="color: rgb(255, 156, 0);">应发:{{scope.row.TotalCommissionMoney}}</div>
+                    <div style="color: rgb(255, 156, 0);cursor: pointer;text-decoration: underline;" @click="getmingxi(scope.row)">
+                      应发:{{scope.row.TotalCommissionMoney}}
+                      <q-popup-proxy transition-show="flip-up" transition-hide="flip-down">
+                        <div style="padding: 10px;border-radius: 4px;background: #FFF;max-width: 500px;">
+                          {{ChangeLog}}
+                        </div>
+                      </q-popup-proxy>
+                    </div>
                     <div>累计已发:{{scope.row.GiveOutMoney}}</div>
                 </template>
                 
@@ -201,7 +208,8 @@
    
     import{
         getSellAchievementsStatistics,
-        getSellAchievementsPeriodsList
+        getSellAchievementsPeriodsList,
+        getSellAchievementsChangeLog
     } from '../../../api/finance/index'
     import {
       getClassDropDownList,
@@ -253,6 +261,7 @@
           AllemployeeList: [], //所有员工
           PeriodsList:[],//周期列表
           TotalCommission:0,
+          ChangeLog:'',
         }
       },
       created() {
@@ -441,6 +450,18 @@
             // EnterID:row.UserId
           });
         },
+        getmingxi(row){//明细
+          getSellAchievementsChangeLog({
+            OrderId: row.OrderId,
+            UserId: row.UserId,
+            UserType: row.UserType,
+            IsDept: row.IsDept,
+          }).then(res => {
+            if (res.Code == 1) {
+              this.ChangeLog = res.Data
+            }
+          });
+        }
       },
     }