#

luxiaotao1123

2022-11-19 923a4bf299c8ab83a60f86a066c4b0675a0fad4d

#

 src/main/resources/application.yml

@@ -9,12 +9,12 @@
    name: @pom.build.finalName@
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://47.97.1.152:51433;databasename=zy_crm
    username: sa
    password: Zoneyung@zy56$
#    url: jdbc:sqlserver://localhost:1433;databasename=zy_crm
#    url: jdbc:sqlserver://47.97.1.152:51433;databasename=zy_crm
#    username: sa
#    password: sa@123
#    password: Zoneyung@zy56$
    url: jdbc:sqlserver://localhost:1433;databasename=zy_crm
    username: sa
    password: sa@123
  mvc:
    static-path-pattern: /**
  redis:

 src/main/webapp/static/js/plan/plan.js

@@ -147,16 +147,15 @@
            ,{field: 'cstmrId$', align: 'center',title: '甲方单位'}
            ,{field: 'uuid', align: 'center',title: '规划单代号'}
            ,{field: 'appleTime$', align: 'center',title: '申请日期'}

            ,{field: 'beItem$', align: 'center',title: '立项'}
            // ,{field: 'beItem$', align: 'center',title: '立项'}
            ,{field: 'planner', align: 'center',title: '规划员'}
            ,{field: 'finishTime$', align: 'center',title: '完成时间'}
            ,{field: 'form', align: 'center',title: '表单内容'}
            ,{field: 'change$', align: 'center',title: '更改方案'}
            ,{field: 'changeTime', align: 'center',title: '更改次数'}
            ,{field: 'changeReason', align: 'center',title: '更改方案原因'}
            ,{field: 'planBonus', align: 'center',title: '规格奖金'}
            ,{field: 'planLeaderBonus', align: 'center',title: '规格组长奖金'}
            // ,{field: 'finishTime$', align: 'center',title: '完成时间'}
            // ,{field: 'form', align: 'center',title: '表单内容'}
            // ,{field: 'change$', align: 'center',title: '更改方案'}
            // ,{field: 'changeTime', align: 'center',title: '更改次数'}
            // ,{field: 'changeReason', align: 'center',title: '更改方案原因'}
            // ,{field: 'planBonus', align: 'center',title: '规格奖金'}
            // ,{field: 'planLeaderBonus', align: 'center',title: '规格组长奖金'}
            // ,{field: 'files', align: 'center',title: '附件'}
            // ,{field: 'settle$', align: 'center',title: '进度'}
            // ,{field: 'settleMsg', align: 'center',title: '审核进度'}
@@ -164,7 +163,7 @@
            // ,{field: 'status$', align: 'center',title: '状态'}
            ,{field: 'updateBy$', align: 'center',title: '修改人员'}
            ,{field: 'updateTime$', align: 'center',title: '修改时间'}
            ,{field: 'memo', align: 'center',title: '注释'}
            ,{field: 'memo', align: 'center',title: '注释', hide: true}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:120}
        ]],

 src/main/webapp/views/plan/plan.html

@@ -293,12 +293,6 @@
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">附件: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="files" placeholder="请输入附件">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">进度: </label>
                    <div class="layui-input-block">
                        <select name="settle">
@@ -317,58 +311,6 @@
                    <label class="layui-form-label">审核进度: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="settleMsg" placeholder="请输入审核进度">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">评论: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="comment" placeholder="请输入评论">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">状态: </label>
                    <div class="layui-input-block">
                        <select name="status">
                            <option value="">请选择状态</option>
                            <option value="1">正常</option>
                            <option value="0">禁用</option>
                        </select>
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">添加人员: </label>
                    <div class="layui-input-block cool-auto-complete">
                        <input class="layui-input" name="createBy" placeholder="请输入添加人员" style="display: none">
                        <input id="createBy$" name="createBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入添加人员" onfocus=this.blur()>
                        <div class="cool-auto-complete-window">
                            <input class="cool-auto-complete-window-input" data-key="userQueryBycreateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
                            <select class="cool-auto-complete-window-select" data-key="userQueryBycreateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                            </select>
                        </div>
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">添加时间: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="createTime" id="createTime$" placeholder="请输入添加时间">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">修改人员: </label>
                    <div class="layui-input-block cool-auto-complete">
                        <input class="layui-input" name="updateBy" placeholder="请输入修改人员" style="display: none">
                        <input id="updateBy$" name="updateBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入修改人员" onfocus=this.blur()>
                        <div class="cool-auto-complete-window">
                            <input class="cool-auto-complete-window-input" data-key="userQueryByupdateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
                            <select class="cool-auto-complete-window-select" data-key="userQueryByupdateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                            </select>
                        </div>
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">修改时间: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="updateTime" id="updateTime$" placeholder="请输入修改时间">
                    </div>
                </div>
                <div class="layui-form-item">