#

Junjie

2023-09-06 cda3622521308b21e10e5446c2060bf2fafd1e80

#

 src/main/java/com/zy/crm/system/service/impl/UserServiceImpl.java

@@ -36,6 +36,9 @@
        if (Cools.isEmpty(manager)) {
            Dept dept = deptService.selectById(deptId);
            Dept parent = deptService.selectById(dept.getParentId());
            if (parent == null) {
                throw new CoolException("保存失败，未找到部门组长");
            }
            manager = this.baseMapper.getDeptManager(hostId, parent.getId());
        }
        if (Cools.isEmpty(manager)) {

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

@@ -139,7 +139,7 @@
            ,{field: 'cstmrId$', align: 'left',title: '甲方单位', style: 'color: #1890ff;cursor:pointer', event: 'cstmrMore', templet:function(d){return emptyShow(d.cstmrId$)}}
            ,{field: 'pcd$', align: 'left',title: '所属区域', templet:function(d){return emptyShow(d.pcd$)}}
            ,{field: 'addr', align: 'left',title: '项目地址', templet:function(d){return emptyShow(d.addr)}}
            ,{field: 'money', align: 'right',title: '项目总金额', templet:function(d){return emptyShow(d.money)}}
            ,{field: 'money', align: 'right',title: '项目预算金额', templet:function(d){return emptyShow(d.money)}}
            ,{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: '添加时间'}

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

@@ -162,9 +162,9 @@
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">项目总金额: </label>
                    <label class="layui-form-label">项目预算金额: </label>
                    <div class="layui-input-block">
                        <input type="number" class="layui-input" name="money" placeholder="请输入项目总金额" autocomplete="off">
                        <input type="number" class="layui-input" name="money" placeholder="请输入项目预算金额" autocomplete="off">
                    </div>
                </div>
                <div class="layui-form-item">

 src/main/webapp/views/planType/planType.html

@@ -87,7 +87,16 @@
            <div class="layui-form-item">
                <label class="layui-form-label layui-form-required">类型名称</label>
                <div class="layui-input-block">
                    <input class="layui-input" name="name" placeholder="请输入类型名称" lay-verType="tips" lay-verify="required" required/>
<!--                    <input class="layui-input" name="name" placeholder="请输入类型名称" lay-verType="tips" lay-verify="required" required/>-->
                    <select name="name" lay-verType="tips" lay-verify="required" required>
                        <option value="">请选择类型</option>
                        <option value="立体库（货架）">立体库（货架）</option>
                        <option value="立体库（集成）">立体库（集成）</option>
                        <option value="四向穿梭库/两向穿梭库">四向穿梭库/两向穿梭库</option>
                        <option value="阁楼货架/钢平台">阁楼货架/钢平台</option>
                        <option value="周转容器">周转容器</option>
                        <option value="平库">平库</option>
                    </select>
                </div>
            </div>
            <div class="layui-form-item">
@@ -270,7 +279,7 @@
            admin.open({
                type: 1,
                title: (mData ? '修改' : '添加') + '类型',
                area: '500px',
                area: '600px',
                content: $('#editDialog').html(),
                success: function (layero, dIndex) {
                    // 回显表单数据