Home Explore Help
Register Sign In
qxp
/
suishenbang-oneportal
Watch 2
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

初始化

qxp192083 4 years ago
parent
b8c1df1449
commit
85ea863c70
16 changed files with 3 additions and 2161 deletions
Split View Show Diff Stats
  1. 2 2
      dgtly-admin/src/main/resources/application-dev-druid.yml
  2. 0 174
      dgtly-admin/src/main/resources/templates/company/company.html
  3. 0 244
      dgtly-admin/src/main/resources/templates/company/edit/edit.html
  4. 0 239
      dgtly-admin/src/main/resources/templates/company/edit/historyInfo.html
  5. 0 74
      dgtly-admin/src/main/resources/templates/company/edit/infoHistory.html
  6. 0 368
      dgtly-admin/src/main/resources/templates/company/editexamine/approve.html
  7. 0 157
      dgtly-admin/src/main/resources/templates/company/editexamine/reviewed.html
  8. 0 301
      dgtly-admin/src/main/resources/templates/company/enterexamine/approve.html
  9. 0 145
      dgtly-admin/src/main/resources/templates/company/enterexamine/reviewed.html
  10. 0 88
      dgtly-admin/src/main/resources/templates/company/honour/add.html
  11. 0 82
      dgtly-admin/src/main/resources/templates/company/honour/edit.html
  12. 0 91
      dgtly-admin/src/main/resources/templates/company/honour/honour.html
  13. 0 133
      dgtly-admin/src/main/resources/templates/company/info.html
  14. 0 51
      dgtly-admin/src/main/resources/templates/company/tree.html
  15. 1 10
      dgtly-api/pom.xml
  16. 0 2
      dgtly-system/src/main/resources/mapper/system/SysCompanyMapper.xml

+ 2 - 2
dgtly-admin/src/main/resources/application-dev-druid.yml
View File 

@@ -6,9 +6,9 @@ spring:
 
         druid:
 
             # 主库数据源
 
             master:
 
-                url: jdbc:mysql://10.32.2.209:3306/kimberleypurchplat?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 
+                url: jdbc:mysql://10.32.2.212:3306/suishenbang-oneportal?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 
                 username: root
 
-                password: root
 
+                password: libang
 
             # 从库数据源
 
             slave:
 
                 # 从数据源开关/默认关闭

+ 0 - 174
dgtly-admin/src/main/resources/templates/company/company.html
View File 

@@ -1,174 +0,0 @@
 
-<!DOCTYPE html>
 
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 
-<head>
 
-    <th:block th:include="include :: header('商户表列表')" />
 
-</head>
 
-<body class="gray-bg">
 
-    <div class="container-div">
 
-        <div class="row">
 
-            <div class="col-sm-12 search-collapse">
 
-                <form id="formId">
 
-                    <div class="select-list">
 
-                        <ul>
 
-                            <li>
 
-                                <p>商户名称：</p>
 
-                                <input type="text" name="companyName"/>
 
-                            </li>
 
-                            <li>
 
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
 
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
 
-                            </li>
 
-                        </ul>
 
-                    </div>
 
-                </form>
 
-            </div>
 
-
 
-            <div class="btn-group-sm" id="toolbar" role="group">
 
-                <!--<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:company:add">
 
-                    <i class="fa fa-plus"></i> 添加
 
-                </a>
 
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:company:edit">
 
-                    <i class="fa fa-edit"></i> 修改
 
-                </a>
 
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:company:remove">
 
-                    <i class="fa fa-remove"></i> 删除
 
-                </a>
 
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:company:export">
 
-                    <i class="fa fa-download"></i> 导出
 
-                 </a>-->
 
-            </div>
 
-            <div class="col-sm-12 select-table table-striped">
 
-                <table id="bootstrap-table"></table>
 
-            </div>
 
-        </div>
 
-    </div>
 
-    <th:block th:include="include :: footer" />
 
-    <th:block th:include="include :: bootstrap-table-editable-js" />
 
-    <script th:inline="javascript">
 
-        var editFlag = [[${@permission.hasPermi('company:company:edit')}]];
 
-        var sortFlag = [[${@permission.hasPermi('company:company:sort')}]];
 
-        var prefix = ctx + "company";
 
-
 
-        $(function() {
 
-            var options = {
 
-                url: prefix + "/list",
 
-                updateUrl: prefix + "/info/{id}",
 
-                modalName: "商户表",
 
-                onEditableSave: onEditableSave,
 
-                showColumns: false,
 
-                showToggle: false,
 
-                columns: [{
 
-                    checkbox: true
 
-                },
 
-                {
 
-                    field : 'id', 
-                    title : '商户编号',
 
-                    visible: false
 
-                },
 
-                {
 
-                    field : 'companyName',
 
-                    title : '商户名称'
 
-                },
 
-                {
 
-                    field : 'primaryBusiness',
 
-                    title : '主营业务'
 
-                },
 
-                {
 
-                    field : 'contactNumber',
 
-                    title : '联系电话'
 
-                },
 
-                {
 
-                    field : 'defaultImgUrl',
 
-                    title : '企业图片',
 
-                    formatter: function(value, row, index) {
 
-                        // 图片预览（注意：如存储在本地直接获取数据库路径，如有配置context-path需要使用ctx+路径）
 
-                        // 如：/profile/upload/2019/08/08/3b7a839aced67397bac694d77611ce72.png
 
-                        return $.table.imageView(value,250,250);
 
-                    }
 
-                },
 
-                {
 
-                    visible: editFlag == 'hidden' ? false : true,
 
-                    title: '商户状态',
 
-                    align: 'center',
 
-                    formatter: function (value, row, index) {
 
-                        return statusTools(row);
 
-                    }
 
-                },
 
-                {
 
-                    field : 'createTime',
 
-                    title: '创建时间',
 
-                    align: 'center'
 
-                },
 
-                {
 
-                    field : 'sort',
 
-                    title : '排序',
 
-                    visible: !sortFlag,
 
-                    editable : {
 
-                        type : 'text',
 
-                        title : '排序（数字越大 排序越靠前）',
 
-                        emptytext : "排序为空",
 
-                        validate : function(value) {
 
-                            if (value.length == 0) {
 
-                                return '排序值不能为空';
 
-                            }
 
-                            if (isNaN(value)) {
 
-                                return '请输入数字';
 
-                            }
 
-                        }
 
-                    }
 
-                },
 
-                {
 
-                    title: '操作',
 
-                    align: 'center',
 
-                    formatter: function(value, row, index) {
 
-                        var actions = [];
 
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>查看详情</a> ');
 
-                        return actions.join('');
 
-                    }
 
-                }]
 
-            };
 
-            $.table.init(options);
 
-
 
-
 
-
 
-
 
-        });
 
-        /* 商户状态显示 */
 
-        function statusTools(row) {
 
-            if (row.status == 1) {
 
-                return '<i class=\"fa fa-toggle-off text-info fa-2x\" onclick="enable(\'' + row.id + '\')"></i> ';
 
-            } else {
 
-                return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="disable(\'' + row.id + '\')"></i> ';
 
-            }
 
-        }
 
-
 
-        function onEditableSave (field, row, oldValue, $el) {
 
-
 
-            var data = new FormData();
 
-            data.append('id', row.id);
 
-            data.append('sort', row.sort);
 
-            $.ajax({
 
-                url:ctx+"company/company/edit",
 
-                type:"post",
 
-                data: data,
 
-                cache: false,
 
-                contentType: false,
 
-                processData: false,
 
-                dataType: 'json',
 
-                success: function(result) {
 
-                    if (result.code == web_status.SUCCESS) {
 
-                        $.modal.alertSuccess("成功");
 
-                    } else {
 
-                        $.modal.alertError(result.msg);
 
-                    }
 
-                },
 
-                error:function(result) {
 
-                    alert("上传失败")
 
-                }
 
-            });
 
-
 
-        }
 
-
 
-    </script>
 
-</body>
 
-</html>

+ 0 - 244
dgtly-admin/src/main/resources/templates/company/edit/edit.html
View File 

@@ -1,244 +0,0 @@
 
-<!DOCTYPE html>
 
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 
-<head>
 
-    <th:block th:include="include :: header('商户信息')" />
 
-    <th:block th:include="include :: datetimepicker-css" />
 
-    <th:block th:include="include :: jasny-bootstrap-css" />
 
-</head>
 
-<body class="white-bg">
 
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
 
-        <div class="row">
 
-            <div class="col-sm-1 col-sm-offset-10">
 
-                <a class="btn btn-primary btn-rounded btn-sm" onclick="edit()" shiro:hasPermission="company:edit:submit">
 
-                    <i class="fa fa-edit"></i>&nbsp;修改信息
 
-                </a>
 
-
 
-            </div>
 
-        </div>
 
-        <form class="form-horizontal m" id="form-company-edit" th:object="${sysCompany}">
 
-            <input name="companyId" th:value="*{id}" type="hidden">
 
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">商户名称：</label>
 
-                <div class="col-sm-8">
 
-                    <input name="companyName" th:field="*{companyName}"  class="form-control" type="text" disabled="true" required>
 
-                </div>
 
-            </div>
 
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">企业类型：</label>
 
-                <div class="col-sm-8">
 
-                    <select name="companyType" class="form-control m-b" th:with="type=${@dict.getType('company_type')}" disabled="true">
 
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{companyType}"></option>
 
-                    </select>
 
-                </div>
 
-            </div>
 
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">详细地址：</label>
 
-                <div class="col-sm-8">
 
-                    <input name="detailAddress" th:field="*{detailAddress}" class="form-control" type="text" disabled="true">
 
-                </div>
 
-            </div>
 
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">经度：</label>
 
-                <div class="col-sm-8">
 
-                    <input name="longitude" th:field="*{longitude}" class="form-control" type="text" disabled="true">
 
-                </div>
 
-            </div>
 
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">纬度：</label>
 
-                <div class="col-sm-8">
 
-                    <input name="latitude" th:field="*{latitude}" class="form-control" type="text" disabled="true">
 
-                </div>
 
-            </div>
 
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">企业法人：</label>
 
-                <div class="col-sm-8">
 
-                    <input name="legalPerson" th:field="*{legalPerson}" class="form-control" type="text" disabled="true">
 
-                </div>
 
-            </div>
 
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">联系电话：</label>
 
-                <div class="col-sm-8">
 
-                    <input name="contactNumber" th:field="*{contactNumber}" class="form-control" type="text" disabled="true">
 
-                </div>
 
-            </div>
 
-            <div class="form-group draggable">
 
-                <label class="col-sm-3 control-label">成立日期：</label>
 
-                <div class="col-sm-8">
 
-                    <div class="input-group date">
 
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
 
-                        <input name="establishDate" th:value="${#dates.format(sysCompany.establishDate, 'yyyy-MM-dd')}"
 
-                               class="form-control" placeholder="yyyy-MM-dd" type="text"  disabled="true">
 
-                    </div>
 
-                </div>
 
-            </div>
 
-            <div class="form-group">
 
-
 
-                <label class="col-sm-3 control-label">统一社会信用代码：</label>
 
-                <div class="col-sm-8">
 
-                    <input name="unifiedSocialCreditCode" th:field="*{unifiedSocialCreditCode}" class="form-control" type="text" disabled="true">
 
-                </div>
 
-            </div>
 
-            <div class="form-group">
 
-                <label class="col-sm-3 control-label">营业执照：</label>
 
-                <div class="col-sm-8">
 
-                    <div class="fileinput fileinput-new">
 
-                        <input id="input-businessLicenseUrl" name="businessLicenseUrl" th:field="*{businessLicenseUrl}" type="hidden"/>
 
-                        <div class="fileinput-new thumbnail" style="max-width: 140px; max-height: 140px;" onclick="openImg(this)">
 
-                            <img th:src="@{*{businessLicenseUrl}}" id="img-businessLicenseUrl" >
 
-                        </div>
 
-                        <div class="div-imgButton" style="display: none;">
 
-                            <input type="file" accept="image/*" style="display: none" onchange="imgChange(this,'businessLicenseUrl')">
 
-                            <a class="btn btn-primary btn-sm" onclick="upImg(this)" >
 
-                                上传营业执照
 
-                            </a>
 
-                            <a  class="btn btn-white" onclick="clearImg('businessLicenseUrl')">清除</a>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-            </div>
 
-            <div class="form-group">
 
-                <input id="fmzFile" name="fmzFile" type="hidden"/>
 
-                <label class="col-sm-3 control-label">商户封面：</label>
 
-                <div class="col-sm-8">
 
-                    <div class="fileinput fileinput-new">
 
-                        <input id="input-defaultImgUrl" name="defaultImgUrl" th:field="*{defaultImgUrl}" type="hidden"/>
 
-                        <div class="fileinput-new thumbnail" style="max-width: 140px; max-height: 140px;" onclick="openImg(this)">
 
-                            <img th:src="@{*{defaultImgUrl}}" id="img-defaultImgUrl" >
 
-                        </div>
 
-                        <div class="div-imgButton" style="display: none;">
 
-                            <input type="file" accept="image/*" style="display: none" onchange="imgChange(this,'defaultImgUrl')">
 
-                            <a class="btn btn-primary btn-sm" onclick="upImg(this)" >
 
-                                上传商户封面
 
-                            </a>
 
-                            <a  class="btn btn-white" onclick="clearImg('defaultImgUrl')">清除</a>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-            </div>
 
-            <div class="form-group">
 
-                <label class="col-sm-3 control-label">商户宣传图片：</label>
 
-                <div class="col-sm-8">
 
-                    <div class="fileinput fileinput-new">
 
-                        <input id="input-propagandaImgUrl" name="propagandaImgUrl" th:field="*{propagandaImgUrl}" type="hidden"/>
 
-                        <div class="fileinput-new thumbnail" style="max-width: 140px; max-height: 140px;" onclick="openImg(this)">
 
-                            <img th:src="@{*{propagandaImgUrl}}" id="img-propagandaImgUrl" >
 
-                        </div>
 
-                        <div class="div-imgButton" style="display: none;">
 
-                            <input type="file" accept="image/*" style="display: none" onchange="imgChange(this,'propagandaImgUrl')">
 
-                            <a class="btn btn-primary btn-sm" onclick="upImg(this)" >
 
-                                上传宣传图片
 
-                            </a>
 
-                            <a  class="btn btn-white" onclick="clearImg('propagandaImgUrl')">清除</a>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-            </div>
 
-
 
-            <div class="form-group">
 
-                <label class="col-sm-3 control-label">企业介绍：</label>
 
-                <div class="col-sm-8">
 
-                    <textarea name="companyIntroduce" class="form-control" disabled="true">[[*{companyIntroduce}]]</textarea>
 
-                </div>
 
-            </div>
 
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">主营业务：</label>
 
-                <div class="col-sm-8">
 
-                    <input name="primaryBusiness" th:field="*{primaryBusiness}" class="form-control" type="text" disabled="true">
 
-                </div>
 
-            </div>
 
-        </form>
 
-        <div id="div-button" class="row" style="display: none">
 
-            <div class="col-sm-2 col-sm-offset-10">
 
-                <a class="btn btn-primary  btn-sm" onclick="editUpdate()" >
 
-                    <i class="fa fa-edit"></i>&nbsp;确定
 
-                </a>
 
-                <a class="btn btn-defult  btn-sm" onclick="reload()" >
 
-                    <i class="fa fa-cancel"></i>&nbsp;取消
 
-                </a>
 
-            </div>
 
-        </div>
 
-    </div>
 
-    <th:block th:include="include :: footer" />
 
-    <th:block th:include="include :: datetimepicker-js" />
 
-    <script th:inline="javascript">
 
-        var prefix = ctx + "company/";
 
-        $("#form-company-edit").validate({
 
-            focusCleanup: true
 
-        });
 
-        $("input[name='establishDate']").datetimepicker({
 
-            format: "yyyy-mm-dd",
 
-            minView: "month",
 
-            autoclose: true
 
-        });
 
-
 
-        function edit(){
 
-            $("#div-button").show();
 
-            $(".div-imgButton").show();
 
-            var forms = $("#form-company-edit");
 
-            forms.each(function(index, form){
 
-                for ( var i = 0; i < form.length; i++) {
 
-                    var element = form.elements[i];
 
-                    element.disabled = false;
 
-                }
 
-            });
 
-        }
 
-        function reload(){
 
-            location.reload()
 
-        }
 
-        function editUpdate(){
 
-            $.modal.confirm("提交修改信息将在审核后生效，是否确认",function(){
 
-                var data = $("#form-company-edit").serialize()
 
-                $.operate.save(prefix+"edit/submit",data,reload())
 
-            })
 
-        }
 
-
 
-        function upImg(self){
 
-            $(self).siblings("input").click()
 
-        }
 
-        function clearImg(name){
 
-            $("#img-"+name).attr("src","")
 
-            $("#input-"+name).val("")
 
-        }
 
-        function imgChange(self,name){
 
-            if ($(self).val() == '') {
 
-                return;
 
-            }var data = new FormData();
 
-            data.append('file', self.files[0]);
 
-            $.modal.loading("正在上传，请稍后...");
 
-            $.ajax({
 
-                url:ctx+"common/upload",
 
-                type:"post",
 
-                data: data,
 
-                cache: false,
 
-                contentType: false,
 
-                processData: false,
 
-                dataType: 'json',
 
-                success: function(result) {
 
-                    if (result.code == web_status.SUCCESS) {
 
-                        $("#img-"+name).attr("src",result.data.fileName)
 
-                        $("#input-"+name).val(result.data.fileName)
 
-                    } else {
 
-                        $.modal.alertError(result.msg);
 
-                    }
 
-                    $.modal.closeLoading();
 
-                },
 
-                error:function(result) {
 
-                    alert("上传失败")
 
-                    $.modal.closeLoading();
 
-                }
 
-            });
 
-        }
 
-        function openImg(self){
 
-            var img = $(self).children("img")
 
-            layer.open({
 
-                type: 1,
 
-                title: false,
 
-                shade: 0.0001,
 
-                area: ['auto'],
 
-                shadeClose: true,
 
-                content: $(img)
 
-            });
 
-        }
 
-    </script>
 
-</body>
 
-</html>

+ 0 - 239
dgtly-admin/src/main/resources/templates/company/edit/historyInfo.html
View File 

@@ -1,239 +0,0 @@
 
-<!DOCTYPE html>
 
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 
-<head>
 
-    <th:block th:include="include :: header('修改商户审核')" />
 
-    <th:block th:include="include :: datetimepicker-css" />
 
-</head>
 
-<body class="white-bg">
 
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
 
-        <input  id="input_status"  th:value="${companyReviewed.status}" type="hidden">
 
-        <!-- 提交信息查看-->
 
-        <form class="form-horizontal m" id="form-companyReviewed" th:object="${companyReviewed}">
 
-            <div class="row">
 
-                <div class="col-sm-6"></div>
 
-                <div class="col-sm-6"></div>
 
-            </div>
 
-            <div class="row">
 
-                <div class="col-sm-6">
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">商户名称：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="companyName" th:field="*{companyName}"  class="form-control" type="text" disabled required>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-                <div class="col-sm-6">
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">企业类型：</label>
 
-                        <div class="col-sm-8">
 
-                            <select name="sex" class="form-control m-b" th:with="type=${@dict.getType('company_type')}" disabled>
 
-                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{companyType}"></option>
 
-                            </select>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-            </div>
 
-
 
-
 
-            <div class="row">
 
-                <div class="col-sm-6">
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">详细地址：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="detailAddress" th:field="*{detailAddress}" class="form-control" type="text" disabled>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-                <div class="col-sm-6">
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">企业法人：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="legalPerson" th:field="*{legalPerson}" class="form-control" type="text" disabled>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-            </div>
 
-
 
-
 
-            <div class="row">
 
-                <div class="col-sm-6">
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">经度：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="longitude" th:field="*{longitude}" class="form-control" type="text" disabled>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-                <div class="col-sm-6">
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">纬度：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="latitude" th:field="*{latitude}" class="form-control" type="text" disabled>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-            </div>
 
-
 
-            <div class="row">
 
-                <div class="col-sm-6">
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">联系电话：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="contactNumber" th:field="*{contactNumber}" class="form-control" type="text" disabled>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-                <div class="col-sm-6">
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">成立日期：</label>
 
-                        <div class="col-sm-8">
 
-                            <div class="input-group date">
 
-                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
 
-                                <input name="establishDate" th:value="${#dates.format(companyReviewed.establishDate, 'yyyy-MM-dd')}"
 
-                                       class="form-control" placeholder="yyyy-MM-dd" type="text" disabled>
 
-                            </div>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-            </div>
 
-
 
-            <div class="row">
 
-                <div class="col-sm-6">
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">统一社会信用代码：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="unifiedSocialCreditCode" th:field="*{unifiedSocialCreditCode}" class="form-control" type="text" disabled>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-                <div class="col-sm-6">
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">主营业务：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="primaryBusiness" th:field="*{primaryBusiness}" class="form-control" type="text" disabled>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-            </div>
 
-
 
-            <div class="row">
 
-                <div class="col-sm-6">
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">营业执照：</label>
 
-                        <div class="col-sm-8">
 
-                            <div class="fileinput fileinput-new">
 
-                                <div class="fileinput-new thumbnail" style="width: 140px; height: 140px;" onclick="openImg(this)">
 
-                                    <img th:src="@{*{businessLicenseUrl}}" >
 
-                                </div>
 
-                            </div>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-                <div class="col-sm-6">
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">企业默认图片：</label>
 
-                        <div class="col-sm-8">
 
-                            <div class="fileinput fileinput-new">
 
-                                <div class="fileinput-new thumbnail" style="width: 140px; height: 140px;" onclick="openImg(this)">
 
-                                    <img th:src="@{*{defaultImgUrl}}"  style="width: 100%;height: 100%">
 
-                                </div>
 
-                            </div>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-            </div>
 
-
 
-            <div class="row">
 
-                <div class="col-sm-6">
 
-                    <div class="form-group">
 
-                    <label class="col-sm-4 control-label">企业宣传图片：</label>
 
-                    <div class="col-sm-8">
 
-                        <div class="fileinput fileinput-new">
 
-                            <div class="fileinput-new thumbnail" style="max-width: 140px; max-width: 140px;" onclick="openImg(this)">
 
-                                <img th:src="@{*{propagandaImgUrl}}"   style="max-width: 100%;max-width: 100%">
 
-                            </div>
 
-                        </div>
 
-                    </div>
 
-                </div></div>
 
-                <div class="col-sm-6"></div>
 
-            </div>
 
-
 
-            <div class="form-group">
 
-                <label class="col-sm-2 control-label">企业介绍：</label>
 
-                <div class="col-sm-10">
 
-                    <textarea name="companyIntroduce" class="form-control" disabled>[[*{companyIntroduce}]]</textarea>
 
-                </div>
 
-            </div>
 
-
 
-        </form>
 
-        <div th:if="@{${companyReviewed.status}!='0'}">
 
-            <h4  class="form-header h4">审核信息 </h4>
 
-            <!--已审核信息回显-->
 
-            <form class="form-horizontal m" id="form-status1">
 
-                <div class="row">
 
-                    <div class="col-sm-6">
 
-                        <div class="form-group">
 
-                            <label class="col-sm-4 control-label">审核结果：</label>
 
-                            <div class="col-sm-8" id="div_status">
 
-                            </div>
 
-                        </div>
 
-                    </div>
 
-                    <div class="col-sm-6">
 
-                        <div class="form-group">
 
-                            <label class="col-sm-4 control-label">审核人：</label>
 
-                            <label class="col-sm-4">
 
-                                <input name="primaryBusiness" th:field="${companyReviewed.companyExamine.createBy}" class="form-control" type="text" disabled>
 
-                            </label>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-                <div class="form-group">
 
-                    <label class="col-sm-2 control-label">审核时间：</label>
 
-                    <div class="col-sm-2">
 
-                        <input name="establishDate" th:value="${companyReviewed.companyExamine.examineDate}"
 
-                               class="form-control" placeholder="yyyy-MM-dd" type="text" disabled>
 
-                    </div>
 
-                </div>
 
-                <div class="form-group">
 
-                    <label class="col-sm-2 control-label">审核结论：</label>
 
-                    <div class="col-sm-10">
 
-                        <textarea name="rejectReason" class="form-control" disabled>[[${companyReviewed.companyExamine.rejectReason}]]</textarea>
 
-                    </div>
 
-                </div>
 
-            </form>
 
-
 
-        </div>
 
-
 
-
 
-    </div>
 
-    <th:block th:include="include :: footer" />
 
-    <th:block th:include="include :: datetimepicker-js" />
 
-    <script th:inline="javascript">
 
-        var datas = [[${@dict.getType('examine_status')}]];
 
-        var prefix = ctx + "company/enterexamine";
 
-
 
-
 
-        $(function() {
 
-
 
-        })
 
-
 
-
 
-        function submitHandler(){
 
-            $.modal.close()
 
-        }
 
-
 
-        function openImg(self){
 
-            var img = $(self).children("img")
 
-            layer.open({
 
-                type: 1,
 
-                title: false,
 
-                shade: 0.0001,
 
-                area: ['auto    '],
 
-                shadeClose: true,
 
-                content: $(img)
 
-            });
 
-        }
 
-
 
-    </script>
 
-</body>
 
-</html>

+ 0 - 74
dgtly-admin/src/main/resources/templates/company/edit/infoHistory.html
View File 

@@ -1,74 +0,0 @@
 
-<!DOCTYPE html>
 
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 
-<head>
 
-    <meta charset="utf-8">
 
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-    <link th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
 
-    <link th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
 
-    <link th:href="@{/css/main/animate.min.css}" rel="stylesheet"/>
 
-    <link th:href="@{/css/style.css}" rel="stylesheet"/>
 
-</head>
 
-<body class="gray-bg">
 
-<div class="row animated fadeInRight">
 
-    <div class="ibox float-e-margins">
 
-        <div class="text-center float-e-margins p-md">
 
-            <h1>商户信息修改记录</h1>
 
-        </div>
 
-        <div>
 
-            <div class="vertical-container light-timeline">
 
-                <div class="vertical-timeline-block" th:each="item:${list}">
 
-
 
-                    <div th:switch="*{item.status}">
 
-                        <div class="vertical-timeline-icon yellow-bg" th:case="0">
 
-                            <i th:class="@{*{item.reason}=='1'}?'fa fa-edit':'fa fa-reply'"></i>
 
-                        </div>
 
-                        <div class="vertical-timeline-icon navy-bg" th:case="1 ">
 
-                            <i th:class="@{*{item.reason}=='1'}?'fa fa-edit':'fa fa-reply'"></i>
 
-                        </div>
 
-                        <div class="vertical-timeline-icon red-bg" th:case="2">
 
-                            <i th:class="@{*{item.reason}=='1'}?'fa fa-edit':'fa fa-reply'"></i>
 
-                        </div>
 
-                    </div>
 
-                    <div class="vertical-timeline-content">
 
-                        <h2 >
 
-                            <span th:text="@{*{item.reason}=='1'}?'修改商户信息':'商户入驻'"></span>
 
-                            <span th:if="@{*{item.status}=='0'}">（审核中...）</span>
 
-                            <span th:if="@{*{item.status}=='1'}">（已审核）</span>
 
-                            <span th:if="@{*{item.status}=='2'}">（已拒绝）</span>
 
-                        </h2>
 
-                        <div>
 
-                            <div class="row">
 
-                                <label class="col-sm-2 control-label">商户名称：</label>
 
-                                <label class="col-sm-4 control-label">[[*{item.companyName}]]</label>
 
-
 
-                                <label class="col-sm-2 control-label">详细地址：</label>
 
-                                <label class="col-sm-4 control-label">[[*{item.detailAddress}]]</label>
 
-                            </div>
 
-                            <div class="row">
 
-                                <label class="col-sm-2 control-label">联系电话：</label>
 
-                                <label class="col-sm-4 control-label">[[*{item.contactNumber}]]</label>
 
-
 
-                                <label class="col-sm-2 control-label">法人：</label>
 
-                                <label class="col-sm-4 control-label">[[*{item.legalPerson}]]</label>
 
-                            </div>
 
-
 
-                        </div>
 
-                        <button type="button" class="btn btn-sm btn-primary"
 
-                                th:onclick="'javascript:openM('+*{item.id}+')'">查看详情</button>
 
-                        <span class="vertical-date">
 
-                                <small th:text="${#dates.format(item.createTime, 'yyyy年MM月dd日 HH:mm:ss')}"></small>
 
-                        </span>
 
-                    </div>
 
-                </div>
 
-            </div>
 
-        </div>
 
-    </div>
 
-</div>
 
-<th:block th:include="include :: footer"/>
 
-<script th:inline="javascript">
 
-    function openM(id){
 
-        $.modal.openFull("提交详情","/company/edit/historyInfo/"+id)
 
-    }
 
-</script>
 
-</body>
 
-</html>

+ 0 - 368
dgtly-admin/src/main/resources/templates/company/editexamine/approve.html
View File 

@@ -1,368 +0,0 @@
 
-<!DOCTYPE html>
 
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 
-<head>
 
-    <th:block th:include="include :: header('修改商户审核')" />
 
-    <th:block th:include="include :: datetimepicker-css" />
 
-</head>
 
-<body class="white-bg">
 
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
 
-        <div class="row">
 
-            <div class="col-sm-5">
 
-                <!-- 提交信息查看-->
 
-                <form class="form-horizontal m"  th:object="${sysCompany}">
 
-
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">商户名称：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="companyName" th:field="*{companyName}"  class="form-control" type="text" disabled required>
 
-                        </div>
 
-                    </div>
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">企业类型：</label>
 
-                        <div class="col-sm-8">
 
-                            <select name="sex" class="form-control m-b" th:with="type=${@dict.getType('company_type')}" disabled>
 
-                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{companyType}"></option>
 
-                            </select>
 
-                        </div>
 
-                    </div>
 
-
 
-
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">详细地址：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="detailAddress" th:field="*{detailAddress}" class="form-control" type="text" disabled>
 
-                        </div>
 
-                    </div>
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">企业法人：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="legalPerson" th:field="*{legalPerson}" class="form-control" type="text" disabled>
 
-                        </div>
 
-                    </div>
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">经度：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="longitude" th:field="*{longitude}" class="form-control" type="text" disabled>
 
-                        </div>
 
-                    </div>
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">纬度：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="latitude" th:field="*{latitude}" class="form-control" type="text" disabled>
 
-                        </div>
 
-                    </div>
 
-
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">联系电话：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="contactNumber" th:field="*{contactNumber}" class="form-control" type="text" disabled>
 
-                        </div>
 
-                    </div>
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">成立日期：</label>
 
-                        <div class="col-sm-8">
 
-                            <div class="input-group date">
 
-                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
 
-                                <input name="establishDate" th:value="${#dates.format(companyReviewed.establishDate, 'yyyy-MM-dd')}"
 
-                                       class="form-control" placeholder="yyyy-MM-dd" type="text" disabled>
 
-                            </div>
 
-                        </div>
 
-                    </div>
 
-
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">统一社会信用代码：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="unifiedSocialCreditCode" th:field="*{unifiedSocialCreditCode}" class="form-control" type="text" disabled>
 
-                        </div>
 
-                    </div>
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">主营业务：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="primaryBusiness" th:field="*{primaryBusiness}" class="form-control" type="text" disabled>
 
-                        </div>
 
-                    </div>
 
-
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">营业执照：</label>
 
-                        <div class="col-sm-8">
 
-                            <div class="fileinput fileinput-new">
 
-                                <div class="fileinput-new thumbnail" style="max-width: 140px; max-height: 140px;" onclick="openImg(this)">
 
-                                    <img th:src="@{*{businessLicenseUrl}}" id="img-businessLicenseUrl" >
 
-                                </div>
 
-                            </div>
 
-                        </div>
 
-                    </div>
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">企业默认图片：</label>
 
-                        <div class="col-sm-8">
 
-                            <div class="fileinput fileinput-new">
 
-                                <div class="fileinput-new thumbnail" style="max-width: 140px; max-height: 140px;" onclick="openImg(this)">
 
-                                    <img th:src="@{*{defaultImgUrl}}" id="img-defaultImgUrl" >
 
-                                </div>
 
-                            </div>
 
-                        </div>
 
-                    </div>
 
-
 
-                    <div class="form-group">
 
-                                <label class="col-sm-4 control-label">企业宣传图片：</label>
 
-                                <div class="col-sm-8">
 
-                                    <div class="fileinput fileinput-new">
 
-                                        <div class="fileinput-new thumbnail" style="max-width: 140px; max-height: 140px;" onclick="openImg(this)">
 
-                                            <img th:src="@{*{propagandaImgUrl}}"  >
 
-                                        </div>
 
-                                    </div>
 
-                                </div>
 
-                            </div>
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">企业介绍：</label>
 
-                        <div class="col-sm-8">
 
-                            <textarea name="companyIntroduce" class="form-control" disabled>[[*{companyIntroduce}]]</textarea>
 
-                        </div>
 
-                    </div>
 
-
 
-                </form>
 
-            </div>
 
-
 
-            <div class="col-sm-6">
 
-                <input  id="input_status"  th:value="${companyReviewed.status}" type="hidden">
 
-                <form class="form-horizontal m"  th:object="${companyReviewed}">
 
-
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">商户名称：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="companyName" th:field="*{companyName}"  class="form-control" type="text" disabled required>
 
-                        </div>
 
-                    </div>
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">企业类型：</label>
 
-                        <div class="col-sm-8">
 
-                            <select name="sex" class="form-control m-b" th:with="type=${@dict.getType('company_type')}" disabled>
 
-                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{companyType}"></option>
 
-                            </select>
 
-                        </div>
 
-                    </div>
 
-
 
-
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">详细地址：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="detailAddress" th:field="*{detailAddress}" class="form-control" type="text" disabled>
 
-                        </div>
 
-                    </div>
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">企业法人：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="legalPerson" th:field="*{legalPerson}" class="form-control" type="text" disabled>
 
-                        </div>
 
-                    </div>
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">经度：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="longitude" th:field="*{longitude}" class="form-control" type="text" disabled>
 
-                        </div>
 
-                    </div>
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">纬度：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="latitude" th:field="*{latitude}" class="form-control" type="text" disabled>
 
-                        </div>
 
-                    </div>
 
-
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">联系电话：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="contactNumber" th:field="*{contactNumber}" class="form-control" type="text" disabled>
 
-                        </div>
 
-                    </div>
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">成立日期：</label>
 
-                        <div class="col-sm-8">
 
-                            <div class="input-group date">
 
-                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
 
-                                <input name="establishDate" th:value="${#dates.format(companyReviewed.establishDate, 'yyyy-MM-dd')}"
 
-                                       class="form-control" placeholder="yyyy-MM-dd" type="text" disabled>
 
-                            </div>
 
-                        </div>
 
-                    </div>
 
-
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">统一社会信用代码：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="unifiedSocialCreditCode" th:field="*{unifiedSocialCreditCode}" class="form-control" type="text" disabled>
 
-                        </div>
 
-                    </div>
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">主营业务：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="primaryBusiness" th:field="*{primaryBusiness}" class="form-control" type="text" disabled>
 
-                        </div>
 
-                    </div>
 
-
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">营业执照：</label>
 
-                        <div class="col-sm-8">
 
-                            <div class="fileinput fileinput-new">
 
-                                <div class="fileinput-new thumbnail" style="width: 140px; height: 140px;" onclick="openImg(this)">
 
-                                    <img th:src="@{*{businessLicenseUrl}}" style=" width: 100%; height: 100%;">
 
-                                </div>
 
-                            </div>
 
-                        </div>
 
-                    </div>
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">企业默认图片：</label>
 
-                        <div class="col-sm-8">
 
-                            <div class="fileinput fileinput-new">
 
-                                <div class="fileinput-new thumbnail" style="width: 140px; height: 140px;" onclick="openImg(this)">
 
-                                    <img th:src="@{*{defaultImgUrl}}" style=" width: 100%; height: 100%;">
 
-                                </div>
 
-                            </div>
 
-                        </div>
 
-                    </div>
 
-
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">企业宣传图片：</label>
 
-                        <div class="col-sm-8">
 
-                            <div class="fileinput fileinput-new">
 
-                                <div class="fileinput-new thumbnail" style="width: 140px; height: 140px;" onclick="openImg(this)">
 
-                                    <img th:src="@{*{propagandaImgUrl}}"  style=" width: 100%; height: 100%;">
 
-                                </div>
 
-                            </div>
 
-                        </div>
 
-                    </div>
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">企业介绍：</label>
 
-                        <div class="col-sm-8">
 
-                            <textarea name="companyIntroduce" class="form-control" disabled>[[*{companyIntroduce}]]</textarea>
 
-                        </div>
 
-                    </div>
 
-
 
-                </form>
 
-            </div>
 
-
 
-        </div>
 
-
 
-        <h4 class="form-header h4">审核信息 </h4>
 
-        <!--已审核信息回显-->
 
-        <form class="form-horizontal m" id="form-status1">
 
-            <div class="row">
 
-                <div class="col-sm-6">
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">审核结果：</label>
 
-                        <div class="col-sm-8" id="div_status">
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-                <div class="col-sm-6">
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">审核人：</label>
 
-                        <label class="col-sm-4">
 
-                            <input name="primaryBusiness" th:field="${companyReviewed.companyExamine.createBy}" class="form-control" type="text" disabled>
 
-                        </label>
 
-                    </div>
 
-                </div>
 
-            </div>
 
-            <div class="form-group">
 
-                <label class="col-sm-2 control-label">审核时间：</label>
 
-                <div class="col-sm-2">
 
-                    <input name="establishDate" th:value="${companyReviewed.companyExamine.examineDate}"
 
-                           class="form-control" placeholder="yyyy-MM-dd" type="text" disabled>
 
-                </div>
 
-            </div>
 
-            <div class="form-group">
 
-                <label class="col-sm-2 control-label">审核结论：</label>
 
-                <div class="col-sm-10">
 
-                    <textarea name="rejectReason" class="form-control" disabled>[[${companyReviewed.companyExamine.rejectReason}]]</textarea>
 
-                </div>
 
-            </div>
 
-        </form>
 
-        <!--未审核的审核提交-->
 
-        <form id="form_status0" class="form-horizontal m" >
 
-            <input name="companyReviewedId" id="input_companyReviewedId"  th:value="${companyReviewed.id}" type="hidden">
 
-            <input name="status" id="input_CEstatus"  type="hidden">
 
-            <div class="row">
 
-                <div class="form-group">
 
-                    <label class="col-sm-1 control-label">审核结论：</label>
 
-                    <div class="col-sm-10">
 
-                        <textarea name="rejectReason" class="form-control">[[${companyReviewed.companyExamine.rejectReason}]]</textarea>
 
-                    </div>
 
-                </div>
 
-            </div>
 
-            <div class="row">
 
-                <div class="col-sm-10"></div>
 
-                <div class="col-sm-2">
 
-                    <a class="btn btn-primary single " href="javascript:void(0)" onclick="approve(1)" >
 
-                        <i class="fa fa-edit"></i> 通过
 
-                    </a>
 
-                    <a class="btn btn-danger multiple " href="javascript:void(0)" onclick="approve(2)" >
 
-                        <i class="fa fa-remove"></i> 拒绝
 
-                    </a>
 
-                </div>
 
-            </div>
 
-        </form>
 
-
 
-    </div>
 
-<th:block th:include="include :: footer" />
 
-<th:block th:include="include :: datetimepicker-js" />
 
-<script th:inline="javascript">
 
-    var datas = [[${@dict.getType('examine_status')}]];
 
-    var prefix = ctx + "company/editexamine";
 
-
 
-
 
-    $(function() {
 
-        /*判断是否审核*/
 
-        var status = $("#input_status").val()
 
-        if(status=="0"){
 
-            $("#form_status0").show();
 
-            $("#form-status1").hide();
 
-        }else{
 
-
 
-            var div_statusHtml = $.table.selectDictLabel(datas, status)
 
-            /***********添加审核****************************/
 
-            $("#div_status").append(div_statusHtml);
 
-
 
-            $("#form_status0").hide();
 
-            $("#form-status1").show();
 
-        }
 
-
 
-    })
 
-
 
-
 
-    function submitHandler(){
 
-        $.modal.close()
 
-
 
-    }
 
-    function approve(status){
 
-        $("#input_CEstatus").val(status);
 
-        $.ajax({
 
-            type: "POST",
 
-            url: prefix + "/approve",
 
-            data: $('#form_status0').serialize(),
 
-            processData: false,
 
-            dataType: 'json',
 
-            success: function(result) {
 
-                if (result.code == web_status.SUCCESS) {
 
-                    $.modal.msgReload("成功","success")
 
-                } else {
 
-                    $.modal.alertError(result.msg);
 
-                }
 
-            },
 
-            error: function(error) {
 
-                $.modal.alertWarning("审核失败。");
 
-            }
 
-        });
 
-    }
 
-    function openImg(self){
 
-        var img = $(self).children("img")
 
-        layer.open({
 
-            type: 1,
 
-            title: false,
 
-            shade: 0.0001,
 
-            area: ['auto'],
 
-            shadeClose: true,
 
-            content: $(img)
 
-        });
 
-    }
 
-
 
-</script>
 
-</body>
 
-</html>

+ 0 - 157
dgtly-admin/src/main/resources/templates/company/editexamine/reviewed.html
View File 

@@ -1,157 +0,0 @@
 
-<!DOCTYPE html>
 
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 
-<head>
 
-    <th:block th:include="include :: header('入驻列表')" />
 
-</head>
 
-<body class="gray-bg">
 
-     <div class="container-div">
 
-        <div class="row">
 
-            <div class="col-sm-12 search-collapse">
 
-                <form id="formId">
 
-                    <div class="select-list">
 
-                        <ul>
 
-                            <li>
 
-                                <p>企业名称：</p>
 
-                                <input type="text" name="companyName"/>
 
-                            </li>
 
-                            <li>
 
-                                <p>企业类型：</p>
 
-                                <select name="companyType" th:with="type=${@dict.getType('company_type')}">
 
-                                    <option value="">所有</option>
 
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
 
-                                </select>
 
-                            </li>
 
-                            <li>
 
-                                <p>企业法人：</p>
 
-                                <input type="text" name="legalPerson"/>
 
-                            </li>
 
-                            <li>
 
-                                    <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
 
-                                    <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
 
-                            </li>
 
-                        </ul>
 
-                    </div>
 
-                </form>
 
-            </div>
 
-
 
-            <div class="btn-group-sm" id="toolbar" role="group">
 
-                <!--<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:examine:add">
 
-                    <i class="fa fa-plus"></i> 添加
 
-                </a>
 
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:examine:edit">
 
-                    <i class="fa fa-edit"></i> 修改
 
-                </a>
 
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:examine:remove">
 
-                    <i class="fa fa-remove"></i> 删除
 
-                </a>
 
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="companyext:examine:export">
 
-                    <i class="fa fa-download"></i> 导出
 
-                 </a>-->
 
-            </div>
 
-            <div class="col-sm-12 select-table table-striped">
 
-                <table id="bootstrap-table"></table>
 
-            </div>
 
-        </div>
 
-    </div>
 
-    <th:block th:include="include :: footer" />
 
-    <script th:inline="javascript">
 
-        var approveFlag = [[${@permission.hasPermi('company:editexamine:approvePage')}]];
 
-        var companyTypes = [[${@dict.getType('company_type')}]];
 
-        var examineStatus = [[${@dict.getType('examine_status')}]];
 
-        var prefix = ctx + "company/editexamine";
 
-
 
-        $(function() {
 
-            var options = {
 
-                url: prefix + "/list",
 
-                createUrl: prefix + "/add",
 
-                modalName: "商户审核",
 
-                columns: [{
 
-                    checkbox: true
 
-                },
 
-                {
 
-                    field : 'id', 
-                    title : '主键',
 
-                    visible: false
 
-                },
 
-                {
 
-                    field : 'companyId', 
-                    title : '商户(公司)Id',
 
-                    visible: false
 
-                },
 
-                {
 
-                    field : 'companyName',
 
-                    title : '企业名称'
 
-                },
 
-                {
 
-                    field : 'companyType',
 
-                    title : '企业类型',
 
-                    align: 'center',
 
-                    formatter: function(value, row, index) {
 
-                        return $.table.selectDictLabel(companyTypes, value);
 
-                    }
 
-                },
 
-                {
 
-                    field : 'legalPerson',
 
-                    title : '企业法人'
 
-                },
 
-                {
 
-                    field : 'contactNumber',
 
-                    title : '联系电话'
 
-                },
 
-                {
 
-                    field : 'status', 
-                    title : '审核状态',
 
-                    align: 'center',
 
-                    formatter: function(value, row, index) {
 
-                        return $.table.selectDictLabel(examineStatus, value)
 
-                       /* if(value=='0'){
 
-                            return '<span class="badge badge-warning">'+ $.table.selectDictLabel(examineStatus, value)+'</span>'
 
-                        }else if(value=='1'){
 
-                            return '<span class="badge badge-danger">'+ $.table.selectDictLabel(examineStatus, value)+'</span>'
 
-                        }*/
 
-                    }
 
-                },
 
-                {
 
-                    field : 'createTime',
 
-                    title : '申请日期'
 
-                },
 
-                {
 
-                    field : 'companyExamine.examineDate',
 
-                    title : '审核日期'
 
-                },
 
-                {
 
-                    field : 'companyExamine.createBy',
 
-                    title : '审核人'
 
-                },
 
-                {
 
-                    title: '操作',
 
-                    align: 'center',
 
-                    formatter: function(value, row, index) {
 
-                        var actions = [];
 
-                        if(row.status=="0"){
 
-                            actions.push('<a class="btn btn-primary btn-xs ' + approveFlag + '" href="javascript:void(0)" onclick="audit(' + row.id + ')"><i class="fa fa-edit"></i>审核</a> ');
 
-                        }else{
 
-                            actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="audit(' + row.id + ')"><i class="fa fa-edit"></i>查看详情</a> ');
 
-                        }
 
-
 
-                        return actions.join('');
 
-                    }
 
-                }]
 
-            };
 
-            $.table.init(options);
 
-            audit=function(id){
 
-                if(id==null && id==""){
 
-                    return;
 
-                }
 
-
 
-                $.modal.openFull("审核商户信息修改",prefix + "/approvePage/"+id);
 
-            }
 
-
 
-        });
 
-        function cb(index, layero){
 
-            layer.close(index);
 
-            $.table.refresh()
 
-        }
 
-    </script>
 
-</body>
 
-</html>

+ 0 - 301
dgtly-admin/src/main/resources/templates/company/enterexamine/approve.html
View File 

@@ -1,301 +0,0 @@
 
-<!DOCTYPE html>
 
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 
-<head>
 
-    <th:block th:include="include :: header('修改商户审核')" />
 
-    <th:block th:include="include :: datetimepicker-css" />
 
-</head>
 
-<body class="white-bg">
 
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
 
-        <input  id="input_status"  th:value="${companyReviewed.status}" type="hidden">
 
-        <!-- 提交信息查看-->
 
-        <form class="form-horizontal m" id="form-companyReviewed" th:object="${companyReviewed}">
 
-            <div class="row">
 
-                <div class="col-sm-6"></div>
 
-                <div class="col-sm-6"></div>
 
-            </div>
 
-            <div class="row">
 
-                <div class="col-sm-6">
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">商户名称：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="companyName" th:field="*{companyName}"  class="form-control" type="text" disabled required>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-                <div class="col-sm-6">
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">企业类型：</label>
 
-                        <div class="col-sm-8">
 
-                            <select name="sex" class="form-control m-b" th:with="type=${@dict.getType('company_type')}" disabled>
 
-                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{companyType}"></option>
 
-                            </select>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-            </div>
 
-
 
-
 
-            <div class="row">
 
-                <div class="col-sm-6">
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">详细地址：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="detailAddress" th:field="*{detailAddress}" class="form-control" type="text" disabled>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-                <div class="col-sm-6">
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">企业法人：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="legalPerson" th:field="*{legalPerson}" class="form-control" type="text" disabled>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-            </div>
 
-
 
-
 
-            <div class="row">
 
-                <div class="col-sm-6">
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">经度：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="longitude" th:field="*{longitude}" class="form-control" type="text" disabled>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-                <div class="col-sm-6">
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">纬度：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="latitude" th:field="*{latitude}" class="form-control" type="text" disabled>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-            </div>
 
-
 
-            <div class="row">
 
-                <div class="col-sm-6">
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">联系电话：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="contactNumber" th:field="*{contactNumber}" class="form-control" type="text" disabled>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-                <div class="col-sm-6">
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">成立日期：</label>
 
-                        <div class="col-sm-8">
 
-                            <div class="input-group date">
 
-                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
 
-                                <input name="establishDate" th:value="${#dates.format(companyReviewed.establishDate, 'yyyy-MM-dd')}"
 
-                                       class="form-control" placeholder="yyyy-MM-dd" type="text" disabled>
 
-                            </div>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-            </div>
 
-
 
-            <div class="row">
 
-                <div class="col-sm-6">
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">统一社会信用代码：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="unifiedSocialCreditCode" th:field="*{unifiedSocialCreditCode}" class="form-control" type="text" disabled>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-                <div class="col-sm-6">
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">主营业务：</label>
 
-                        <div class="col-sm-8">
 
-                            <input name="primaryBusiness" th:field="*{primaryBusiness}" class="form-control" type="text" disabled>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-            </div>
 
-
 
-            <div class="row">
 
-                <div class="col-sm-6">
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">营业执照：</label>
 
-                        <div class="col-sm-8">
 
-                            <div class="fileinput fileinput-new">
 
-                                <div class="row" style="margin-left: 0px;">
 
-                                    <div class="fileinput-new thumbnail col-sm-6"
 
-                                         style="width: 140px; height: 140px;" onclick="openImg(this)" th:each="item,it:${businessLicenseUrls}">
 
-                                        <img th:src="${item}" id="img-businessLicenseUrl" style=" width: 100%; height: 100%;">
 
-                                    </div>
 
-                                </div>
 
-                            </div>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-                <div class="col-sm-6">
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">企业默认图片：</label>
 
-                        <div class="col-sm-8">
 
-                            <div class="fileinput fileinput-new">
 
-                                <div class="fileinput-new thumbnail"
 
-                                     style="width: 140px; height: 140px;" onclick="openImg(this)">
 
-                                    <img th:src="@{*{defaultImgUrl}}" id="img-defaultImgUrl"  style=" width: 100%; height: 100%;">
 
-                                </div>
 
-                            </div>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-            </div>
 
-
 
-            <div class="row">
 
-                <div class="col-sm-6">
 
-                    <div class="form-group">
 
-                    <label class="col-sm-4 control-label">企业宣传图片：</label>
 
-                    <div class="col-sm-8">
 
-                        <div class="fileinput fileinput-new">
 
-                            <div class="row" style="margin-left: 0px;">
 
-                                <div class="fileinput-new thumbnail col-sm-6"
 
-                                     style="width: 140px; height: 140px;" onclick="openImg(this)" th:each="item,it:${propagandaImgUrls}">
 
-                                    <img th:src="${item}" id="img-propagandaImgUrl" style=" width: 100%; height: 100%;">
 
-                                </div>
 
-                            </div>
 
-                        </div>
 
-                    </div>
 
-                </div></div>
 
-                <div class="col-sm-6"></div>
 
-            </div>
 
-
 
-            <div class="form-group">
 
-                <label class="col-sm-2 control-label">企业介绍：</label>
 
-                <div class="col-sm-10">
 
-                    <textarea name="companyIntroduce" class="form-control" disabled>[[*{companyIntroduce}]]</textarea>
 
-                </div>
 
-            </div>
 
-
 
-        </form>
 
-        <h4 class="form-header h4">审核信息 </h4>
 
-        <!--已审核信息回显-->
 
-        <form class="form-horizontal m" id="form-status1">
 
-            <div class="row">
 
-                <div class="col-sm-6">
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">审核结果：</label>
 
-                        <div class="col-sm-8" id="div_status">
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-                <div class="col-sm-6">
 
-                    <div class="form-group">
 
-                        <label class="col-sm-4 control-label">审核人：</label>
 
-                        <label class="col-sm-4">
 
-                            <input name="primaryBusiness" th:field="${companyReviewed.companyExamine.createBy}" class="form-control" type="text" disabled>
 
-                        </label>
 
-                    </div>
 
-                </div>
 
-            </div>
 
-            <div class="form-group">
 
-                <label class="col-sm-2 control-label">审核时间：</label>
 
-                <div class="col-sm-2">
 
-                    <input name="establishDate" th:value="${companyReviewed.companyExamine.examineDate}"
 
-                           class="form-control" placeholder="yyyy-MM-dd" type="text" disabled>
 
-                </div>
 
-            </div>
 
-            <div class="form-group">
 
-                <label class="col-sm-2 control-label">审核结论：</label>
 
-                <div class="col-sm-10">
 
-                    <textarea name="rejectReason" class="form-control" disabled>[[${companyReviewed.companyExamine.rejectReason}]]</textarea>
 
-                </div>
 
-            </div>
 
-        </form>
 
-        <!--未审核的审核提交-->
 
-        <form id="form_status0" class="form-horizontal m" >
 
-            <input name="companyReviewedId" id="input_companyReviewedId"  th:value="${companyReviewed.id}" type="hidden">
 
-            <input name="status" id="input_CEstatus"  type="hidden">
 
-            <div class="row">
 
-                <div class="form-group">
 
-                    <label class="col-sm-2 control-label">审核结论：</label>
 
-                    <div class="col-sm-10">
 
-                        <textarea name="rejectReason" class="form-control">[[${companyReviewed.companyExamine.rejectReason}]]</textarea>
 
-                    </div>
 
-                </div>
 
-            </div>
 
-            <div class="row">
 
-                <div class="col-sm-8"></div>
 
-                <div class="col-sm-4">
 
-                    <a class="btn btn-primary single " href="javascript:void(0)" onclick="approve(1)" >
 
-                        <i class="fa fa-edit"></i> 通过
 
-                    </a>
 
-                    <a class="btn btn-danger multiple " href="javascript:void(0)" onclick="approve(2)" >
 
-                        <i class="fa fa-remove"></i> 拒绝
 
-                    </a>
 
-                </div>
 
-            </div>
 
-
 
-        </form>
 
-
 
-    </div>
 
-    <th:block th:include="include :: footer" />
 
-    <th:block th:include="include :: datetimepicker-js" />
 
-    <script th:inline="javascript">
 
-        var datas = [[${@dict.getType('examine_status')}]];
 
-        var prefix = ctx + "company/enterexamine";
 
-
 
-
 
-        $(function() {
 
-          /*判断是否审核*/
 
-            var status = $("#input_status").val()
 
-            if(status=="0"){
 
-                $("#form_status0").show();
 
-                $("#form-status1").hide();
 
-            }else{
 
-
 
-                var div_statusHtml = $.table.selectDictLabel(datas, status)
 
-                /***********添加审核****************************/
 
-                $("#div_status").append(div_statusHtml);
 
-
 
-                $("#form_status0").hide();
 
-                $("#form-status1").show();
 
-            }
 
-
 
-        })
 
-
 
-
 
-        function submitHandler(){
 
-            $.modal.close()
 
-
 
-        }
 
-        function approve(status){
 
-            $("#input_CEstatus").val(status);
 
-            $.ajax({
 
-                type: "POST",
 
-                url: prefix + "/approve",
 
-                data: $('#form_status0').serialize(),
 
-                processData: false,
 
-                dataType: 'json',
 
-                success: function(result) {
 
-                    if (result.code == web_status.SUCCESS) {
 
-                        $.modal.msgReload("成功","success")
 
-                    } else {
 
-                        $.modal.alertError(result.msg);
 
-                    }
 
-                },
 
-                error: function(error) {
 
-                    $.modal.alertWarning("审核失败。");
 
-                }
 
-            });
 
-        }
 
-        function openImg(self){
 
-            var img = $(self).children("img")
 
-            layer.open({
 
-                type: 1,
 
-                title: false,
 
-                shade: 0.0001,
 
-                area: ['auto'],
 
-                shadeClose: true,
 
-                content: $(img)
 
-            });
 
-        }
 
-
 
-    </script>
 
-</body>
 
-</html>

+ 0 - 145
dgtly-admin/src/main/resources/templates/company/enterexamine/reviewed.html
View File 

@@ -1,145 +0,0 @@
 
-<!DOCTYPE html>
 
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 
-<head>
 
-    <th:block th:include="include :: header('修改列表')" />
 
-</head>
 
-<body class="gray-bg">
 
-     <div class="container-div">
 
-        <div class="row">
 
-            <div class="col-sm-12 search-collapse">
 
-                <form id="formId">
 
-                    <div class="select-list">
 
-                        <ul>
 
-                            <li>
 
-                                <p>企业名称：</p>
 
-                                <input type="text" name="companyName"/>
 
-                            </li>
 
-                            <li>
 
-                                <p>企业类型：</p>
 
-                                <select name="companyType" th:with="type=${@dict.getType('company_type')}">
 
-                                    <option value="">所有</option>
 
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
 
-                                </select>
 
-                            </li>
 
-                            <li>
 
-                                <p>企业法人：</p>
 
-                                <input type="text" name="legalPerson"/>
 
-                            </li>
 
-                            <li>
 
-                                    <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
 
-                                    <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
 
-                            </li>
 
-                        </ul>
 
-                    </div>
 
-                </form>
 
-            </div>
 
-
 
-            <div class="btn-group-sm" id="toolbar" role="group">
 
-            </div>
 
-            <div class="col-sm-12 select-table table-striped">
 
-                <table id="bootstrap-table"></table>
 
-            </div>
 
-        </div>
 
-    </div>
 
-    <th:block th:include="include :: footer" />
 
-    <script th:inline="javascript">
 
-        var approveFlag = [[${@permission.hasPermi('companyext:noexamine:approve')}]];
 
-        var companyTypes = [[${@dict.getType('company_type')}]];
 
-        var examineStatus = [[${@dict.getType('examine_status')}]];
 
-        var prefix = ctx + "company/enterexamine";
 
-
 
-        $(function() {
 
-            var options = {
 
-                url: prefix + "/list",
 
-                createUrl: prefix + "/add",
 
-                modalName: "商户审核",
 
-                columns: [{
 
-                    checkbox: true
 
-                },
 
-                {
 
-                    field : 'id', 
-                    title : '主键',
 
-                    visible: false
 
-                },
 
-                {
 
-                    field : 'companyId', 
-                    title : '商户(公司)Id',
 
-                    visible: false
 
-                },
 
-                {
 
-                    field : 'companyName',
 
-                    title : '企业名称'
 
-                },
 
-                {
 
-                    field : 'companyType',
 
-                    title : '企业类型',
 
-                    align: 'center',
 
-                    formatter: function(value, row, index) {
 
-                        return $.table.selectDictLabel(companyTypes, value);
 
-                    }
 
-                },
 
-                {
 
-                    field : 'legalPerson',
 
-                    title : '企业法人'
 
-                },
 
-                {
 
-                    field : 'contactNumber',
 
-                    title : '联系电话'
 
-                },
 
-                {
 
-                    field : 'status', 
-                    title : '审核状态',
 
-                    align: 'center',
 
-                    formatter: function(value, row, index) {
 
-                        return $.table.selectDictLabel(examineStatus, value)
 
-                       /* if(value=='0'){
 
-                            return '<span class="badge badge-warning">'+ $.table.selectDictLabel(examineStatus, value)+'</span>'
 
-                        }else if(value=='1'){
 
-                            return '<span class="badge badge-danger">'+ $.table.selectDictLabel(examineStatus, value)+'</span>'
 
-                        }*/
 
-                    }
 
-                },
 
-                {
 
-                    field : 'createTime',
 
-                    title : '申请日期'
 
-                },
 
-                {
 
-                    field : 'companyExamine.examineDate',
 
-                    title : '审核日期'
 
-                },
 
-                {
 
-                    field : 'companyExamine.createBy',
 
-                    title : '审核人'
 
-                },
 
-                {
 
-                    title: '操作',
 
-                    align: 'center',
 
-                    formatter: function(value, row, index) {
 
-                        var actions = [];
 
-                        if(row.status=="0"){
 
-                            actions.push('<a class="btn btn-primary btn-xs ' + approveFlag + '" href="javascript:void(0)" onclick="audit(' + row.id + ')"><i class="fa fa-edit"></i>审核</a> ');
 
-                        }else{
 
-                            actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="audit(' + row.id + ')"><i class="fa fa-edit"></i>查看详情</a> ');
 
-                        }
 
-
 
-                        return actions.join('');
 
-                    }
 
-                }]
 
-            };
 
-            $.table.init(options);
 
-            audit=function(id){
 
-                if(id==null && id==""){
 
-                    return;
 
-                }
 
-
 
-                $.modal.openFull("审核商户",prefix + "/approvePage/"+id);
 
-            }
 
-
 
-        });
 
-        function cb(index, layero){
 
-            layer.close(index);
 
-            $.table.refresh()
 
-        }
 
-    </script>
 
-</body>
 
-</html>

+ 0 - 88
dgtly-admin/src/main/resources/templates/company/honour/add.html
View File 

@@ -1,88 +0,0 @@
 
-<!DOCTYPE html>
 
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 
-<head>
 
-    <th:block th:include="include :: header('新增企业荣誉')" />
 
-    <th:block th:include="include :: jasny-bootstrap-css" />
 
-</head>
 
-<body class="white-bg">
 
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
 
-        <form class="form-horizontal m" id="form-company_honour-add">
 
-            <div class="form-group">
 
-                <label class="col-sm-3 control-label">荣誉标题：</label>
 
-                <div class="col-sm-8">
 
-                    <input class="form-control" type="text" name="title" id="title" required>
 
-                </div>
 
-            </div>
 
-            <div class="form-group">
 
-                <label class="col-sm-3 control-label">荣誉描述：</label>
 
-                <div class="col-sm-8">
 
-                    <textarea name="des" class="form-control"></textarea>
 
-                </div>
 
-            </div>
 
-            <div class="form-group">
 
-                <label class="col-sm-3 control-label">荣誉图片：</label>
 
-                <div class="col-sm-8">
 
-                    <input id="input-img" name="img"  type="hidden">
 
-                    <div class="fileinput fileinput-new" data-provides="fileinput">
 
-                        <div class="fileinput-preview thumbnail" style="width: 200px; height: 150px;">
 
-
 
-                        </div>
 
-                        <div>
 
-                            <span class="btn btn-white btn-file">
 
-                                <span class="fileinput-new">选择图片</span>
 
-                                <span class="fileinput-exists">更改</span>
 
-                                <input id="input-fileinput" type="file">
 
-                            </span>
 
-                            <a href="#" class="btn btn-white fileinput-exists" data-dismiss="fileinput">清除</a>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-            </div>
 
-        </form>
 
-    </div>
 
-    <th:block th:include="include :: footer" />
 
-    <th:block th:include="include :: jasny-bootstrap-js" />
 
-    <script type="text/javascript">
 
-        var prefix = ctx + "company/honour"
 
-        $("#form-company_honour-add").validate({
 
-            focusCleanup: true
 
-        });
 
-        /*选择后提交图片到服务器*******/
 
-        $('.fileinput').on('change.bs.fileinput ', function (e) {
 
-            if ($("#input-fileinput").val() == '') {
 
-                return;
 
-            }var data = new FormData();
 
-            data.append('file', document.getElementById('input-fileinput').files[0]);
 
-            $.ajax({
 
-                url:ctx+"common/upload",
 
-                type:"post",
 
-                data: data,
 
-                cache: false,
 
-                contentType: false,
 
-                processData: false,
 
-                dataType: 'json',
 
-                success: function(result) {
 
-                    if (result.code == web_status.SUCCESS) {
 
-                        $("#input-img").val(result.data.fileName);
 
-                    } else {
 
-                        $.modal.alertError(result.msg);
 
-                    }
 
-                },
 
-                error:function(result) {
 
-                    alert("上传失败")
 
-                }
 
-            });
 
-        });
 
-        function submitHandler() {
 
-            if($("#input-img").val()==undefined||$("#input-img").val()==""){
 
-                $.modal.msgError("请选择荣誉图片")
 
-            }
 
-            if ($.validate.form()) {
 
-                $.operate.save(prefix + "/add", $('#form-company_honour-add').serialize());
 
-            }
 
-        }
 
-
 
-
 
-    </script>
 
-</body>
 
-</html>

+ 0 - 82
dgtly-admin/src/main/resources/templates/company/honour/edit.html
View File 

@@ -1,82 +0,0 @@
 
-<!DOCTYPE html>
 
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 
-<head>
 
-    <th:block th:include="include :: header('修改企业荣誉')" />
 
-    <th:block th:include="include :: jasny-bootstrap-css" />
 
-</head>
 
-<body class="white-bg">
 
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
 
-        <form class="form-horizontal m" id="form-company_honour-edit" th:object="${companyHonour}">
 
-            <input name="honourId" th:field="*{honourId}" type="hidden">
 
-
 
-            <div class="form-group">
 
-                <label class="col-sm-3 control-label">荣誉标题：</label>
 
-                <div class="col-sm-8">
 
-                    <input class="form-control" type="text" name="title" th:field="*{title}" id="title" required>
 
-                </div>
 
-            </div>
 
-            <div class="form-group">
 
-                <label class="col-sm-3 control-label">荣誉描述：</label>
 
-                <div class="col-sm-8">
 
-                    <textarea name="des" class="form-control">[[*{des}]]</textarea>
 
-                </div>
 
-            </div>
 
-            <div class="form-group">
 
-                <label class="col-sm-3 control-label">荣誉图片：</label>
 
-                <div class="col-sm-8">
 
-                    <input id="input-img" name="img"  type="hidden" th:field="*{img}">
 
-                    <img th:src="*{img}" id="img-img" style="max-width: 200px;max-height: 200px">
 
-                    <div>
 
-                        <span class="btn btn-white btn-file">
 
-                            <span class="fileinput-exists">更改</span>
 
-                            <input id="input-fileinput" type="file">
 
-                        </span>
 
-                    </div>
 
-                </div>
 
-            </div>
 
-        </form>
 
-    </div>
 
-    <th:block th:include="include :: footer" />
 
-    <script type="text/javascript">
 
-        var prefix = ctx + "company/honour";
 
-        $("#form-company_honour-edit").validate({
 
-            focusCleanup: true
 
-        });
 
-
 
-        function submitHandler() {
 
-            if($("#input-img").val()==undefined||$("#input-img").val()==""){
 
-                $.modal.msgError("请选择荣誉图片")
 
-            }
 
-            if ($.validate.form()) {
 
-                $.operate.save(prefix + "/edit", $('#form-company_honour-edit').serialize());
 
-            }
 
-        }
 
-        $('#input-fileinput').on('change.bs.fileinput ', function (e) {
 
-            if ($("#input-fileinput").val() == '') {
 
-                return;
 
-            }var data = new FormData();
 
-            data.append('file', document.getElementById('input-fileinput').files[0]);
 
-            $.ajax({
 
-                url:ctx+"common/upload",
 
-                type:"post",
 
-                data: data,
 
-                cache: false,
 
-                contentType: false,
 
-                processData: false,
 
-                dataType: 'json',
 
-                success: function(result) {
 
-                    if (result.code == web_status.SUCCESS) {
 
-                        $("#input-img").val(result.data.fileName);
 
-                        $("#img-img").attr('src',result.data.fileName);
 
-                    } else {
 
-                        $.modal.alertError(result.msg);
 
-                    }
 
-                },
 
-                error:function(result) {
 
-                    alert("上传失败")
 
-                }
 
-            });
 
-        })
 
-    </script>
 
-</body>
 
-</html>

+ 0 - 91
dgtly-admin/src/main/resources/templates/company/honour/honour.html
View File 

@@ -1,91 +0,0 @@
 
-<!DOCTYPE html>
 
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 
-<head>
 
-    <th:block th:include="include :: header('企业荣誉列表')" />
 
-</head>
 
-<body class="gray-bg">
 
-     <div class="container-div">
 
-        <div class="row">
 
-            <div class="col-sm-12 search-collapse">
 
-
 
-            </div>
 
-
 
-            <div class="btn-group-sm" id="toolbar" role="group">
 
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="company:honour:add">
 
-                    <i class="fa fa-plus"></i> 添加
 
-                </a>
 
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="company:honour:edit">
 
-                    <i class="fa fa-edit"></i> 修改
 
-                </a>
 
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="company:honour:remove">
 
-                    <i class="fa fa-remove"></i> 删除
 
-                </a>
 
-            </div>
 
-            <div class="col-sm-12 select-table table-striped">
 
-                <table id="bootstrap-table"></table>
 
-            </div>
 
-        </div>
 
-    </div>
 
-    <th:block th:include="include :: footer" />
 
-    <script th:inline="javascript">
 
-        var editFlag = [[${@permission.hasPermi('company:honour:edit')}]];
 
-        var removeFlag = [[${@permission.hasPermi('company:honour:remove')}]];
 
-        var prefix = ctx + "company/honour";
 
-
 
-        $(function() {
 
-            var options = {
 
-                url: prefix + "/list",
 
-                createUrl: prefix + "/add",
 
-                updateUrl: prefix + "/edit/{id}",
 
-                removeUrl: prefix + "/remove",
 
-                modalName: "企业荣誉",
 
-                columns: [{
 
-                    checkbox: true
 
-                },
 
-                {
 
-                    field : 'honourId', 
-                    title : '商户荣誉id',
 
-                    visible: false
 
-                },
 
-                {
 
-                    field : 'companyId', 
-                    title : '商户id',
 
-                    visible: false
 
-                },
 
-                {
 
-                    field : 'title',
 
-                    title : '荣誉标题'
 
-                },
 
-                {
 
-                    field : 'des',
 
-                    title : '荣誉描述'
 
-                },
 
-                {
 
-                    field : 'img', 
-                    title : '荣誉图片',
 
-                    formatter: function(value, row, index) {
 
-                        // 图片预览（注意：如存储在本地直接获取数据库路径，如有配置context-path需要使用ctx+路径）
 
-                        // 如：/profile/upload/2019/08/08/3b7a839aced67397bac694d77611ce72.png
 
-                        return $.table.imageView(value,250,250);
 
-                    }
 
-                },
 
-                {
 
-                    field : 'remark', 
-                    title : '备注'
 
-                },
 
-                {
 
-                    title: '操作',
 
-                    align: 'center',
 
-                    formatter: function(value, row, index) {
 
-                        var actions = [];
 
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.honourId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
 
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.honourId + '\')"><i class="fa fa-remove"></i>删除</a>');
 
-                        return actions.join('');
 
-                    }
 
-                }]
 
-            };
 
-            $.table.init(options);
 
-        });
 
-    </script>
 
-</body>
 
-</html>

+ 0 - 133
dgtly-admin/src/main/resources/templates/company/info.html
View File 

@@ -1,133 +0,0 @@
 
-<!DOCTYPE html>
 
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 
-<head>
 
-    <th:block th:include="include :: header('商户信息')" />
 
-    <th:block th:include="include :: datetimepicker-css" />
 
-</head>
 
-<body class="white-bg">
 
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
 
-        <form class="form-horizontal m" id="form-company-edit" th:object="${sysCompany}">
 
-            <input name="id" th:field="*{id}" type="hidden">
 
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">商户名称：</label>
 
-                <div class="col-sm-8">
 
-                    <input name="companyName" th:field="*{companyName}"  class="form-control" type="text" disabled required>
 
-                </div>
 
-            </div>
 
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">企业类型：</label>
 
-                <div class="col-sm-8">
 
-                    <select name="sex" class="form-control m-b" th:with="type=${@dict.getType('company_type')}" disabled>
 
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{companyType}"></option>
 
-                    </select>
 
-                </div>
 
-            </div>
 
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">详细地址：</label>
 
-                <div class="col-sm-8">
 
-                    <input name="detailAddress" th:field="*{detailAddress}" class="form-control" type="text" disabled>
 
-                </div>
 
-            </div>
 
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">经度：</label>
 
-                <div class="col-sm-8">
 
-                    <input name="longitude" th:field="*{longitude}" class="form-control" type="text" disabled>
 
-                </div>
 
-            </div>
 
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">纬度：</label>
 
-                <div class="col-sm-8">
 
-                    <input name="latitude" th:field="*{latitude}" class="form-control" type="text" disabled>
 
-                </div>
 
-            </div>
 
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">企业法人：</label>
 
-                <div class="col-sm-8">
 
-                    <input name="legalPerson" th:field="*{legalPerson}" class="form-control" type="text" disabled>
 
-                </div>
 
-            </div>
 
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">联系电话：</label>
 
-                <div class="col-sm-8">
 
-                    <input name="contactNumber" th:field="*{contactNumber}" class="form-control" type="text" disabled>
 
-                </div>
 
-            </div>
 
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">成立日期：</label>
 
-                <div class="col-sm-8">
 
-                    <div class="input-group date">
 
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
 
-                        <input name="establishDate" th:value="${#dates.format(sysCompany.establishDate, 'yyyy-MM-dd')}"
 
-                               class="form-control" placeholder="yyyy-MM-dd" type="text" disabled>
 
-                    </div>
 
-                </div>
 
-            </div>
 
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">统一社会信用代码：</label>
 
-                <div class="col-sm-8">
 
-                    <input name="unifiedSocialCreditCode" th:field="*{unifiedSocialCreditCode}" class="form-control" type="text" disabled>
 
-                </div>
 
-            </div>
 
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">营业执照：</label>
 
-                <div class="col-sm-8">
 
-                    <div class="fileinput-new thumbnail" style="width: 140px;height: 140px;" onclick="openImg(this)">
 
-                        <img th:src="@{*{businessLicenseUrl}}" id="img-businessLicenseUrl" style=" width: 100%; height: 100%;" >
 
-                    </div>
 
-                </div>
 
-            </div>
 
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">企业默认图片：</label>
 
-                <div class="col-sm-8">
 
-                    <div class="fileinput-new thumbnail" style="width: 140px;height: 140px;" onclick="openImg(this)">
 
-                        <img th:src="@{*{defaultImgUrl}}" id="img-defaultImgUrl"  style=" width: 100%; height: 100%;">
 
-                    </div>
 
-                </div>
 
-            </div>
 
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">企业宣传图片：</label>
 
-                <div class="col-sm-8">
 
-                    <div class="fileinput-new thumbnail" style="width: 140px;height: 140px;" onclick="openImg(this)">
 
-                        <img th:src="@{*{propagandaImgUrl}}" id="img-propagandaImgUrl" style=" width: 100%; height: 100%;">
 
-                    </div>
 
-                </div>
 
-            </div>
 
-            <div class="form-group">
 
-                <label class="col-sm-3 control-label">企业介绍：</label>
 
-                <div class="col-sm-8">
 
-                    <textarea name="companyIntroduce" class="form-control" disabled>[[*{companyIntroduce}]]</textarea>
 
-                </div>
 
-            </div>
 
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">主营业务：</label>
 
-                <div class="col-sm-8">
 
-                    <input name="primaryBusiness" th:field="*{primaryBusiness}" class="form-control" type="text" disabled>
 
-                </div>
 
-            </div>
 
-        </form>
 
-    </div>
 
-    <th:block th:include="include :: footer" />
 
-    <th:block th:include="include :: datetimepicker-js" />
 
-    <script type="text/javascript">
 
-        var prefix = ctx + "system/company";
 
-        $("#form-company-edit").validate({
 
-            focusCleanup: true
 
-        });
 
-
 
-        function submitHandler() {
 
-            $.modal.close();
 
-        }
 
-        function openImg(self){
 
-            var img = $(self).children("img")
 
-            layer.open({
 
-                type: 1,
 
-                title: false,
 
-                shade: 0.0001,
 
-                area: [80,80],
 
-                shadeClose: true,
 
-                content: $(img)
 
-            });
 
-        }
 
-    </script>
 
-</body>
 
-</html>

+ 0 - 51
dgtly-admin/src/main/resources/templates/company/tree.html
View File 

@@ -1,51 +0,0 @@
 
-<!DOCTYPE html>
 
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 
-<head>
 
-    <th:block th:include="include :: header('商户选择列表')" />
 
-    <th:block th:include="include :: ztree-css" />
 
-</head>
 
-<style>
 
-    body{height:auto;font-family: "Microsoft YaHei";}
 
-    button{font-family: "SimSun","Helvetica Neue",Helvetica,Arial;}
 
-</style>
 
-<body class="hold-transition box box-main">
 
-    <input id="treeId" type="hidden">
 
-    <input id="treeName" type="hidden">
 
-    <div class="wrapper">
 
-        <div class="treeShowHideButton" onclick="$.tree.toggleSearch();">
 
-            <label id="btnShow" title="显示搜索" style="display:none;">︾</label>
 
-            <label id="btnHide" title="隐藏搜索">︽</label>
 
-        </div>
 
-    </div>
 
-    <div class="treeSearchInput" id="search">
 
-        <label for="keyword">关键字：</label><input type="text" class="empty" id="keyword" maxlength="50">
 
-        <button class="btn" id="btn" onclick="$.tree.searchNode()"> 搜索 </button>
 
-    </div>
 
-    <div class="treeExpandCollapse">
 
-        <a href="#" onclick="$.tree.expand()">展开</a> /
 
-        <a href="#" onclick="$.tree.collapse()">折叠</a>
 
-    </div>
 
-    <div id="tree" class="ztree treeselect"></div>
 
-    <th:block th:include="include :: footer" />
 
-    <th:block th:include="include :: ztree-js" />
 
-    <script th:inline="javascript">
 
-        var prefix = ctx + "company";
 
-
 
-        $(function() {
 
-            var options = {
 
-                url: prefix + "/treeData",
 
-                modalName: "商户表",
 
-                expandLevel: 2,
 
-                onClick: zOnClick
 
-            };
 
-            $.tree.init(options);
 
-        });
 
-        function zOnClick(event, treeId, treeNode) {
 
-            var treeId = treeNode.id;
 
-            var treeName = treeNode.name;
 
-            $("#treeId").val(treeId);
 
-            $("#treeName").val(treeName);
 
-        }
 
-    </script>
 
-</body>
 
-</html>

+ 1 - 10
dgtly-api/pom.xml
View File 

@@ -27,16 +27,7 @@
 
             <artifactId>dgtly-system</artifactId>
 
             <version>4.0.0</version>
 
         </dependency>
 
-        <dependency>
 
-            <groupId>com.dgtly</groupId>
 
-            <artifactId>dgtly-goods-api</artifactId>
 
-            <version>4.0.0</version>
 
-        </dependency>
 
-        <dependency>
 
-            <groupId>com.dgtly</groupId>
 
-            <artifactId>dgtly-member-api</artifactId>
 
-            <version>4.0.0</version>
 
-        </dependency>
 
+
 
     </dependencies>
 
 
     <build>

+ 0 - 2
dgtly-system/src/main/resources/mapper/system/SysCompanyMapper.xml
View File 

@@ -28,7 +28,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         <result property="remark"    column="remark"    />
 
         <result property="primaryBusiness"    column="primary_business"    />
 
         <result property="sort"    column="sort"    />
 
-        <result property="goodsCount"    column="goodsCount"    />
 
     </resultMap>
 
 
 
@@ -36,7 +35,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         select sc.id, sc.company_name,sc.company_type,sc.detail_address,sc.longitude,sc.latitude,sc.legal_person,sc.contact_number,sc.establish_date,
 
         sc.unified_social_credit_code,sc.business_license_url,sc.default_img_url,sc.propaganda_img_url,sc.company_introduce,sc.version_num,
 
         sc.create_by,sc.update_by,sc.update_time,sc.remark,sc.status,sc.create_time,sc.primary_business,sc.sort
 
-        ,(select count(0) from goods_info gi where gi.company_id = sc.id and gi.putaway_flag = '1' and gi.del_flag='0') goodsCount
 
         from sys_company sc
 
     </sql>