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

src/components/finance/consult-form.vue

@@ -145,10 +145,13 @@
           </div>
         </div>
         <div class="row wrap">
-          <div class="col-6">
-            <q-select filled v-model="SaleIdsArray" multiple @filter="filterEmployee" use-input
-              class="col-6 q-pb-lg q-pr-lg" :options="myEmployeeList" label="适用人员" option-label="EmployeeName"
+          <div class="col-6" style="display:flex;align-items:center;">
+            <q-select filled v-model="SaleIdsArray" style="width:290px;" multiple @filter="filterEmployee" use-input
+              class="q-pb-lg" :options="myEmployeeList" label="适用人员" option-label="EmployeeName"
               option-value="Id" emit-value map-options />
+              <div class="q-gutter-sm q-pb-lg">
+                <q-checkbox v-model="isCheckAll" label="全选" @input='getAllEmployee'/>
+              </div>
           </div>
           <div class="col-6">
               <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.MonthGoalMoney"
@@ -239,6 +242,7 @@
         CourseList: [], //关联课程下拉数据
         saveLoading: false,
         optionTitle: '',
+        isCheckAll: false
       }
     },
     created() {
@@ -249,6 +253,17 @@
       this.initObj()
     },
     methods: {
+      //点击适用人员全选
+      getAllEmployee(){
+        if(this.isCheckAll){
+          this.SaleIdsArray = [];
+          this.employeeList.forEach(x=>{
+            this.SaleIdsArray.push(x.Id);
+          })
+        }else{
+          this.SaleIdsArray = [];
+        }
+      },
       //新增
       addCourse() {
         let obj = {

src/pages/financial/market/empBonus.vue

 <style>
+  .empBonus ._icon_btn i.icon-sousuo,
+  .empBonus ._icon_btn i.icon-add {
+    background-color: #47BF8C;
+  }
+
+  .empBonus ._icon_btn i {
+    width: 26px;
+    height: 26px;
+    display: inline-block;
+    color: white !important;
+    border-radius: 50%;
+    text-align: center;
+    line-height: 26px;
+    margin-right: 10px;
+    cursor: pointer;
+    outline: none;
+  }
 
 </style>
 <template>
@@ -8,10 +25,9 @@
         <div>
           <div class="block" style="display:flex">
             <span style="margin-right: 5px;">选择月份</span>
-            <el-date-picker v-model="value2" type="month" placeholder="选择月">
+            <el-date-picker v-model="StartDate" size="small" value-format="yyyy-MM" type="month" placeholder="选择月">
             </el-date-picker>
-            <q-btn :loading="loading1"  color="primary"  size="11px"  label="生成提成"  @click="createBonus"
-               style="margin-left:10px" />
+            <q-btn color="primary"  size="11px"  label="生成提成"  @click="createBonus"  style="margin-left:10px" />
           </div>
         </div>
       </div>
@@ -34,13 +50,12 @@
               <el-tooltip class="item" effect="dark" content="查看" placement="top">
                 <i class="iconfont icon-sousuo" @click="goUrl(scope.row.Id)"></i>
               </el-tooltip>
-              <el-tooltip class="item" effect="dark" content="制单" placement="top"  >
-                <i class="iconfont icon-add" ></i>
+              <el-tooltip class="item" effect="dark" content="制单" @click="go" placement="top">
+                <i class="iconfont icon-add" @click="generalFinancacls(scope.row)"></i>
               </el-tooltip>
             </div>
           </template>
         </el-table-column>
-
       </el-table>
       <div style="margin-top: 10px;text-align: center;">
         <el-pagination background @current-change="handleCurrentChanges" layout="total,prev, pager, next, jumper"
@@ -48,12 +63,32 @@
         </el-pagination>
       </div>
     </template>
+    <el-dialog title="设置发放用户" width="700px" :visible.sync="costmode" center>
+      <el-table :data="SendEmployeeList" border @selection-change="handleSelectionChange" style="width: 100%">
+        <el-table-column type="selection" width="55" :selectable="checkSelectable"></el-table-column>
+        <el-table-column prop="UserName" label="用户"> </el-table-column>
+        <el-table-column prop="StudentCount" label="客人数量"> </el-table-column>
+        <el-table-column prop="CurrentPeriodMoney" label="应发提成金额"> </el-table-column>
+        <el-table-column prop="IsGiveOut" label="是否已发放">
+          <template slot-scope="scope">
+            <span v-if='scope.row.IsGiveOut==1'>已发放</span>
+            <span v-if='scope.row.IsGiveOut==2'>未发放</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div style="margin-top: 10px;">金额总额：{{totalAmount}}</div>
+      <div slot="footer" class="dialog-footer">
+        <el-button class="hollowFixedBtn" size="small" @click="costmode=false">取消</el-button>
+        <el-button class="normalBtn" size="small" type="primary" @click="preservetransaction()">确定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
   import {
     CreateEmpBonus,
-    queryPersonnelPeriodPage
+    queryPersonnelPeriodPage,
+    getSellAchievementsSendEmployeeList
   } from '../../../api/finance/index'
 
   export default {
@@ -67,32 +102,170 @@
     data() {
       return {
         loading: false,
-        loading1: false,
         //列表数据参数
         msg: {
           PageIndex: 1,
           PageSize: 10,
         },
+        StartDate: '',
         pageCount: 0,
-        total: 0,
         dataList: [],
-        value2: "",
+        iscMaker: false, //是否有制单的权限
+        CheckID: 0,
+        SendEmployeeList: [], //可发放提成的用户列表
+        multipleSelection: [],
+        totalAmount: 0, //选中的金额总额
+        costmode: false,
       }
     },
-    created() {
-    },
+    created() {},
     mounted() {
+      let userinfo = this.getLocalStorage();
+      userinfo.ActionMenuList.map(x => { //判断权限
+        // if (x.FunctionCode == "SAGenerate_Commission") { //判断是否有生成的权限
+        //   this.isgenerate = true;
+        // }
+        // if (x.FunctionCode == "SACommission_maker") { //判断是否有制单的权限
+        //   this.iscMaker = true;
+        // }
+      })
+
       this.getList();
     },
     methods: {
+      //制单
+      generalFinancacls(item) {
+        this.CheckID = item.Id;
+        this.tishi('3.6', this.CheckID);
+      },
+      tishi(Money, Id) {
+        let that = this
+        this.$q.dialog({
+          title: "销售制单",
+          message: "你正在进行所有校区一起制单操作？",
+          persistent: true,
+          cancel: {
+            label: "取消",
+            flat: true
+          },
+          ok: {
+            label: "确认",
+            flat: true,
+            focus: true
+          }
+        }).onOk(() => {
+          this.getcomSendEmployeeList(Id)
+        });
+      },
+      getcomSendEmployeeList(Id) { //获取可发放提成的用户
+        getSellAchievementsSendEmployeeList({
+          PeriodId: Id
+        }).then(res => {
+          this.SendEmployeeList = res.Data;
+          this.costmode = true
+        }).catch(() => {
+
+        })
+      },
+      handleSelectionChange(val) {
+        this.multipleSelection = val;
+        let zong = 0
+        this.multipleSelection.forEach(x => {
+          zong = this.accAdd(zong, x.CurrentPeriodMoney)
+        })
+        this.totalAmount = zong
+      },
+      checkSelectable(row) {
+        return row.IsGiveOut = 2
+      },
+
+      preservetransaction() {
+        let that = this
+        if (this.multipleSelection.length == 0) {
+          this.$q.notify({
+            type: 'negative',
+            position: "top",
+            message: `请选择您要发放的用户`
+          })
+          return
+        }
+        this.$q.dialog({
+          title: "设置用户状态",
+          message: "确认后无法更改用户制单状态，如果需修改请联系管理员",
+          persistent: true,
+          cancel: {
+            label: "取消",
+            flat: true
+          },
+          ok: {
+            label: "确认",
+            flat: true,
+            focus: true
+          }
+        }).onOk(() => {
+          let EmpIds = '';
+          let data = []
+          this.multipleSelection.forEach(x => {
+            data.push(x.UserId)
+          })
+          EmpIds = data.join(',')
+          setSellAchievementsSendEmployee({
+            PeriodId: this.CheckID,
+            EmpIds: EmpIds
+          }).then(res => {
+            this.goaddFinancial(this.totalAmount, this.CheckID, EmpIds)
+            this.$message.success('设置成功');
+          }).catch(() => {
+
+          })
+        });
+      },
+
+      goaddFinancial(Money, Id, EmpIds) {
+        let School_Id = 0;
+
+        let obj = {
+          CostType: 316,
+          Money: Money,
+          CurrencyId: 21,
+          XSTC: 1,
+          School_Id: this.msg.SchoolId == -1 ? 0 : this.msg.SchoolId,
+          OtherType: 51, //业绩提成
+          ReFinanceId: Id,
+          ReFinanceId2: this.msg.SchoolId,
+          EduCommissionEmp: EmpIds
+        }
+        let query = {
+          blank: "y",
+          tab: "新增付款单据",
+          Type: 2,
+          IsUploadPic: 1,
+          Name: '销售提成单',
+          id: 143,
+          orderObj: JSON.stringify(obj)
+        }
+        this.$router.push({
+          path: "/financial/financalDocument/addFinancialDocuments",
+          query
+        });
+      },
+
       //生成提成
       createBonus() {
-        console.log("value2", this.value2);
+        if (this.StartDate) {
+          let msg = {
+            StartDate: this.StartDate + '-01'
+          }
+          CreateEmpBonus(msg).then(res => {
+            if (res.Code == 1) {
+              this.getList();
+            }
+          });
+        }
       },
       //获取分页列表
       getList() {
         queryPersonnelPeriodPage(this.msg).then(res => {
-          console.log("res", res);
           this.dataList = res.Data.PageData
           this.pageCount = res.Data.PageCount;
         });
@@ -102,14 +275,16 @@
         this.getList()
       },
       //跳转详情
-      goUrl(Id){
+      goUrl(Id) {
         this.OpenNewUrl('../market/empBonusDetail', {
           Id: Id
         })
       }
     },
   }
+
 </script>
 <style lang="sass">
   @import url('~assets/css/table.sass')
-</style>
\ No newline at end of file
+
+</style>

src/pages/financial/market/empBonusDetail.vue

 <style>
   .empDetailDiv {
     width: 400px;
-    height: 400px;
+    max-height: 400px;
     overflow: auto;
   }
 </style>
@@ -13,54 +13,65 @@
         <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" label="当月订单人数"> </el-table-column>
-        <el-table-column label="当月奖励金额">
+        <el-table-column prop="CurGuestNum" width="110" label="当月订单人数"> </el-table-column>
+        <el-table-column label="当月奖励金额" width="110">
           <template slot-scope="scope">
-            <el-popover placement="left" title="标题" width="420" trigger="click">
+            <el-popover placement="left" width="420" trigger="click">
               <div class="empDetailDiv">
-                <el-table ref="filterTable" :data="scope.row.DetailList">
+                <el-table ref="filterTable" max-height="300" :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-column prop="OrderStateName" label="订单状态"> </el-table-column>
                 </el-table>
               </div>
-              <el-button slot="reference" size="mini">{{scope.row.CurRewardMoney}}</el-button>
+              <el-button slot="reference" type="success" plain 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="BeforeMoney" width="150" 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 label="已抵扣金额">
+        <el-table-column prop="CreateTime" label="创建时间" width="150"> </el-table-column>
+        <el-table-column prop="CurOrderMoney" width="110" label="当月订单金额"> </el-table-column>
+        <el-table-column prop="DeductionMoney" width="100" label="待抵扣金额">
           <template slot-scope="scope">
-            <el-popover placement="left" title="标题" width="420" trigger="click">
+            <span v-if="scope.row.DeductionMoney>0" style="color:red;">{{scope.row.DeductionMoney}}</span>
+            <span v-else>{{scope.row.DeductionMoney}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="已抵扣金额" width="100">
+          <template slot-scope="scope">
+            <el-popover placement="left" 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 ref="filterTable" max-height="300" :data="scope.row.DeductionList">
+                  <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" 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="是否达标"> </el-table-column>
-        <el-table-column label="日志">
+        <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>
+        </el-table-column>
+        <el-table-column label="日志" width="110">
           <template slot-scope="scope">
-            <el-popover placement="left" title="标题" width="420" trigger="click">
+            <el-popover placement="left" width="420" trigger="click">
               <div class="empDetailDiv">
-                <el-table ref="filterTable" :data="scope.row.BonusLogList">
+                <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>
-              <el-button slot="reference" size="mini">日志信息</el-button>
+              <el-button slot="reference" type="success" plain size="mini">日志信息</el-button>
             </el-popover>
           </template>
         </el-table-column>