diff --git a/ruoyi-admin/src/main/resources/templates/system/carrier/add.html b/ruoyi-admin/src/main/resources/templates/system/carrier/add.html
new file mode 100644
index 00000000..c85d8950
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/system/carrier/add.html
@@ -0,0 +1,132 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+ <th:block th:include="include :: header('新增载体制作')" />
+ <th:block th:include="include :: select2-css" />
+ <th:block th:include="include :: bootstrap-select-css" />
+ <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-fileprovide-add">
+ <div class="row">
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label is-required">载体名称：</label>
+ <div class="col-sm-8">
+ <input name="carrierName" placeholder="请输入载体名称" required class="form-control" type="text">
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label is-required">载体类型：</label>
+ <div class="col-sm-8">
+ <select name="carrierLevel" required class="form-control m-b" th:with="type=${@dict.getType('sys_provide_level')}">
+ <option value="">---请选择---</option>
+ <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></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 is-required">载体数量：</label>
+ <div class="col-sm-8">
+ <input name="carrierCount" digits="true" placeholder="请输入载体数量" required class="form-control" type="text">
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label is-required">密级：</label>
+ <div class="col-sm-8">
+ <select name="carrierSecret" required class="form-control m-b" th:with="type=${@dict.getType('sys_file_miji')}">
+ <option value="">---请选择---</option>
+ <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></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 is-required">紧急程度：</label>
+ <div class="col-sm-8">
+ <select name="carrierExtent" required class="form-control m-b" th:with="type=${@dict.getType('sys_file_jinjichengdu')}">
+ <option value="">---请选择---</option>
+ <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+ </select>
+ </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="carrierNumber" placeholder="请输入编号" class="form-control" type="text">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label is-required">保密期限：</label>
+ <div class="col-sm-8">
+ <input name="carrierTerm" placeholder="请输入保密期限" required class="form-control" type="text">
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label is-required">发放范围：</label>
+ <div class="col-sm-8">
+ <input name="carrierContent" placeholder="请输入发放范围" required class="form-control" type="text">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-2 control-label is-required">定密依据：</label>
+ <div class="col-sm-10">
+ <textarea name="carrierAlliance" placeholder="请输入定密依据" required class="form-control" type="text"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ <th:block th:include="include :: footer" />
+ <th:block th:include="include :: select2-js" />
+ <th:block th:include="include :: bootstrap-select-js" />
+ <th:block th:include="include :: datetimepicker-js" />
+ <script th:inline="javascript">
+ var prefix = ctx + "system/carrier"
+ $("#form-fileprovide-add").validate({
+ focusCleanup: true
+ });
+ function submitHandler() {
+ if ($.validate.form()) {
+ $.operate.save(prefix + "/add", $('#form-fileprovide-add').serialize());
+ }
+ }
+ $("input[name='provideDate']").datetimepicker({
+ format: "yyyy-mm-dd",
+ minView: "month",
+ autoclose: true
+ });
+ $(function() {
+ $('#targetDepart').select2({
+ placeholder: "请选择接收单位",
+ allowClear: true
+ });
+ })
+ </script>
+</body>
+</html>
diff --git a/ruoyi-admin/src/main/resources/templates/system/carrier/carrier.html b/ruoyi-admin/src/main/resources/templates/system/carrier/carrier.html
new file mode 100644
index 00000000..35c025f0
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/system/carrier/carrier.html
@@ -0,0 +1,176 @@
+<!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" id="app">
+ <div class="row">
+ <div class="col-sm-12 search-collapse">
+ <form id="formId">
+ <div class="select-list">
+ <ul>
+ <li>
+ <label>载体名称：</label>
+ <input type="text" name="carrierName"/>
+ </li>
+ <li>
+ <label>密级：</label>
+ <select name="carrierSecret" th:with="type=${@dict.getType('sys_file_miji')}">
+ <option value="">所有</option>
+ <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+ </select>
+ </li>
+ <li>
+ <label>载体类型：</label>
+ <select name="carrierLevel" th:with="type=${@dict.getType('sys_provide_level')}">
+ <option value="">所有</option>
+ <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+ </select>
+ </li>
+ <li>
+ <label>紧急程度：</label>
+ <select name="carrierExtent" th:with="type=${@dict.getType('sys_file_jinjichengdu')}">
+ <option value="">所有</option>
+ <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+ </select>
+ </li>
+ <li>
+ <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
+ <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 重置</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:carrier:add">
+ <i class="fa fa-plus"></i> 添加
+ </a>
+ <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:carrier:edit">
+ <i class="fa fa-edit"></i> 修改
+ </a>
+ <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:carrier:remove">
+ <i class="fa fa-remove"></i> 删除
+ </a>
+ <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:carrier: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 editFlag = [[${@permission.hasPermi('system:carrier:edit')}]];
+ var removeFlag = [[${@permission.hasPermi('system:carrier:remove')}]];
+ var detailFlag = [[${@permission.hasPermi('system:carrier:detail')}]];
+ var carrierLevelDatas = [[${@dict.getType('sys_provide_level')}]];
+ var fileSecretDatas = [[${@dict.getType('sys_file_miji')}]];
+ var carrierExtentDatas = [[${@dict.getType('sys_file_jinjichengdu')}]];
+ var stateDatas = [[${@dict.getType('sys_carrier_status')}]];
+ var prefix = ctx + "system/carrier";
+ $(function() {
+ var options = {
+ url: prefix + "/list",
+ createUrl: prefix + "/add",
+ updateUrl: prefix + "/edit/{id}",
+ detailUrl: prefix + "/detail/{id}",
+ removeUrl: prefix + "/remove",
+ exportUrl: prefix + "/export",
+ modalName: "国家秘密载体制作",
+ columns: [
+ {
+ checkbox: true
+ },
+ {
+ field: 'id',
+ title: 'id',
+ visible: false
+ },
+ {
+ field: 'carrierCount',
+ title: '载体数量'
+ },
+ {
+ field: 'carrierName',
+ title: '载体名称'
+ },
+ {
+ field: 'carrierLevel',
+ title: '载体类型',
+ formatter: function(value, row, index) {
+ return $.table.selectDictLabel(carrierLevelDatas, value);
+ }
+ },
+ {
+ field: 'carrierExtent',
+ title: '紧急程度',
+ formatter: function(value, row, index) {
+ return $.table.selectDictLabel(carrierExtentDatas, value);
+ }
+ },
+ {
+ field: 'status',
+ title: '状态',
+ formatter: function(value, row, index) {
+ return $.table.selectDictLabel(stateDatas, value);
+ }
+ },
+ {
+ field: 'carrierSecret',
+ title: '密级',
+ formatter: function(value, row, index) {
+ return $.table.selectDictLabel(fileSecretDatas, value);
+ }
+ },
+ {
+ field: 'carrierNumber',
+ title: '编号'
+ },
+ {
+ field: 'carrierTerm',
+ title: '保密期限'
+ },
+ {
+ title: '操作',
+ align: 'center',
+ formatter: function(value, row, index) {
+ var actions = [];
+ if (row.status == '1') {
+ actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" disabled><i class="fa fa-save"></i>提交</a> ');
+ actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-search"></i>详细</a> ');
+ 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> ');
+ actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+ }else{
+ actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="openSubmit(\'' + row.id + '\')"><i class="fa fa-save"></i>提交</a> ');
+ actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-search"></i>详细</a> ');
+ 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> ');
+ actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+ }
+ return actions.join('');
+ }
+ }]
+ };
+ $.table.init(options);
+ });
+ function openSubmit(id){
+ $.modal.confirm("确定要执行此操作吗？", function() {
+ $.ajax({
+ url: ctx + "system/carrier/updateStatus/" + id +'/' + '1',
+ type: "GET",
+ dataType: "json",
+ success: function(result) {
+ $.modal.msgSuccess(result.msg)
+ }
+ })
+ }, function() {
+ $.modal.msgWarning('取消操作')
+ });
+ }
+</script>
+</body>
+</html>
diff --git a/ruoyi-admin/src/main/resources/templates/system/carrier/detail.html b/ruoyi-admin/src/main/resources/templates/system/carrier/detail.html
new file mode 100644
index 00000000..6d4e3b94
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/system/carrier/detail.html
@@ -0,0 +1,133 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+ <th:block th:include="include :: header('新增载体制作')" />
+ <th:block th:include="include :: select2-css" />
+ <th:block th:include="include :: bootstrap-select-css" />
+ <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-fileprovide-add" th:object="${tdCarrier}">
+ <input name="id" th:field="*{id}" type="hidden">
+ <div class="row">
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label is-required">载体名称：</label>
+ <div class="col-sm-8">
+ <input name="carrierName" disabled th:field="*{carrierName}" placeholder="请输入载体名称" required class="form-control" type="text">
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label is-required">载体类型：</label>
+ <div class="col-sm-8">
+ <select name="carrierLevel" disabled required class="form-control m-b" th:with="type=${@dict.getType('sys_provide_level')}">
+ <option value="">---请选择---</option>
+ <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{carrierLevel}"></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 is-required">载体数量：</label>
+ <div class="col-sm-8">
+ <input name="carrierCount" disabled th:field="*{carrierCount}" digits="true" placeholder="请输入载体数量" required class="form-control" type="text">
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label is-required">密级：</label>
+ <div class="col-sm-8">
+ <select name="carrierSecret" disabled required class="form-control m-b" th:with="type=${@dict.getType('sys_file_miji')}">
+ <option value="">---请选择---</option>
+ <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{carrierSecret}"></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 is-required">紧急程度：</label>
+ <div class="col-sm-8">
+ <select name="carrierExtent" disabled required class="form-control m-b" th:with="type=${@dict.getType('sys_file_jinjichengdu')}">
+ <option value="">---请选择---</option>
+ <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{carrierExtent}"></option>
+ </select>
+ </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="carrierNumber" disabled placeholder="请输入编号" th:field="*{carrierNumber}" class="form-control" type="text">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label is-required">保密期限：</label>
+ <div class="col-sm-8">
+ <input name="carrierTerm" disabled placeholder="请输入保密期限" th:field="*{carrierTerm}" required class="form-control" type="text">
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label is-required">发放范围：</label>
+ <div class="col-sm-8">
+ <input name="carrierContent" disabled placeholder="请输入发放范围" th:field="*{carrierContent}" required class="form-control" type="text">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-2 control-label is-required">定密依据：</label>
+ <div class="col-sm-10">
+ <textarea name="carrierAlliance" disabled th:field="*{carrierAlliance}" placeholder="请输入定密依据" required class="form-control" type="text"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: select2-js" />
+<th:block th:include="include :: bootstrap-select-js" />
+<th:block th:include="include :: datetimepicker-js" />
+<script th:inline="javascript">
+ var prefix = ctx + "system/carrier"
+ $("#form-fileprovide-add").validate({
+ focusCleanup: true
+ });
+ function submitHandler() {
+ if ($.validate.form()) {
+ $.operate.save(prefix + "/add", $('#form-fileprovide-add').serialize());
+ }
+ }
+ $("input[name='provideDate']").datetimepicker({
+ format: "yyyy-mm-dd",
+ minView: "month",
+ autoclose: true
+ });
+ $(function() {
+ $('#targetDepart').select2({
+ placeholder: "请选择接收单位",
+ allowClear: true
+ });
+ })
+</script>
+</body>
+</html>
diff --git a/ruoyi-admin/src/main/resources/templates/system/carrier/edit.html b/ruoyi-admin/src/main/resources/templates/system/carrier/edit.html
new file mode 100644
index 00000000..a5c8c629
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/system/carrier/edit.html
@@ -0,0 +1,133 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+ <th:block th:include="include :: header('新增载体制作')" />
+ <th:block th:include="include :: select2-css" />
+ <th:block th:include="include :: bootstrap-select-css" />
+ <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-fileprovide-add" th:object="${tdCarrier}">
+ <input name="id" th:field="*{id}" type="hidden">
+ <div class="row">
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label is-required">载体名称：</label>
+ <div class="col-sm-8">
+ <input name="carrierName" th:field="*{carrierName}" placeholder="请输入载体名称" required class="form-control" type="text">
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label is-required">载体类型：</label>
+ <div class="col-sm-8">
+ <select name="carrierLevel" required class="form-control m-b" th:with="type=${@dict.getType('sys_provide_level')}">
+ <option value="">---请选择---</option>
+ <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{carrierLevel}"></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 is-required">载体数量：</label>
+ <div class="col-sm-8">
+ <input name="carrierCount" th:field="*{carrierCount}" digits="true" placeholder="请输入载体数量" required class="form-control" type="text">
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label is-required">密级：</label>
+ <div class="col-sm-8">
+ <select name="carrierSecret" required class="form-control m-b" th:with="type=${@dict.getType('sys_file_miji')}">
+ <option value="">---请选择---</option>
+ <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{carrierSecret}"></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 is-required">紧急程度：</label>
+ <div class="col-sm-8">
+ <select name="carrierExtent" required class="form-control m-b" th:with="type=${@dict.getType('sys_file_jinjichengdu')}">
+ <option value="">---请选择---</option>
+ <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{carrierExtent}"></option>
+ </select>
+ </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="carrierNumber" placeholder="请输入编号" th:field="*{carrierNumber}" class="form-control" type="text">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label is-required">保密期限：</label>
+ <div class="col-sm-8">
+ <input name="carrierTerm" placeholder="请输入保密期限" th:field="*{carrierTerm}" required class="form-control" type="text">
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-4 control-label is-required">发放范围：</label>
+ <div class="col-sm-8">
+ <input name="carrierContent" placeholder="请输入发放范围" th:field="*{carrierContent}" required class="form-control" type="text">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-2 control-label is-required">定密依据：</label>
+ <div class="col-sm-10">
+ <textarea name="carrierAlliance" th:field="*{carrierAlliance}" placeholder="请输入定密依据" required class="form-control" type="text"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: select2-js" />
+<th:block th:include="include :: bootstrap-select-js" />
+<th:block th:include="include :: datetimepicker-js" />
+<script th:inline="javascript">
+ var prefix = ctx + "system/carrier"
+ $("#form-fileprovide-add").validate({
+ focusCleanup: true
+ });
+ function submitHandler() {
+ if ($.validate.form()) {
+ $.operate.save(prefix + "/add", $('#form-fileprovide-add').serialize());
+ }
+ }
+ $("input[name='provideDate']").datetimepicker({
+ format: "yyyy-mm-dd",
+ minView: "month",
+ autoclose: true
+ });
+ $(function() {
+ $('#targetDepart').select2({
+ placeholder: "请选择接收单位",
+ allowClear: true
+ });
+ })
+</script>
+</body>
+</html>