From 677a74641dfffa8c28e3a2982eba5eea9315669b Mon Sep 17 00:00:00 2001
From: dshclm <3321914460@qq.com>
Date: Wed, 21 Aug 2024 15:27:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E7=A7=98=E5=AF=86=E8=BD=BD?=
 =?UTF-8?q?=E4=BD=93=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../carrier/UseCarrierController.java         |  2 +-
 .../templates/system/recCarrier/edit.html     |  4 +-
 .../templates/system/useCarrier/edit.html     | 68 +++++++++++++
 .../system/useCarrier/useCarrier.html         | 97 +++++++++++++++++++
 4 files changed, 168 insertions(+), 3 deletions(-)
 create mode 100644 ruoyi-admin/src/main/resources/templates/system/useCarrier/edit.html
 create mode 100644 ruoyi-admin/src/main/resources/templates/system/useCarrier/useCarrier.html
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/UseCarrierController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/UseCarrierController.java
index df22de7..7322d52 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/UseCarrierController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/UseCarrierController.java
@@ -22,7 +22,7 @@ import java.util.List;
 @Controller
 @RequestMapping("/system/useCarrier")
 public class UseCarrierController extends BaseController {
-    private String prefix = "system/carrier/useCarrier";
+    private String prefix = "system/useCarrier";
 
     @Resource
     private CarrierManager carrierManager;
diff --git a/ruoyi-admin/src/main/resources/templates/system/recCarrier/edit.html b/ruoyi-admin/src/main/resources/templates/system/recCarrier/edit.html
index c4d9089..75a1260 100644
--- a/ruoyi-admin/src/main/resources/templates/system/recCarrier/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/recCarrier/edit.html
@@ -96,13 +96,13 @@
 <th:block th:include="include :: bootstrap-select-js" />
 <th:block th:include="include :: datetimepicker-js" />
 <script th:inline="javascript">
-    var prefix = ctx + "system/carrier"
+    var prefix = ctx + "system/recCarrier"
     $("#form-fileprovide-add").validate({
         focusCleanup: true
     });
     function submitHandler() {
         if ($.validate.form()) {
-            $.operate.save(prefix + "/add", $('#form-fileprovide-add').serialize());
+            $.operate.save(prefix + "/edit", $('#form-fileprovide-add').serialize());
         }
     }
     $("input[name='receivingTime']").datetimepicker({
diff --git a/ruoyi-admin/src/main/resources/templates/system/useCarrier/edit.html b/ruoyi-admin/src/main/resources/templates/system/useCarrier/edit.html
new file mode 100644
index 0000000..7b27bfd
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/system/useCarrier/edit.html
@@ -0,0 +1,68 @@
+<!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">
+        <input name="status"  th:value="4" 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="mentsUse" th:field="*{mentsUse}" 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">
+                        <div class="input-group date">
+                            <input name="mentsTime" required class="form-control" placeholder="yyyy-MM-dd" type="text">
+                            <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        </div>
+                    </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="usageUser" th:field="*{usageUser}" placeholder="请输入接收人员" required class="form-control" type="text">
+                    </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/useCarrier"
+    $("#form-fileprovide-add").validate({
+        focusCleanup: true
+    });
+    function submitHandler() {
+        if ($.validate.form()) {
+            $.operate.save(prefix + "/edit", $('#form-fileprovide-add').serialize());
+        }
+    }
+    $("input[name='mentsTime']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+</script>
+</body>
+</html>
diff --git a/ruoyi-admin/src/main/resources/templates/system/useCarrier/useCarrier.html b/ruoyi-admin/src/main/resources/templates/system/useCarrier/useCarrier.html
new file mode 100644
index 0000000..fde7f8d
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/system/useCarrier/useCarrier.html
@@ -0,0 +1,97 @@
+<!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>
+                        <input type="hidden" name="status" th:value="3"/>
+                        <li>
+                            <label>使用人员：</label>
+                            <input type="text" name="usageUser"/>
+                        </li>
+                        <li>
+                            <label>使用时间：</label>
+                            <input type="text" class="time-input" placeholder="请选择接收时间" name="mentsTime"/>
+                        </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="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:useCarrier:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('system:useCarrier:remove')}]];
+    var detailFlag = [[${@permission.hasPermi('system:useCarrier:detail')}]];
+    var prefix = ctx + "system/useCarrier";
+    let datas = []
+    $.ajax({
+        url: ctx + "system/area/getAllList",
+        type: 'GET',
+        data:{parentId:''} ,
+        success:((res)=>{
+            datas = res.data
+        }) ,
+    });
+    $(function() {
+        var options = {
+            url: prefix + "/list",
+            updateUrl: prefix + "/edit/{id}",
+            modalName: "国家秘密载体使用",
+            columns: [
+                {
+                    checkbox: true
+                },
+                {
+                    field: 'id',
+                    title: 'id',
+                    visible: false
+                },
+                {
+                    field: 'areaCity',
+                    title: '所属市州',
+                    formatter: function(value, row, index) {
+                        return getCity(datas, value)
+                    }
+                },
+                {
+                    field: 'mentsUse',
+                    title: '使用要求'
+                },
+                {
+                    field: 'mentsTime',
+                    title: '使用时间'
+                },
+                {
+                    field: 'usageUser',
+                    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.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        return actions.join('');
+                    }
+                }]
+        };
+        $.table.init(options);
+    });
+</script>
+</body>
+</html>
