修正租户id为Long问题

src/api/school/salary/commissionPlans.js

@@ -0,0 +1,25 @@
+import request from '@/utils/request'
+
+export function list(data) {
+  return request({
+    url: '/commissionPlans/list',
+    method: 'post',
+    data: data
+  })
+}
+
+export function saveOrEdit(data) {
+  return request({
+    url: '/commissionPlans/saveOrEdit',
+    method: 'post',
+    data: data
+  })
+}
+
+export function remove(data) {
+  return request({
+    url: '/commissionPlans/remove',
+    method: 'get',
+    params: data
+  })
+}

src/components/sc/course/cla/changeCla.vue

@@ -7,7 +7,7 @@
             <el-form-item label="选择课程:" prop="courseId">
               <el-button v-if="chooseCourseInfo.courseId === undefined" type="primary" plain icon="el-icon-reading" size="small" @click="chooseCourse">选择课程</el-button>
               <el-input v-else v-model="chooseCourseInfo.courseName" disabled readonly>
-                <el-button v-if="chooseCourseInfo.courseId !== undefined && canChangeCourse" slot="append" icon="el-icon-reading" @click="chooseCourse">重选</el-button>
+                <el-button v-if="canChangeCourse" slot="append" icon="el-icon-reading" @click="chooseCourse">重选</el-button>
               </el-input>
             </el-form-item>
           </el-col>

src/main.js

@@ -46,6 +46,8 @@ import DictRadio from '@/components/DictRadio'
 import DictSelect from '@/components/DictSelect'
 
 import InBody from '@/components/InBody/InBody.vue'
+import {dictTypeDataListByParentValue, getDictListByDictType} from "@/api/school/system/dict/data";
+import {downExportFile} from "@/utils/commonUtils";
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts
 Vue.prototype.getConfigKey = getConfigKey
@@ -61,6 +63,12 @@ Vue.prototype.addDateRange3 = addDateRange3
 Vue.prototype.getHiddenName = getHiddenName
 Vue.prototype.getHiddenDetailAddress = getHiddenDetailAddress
 
+Vue.prototype.getDictListByDictType = getDictListByDictType
+Vue.prototype.dictTypeDataListByParentValue = dictTypeDataListByParentValue
+
+Vue.prototype.downExportFile = downExportFile
+
+
 Vue.prototype.msgSuccess = function(msg) {
   this.$message({ showClose: true, message: msg, type: 'success' })
 }

src/views/school/salary/commission_plans/index.vue

@@ -0,0 +1,266 @@
+<template>
+  <div class="app-container">
+    <el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
+      <el-form-item label="方案名称" prop="planName">
+        <el-input v-model="queryParams.planName" placeholder="请输入所属校区" />
+      </el-form-item>
+      <el-form-item label="是否生效" prop="isActive">
+        <el-select v-model="queryParams.isActive" filterable placeholder="请选择">
+          <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column prop="planName" label="方案名称" />
+      <el-table-column prop="tier1Threshold" label="第一阶梯阈值" />
+      <el-table-column prop="tier1Rate" label="第一阶梯比例" />
+      <el-table-column prop="tier2Threshold" label="第二阶梯阈值" />
+      <el-table-column prop="tier2Rate" label="第二阶梯比例" />
+      <el-table-column prop="tier3Threshold" label="第三阶梯阈值" />
+      <el-table-column prop="tier3Rate" label="第三阶梯比例" />
+      <el-table-column prop="tier4Rate" label="第四阶梯比例" />
+      <el-table-column prop="renewalRate" label="续费率" />
+      <el-table-column prop="referralRate" label="转介绍率" />
+      <el-table-column prop="isActive" label="是否生效" />
+      <el-table-column prop="effectiveDate" label="生效日期" />
+      <el-table-column width="150" label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit-outline" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList"/>
+
+    <!-- 添加或修改对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="770px">
+      <el-form ref="form" v-loading="loadingChange" :model="form" label-width="120px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="方案名称:" prop="planName">
+              <el-input v-model="form.planName" placeholder="请输入方案名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="第一阶梯阈值:" prop="tier1Threshold">
+              <el-input v-model="form.tier1Threshold" placeholder="第一阶梯阈值(0-?元)" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="第一阶梯比例:" prop="tier1Rate">
+              <el-input v-model="form.tier1Rate" placeholder="第一阶梯比例(8%)" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="第二阶梯阈值:" prop="tier2Threshold">
+              <el-input v-model="form.tier2Threshold" placeholder="第二阶梯阈值(0-?元)" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="第二阶梯比例:" prop="tier2Rate">
+              <el-input v-model="form.tier2Rate" placeholder="第二阶梯比例(8%)" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="第三阶梯阈值:" prop="tier3Threshold">
+              <el-input v-model="form.tier3Threshold" placeholder="第三阶梯阈值(0-?元)" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="第三阶梯比例:" prop="tier3Rate">
+              <el-input v-model="form.tier3Rate" placeholder="第三阶梯比例(8%)" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="第四阶梯比例:" prop="tier4Rate">
+              <el-input v-model="form.tier4Rate" placeholder="第四阶梯比例(8%)" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="续费率:" prop="renewalRate">
+              <el-input v-model="form.renewalRate" placeholder="续费率(5%)" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="转介绍率:" prop="referralRate">
+              <el-input v-model="form.tier1Threshold" placeholder="转介绍率(8-10%)" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否生效:" prop="isActive">
+              <el-select v-model="form.isActive" filterable placeholder="请选择">
+                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="生效日期:" prop="referralRate">
+              <el-date-picker
+                v-model="form.effectiveDate"
+                :format="dateFormat"
+                :valueFormat="dateFormat"
+                type="date"
+                placeholder="选择日期" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="loadingChange" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { list, saveOrEdit, remove } from '@/api/school/salary/commissionPlans'
+export default {
+  name: 'Room',
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      loadingChange: false,
+      // 总条数
+      total: 0,
+      // 表格树数据
+      dataList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        planName:'',
+        isActive:1,
+      },
+      // 表单参数
+      dateFormat:'yyyy/MM/dd',
+      form: {
+        planName:'',
+        tier1Threshold:null,
+        tier1Rate:null,
+        tier2Threshold:null,
+        tier2Rate:null,
+        tier3Threshold:null,
+        tier3Rate:null,
+        tier4Rate:null,
+        renewalRate:null,
+        referralRate:null,
+        isActive:1,
+        effectiveDate:'',
+      },
+      options:[
+        {label:'生效',value:1},
+        {label:'未生效',value:0},
+      ]
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    getList() {
+      this.loading = true
+      list(this.queryParams).then(response => {
+        this.dataList = response.data.rows
+        this.total = response.data.total
+        this.loading = false
+      }).catch(() => {
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        planName:'',
+        tier1Threshold:null,
+        tier1Rate:null,
+        tier2Threshold:null,
+        tier2Rate:null,
+        tier3Threshold:null,
+        tier3Rate:null,
+        tier4Rate:null,
+        renewalRate:null,
+        referralRate:null,
+        isActive:1,
+        effectiveDate:new Date().getDate(),
+      }
+      this.resetForm('form')
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.reset()
+      this.open = true
+      this.title = '添加佣金方案'
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      this.form = row
+      this.open=true
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.loadingChange = true
+      saveOrEdit(this.form).then(response => {
+        this.loadingChange = false
+        this.msgSuccess(response.msg)
+        this.open = false
+        this.getList()
+      }).catch((response) => {
+        this.msgError(response.msg)
+        this.loadingChange = false
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const id = row.roomId || this.ids
+      this.$confirm('是否确认删除?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(function() {
+        return remove({id:id})
+      }).then((response) => {
+        if (response.respCode === 200) {
+          this.getList()
+          this.msgSuccess('删除成功')
+        } else {
+          this.msgError(response.respMsg)
+        }
+      }).catch(function() {})
+    }
+  }
+}
+</script>

src/views/school/salary/comps/CalTime.vue

@@ -10,14 +10,17 @@
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">设置课时提成</el-button>
       </el-form-item>
     </el-form>
 
     <el-table v-loading="loading" :data="dataList">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column prop="name" label="薪资配置名称" />
+      <el-table-column prop="name" label="开课校区" />
-      <el-table-column prop="salary" label="薪资金额(元)" />
+      <el-table-column prop="salary" label="课程名称" />
+      <el-table-column prop="salary" label="收费类型" />
+      <el-table-column prop="salary" label="收费模式" />
+      <el-table-column prop="salary" label="提成设置(元)" />
       <el-table-column width="150" label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit-outline" @click="handleUpdate(scope.row)">修改</el-button>