业绩规则1

935090232@qq.com

2021-06-03 cfb8dfcae63e6706d088201aed486d2dbf5014a9

业绩规则1

 zq-erp/src/main/java/com/matrix/system/hive/bean/ShoppingGoods.java

@@ -439,10 +439,24 @@
    private Long achieveRuleId;

    /**
     *业绩规则名称
     */
    @Extend
    private String achieveRuleName;

    /**
     * 支付方式 1-充值本金 2-赠送金额 3-积分
     */
    private String payMethods;

    public String getAchieveRuleName() {
        return achieveRuleName;
    }

    public void setAchieveRuleName(String achieveRuleName) {
        this.achieveRuleName = achieveRuleName;
    }

    public Long getAchieveRuleId() {
        return achieveRuleId;
    }

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

@@ -110,7 +110,7 @@
     * @return
     */
    @PostMapping("/selectList")
    public AjaxResult removeById(@RequestBody BasePageQueryDto pageDto) {
    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());
@@ -129,5 +129,8 @@
        return result;
    }


    @PostMapping("/selectListForm")
    public AjaxResult selectListForm(BasePageQueryDto pageDto) {
        return selectList(pageDto);
    }
}

 zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml

@@ -85,6 +85,8 @@

        <result property="goodsSortName" column="goodsSortName" />

        <result property="achieveRuleName" column="achieveRuleName" />


        <result property="payMethods" column="pay_methods" />
        <result property="invalidTime" column="invalid_time" />
@@ -167,6 +169,8 @@
        <!-- 扩展属性 -->
        <result property="cateName" column="cate_name" />
        <result property="goodsSortName" column="goodsSortName" />
        <result property="achieveRuleName" column="achieveRuleName" />


    </resultMap>

@@ -586,8 +590,9 @@
    <select id="selectInPage" resultMap="ShoppingGoodsMap">
        select
        a.*,
        (select TYPE_NAME from sys_goods_type b where b.id=a.goods_sort_id) goodsSortName,
        (select NAME from shopping_goods_category t where t.id=a.cate_id) cate_name,
        (select name from achieve_rule f where f.id=a.achieve_rule_id) as achieveRuleName,
        (select TYPE_NAME from sys_goods_type b where b.id=a.goods_sort_id) as  goodsSortName,
        (select NAME from shopping_goods_category t where t.id=a.cate_id) as cate_name,
        (select  shop_name from  sys_shop_info h where  a.SHOP_ID=h.ID ) as shop_name
        from shopping_goods a
        where 1=1
@@ -662,6 +667,11 @@
            </if>


            <if test="record.achieveRuleId != null and record.achieveRuleId !='' ">
                and achieve_rule_id = #{record.achieveRuleId}
            </if>



            <if test="record.headquarters != null and record.headquarters !='' ">
                and headquarters = #{record.headquarters}
@@ -728,7 +738,9 @@
            <if test="record.isVipCar != null and record.isVipCar !='' ">
                and is_vip_car = #{record.isVipCar}
            </if>

            <if test="record.achieveRuleId != null and record.achieveRuleId !='' ">
                and achieve_rule_id = #{record.achieveRuleId}
            </if>

            <if test="record.isCourse != null and record.isCourse !=''">
                and is_course = #{record.isCourse}
@@ -773,6 +785,7 @@
    <select id="selectAll" resultMap="ShoppingGoodsSimpleMap">
        select
        *,
        (select name from achieve_rule f where f.id=a.achieve_rule_id) as achieveRuleName,
        (select TYPE_NAME from sys_goods_type b where b.id=a.goods_sort_id) goodsSortName,
        (select NAME from
        shopping_goods_category t where t.id=cate_id)
@@ -878,6 +891,7 @@
    <select id="findByCode" resultMap="ShoppingGoodsMap">
        select
        *,
        (select name from achieve_rule f where f.id=a.achieve_rule_id) as achieveRuleName,
        (select TYPE_NAME from sys_goods_type b where b.id=a.goods_sort_id) goodsSortName,
        (select NAME from shopping_goods_category t where
        t.id=cate_id)
@@ -890,6 +904,7 @@
    <select id="selectSimpleMapById" resultMap="ShoppingGoodsSimpleMap">
        select
        *,
        (select name from achieve_rule f where f.id=a.achieve_rule_id) as achieveRuleName,
        (select TYPE_NAME from sys_goods_type b where b.id=a.goods_sort_id) goodsSortName,
        (select NAME from
        shopping_goods_category t where t.id=cate_id)
@@ -909,6 +924,7 @@
    <select id="selectByModel" resultMap="ShoppingGoodsMap">
        select
        *,
        (select name from achieve_rule f where f.id=a.achieve_rule_id) as achieveRuleName,
        (select TYPE_NAME from sys_goods_type b where b.id=a.goods_sort_id) goodsSortName,
        (select NAME from
        shopping_goods_category t where t.id=cate_id)
@@ -988,6 +1004,7 @@
    <select id="selectByModel1" resultMap="ShoppingGoodsMap">
        select
        *,
        (select name from achieve_rule f where f.id=a.achieve_rule_id) as achieveRuleName,
        (select TYPE_NAME from sys_goods_type b where b.id=a.goods_sort_id) goodsSortName,
        (select NAME from
        shopping_goods_category t where t.id=cate_id)
@@ -1066,6 +1083,7 @@
    <select id="selectInPageNoTaocan" resultMap="ShoppingGoodsMap">
        select
        *,
        (select name from achieve_rule f where f.id=a.achieve_rule_id) as achieveRuleName,
        (select TYPE_NAME from sys_goods_type b where b.id=a.goods_sort_id) goodsSortName,
        (select NAME from
        shopping_goods_category t where t.id=cate_id)

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

New file
@@ -0,0 +1,250 @@
<!DOCTYPE HTML>
<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
<head>
    <meta charset="utf-8">
    <META HTTP-EQUIV="Pragma" CONTENT="no-cache">
    <meta name="renderer" content="webkit|ie-comp|ie-stand">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport"
          content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
    <meta http-equiv="Cache-Control" content="no-siteapp"/>
    <LINK rel="Bookmark" href="../images/favicon.ico">
    <!-- 本框架基本脚本和样式 -->
    <script type="text/javascript" th:src="@{/js/systools/MBaseVue.js}"></script>
    <link rel="stylesheet" th:href="@{/plugin/element-ui/index.css}">
    <link th:href="@{/css/styleOne/style.min.css}" rel="stylesheet" type="text/css"/>
    <title></title>
    <style>
        .panel-body{
            overflow: hidden;
        }
        .buttonPanel{
            background: #ffffff;
            padding: 10px 10px ;
            margin: 0px 0px 10px 0px;
        }
        .rowPanel{
            background: #ffffff;
            padding: 0px 10px ;
            padding-top: 10px;
            margin: 0px 0px 10px 0px;
        }
        .paginationStyle{
            background: #ffffff;
            padding: 10px 10px;
            margin: 0px 0px 10px 0px;
            text-align: right;
        }
    </style>
</head>
<body>
<div class="panel-body" id="app">

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

    <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 @click="resetForm('form')">重置</el-button>
        </el-form>
    </el-row>

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

        <el-table id="proj" :data="table.rows"  :height="height" stripe @sort-change="sortChange">
            <el-table-column
                    prop="name"
                    label="规则名称"
                    width="180">
            </el-table-column>
            <el-table-column
                    prop="updateTime"
                    sortable="custom"
                    label="修改时间"
                    show-overflow-tooltip
                    width="180">
            </el-table-column>
            <el-table-column
                    prop="updateBy"
                    label="修改人">
            </el-table-column>

            <el-table-column
                    prop="createTime"
                    sortable="custom"
                    label="创建时间"
                    show-overflow-tooltip
                    width="180">
            </el-table-column>
            <el-table-column
                    prop="createBy"
                    label="创建人">
            </el-table-column>

            <el-table-column label="操作">
                <template slot-scope="scope">
                    <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-pagination background
                       @size-change="changePageSize"
                       @current-change="changeCurrentPage"
                       :current-page="table.currentPage"
                       :page-sizes="[10, 20, 30, 50]"
                       :page-size="table.pageSize"
                       layout="total, sizes, prev, pager, next, jumper"
                       :total="table.total">
        </el-pagination>
    </el-row>

    <el-dialog
            title="提示"
            :visible.sync="dialogVisible"
            width="30%"
            :before-close="handleClose">
        <span>这是一段信息</span>
        <span slot="footer" class="dialog-footer">
    <el-button @click="dialogVisible = false">取 消</el-button>
    <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
  </span>
    </el-dialog>


</div>
</body>
<script type="text/javascript" th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
<script type="text/javascript" th:src="@{/js/plugin/jquery.query.js}"></script>
<script type="text/javascript" th:src="@{/plugin/layer/layer.js}"></script>
<script type="text/javascript" th:src="@{/js/systools/AjaxProxyVue.js}"></script>
<script type="text/javascript" th:src="@{/js/plugin/vue.js}"></script>
<script type="text/javascript" th:src="@{/plugin/element-ui/index.js}"></script>
<script type="text/javascript" th:src="@{/plugin/moment.min.js}"></script>
<script type="text/javascript" th:inline="javascript">

    var vue = new Vue({
        el: '#app',
        data: {
            table:{
                rows:[],
                total:0,
                pageSize:10,
                currentPage:1,
            },
            form:{
                name:null,
                datetimeArr:'',
                payMethod:'',
                flowType:'',
                orderNo:'',
                oprationMan:'',
                queryKey:'',
                order:'',
                sort:''
            },
            height:'calc(100vh - 240px)',
            dialogVisible:false,

        },
        created: function () {
           this.loadData();
            window.addEventListener("keydown", this.keydown);
        },
        methods: {
            changePageSize(val) {
                this.table.pageSize = val;
                this.loadData();
            },
            changeCurrentPage(val) {
                this.table.currentPage = val;
                this.loadData();
            },
            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";
                    }
                    this.form.sort=column.prop;
                    this.loadData();
                }
            },
            loadData:function(){
                let _this = this;
                let data=_this.getRequestParam();
                data.pageSize=_this.table.pageSize;
                data.pageNum=_this.table.currentPage;
                AjaxProxy.requst({
                    app: _this,
                    data:data,
                    url: basePath + '/admin/achieveRule/selectList',
                    callback: function (data) {
                        _this.table.rows = data.rows;
                        _this.table.total=data.total;
                    }
                });
            },
            getRequestParam(){
                let _this = this;
                return   {
                    name:_this.form.name,
                }
            },
            search:function(){
                this.table.currentPage=1;
                this.loadData();
            },
            keydown(evt){
                if(evt.keyCode==13) {
                    this.search();
                }
            },

            del(index,row){
                let _this=this;
                this.$confirm('确认删除该规则吗?', '提示', {
                    confirmButtonText: '确定',
                    cancelButtonText: '取消',
                    type: 'warning'
                }).then(() => {
                    AjaxProxy.requst({
                        app: _this,
                        url: basePath + "/admin/achieveRule/removeById/"+row.id,
                        callback: function (data) {
                            _this.$message({
                                type: 'success',
                                message: '删除成功!'
                            });
                            _this.loadData();
                        }
                    });
                }).catch(() => {
                    this.$message({
                        type: 'info',
                        message: '已取消删除'
                    });
                });
            },
            //导出
          add(){

            }

        }
    });


</script>
</body>
</html>

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

New file
@@ -0,0 +1,250 @@
<!DOCTYPE HTML>
<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
<head>
    <meta charset="utf-8">
    <META HTTP-EQUIV="Pragma" CONTENT="no-cache">
    <meta name="renderer" content="webkit|ie-comp|ie-stand">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport"
          content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
    <meta http-equiv="Cache-Control" content="no-siteapp"/>
    <LINK rel="Bookmark" href="../images/favicon.ico">
    <!-- 本框架基本脚本和样式 -->
    <script type="text/javascript" th:src="@{/js/systools/MBaseVue.js}"></script>
    <link rel="stylesheet" th:href="@{/plugin/element-ui/index.css}">
    <link th:href="@{/css/styleOne/style.min.css}" rel="stylesheet" type="text/css"/>
    <title></title>
    <style>
        .panel-body{
            overflow: hidden;
        }
        .buttonPanel{
            background: #ffffff;
            padding: 10px 10px ;
            margin: 0px 0px 10px 0px;
        }
        .rowPanel{
            background: #ffffff;
            padding: 0px 10px ;
            padding-top: 10px;
            margin: 0px 0px 10px 0px;
        }
        .paginationStyle{
            background: #ffffff;
            padding: 10px 10px;
            margin: 0px 0px 10px 0px;
            text-align: right;
        }
    </style>
</head>
<body>
<div class="panel-body" id="app">

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

    <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 @click="resetForm('form')">重置</el-button>
        </el-form>
    </el-row>

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

        <el-table id="proj" :data="table.rows"  :height="height" stripe @sort-change="sortChange">
            <el-table-column
                    prop="name"
                    label="规则名称"
                    width="180">
            </el-table-column>
            <el-table-column
                    prop="updateTime"
                    sortable="custom"
                    label="修改时间"
                    show-overflow-tooltip
                    width="180">
            </el-table-column>
            <el-table-column
                    prop="updateBy"
                    label="修改人">
            </el-table-column>

            <el-table-column
                    prop="createTime"
                    sortable="custom"
                    label="创建时间"
                    show-overflow-tooltip
                    width="180">
            </el-table-column>
            <el-table-column
                    prop="createBy"
                    label="创建人">
            </el-table-column>

            <el-table-column label="操作">
                <template slot-scope="scope">
                    <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-pagination background
                       @size-change="changePageSize"
                       @current-change="changeCurrentPage"
                       :current-page="table.currentPage"
                       :page-sizes="[10, 20, 30, 50]"
                       :page-size="table.pageSize"
                       layout="total, sizes, prev, pager, next, jumper"
                       :total="table.total">
        </el-pagination>
    </el-row>

    <el-dialog
            title="提示"
            :visible.sync="dialogVisible"
            width="30%"
            :before-close="handleClose">
        <span>这是一段信息</span>
        <span slot="footer" class="dialog-footer">
    <el-button @click="dialogVisible = false">取 消</el-button>
    <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
  </span>
    </el-dialog>


</div>
</body>
<script type="text/javascript" th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
<script type="text/javascript" th:src="@{/js/plugin/jquery.query.js}"></script>
<script type="text/javascript" th:src="@{/plugin/layer/layer.js}"></script>
<script type="text/javascript" th:src="@{/js/systools/AjaxProxyVue.js}"></script>
<script type="text/javascript" th:src="@{/js/plugin/vue.js}"></script>
<script type="text/javascript" th:src="@{/plugin/element-ui/index.js}"></script>
<script type="text/javascript" th:src="@{/plugin/moment.min.js}"></script>
<script type="text/javascript" th:inline="javascript">

    var vue = new Vue({
        el: '#app',
        data: {
            table:{
                rows:[],
                total:0,
                pageSize:10,
                currentPage:1,
            },
            form:{
                name:null,
                datetimeArr:'',
                payMethod:'',
                flowType:'',
                orderNo:'',
                oprationMan:'',
                queryKey:'',
                order:'',
                sort:''
            },
            height:'calc(100vh - 240px)',
            dialogVisible:false,

        },
        created: function () {
           this.loadData();
            window.addEventListener("keydown", this.keydown);
        },
        methods: {
            changePageSize(val) {
                this.table.pageSize = val;
                this.loadData();
            },
            changeCurrentPage(val) {
                this.table.currentPage = val;
                this.loadData();
            },
            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";
                    }
                    this.form.sort=column.prop;
                    this.loadData();
                }
            },
            loadData:function(){
                let _this = this;
                let data=_this.getRequestParam();
                data.pageSize=_this.table.pageSize;
                data.pageNum=_this.table.currentPage;
                AjaxProxy.requst({
                    app: _this,
                    data:data,
                    url: basePath + '/admin/achieveRule/selectList',
                    callback: function (data) {
                        _this.table.rows = data.rows;
                        _this.table.total=data.total;
                    }
                });
            },
            getRequestParam(){
                let _this = this;
                return   {
                    name:_this.form.name,
                }
            },
            search:function(){
                this.table.currentPage=1;
                this.loadData();
            },
            keydown(evt){
                if(evt.keyCode==13) {
                    this.search();
                }
            },

            del(index,row){
                let _this=this;
                this.$confirm('确认删除该规则吗?', '提示', {
                    confirmButtonText: '确定',
                    cancelButtonText: '取消',
                    type: 'warning'
                }).then(() => {
                    AjaxProxy.requst({
                        app: _this,
                        url: basePath + "/admin/achieveRule/removeById/"+row.id,
                        callback: function (data) {
                            _this.$message({
                                type: 'success',
                                message: '删除成功!'
                            });
                            _this.loadData();
                        }
                    });
                }).catch(() => {
                    this.$message({
                        type: 'info',
                        message: '已取消删除'
                    });
                });
            },
            //导出
          add(){

            }

        }
    });


</script>
</body>
</html>

 zq-erp/src/main/resources/templates/views/admin/hive/products/goods-form.html

@@ -83,6 +83,19 @@
                        </el-form-item>
                    </el-col>

                    <el-col :offset="2" :span="10" v-if="form.goodType!='家居产品'">
                        <el-form-item label="业绩规则" prop="achieveRuleId">
                            <el-select v-model="form.achieveRuleId" filterable placeholder="请选择业绩规则">
                                <el-option
                                        v-for="item in achieveRulsList"
                                        :key="item.id"
                                        :label="item.name"
                                        :value="item.id">
                                </el-option>
                            </el-select>
                        </el-form-item>
                    </el-col>


                </el-row>
                <el-row>
@@ -1097,7 +1110,8 @@
            loading_zhk: false,
            /******综合卡表格数据END********/


            //提成规则
            achieveRulsList:[],

            //默认充值卡选中项
            defaultCates: [],
@@ -1145,6 +1159,8 @@
                useDateNum : '',
                buyDateNum : '',
                payMethods : '',
                achieveRuleId:'',

            },
            submitUrl: '/admin/shoppinggoods/addShoppingGoods',
            modifySubmitUrl: '/admin/shoppinggoods/modifyShoppingGoods',
@@ -1174,6 +1190,7 @@
            this.getGoodstype();
            this.getDictionary();
            this.getShopInfo();
            this.getAchieveRule();
            if(goodType=='家居产品'){
                this.getSupplierList();
            }
@@ -1194,6 +1211,21 @@
        methods: {

            /**
             * 获取规则
             */
            getAchieveRule(){
                let _this = this;
                AjaxProxy.requst({
                    app: _this,
                    data: {pageNum:1,pageSize:1000},
                    url: basePath + "/admin/achieveRule/selectList",
                    callback: function (data) {
                        _this.achieveRulsList=data.rows;
                    }
                });
            },

            /**
             * 商品分类树形组件格式化
             */
            normalizer(node) {

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

@@ -62,6 +62,16 @@
                    <option value=''>请选择项目状态</option>
                </select>
            </div>
            <div class="form-group mr-20">
                <label for="staus">业绩规则</label>
                <select class="form-control autoFull" name="achieveRuleId"
                        data-filed="name"
                        data-value="id"
                        th:data-url="@{/admin/achieveRule/selectListForm}"
                        data-param="{pageNum:1,pageSize:1000}">
                    <option value=''>请选择业绩规则</option>
                </select>
            </div>

            <div class="form-group mr-20">
                <label for="isPresent">是否赠送</label>
@@ -114,6 +124,7 @@
                <th data-field="isPresent">是否赠送</th>
                <th data-field="goodType" data-sortable="true">类型</th>
                <th data-field="cateName">分类</th>
                <th data-field="achieveRuleName" >业绩规则</th>
                <th data-field="createTime"  data-sortable="true" data-formatter="MGrid.getTime">创建时间</th>
            </tr>
            </thead>

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

@@ -63,6 +63,16 @@
                    <option value=''>请选择项目状态</option>
                </select>
            </div>
            <div class="form-group mr-20">
                <label for="staus">业绩规则</label>
                <select class="form-control autoFull" name="achieveRuleId"
                        data-filed="name"
                        data-value="id"
                        th:data-url="@{/admin/achieveRule/selectListForm}"
                        data-param="{pageNum:1,pageSize:1000}">
                    <option value=''>请选择业绩规则</option>
                </select>
            </div>

            <div class="form-group mr-20">
                <label for="isPresent">是否赠送</label>
@@ -110,6 +120,7 @@
                <th data-field="isPresent">是否赠送</th>
                <th data-field="goodType" data-sortable="true">类型</th>
                <th data-field="cateName" >分类</th>
                <th data-field="achieveRuleName" >业绩规则</th>
                <th data-field="createTime"  data-sortable="true" data-formatter="MGrid.getTime">创建时间</th>
            </tr>
            </thead>