#心得体会

LSH

2023-10-16 51d36e410d855fb782b6cd678038cb167a25ea11

#心得体会

 src/main/java/com/zy/crm/manager/controller/OrderController.java

@@ -43,6 +43,8 @@
    private PriOnline2Service priOnline2Service;
    @Autowired
    private PriQuoteService priQuoteService;
    @Autowired
    private FollowUpService followUpService;

    @RequestMapping(value = "/order/{id}/auth")
    @ManagerAuth
@@ -110,7 +112,25 @@
        }
        Date now = new Date();

        if (order.getStatus()!=0){
            if (Cools.isEmpty(order.getMemoExperience())){
                return R.error("请输入心得体会");
            }else {
                FollowUp followUp = new FollowUp();
                followUp.setWorkMsg(order.getMemoExperience());
                followUp.setOrderId(order.getId());
                followUp.setUserId(getUserId());
                followUp.setCreateBy(getUserId());
                followUp.setUpdateBy(getUserId());
                followUp.setDirector(getUserId());
                followUp.setDeptId(getDeptId());
                followUp.setCreateTime(now);
                followUp.setUpdateTime(now);
                followUpService.insert(followUp);
            }
        }

        order.setMemoExperience(null);
        order.setUpdateBy(getUserId());
        order.setUpdateTime(now);
        Order orderOld = orderService.selectById(order.getId());

 src/main/java/com/zy/crm/manager/entity/Order.java

@@ -184,6 +184,12 @@
     */
    @ApiModelProperty(value= "注释")
    private String memo;
    /**
     * 注释
     */
    @ApiModelProperty(value= "心得体会")
    @TableField("memo_experience")
    private String memoExperience;

    /**
     * 预计成交率

 src/main/resources/mapper/OrderMapper.xml

@@ -29,6 +29,7 @@
        <result column="memo" property="memo" />
        <result column="transaction_rate" property="transactionRate" />
        <result column="order_product_type_id" property="orderProductTypeId" />
        <result column="memo_experience" property="memoExperience" />

    </resultMap>


 src/main/webapp/static/js/followUp/followUp.js

@@ -21,22 +21,23 @@
        cellMinWidth: 50,
        height: 'full-120',
        cols: [[
            {type: 'checkbox'}
            ,{field: 'id', align: 'center',title: 'ID',hide:true}
            ,{field: 'userId$', align: 'center',title: '创建人'}
            // {type: 'checkbox'},
            {field: 'id', align: 'center',title: 'ID',hide:true}
            ,{field: 'orderId', align: 'center',title: '项目号',hide:false}
            ,{field: 'userId$', align: 'center',title: '业务员',hide: false}
            ,{field: 'deptId$', align: 'center',title: '所属部门',hide:true}
            ,{field: 'hostId', align: 'center',title: 'hostId',hide:true}
            ,{field: 'orderId$', align: 'center',title: '项目号'}
            ,{field: 'orderId$', align: 'center',title: '项目',hide:false}
            ,{field: 'director$', align: 'center',title: '负责人',hide:true}
            ,{field: 'workMsg', align: 'center',title: '任务描述'}
            ,{field: 'memo', align: 'center',title: '备注'}
            ,{field: 'workMsg', align: 'center',title: '心得体会',hide: false}
            ,{field: 'comment', align: 'center',title: '评论',hide:true}
            ,{field: 'createBy$', align: 'center',title: '创建人员',hide:true}
            ,{field: 'updateBy$', align: 'center',title: '更新人员'}
            ,{field: 'createTime$', align: 'center',title: '创建时间',hide:true}
            ,{field: 'updateTime$', align: 'center',title: '更新时间'}
            ,{field: 'updateBy$', align: 'center',title: '更新人员',hide:true}
            ,{field: 'createTime$', align: 'center',title: '创建时间',hide:false}
            ,{field: 'updateTime$', align: 'center',title: '更新时间',hide:true}
            ,{field: 'memo', align: 'center',title: '备注',hide:true}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:120}
            // ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:180}
        ]],
        request: {
            pageName: 'curr',

 src/main/webapp/static/js/order/order.js

@@ -142,6 +142,7 @@
        where: where,
        cols: [[
            {type: 'checkbox'},
            {field: 'id', align: 'left',title: '项目号',hide: false},
            {
                field: 'name',
                align: 'left',
@@ -150,7 +151,7 @@
                event: 'more',
                width: 300
            },
            {field: 'uuid', align: 'left',title: '项目代号'},
            {field: 'uuid', align: 'left',title: '项目代号',hide: false},
            {
                field: 'cstmrId$',
                align: 'left',
@@ -195,14 +196,15 @@
            },
            {field: 'director$', align: 'left',title: '项目负责人', templet:function(d){return emptyShow(d.director$)}},
            {field: 'remarks', align: 'left',title: '备注', templet:function(d){return emptyShow(d.remarks)}},
            {field: 'createTime$', align: 'left',title: '添加时间'},
            {field: 'createTime$', align: 'left',title: '添加时间', hide: false},
            {field: 'company$', align: 'left',title: '所属公司', hide: false},
            {field: 'orderProductTypeId$', align: 'left',title: '产品类型', hide: false},
            {field: 'province', align: 'left',title: '省', hide: true},
            {field: 'city', align: 'left',title: '市', hide: true},
            {field: 'district', align: 'left',title: '县', hide: true},
            {field: 'town', align: 'left',title: '镇', hide: true},
            {field: 'status$', align: 'left',title: '状态'},
            {field: 'status$', align: 'left',title: '状态', hide: false},
            {field: 'status', align: 'left',title: '状态', hide: true},
            {field: 'files', align: 'left',title: '附件', hide: true},
            {field: 'updateBy$', align: 'left',title: '修改人员', hide: true},
            {field: 'updateTime$', align: 'left',title: '修改时间', hide: true},

 src/main/webapp/views/businessTrip/businessTrip.html

@@ -83,8 +83,10 @@
        <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">审批</a>
        <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>
    {{# } }}
    {{# if (d.settle == 2) { }}
        <a class="layui-btn icon-btn layui-btn-sm" lay-event="addBlank">申请报销</a>
    {{# } }}
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>
    <a class="layui-btn icon-btn layui-btn-sm" lay-event="addBlank">申请报销</a>
</script>

<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>

 src/main/webapp/views/businessTrip/businessTripOther.html

@@ -83,8 +83,11 @@
        <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">审批</a>
        <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>
    {{# } }}

    {{# if (d.settle == 2) { }}
        <a class="layui-btn icon-btn layui-btn-sm" lay-event="addBlank">申请报销</a>
    {{# } }}
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>
    <a class="layui-btn icon-btn layui-btn-sm" lay-event="addBlank">申请报销</a>
</script>

<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>

 src/main/webapp/views/followUp/followUp.html

@@ -18,9 +18,9 @@
            <div class="layui-form toolbar" id="search-box">
                <div class="layui-form-item">
                    <div class="layui-inline">
                        <label class="layui-form-label">编号:</label>
                        <label class="layui-form-label">项目号:</label>
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">
                            <input class="layui-input" type="text" name="order_id" placeholder="项目号" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">&emsp;
@@ -40,15 +40,15 @@

<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>
        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">删除</button>
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">导出</button>
<!--        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>-->
<!--        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">删除</button>-->
<!--        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">导出</button>-->
    </div>
</script>

<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>
<!--    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>-->
<!--    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>-->
</script>

<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>

 src/main/webapp/views/home/dashboard.html

@@ -74,7 +74,8 @@
                        <div class="layui-col-xs12 layui-col-sm6 layui-col-lg2 text-center">
                            <div class="numberInfoSubTitle testColorBlack">出差审批</div>
                            <div class="numberInfoValue">
                                <a href="#" id="openBusinessTripPendingTasks" style="color: #1E9FFF"><span id="businessTripPendingTaskCount">2333</span><em class="numberInfoSuffix">个</em></a>
<!--                                <a href="#" id="openBusinessTripPendingTasks" style="color: #1E9FFF"><span id="businessTripPendingTaskCount">2333</span><em class="numberInfoSuffix">个</em></a>-->
                                <span id="businessTripPendingTaskCount">2333</span><em class="numberInfoSuffix">个</em>
                            </div>
                        </div>
                        <div class="layui-col-xs12 layui-col-sm6 layui-col-lg2 text-center">
@@ -84,9 +85,10 @@
                            </div>
                        </div>
                        <div class="layui-col-xs12 layui-col-sm6 layui-col-lg2 text-center">
                            <div class="numberInfoSubTitle testColorBlack">待接收核价任务</div>
                            <div class="numberInfoSubTitle testColorBlack">可接收核价任务</div>
                            <div class="numberInfoValue">
                                <a href="#" id="openPlanPriOnlinePendingTasks" style="color: #1E9FFF"><span id="planPriOnlinePendingTaskCount">888</span><em class="numberInfoSuffix">个</em></a>
<!--                                <a href="#" id="openPlanPriOnlinePendingTasks" style="color: #1E9FFF"><span id="planPriOnlinePendingTaskCount">888</span><em class="numberInfoSuffix">个</em></a>-->
                                <span id="planPriOnlinePendingTaskCount">888</span><em class="numberInfoSuffix">个</em>
                            </div>
                        </div>
                    </div>
@@ -551,6 +553,61 @@
                }
            });
        });
        $("#openPlanPendingTasks").on("click", () => {
            layer.open({
                type: 2,
                title: '规划申请单',
                maxmin: true,
                area: [top.detailWidth, top.detailHeight],
                shadeClose: true,
                content: '../plan/plan.html?status=4',
                success: function(layero, index){

                }
            });
        });

        $("#openPriOnlinePendingTasks").on("click", () => {
            layer.open({
                type: 2,
                title: '核价任务',
                maxmin: true,
                area: [top.detailWidth, top.detailHeight],
                shadeClose: true,
                content: '../priOnline2/priOnline.html?status=4',
                success: function(layero, index){

                }
            });
        });

        $("#openPriQuotePendingTasks").on("click", () => {
            layer.open({
                type: 2,
                title: '报价任务',
                maxmin: true,
                area: [top.detailWidth, top.detailHeight],
                shadeClose: true,
                content: '../priQuote/priQuote.html?status=4',
                success: function(layero, index){

                }
            });
        });

        $("#openReimburseOnlinePendingTasks").on("click", () => {
            layer.open({
                type: 2,
                title: '报销任务',
                maxmin: true,
                area: [top.detailWidth, top.detailHeight],
                shadeClose: true,
                content: '../reimburseOnline/reimburseOnline.html?status=4',
                success: function(layero, index){

                }
            });
        });

        $("#openCompanyPost").on("click", () => {
            layer.open({

 src/main/webapp/views/order/order.html

@@ -104,8 +104,12 @@
</div>

<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>
    {{# if (d.status == 0) { }}
        <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>
    {{# } }}
    {{# if (d.status != 1) { }}
        <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>
    {{# } }}
    <a class="layui-btn icon-btn layui-btn-sm" lay-event="business">出差</a>
</script>

@@ -178,12 +182,10 @@
                        </div>
                    </div>
                </div>
                <div class="layui-form-item" style="display: none;" id="statusNone">
                    <label class="layui-form-label layui-form-required">项目状态 : </label>
                    <div class="layui-input-block" >
                        <input type="radio" name="status" value="0" title="跟踪中" checked/>
                        <input type="radio" name="status" value="1" title="完成"/>
                        <input type="radio" name="status" value="2" title="关闭"/>
                <div class="layui-form-item">
                    <label class="layui-form-label">心得体会: </label>
                    <div class="layui-input-block">
                        <textarea class="layui-textarea" name="memoExperience" placeholder="请输入心得体会" maxlength="1024" autocomplete="off"></textarea>
                    </div>
                </div>
            </div>
@@ -229,6 +231,14 @@
                        <textarea class="layui-textarea" name="remarks" placeholder="请输入备注" maxlength="1024" autocomplete="off"></textarea>
                    </div>
                </div>
                <div class="layui-form-item" style="display: none;" id="statusNone">
                    <label class="layui-form-label layui-form-required">项目状态 : </label>
                    <div class="layui-input-block" >
                        <input type="radio" name="status" value="0" title="跟踪中" checked/>
                        <input type="radio" name="status" value="1" title="完成"/>
                        <input type="radio" name="status" value="2" title="关闭"/>
                    </div>
                </div>
            </div>
        </div>
        <hr class="layui-bg-gray">