业绩规则2

935090232@qq.com

2021-06-03 10f78f85875f539590a757f7c17992c6c0ae0773

业绩规则2

 zq-erp/src/main/java/com/matrix/system/hiveErp/action/AchieveRuleAction.java

@@ -15,7 +15,6 @@
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.AchieveRule;
import com.matrix.system.hive.dao.AchieveRuleDao;
import com.matrix.system.hive.plugin.util.CollectionUtils;
import com.matrix.system.hiveErp.pojo.AchieveRuleItem;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -46,11 +45,8 @@
    @PostMapping("/add")
    public AjaxResult add(@RequestBody @Validated AchieveRule achieveRule) {

        WebUtil.setSessionAttribute(MatrixConstance.LOGIN_KEY,sysUsersDao.selectById(2L));

        if(CollectionUtils.isEmpty(achieveRule.getRuleItemList())){
            return AjaxResult.buildFailInstance("规则设置不能为空");
        }

        String rules = JSONUtil.toJsonStr(achieveRule.getRuleItemList());
        achieveRule.setRules(rules);

@@ -72,14 +68,11 @@
     */
    @PostMapping("/update")
    public AjaxResult update(@RequestBody @Validated AchieveRule achieveRule) {
        WebUtil.setSessionAttribute(MatrixConstance.LOGIN_KEY,sysUsersDao.selectById(2L));

        if (achieveRule.getId() == null) {
            return AjaxResult.buildFailInstance("id不能为空");
        }

        if(CollectionUtils.isEmpty(achieveRule.getRuleItemList())){
            return AjaxResult.buildFailInstance("规则设置不能为空");
        }
        String rules = JSONUtil.toJsonStr(achieveRule.getRuleItemList());
        achieveRule.setRules(rules);

@@ -111,7 +104,7 @@
     */
    @PostMapping("/selectList")
    public AjaxResult selectList(@RequestBody BasePageQueryDto pageDto) {
        WebUtil.setSessionAttribute(MatrixConstance.LOGIN_KEY,sysUsersDao.selectById(2L));

        SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        Page<AchieveRule> page = new Page<>(pageDto.getPageNum(), pageDto.getPageSize());
        LambdaQueryWrapper<AchieveRule> lambdaQueryWrapper = new LambdaQueryWrapper<AchieveRule>()

 zq-erp/src/main/resources/templates/views/admin/hive-erp/products/achieverule-list.html

@@ -15,21 +15,24 @@
    <link th:href="@{/css/styleOne/style.min.css}" rel="stylesheet" type="text/css"/>
    <title></title>
    <style>
        .panel-body{
        .panel-body {
            overflow: hidden;
        }
        .buttonPanel{

        .buttonPanel {
            background: #ffffff;
            padding: 10px 10px ;
            padding: 10px 10px;
            margin: 0px 0px 10px 0px;
        }
        .rowPanel{

        .rowPanel {
            background: #ffffff;
            padding: 0px 10px ;
            padding: 0px 10px;
            padding-top: 10px;
            margin: 0px 0px 10px 0px;
        }
        .paginationStyle{

        .paginationStyle {
            background: #ffffff;
            padding: 10px 10px;
            margin: 0px 0px 10px 0px;
@@ -41,22 +44,22 @@
<div class="panel-body" id="app">

    <el-row class="buttonPanel">
            <el-button @click="dialogVisible = true" type="primary" >新增</el-button>
        <el-button @click="openAdd" type="primary">新增</el-button>
    </el-row>

    <el-row class="rowPanel"  >
        <el-form ref="form" :model="form" inline >
    <el-row class="rowPanel">
        <el-form ref="form" :model="form" inline>
            <el-form-item label="规则名称" prop="queryKey">
                <el-input v-model="form.keyword" placeholder="请输入规则名称"></el-input>
            </el-form-item>
            <el-button type="primary" @click="search" >搜索</el-button>
            <el-button type="primary" @click="search">搜索</el-button>
            <el-button @click="resetForm('form')">重置</el-button>
        </el-form>
    </el-row>

    <el-row class="table-style"  >
    <el-row class="table-style">

        <el-table id="proj" :data="table.rows"  :height="height" stripe @sort-change="sortChange">
        <el-table id="proj" :data="table.rows" :height="height" stripe @sort-change="sortChange">
            <el-table-column
                    prop="name"
                    label="规则名称"
@@ -88,12 +91,13 @@

            <el-table-column label="操作">
                <template slot-scope="scope">
                    <el-button type="text" @click="openModify(scope.$index, scope.row)" size="small">修改</el-button>
                    <el-button type="text" @click="remove(scope.$index, scope.row)" size="small">删除</el-button>
                </template>
            </el-table-column>
        </el-table>
    </el-row>
    <el-row class="paginationStyle"  >
    <el-row class="paginationStyle">
        <el-pagination background
                       @size-change="changePageSize"
                       @current-change="changeCurrentPage"
@@ -106,9 +110,9 @@
    </el-row>

    <el-dialog
            title="提示"
            title="title"
            :visible.sync="dialogVisible"
            width="30%"
            width="60%"
            :before-close="handleClose">
        <span>这是一段信息</span>
        <span slot="footer" class="dialog-footer">
@@ -132,29 +136,51 @@
    var vue = new Vue({
        el: '#app',
        data: {
            table:{
                rows:[],
                total:0,
                pageSize:10,
                currentPage:1,
            table: {
                rows: [],
                total: 0,
                pageSize: 10,
                currentPage: 1,
            },
            form:{
                name:null,
                datetimeArr:'',
                payMethod:'',
                flowType:'',
                orderNo:'',
                oprationMan:'',
                queryKey:'',
                order:'',
                sort:''
            form: {
                queryKey: null,
            },
            height:'calc(100vh - 240px)',
            dialogVisible:false,

            height: 'calc(100vh - 240px)',
            dialogVisible: false,
            title: '',
            formData: {
                name: '',
                ruleItemList: [this.defaultRuleItem]
            },
            defaultRuleItem: {
                achieveType: 1,
                calculationType: 1,
                Lower: '',
                upper: '',
                achieve: '',
            },
            type: '',
            achieveTypeList: [{
                label: '本金消耗',
                value: 1
            }
                , {
                    label: '赠送消耗',
                    value: 2
                }],
            calculationTypeList: [
                {
                label: '固定值',
                value: 1
                }
                , {
                    label: '百分比',
                    value: 2
                }]
        },
        created: function () {
           this.loadData();
            this.loadData();
            window.addEventListener("keydown", this.keydown);
        },
        methods: {
@@ -169,50 +195,50 @@
            resetForm(formName) {
                this.$refs[formName].resetFields();
            },
            sortChange:function (column){
                if(column.order){
                    if(column.order.indexOf("desc")){
                        this.form.order="desc";
                    }else{
                        this.form.order="asc";
            sortChange: function (column) {
                if (column.order) {
                    if (column.order.indexOf("desc")) {
                        this.form.order = "desc";
                    } else {
                        this.form.order = "asc";
                    }
                    this.form.sort=column.prop;
                    this.form.sort = column.prop;
                    this.loadData();
                }
            },
            loadData:function(){
            loadData: function () {
                let _this = this;
                let data=_this.getRequestParam();
                data.pageSize=_this.table.pageSize;
                data.pageNum=_this.table.currentPage;
                let data = _this.getRequestParam();
                data.pageSize = _this.table.pageSize;
                data.pageNum = _this.table.currentPage;
                AjaxProxy.requst({
                    app: _this,
                    data:data,
                    data: data,
                    url: basePath + '/admin/achieveRule/selectList',
                    callback: function (data) {
                        _this.table.rows = data.rows;
                        _this.table.total=data.total;
                        _this.table.total = data.total;
                    }
                });
            },
            getRequestParam(){
            getRequestParam() {
                let _this = this;
                return   {
                    name:_this.form.name,
                return {
                    queryKey: _this.form.queryKey,
                }
            },
            search:function(){
                this.table.currentPage=1;
            search: function () {
                this.table.currentPage = 1;
                this.loadData();
            },
            keydown(evt){
                if(evt.keyCode==13) {
            keydown(evt) {
                if (evt.keyCode == 13) {
                    this.search();
                }
            },

            del(index,row){
                let _this=this;
            remove(index, row) {
                let _this = this;
                this.$confirm('确认删除该规则吗?', '提示', {
                    confirmButtonText: '确定',
                    cancelButtonText: '取消',
@@ -220,12 +246,14 @@
                }).then(() => {
                    AjaxProxy.requst({
                        app: _this,
                        url: basePath + "/admin/achieveRule/removeById/"+row.id,
                        type: 'GET',
                        url: basePath + "/admin/achieveRule/removeById/" + row.id,
                        callback: function (data) {
                            _this.$message({
                                type: 'success',
                                message: '删除成功!'
                                message: data.info,
                            });
                            debugger
                            _this.loadData();
                        }
                    });
@@ -236,12 +264,32 @@
                    });
                });
            },
            //导出
          add(){
            //开启表单弹窗
            openForm(type, data) {

            }
                if (type == 'add') {
                    this.title = '新增规则';
                    this.$refs['formName'].resetFields();
                } else {
                    this.title = '修改规则';
                    this.formData = data;
                }
                this.type = type;
                this.dialogVisible = true;
            },
            //提交表单
            submit() {
                let url = basePath + "/admin/achieveRule/add";
                if (this.type == 'modify') {
                    url = basePath + "/admin/achieveRule/update";
                }


            },


        }

    });



 zq-erp/src/main/resources/templates/views/admin/hive/products/achieverule-list.html

File was deleted