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

src/api/finance/index.js

@@ -184,5 +184,24 @@ export function getSaleAchievementsRankStatistics(data) {
   });
 }
 
+//  获取可发放提成的用户
+export function getSellCommissionSendEmployeeList(data) {
+  return request({
+    url: '/SellCommission/GetSellCommissionSendEmployeeList',
+    method: 'post',
+    data
+  });
+}
+
+//  设置用户已发
+export function setSellCommissionSendEmployee(data) {
+  return request({
+    url: '/SellCommission/SetSellCommissionSendEmployee',
+    method: 'post',
+    data
+  });
+}
+
+
 
 

src/components/sale/orderlist.vue

@@ -297,13 +297,13 @@
                 <span @click="isShowPop=true">查看合同</span>
                 <q-popup-proxy v-if="isShowPop">
                   <q-banner>
-                    <div style="width: 520px;max-height:220px;overflow:auto;">
+                    <div style="width: 550px;max-height:220px;overflow:auto;">
                       <table class="Contract_Table">
                         <tr>
                           <th>姓名</th>
                           <th style="width:180px;">合同编号</th>
                           <th>状态</th>
-                          <th width="170px;">操作</th>
+                          <th width="200px;">操作</th>
                         </tr>
                         <tr v-for="subItem in item.GuestList">
                           <td>{{subItem.GuestName}}</td>
@@ -316,6 +316,7 @@
                             </template>
                             <template v-else>
                               <q-btn color="secondary" size="sm" @click="goContractMannage(subItem)" label="查看合同" />
+                              <q-btn style="margin-left:5px;" v-if="subItem.ContractStatus==0" color="purple" size="sm" @click="goContractAudit(subItem)" label="提交审核" />
                             </template>
                           </td>
                         </tr>
@@ -814,7 +815,8 @@
     queryEmployee //员工列表
   } from '../../api/users/user'
   import {
-    SetOrderReceiveContract //领取合同
+    SetOrderReceiveContract, //领取合同
+    SetEducationContractAudit
   } from '../../api/sale/contract'
 
   export default {
@@ -1333,6 +1335,25 @@
         this.OpenNewUrl("/financial/cycleOrderList", {
           OrderId: OrderId
         });
+      },
+      //合同提交审核
+      goContractAudit(subItem){
+         let msg = {
+          ContractId: subItem.ContractId,
+          State: 1
+        }
+        SetEducationContractAudit(msg).then(res => {
+          if (res.Code == 1) {
+            this.$q.notify({
+              icon: 'iconfont icon-chenggong',
+              color: 'accent',
+              timeout: 2000,
+              message: '修改成功！',
+              position: 'top'
+            })
+            this.$emit('success');
+          }
+        })
       }
     }
   }

src/pages/financial/salesCommission.vue

@@ -116,6 +116,31 @@
         </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" @click="costmode=false">取消</el-button>
+          <el-button class="normalBtn" type="primary" @click="preservetransaction()">确定</el-button>
+        </div>
+      </el-dialog>
       
     </div>
   </template>
@@ -129,7 +154,9 @@
     import{
       getSellCommissionPeriodsPageList,
         setSellCommissionRule,
-        setSellCommissionInfo
+        setSellCommissionInfo,
+        getSellCommissionSendEmployeeList,
+        setSellCommissionSendEmployee
     } from '../../api/finance/index'
     export default {
       meta: {
@@ -157,7 +184,11 @@
           CompanyList:[],
           isgenerate:false,//是否有生成的权限
           iscMaker:false,//是否有制单的权限
-
+          SendEmployeeList:[],//可发放提成的用户列表
+          costmode:false,
+          multipleSelection:[],
+          totalAmount:0,//选中的金额总额
+          CheckID:0,
         }
       },
       created() {
@@ -232,6 +263,7 @@
             });
         },
         generalFinancacls(item) {
+          this.CheckID = item.Id
           if(this.msg.SchoolId == -1){
               if(item.SumPrice>0){
                 this.tishi(item.SumPrice,item.Id)
@@ -291,13 +323,63 @@
                     focus: true
                   }
                 }).onOk(() => {
-                  this.goaddFinancial(Money,Id)
+                  // this.goaddFinancial(Money,Id)
+                  this.getcomSendEmployeeList(Id)
                 });
         },
+        getcomSendEmployeeList(Id){//获取可发放提成的用户
+          getSellCommissionSendEmployeeList({PeriodId:Id}).then(res => {
+            this.SendEmployeeList = res.Data.Data;
+            this.costmode = true
+          }).catch(() => {
+
+          })
+        },
         handleCurrentChanges(val){
           this.msg.PageIndex= val;
           this.getList()
         },
+        checkSelectable(row){
+          return row.showInventoryNum==2
+        },
+        handleSelectionChange(val) {
+          this.multipleSelection = val;
+          let zong = 0
+          this.multipleSelection.forEach(x=>{
+            zong +=x.CurrentPeriodMoney
+          })
+          this.totalAmount = zong
+        },
+        preservetransaction(){
+          let that = this
+          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(',')
+            setSellCommissionSendEmployee({PeriodId:this.CheckID,EmpIds:EmpIds}).then(res => {
+                this.goaddFinancial(this.totalAmount,this.CheckID)
+                this.$message.success('设置成功');
+            }).catch(() => {
+
+            })
+          });
+        }
      
       
       },