1

src/pages/financial/market/AchievementsForOrderList.vue

@@ -65,10 +65,10 @@
         </el-table-column>
         <el-table-column prop="UserName" label="人员" :filters='UserNamelist' :filter-method="filterHandler">
         </el-table-column>
-          <el-table-column  prop="IsDept" label="业绩方式" >
+          <el-table-column  prop="IsCommonDept" label="业绩方式" >
                   <template slot-scope="scope">
-                    <span v-if="scope.row.IsDept==1">部门</span>
-                    <span v-if="scope.row.IsDept==2">个人</span>
+                    <span v-if="scope.row.IsCommonDept==1">部门</span>
+                    <span v-if="scope.row.IsCommonDept==0">个人</span>
                  </template>
             </el-table-column>          
         <el-table-column width='170' prop="ClassName" label="班级信息">
@@ -99,6 +99,8 @@
             <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>
+
+            <div v-if="scope.row.OrderSaleMoney">订单业绩:{{ scope.row.OrderSaleMoney }}</div>
           </template>
 
         </el-table-column>

src/pages/financial/market/AchievementsUserDetailList.vue

@@ -94,7 +94,7 @@
             option-value="Id"
             @input="getList"
             option-label="Name"
-            v-model="msg.IsDept"
+            v-model="msg.IsCommonDept"
             :options="IsDeptList"
             label="业绩方式"
             :dense="false"
@@ -139,10 +139,10 @@
           </template>
         </el-table-column>
         <el-table-column prop="UserName" label="销售"></el-table-column>
-        <el-table-column prop="IsDept" label="业绩方式">
+        <el-table-column prop="IsCommonDept" label="业绩方式">
           <template slot-scope="scope">
-            <span v-if="scope.row.IsDept == 1">部门</span>
-            <span v-if="scope.row.IsDept == 2">个人</span>
+            <span v-if="scope.row.IsCommonDept == 1">部门</span>
+            <span v-if="scope.row.IsCommonDept == 0">个人</span>
           </template>
         </el-table-column>
         <el-table-column width="130" prop="ClassName" label="班级信息">
@@ -175,17 +175,8 @@
             >{{ scope.row.OrderId!=-1?scope.row.OrderId:'有效到访奖励' }}</div>
           </template>
         </el-table-column>
-        <el-table-column prop="IssueNum" label="发放次数" width="94">
-          <template slot-scope="scope">
-            <div
-              v-if="scope.row.IssueNum"
-              style="cursor: pointer;text-decoration: underline;"
-              @click="goorderUrl(scope.row)"
-            >发放第{{ scope.row.IssueNum }}次</div>
-          </template>
-        </el-table-column>
 
-        <el-table-column width="130" prop="TotalCommissionMoney" label="订单发放信息">
+        <el-table-column width="150" prop="TotalCommissionMoney" label="订单发放信息">
           <template slot-scope="scope">
 
              <div v-if="scope.row.TotalCommissionMoney" style="color: rgb(255, 156, 0);cursor: pointer;text-decoration: underline;" @click="getmingxi(scope.row)">
@@ -199,15 +190,17 @@
             <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>
+
+            <div v-if="scope.row.OrderSaleMoney">订单业绩:{{ scope.row.OrderSaleMoney }}</div>
           </template>
         </el-table-column>
-        <el-table-column prop="IsFirstCommission" label="首次发放">
+        <!-- <el-table-column prop="IsFirstCommission" label="首次发放">
           <template slot-scope="scope">
             <div
               v-if="scope.row.IsFirstCommission"
             >{{ scope.row.IsFirstCommission == 1 ? '是' : '否' }}</div>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column prop="TotalHours" label="课时统计" width="120">
           <template slot-scope="scope">
             <div v-if="scope.row.TotalHours">总计课时:{{ scope.row.TotalHours }}</div>
@@ -241,6 +234,15 @@
           </template>
         </el-table-column>
         <el-table-column width="90" prop="PeopleNumMoney" label="人头奖励"></el-table-column>
+        <el-table-column prop="IssueNum" label="发放次数" width="94">
+          <template slot-scope="scope">
+            <div
+              v-if="scope.row.IssueNum"
+              style="cursor: pointer;text-decoration: underline;"
+              @click="goorderUrl(scope.row)"
+            >发放第{{ scope.row.IssueNum }}次</div>
+          </template>
+        </el-table-column>
         <el-table-column width="90" prop="Periods" label="期数"></el-table-column>
         <el-table-column prop="Remark" width="160" label="备注"></el-table-column>
       </el-table>
@@ -278,11 +280,11 @@ export default {
         ClassId: 0,
         OrderId: '',
         UserType: 0,//类型 1市场、2顾问、3教师
-        IsDept: 0,//业绩方式 1部门 2个人
+        IsCommonDept: '0',//业绩方式 1部门 2个人
         UserIds: '',
       },
       UserTypeList: [{ Id: 0, Name: '不限' }, { Id: 1, Name: '市场' }, { Id: 2, Name: '顾问' }, { Id: 3, Name: '教师' },],
-      IsDeptList: [{ Id: 0, Name: '不限' }, { Id: 1, Name: '部门' }, { Id: 2, Name: '个人' }],
+      IsDeptList: [{ Id: '0', Name: '不限' }, { Id: '1', Name: '部门' }, { Id: '2', Name: '个人' }],
       pageCount: 0,
       persistent: false,
       listData: {},
@@ -307,6 +309,9 @@ export default {
     if (this.$route.query && this.$route.query.UserIds) {
       this.msg.UserIds = this.$route.query.UserIds
     }
+    if(this.$route.query && this.$route.query.IsCommonDept){
+      this.msg.IsCommonDept = this.$route.query.IsCommonDept
+    }
     this.getList()
     this.setClass()
     this.getEmployee()
@@ -331,7 +336,8 @@ export default {
       let obj = {
         SchoolName: '合计',
         YFMoney: 0,
-        PeopleNumMoney: 0
+        PeopleNumMoney: 0,
+        IsCommonDept:-1
       }
       this.tableData.forEach((x) => {
         if (x.YFMoney) {

src/pages/financial/market/commissionRule.vue

@@ -233,6 +233,24 @@
 
             </tr>
           </table>
+          <table v-if="item.IsDeptAward=='1'"
+            class="po_content singeRowTable"
+            style="border:1px solid #E6E6E6;"
+            cellspacing="0"
+            cellpadding="0"
+          >
+            <tr>
+              <td rowspan="2" width="100" style="min-width: 100px;">部门共同奖金包分配</td>
+              <th style="min-width: 220px;"
+                v-for="( son , sIndex ) in item.DeptAwardList"
+                :key="sIndex"
+              >{{ son.EmName }}</th>
+            </tr>
+            <tr style="">
+              <td style="min-width: 220px;" v-for="( son , sIndex ) in item.DeptAwardList" :key="sIndex">{{ son.Rate }}%</td>
+
+            </tr>
+          </table>
         </div>
 
       </div>

src/pages/financial/market/employeeCommission.vue

@@ -67,7 +67,7 @@
             <template slot-scope="scope">
               <div class="_icon_btn">
                 <el-tooltip class="item" effect="dark" content="查看" placement="top">
-                  <i class="iconfont icon-sousuo" @click="goUrl('market/AchievementsUserDetailList',scope.row.UserId)"></i>
+                  <i class="iconfont icon-sousuo" @click="goUrl('market/AchievementsUserDetailList',scope.row.IsCommonDept,scope.row.UserId)"></i>
                 </el-tooltip>
               </div>
             </template>
@@ -174,15 +174,26 @@
       
     
   
-        goUrl(path, id) {
-          this.$router.push({
-            path: '/financial/' + path,
-            query: {
-              userId: id,
-              preriodId: this.$route.query.id,
-              blank: 'y',
-            }
-          })
+        goUrl(path,IsCommonDept, id) {
+          if(IsCommonDept==1){
+            this.$router.push({
+              path: '/financial/' + path,
+              query: {
+                IsCommonDept: IsCommonDept,
+                preriodId: this.$route.query.id,
+                blank: 'y',
+              }
+            })
+          }else{
+            this.$router.push({
+              path: '/financial/' + path,
+              query: {
+                userId: id,
+                preriodId: this.$route.query.id,
+                blank: 'y',
+              }
+            })
+          }
         },
         filterHandler(value, row, column) {
           const property = column['property'];

src/pages/financial/market/marketStatistics.vue

@@ -94,7 +94,7 @@
         </div>
         <div class="col-3">
           <q-select filled stack-label input-debounce="0" option-value="Id" @input="resetSearch()" option-label="Name"
-            v-model="msg.IsDept" :options="IsDeptList" label="业绩方式" :dense="false" emit-value map-options>
+            v-model="msg.IsCommonDept" :options="IsDeptList" label="业绩方式" :dense="false" emit-value map-options>
           </q-select>
         </div>
       </div>
@@ -117,10 +117,10 @@
           </template>
         </el-table-column>
         <el-table-column prop="UserName" label="人员"> </el-table-column>
-        <el-table-column prop="IsDept" label="业绩方式">
+        <el-table-column prop="IsCommonDept" label="业绩方式">
           <template slot-scope="scope">
-            <span v-if="scope.row.IsDept==1">部门</span>
-            <span v-if="scope.row.IsDept==2">个人</span>
+            <span v-if="scope.row.IsCommonDept==1">部门</span>
+            <span v-if="scope.row.IsCommonDept==0">个人</span>
           </template>
         </el-table-column>
         <el-table-column width='170' prop="ClassName" label="班级信息">
@@ -145,7 +145,7 @@
                {{ scope.row.OrderId!=-1?scope.row.OrderId:'有效到访奖励' }} </div>
           </template>
         </el-table-column>
-        <el-table-column width='130' prop="TotalCommissionMoney" label="订单发放信息">
+        <el-table-column width='150' prop="TotalCommissionMoney" label="订单发放信息">
           <template slot-scope="scope">
             <div style="color: rgb(255, 156, 0);cursor: pointer;text-decoration: underline;"
               @click="getmingxi(scope.row)">
@@ -157,13 +157,14 @@
               </q-popup-proxy>
             </div>
             <div>累计已发:{{scope.row.GiveOutMoney}}</div>
+            <div v-if="scope.row.OrderSaleMoney">订单业绩:{{ scope.row.OrderSaleMoney }}</div>
           </template>
         </el-table-column>
-        <el-table-column prop="IsFirstCommission" label="首次发放">
+        <!-- <el-table-column prop="IsFirstCommission" label="首次发放">
           <template slot-scope="scope">
             <div>{{scope.row.IsFirstCommission==1?'是':'否'}}</div>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column prop="TotalHours" label="课时统计" width='160'>
           <template slot-scope="scope">
             <div>总计课时:{{scope.row.TotalHours}}</div>
@@ -242,7 +243,7 @@
           ClassId: 0,
           OrderId: '',
           UserType: 0, //类型 1市场、2顾问、3教师
-          IsDept: 0, //业绩方式 1部门 2个人
+          IsCommonDept: 0, //业绩方式 1部门 2个人
         },
         UserTypeList: [{
           Id: 0,

src/pages/financial/orderCompleteStatistics.vue

@@ -61,6 +61,10 @@ td .border-b:last-child {
 .orderCompleteStatistics td {
   color: #000;
 }
+
+.el-form-item {
+    margin-bottom: 7px;
+}
 </style>
 <template>
   <div class="page_EasyReport My_table_tell page-body" v-loading="AALloading">