修改使用单位填写方式为选择框

doc/kingbase_trouble

@@ -0,0 +1,3 @@
+1.系统工具——————代码生成
+2.涉密人员统计——————打印
+4.文件管理若干问题

pom.xml

@@ -6,11 +6,6 @@
     <groupId>com.ruoyi</groupId>
     <artifactId>ruoyi</artifactId>
     <version>4.7.7</version>
-
-    <name>ruoyi</name>
-    <url>http://www.ruoyi.vip</url>
-    <description>若依管理系统</description>
-    
     <properties>
         <ruoyi.version>4.7.7</ruoyi.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

ruoyi-admin/src/main/java/com/ruoyi/web/controller/license/LicenseController.java

@@ -0,0 +1,52 @@
+package com.ruoyi.web.controller.license;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.license.domain.LicenseCreatorParam;
+import com.ruoyi.license.service.AbstractServerInfos;
+import com.ruoyi.license.service.impl.LinuxServerInfos;
+import com.ruoyi.license.service.impl.WindowsServerInfos;
+import com.ruoyi.license.utils.LicenseCreator;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * 用于生成证书文件，不能放在给客户部署的代码里
+ */
+@RestController
+@RequestMapping("/license")
+public class LicenseController {
+
+    /**
+     * 获取服务器硬件信息
+     */
+    @GetMapping(value = "/getInfo")
+    public AjaxResult getInfo(@RequestParam(value = "osName",required = false) String osName) {
+        //操作系统类型
+        if(StringUtils.isBlank(osName)){
+            osName = System.getProperty("os.name");
+        }
+        osName = osName.toLowerCase();
+        AbstractServerInfos abstractServerInfos = null;
+        //根据不同操作系统类型选择不同的数据获取方法
+        if (osName.startsWith("windows")) {
+            abstractServerInfos = new WindowsServerInfos();
+        } else if (osName.startsWith("linux")) {
+            abstractServerInfos = new LinuxServerInfos();
+        }else{//其他服务器类型
+            abstractServerInfos = new LinuxServerInfos();
+        }
+        return AjaxResult.success(abstractServerInfos.getServerInfos());
+    }
+
+    @PostMapping(value = "/generate")
+    public AjaxResult generate(@RequestBody LicenseCreatorParam param) {
+        LicenseCreator licenseCreator = new LicenseCreator(param);
+        boolean result = licenseCreator.generateLicense();
+        if(result){
+            return AjaxResult.success();
+        }else{
+            return AjaxResult.error("证书文件生成失败");
+        }
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java

@@ -83,7 +83,7 @@ public class SysLogininforController extends BaseController
     }
 
     @RequiresPermissions("monitor:logininfor:unlock")
-    @Log(title = "账户解锁", businessType = BusinessType.OTHER)
+    @Log(title = "账户解锁", businessType = BusinessType.UNLOCKING)
     @PostMapping("/unlock")
     @ResponseBody
     public AjaxResult unlock(String loginName)

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdCheckResultController.java

@@ -15,6 +15,7 @@ import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Objects;
 
 @Controller
 @RequestMapping("/system/checkresult")
@@ -115,9 +116,12 @@ public class TdCheckResultController extends BaseController {
     @ResponseBody
     public AjaxResult selfcheckSave(TdCheck tdCheck)
     {
-        if (tdCheck.getCheckresult1().equals("0")&&tdCheck.getCheckresult2().equals("0")
-                &&tdCheck.getCheckresult3().equals("0")&&tdCheck.getCheckresult4().equals("0")
-                &&tdCheck.getCheckresult5().equals("0")&&tdCheck.getCheckresult6().equals("0")){
+        if (Objects.equals(tdCheck.getCheckresult1(),"0")
+                && Objects.equals(tdCheck.getCheckresult2(),"0")
+                && Objects.equals(tdCheck.getCheckresult3(),"0")
+                && Objects.equals(tdCheck.getCheckresult4(),"0")
+                && Objects.equals(tdCheck.getCheckresult5(),"0")
+                && Objects.equals(tdCheck.getCheckresult6(),"0")){
             tdCheck.setCheckState("0");
         }else {
             tdCheck.setCheckState("1");

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysNetworknumController.java

@@ -50,7 +50,7 @@ public class SysNetworknumController extends BaseController {
     /**
      * 打印界面
      */
-    @RequiresPermissions("system:propertynum:print")
+    @RequiresPermissions("system:networknum:print")
     @GetMapping("/print/{netId}")
     @Log(title = "网络设备统计", businessType = BusinessType.PRINT)
     public String print(@PathVariable("netId") String netId, ModelMap mmap)

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysTrainnumController.java

@@ -63,16 +63,16 @@ public class SysTrainnumController extends BaseController {
     }
 
     /**
-     * 打印
+     * 详细
      */
-    @RequiresPermissions("system:trainnum:print")
-    @GetMapping("/print/{traiId}")
-    @ResponseBody
-    public String print(@PathVariable("trainId") Long trainId, ModelMap mmap){
-        TdTrain tdTrain = tdTrainService.selectTdTrainByID(trainId);
-        List<TdTrain> tdTrains = tdTrainService.selectTdTrainList(tdTrain);
-        mmap.put("train", tdTrain);
-        return prefix + "/print";
+    @RequiresPermissions("system:trainnum:detail")
+    @GetMapping("/detail/{ID}")
+    public String detail(@PathVariable("ID") Long ID, ModelMap mmap)
+    {
+        mmap.put("tdTrain", tdTrainService.selectTdTrainByID(ID));
+        SysUser user = getSysUser();
+        mmap.put("user", user);
+        return prefix + "/detail";
     }
 
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysUsernumController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.system.count;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.convert.Convert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -112,7 +113,7 @@ public class SysUsernumController extends BaseController {
             List<SysUserPost> postList = sysUserPostService.lambdaQuery().
                     eq(SysUserPost::getUserId, sysuser.getUserId()).list();
             List<Long> postIds = postList.stream().map(SysUserPost::getPostId).collect(Collectors.toList());
-            if(CollectionUtil.isNotEmpty(postIds)){
+            if(CollUtil.isNotEmpty(postIds)){
                 List<SysPost> sysPostList = postService.lambdaQuery().in(SysPost::getPostId, postIds).list();
                 sysuser.setPosts( Convert.toList(SysPostVO.class, sysPostList));
             }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/exam/TdExamController.java

@@ -40,9 +40,7 @@ public class TdExamController extends BaseController{
     public String index(ModelMap mmap){
         SysUser user = getSysUser();
         mmap.put("user", user);
-
         return prefix + "/index";
-
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/exam/TdQuestionController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.system.exam;
 
+import java.util.Date;
 import java.util.List;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -87,6 +88,8 @@ public class TdQuestionController extends BaseController
     @ResponseBody
     public AjaxResult addSave(TdQuestion tdQuestion)
     {
+        tdQuestion.setCREATEPERSON(getLoginName());
+        tdQuestion.setCREATEDATE(new Date());
         return toAjax(tdQuestionService.insertTdQuestion(tdQuestion));
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileDestoryController.java

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.system.filemanager;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import com.ruoyi.system.domain.TdFileProvide;
 import com.ruoyi.system.domain.TdFileReceive;
@@ -58,7 +59,7 @@ public class TdFileDestoryController extends BaseController
         List<TdFileReceive> list = tdFileReceiveService.selectTdFileReceiveList(tdFileReceive);
         List<TdFileReceive> tdFileReceives = new ArrayList<>();
         for (TdFileReceive FileReceivelist : list){
-            if (FileReceivelist.getExtractState().equals("1") && FileReceivelist.getReceiveDepartid().equals(deptService.selectDeptById(getSysUser().getDeptId()).getDeptName())){
+            if (Objects.equals(FileReceivelist.getExtractState(),"1") && FileReceivelist.getReceiveDepartid().equals(deptService.selectDeptById(getSysUser().getDeptId()).getDeptName())){
                 tdFileReceives.add(FileReceivelist);
             }
         }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileExtractController.java

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 涉密文件提取Controller
@@ -37,7 +38,6 @@ public class TdFileExtractController extends BaseController {
         mmap.put("sysuser",getSysUser());
         return prefix + "/fileextract";
     }
-
     /**
      * 查询涉密文件接收列表
      */
@@ -50,13 +50,12 @@ public class TdFileExtractController extends BaseController {
         List<TdFileReceive> list = tdFileReceiveService.selectTdFileReceiveList(tdFileReceive);
         List<TdFileReceive> tdFileReceives = new ArrayList<>();
         for (TdFileReceive FileReceivelist : list){
-            if (FileReceivelist.getReceiveState().equals("1") && FileReceivelist.getReceiveDepartid().equals(deptService.selectDeptById(getSysUser().getDeptId()).getDeptName())){
+            if (Objects.equals(FileReceivelist.getReceiveState(),"1") && FileReceivelist.getReceiveDepartid().equals(getSysUser().getDept().getDeptName())){
                 tdFileReceives.add(FileReceivelist);
             }
         }
         return getDataTable(tdFileReceives);
     }
-
     /**
      * 导出涉密文件接收列表
      */
@@ -70,7 +69,6 @@ public class TdFileExtractController extends BaseController {
         ExcelUtil<TdFileReceive> util = new ExcelUtil<TdFileReceive>(TdFileReceive.class);
         return util.exportExcel(list, "涉密文件接收数据");
     }
-
     /**
      * 涉密文件提取
      */

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileReceiveController.java

@@ -59,7 +59,7 @@ public class TdFileReceiveController extends BaseController
         List<TdFileReceive> list = tdFileReceiveService.selectTdFileReceiveList(tdFileReceive);
         List<TdFileReceive> tdFileReceives = new ArrayList<>();
         for (TdFileReceive FileReceivelist : list){
-            if (FileReceivelist.getReceiveDepartid().equals(deptService.selectDeptById(getSysUser().getDeptId()).getDeptName())){
+            if (FileReceivelist.getReceiveDepartid().equals(getSysUser().getDept().getDeptName())){
                 tdFileReceives.add(FileReceivelist);
             }
         }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyChangeListController.java

@@ -0,0 +1,65 @@
+package com.ruoyi.web.controller.system.property;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.system.domain.TdPropertyManager;
+import com.ruoyi.system.service.ITdPropertyManagerService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * packageName com.ruoyi.web.controller.system.property
+ *
+ * @author wangxy
+ * @version JDK 8
+ * @className TdPropertyChangeListController
+ * @date 2024/6/24
+ * @description 资产变更
+ */
+@Controller
+@RequestMapping("/system/change/list")
+public class TdPropertyChangeListController extends BaseController {
+
+    private String prefix = "system/property/propertychange/list";
+
+    @Autowired
+    private ITdPropertyManagerService tdPropertyManagerService;
+
+    @RequiresPermissions("system:change:view")
+    @GetMapping()
+    public String property()
+    {
+        return prefix + "/property";
+    }
+
+    /**
+     * 查询资产登记列表
+     */
+    @RequiresPermissions("system:change:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(TdPropertyManager tdPropertyManager)
+    {
+        startPage();
+        List<TdPropertyManager> list = tdPropertyManagerService.selectTdPropertyManagerList(tdPropertyManager);
+        return getDataTable(list);
+    }
+
+
+
+    /**
+     * 添加资产条目
+     */
+    @RequiresPermissions("system:change:detail")
+    @GetMapping("/detail/{useId}")
+    public String detail(@PathVariable("useId") String useId, ModelMap mmap)
+    {
+        mmap.put("useId",useId);
+        return "system/property/propertychange/changeproperty";
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyInfoController.java

@@ -45,10 +45,10 @@ public class TdPropertyInfoController extends BaseController
     @RequiresPermissions("system:property:list")
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(@RequestParam String useId)
+    public TableDataInfo list(TdPropertyInfo tdPropertyInfo)
     {
         startPage();
-        List<TdPropertyInfo> tdPropertyInfos = tdPropertyInfoService.selectTdPropertyInfoByUseId(useId);
+        List<TdPropertyInfo> tdPropertyInfos = tdPropertyInfoService.selectTdPropertyInfoList(tdPropertyInfo);
         return getDataTable(tdPropertyInfos);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyNetinfoController.java

@@ -45,10 +45,10 @@ public class TdPropertyNetinfoController extends BaseController
     @RequiresPermissions("system:network:list")
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(@RequestParam String netId)
+    public TableDataInfo list(TdPropertyNetinfo tdPropertyNetinfo)
     {
         startPage();
-        List<TdPropertyNetinfo> list = tdPropertyNetinfoService.selectTdPropertyNetinfoByNetId(netId);
+        List<TdPropertyNetinfo> list = tdPropertyNetinfoService.selectTdPropertyNetinfoList(tdPropertyNetinfo);
         return getDataTable(list);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysProfileController.java

@@ -73,7 +73,7 @@ public class SysProfileController extends BaseController
         return prefix + "/resetPwd";
     }
 
-    @Log(title = "重置密码", businessType = BusinessType.UPDATE)
+    @Log(title = "重置密码", businessType = BusinessType.RESET)
     @PostMapping("/resetPwd")
     @ResponseBody
     public AjaxResult resetPwd(String oldPassword, String newPassword)

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserController.java

@@ -199,7 +199,7 @@ public class SysUserController extends BaseController
     }
 
     @RequiresPermissions("system:user:resetPwd")
-    @Log(title = "重置密码", businessType = BusinessType.UPDATE)
+    @Log(title = "重置密码", businessType = BusinessType.RESET)
     @PostMapping("/resetPwd")
     @ResponseBody
     public AjaxResult resetPwdSave(SysUser user)

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdIndentureController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.system.system;
 
+import java.util.Date;
 import java.util.List;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -87,6 +88,8 @@ public class TdIndentureController extends BaseController
     @ResponseBody
     public AjaxResult addSave(TdIndenture tdIndenture)
     {
+        tdIndenture.setCreateStaffid(getLoginName());
+        tdIndenture.setCreateDate(new Date());
         return toAjax(tdIndentureService.insertTdIndenture(tdIndenture));
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdLeaveController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.system.system;
 
 import java.util.List;
+import java.util.Objects;
 
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.system.service.ISysPostService;
@@ -145,7 +146,7 @@ public class TdLeaveController extends BaseController
     @ResponseBody
     public AjaxResult examinesave(TdLeave tdLeave)
     {
-        if (tdLeave.getLeavestate().equals("1")){
+        if (Objects.equals(tdLeave.getLeavestate(),"1")){
             SysUser sysUser = userService.selectUserById(tdLeave.getUserId());
             sysUser.setStatus("1");
             userService.updateUser(sysUser);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdTrainController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.system.system;
 
+import java.util.Date;
 import java.util.List;
 
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -88,6 +89,9 @@ public class TdTrainController extends BaseController
     @ResponseBody
     public AjaxResult addSave(TdTrain tdTrain)
     {
+        tdTrain.setCreateStaffid(getLoginName());
+        tdTrain.setCreateDate(new Date());
+        tdTrain.setCreateDepartid(String.valueOf(getSysUser().getDeptId()));
         return toAjax(tdTrainService.insertTdTrain(tdTrain));
     }
 
@@ -113,6 +117,9 @@ public class TdTrainController extends BaseController
     @ResponseBody
     public AjaxResult editSave(TdTrain tdTrain)
     {
+        tdTrain.setUpdateStaffid(getLoginName());
+        tdTrain.setUpdateDate(new Date());
+        tdTrain.setUpdateDepartid(String.valueOf(getSysUser().getDeptId()));
         return toAjax(tdTrainService.updateTdTrain(tdTrain));
     }
 

ruoyi-admin/src/main/resources/application-dev.yml

@@ -2,19 +2,19 @@
 spring:
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
-        driverClassName: com.mysql.cj.jdbc.Driver
-#        driverClassName: com.kingbase8.Driver
+#        driverClassName: com.mysql.cj.jdbc.Driver
+        driverClassName: com.kingbase8.Driver
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://192.168.254.123:3306/zhky?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                url: jdbc:kingbase8://192.168.254.197:54321/zhky?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                url: jdbc:mysql://192.168.254.123:3306/zhky?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:kingbase8://192.168.254.197:54321/zhky?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&clientEncoding=UTF8
 
                 #username: root
                 #password: qwer1234
                 username: ENC(ElFzIjuV3codlxGotvqqyA==)
-                password: ENC(aM81j4MP4WJC4ZQBNlDntx0jKsP3wwQZ)
-#                password: ENC(YgAg6bUSgw1uc1H17kDw0g==)
+#                password: ENC(aM81j4MP4WJC4ZQBNlDntx0jKsP3wwQZ)
+                password: ENC(YgAg6bUSgw1uc1H17kDw0g==)
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ruoyi-admin/src/main/resources/application.yml

@@ -59,7 +59,7 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   profiles:
-    active: druid
+    active: dev
   # 文件上传
   servlet:
     multipart:
@@ -73,19 +73,25 @@ spring:
       # 热部署开关
       enabled: true
 
-# MyBatis
-mybatis:
+# MyBatis Plus配置
+mybatis-plus:
   # 搜索指定包别名
   typeAliasesPackage: com.ruoyi.**.domain
   # 配置mapper的扫描，找到所有的mapper.xml映射文件
   mapperLocations: classpath*:mapper/**/*Mapper.xml
   # 加载全局的配置文件
   configLocation: classpath:mybatis/mybatis-config.xml
+  global-config:
+    db-config:
+      # 表名前缀
+      table-prefix: public.
+  configuration-properties:
+    prefix: public. # 自定义sql中表名带前缀
 
 # PageHelper分页插件
 pagehelper:
-  helperDialect: mysql
-#  helperDialect: postgresql
+#  helperDialect: mysql
+  helperDialect: postgresql
   supportMethodsArguments: true
   params: count=countSql
 
@@ -160,3 +166,11 @@ aj:
 jasypt:
   encryptor:
     password: BUSINESS
+
+license:
+  subject: license_demo                                 #证书subject，建议用统一平台的AppCode
+  publicAlias: publicCert                             #密钥别称
+  storePass: public_password1234                         #访问秘钥库的密码，建议用统一平台的client_security
+  licensePath: license.lic                         #证书存储路径
+  publicKeysStorePath: publicCerts.keystore                 #密钥库存储路径
+  node_env: dev

ruoyi-admin/src/main/resources/static/css/login.min.css

@@ -1 +1 @@
-html{height:100%}body.signin{height:auto;background:url(../img/login-background.jpg) no-repeat center fixed;-webkit-background-size:cover;-moz-background-size:cover;-o-background-size:cover;background-size:cover}.signinpanel{width:750px;margin:10% auto 0;color:rgba(255,255,255,.95)}.signinpanel .logopanel{float:none;width:auto;padding:0;background:0}.signinpanel .signin-info ul{list-style:none;padding:0;margin:20px 0}.signinpanel .form-control{display:block;margin-top:15px}.signinpanel .uname{background:#fff url(../img/user.png) no-repeat 95% center;color:#333}.signinpanel .pword{background:#fff url(../img/locked.png) no-repeat 95% center;color:#333}.signinpanel .code{background:#fff no-repeat 95% center;color:#333;margin:0 0 15px 0}.signinpanel .btn{margin-top:15px}.signinpanel form{background:rgba(255,255,255,.2);border:1px solid rgba(255,255,255,.3);-moz-box-shadow:0 3px 0 rgba(12,12,12,.03);-webkit-box-shadow:0 3px 0 rgba(12,12,12,.03);box-shadow:0 3px 0 rgba(12,12,12,.03);-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;padding:30px}.signup-footer{border-top:solid 1px rgba(255,255,255,.3);margin:20px 0;padding-top:15px}@media screen and (max-width:768px){.signinpanel,.signuppanel{margin:0 auto;width:380px!important;padding:20px}.signinpanel form{margin-top:20px}.signup-footer,.signuppanel .form-control{margin-bottom:10px}.signup-footer .pull-left,.signup-footer .pull-right{float:none!important;text-align:center}.signinpanel .signin-info ul{display:none}}@media screen and (max-width:320px){.signinpanel,.signuppanel{margin:0 20px;width:auto}}.checkbox-custom{position:relative;padding:0 15px 0 25px;margin-bottom:7px;display:inline-block}.checkbox-custom input[type="checkbox"]{opacity:0;position:absolute;cursor:pointer;z-index:2;margin:-6px 0 0 0;top:50%;left:3px}.checkbox-custom label:before{content:'';position:absolute;top:50%;left:0;margin-top:-9px;width:18px;height:17px;display:inline-block;border-radius:2px;border:1px solid #bbb;background:#fff}.checkbox-custom input[type="checkbox"]:checked+label:after{position:absolute;display:inline-block;font-family:'Glyphicons Halflings';content:"\e013";top:42%;left:3px;margin-top:-5px;font-size:11px;line-height:1;width:16px;height:16px;color:#333}.checkbox-custom label{cursor:pointer;line-height:1.2;font-weight:normal;margin-bottom:0;text-align:left}.form-control,.form-control:focus,.has-error .form-control:focus,.has-success .form-control:focus,.has-warning .form-control:focus,.navbar-collapse,.navbar-form,.navbar-form-custom .form-control:focus,.navbar-form-custom .form-control:hover,.open .btn.dropdown-toggle,.panel,.popover,.progress,.progress-bar{box-shadow:none}.form-control{border-radius:1px!important;padding:6px 12px!important;height:34px!important}.form-control:focus{border-color:#1ab394!important}
+html{height:100%}body.signin{height:auto;background:url(../img/login-background.jpg) no-repeat center fixed;-webkit-background-size:cover;-moz-background-size:cover;-o-background-size:cover;background-size:cover}.signinpanel{width:750px;margin:17% auto 0;color:rgba(255,255,255,.95)}.signinpanel .logopanel{float:none;width:auto;padding:0;background:0}.signinpanel .signin-info ul{list-style:none;padding:0;margin:20px 0}.signinpanel .form-control{display:block;margin-top:15px}.signinpanel .uname{background:#fff url(../img/user.png) no-repeat 95% center;color:#333}.signinpanel .pword{background:#fff url(../img/locked.png) no-repeat 95% center;color:#333}.signinpanel .code{background:#fff no-repeat 95% center;color:#333;margin:0 0 15px 0}.signinpanel .btn{margin-top:15px}.signinpanel form{background:rgba(255,255,255,.2);border:1px solid rgba(255,255,255,.3);-moz-box-shadow:0 3px 0 rgba(12,12,12,.03);-webkit-box-shadow:0 3px 0 rgba(12,12,12,.03);box-shadow:0 3px 0 rgba(12,12,12,.03);-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;padding:30px}.signup-footer{margin:20px 0;padding-top:15px}@media screen and (max-width:768px){.signinpanel,.signuppanel{margin:0 auto;width:380px!important;padding:20px}.signinpanel form{margin-top:20px}.signup-footer,.signuppanel .form-control{margin-bottom:10px}.signup-footer .pull-left,.signup-footer .pull-right{float:none!important;text-align:center}.signinpanel .signin-info ul{display:none}}@media screen and (max-width:320px){.signinpanel,.signuppanel{margin:0 20px;width:auto}}.checkbox-custom{position:relative;padding:0 15px 0 25px;margin-bottom:7px;display:inline-block}.checkbox-custom input[type="checkbox"]{opacity:0;position:absolute;cursor:pointer;z-index:2;margin:-6px 0 0 0;top:50%;left:3px}.checkbox-custom label:before{content:'';position:absolute;top:50%;left:0;margin-top:-9px;width:18px;height:17px;display:inline-block;border-radius:2px;border:1px solid #bbb;background:#fff}.checkbox-custom input[type="checkbox"]:checked+label:after{position:absolute;display:inline-block;font-family:'Glyphicons Halflings';content:"\e013";top:42%;left:3px;margin-top:-5px;font-size:11px;line-height:1;width:16px;height:16px;color:#333}.checkbox-custom label{cursor:pointer;line-height:1.2;font-weight:normal;margin-bottom:0;text-align:left}.form-control,.form-control:focus,.has-error .form-control:focus,.has-success .form-control:focus,.has-warning .form-control:focus,.navbar-collapse,.navbar-form,.navbar-form-custom .form-control:focus,.navbar-form-custom .form-control:hover,.open .btn.dropdown-toggle,.panel,.popover,.progress,.progress-bar{box-shadow:none}.form-control{border-radius:1px!important;padding:6px 12px!important;height:34px!important}.form-control:focus{border-color:#1ab394!important}

ruoyi-admin/src/main/resources/templates/include.html

@@ -42,6 +42,14 @@
 	<script th:src="@{/ruoyi/js/getCity.js?v=4.7.7}"></script>
 </div>
 
+<!-- element下拉框插件 -->
+<div th:fragment="element-css">
+	<link th:href="@{/ruoyi/css/element.css?v=0.0.0}" rel="stylesheet"/>
+</div>
+<div th:fragment="element-js">
+	<script th:src="@{/ruoyi/js/element.js?v=0.0.0}"></script>
+</div>
+
 <!-- ztree树插件 -->
 <div th:fragment="ztree-css">
     <link th:href="@{/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css}" rel="stylesheet"/>

ruoyi-admin/src/main/resources/templates/index-topnav.html

@@ -246,7 +246,7 @@
 				</div>
                 <!-- 右侧栏 -->
                 <ul class="nav navbar-top-links navbar-right welcome-message">
-                    <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="开发文档" href="http://doc.ruoyi.vip/ruoyi" target="_blank"><i class="fa fa-question-circle"></i> 文档</a></li>
+<!--                    <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="开发文档" href="http://doc.ruoyi.vip/ruoyi" target="_blank"><i class="fa fa-question-circle"></i> 文档</a></li>-->
                     <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="锁定屏幕" href="#" id="lockScreen"><i class="fa fa-lock"></i> 锁屏</a></li>
 	                <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="全屏显示" href="#" id="fullScreen"><i class="fa fa-arrows-alt"></i> 全屏</a></li>
                 

ruoyi-admin/src/main/resources/templates/index.html

@@ -72,7 +72,7 @@
 					</ul>
                 </li>
                 <li th:if="${demoEnabled}">
-					<a href="#"><i class="fa fa-desktop"></i><span class="nav-label">实例演示</span><span class="fa arrow"></span></a>
+<!--					<a href="#"><i class="fa fa-desktop"></i><span class="nav-label">实例演示</span><span class="fa arrow"></span></a>-->
                     <ul class="nav nav-second-level collapse">
                         <li> <a>表单<span class="fa arrow"></span></a>
                             <ul class="nav nav-third-level">
@@ -193,7 +193,7 @@
                     </a>
                 </div>
                 <ul class="nav navbar-top-links navbar-right welcome-message">
-                    <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="开发文档" href="http://doc.ruoyi.vip/ruoyi" target="_blank"><i class="fa fa-question-circle"></i> 文档</a></li>
+<!--                    <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="开发文档" href="http://doc.ruoyi.vip/ruoyi" target="_blank"><i class="fa fa-question-circle"></i> 文档</a></li>-->
                     <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="锁定屏幕" href="#" id="lockScreen"><i class="fa fa-lock"></i> 锁屏</a></li>
 	                <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="全屏显示" href="#" id="fullScreen"><i class="fa fa-arrows-alt"></i> 全屏</a></li>
                     <li class="dropdown user-menu">

ruoyi-admin/src/main/resources/templates/login.html

@@ -19,7 +19,7 @@
     <style type="text/css">label.error { position:inherit;  }
     .verifybox {
         left: 63%;
-        top: 33%;
+        top: 45%;
         transform: translate(-52%, -50%);
     }
     </style>

ruoyi-admin/src/main/resources/templates/main.html

@@ -46,6 +46,23 @@
             color: #000000;
             margin-bottom: 5px;
         }
+        ::-webkit-scrollbar {
+            width: 8px;
+        }
+        /* 背景色 */
+        ::-webkit-scrollbar-track {
+            background: #f1f1f1;
+        }
+        /* 滑块 */
+        ::-webkit-scrollbar-thumb {
+            background: #a1a1a1;
+            border-radius: 20px;
+        }
+
+        /* 滑块悬停时 */
+        ::-webkit-scrollbar-thumb:hover {
+            background: #7a7a7a;
+        }
 	</style>
 </head>
 
@@ -219,4 +236,4 @@
 			content: html
 		});
 	});
-</script>
+</script>

ruoyi-admin/src/main/resources/templates/register.html

@@ -35,7 +35,7 @@
                         <h1><img alt="[ 若依 ]" src="../static/ruoyi.png" th:src="@{/ruoyi.png}"></h1>
                     </div>
                     <div class="m-b"></div>
-                    <h4>欢迎使用 <strong>若依 后台管理系统</strong></h4>
+                    <h4>欢迎使用 <strong>后台管理系统</strong></h4>
                     <ul class="m-b">
                         <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> SpringBoot</li>
                         <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Mybatis</li>
@@ -49,7 +49,7 @@
             <div class="col-sm-5">
                 <form id="registerForm" autocomplete="off">
                     <h4 class="no-margins">注册：</h4>
-                    <p class="m-t-md">你若不离不弃，我必生死相依</p>
+                    <p class="m-t-md"></p>
                     <input type="text"     name="username" class="form-control uname"         placeholder="用户名"   maxlength="20" />
                     <input type="password" name="password" class="form-control pword"         placeholder="密码"     maxlength="20" />
                     <input type="password" name="confirmPassword" class="form-control pword"  placeholder="确认密码" maxlength="20" />

ruoyi-admin/src/main/resources/templates/system/check/add.html

@@ -7,85 +7,126 @@
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
         <form class="form-horizontal m" id="form-check-add" th:object="${user}">
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">报告人：</label>
-                <div class="col-sm-8">
-                    <input name="user" readonly required th:value="*{userName}" class="form-control" type="text">
+            <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="adduser" readonly required th:value="*{userName}" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">报告人单位：</label>
-                <div class="col-sm-8">
-                    <input name="depart" readonly required th:value="*{dept.deptName}" class="form-control" type="text">
+                <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="depart" readonly required th:value="*{dept.deptName}" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">检查开始时间：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <input name="checkStartTime" required readonly class="form-control" placeholder="yyyy-MM-dd" type="text">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+            <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">
+                            <div class="input-group date">
+                                <input name="checkStartTime" required readonly 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="form-group">
-                <label class="col-sm-3 control-label is-required">所属地市：</label>
-                <div class="col-sm-8">
-                    <select id="City" name="framework" required @change="getAreaList()" v-model="City" class="form-control m-b">
-                        <option value="">请选择</option>
-                        <option v-for="option in CityList" :value="option.id" :key="option.id">
-                            {{ option.name }}
-                        </option>
-                    </select>
+            <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 id="City" name="framework" required @change="getAreaList()" v-model="City" class="form-control m-b">
+                                <option value="">---请选择---</option>
+                                <option v-for="option in CityList" :value="option.id" :key="option.id">
+                                    {{ option.name }}
+                                </option>
+                            </select>
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">所属区县：</label>
-                <div class="col-sm-8">
-                    <select id="Area" name="area" required v-model="Area" class="form-control m-b">
-                        <option value="">请选择</option>
-                        <option v-for="option in AreaList" :value="option.id" :key="option.id">
-                            {{ option.name }}
-                        </option>
-                    </select>
+                <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 id="Area" name="area" required v-model="Area" class="form-control m-b">
+                                <option value="">---请选择---</option>
+                                <option v-for="option in AreaList" :value="option.id" :key="option.id">
+                                    {{ option.name }}
+                                </option>
+                            </select>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">人员检查：</label>
-                <div class="col-sm-8">
-                    <textarea name="checkcontentry" required class="form-control" ></textarea>
+            <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="checkcontentry" placeholder="请输入人员检查" required class="form-control" ></textarea>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">文件检查：</label>
-                <div class="col-sm-8">
-                    <textarea name="checkcontentrywj" required class="form-control" ></textarea>
+            <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="checkcontentrywj" placeholder="请输入文件检查" required class="form-control" ></textarea>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">资产检查：</label>
-                <div class="col-sm-8">
-                    <textarea name="checkcontentrysb" required class="form-control" ></textarea>
+            <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="checkcontentrysb" placeholder="请输入资产检查" required class="form-control" ></textarea>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">管理制度检查：</label>
-                <div class="col-sm-8">
-                    <textarea name="checkcontentryglzd" required class="form-control" ></textarea>
+            <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="checkcontentryglzd" placeholder="请输入管理制度检查" required class="form-control" ></textarea>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">泄密事件检查：</label>
-                <div class="col-sm-8">
-                    <textarea name="checkcontentryxmsj" required class="form-control" ></textarea>
+            <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="checkcontentryxmsj" placeholder="请输入泄密事件检查" required class="form-control" ></textarea>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">其他项目检查：</label>
-                <div class="col-sm-8">
-                    <textarea name="checkcontentryother" required class="form-control" ></textarea>
+            <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="checkcontentryother" placeholder="请输入其他项目检查" required class="form-control" ></textarea>
+                        </div>
+                    </div>
                 </div>
             </div>
+
         </form>
     </div>
     <th:block th:include="include :: footer" />

ruoyi-admin/src/main/resources/templates/system/check/check.html

@@ -17,7 +17,7 @@
                             <li>
                                 <label>所属市州：</label>
                                 <select id="City" name="framework" @change="getAreaList()" v-model="City">
-                                    <option value="">请选择</option>
+                                    <option value="">---请选择---</option>
                                     <option v-for="option in CityList" :value="option.id" :key="option.id">
                                         {{ option.name }}
                                     </option>
@@ -26,7 +26,7 @@
                             <li>
                                 <label>所属区县：</label>
                                 <select id="Area" name="area" v-model="Area">
-                                    <option value="">请选择</option>
+                                    <option value="">---请选择---</option>
                                     <option v-for="option in AreaList" :value="option.id" :key="option.id">
                                         {{ option.name }}
                                     </option>
@@ -123,7 +123,7 @@
                     }
                 },
                 {
-                    field: 'user',
+                    field: 'adduser',
                     title: '报告人'
                 },
                 {

ruoyi-admin/src/main/resources/templates/system/check/detail.html

@@ -8,83 +8,123 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
     <form class="form-horizontal m" id="form-check-edit" th:object="${tdCheck}">
         <input name="checkId" th:field="*{checkId}" type="hidden">
-        <div class="form-group">
-            <label class="col-sm-3 control-label">报告人：</label>
-            <div class="col-sm-8">
-                <input name="user" disabled th:field="*{user}" class="form-control" type="text">
+        <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="user" disabled th:field="*{adduser}" class="form-control" type="text">
+                    </div>
+                </div>
             </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">报告人单位：</label>
-            <div class="col-sm-8">
-                <input name="depart" disabled th:field="*{depart}" class="form-control" type="text">
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">报告人单位：</label>
+                    <div class="col-sm-8">
+                        <input name="depart" disabled th:field="*{depart}" class="form-control" type="text">
+                    </div>
+                </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">检查开始时间：</label>
-            <div class="col-sm-8">
-                <div class="input-group date">
-                    <input name="checkStartTime" disabled th:value="${#dates.format(tdCheck.checkStartTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="form-group">
+                    <label class="col-sm-2 control-label">检查开始时间：</label>
+                    <div class="col-sm-10">
+                        <div class="input-group date">
+                            <input name="checkStartTime" disabled th:value="${#dates.format(tdCheck.checkStartTime, 'yyyy-MM-dd')}" 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="form-group">
-            <label class="col-sm-3 control-label is-required">所属地市：</label>
-            <div class="col-sm-8">
-                <select id="City" name="framework" disabled required @change="getAreaList()" v-model="City" class="form-control m-b">
-                    <option value="">请选择</option>
-                    <option v-for="option in CityList" :value="option.id" :key="option.id">
-                        {{ option.name }}
-                    </option>
-                </select>
+        <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 id="City" name="framework" disabled required @change="getAreaList()" v-model="City" class="form-control m-b">
+                            <option value="">---请选择---</option>
+                            <option v-for="option in CityList" :value="option.id" :key="option.id">
+                                {{ option.name }}
+                            </option>
+                        </select>
+                    </div>
+                </div>
             </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">所属区县：</label>
-            <div class="col-sm-8">
-                <select id="Area" name="area" disabled required v-model="Area" class="form-control m-b">
-                    <option value="">请选择</option>
-                    <option v-for="option in AreaList" :value="option.id" :key="option.id">
-                        {{ option.name }}
-                    </option>
-                </select>
+            <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 id="Area" name="area" disabled required v-model="Area" class="form-control m-b">
+                            <option value="">---请选择---</option>
+                            <option v-for="option in AreaList" :value="option.id" :key="option.id">
+                                {{ option.name }}
+                            </option>
+                        </select>
+                    </div>
+                </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">人员检查：</label>
-            <div class="col-sm-8">
-                <textarea name="checkcontentry" disabled th:field="*{checkcontentry}" class="form-control" ></textarea>
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="form-group">
+                    <label class="col-sm-2 control-label">人员检查：</label>
+                    <div class="col-sm-10">
+                        <textarea name="checkcontentry" disabled th:field="*{checkcontentry}" class="form-control" ></textarea>
+                    </div>
+                </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">文件检查：</label>
-            <div class="col-sm-8">
-                <textarea name="checkcontentrywj" disabled th:field="*{checkcontentrywj}" class="form-control" ></textarea>
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="form-group">
+                    <label class="col-sm-2 control-label">文件检查：</label>
+                    <div class="col-sm-10">
+                        <textarea name="checkcontentrywj" disabled th:field="*{checkcontentrywj}" class="form-control" ></textarea>
+                    </div>
+                </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">资产检查：</label>
-            <div class="col-sm-8">
-                <textarea name="checkcontentrysb" disabled th:field="*{checkcontentrysb}" class="form-control" ></textarea>
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="form-group">
+                <label class="col-sm-2 control-label">资产检查：</label>
+                <div class="col-sm-10">
+                    <textarea name="checkcontentrysb" disabled th:field="*{checkcontentrysb}" class="form-control" ></textarea>
+                </div>
+            </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">管理制度检查：</label>
-            <div class="col-sm-8">
-                <textarea name="checkcontentryglzd" disabled th:field="*{checkcontentryglzd}" class="form-control" ></textarea>
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="form-group">
+                    <label class="col-sm-2 control-label">管理制度检查：</label>
+                    <div class="col-sm-10">
+                        <textarea name="checkcontentryglzd" disabled th:field="*{checkcontentryglzd}" class="form-control" ></textarea>
+                    </div>
+                </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">泄密事件检查：</label>
-            <div class="col-sm-8">
-                <textarea name="checkcontentryxmsj" disabled th:field="*{checkcontentryxmsj}" class="form-control" ></textarea>
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="form-group">
+                    <label class="col-sm-2 control-label">泄密事件检查：</label>
+                    <div class="col-sm-10">
+                        <textarea name="checkcontentryxmsj" disabled th:field="*{checkcontentryxmsj}" class="form-control" ></textarea>
+                    </div>
+                </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">其他项目检查：</label>
-            <div class="col-sm-8">
-                <textarea name="checkcontentryother" disabled th:field="*{checkcontentryother}" class="form-control" ></textarea>
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="form-group">
+                    <label class="col-sm-2 control-label">其他项目检查：</label>
+                    <div class="col-sm-10">
+                        <textarea name="checkcontentryother" disabled th:field="*{checkcontentryother}" class="form-control" ></textarea>
+                    </div>
+                </div>
             </div>
         </div>
     </form>

ruoyi-admin/src/main/resources/templates/system/check/edit.html

@@ -8,83 +8,123 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
         <form class="form-horizontal m" id="form-check-edit" th:object="${tdCheck}">
             <input name="checkId" th:field="*{checkId}" type="hidden">
-            <div class="form-group">
-                <label class="col-sm-3 control-label">报告人：</label>
-                <div class="col-sm-8">
-                    <input name="user" disabled th:field="*{user}" class="form-control" type="text">
+            <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="user" disabled th:field="*{adduser}" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">报告人单位：</label>
-                <div class="col-sm-8">
-                    <input name="depart" disabled th:field="*{depart}" class="form-control" type="text">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">报告人单位：</label>
+                        <div class="col-sm-8">
+                            <input name="depart" disabled th:field="*{depart}" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">检查开始时间：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <input name="checkStartTime" disabled th:value="${#dates.format(tdCheck.checkStartTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">检查开始时间：</label>
+                        <div class="col-sm-10">
+                            <div class="input-group date">
+                                <input name="checkStartTime" disabled th:value="${#dates.format(tdCheck.checkStartTime, 'yyyy-MM-dd')}" 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="form-group">
-                <label class="col-sm-3 control-label is-required">所属地市：</label>
-                <div class="col-sm-8">
-                    <select id="City" name="framework" required @change="getAreaList()" v-model="City" class="form-control m-b">
-                        <option value="">请选择</option>
-                        <option v-for="option in CityList" :value="option.id" :key="option.id">
-                            {{ option.name }}
-                        </option>
-                    </select>
+            <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 id="City" name="framework" required @change="getAreaList()" v-model="City" class="form-control m-b">
+                                <option value="">---请选择---</option>
+                                <option v-for="option in CityList" :value="option.id" :key="option.id">
+                                    {{ option.name }}
+                                </option>
+                            </select>
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">所属区县：</label>
-                <div class="col-sm-8">
-                    <select id="Area" name="area" required v-model="Area" class="form-control m-b">
-                        <option value="">请选择</option>
-                        <option v-for="option in AreaList" :value="option.id" :key="option.id">
-                            {{ option.name }}
-                        </option>
-                    </select>
+                <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 id="Area" name="area" required v-model="Area" class="form-control m-b">
+                                <option value="">---请选择---</option>
+                                <option v-for="option in AreaList" :value="option.id" :key="option.id">
+                                    {{ option.name }}
+                                </option>
+                            </select>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">人员检查：</label>
-                <div class="col-sm-8">
-                    <textarea name="checkcontentry" required th:field="*{checkcontentry}" class="form-control" ></textarea>
+            <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="checkcontentry" required th:field="*{checkcontentry}" class="form-control" ></textarea>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">文件检查：</label>
-                <div class="col-sm-8">
-                    <textarea name="checkcontentrywj" required th:field="*{checkcontentrywj}" class="form-control" ></textarea>
+            <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="checkcontentrywj" required th:field="*{checkcontentrywj}" class="form-control" ></textarea>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">资产检查：</label>
-                <div class="col-sm-8">
-                    <textarea name="checkcontentrysb" required th:field="*{checkcontentrysb}" class="form-control" ></textarea>
+            <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="checkcontentrysb" required th:field="*{checkcontentrysb}" class="form-control" ></textarea>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">管理制度检查：</label>
-                <div class="col-sm-8">
-                    <textarea name="checkcontentryglzd" required th:field="*{checkcontentryglzd}" class="form-control" ></textarea>
+            <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="checkcontentryglzd" required th:field="*{checkcontentryglzd}" class="form-control" ></textarea>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">泄密事件检查：</label>
-                <div class="col-sm-8">
-                    <textarea name="checkcontentryxmsj" required th:field="*{checkcontentryxmsj}" class="form-control" ></textarea>
+            <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="checkcontentryxmsj" required th:field="*{checkcontentryxmsj}" class="form-control" ></textarea>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">其他项目检查：</label>
-                <div class="col-sm-8">
-                    <textarea name="checkcontentryother" required th:field="*{checkcontentryother}" class="form-control" ></textarea>
+            <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="checkcontentryother" required th:field="*{checkcontentryother}" class="form-control" ></textarea>
+                        </div>
+                    </div>
                 </div>
             </div>
         </form>

ruoyi-admin/src/main/resources/templates/system/check/selfcheck.html

@@ -8,115 +8,149 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form class="form-horizontal m" id="form-check-edit" th:object="${tdCheck}">
         <input name="checkId" th:field="*{checkId}" type="hidden">
-        <div class="form-group">
-            <label class="col-sm-3 control-label">报告人：</label>
-            <div class="col-sm-8">
-                <input name="user" disabled th:field="*{user}" class="form-control" type="text">
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">报告人单位：</label>
-            <div class="col-sm-8">
-                <input name="depart" disabled th:field="*{depart}" class="form-control" type="text">
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">检查开始时间：</label>
-            <div class="col-sm-8">
-                <div class="input-group date">
-                    <input name="checkStartTime" disabled th:value="${#dates.format(tdCheck.checkStartTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+        <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="adduser" disabled th:field="*{adduser}" class="form-control" type="text">
+                    </div>
                 </div>
             </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">人员检查：</label>
-            <div class="col-sm-8">
-                <div class="radio-box" th:each="dict : ${@dict.getType('sys_self_check')}">
-                    <input type="radio" required th:id="${'checkcontentryjt_' + dict.dictCode}" name="checkcontentryjt" th:value="${dict.dictValue}" th:field="*{checkcontentryjt}">
-                    <label th:for="${'checkcontentryjt_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">报告人单位：</label>
+                    <div class="col-sm-8">
+                        <input name="depart" disabled th:field="*{depart}" class="form-control" type="text">
+                    </div>
                 </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label"></label>
-            <div class="col-sm-8">
-                <textarea name="checkcontentry" disabled th:field="*{checkcontentry}" class="form-control" ></textarea>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">文件检查：</label>
-            <div class="col-sm-8">
-                <div class="radio-box" th:each="dict : ${@dict.getType('sys_self_check')}">
-                    <input type="radio" required th:id="${'checkcontentrywjjt_' + dict.dictCode}" name="checkcontentrywjjt" th:value="${dict.dictValue}" th:field="*{checkcontentrywjjt}">
-                    <label th:for="${'checkcontentrywjjt_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="form-group">
+                    <label class="col-sm-2 control-label">检查开始时间：</label>
+                    <div class="col-sm-10">
+                        <div class="input-group date">
+                            <input name="checkStartTime" disabled th:value="${#dates.format(tdCheck.checkStartTime, 'yyyy-MM-dd')}" 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="form-group">
-            <label class="col-sm-3 control-label"></label>
-            <div class="col-sm-8">
-                <textarea name="checkcontentrywj" disabled th:field="*{checkcontentrywj}" class="form-control" ></textarea>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">资产检查：</label>
-            <div class="col-sm-8">
-                <div class="radio-box" th:each="dict : ${@dict.getType('sys_self_check')}">
-                    <input type="radio" required th:id="${'checkcontentrysbjt_' + dict.dictCode}" name="checkcontentrysbjt" th:value="${dict.dictValue}" th:field="*{checkcontentrysbjt}">
-                    <label th:for="${'checkcontentrysbjt_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+        <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">
+                        <div class="radio-box" th:each="dict : ${@dict.getType('sys_self_check')}">
+                            <input type="radio" required th:id="${'checkcontentryjt_' + dict.dictCode}" name="checkcontentryjt" th:value="${dict.dictValue}" th:field="*{checkcontentryjt}">
+                            <label th:for="${'checkcontentryjt_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                        </div>
+                    </div>
                 </div>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label"></label>
-            <div class="col-sm-8">
-                <textarea name="checkcontentrysb" disabled th:field="*{checkcontentrysb}" class="form-control" ></textarea>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">管理制度检查：</label>
-            <div class="col-sm-8">
-                <div class="radio-box" th:each="dict : ${@dict.getType('sys_self_check')}">
-                    <input type="radio" required th:id="${'checkcontentryglzdjt_' + dict.dictCode}" name="checkcontentryglzdjt" th:value="${dict.dictValue}" th:field="*{checkcontentryglzdjt}">
-                    <label th:for="${'checkcontentryglzdjt_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                <div class="form-group">
+                    <label class="col-sm-2 control-label"></label>
+                    <div class="col-sm-10">
+                        <textarea name="checkcontentry" disabled th:field="*{checkcontentry}" class="form-control" ></textarea>
+                    </div>
                 </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label"></label>
-            <div class="col-sm-8">
-                <textarea name="checkcontentryglzd" disabled th:field="*{checkcontentryglzd}" class="form-control" ></textarea>
+        <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">
+                        <div class="radio-box" th:each="dict : ${@dict.getType('sys_self_check')}">
+                            <input type="radio" required th:id="${'checkcontentrywjjt_' + dict.dictCode}" name="checkcontentrywjjt" th:value="${dict.dictValue}" th:field="*{checkcontentrywjjt}">
+                            <label th:for="${'checkcontentrywjjt_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="col-sm-2 control-label"></label>
+                    <div class="col-sm-10">
+                        <textarea name="checkcontentrywj" disabled th:field="*{checkcontentrywj}" class="form-control" ></textarea>
+                    </div>
+                </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">泄密事件检查：</label>
-            <div class="col-sm-8">
-                <div class="radio-box" th:each="dict : ${@dict.getType('sys_self_check')}">
-                    <input type="radio" required th:id="${'checkcontentryxmsjjt_' + dict.dictCode}" name="checkcontentryxmsjjt" th:value="${dict.dictValue}" th:field="*{checkcontentryxmsjjt}">
-                    <label th:for="${'checkcontentryxmsjjt_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+        <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">
+                        <div class="radio-box" th:each="dict : ${@dict.getType('sys_self_check')}">
+                            <input type="radio" required th:id="${'checkcontentrysbjt_' + dict.dictCode}" name="checkcontentrysbjt" th:value="${dict.dictValue}" th:field="*{checkcontentrysbjt}">
+                            <label th:for="${'checkcontentrysbjt_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="col-sm-2 control-label"></label>
+                    <div class="col-sm-10">
+                        <textarea name="checkcontentrysb" disabled th:field="*{checkcontentrysb}" class="form-control" ></textarea>
+                    </div>
                 </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label"></label>
-            <div class="col-sm-8">
-                <textarea name="checkcontentryxmsj" disabled th:field="*{checkcontentryxmsj}" class="form-control" ></textarea>
+        <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">
+                        <div class="radio-box" th:each="dict : ${@dict.getType('sys_self_check')}">
+                            <input type="radio" required th:id="${'checkcontentryglzdjt_' + dict.dictCode}" name="checkcontentryglzdjt" th:value="${dict.dictValue}" th:field="*{checkcontentryglzdjt}">
+                            <label th:for="${'checkcontentryglzdjt_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="col-sm-2 control-label"></label>
+                    <div class="col-sm-10">
+                        <textarea name="checkcontentryglzd" disabled th:field="*{checkcontentryglzd}" class="form-control" ></textarea>
+                    </div>
+                </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">其他内容检查：</label>
-            <div class="col-sm-8">
-                <div class="radio-box" th:each="dict : ${@dict.getType('sys_self_check')}">
-                    <input type="radio" required th:id="${'checkcontentryxmsjotherjt_' + dict.dictCode}" name="checkcontentryxmsjotherjt" th:value="${dict.dictValue}" th:field="*{checkcontentryxmsjotherjt}">
-                    <label th:for="${'checkcontentryxmsjotherjt_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+        <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">
+                        <div class="radio-box" th:each="dict : ${@dict.getType('sys_self_check')}">
+                            <input type="radio" required th:id="${'checkcontentryxmsjjt_' + dict.dictCode}" name="checkcontentryxmsjjt" th:value="${dict.dictValue}" th:field="*{checkcontentryxmsjjt}">
+                            <label th:for="${'checkcontentryxmsjjt_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="col-sm-2 control-label"></label>
+                    <div class="col-sm-10">
+                        <textarea name="checkcontentryxmsj" disabled th:field="*{checkcontentryxmsj}" class="form-control" ></textarea>
+                    </div>
                 </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label"></label>
-            <div class="col-sm-8">
-                <textarea name="checkcontentryother" disabled th:field="*{checkcontentryother}" class="form-control" ></textarea>
+        <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">
+                        <div class="radio-box" th:each="dict : ${@dict.getType('sys_self_check')}">
+                            <input type="radio" required th:id="${'checkcontentryxmsjotherjt_' + dict.dictCode}" name="checkcontentryxmsjotherjt" th:value="${dict.dictValue}" th:field="*{checkcontentryxmsjotherjt}">
+                            <label th:for="${'checkcontentryxmsjotherjt_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="col-sm-2 control-label"></label>
+                    <div class="col-sm-10">
+                        <textarea name="checkcontentryother" disabled th:field="*{checkcontentryother}" class="form-control" ></textarea>
+                    </div>
+                </div>
             </div>
         </div>
     </form>

ruoyi-admin/src/main/resources/templates/system/checkresult/checkresult.html

@@ -17,7 +17,7 @@
                             <li>
                                 <label>所属市州：</label>
                                 <select id="City" name="framework" @change="getAreaList()" v-model="City">
-                                    <option value="">请选择</option>
+                                    <option value="">---请选择---</option>
                                     <option v-for="option in CityList" :value="option.id" :key="option.id">
                                         {{ option.name }}
                                     </option>
@@ -26,7 +26,7 @@
                             <li>
                                 <label>所属区县：</label>
                                 <select id="Area" name="area" v-model="Area">
-                                    <option value="">请选择</option>
+                                    <option value="">---请选择---</option>
                                     <option v-for="option in AreaList" :value="option.id" :key="option.id">
                                         {{ option.name }}
                                     </option>
@@ -114,7 +114,7 @@
                     }
                 },
                 {
-                    field: 'user',
+                    field: 'adduser',
                     title: '报告人'
                 },
                 {

ruoyi-admin/src/main/resources/templates/system/checkresult/docheck.html

@@ -24,7 +24,7 @@
                     <label class="col-xs-4 control-label is-required">所属地市：</label>
                     <div class="col-xs-8">
                         <select id="City" name="framework" disabled required @change="getAreaList()" v-model="City" class="form-control m-b">
-                            <option value="">请选择</option>
+                            <option value="">---请选择---</option>
                             <option v-for="option in CityList" :value="option.id" :key="option.id">
                                 {{ option.name }}
                             </option>
@@ -37,7 +37,7 @@
                     <label class="col-xs-4 control-label is-required">所属区县：</label>
                     <div class="col-xs-8">
                         <select id="Area" name="area" disabled required v-model="Area" class="form-control m-b">
-                            <option value="">请选择</option>
+                            <option value="">---请选择---</option>
                             <option v-for="option in AreaList" :value="option.id" :key="option.id">
                                 {{ option.name }}
                             </option>
@@ -95,7 +95,7 @@
                 <div class="form-group">
                     <label class="col-xs-4 control-label">报告人员：</label>
                     <div class="col-xs-8">
-                        <input name="user" readonly th:field="*{user}" class="form-control" type="text">
+                        <input name="adduser" readonly th:field="*{adduser}" class="form-control" type="text">
                     </div>
                 </div>
             </div>

ruoyi-admin/src/main/resources/templates/system/dept/add.html

@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 <head>
-	<th:block th:include="include :: header('新增部门')" />
+	<th:block th:include="include :: header('新增单位')" />
 </head>
 <body class="white-bg">
 	<div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
 		<form class="form-horizontal m" id="form-dept-add">
 			<input id="treeId" name="parentId" type="hidden" th:value="${dept?.deptId}"   />
 			<div class="form-group">
-				<label class="col-sm-3 control-label is-required">上级部门：</label>
+				<label class="col-sm-3 control-label is-required">上级单位：</label>
 				<div class="col-sm-8">
 				    <div class="input-group">
 						<input class="form-control" type="text" onclick="selectDeptTree()" id="treeName" readonly="true" th:value="${dept?.deptName}" required>
@@ -20,7 +20,7 @@
 				<label class="col-sm-3 control-label is-required">所属地市：</label>
 				<div class="col-sm-8">
 					<select id="City" name="framework" required @change="getAreaList()" v-model="City" class="form-control m-b">
-						<option value="">请选择</option>
+						<option value="">---请选择---</option>
 						<option v-for="option in CityList" :value="option.id" :key="option.id">
 							{{ option.name }}
 						</option>
@@ -31,7 +31,7 @@
 				<label class="col-sm-3 control-label is-required">所属区县：</label>
 				<div class="col-sm-8">
 					<select id="Area" name="area" required v-model="Area" class="form-control m-b">
-						<option value="">请选择</option>
+						<option value="">---请选择---</option>
 						<option v-for="option in AreaList" :value="option.id" :key="option.id">
 							{{ option.name }}
 						</option>
@@ -39,7 +39,7 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label is-required">部门名称：</label>
+				<label class="col-sm-3 control-label is-required">单位名称：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="deptName" id="deptName" required>
 				</div>
@@ -69,10 +69,10 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">部门状态：</label>
+				<label class="col-sm-3 control-label is-required">单位状态：</label>
 				<div class="col-sm-8">
 				    <div class="radio-box" th:each="dict : ${@dict.getType('sys_normal_disable')}">
-						<input type="radio" th:id="${dict.dictCode}" name="status" th:value="${dict.dictValue}" th:checked="${dict.default}">
+						<input type="radio" required th:id="${dict.dictCode}" name="status" th:value="${dict.dictValue}">
 						<label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
 					</div>
 				</div>
@@ -154,7 +154,7 @@
 			},
 			messages: {
 		        "deptName": {
-		            remote: "部门已经存在"
+		            remote: "单位已经存在"
 		        }
 		    },
 		    focusCleanup: true
@@ -166,15 +166,15 @@
 	        }
 	    }
 
-		/*部门管理-新增-选择父部门树*/
+		/*单位管理-新增-选择父单位树*/
 		function selectDeptTree() {
 			var treeId = $("#treeId").val();
 			if ($.common.isEmpty(treeId)) {
-       			$.modal.alertWarning("请先添加用户所属的部门！");
+       			$.modal.alertWarning("请先添加用户所属的单位！");
        			return;
        		}
 			var options = {
-				title: '部门选择',
+				title: '单位选择',
 				width: "380",
 				url: prefix + "/selectDeptTree/" + treeId + "/0",
 				callBack: doSubmit

ruoyi-admin/src/main/resources/templates/system/dept/dept.html

@@ -1,7 +1,7 @@
 <!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 :: header('单位列表')" />
 </head>
 <body class="gray-bg">
 	<div class="container-div">
@@ -11,11 +11,11 @@
 					<div class="select-list">
 						<ul>
 							<li>
-								部门名称：<input type="text" name="deptName"/>
+								单位名称：<input type="text" name="deptName"/>
 							</li>
 							<li>
-								部门状态：<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}">
-									<option value="">所有</option>
+								单位状态：<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}">
+									<option value="">---请选择---</option>
 									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
 								</select>
 							</li>
@@ -27,7 +27,7 @@
 					</div>
 				</form>
 			</div>
-                
+
             <div class="btn-group-sm" id="toolbar" role="group">
 		        <a class="btn btn-success" onclick="$.operate.add(100)" shiro:hasPermission="system:dept:add">
                     <i class="fa fa-plus"></i> 新增
@@ -61,14 +61,14 @@
 		        createUrl: prefix + "/add/{id}",
 		        updateUrl: prefix + "/edit/{id}",
 		        removeUrl: prefix + "/remove/{id}",
-		        modalName: "部门",
+		        modalName: "单位",
 		        columns: [{
-                    field: 'selectItem', 
+                    field: 'selectItem',
                     radio: true
                  },
                  {
 		            field: 'deptName',
-		            title: '部门名称',
+		            title: '单位名称',
 		            align: "left"
 		        },
 		        {
@@ -109,4 +109,4 @@
 		});
 	</script>
 </body>
-</html>
+</html>

ruoyi-admin/src/main/resources/templates/system/dept/edit.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 <head>
-	<th:block th:include="include :: header('修改部门')" />
+	<th:block th:include="include :: header('修改单位')" />
 </head>
 <body class="white-bg">
 	<div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
@@ -9,7 +9,7 @@
 			<input name="deptId" type="hidden" th:field="*{deptId}" />
 			<input id="treeId" name="parentId" type="hidden" th:field="*{parentId}" />
 			<div class="form-group">
-				<label class="col-sm-3 control-label">上级部门：</label>
+				<label class="col-sm-3 control-label">上级单位：</label>
 				<div class="col-sm-8">
 				    <div class="input-group">
 						<input class="form-control" type="text" id="treeName" onclick="selectDeptTree()" readonly="true" th:field="*{parentName}">
@@ -21,7 +21,7 @@
 				<label class="col-sm-3 control-label is-required">所属地市：</label>
 				<div class="col-sm-8">
 					<select id="City" name="framework" required @change="getAreaList()" v-model="City" class="form-control m-b">
-						<option value="">请选择</option>
+						<option value="">---请选择---</option>
 						<option v-for="option in CityList" :value="option.id" :key="option.id">
 							{{ option.name }}
 						</option>
@@ -32,7 +32,7 @@
 				<label class="col-sm-3 control-label is-required">所属区县：</label>
 				<div class="col-sm-8">
 					<select id="Area" name="area" required v-model="Area" class="form-control m-b">
-						<option value="">请选择</option>
+						<option value="">---请选择---</option>
 						<option v-for="option in AreaList" :value="option.id" :key="option.id">
 							{{ option.name }}
 						</option>
@@ -40,7 +40,7 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label is-required">部门名称：</label>
+				<label class="col-sm-3 control-label is-required">单位名称：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="deptName" th:field="*{deptName}" id="deptName" required>
 				</div>
@@ -70,7 +70,7 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">部门状态：</label>
+				<label class="col-sm-3 control-label">单位状态：</label>
 				<div class="col-sm-8">
 					<div class="radio-box" th:each="dict : ${@dict.getType('sys_normal_disable')}">
 						<input type="radio" th:id="${dict.dictCode}" name="status" th:value="${dict.dictValue}" th:field="*{status}">
@@ -116,7 +116,7 @@
 			},
 			messages: {
 		        "deptName": {
-		            remote: "部门已经存在"
+		            remote: "单位已经存在"
 		        }
 		    },
 		    focusCleanup: true
@@ -128,20 +128,20 @@
 	        }
 	    }
 
-		/*部门管理-修改-选择部门树*/
+		/*单位管理-修改-选择单位树*/
 		function selectDeptTree() {
 			var deptId = $("#treeId").val();
 			var excludeId = $("input[name='deptId']").val();
 			if(deptId > 0) {
 			    var options = {
-					title: '部门选择',
+					title: '单位选择',
 					width: "380",
 					url: prefix + "/selectDeptTree/" + $("#treeId").val() + "/" + excludeId,
 					callBack: doSubmit
 				};
 				$.modal.openOptions(options);
 			} else {
-        		$.modal.alertError("父部门不能选择");
+        		$.modal.alertError("父单位不能选择");
         	}
 		}
 

ruoyi-admin/src/main/resources/templates/system/dept/tree.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 <head>
-	<th:block th:include="include :: header('部门树选择')" />
+	<th:block th:include="include :: header('单位树选择')" />
 	<th:block th:include="include :: ztree-css" />
 </head>
 <style>
@@ -40,7 +40,7 @@
 		    };
 			$.tree.init(options);
 		});
-		
+
 		function zOnClick(event, treeId, treeNode) {
 		    var treeId = treeNode.id;
 		    var treeName = treeNode.name;

ruoyi-admin/src/main/resources/templates/system/exam/exam.html

@@ -94,7 +94,7 @@
 
     #examTitle {
         width: 100%;
-        height: 100px;
+        height: 70px;
         background-color: #ffffff;
         display: flex;
         justify-content: space-between;
@@ -964,6 +964,20 @@
                 window.location.href = `/system/exam`;
             }
         };
+        window.addEventListener('beforeunload', function() {
+            documentVisililityChange();
+        });
+
+        window.addEventListener('unload', function() {
+            documentVisililityChange();
+        });
+        document.addEventListener('visibilitychange',documentVisililityChange)
+        function documentVisililityChange (){
+                if (document.visibilityState === 'hidden'){
+                    alert("检测到您已切换页面，系统将进行强制提交");
+                    submitMethid();
+                }
+        }
         function submitMethid(sub){
             var htmlText = '';
             var account = 0; //总得分
@@ -1149,7 +1163,6 @@
             callInternalFunction: submitMethid
         };
     }
-
 </script>
 
 </body>

ruoyi-admin/src/main/resources/templates/system/exam/index.html

@@ -61,10 +61,10 @@
                                 <tr>
                                     <td colspan="3"><p align="center" class="unnamed1">友情提示</p>
                                         <p align="center" class="unnamed1">答题过程不能中断!不能作弊和抄袭,</p>
+                                        <p align="center" class="unnamed1">答题过程中不能切换屏幕，否则将进行强制提交！</p>
                                         <p align="center" class="unnamed1">考试时间为：45分钟，到考试结束时间没有交卷的，系统将强制交卷！</p>
                                         <p align="center">
-                                            <input type="button"  class="btn btn-primary" name="button1" value=" 开始答卷"  onclick="check()"
-                                            />
+                                            <input type="button"  class="btn btn-primary" name="button1" value=" 开始答卷"  onclick="check()"/>
                                         </p>
                                     </td>
                                 </tr>
@@ -82,8 +82,8 @@
             alert("请选择相关考题！");
             return false;
         }
-        var userName = document.querySelector('.user_name').innerHTML
-        var deptName = document.querySelector('.dept_name').innerHTML
+        var userName = [[${user.userName}]];
+        var deptName = [[${user.dept.deptName}]];
         window.location.href = `/system/exam/edit?TYPEID=${form1.TYPEID.value}&userName=${userName}&deptName=${deptName}`;
         // form1.action = "/zhyw/smsj/TryBook.jsp";
         // form1.button1.disabled=true;

ruoyi-admin/src/main/resources/templates/system/filedestory/detail.html

@@ -5,22 +5,32 @@
     <th:block th:include="include :: datetimepicker-css" />
 </head>
 <body class="white-bg">
-<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
     <form class="form-horizontal m" id="form-filereceive-edit" th:object="${tdFileProvide}">
         <div class="row">
             <div class="col-sm-6">
                 <div class="form-group">
-                    <label class="col-sm-3 control-label">所属市州：</label>
+                    <label class="col-sm-3 control-label is-required">所属地市：</label>
                     <div class="col-sm-8">
-                        <input name="frameworkId" readonly th:field="*{frameworkId}" class="form-control" type="text">
+                        <select id="City" name="frameworkId" disabled required @change="getAreaList()" v-model="City" class="form-control m-b">
+                            <option value="">请选择</option>
+                            <option v-for="option in CityList" :value="option.id" :key="option.id">
+                                {{ option.name }}
+                            </option>
+                        </select>
                     </div>
                 </div>
             </div>
             <div class="col-sm-6">
                 <div class="form-group">
-                    <label class="col-sm-3 control-label">所属区县：</label>
+                    <label class="col-sm-3 control-label is-required">所属区县：</label>
                     <div class="col-sm-8">
-                        <input name="areaid" readonly th:field="*{areaid}" class="form-control" type="text">
+                        <select id="Area" name="areaid" disabled required v-model="Area" class="form-control m-b">
+                            <option value="">请选择</option>
+                            <option v-for="option in AreaList" :value="option.id" :key="option.id">
+                                {{ option.name }}
+                            </option>
+                        </select>
                     </div>
                 </div>
             </div>
@@ -78,6 +88,16 @@
                 </div>
             </div>
         </div>
+        <div class="row">
+            <div class="col-sm-8">
+                <div class="form-group">
+                    <label class="col-sm-2 control-label">备注：</label>
+                    <div class="col-sm-10">
+                        <textarea name="remark" readonly th:field="*{remark}" class="form-control" type="text"></textarea>
+                    </div>
+                </div>
+            </div>
+        </div>
         <div class="col-sm-12 select-table table-striped">
             <table id="bootstrap-table"></table>
         </div>
@@ -128,7 +148,48 @@
     $("#form-filereceive-edit").validate({
         focusCleanup: true
     });
-
+    var app = new Vue({
+        el: '#app',
+        data: {
+            CityList: [],
+            AreaList:[],
+            City:[[${tdFileProvide.frameworkId}]],
+            Area:[[${tdFileProvide.areaid}]],
+            params:{
+                parentId:'',
+            }
+        },
+        mounted(){
+            // 初始化地市列表
+            this.getCityList();
+            if (this.City){
+                this.getAreaList()
+            }
+        },
+        methods:{
+            getCityList(){
+                $.ajax({
+                    url: ctx + "system/area/getSysAreaList",
+                    type: 'GET',
+                    data:this.params ,
+                    success:((res)=>{
+                        this.CityList = res.data
+                    }) ,
+                });
+            },
+            getAreaList(){
+                this.params.parentId = this.City
+                $.ajax({
+                    url: ctx + "system/area/getSysAreaList",
+                    type: 'GET',
+                    data:this.params,
+                    success:((res)=>{
+                        this.AreaList = res.data
+                    }) ,
+                });
+            }
+        }
+    })
     function submitHandler() {
         if ($.validate.form()) {
             $.operate.save(prefix + "/edit", $('#form-filereceive-edit').serialize());

ruoyi-admin/src/main/resources/templates/system/filedestory/edit.html

@@ -55,6 +55,7 @@
             <label class="col-sm-3 control-label is-required">销毁方式：</label>
             <div class="col-sm-8">
                 <select name="destoryStyle" required class="form-control m-b" th:with="type=${@dict.getType('sys_destory_style')}">
+                    <option value="">请选择</option>
                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{destoryStyle}"></option>
                 </select>
             </div>

ruoyi-admin/src/main/resources/templates/system/filedestory/filedestory.html

@@ -109,17 +109,18 @@
                     field: 'destoryDate',
                     title: '销毁日期'
                 },
-                {
-                    field: 'remark',
-                    title: '备注'
-                },
                 {
                     title: '操作',
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + detaileFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.receiveId + '\')"><i class="fa fa-edit"></i>详情</a> ');
-                        actions.push('<a class="btn btn-warning btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.receiveId + '\')"><i class="fa fa-remove"></i>销毁</a> ');
+                        if (row.destoryState === '2'){
+                            actions.push('<a class="btn btn-success btn-xs ' + detaileFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.receiveId + '\')"><i class="fa fa-edit"></i>详情</a> ');
+                            actions.push('<a class="btn btn-warning btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.receiveId + '\')"><i class="fa fa-remove"></i>销毁</a> ');
+                        }else{
+                            actions.push('<a class="btn btn-success btn-xs ' + detaileFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.receiveId + '\')"><i class="fa fa-edit"></i>详情</a> ');
+                            actions.push('<a disabled class="btn btn-warning btn-xs ' + removeFlag + '" href="javascript:void(0)"><i class="fa fa-remove"></i>销毁</a> ');
+                        }
                         return actions.join('');
                     }
                 }]

ruoyi-admin/src/main/resources/templates/system/fileextract/fileextract.html

@@ -113,7 +113,12 @@
                     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.receiveId + '\')"><i class="fa fa-edit"></i>提取</a> ');
+                        if (row.extractState === '2'){
+                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.receiveId + '\')"><i class="fa fa-edit"></i>提取</a> ');
+                        }else{
+                            actions.push('<a disabled class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)"><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.receiveId + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
                     }

ruoyi-admin/src/main/resources/templates/system/fileprovide/add.html

@@ -9,105 +9,152 @@
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-fileprovide-add">
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">所属地市：</label>
-                <div class="col-sm-8">
-                    <select id="City" name="frameworkId" required class="form-control m-b">
-                        <option value="">请选择市</option>
-                    </select>
+            <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 id="City" name="frameworkId" required class="form-control m-b">
+                                <option value="">---请选择---</option>
+                            </select>
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">所属区县：</label>
-                <div class="col-sm-8">
-                    <select id="Area" name="areaid" required class="form-control m-b">
-                        <option value="">请选择区</option>
-                    </select>
+                <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 id="Area" name="areaid" required class="form-control m-b">
+                                <option value="">---请选择---</option>
+                            </select>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">发文单位：</label>
-                <div class="col-sm-8">
-                    <input name="provideDepart" required readonly th:value="${user.dept.deptName}" class="form-control" type="text">
+            <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="fileName" placeholder="请输入文件标题" required class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">发文人员：</label>
-                <div class="col-sm-8">
-                    <input name="provideUserid" required readonly th:value="${user.userName}" class="form-control" type="text">
+                <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="provideUserid" required readonly th:value="${user.userName}" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
+
+
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">发文日期：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <input name="provideDate" required class="form-control" placeholder="yyyy-MM-dd" type="text">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+            <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="fileSecret" 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="form-group">
-                <label class="col-sm-3 control-label is-required">发文份数：</label>
-                <div class="col-sm-8">
-                    <input name="provideCount" required digits="true" class="form-control"  type="text">
+                <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="releaseSecretid" placeholder="请输入保密期限" required class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
             </div>
-
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">收文单位：</label>
-                <div class="col-sm-8">
-                    <select name="targetDepart" class="form-control select2-multiple m-b" multiple>
-                        <option th:each="item : ${dept}" th:if="${item.deptId != 100}" th:text="${item.deptName}" th:value="${item.deptName}"></option>
-                    </select>
+            <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="instancyExtent" 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>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">紧急程度：</label>
-                <div class="col-sm-8">
-                    <select name="instancyExtent" required class="form-control m-b" th:with="type=${@dict.getType('sys_file_jinjichengdu')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                    </select>
+                <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="fileNum" placeholder="请输入文号" required class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">文件标题：</label>
-                <div class="col-sm-8">
-                    <input name="fileName" required class="form-control" type="text">
+            <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="targetDepart" id="targetDepart" class="form-control select2-multiple" required multiple>
+                                <option th:each="item : ${dept}" th:if="${item.deptId != 100}" th:text="${item.deptName}" th:value="${item.deptName}" ></option>
+                            </select>
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">文号：</label>
-                <div class="col-sm-8">
-                    <input name="fileNum" required class="form-control" type="text">
+                <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="provideCount" required digits="true" placeholder="请输入发文份数" class="form-control"  type="text">
+                        </div>
+                    </div>
                 </div>
+
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">文件密级：</label>
-                <div class="col-sm-8">
-                    <select name="fileSecret" required class="form-control m-b" th:with="type=${@dict.getType('sys_file_miji')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                    </select>
+            <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="provideDepart" required readonly th:value="${user.dept.deptName}" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">定密依据：</label>
-                <div class="col-sm-8">
-                    <input name="allianceFile" required class="form-control" type="text">
+                <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="provideDate" 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="form-group">
-                <label class="col-sm-3 control-label is-required">保密期限：</label>
-                <div class="col-sm-8">
-                    <input name="releaseSecretid" required class="form-control" type="text">
+            <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="allianceFile"  placeholder="请输入定密依据" required class="form-control" type="text"></textarea>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">文件备注：</label>
-                <div class="col-sm-8">
-                    <input name="remark" required class="form-control" type="text">
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">文件备注：</label>
+                        <div class="col-sm-10">
+                            <textarea name="remark"  placeholder="请输入备注"  class="form-control" type="text"></textarea>
+                        </div>
+                    </div>
                 </div>
             </div>
-
         </form>
     </div>
     <th:block th:include="include :: footer" />
@@ -192,6 +239,12 @@
             minView: "month",
             autoclose: true
         });
+        $(function() {
+            $('#targetDepart').select2({
+                placeholder: "请选择收文单位",
+                allowClear: true
+            });
+        })
     </script>
 </body>
 </html>

ruoyi-admin/src/main/resources/templates/system/fileprovide/detail.html

@@ -14,114 +14,162 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
     <form class="form-horizontal m" id="form-fileprovide-edit" th:object="${tdFileProvide}">
         <input name="fileId" th:field="*{fileId}" type="hidden">
-        <div class="form-group">
-            <label class="col-sm-3 control-label">文件编码：</label>
-            <div class="col-sm-8">
-                <input name="fileId" readonly th:field="*{fileId}" class="form-control" type="text">
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="form-group">
+                    <label class="col-sm-2 control-label">文件编码：</label>
+                    <div class="col-sm-10">
+                        <input name="fileId" readonly th:field="*{fileId}" class="form-control" type="text">
+                    </div>
+                </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">所属地市：</label>
-            <div class="col-sm-8">
-                <select id="City" name="frameworkId" disabled required @change="getAreaList()" v-model="City" class="form-control m-b">
-                    <option value="">请选择</option>
-                    <option v-for="option in CityList" :value="option.id" :key="option.id">
-                        {{ option.name }}
-                    </option>
-                </select>
+        <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">
+                        <select id="City" name="frameworkId" disabled @change="getAreaList()" v-model="City" class="form-control m-b">
+                            <option value="">请选择</option>
+                            <option v-for="option in CityList" :value="option.id" :key="option.id">
+                                {{ option.name }}
+                            </option>
+                        </select>
+                    </div>
+                </div>
             </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">所属区县：</label>
-            <div class="col-sm-8">
-                <select id="Area" name="areaid" disabled required v-model="Area" class="form-control m-b">
-                    <option value="">请选择</option>
-                    <option v-for="option in AreaList" :value="option.id" :key="option.id">
-                        {{ option.name }}
-                    </option>
-                </select>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label ">所属区县：</label>
+                    <div class="col-sm-8">
+                        <select id="Area" name="areaid" disabled v-model="Area" class="form-control m-b">
+                            <option value="">请选择</option>
+                            <option v-for="option in AreaList" :value="option.id" :key="option.id">
+                                {{ option.name }}
+                            </option>
+                        </select>
+                    </div>
+                </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">发文单位：</label>
-            <div class="col-sm-8">
-                <input name="provideDepart" readonly th:field="*{provideDepart}" class="form-control" type="text">
+        <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="provideDepart" readonly th:field="*{provideDepart}" class="form-control" type="text">
+                    </div>
+                </div>
             </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">发文人员：</label>
-            <div class="col-sm-8">
-                <input name="provideUserid" readonly th:field="*{provideUserid}" class="form-control" type="text">
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">发文人员：</label>
+                    <div class="col-sm-8">
+                        <input name="provideUserid" readonly th:field="*{provideUserid}" class="form-control" type="text">
+                    </div>
+                </div>
             </div>
         </div>
-
-        <div class="form-group">
-            <label class="col-sm-3 control-label">发文日期：</label>
-            <div class="col-sm-8">
-                <div class="input-group date">
-                    <input name="provideDate" readonly th:value="${#dates.format(tdFileProvide.provideDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+        <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="input-group date">
+                            <input name="provideDate" readonly th:value="${#dates.format(tdFileProvide.provideDate, 'yyyy-MM-dd')}" 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="form-group">
-            <label class="col-sm-3 control-label">发文份数：</label>
-            <div class="col-sm-8">
-                <input name="provideCount" readonly th:field="*{provideCount}" class="form-control" type="text">
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">发文份数：</label>
+                    <div class="col-sm-8">
+                        <input name="provideCount" readonly th:field="*{provideCount}" class="form-control" type="text">
+                    </div>
+                </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">收文单位：</label>
-            <div class="col-sm-8">
-                <select name="targetDepart" disabled class="form-control select2-multiple m-b" multiple>
-                    <option th:each="item : ${dept}" th:if="${item.deptId != 100}" th:text="${item.deptName}" th:selected="${item.delFlag}" th:value="${item.deptName}"></option>
-                </select>
+        <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="provideCount" readonly th:field="*{targetDepart}" class="form-control" type="text">
+                    </div>
+                </div>
             </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">紧急程度：</label>
-            <div class="col-sm-8">
-                <select name="instancyExtent" disabled class="form-control m-b" th:with="type=${@dict.getType('sys_file_jinjichengdu')}">
-                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{instancyExtent}"></option>
-                </select>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">紧急程度：</label>
+                    <div class="col-sm-8">
+                        <select name="instancyExtent" disabled class="form-control m-b" th:with="type=${@dict.getType('sys_file_jinjichengdu')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{instancyExtent}"></option>
+                        </select>
+                    </div>
+                </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">文件标题：</label>
-            <div class="col-sm-8">
-                <input name="fileName" readonly th:field="*{fileName}" class="form-control" type="text">
+        <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="fileName" readonly th:field="*{fileName}" class="form-control" type="text">
+                    </div>
+                </div>
             </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">文号：</label>
-            <div class="col-sm-8">
-                <input name="fileNum" readonly th:field="*{fileNum}" class="form-control" type="text">
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">文号：</label>
+                    <div class="col-sm-8">
+                        <input name="fileNum" readonly th:field="*{fileNum}" class="form-control" type="text">
+                    </div>
+                </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">文件密级：</label>
-            <div class="col-sm-8">
-                <select name="fileSecret" disabled class="form-control m-b" th:with="type=${@dict.getType('sys_file_miji')}">
-                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{fileSecret}"></option>
-                </select>
+        <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">
+                        <select name="fileSecret" disabled class="form-control m-b" th:with="type=${@dict.getType('sys_file_miji')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{fileSecret}"></option>
+                        </select>
+                    </div>
+                </div>
             </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">定密依据：</label>
-            <div class="col-sm-8">
-                <input name="allianceFile" readonly th:field="*{allianceFile}" class="form-control" type="text">
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">定密依据：</label>
+                    <div class="col-sm-8">
+                        <input name="allianceFile" readonly th:field="*{allianceFile}" class="form-control" type="text">
+                    </div>
+                </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">保密期限：</label>
-            <div class="col-sm-8">
-                <input name="releaseSecretid" readonly th:field="*{releaseSecretid}" class="form-control" type="text">
+        <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="releaseSecretid" readonly th:field="*{releaseSecretid}" class="form-control" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-6">
+
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">文件备注：</label>
-            <div class="col-sm-8">
-                <input name="remark" readonly th:field="*{remark}" class="form-control" type="text">
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="form-group">
+                    <label class="col-sm-2 control-label">文件备注：</label>
+                    <div class="col-sm-10">
+                        <textarea name="remark" readonly th:field="*{remark}" class="form-control" type="text"></textarea>
+                    </div>
+                </div>
             </div>
         </div>
     </form>

ruoyi-admin/src/main/resources/templates/system/fileprovide/filenum/filenum.html

@@ -44,9 +44,7 @@
         </div>
 
         <div class="btn-group-sm" id="toolbar" role="group">
-            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:fileprovide:export">
-                <i class="fa fa-download"></i> 导出
-            </a>
+
         </div>
         <div class="col-sm-12 select-table table-striped">
             <table id="bootstrap-table"></table>

ruoyi-admin/src/main/resources/templates/system/fileprovide/fileprovide.html

@@ -2,6 +2,7 @@
 <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 :: element-css" />
 </head>
 <body class="gray-bg">
      <div class="container-div" id="app">
@@ -57,6 +58,7 @@
         </div>
     </div>
     <th:block th:include="include :: footer" />
+     <th:block th:include="include :: element-js" />
     <script th:inline="javascript">
         var removeFlag = [[${@permission.hasPermi('system:fileprovide:remove')}]];
         var detailFlag = [[${@permission.hasPermi('system:fileprovide:detail')}]];

ruoyi-admin/src/main/resources/templates/system/filereceive/filereceive.html

@@ -113,7 +113,12 @@
                     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.receiveId + '\')"><i class="fa fa-edit"></i>接收</a> ');
+                        if (row.receiveState === '2'){
+                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.receiveId + '\')"><i class="fa fa-edit"></i>接收</a> ');
+                        }else{
+                            actions.push('<a disabled class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)"><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.receiveId + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
                     }

ruoyi-admin/src/main/resources/templates/system/indenture/add.html

@@ -7,74 +7,88 @@
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-indenture-add">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">维修商名称：</label>
-                <div class="col-sm-8">
-                    <input name="indentureName" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">维修商地址：</label>
-                <div class="col-sm-8">
-                    <input name="indentureAddress" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">维修商座机：</label>
-                <div class="col-sm-8">
-                    <input name="indenturePhone" class="form-control" type="text">
+            <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="indentureName" required placeholder="请输入维修商名称" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">维修商手机：</label>
-                <div class="col-sm-8">
-                    <input name="indentureMobile" class="form-control" type="text">
+                <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="indentureAddress" required  placeholder="请输入维修商地址" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">联系人：</label>
-                <div class="col-sm-8">
-                    <input name="indentureLinkman" class="form-control" type="text">
+            <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="indenturePhone" required placeholder="请输入维修商座机" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">联系人电话：</label>
-                <div class="col-sm-8">
-                    <input name="linkmanPhone" class="form-control" type="text">
+                <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="indentureMobile" required placeholder="请输入维修商手机" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">联系人手机：</label>
-                <div class="col-sm-8">
-                    <input name="linkmanMobile" class="form-control" type="text">
+            <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="indentureLinkman" placeholder="请输入联系人" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">维修商状态：</label>
-                <div class="col-sm-8">
-                    <select name="indentureState" class="form-control m-b" th:with="type=${@dict.getType('sys_normal_disable')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                    </select>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">联系人座机：</label>
+                        <div class="col-sm-8">
+                            <input name="linkmanPhone" placeholder="请输入联系人座机" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">备注：</label>
-                <div class="col-sm-8">
-                    <textarea name="REMARK" class="form-control"></textarea>
+            <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="linkmanMobile" placeholder="请输入联系人手机" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">创建人：</label>
-                <div class="col-sm-8">
-                    <input name="createStaffid" class="form-control" readonly th:value="${sysuser.userName}" type="text">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">维修单位状态：</label>
+                        <div class="col-sm-8">
+                            <div class="radio-box" th:each="dict : ${@dict.getType('sys_normal_disable')}">
+                                <input type="radio" th:id="${dict.dictCode}" name="indentureState" th:value="${dict.dictValue}" th:checked="${dict.default}">
+                                <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                            </div>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">创建时间：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <input name="createDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">备注：</label>
+                        <div class="col-sm-10">
+                            <textarea name="REMARK"  placeholder="请输入备注" class="form-control"></textarea>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -101,4 +115,4 @@
         });
     </script>
 </body>
-</html>
+</html>

ruoyi-admin/src/main/resources/templates/system/indenture/edit.html

@@ -8,74 +8,88 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-indenture-edit" th:object="${tdIndenture}">
             <input name="indentureId" th:field="*{indentureId}" type="hidden">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">维修商名称：</label>
-                <div class="col-sm-8">
-                    <input name="indentureName" th:field="*{indentureName}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">维修商地址：</label>
-                <div class="col-sm-8">
-                    <input name="indentureAddress" th:field="*{indentureAddress}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">维修商座机：</label>
-                <div class="col-sm-8">
-                    <input name="indenturePhone" th:field="*{indenturePhone}" class="form-control" type="text">
+            <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="indentureName"  required th:field="*{indentureName}" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">维修商手机：</label>
-                <div class="col-sm-8">
-                    <input name="indentureMobile" th:field="*{indentureMobile}" class="form-control" type="text">
+                <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="indentureAddress" required th:field="*{indentureAddress}" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">联系人：</label>
-                <div class="col-sm-8">
-                    <input name="indentureLinkman" th:field="*{indentureLinkman}" class="form-control" type="text">
+            <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="indenturePhone" required th:field="*{indenturePhone}" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">联系人电话：</label>
-                <div class="col-sm-8">
-                    <input name="linkmanPhone" th:field="*{linkmanPhone}" class="form-control" type="text">
+                <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="indentureMobile" required th:field="*{indentureMobile}" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">联系人手机：</label>
-                <div class="col-sm-8">
-                    <input name="linkmanMobile" th:field="*{linkmanMobile}" class="form-control" type="text">
+            <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="indentureLinkman" th:field="*{indentureLinkman}" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">维修商状态：</label>
-                <div class="col-sm-8">
-                    <select name="indentureState" class="form-control m-b" th:with="type=${@dict.getType('sys_normal_disable')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{indentureState}"></option>
-                    </select>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">联系人座机：</label>
+                        <div class="col-sm-8">
+                            <input name="linkmanPhone" th:field="*{linkmanPhone}" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">备注：</label>
-                <div class="col-sm-8">
-                    <textarea name="remark" class="form-control">[[*{remark}]]</textarea>
+            <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="linkmanMobile" th:field="*{linkmanMobile}" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">创建人：</label>
-                <div class="col-sm-8">
-                    <input name="createStaffid" readonly th:field="*{createStaffid}" class="form-control" type="text">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">维修单位状态：</label>
+                        <div class="col-sm-8">
+                            <div class="radio-box" th:each="dict : ${@dict.getType('sys_normal_disable')}">
+                                <input type="radio" th:id="${dict.dictCode}" name="indentureState" th:value="${dict.dictValue}" th:field="*{indentureState}">
+                                <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                            </div>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">创建时间：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <input name="createDate" disabled th:value="${#dates.format(tdIndenture.createDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">备注：</label>
+                        <div class="col-sm-10">
+                            <textarea name="remark" class="form-control">[[*{remark}]]</textarea>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -102,4 +116,4 @@
         });
     </script>
 </body>
-</html>
+</html>

ruoyi-admin/src/main/resources/templates/system/indenture/indenture.html

@@ -21,7 +21,7 @@
                             <li>
                                 <label>状态：</label>
                                 <select name="indentureState" th:with="type=${@dict.getType('sys_normal_disable')}">
-                                    <option value="">所有</option>
+                                    <option value="">---请选择---</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>
@@ -71,30 +71,30 @@
                 updateUrl: prefix + "/edit/{id}",
                 removeUrl: prefix + "/remove",
                 exportUrl: prefix + "/export",
-                modalName: "维修商",
+                modalName: "维修单位",
                 columns: [{
                     checkbox: true
                 },
                 {
                     field: 'indentureId',
-                    title: '维修商id',
+                    title: '维修单位id',
                     visible: false
                 },
                 {
                     field: 'indentureName',
-                    title: '维修商名称'
+                    title: '维修单位名称'
                 },
                 {
                     field: 'indentureAddress',
-                    title: '维修商地址'
+                    title: '维修单位地址'
                 },
                 {
                     field: 'indenturePhone',
-                    title: '维修商座机'
+                    title: '维修单位座机'
                 },
                 {
                     field: 'indentureMobile',
-                    title: '维修商手机'
+                    title: '维修单位手机'
                 },
                 {
                     field: 'indentureLinkman',
@@ -110,7 +110,7 @@
                 },
                 {
                     field: 'indentureState',
-                    title: '维修商状态',
+                    title: '维修单位状态',
                     formatter: function(value, row, index) {
                        return $.table.selectDictLabel(indentureStateDatas, value);
                     }

ruoyi-admin/src/main/resources/templates/system/leave/add.html

@@ -10,12 +10,12 @@
         <form class="form-horizontal m" id="form-leave-add" th:object="${addleave}">
             <input name="userId" type="hidden" th:value="*{userId}" id="userId"/>
             <div class="form-group">
-                <label class="col-sm-3 control-label is-required">提交人：</label>
+                <label class="col-sm-3 control-label is-required">人员姓名：</label>
                 <div class="col-sm-8">
                     <input disabled name="userName" id="username" class="form-control" th:value="*{userName}" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label is-required">地区：</label>
                 <div class="col-sm-8">
                     <input name="areaname" placeholder="请输入地区"  class="form-control" type="text">
@@ -27,17 +27,17 @@
                     <textarea name="leavereason" placeholder="请输入离职原因" class="form-control"></textarea>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">单位：</label>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">所属单位：</label>
                 <div class="col-sm-8">
                     <div class="input-group">
-                        <input name="depart" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择单位" class="form-control">
+                        <input name="depart" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择单位" class="form-control" >
                         <span class="input-group-addon"><i class="fa fa-search"></i></span>
                     </div>
 
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label is-required">离职时间：</label>
                 <div class="col-sm-8">
                     <div class="input-group date">
@@ -46,6 +46,17 @@
                     </div>
                 </div>
             </div>
+
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">工作交接：</label>
+                <div class="col-sm-8">
+                    <select name="workstate" required class="form-control m-b"  th:with="type=${@dict.getType('sys_user_work')}">
+                        <option value="">---请选择---</option>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+
         </form>
     </div>
     <th:block th:include="include :: footer" />
@@ -95,6 +106,13 @@
             minView: "month",
             autoclose: true
         });
+        $(function() {
+           var deptId =  [[${addleave.deptId}]];
+            var deptName =  [[${addleave.dept.deptName}]];
+            $("#treeId").val(deptId);
+            $("#treeName").val(deptName);
+
+        });
     </script>
 </body>
-</html>
+</html>

ruoyi-admin/src/main/resources/templates/system/leave/edit.html

@@ -9,13 +9,13 @@
         <form class="form-horizontal m" id="form-leave-edit" th:object="${tdLeave}">
             <input name="id" th:field="*{id}" type="hidden">
             <input name="userId" type="hidden" th:value="*{userId}" id="userId"/>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">提交人：</label>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">人员姓名：</label>
                 <div class="col-sm-8">
                     <input readonly name="userName" required th:field="*{userName}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label is-required">地区：</label>
                 <div class="col-sm-8">
                     <input name="areaname" required th:field="*{areaname}" class="form-control" type="text">
@@ -27,8 +27,8 @@
                     <textarea name="leavereason" required class="form-control">[[*{leavereason}]]</textarea>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">单位：</label>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">所属单位：</label>
                 <div class="col-sm-8">
                     <div class="input-group">
                         <input name="depart" required onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择单位" class="form-control" th:field="*{depart}">
@@ -36,7 +36,7 @@
                     </div>
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label is-required">离职时间：</label>
                 <div class="col-sm-8">
                     <div class="input-group date">
@@ -45,6 +45,15 @@
                     </div>
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">工作交接：</label>
+                <div class="col-sm-8">
+                    <select name="workstate" required class="form-control m-b"  th:with="type=${@dict.getType('sys_user_work')}">
+                        <option value="">---请选择---</option>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{workstate}"></option>
+                    </select>
+                </div>
+            </div>
         </form>
     </div>
     <th:block th:include="include :: footer" />
@@ -92,4 +101,4 @@
         });
     </script>
 </body>
-</html>
+</html>

ruoyi-admin/src/main/resources/templates/system/leave/leave.html

@@ -11,7 +11,7 @@
                     <div class="select-list">
                         <ul>
                             <li>
-                                <label>提交人：</label>
+                                <label>人员姓名：</label>
                                 <input type="text" name="usernName"/>
                             </li>
                             <li>
@@ -21,14 +21,14 @@
                             <li>
                                 <label>离职状态：</label>
                                 <select name="leavestate" th:with="type=${@dict.getType('sys_user_leave')}">
-                                    <option value="">所有</option>
+                                    <option value="">---请选择---</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>
                             <li>
                                 <label>审核意见：</label>
                                 <select name="examinestate" th:with="type=${@dict.getType('sys_examine_state')}">
-                                    <option value="">所有</option>
+                                    <option value="">---请选择---</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>
@@ -94,7 +94,7 @@
                 },
                 {
                     field: 'userName',
-                    title: '提交人'
+                    title: '人员姓名'
                 },
                 {
                     field: 'areaname',
@@ -106,7 +106,7 @@
                 },
                 {
                     field: 'depart',
-                    title: '单位'
+                    title: '所属单位'
                 },
                 {
                     field: 'leavedate',
@@ -146,10 +146,17 @@
                     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> ');
-                        actions.push('<a class="btn btn-success btn-xs ' + downloadFlag + '" href="javascript:void(0)" onclick="leaveAuditing(\'' + row.id +  '\')"><i class="fa fa-edit"></i>审核</a> ');
-                        actions.push('<a class="btn btn-success btn-xs ' + PrintFlag + '" href="javascript:void(0)" onclick="auditingPrint(\'' + row.id + '/' + row.userId + '\')"><i class="fa fa-download"></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>');
+                        if (row.examinestate === '2'){
+                            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-success btn-xs ' + downloadFlag + '" href="javascript:void(0)" onclick="leaveAuditing(\'' + row.id +  '\')"><i class="fa fa-edit"></i>审核</a> ');
+                            actions.push('<a class="btn btn-success btn-xs ' + PrintFlag + '" href="javascript:void(0)" onclick="auditingPrint(\'' + row.id + '/' + row.userId + '\')"><i class="fa fa-download"></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 ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                            actions.push('<a disabled class="btn btn-success btn-xs ' + downloadFlag + '" href="javascript:void(0)"><i class="fa fa-edit"></i>审核</a> ');
+                            actions.push('<a class="btn btn-success btn-xs ' + PrintFlag + '" href="javascript:void(0)" onclick="auditingPrint(\'' + row.id + '/' + row.userId + '\')"><i class="fa fa-download"></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('');
                     }
                 }]
@@ -166,4 +173,4 @@
         }
     </script>
 </body>
-</html>
+</html>

ruoyi-admin/src/main/resources/templates/system/leave/leaveexamine.html

@@ -14,7 +14,7 @@
         <div class="row">
             <div class="col-sm-6">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label">提交人：</label>
+                    <label class="col-sm-4 control-label">离岗人姓名：</label>
                     <div class="col-sm-8">
                         <input disabled name="userName" th:field="*{userName}" class="form-control" type="text">
                     </div>
@@ -22,33 +22,34 @@
             </div>
             <div class="col-sm-6">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label is-required">离职状态：</label>
+                    <label class="col-sm-4 control-label is-required">工作交接：</label>
                     <div class="col-sm-8">
-                        <select name="leavestate" required class="form-control m-b"  th:with="type=${@dict.getType('sys_user_leave')}">
-                            <option value="">所有</option>
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{leavestate}"></option>
+                        <select name="workstate" required class="form-control m-b"  th:with="type=${@dict.getType('sys_user_work')}">
+                            <option value="">---请选择---</option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{workstate}"></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>
+                    <label class="col-sm-4 control-label is-required">离职状态：</label>
                     <div class="col-sm-8">
-                        <input name="country" required th:field="*{country}" class="form-control" type="text">
+                        <select name="leavestate" required class="form-control m-b"  th:with="type=${@dict.getType('sys_user_leave')}">
+                            <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 is-required">工作交接：</label>
+                    <label class="col-sm-4 control-label is-required">脱密期：</label>
                     <div class="col-sm-8">
-                        <select name="workstate" required class="form-control m-b"  th:with="type=${@dict.getType('sys_user_work')}">
-                            <option value="">所有</option>
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{workstate}"></option>
-                        </select>
+                        <input name="country" required th:field="*{country}" class="form-control" type="text">
                     </div>
                 </div>
             </div>
@@ -59,8 +60,8 @@
                     <label class="col-sm-4 control-label is-required">领导意见：</label>
                     <div class="col-sm-8">
                         <select name="examinestate" required class="form-control m-b"  th:with="type=${@dict.getType('sys_examine_state')}">
-                            <option value="">所有</option>
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{examinestate}"></option>
+                            <option value="">---请选择---</option>
+                            <option th:each="dict : ${type}" th:if="${dict.dictValue != '2'}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                         </select>
                     </div>
                 </div>
@@ -129,4 +130,4 @@
     });
 </script>
 </body>
-</html>
+</html>

ruoyi-admin/src/main/resources/templates/system/network/netinfo/add.html

@@ -7,86 +7,125 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-netinfo-add">
             <input name="netId" class="form-control" th:value="${netId}" type="hidden">
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">设备种类：</label>
-                <div class="col-sm-8">
-                    <select name="netName" class="form-control m-b" th:with="type=${@dict.getType('sys_net_type')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                    </select>
+            <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="netName" required class="form-control" th:with="type=${@dict.getType('sys_net_type')}">
+                                <option value="">---请选择---</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            </select>
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">网络设备品牌：</label>
-                <div class="col-sm-8">
-                    <input name="netBrand" required class="form-control" type="text">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">IP地址：</label>
+                        <div class="col-sm-8">
+                            <input name="netIp" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">IP地址：</label>
-                <div class="col-sm-8">
-                    <input name="netIp" class="form-control" type="text">
+            <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="netNo" required class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">设备型号：</label>
-                <div class="col-sm-8">
-                    <input name="netNo" required class="form-control" type="text">
+                <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="netSn" required class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">序列号：</label>
-                <div class="col-sm-8">
-                    <input name="netSn" required class="form-control" type="text">
+            <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="netname" class="form-control" readonly th:value="${sysuser.userName}" type="text">
+                        </div>
+                    </div>
                 </div>
-            </div>
-
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">登记人员：</label>
-                <div class="col-sm-8">
-                    <input name="netname" class="form-control" readonly th:value="${sysuser.userName}" type="text">
+                <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="netManager" required class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">责任人：</label>
-                <div class="col-sm-8">
-                    <input name="netManager" required class="form-control" type="text">
+            <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="depart" required class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">单位名称：</label>
-                <div class="col-sm-8">
-                    <input name="depart" required class="form-control" type="text">
+                <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="netMiji"  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="form-group">    
-                <label class="col-sm-3 control-label is-required">密级：</label>
-                <div class="col-sm-8">
-                    <select name="netMiji"  required class="form-control m-b" th:with="type=${@dict.getType('sys_file_miji')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                    </select>
+            <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="netBrand" required class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">涉密网络名称：</label>
-                <div class="col-sm-8">
-                    <input name="netsmname" required class="form-control" type="text">
+                <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="netsmname" required class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">是否属于要害部门部位：</label>
-                <div class="col-sm-8">
-                    <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
-                        <input type="radio" required th:id="${'isCurcial_' + dict.dictCode}" name="isCurcial" th:value="${dict.dictValue}" th:checked="${dict.default}">
-                        <label th:for="${'isCurcial_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+            <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">
+                            <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
+                                <input type="radio" required th:id="${'isCurcial_' + dict.dictCode}" name="isCurcial" th:value="${dict.dictValue}" th:checked="${dict.default}">
+                                <label th:for="${'isCurcial_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">备注：</label>
-                <div class="col-sm-8">
-                    <input name="remark" class="form-control" type="text">
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">备注：</label>
+                        <div class="col-sm-10">
+                            <textarea name="remark" class="form-control" type="text"></textarea>
+                        </div>
+                    </div>
+                </div>
             </div>
-        </div>
         </form>
     </div>
     <th:block th:include="include :: footer" />
@@ -103,4 +142,4 @@
         }
     </script>
 </body>
-</html>
+</html>

ruoyi-admin/src/main/resources/templates/system/network/netinfo/detail.html

@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-</head>
-<body>
-
-</body>
-</html>

ruoyi-admin/src/main/resources/templates/system/network/netinfo/edit.html

@@ -7,89 +7,132 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-netinfo-edit" th:object="${tdPropertyNetinfo}">
             <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="id" disabled th:field="*{id}" class="form-control" type="text">
+            <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="id" disabled th:field="*{id}" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">网络编号：</label>
-                <div class="col-sm-8">
-                    <input name="netId" disabled th:field="*{netId}" class="form-control" type="text">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">网络编号：</label>
+                        <div class="col-sm-8">
+                            <input name="netId" disabled th:field="*{netId}" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">设备种类：</label>
-                <div class="col-sm-8">
-                    <select name="netName" required class="form-control m-b" th:with="type=${@dict.getType('sys_net_type')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{netName}"></option>
-                    </select>
+
+            <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="netName" required class="form-control" th:with="type=${@dict.getType('sys_net_type')}">
+                                <option value="">---请选择---</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{netName}"></option>
+                            </select>
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">网络设备品牌：</label>
-                <div class="col-sm-8">
-                    <input name="netBrand" required th:field="*{netBrand}" class="form-control" type="text">
+                <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="netBrand" required th:field="*{netBrand}" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">IP地址：</label>
-                <div class="col-sm-8">
-                    <input name="netIp" th:field="*{netIp}" class="form-control" type="text">
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">IP地址：</label>
+                        <div class="col-sm-8">
+                            <input name="netIp" th:field="*{netIp}" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">设备型号：</label>
-                <div class="col-sm-8">
-                    <input name="netNo" required th:field="*{netNo}" class="form-control" type="text">
+                <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="netNo" required th:field="*{netNo}" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">序列号：</label>
-                <div class="col-sm-8">
-                    <input name="netSn" required th:field="*{netSn}" class="form-control" type="text">
+            <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="netSn" required th:field="*{netSn}" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">责任人：</label>
-                <div class="col-sm-8">
-                    <input name="netManager" required th:field="*{netManager}" class="form-control" type="text">
+                <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="netManager" required th:field="*{netManager}" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">单位名称：</label>
-                <div class="col-sm-8">
-                    <input name="depart" required th:field="*{depart}" class="form-control" type="text">
+            <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="depart" required th:field="*{depart}" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">密级：</label>
-                <div class="col-sm-8">
-                    <select name="netMiji" required class="form-control m-b" th:with="type=${@dict.getType('sys_file_miji')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{netMiji}"></option>
-                    </select>
+                <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="netMiji" required class="form-control" 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="*{netMiji}"></option>
+                            </select>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">涉密网络名称：</label>
-                <div class="col-sm-8">
-                    <input name="netsmname" required th:field="*{netsmname}" class="form-control" type="text">
+            <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="netsmname" required th:field="*{netsmname}" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">是否属于要害部门部位：</label>
-                <div class="col-sm-8">
-                    <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
-                        <input type="radio" required th:id="${'isCurcial_' + dict.dictCode}" name="isCurcial" th:value="${dict.dictValue}" th:field="*{isCurcial}">
-                        <label th:for="${'isCurcial_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                <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="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
+                                <input type="radio" required th:id="${'isCurcial_' + dict.dictCode}" name="isCurcial" th:value="${dict.dictValue}" th:field="*{isCurcial}">
+                                <label th:for="${'isCurcial_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">备注：</label>
-                <div class="col-sm-8">
-                    <input name="remark" th:field="*{remark}" class="form-control" type="text">
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">备注：</label>
+                        <div class="col-sm-10">
+                            <textarea name="remark" th:field="*{remark}" class="form-control" type="text"></textarea>
+                        </div>
+                    </div>
                 </div>
             </div>
         </form>
@@ -108,4 +151,4 @@
         }
     </script>
 </body>
-</html>
+</html>

ruoyi-admin/src/main/resources/templates/system/network/netinfo/netinfo.html

@@ -13,6 +13,7 @@
                             <li>
                                 <label>设备编号：</label>
                                 <input type="text" name="id"/>
+                                <input type="hidden" name="netId" th:value="*{netId}"/>
                             </li>
                             <li>
                                 <label>网络设备品牌：</label>
@@ -84,6 +85,7 @@
                 updateUrl: prefix + "/edit/{id}",
                 removeUrl: prefix + "/remove",
                 exportUrl: prefix + "/export",
+                queryParams: queryParams,
                 modalName: "涉密网络登记",
                 columns: [{
                     checkbox: true
@@ -146,6 +148,12 @@
                 }]
             };
             $.table.init(options);
+
+            function queryParams(params) {
+                var search = $.table.queryParams(params);
+                search.netId = [[${netId}]];
+                return search;
+            }
         });
     </script>
 </body>

ruoyi-admin/src/main/resources/templates/system/network/network/add.html

@@ -11,7 +11,7 @@
                 <label class="col-sm-3 control-label is-required">所属地市：</label>
                 <div class="col-sm-8">
                     <select id="City" name="framework" required @change="getAreaList()" v-model="City" class="form-control m-b">
-                        <option value="">请选择</option>
+                        <option value="">---请选择---</option>
                         <option v-for="option in CityList" :value="option.id" :key="option.id">
                             {{ option.name }}
                         </option>
@@ -21,8 +21,8 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">所属区县：</label>
                 <div class="col-sm-8">
-                    <select id="Area" name="area" v-model="Area" class="form-control m-b">
-                        <option value="">请选择</option>
+                    <select id="Area" name="area" required v-model="Area" class="form-control m-b">
+                        <option value="">---请选择---</option>
                         <option v-for="option in AreaList" :value="option.id" :key="option.id">
                             {{ option.name }}
                         </option>
@@ -32,15 +32,18 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">使用单位：</label>
                 <div class="col-sm-8">
-                    <input name="netDepart" required class="form-control" type="text">
+                    <div class="input-group">
+                        <input name="netDepart" required onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择使用单位" class="form-control">
+                        <span class="input-group-addon"><i class="fa fa-search"></i></span>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">
+            <!--<div class="form-group">
                 <label class="col-sm-3 control-label is-required">使用部门：</label>
                 <div class="col-sm-8">
                     <input name="part" required class="form-control" type="text">
                 </div>
-            </div>
+            </div>-->
             <div class="form-group">
                 <label class="col-sm-3 control-label ">登记人员：</label>
                 <div class="col-sm-8">
@@ -57,15 +60,16 @@
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label is-required">设备密级：</label>
+                <label class="col-sm-3 control-label is-required">密级：</label>
                 <div class="col-sm-8">
                     <select name="netMiji" 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 class="form-group">
-                <label class="col-sm-3 control-label is-required">设备数量：</label>
+                <label class="col-sm-3 control-label is-required">网络终端：</label>
                 <div class="col-sm-8">
                     <input name="terminalNum" required digits="true" class="form-control" type="text">
                 </div>
@@ -127,6 +131,25 @@
                 }
             }
         })
+        /* 选择部门树 */
+        function selectDeptTree() {
+            var treeId = $("#treeId").val();
+            var deptId = $.common.isEmpty(treeId) ? "100" : $("#treeId").val();
+            var url = ctx + "system/user/selectDeptTree/" + deptId;
+            var options = {
+                title: '选择部门',
+                width: "380",
+                url: url,
+                callBack: doSubmit
+            };
+            $.modal.openOptions(options);
+        }
+        function doSubmit(index, layero){
+            var body = $.modal.getChildFrame(index);
+            $("#treeId").val(body.find('#treeId').val());
+            $("#treeName").val(body.find('#treeName').val());
+            $.modal.close(index);
+        }
         $("input[name='netDate']").datetimepicker({
             format: "yyyy-mm-dd",
             minView: "month",

ruoyi-admin/src/main/resources/templates/system/network/network/edit.html

@@ -12,7 +12,7 @@
                 <label class="col-sm-3 control-label is-required">所属地市：</label>
                 <div class="col-sm-8">
                     <select id="City" name="framework" required @change="getAreaList()" v-model="City" class="form-control m-b">
-                        <option value="">请选择</option>
+                        <option value="">---请选择---</option>
                         <option v-for="option in CityList" :value="option.id" :key="option.id">
                             {{ option.name }}
                         </option>
@@ -23,7 +23,7 @@
                 <label class="col-sm-3 control-label is-required">所属区县：</label>
                 <div class="col-sm-8">
                     <select id="Area" name="area" required v-model="Area" class="form-control m-b">
-                        <option value="">请选择</option>
+                        <option value="">---请选择---</option>
                         <option v-for="option in AreaList" :value="option.id" :key="option.id">
                             {{ option.name }}
                         </option>
@@ -33,15 +33,18 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">使用单位：</label>
                 <div class="col-sm-8">
-                    <input name="netDepart" required th:field="*{netDepart}" class="form-control" type="text">
+                    <div class="input-group">
+                        <input class="form-control" required type="text" name="netDepart" onclick="selectDeptTree()" id="treeName" th:field="*{netDepart}">
+                        <span class="input-group-addon"><i class="fa fa-search"></i></span>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">
+            <!--<div class="form-group">
                 <label class="col-sm-3 control-label is-required">使用部门：</label>
                 <div class="col-sm-8">
                     <input name="part" required th:field="*{part}" class="form-control" type="text">
                 </div>
-            </div>
+            </div>-->
             <div class="form-group">
                 <label class="col-sm-3 control-label ">登记人员：</label>
                 <div class="col-sm-8">
@@ -58,15 +61,16 @@
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label is-required">设备密级：</label>
+                <label class="col-sm-3 control-label is-required">密级：</label>
                 <div class="col-sm-8">
                     <select name="netMiji" 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="*{netMiji}"></option>
                     </select>
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label is-required">设备数量：</label>
+                <label class="col-sm-3 control-label is-required">网络终端：</label>
                 <div class="col-sm-8">
                     <input name="terminalNum" required digits="true" th:field="*{terminalNum}" class="form-control" type="text">
                 </div>
@@ -128,7 +132,25 @@
                 $.operate.save(prefix + "/edit", $('#form-network-edit').serialize());
             }
         }
+        /* 选择部门树 */
+        function selectDeptTree() {
+            var deptId = $.common.isEmpty($("#treeId").val()) ? "100" : $("#treeId").val();
+            var url = ctx + "system/user/selectDeptTree/" + deptId;
+            var options = {
+                title: '选择部门',
+                width: "380",
+                url: url,
+                callBack: doSubmit
+            };
+            $.modal.openOptions(options);
+        }
 
+        function doSubmit(index, layero){
+            var body = $.modal.getChildFrame(index);
+            $("#treeId").val(body.find('#treeId').val());
+            $("#treeName").val(body.find('#treeName').val());
+            $.modal.close(index);
+        }
         $("input[name='netDate']").datetimepicker({
             format: "yyyy-mm-dd",
             minView: "month",

ruoyi-admin/src/main/resources/templates/system/network/network/network.html

@@ -13,7 +13,7 @@
                             <li>
                                 <label>所属市州：</label>
                                 <select id="City" name="framework" @change="getAreaList()" v-model="City">
-                                    <option value="">请选择</option>
+                                    <option value="">---请选择---</option>
                                     <option v-for="option in CityList" :value="option.id" :key="option.id">
                                         {{ option.name }}
                                     </option>
@@ -22,7 +22,7 @@
                             <li>
                                 <label>所属区县：</label>
                                 <select id="Area" name="area" v-model="Area" class="form-control m-b">
-                                    <option value="">请选择</option>
+                                    <option value="">---请选择---</option>
                                     <option v-for="option in AreaList" :value="option.id" :key="option.id">
                                         {{ option.name }}
                                     </option>
@@ -114,10 +114,10 @@
                     field: 'netDepart',
                     title: '使用单位'
                 },
-                {
-                    field: 'part',
-                    title: '使用部门'
-                },
+                // {
+                //     field: 'part',
+                //     title: '使用部门'
+                // },
                 {
                     field: 'netUser',
                     title: '登记人员'
@@ -128,14 +128,14 @@
                 },
                 {
                     field: 'netMiji',
-                    title: '设备密级',
+                    title: '密级',
                     formatter: function(value, row, index) {
                        return $.table.selectDictLabel(netMijiDatas, value);
                     }
                 },
                 {
                     field: 'terminalNum',
-                    title: '设备数量'
+                    title: '网络终端'
                 },
                 {
                     title: '操作',

ruoyi-admin/src/main/resources/templates/system/network/networknum/networknum.html

@@ -46,9 +46,7 @@
         </div>
 
         <div class="btn-group-sm" id="toolbar" role="group">
-            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:network:export">
-                <i class="fa fa-download"></i> 导出
-            </a>
+
         </div>
         <div class="col-sm-12 select-table table-striped">
             <table id="bootstrap-table"></table>
@@ -58,6 +56,7 @@
 <th:block th:include="include :: footer" />
 <script th:inline="javascript">
     var editFlag = [[${@permission.hasPermi('system:network:edit')}]];
+    var printFlag = [[${@permission.hasPermi('system:networknum:print')}]];
     var removeFlag = [[${@permission.hasPermi('system:network:remove')}]];
     var listFlag = [[${@permission.hasPermi('system:network:list')}]];
     var netMijiDatas = [[${@dict.getType('sys_file_miji')}]];
@@ -130,7 +129,7 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-info btn-xs ' + listFlag + '" href="javascript:void(0)" onclick="print(\'' + row.netId + '\')"><i class="fa fa-download"></i>打印</a> ');
+                        actions.push('<a class="btn btn-info btn-xs ' + printFlag + '" href="javascript:void(0)" onclick="print(\'' + row.netId + '\')"><i class="fa fa-download"></i>打印</a> ');
                         return actions.join('');
                     }
                 }]

ruoyi-admin/src/main/resources/templates/system/notify/add.html

@@ -11,7 +11,7 @@
                 <label class="col-sm-3 control-label is-required">所属地市：</label>
                 <div class="col-sm-8">
                     <select id="City" name="framework" required @change="getAreaList()" v-model="City" class="form-control m-b">
-                        <option value="">请选择</option>
+                        <option value="">---请选择---</option>
                         <option v-for="option in CityList" :value="option.id" :key="option.id">
                             {{ option.name }}
                         </option>
@@ -22,7 +22,7 @@
                 <label class="col-sm-3 control-label is-required">所属区县：</label>
                 <div class="col-sm-8">
                     <select id="Area" name="area" required v-model="Area" class="form-control m-b">
-                        <option value="">请选择</option>
+                        <option value="">---请选择---</option>
                         <option v-for="option in AreaList" :value="option.id" :key="option.id">
                             {{ option.name }}
                         </option>
@@ -30,19 +30,19 @@
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label is-required">通知人：</label>
+                <label class="col-sm-3 control-label is-required">通知人员：</label>
                 <div class="col-sm-8">
                     <input name="notifyUser" required class="form-control" readonly th:value="${sysuser.userName}" type="text">
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label is-required">单位：</label>
+                <label class="col-sm-3 control-label is-required">所属单位：</label>
                 <div class="col-sm-8">
                     <input name="notifyDepart" required class="form-control" readonly th:value="${sysuser.dept.deptName}" type="text">
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">时间：</label>
+                <label class="col-sm-3 control-label">通知日期：</label>
                 <div class="col-sm-8">
                     <div class="input-group date">
                         <input name="notifyTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
@@ -57,21 +57,20 @@
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label is-required">内容：</label>
+                <label class="col-sm-3 control-label is-required">通知内容：</label>
                 <div class="col-sm-8">
                     <textarea name="notifyContent" required class="form-control"></textarea>
                 </div>
             </div>
-
-<!--            <div class="form-group">    -->
-<!--                <label class="col-sm-3 control-label">发出状态：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <select name="notifyState" class="form-control m-b" th:with="type=${@dict.getType('sys_notice_state')}">-->
-<!--                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
-<!--                    </select>-->
-<!--                </div>-->
-<!--            </div>-->
-
+            <div class="form-group">
+                <label class="col-sm-3 control-label">发出状态：</label>
+                <div class="col-sm-8">
+                    <div class="radio-box" th:each="dict : ${@dict.getType('sys_notice_state')}">
+                        <input type="radio" th:id="${dict.dictCode}" name="notifyState" th:value="${dict.dictValue}" th:checked="${dict.default}">
+                        <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                    </div>
+                </div>
+            </div>
         </form>
     </div>
     <th:block th:include="include :: footer" />

ruoyi-admin/src/main/resources/templates/system/notify/edit.html

@@ -12,7 +12,7 @@
                 <label class="col-sm-3 control-label is-required">所属地市：</label>
                 <div class="col-sm-8">
                     <select id="City" name="framework" required @change="getAreaList()" v-model="City" class="form-control m-b">
-                        <option value="">请选择</option>
+                        <option value="">---请选择---</option>
                         <option v-for="option in CityList" :value="option.id" :key="option.id">
                             {{ option.name }}
                         </option>
@@ -23,7 +23,7 @@
                 <label class="col-sm-3 control-label is-required">所属区县：</label>
                 <div class="col-sm-8">
                     <select id="Area" name="area" required v-model="Area" class="form-control m-b">
-                        <option value="">请选择</option>
+                        <option value="">---请选择---</option>
                         <option v-for="option in AreaList" :value="option.id" :key="option.id">
                             {{ option.name }}
                         </option>
@@ -31,19 +31,19 @@
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">通知人：</label>
+                <label class="col-sm-3 control-label">通知人员：</label>
                 <div class="col-sm-8">
                     <input name="notifyUser" readonly th:field="*{notifyUser}" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">单位：</label>
+                <label class="col-sm-3 control-label">所属单位：</label>
                 <div class="col-sm-8">
                     <input name="notifyDepart" readonly th:field="*{notifyDepart}" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">时间：</label>
+                <label class="col-sm-3 control-label">通知日期：</label>
                 <div class="col-sm-8">
                     <div class="input-group date">
                         <input name="notifyTime" th:value="${#dates.format(tdNotify.notifyTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
@@ -52,7 +52,7 @@
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label is-required">内容：</label>
+                <label class="col-sm-3 control-label is-required">通知内容：</label>
                 <div class="col-sm-8">
                     <textarea name="notifyContent" required class="form-control">[[*{notifyContent}]]</textarea>
                 </div>
@@ -64,11 +64,12 @@
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label is-required">发出状态：</label>
+                <label class="col-sm-3 control-label">发出状态：</label>
                 <div class="col-sm-8">
-                    <select name="notifyState" required class="form-control m-b" th:with="type=${@dict.getType('sys_notice_state')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{notifyState}"></option>
-                    </select>
+                    <div class="radio-box" th:each="dict : ${@dict.getType('sys_notice_state')}">
+                        <input type="radio" th:id="${dict.dictCode}" name="notifyState" th:value="${dict.dictValue}" th:field="*{notifyState}">
+                        <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                    </div>
                 </div>
             </div>
         </form>

ruoyi-admin/src/main/resources/templates/system/notify/notify.html

@@ -13,7 +13,7 @@
                             <li>
                                 <label>所属市州：</label>
                                 <select id="City" name="framework" @change="getAreaList()" v-model="City">
-                                    <option value="">请选择</option>
+                                    <option value="">---请选择---</option>
                                     <option v-for="option in CityList" :value="option.id" :key="option.id">
                                         {{ option.name }}
                                     </option>
@@ -22,21 +22,21 @@
                             <li>
                                 <label>所属区县：</label>
                                 <select id="Area" name="area" v-model="Area">
-                                    <option value="">请选择</option>
+                                    <option value="">---请选择---</option>
                                     <option v-for="option in AreaList" :value="option.id" :key="option.id">
                                         {{ option.name }}
                                     </option>
                                 </select>
                             </li>
                             <li>
-                                <label>单位：</label>
+                                <label>所属单位：</label>
                                 <input type="text" name="notifyDepart"/>
                             </li>
 
                             <li>
                                 <label>发出状态：</label>
                                 <select name="notifyState" th:with="type=${@dict.getType('sys_notice_state')}">
-                                    <option value="">所有</option>
+                                    <option value="">---请选择---</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>
@@ -116,15 +116,15 @@
                 },
                 {
                     field: 'notifyUser',
-                    title: '通知人'
+                    title: '通知人员'
                 },
                 {
                     field: 'notifyDepart',
-                    title: '单位'
+                    title: '所属单位'
                 },
                 {
                     field: 'notifyTime',
-                    title: '时间'
+                    title: '通知日期'
                 },
                 {
                     field: 'notifyBeuser',

ruoyi-admin/src/main/resources/templates/system/property/data/add.html

@@ -12,6 +12,7 @@
                 <label class="col-sm-3 control-label is-required">资产种类：</label>
                 <div class="col-sm-8">
                     <select name="propertyType" id="select1" required class="form-control m-b" v-model="selectType" th:with="type=${@dict.getType('sys_sm_property')}">
+                        <option value="">---请选择---</option>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                     </select>
                 </div>
@@ -80,6 +81,7 @@
                     <label class="col-sm-3 control-label is-required ">是否安装防护软件：</label>
                     <div class="col-sm-8">
                         <select name="isSoftware" required class="form-control m-b" th:with="type=${@dict.getType('sys_yes_no')}">
+                            <option value="">请选择</option>
                             <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                         </select>
                     </div>
@@ -432,187 +434,10 @@
                     </div>
                 </div>
             </div>
-            <!--其他结束-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">登记编号：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <input name="id" class="form-control" type="text">-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">资产编号：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <input name="useId" class="form-control" type="text">-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label  is-required">设备品牌：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <input name="propertyBrand" required class="form-control" type="text">-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">设备mac：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <input name="propertyMac" class="form-control" type="text">-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">涉密网络终端：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <select name="propertyNetstyle" class="form-control m-b" th:with="type=${@dict.getType('sys_file_miji')}">-->
-<!--                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
-<!--                    </select>-->
-<!--                </div>-->
-<!--            </div>-->
-
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label is-required">资产型号：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <input name="propertyNo" required class="form-control" type="text">-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">资产名称：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <p id="showValue" style="height: 40px;line-height: 40px;color: white;background-color: black;"></p>-->
-<!--                    <input name="propertyName" class="form-control" type="text">-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">计算机类型：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <input name="computerType" class="form-control" type="text">-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">资产密级：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <select name="propertyMiji" class="form-control m-b" th:with="type=${@dict.getType('sys_file_miji')}">-->
-<!--                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
-<!--                    </select>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">设备SN：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <input name="propertySn" class="form-control" type="text">-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">备注：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <textarea name="remark" class="form-control"></textarea>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">是否是要害部门，部位：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <select name="isCurcial" class="form-control m-b" th:with="type=${@dict.getType('sys_yes_no')}">-->
-<!--                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
-<!--                    </select>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">是否安装防护软件：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <select name="isSoftware" class="form-control m-b" th:with="type=${@dict.getType('sys_yes_no')}">-->
-<!--                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
-<!--                    </select>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">使用人：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <input name="username" class="form-control" type="text">-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">维护部门：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <input name="maintainDepart" class="form-control" type="text">-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">维护人员：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <input name="maintainUser" class="form-control" type="text">-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">维护日期：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <div class="input-group date">-->
-<!--                        <input name="maintainDate" 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 class="form-group">-->
-<!--                <label class="col-sm-3 control-label">维护状态：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <input name="maintainState" class="form-control" type="text">-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">销毁状态：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <input name="destoryState" class="form-control" type="text">-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">销毁部门：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <input name="destoryDepart" class="form-control" type="text">-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">销毁人员：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <input name="destoryUser" class="form-control" type="text">-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">销毁日期：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <div class="input-group date">-->
-<!--                        <input name="destoryDate" 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 class="form-group">-->
-<!--                <label class="col-sm-3 control-label">设备描述：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <input name="propertyRefer" class="form-control" type="text">-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">维护备注：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <input name="maintainRemark" class="form-control" type="text">-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">涉密程度：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <select name="shemichengdu" class="form-control m-b" th:with="type=${@dict.getType('sys_user_shemi')}">-->
-<!--                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
-<!--                    </select>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">部门：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <input name="part" class="form-control" type="text">-->
-<!--                </div>-->
-<!--            </div>-->
         </form>
     </div>
     <th:block th:include="include :: footer" />
     <th:block th:include="include :: datetimepicker-js" />
-    <!-- 开发环境版本，包含了有帮助的命令行警告 -->
-    <script src="https://cdn.jsdelivr.net/npm/vue@2/dist/vue.js"></script>
     <script th:inline="javascript">
         var app = new Vue({
             el: '#app',
@@ -624,28 +449,6 @@
 
             }
         })
-        // window.onload = function() {
-        //     var selectElement = document.getElementById("select1");
-        //     // 初始化时显示第一个选项的内容
-        //     showContentForOption(selectElement.value);
-        //     // 添加事件监听器以便在选择更改时更新内容
-        //     selectElement.addEventListener('change', function() {
-        //         showContentForOption(this.value);
-        //     });
-        // };
-        // function showContentForOption(optionValue) {
-        //     // 首先将所有内容盒子设置为不可见
-        //     var contentBoxes = document.getElementsByClassName("contentBox");
-        //     for (var i = 0; i < contentBoxes.length; i++) {
-        //         contentBoxes[i].style.display = "none";
-        //     }
-        //     // 如果选中了有效的选项，则显示对应的内容盒子
-        //     if (!isNaN(parseInt(optionValue))) {
-        //         var boxId = 'box' + optionValue;
-        //         var chosenBox = document.getElementById(boxId);
-        //         chosenBox.style.display = "block";
-        //     }
-        // }
         var prefix = ctx + "system/property/data"
         $("#form-propertyinfo-add").validate({
             focusCleanup: true

ruoyi-admin/src/main/resources/templates/system/property/data/propertyinfo.html

@@ -10,13 +10,10 @@
                 <form id="formId">
                     <div class="select-list">
                         <ul>
-                            <li>
-                                <label>资产编号：</label>
-                                <input type="text" name="useId"/>
-                            </li>
                             <li>
                                 <label>登记编号：</label>
-                                <input type="text" name="Id"/>
+                                <input type="text" name="id"/>
+                                <input type="hidden" name="useId" th:value="*{useId}"/>
                             </li>
                             <li>
                                 <label>资产种类：</label>
@@ -85,6 +82,7 @@
                 detailUrl: prefix + "/detail/{id}",
                 removeUrl: prefix + "/remove",
                 exportUrl: prefix + "/export",
+                queryParams: queryParams,
                 modalName: "资产管理",
                 columns: [{
                     checkbox: true
@@ -141,6 +139,13 @@
             };
             $.table.init(options);
         });
+
+
+        function queryParams(params) {
+            var search = $.table.queryParams(params);
+            search.useId = [[${useId}]];
+            return search;
+        }
     </script>
 </body>
 </html>

ruoyi-admin/src/main/resources/templates/system/property/property/add.html

@@ -11,7 +11,7 @@
                 <label class="col-sm-3 control-label is-required">所属地市：</label>
                 <div class="col-sm-8">
                     <select id="City" name="part" required @change="getAreaList()" v-model="City" class="form-control m-b">
-                        <option value="">请选择</option>
+                        <option value="">---请选择---</option>
                         <option v-for="option in CityList" :value="option.id" :key="option.id">
                             {{ option.name }}
                         </option>
@@ -22,23 +22,26 @@
                 <label class="col-sm-3 control-label is-required">所属区县：</label>
                 <div class="col-sm-8">
                     <select id="Area" name="areaId" required v-model="Area" class="form-control m-b">
-                        <option value="">请选择</option>
+                        <option value="">---请选择---</option>
                         <option v-for="option in AreaList" :value="option.id" :key="option.id">
                             {{ option.name }}
                         </option>
                     </select>
                 </div>
             </div>
-            <div class="form-group">
+           <!-- <div class="form-group">
                 <label class="col-sm-3 control-label is-required">单位名称：</label>
                 <div class="col-sm-8">
                     <input name="frameworkId" class="form-control" type="text" required>
                 </div>
-            </div>
+            </div>-->
             <div class="form-group">
-                <label class="col-sm-3 control-label is-required">使用部门：</label>
+                <label class="col-sm-3 control-label is-required">使用单位：</label>
                 <div class="col-sm-8">
-                    <input name="useDepart" required class="form-control" type="text">
+                    <div class="input-group">
+                        <input name="useDepart" required onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择使用单位" class="form-control">
+                        <span class="input-group-addon"><i class="fa fa-search"></i></span>
+                    </div>
                 </div>
             </div>
             <div class="form-group">
@@ -139,7 +142,25 @@
                 $.operate.save(prefix + "/add", $('#form-property-add').serialize());
             }
         }
-
+        /* 选择部门树 */
+        function selectDeptTree() {
+            var treeId = $("#treeId").val();
+            var deptId = $.common.isEmpty(treeId) ? "100" : $("#treeId").val();
+            var url = ctx + "system/user/selectDeptTree/" + deptId;
+            var options = {
+                title: '选择部门',
+                width: "380",
+                url: url,
+                callBack: doSubmit
+            };
+            $.modal.openOptions(options);
+        }
+        function doSubmit(index, layero){
+            var body = $.modal.getChildFrame(index);
+            $("#treeId").val(body.find('#treeId').val());
+            $("#treeName").val(body.find('#treeName').val());
+            $.modal.close(index);
+        }
         $("input[name='useDate']").datetimepicker({
             format: "yyyy-mm-dd",
             minView: "month",

ruoyi-admin/src/main/resources/templates/system/property/property/edit.html

@@ -9,15 +9,40 @@
         <form class="form-horizontal m" id="form-property-edit" th:object="${tdPropertyManager}">
             <input name="useId" th:field="*{useId}" type="hidden">
             <div class="form-group">
-                <label class="col-sm-3 control-label is-required">资产id：</label>
+                <label class="col-sm-3 control-label is-required">资产编号：</label>
                 <div class="col-sm-8">
                     <input disabled name="useId" required th:field="*{useId}" class="form-control" type="text">
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">所属地市：</label>
+                <div class="col-sm-8">
+                    <select id="City" name="part" required @change="getAreaList()" v-model="City" class="form-control m-b">
+                        <option value="">---请选择---</option>
+                        <option v-for="option in CityList" :value="option.id" :key="option.id">
+                            {{ option.name }}
+                        </option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">所属区县：</label>
+                <div class="col-sm-8">
+                    <select id="Area" name="areaId" required v-model="Area" class="form-control m-b">
+                        <option value="">---请选择---</option>
+                        <option v-for="option in AreaList" :value="option.id" :key="option.id">
+                            {{ option.name }}
+                        </option>
+                    </select>
+                </div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">使用部门：</label>
                 <div class="col-sm-8">
-                    <input name="useDepart" required th:field="*{useDepart}" class="form-control" type="text">
+                    <div class="input-group">
+                        <input class="form-control" required type="text" name="useDepart" onclick="selectDeptTree()" id="treeName" th:field="*{useDepart}">
+                        <span class="input-group-addon"><i class="fa fa-search"></i></span>
+                    </div>
                 </div>
             </div>
             <div class="form-group">
@@ -62,28 +87,7 @@
                     </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">所属地市：</label>
-                <div class="col-sm-8">
-                    <select id="City" name="part" required @change="getAreaList()" v-model="City" class="form-control m-b">
-                        <option value="">请选择</option>
-                        <option v-for="option in CityList" :value="option.id" :key="option.id">
-                            {{ option.name }}
-                        </option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">所属区县：</label>
-                <div class="col-sm-8">
-                    <select id="Area" name="areaId" required v-model="Area" class="form-control m-b">
-                        <option value="">请选择</option>
-                        <option v-for="option in AreaList" :value="option.id" :key="option.id">
-                            {{ option.name }}
-                        </option>
-                    </select>
-                </div>
-            </div>
+
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">资产数量：</label>
                 <div class="col-sm-8">
@@ -146,7 +150,25 @@
                 $.operate.save(prefix + "/edit", $('#form-property-edit').serialize());
             }
         }
-
+        /* 选择部门树 */
+        function selectDeptTree() {
+            var treeId = $("#treeId").val();
+            var deptId = $.common.isEmpty(treeId) ? "100" : $("#treeId").val();
+            var url = ctx + "system/user/selectDeptTree/" + deptId;
+            var options = {
+                title: '选择部门',
+                width: "380",
+                url: url,
+                callBack: doSubmit
+            };
+            $.modal.openOptions(options);
+        }
+        function doSubmit(index, layero){
+            var body = $.modal.getChildFrame(index);
+            $("#treeId").val(body.find('#treeId').val());
+            $("#treeName").val(body.find('#treeName').val());
+            $.modal.close(index);
+        }
         $("input[name='useDate']").datetimepicker({
             format: "yyyy-mm-dd",
             minView: "month",

ruoyi-admin/src/main/resources/templates/system/property/property/property.html

@@ -21,7 +21,7 @@
                             <li>
                                 <label>所属市州：</label>
                                 <select id="City" name="part" @change="getAreaList()" v-model="City">
-                                    <option value="">请选择</option>
+                                    <option value="">---请选择---</option>
                                     <option v-for="option in CityList" :value="option.id" :key="option.id">
                                         {{ option.name }}
                                     </option>

ruoyi-admin/src/main/resources/templates/system/property/propertychange/change.html

@@ -30,6 +30,7 @@
             <label class="col-sm-3 control-label">资产种类：</label>
             <div class="col-sm-8">
                 <select name="propertyType" disabled class="form-control m-b" th:with="type=${@dict.getType('sys_sm_property')}">
+                    <option value="">---请选择---</option>
                     <option  th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{propertyType}"></option>
                 </select>
             </div>

ruoyi-admin/src/main/resources/templates/system/property/propertychange/changeproperty.html

@@ -11,8 +11,8 @@
                 <div class="select-list">
                     <ul>
                         <li>
-                            <label>资产编号：</label>
-                            <input type="text" name="useId"/>
+                            <label>登记编号：</label>
+                            <input type="text" name="id"/>
                         </li>
                         <li>
                             <label>设备品牌：</label>
@@ -32,7 +32,9 @@
         </div>
 
         <div class="btn-group-sm" id="toolbar" role="group">
-
+            <a class="btn btn-danger" onclick="closeItem()">
+                <i class="fa fa-reply-all"></i> 关闭
+            </a>
         </div>
         <div class="col-sm-12 select-table table-striped">
             <table id="bootstrap-table"></table>
@@ -50,18 +52,16 @@
     $(function() {
         var options = {
             url: prefix + "/list",
-            createUrl: prefix + "/add",
             updateUrl: prefix + "/edit/{id}",
             destoryUrl: prefix + "/destory/{id}",
-            removeUrl: prefix + "/remove",
-            exportUrl: prefix + "/export",
+            queryParams: queryParams,
             modalName: "设备登记",
             columns: [{
                 checkbox: true
             },
                 {
-                    field: 'useId',
-                    title: '资产编号'
+                    field: 'id',
+                    title: '登记编号'
                 },
                 {
                     field: 'propertyBrand',
@@ -95,6 +95,14 @@
         };
         $.table.init(options);
     });
+
+
+    function queryParams(params) {
+        var search = $.table.queryParams(params);
+        search.useId = [[${useId}]];
+        return search;
+    }
+
     function destory(id) {
         var url = prefix + '/destory/' + id;
         $.modal.open("销毁资产", url);

ruoyi-admin/src/main/resources/templates/system/property/propertychange/destory.html

@@ -30,6 +30,7 @@
             <label class="col-sm-3 control-label">资产种类：</label>
             <div class="col-sm-8">
                 <select name="propertyType" disabled class="form-control m-b" th:with="type=${@dict.getType('sys_sm_property')}">
+                    <option value="">---请选择---</option>
                     <option  th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{propertyType}"></option>
                 </select>
             </div>

ruoyi-admin/src/main/resources/templates/system/property/propertychange/list/property.html

@@ -0,0 +1,166 @@
+<!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="frameworkId"/>
+                            </li>
+                            <li>
+                                <label>资产编号：</label>
+                                <input type="text" name="useId"/>
+                            </li>
+                            <li>
+                                <label>所属市州：</label>
+                                <select id="City" name="part" @change="getAreaList()" v-model="City">
+                                    <option value="">---请选择---</option>
+                                    <option v-for="option in CityList" :value="option.id" :key="option.id">
+                                        {{ option.name }}
+                                    </option>
+                                </select>
+                            </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 listFlag = [[${@permission.hasPermi('system:change:detail')}]];
+        var prefix = ctx + "system/change/list";
+        let datas = []
+        $.ajax({
+            url: ctx + "system/area/getAllList",
+            type: 'GET',
+            data:{parentId:''} ,
+            success:((res)=>{
+                datas = res.data
+            }) ,
+        });
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "资产登记",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'useId',
+                    title: '资产编号'
+                },
+                {
+                    field: 'part',
+                    title: '所属市州',
+                    formatter: function(value, row, index) {
+                        return getCity(datas, value)
+                    }
+                },
+                {
+                    field: 'areaId',
+                    title: '所属区县',
+                    formatter: function(value, row, index) {
+                        return getCity(datas, value)
+                    }
+                },
+                {
+                    field: 'useDepart',
+                    title: '使用部门'
+                },
+                {
+                    field: 'userName',
+                    title: '使用人员'
+                },
+                {
+                    field: 'recoverName',
+                    title: '登记人员'
+                },
+                {
+                    field: 'recoverDate',
+                    title: '配发日期'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-info btn-xs ' + listFlag + '" href="javascript:void(0)" onclick="detail(\'' + row.useId + '\')"><i class="fa fa-list-ul"></i>变更</a> ');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+        var app = new Vue({
+            el: '#app',
+            data: {
+                CityList: [],
+                AreaList:[],
+                City:'',
+                Area:'',
+                params:{
+                    parentId:'',
+                }
+            },
+            mounted(){
+                // 初始化地市列表
+                this.getCityList();
+                if (this.City){
+                    this.getAreaList()
+                }
+            },
+            methods:{
+                getCityList(){
+                    $.ajax({
+                        url: ctx + "system/area/getSysAreaList",
+                        type: 'GET',
+                        data:this.params ,
+                        success:((res)=>{
+                            this.CityList = res.data
+                        }) ,
+                    });
+                },
+                getAreaList(){
+                    this.params.parentId = this.City
+                    $.ajax({
+                        url: ctx + "system/area/getSysAreaList",
+                        type: 'GET',
+                        data:this.params,
+                        success:((res)=>{
+                            this.AreaList = res.data
+                        }) ,
+                    });
+                }
+            }
+        })
+        /*资产列表-详细*/
+        function detail(useId) {
+            var url = prefix + '/detail/' + useId;
+            $.modal.openTab("资产列表数据", url);
+        }
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/property/propertynum/propertynum.html

@@ -21,7 +21,7 @@
                         <li>
                             <label>所属市州：</label>
                             <select id="City" name="part" @change="getAreaList()" v-model="City">
-                                <option value="">请选择</option>
+                                <option value="">---请选择---</option>
                                 <option v-for="option in CityList" :value="option.id" :key="option.id">
                                     {{ option.name }}
                                 </option>
@@ -37,9 +37,7 @@
         </div>
 
         <div class="btn-group-sm" id="toolbar" role="group">
-            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:property:export">
-                <i class="fa fa-download"></i> 导出
-            </a>
+
         </div>
         <div class="col-sm-12 select-table table-striped">
             <table id="bootstrap-table"></table>
@@ -49,6 +47,7 @@
 <th:block th:include="include :: footer" />
 <script th:inline="javascript">
     var editFlag = [[${@permission.hasPermi('system:property:edit')}]];
+    var printFlag = [[${@permission.hasPermi('system:propertynum:print')}]];
     var removeFlag = [[${@permission.hasPermi('system:property:remove')}]];
     var listFlag = [[${@permission.hasPermi('system:property:list')}]];
     var prefix = ctx + "system/propertynum";
@@ -149,7 +148,7 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-info btn-xs ' + listFlag + '" href="javascript:void(0)" onclick="print(\'' + row.useId + '\')"><i class="fa fa-download"></i>打印</a> ');
+                        actions.push('<a class="btn btn-info btn-xs ' + printFlag + '" href="javascript:void(0)" onclick="print(\'' + row.useId + '\')"><i class="fa fa-download"></i>打印</a> ');
                         return actions.join('');
                     }
                 }]

ruoyi-admin/src/main/resources/templates/system/question/add.html

@@ -10,12 +10,13 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">题库类型：</label>
                 <div class="col-sm-8">
-                    <select name="TYPEID" class="form-control m-b" th:with="type=${@dict.getType('td_question_type')}">
+                    <select name="TYPEID" class="form-control m-b" required th:with="type=${@dict.getType('td_question_type')}">
+                        <option value="">请选择</option>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                     </select>
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label is-required">问题描述：</label>
                 <div class="col-sm-8">
                     <input name="qSubject" required class="form-control" type="text">
@@ -51,21 +52,6 @@
                     <input name="NOTE" class="form-control" type="text" required>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">创建人：</label>
-                <div class="col-sm-8">
-                    <input name="CREATEPERSON" class="form-control"  readonly th:value="${sysuser.userName}" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">创建时间：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <input name="CREATEDATE" class="form-control" placeholder="yyyy-MM-dd"  type="text">
-                        <span class="input-group-addon">    <i class="fa fa-calendar"></i></span>
-                    </div>
-                </div>
-            </div>
         </form>
     </div>
     <th:block th:include="include :: footer" />
@@ -89,4 +75,4 @@
         });
     </script>
 </body>
-</html>
+</html>

ruoyi-admin/src/main/resources/templates/system/question/edit.html

@@ -52,21 +52,6 @@
                     <input name="NOTE" required th:field="*{NOTE}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">创建人：</label>
-                <div class="col-sm-8">
-                    <input name="CREATEPERSON" readonly th:field="*{CREATEPERSON}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">创建时间：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <input name="CREATEDATE" disabled th:value="${#dates.format(tdQuestion.CREATEDATE, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                    </div>
-                </div>
-            </div>
         </form>
     </div>
     <th:block th:include="include :: footer" />

ruoyi-admin/src/main/resources/templates/system/question/question.html

@@ -90,23 +90,38 @@
                 },
                 {
                     field: 'qSubject',
-                    title: '问题描述'
+                    title: '问题描述',
+                    width: '25',
+                    widthUnit: '%',
+                    align: "left"
                 },
                 {
                     field: 'optiona',
-                    title: '选项A'
+                    title: '选项A',
+                    width: '10',
+                    widthUnit: '%',
+                    align: "left"
                 },
                 {
                     field: 'optionb',
-                    title: '选项B'
+                    title: '选项B',
+                    width: '10',
+                    widthUnit: '%',
+                    align: "left"
                 },
                 {
                     field: 'optionc',
-                    title: '选项C'
+                    title: '选项C',
+                    width: '10',
+                    widthUnit: '%',
+                    align: "left"
                 },
                 {
                     field: 'optiond',
-                    title: '选项D'
+                    title: '选项D',
+                    width: '10',
+                    widthUnit: '%',
+                    align: "left"
                 },
                 {
                     field: 'note',

ruoyi-admin/src/main/resources/templates/system/train/add.html

@@ -7,109 +7,131 @@
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
         <form class="form-horizontal m" id="form-train-add">
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">所属地市：</label>
-                <div class="col-sm-8">
-                    <select id="City" name="AREAID" required @change="getAreaList()" v-model="City" class="form-control m-b">
-                        <option value="">请选择</option>
-                        <option v-for="option in CityList" :value="option.id" :key="option.id">
-                            {{ option.name }}
-                        </option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">所属区县：</label>
-                <div class="col-sm-8">
-                    <select id="Area" name="FRAMEWORK" v-model="Area" class="form-control m-b">
-                        <option value="">请选择</option>
-                        <option v-for="option in AreaList" :value="option.id" :key="option.id">
-                            {{ option.name }}
-                        </option>
-                    </select>
+            <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 id="City" name="AREAID" required @change="getAreaList()" v-model="City" class="form-control m-b">
+                                <option value="">---请选择---</option>
+                                <option v-for="option in CityList" :value="option.id" :key="option.id">
+                                    {{ option.name }}
+                                </option>
+                            </select>
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">人员名称：</label>
-                <div class="col-sm-8">
-                    <input name="USERNAME"  required class="form-control" type="text">
+                <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 id="Area" name="FRAMEWORK" required v-model="Area" class="form-control m-b">
+                                <option value="">---请选择---</option>
+                                <option v-for="option in AreaList" :value="option.id" :key="option.id">
+                                    {{ option.name }}
+                                </option>
+                            </select>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required ">单位名称：</label>
-                <div class="col-sm-8">
-                    <input name="deptName" required class="form-control" type="text">
+            <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 id="User" name="USERNAME" required @change="getDept()" v-model="dept" class="form-control m-b">
+                                <option value="">---请选择---</option>
+                                <option v-for="option in userList" :value="option.userId" :key="option.userId">
+                                    {{ option.userName }}
+                                </option>
+                            </select>
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">部门：</label>
-                <div class="col-sm-8">
-                    <input name="PART" required class="form-control" type="text">
+                <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 placeholder="请输入单位名称" v-model="deptObj.deptName" required class="form-control m-b" type="text">
+                            <input name="deptName" v-model="deptObj.deptId" type=hidden>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">培训类型：</label>
-                <div class="col-sm-8">
-                    <select name="trainType" required class="form-control m-b" th:with="type=${@dict.getType('sys_usertrain_typer')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                    </select>
+            <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="PART" required placeholder="请输入部门" class="form-control" type="text">-->
+<!--                        </div>-->
+<!--                    </div>-->
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label is-required">培训对象：</label>
+                        <div class="col-sm-8">
+                            <select name="trainSubject" required class="form-control m-b" th:with="type=${@dict.getType('sys_usertrain_obj')}">
+                                <option value="">---请选择---</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            </select>
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">培训对象：</label>
-                <div class="col-sm-8">
-                    <select name="trainSubject" required class="form-control m-b" th:with="type=${@dict.getType('sys_usertrain_obj')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                    </select>
+                <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="trainType" required class="form-control m-b" th:with="type=${@dict.getType('sys_usertrain_typer')}">
+                                <option value="">---请选择---</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            </select>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">培训地点：</label>
-                <div class="col-sm-8">
-                    <textarea name="trainAddress"  required class="form-control"></textarea>
+
+            <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="trainName" required placeholder="请输入培训人员" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
+
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">培训日期：</label>
-                <div class="col-sm-8">
-                    <div class="input-daterange input-group ">
-                        <input type="text" class="input-sm form-control" required name="trainDate" id="laydate-startTime" placeholder="开始日期"/>
-                        <span class="input-group-addon">到</span>
-                        <input type="text" class="input-sm form-control" required name="trainTimeend" id="laydate-endTime" placeholder="结束日期"/>
+            <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">
+                        <div class="input-daterange input-group ">
+                            <input type="text" class="input-sm form-control" required name="trainDate" id="laydate-startTime" placeholder="开始日期"/>
+                            <span class="input-group-addon">到</span>
+                            <input type="text" class="input-sm form-control" required name="trainTimeend" id="laydate-endTime" placeholder="结束日期"/>
+                        </div>
                     </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">填报人：</label>
-                <div class="col-sm-8">
-                    <input name="createStaffid" class="form-control" type="text" >
-                </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">填报日期：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <input name="createDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+            <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="trainAddress" placeholder="请输入培训地点" required class="form-control m-t"></textarea>
+                        </div>
                     </div>
                 </div>
             </div>
-
-            <div class="form-group">
-                <label class="col-sm-3 control-label">培训人员：</label>
-                <div class="col-sm-8">
-                    <input name="trainName" class="form-control" type="text">
-                </div>
-            </div>
-
-
         </form>
     </div>
     <th:block th:include="include :: footer" />
     <th:block th:include="include :: datetimepicker-js" />
     <script th:inline="javascript">
         var prefix = ctx + "system/train"
-        $("#form-train-add").validate({
+            $("#form-train-add").validate({
             focusCleanup: true
         });
         var app = new Vue({
@@ -117,11 +139,15 @@
             data: {
                 CityList: [],
                 AreaList:[],
+                userList:[],
                 City:'',
                 Area:'',
+                dept:'',
                 params:{
                     parentId:'',
-                }
+                },
+                userPost:"system/user/list",
+                deptObj:{}
             },
             mounted(){
                 // 初始化地市列表
@@ -129,8 +155,33 @@
                 if (this.City){
                     this.getAreaList()
                 }
+                this.getUserList()
             },
             methods:{
+                getDept(){
+                    if (this.dept !== ''){
+                        $.ajax({
+                            url: ctx + this.userPost,
+                            data:{userId:this.dept},
+                            type: 'POST',
+                            success:((res)=>{
+                                this.deptObj = res.rows[0].dept
+                            }) ,
+                        });
+                    }else{
+                        this.deptObj ={}
+                    }
+
+                },
+                getUserList(){
+                    $.ajax({
+                        url: ctx + this.userPost,
+                        type: 'POST',
+                        success:((res)=>{
+                            this.userList = res.rows
+                        }) ,
+                    });
+                },
                 getCityList(){
                     $.ajax({
                         url: ctx + "system/area/getSysAreaList",

ruoyi-admin/src/main/resources/templates/system/train/detail.html

@@ -9,102 +9,140 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
     <form class="form-horizontal m" id="form-train-edit" th:object="${tdTrain}">
         <input name="ID" th:field="*{ID}" type="hidden">
-        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">所属地市：</label>
-            <div class="col-sm-8">
-                <select id="City" name="AREAID" disabled required @change="getAreaList()" v-model="City" class="form-control m-b">
-                    <option value="">请选择</option>
-                    <option v-for="option in CityList" :value="option.id" :key="option.id">
-                        {{ option.name }}
-                    </option>
-                </select>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">所属区县：</label>
-            <div class="col-sm-8">
-                <select id="Area" name="FRAMEWORK" disabled v-model="Area" class="form-control m-b">
-                    <option value="">请选择</option>
-                    <option v-for="option in AreaList" :value="option.id" :key="option.id">
-                        {{ option.name }}
-                    </option>
-                </select>
+        <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 id="City" name="AREAID" disabled required @change="getAreaList()" v-model="City" class="form-control m-b">
+                            <option value="">请选择</option>
+                            <option v-for="option in CityList" :value="option.id" :key="option.id">
+                                {{ option.name }}
+                            </option>
+                        </select>
+                    </div>
+                </div>
             </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">人员名称：</label>
-            <div class="col-sm-8">
-                <input name="USERNAME" disabled th:field="*{USERNAME}" class="form-control" type="text">
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">所属区县：</label>
+                    <div class="col-sm-8">
+                        <select id="Area" name="FRAMEWORK" disabled v-model="Area" class="form-control m-b">
+                            <option value="">请选择</option>
+                            <option v-for="option in AreaList" :value="option.id" :key="option.id">
+                                {{ option.name }}
+                            </option>
+                        </select>
+                    </div>
+                </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">单位名称：</label>
-            <div class="col-sm-8">
-                <input name="deptName" disabled th:field="*{deptName}" class="form-control" type="text">
+
+        <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">
+                        <select id="User" name="USERNAME" disabled required @change="getDept()" v-model="userName" class="form-control m-b">
+                            <option value="">---请选择---</option>
+                            <option v-for="option in userList" :value="option.userId" :key="option.userId">
+                                {{ option.userName }}
+                            </option>
+                        </select>
+                    </div>
+                </div>
             </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">培训类型：</label>
-            <div class="col-sm-8">
-                <select name="trainType" disabled class="form-control m-b" th:with="type=${@dict.getType('sys_usertrain_typer')}">
-                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{trainType}"></option>
-                </select>
+            <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 placeholder="请输入单位名称" disabled v-model="deptObj.deptName" required class="form-control m-b" type="text">
+                    </div>
+                </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">培训对象：</label>
-            <div class="col-sm-8">
-                <select name="trainSubject" disabled class="form-control m-b" th:with="type=${@dict.getType('sys_usertrain_obj')}">
-                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{trainSubject}"></option>
-                </select>
+        <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">
+                        <select name="trainType" disabled class="form-control m-b" th:with="type=${@dict.getType('sys_usertrain_typer')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{trainType}"></option>
+                        </select>
+                    </div>
+                </div>
             </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">培训地点：</label>
-            <div class="col-sm-8">
-                <textarea name="trainAddress" disabled class="form-control">[[*{trainAddress}]]</textarea>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">培训对象：</label>
+                    <div class="col-sm-8">
+                        <select name="trainSubject" disabled class="form-control m-b" th:with="type=${@dict.getType('sys_usertrain_obj')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{trainSubject}"></option>
+                        </select>
+                    </div>
+                </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">培训开始日期：</label>
-            <div class="col-sm-8">
-                <div class="input-group date">
-                    <input name="trainDate" disabled th:value="${#dates.format(tdTrain.trainDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+        <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">
+                        <textarea name="trainAddress" disabled class="form-control">[[*{trainAddress}]]</textarea>
+                    </div>
                 </div>
             </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">培训人员：</label>
-            <div class="col-sm-8">
-                <input name="trainName" disabled th:field="*{trainName}" class="form-control" type="text">
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">培训人员：</label>
+                    <div class="col-sm-8">
+                        <input name="trainName" disabled th:field="*{trainName}" class="form-control" type="text">
+                    </div>
+                </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">培训结束时间：</label>
-            <div class="col-sm-8">
-                <div class="input-group date">
-                    <input name="trainTimeend" disabled th:value="${#dates.format(tdTrain.trainTimeend, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+        <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">
+                        <div class="input-daterange input-group">
+                            <input type="text" class="input-sm form-control" disabled th:value="${#dates.format(tdTrain.trainDate, 'yyyy-MM-dd')}" name="trainDate" id="laydate-startTime" placeholder="开始日期"/>
+                            <span class="input-group-addon">到</span>
+                            <input type="text" class="input-sm form-control" disabled th:value="${#dates.format(tdTrain.trainTimeend, 'yyyy-MM-dd')}" name="trainTimeend" id="laydate-endTime" placeholder="结束日期"/>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">培训状态：</label>
-            <div class="col-sm-8">
-                <input name="trainState" disabled th:field="*{trainState}" class="form-control" type="text">
+        <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">
+                        <select name="trainState" disabled required class="form-control m-b" th:with="type=${@dict.getType('sys_examine_state')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{trainState}"></option>
+                        </select>
+                    </div>
+                </div>
             </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">审核人员：</label>
-            <div class="col-sm-8">
-                <input name="updateStaffid" disabled th:field="*{updateStaffid}" class="form-control" type="text">
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">审核人员：</label>
+                    <div class="col-sm-8">
+                        <input name="updateStaffid" disabled th:field="*{updateStaffid}" class="form-control" type="text">
+                    </div>
+                </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">培训评价：</label>
-            <div class="col-sm-8">
-                <textarea name="TRAININFO" disabled class="form-control">[[*{TRAININFO}]]</textarea>
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="form-group">
+                    <label class="col-sm-2 control-label">培训评价：</label>
+                    <div class="col-sm-10">
+                        <textarea name="TRAININFO" disabled class="form-control">[[*{TRAININFO}]]</textarea>
+                    </div>
+                </div>
             </div>
         </div>
     </form>
@@ -127,9 +165,13 @@
             AreaList:[],
             City:[[${tdTrain.AREAID}]],
             Area:[[${tdTrain.FRAMEWORK}]],
+            userName:[[${tdTrain.USERNAME}]],
+            userList:[],
             params:{
                 parentId:'',
-            }
+            },
+            userPost:"system/user/list",
+            deptObj:{}
         },
         mounted(){
             // 初始化地市列表
@@ -137,8 +179,33 @@
             if (this.City){
                 this.getAreaList()
             }
+            this.getUserList()
+            this.getDept()
         },
         methods:{
+            getDept(){
+                if (this.userName !== ''){
+                    $.ajax({
+                        url: ctx + this.userPost,
+                        data:{userId:this.userName},
+                        type: 'POST',
+                        success:((res)=>{
+                            this.deptObj = res.rows[0].dept
+                        }) ,
+                    });
+                }else{
+                    this.deptObj ={}
+                }
+            },
+            getUserList(){
+                $.ajax({
+                    url: ctx + this.userPost,
+                    type: 'POST',
+                    success:((res)=>{
+                        this.userList = res.rows
+                    }) ,
+                });
+            },
             getCityList(){
                 $.ajax({
                     url: ctx + "system/area/getSysAreaList",

ruoyi-admin/src/main/resources/templates/system/train/edit.html

@@ -8,76 +8,117 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
         <form class="form-horizontal m" id="form-train-edit" th:object="${tdTrain}">
             <input name="ID" th:field="*{ID}" type="hidden">
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">所属地市：</label>
-                <div class="col-sm-8">
-                    <select id="City" name="AREAID" required @change="getAreaList()" v-model="City" class="form-control m-b">
-                        <option value="">请选择</option>
-                        <option v-for="option in CityList" :value="option.id" :key="option.id">
-                            {{ option.name }}
-                        </option>
-                    </select>
+            <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 id="City" name="AREAID" required @change="getAreaList()" v-model="City" class="form-control m-b">
+                                <option value="">---请选择---</option>
+                                <option v-for="option in CityList" :value="option.id" :key="option.id">
+                                    {{ option.name }}
+                                </option>
+                            </select>
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">所属区县：</label>
-                <div class="col-sm-8">
-                    <select id="Area" name="FRAMEWORK" required v-model="Area" class="form-control m-b">
-                        <option value="">请选择</option>
-                        <option v-for="option in AreaList" :value="option.id" :key="option.id">
-                            {{ option.name }}
-                        </option>
-                    </select>
+                <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 id="Area" name="FRAMEWORK" required v-model="Area" class="form-control m-b">
+                                <option value="">---请选择---</option>
+                                <option v-for="option in AreaList" :value="option.id" :key="option.id">
+                                    {{ option.name }}
+                                </option>
+                            </select>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">人员名称：</label>
-                <div class="col-sm-8">
-                    <input name="USERNAME" required th:field="*{USERNAME}" class="form-control" type="text">
+            <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 id="User" name="USERNAME" required  @change="getDept()" v-model="userName" class="form-control m-b">
+                                <option value="">---请选择---</option>
+                                <option v-for="option in userList" :value="option.userId" :key="option.userId">
+                                    {{ option.userName }}
+                                </option>
+                            </select>
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">单位名称：</label>
-                <div class="col-sm-8">
-                    <input name="deptName" required th:field="*{deptName}" class="form-control" type="text">
+                <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 placeholder="请输入单位名称" v-model="deptObj.deptName" required class="form-control m-b" type="text">
+                            <input name="deptName" v-model="deptObj.deptId" type=hidden>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">培训类型：</label>
-                <div class="col-sm-8">
-                    <select name="trainType" required class="form-control m-b" th:with="type=${@dict.getType('sys_usertrain_typer')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{trainType}"></option>
-                    </select>
+            <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="trainType" required class="form-control m-b" th:with="type=${@dict.getType('sys_usertrain_typer')}">
+                                <option value="">---请选择---</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{trainType}"></option>
+                            </select>
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">培训对象：</label>
-                <div class="col-sm-8">
-                    <select name="trainSubject" required class="form-control m-b" th:with="type=${@dict.getType('sys_usertrain_obj')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{trainSubject}"></option>
-                    </select>
+                <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="trainSubject" required class="form-control m-b" th:with="type=${@dict.getType('sys_usertrain_obj')}">
+                                <option value="">---请选择---</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{trainSubject}"></option>
+                            </select>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">培训地点：</label>
-                <div class="col-sm-8">
-                    <textarea name="trainAddress" required class="form-control">[[*{trainAddress}]]</textarea>
+            <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="trainName" required th:field="*{trainName}" class="form-control m-b" type="text">
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">培训日期：</label>
-                <div class="col-sm-8">
-                    <div class="input-daterange input-group">
-                        <input type="text" class="input-sm form-control" th:value="${#dates.format(tdTrain.trainDate, 'yyyy-MM-dd')}" name="trainDate" id="laydate-startTime" placeholder="开始日期"/>
-                        <span class="input-group-addon">到</span>
-                        <input type="text" class="input-sm form-control" th:value="${#dates.format(tdTrain.trainTimeend, 'yyyy-MM-dd')}" name="trainTimeend" id="laydate-endTime" placeholder="结束日期"/>
+            <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">
+                            <div class="input-daterange input-group">
+                                <input type="text" class="input-sm form-control" th:value="${#dates.format(tdTrain.trainDate, 'yyyy-MM-dd')}" name="trainDate" id="laydate-startTime" placeholder="开始日期"/>
+                                <span class="input-group-addon">到</span>
+                                <input type="text" class="input-sm form-control" th:value="${#dates.format(tdTrain.trainTimeend, 'yyyy-MM-dd')}" name="trainTimeend" id="laydate-endTime" placeholder="结束日期"/>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">培训人员：</label>
-                <div class="col-sm-8">
-                    <input name="trainName" required th:field="*{trainName}" class="form-control" type="text">
+            <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="trainAddress" required class="form-control m-t">[[*{trainAddress}]]</textarea>
+                        </div>
+                    </div>
                 </div>
             </div>
         </form>
@@ -97,9 +138,13 @@
                 AreaList:[],
                 City:[[${tdTrain.AREAID}]],
                 Area:[[${tdTrain.FRAMEWORK}]],
+                userName:[[${tdTrain.USERNAME}]],
+                userList:[],
                 params:{
                     parentId:'',
-                }
+                },
+                userPost:"system/user/list",
+                deptObj:{}
             },
             mounted(){
                 // 初始化地市列表
@@ -107,8 +152,33 @@
                 if (this.City){
                     this.getAreaList()
                 }
+                this.getUserList()
+                this.getDept()
             },
             methods:{
+                getDept(){
+                    if (this.userName !== ''){
+                        $.ajax({
+                            url: ctx + this.userPost,
+                            data:{userId:this.userName},
+                            type: 'POST',
+                            success:((res)=>{
+                                this.deptObj = res.rows[0].dept
+                            }) ,
+                        });
+                    }else{
+                        this.deptObj ={}
+                    }
+                },
+                getUserList(){
+                    $.ajax({
+                        url: ctx + this.userPost,
+                        type: 'POST',
+                        success:((res)=>{
+                            this.userList = res.rows
+                        }) ,
+                    });
+                },
                 getCityList(){
                     $.ajax({
                         url: ctx + "system/area/getSysAreaList",

ruoyi-admin/src/main/resources/templates/system/train/examine.html

@@ -9,98 +9,143 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
     <form class="form-horizontal m" id="form-train-examine" th:object="${tdTrain}">
         <input name="ID" th:field="*{ID}" type="hidden">
-        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">所属地市：</label>
-            <div class="col-sm-8">
-                <select id="City" name="AREAID" required disabled @change="getAreaList()" v-model="City" class="form-control m-b">
-                    <option value="">请选择</option>
-                    <option v-for="option in CityList" :value="option.id" :key="option.id">
-                        {{ option.name }}
-                    </option>
-                </select>
+        <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 id="City" name="AREAID" required disabled @change="getAreaList()" v-model="City" class="form-control m-b">
+                            <option value="">请选择</option>
+                            <option v-for="option in CityList" :value="option.id" :key="option.id">
+                                {{ option.name }}
+                            </option>
+                        </select>
+                    </div>
+                </div>
             </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">所属区县：</label>
-            <div class="col-sm-8">
-                <select id="Area" name="FRAMEWORK" disabled v-model="Area" class="form-control m-b">
-                    <option value="">请选择</option>
-                    <option v-for="option in AreaList" :value="option.id" :key="option.id">
-                        {{ option.name }}
-                    </option>
-                </select>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">所属区县：</label>
+                    <div class="col-sm-8">
+                        <select id="Area" name="FRAMEWORK" disabled v-model="Area" class="form-control m-b">
+                            <option value="">请选择</option>
+                            <option v-for="option in AreaList" :value="option.id" :key="option.id">
+                                {{ option.name }}
+                            </option>
+                        </select>
+                    </div>
+                </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">人员名称：</label>
-            <div class="col-sm-8">
-                <input name="USERNAME" disabled th:field="*{USERNAME}" class="form-control" type="text">
+        <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">
+                        <select id="User" name="USERNAME" disabled required @change="getDept()" v-model="userName" class="form-control m-b">
+                            <option value="">---请选择---</option>
+                            <option v-for="option in userList" :value="option.userId" :key="option.userId">
+                                {{ option.userName }}
+                            </option>
+                        </select>
+                    </div>
+                </div>
             </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">单位名称：</label>
-            <div class="col-sm-8">
-                <input name="deptName" disabled th:field="*{deptName}" class="form-control" type="text">
+            <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 placeholder="请输入单位名称" disabled v-model="deptObj.deptName" required class="form-control m-b" type="text">
+                    </div>
+                </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">培训类型：</label>
-            <div class="col-sm-8">
-                <select name="trainType" disabled class="form-control m-b" th:with="type=${@dict.getType('sys_usertrain_typer')}">
-                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{trainType}"></option>
-                </select>
+        <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">
+                        <select name="trainType" disabled class="form-control m-b" th:with="type=${@dict.getType('sys_usertrain_typer')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{trainType}"></option>
+                        </select>
+                    </div>
+                </div>
             </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">培训对象：</label>
-            <div class="col-sm-8">
-                <select name="trainSubject" disabled class="form-control m-b" th:with="type=${@dict.getType('sys_usertrain_obj')}">
-                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{trainSubject}"></option>
-                </select>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">培训对象：</label>
+                    <div class="col-sm-8">
+                        <select name="trainSubject" disabled class="form-control m-b" th:with="type=${@dict.getType('sys_usertrain_obj')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{trainSubject}"></option>
+                        </select>
+                    </div>
+                </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">培训地点：</label>
-            <div class="col-sm-8">
-                <textarea name="trainAddress" disabled class="form-control">[[*{trainAddress}]]</textarea>
+        <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="trainName" disabled th:field="*{trainName}" class="form-control" type="text">
+                    </div>
+                </div>
             </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">培训日期：</label>
-            <div class="col-sm-8">
-                <div class="input-daterange input-group">
-                    <input type="text" class="input-sm form-control" disabled th:value="${#dates.format(tdTrain.trainDate, 'yyyy-MM-dd')}" name="trainDate" id="laydate-startTime" placeholder="开始日期"/>
-                    <span class="input-group-addon">到</span>
-                    <input type="text" class="input-sm form-control" disabled th:value="${#dates.format(tdTrain.trainTimeend, 'yyyy-MM-dd')}" name="trainTimeend" id="laydate-endTime" placeholder="结束日期"/>
+            <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="updateStaffid" readonly th:field="*{updateStaffid}"  class="form-control" type="text">
+                    </div>
                 </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">培训人员：</label>
-            <div class="col-sm-8">
-                <input name="trainName" disabled th:field="*{trainName}" class="form-control" type="text">
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="form-group">
+                    <label class="col-sm-2 control-label">培训日期：</label>
+                    <div class="col-sm-10">
+                        <div class="input-daterange input-group">
+                            <input type="text" class="input-sm form-control" disabled th:value="${#dates.format(tdTrain.trainDate, 'yyyy-MM-dd')}" name="trainDate" id="laydate-startTime" placeholder="开始日期"/>
+                            <span class="input-group-addon">到</span>
+                            <input type="text" class="input-sm form-control" disabled th:value="${#dates.format(tdTrain.trainTimeend, 'yyyy-MM-dd')}" name="trainTimeend" id="laydate-endTime" placeholder="结束日期"/>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">培训状态：</label>
-            <div class="col-sm-8">
-                <select name="trainState" required class="form-control m-b" th:with="type=${@dict.getType('sys_examine_state')}">
-                    <option th:value="''" th:text="'请选择'"></option>
-                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                </select>
-<!--                <input name="trainState" th:field="*{trainState}" class="form-control" type="text">-->
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="form-group">
+                    <label class="col-sm-2 control-label">培训地点：</label>
+                    <div class="col-sm-10">
+                        <textarea name="trainAddress" disabled class="form-control">[[*{trainAddress}]]</textarea>
+                    </div>
+                </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">审核人员：</label>
-            <div class="col-sm-8">
-                <input name="updateStaffid" readonly th:field="*{updateStaffid}"  class="form-control" type="text">
+        <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="trainState" required class="form-control m-b" th:with="type=${@dict.getType('sys_examine_state')}">
+                            <option value="">---请选择---</option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:if="${dict.dictValue} ne '2'" th:value="${dict.dictValue}"></option>
+                        </select>
+                        <!--                <input name="trainState" th:field="*{trainState}" class="form-control" type="text">-->
+                    </div>
+                </div>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">培训评价：</label>
-            <div class="col-sm-8">
-                <textarea name="TRAININFO" required class="form-control">[[*{TRAININFO}]]</textarea>
+        <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="TRAININFO" required class="form-control">[[*{TRAININFO}]]</textarea>
+                    </div>
+                </div>
             </div>
         </div>
     </form>
@@ -123,9 +168,13 @@
             AreaList:[],
             City:[[${tdTrain.AREAID}]],
             Area:[[${tdTrain.FRAMEWORK}]],
+            userName:[[${tdTrain.USERNAME}]],
+            userList:[],
             params:{
                 parentId:'',
-            }
+            },
+            userPost:"system/user/list",
+            deptObj:{}
         },
         mounted(){
             // 初始化地市列表
@@ -133,8 +182,33 @@
             if (this.City){
                 this.getAreaList()
             }
+            this.getUserList()
+            this.getDept()
         },
         methods:{
+            getDept(){
+                if (this.userName !== ''){
+                    $.ajax({
+                        url: ctx + this.userPost,
+                        data:{userId:this.userName},
+                        type: 'POST',
+                        success:((res)=>{
+                            this.deptObj = res.rows[0].dept
+                        }) ,
+                    });
+                }else{
+                    this.deptObj ={}
+                }
+            },
+            getUserList(){
+                $.ajax({
+                    url: ctx + this.userPost,
+                    type: 'POST',
+                    success:((res)=>{
+                        this.userList = res.rows
+                    }) ,
+                });
+            },
             getCityList(){
                 $.ajax({
                     url: ctx + "system/area/getSysAreaList",

ruoyi-admin/src/main/resources/templates/system/train/train.html

@@ -73,7 +73,23 @@
         var trainSubjectDatas = [[${@dict.getType('sys_usertrain_obj')}]];
         var trainStateDatas = [[${@dict.getType('sys_examine_state')}]];
         var prefix = ctx + "system/train";
-
+        let datas = []
+        $.ajax({
+            url: ctx + "system/area/getAllList",
+            type: 'GET',
+            data:{parentId:''} ,
+            success:((res)=>{
+                datas = res.data
+            }) ,
+        });
+        let userList = []
+        $.ajax({
+            url: ctx + "system/user/list",
+            type: 'POST',
+            success:((res)=>{
+                userList = res.rows
+            }) ,
+        });
         $(function() {
             var options = {
                 url: prefix + "/list",
@@ -92,9 +108,12 @@
                     visible: false
                 },
                 {
-                    field: 'AREAID',
+                    field: 'areaid',
                     title: '所属地市',
-                    visible: false
+                    visible: false,
+                    formatter: function(value, row, index) {
+                        return getCity(datas, value)
+                    }
 
                 },
                 {
@@ -102,14 +121,19 @@
                     title: '培训人员'
                 },
                 {
-                    field: 'FRAMEWORK',
+                    field: 'framework',
                     title: '所属区县',
-                    visible: false
+                    visible: false,
+                    formatter: function(value, row, index) {
+                        return getCity(datas, value)
+                    }
                 },
                 {
-                    field: 'USERNAME',
-                    title: '人员名称',
-                    visible: false
+                    field: 'username',
+                    title: '人员姓名',
+                    formatter:function (value, row, index) {
+                        return getUser(userList,value)
+                    }
                 },
                 {
                     field: 'deptName',
@@ -179,12 +203,12 @@
                     }
                 },
                 {
-                    field: 'PART',
+                    field: 'part',
                     title: '部门',
                     visible: false
                 },
                 {
-                    field: 'TRAININFO',
+                    field: 'traininfo',
                     title: '培训评价',//
                     visible: false
                 },
@@ -193,10 +217,17 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        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-success btn-xs ' + examineFlag + '" href="javascript:void(0)" onclick="examine(\'' + 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>');
+                        if (row.trainState === 2){
+                            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-success btn-xs ' + examineFlag + '" href="javascript:void(0)" onclick="examine(\'' + 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-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 disabled class="btn btn-success btn-xs ' + examineFlag + '" href="javascript:void(0)"><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('');
                     }
                 }]
@@ -207,6 +238,23 @@
             var url = prefix + '/examine/' + id;
             $.modal.open("涉密人员培训审核", url);
         }
+        function getUser(datas,value){
+            if ($.common.isEmpty(datas) || $.common.isEmpty(value)) {
+                return '';
+            }
+            var actions = []
+            $.each(datas, function(index, user) {
+                if (user.userId ==  value) {
+                    actions.push($.common.sprintf("<span>%s</span>", user.userName));
+                    return false;
+                }
+            });
+            if (actions.length === 0) {
+                actions.push($.common.sprintf("<span>%s</span>", value))
+            }
+            return actions.join('');
+        }
+
         var app = new Vue({
             el: '#app',
             data: {

ruoyi-admin/src/main/resources/templates/system/trainnum/detail.html

@@ -0,0 +1,234 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('涉密人员培训详情')" />
+    <th:block th:include="include :: jsonview-css" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
+    <form class="form-horizontal m" id="form-train-edit" th:object="${tdTrain}">
+        <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">
+                        <select id="City" name="AREAID" disabled required @change="getAreaList()" v-model="City" class="form-control  ">
+                            <option value="">请选择</option>
+                            <option v-for="option in CityList" :value="option.id" :key="option.id">
+                                {{ option.name }}
+                            </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">
+                        <select id="Area" name="FRAMEWORK" disabled v-model="Area" class="form-control  ">
+                            <option value="">请选择</option>
+                            <option v-for="option in AreaList" :value="option.id" :key="option.id">
+                                {{ option.name }}
+                            </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="USERNAME" disabled th:field="*{USERNAME}" class="form-control" type="text">
+                    </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="deptName" disabled th:field="*{deptName}" 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">培训类型：</label>
+                    <div class="col-sm-8">
+                        <select name="trainType" disabled class="form-control  " th:with="type=${@dict.getType('sys_usertrain_typer')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{trainType}"></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">
+                        <select name="trainSubject" disabled class="form-control  " th:with="type=${@dict.getType('sys_usertrain_obj')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{trainSubject}"></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="trainAddress" th:field="*{trainAddress}" disabled class="form-control">
+                    </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">
+                            <input name="trainDate" disabled th:value="${#dates.format(tdTrain.trainDate, 'yyyy-MM-dd')}" 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">培训人员：</label>
+                    <div class="col-sm-8">
+                        <input name="trainName" disabled th:field="*{trainName}" class="form-control" type="text">
+                    </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">
+                            <input name="trainTimeend" disabled th:value="${#dates.format(tdTrain.trainTimeend, 'yyyy-MM-dd')}" 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">培训状态：</label>
+                    <div class="col-sm-8">
+                        <select name="trainState" disabled required class="form-control  " th:with="type=${@dict.getType('sys_examine_state')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{trainState}"></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="updateStaffid" disabled th:field="*{updateStaffid}" 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">培训评价：</label>
+                    <div class="col-sm-10">
+                        <textarea name="TRAININFO" disabled class="form-control">[[*{TRAININFO}]]</textarea>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: jsonview-js" />
+<th:block th:include="include :: datetimepicker-css" />
+<script th:inline="javascript">
+    var trainStateDatas = [[${@dict.getType('sys_examine_state')}]];
+    var trainStateText = $("input[name='trainState']").val()
+    trainStateDatas.forEach((item)=>{
+        if(trainStateText === item.dictValue){
+            $("input[name='trainState']").val(item.dictLabel);
+        }
+    })
+    var app = new Vue({
+        el: '#app',
+        data: {
+            CityList: [],
+            AreaList:[],
+            City:[[${tdTrain.AREAID}]],
+            Area:[[${tdTrain.FRAMEWORK}]],
+            params:{
+                parentId:'',
+            }
+        },
+        mounted(){
+            // 初始化地市列表
+            this.getCityList();
+            if (this.City){
+                this.getAreaList()
+            }
+        },
+        methods:{
+
+            getCityList(){
+                $.ajax({
+                    url: ctx + "system/area/getSysAreaList",
+                    type: 'GET',
+                    data:this.params ,
+                    success:((res)=>{
+                        this.CityList = res.data
+                    }) ,
+                });
+            },
+            getAreaList(){
+                this.params.parentId = this.City
+                $.ajax({
+                    url: ctx + "system/area/getSysAreaList",
+                    type: 'GET',
+                    data:this.params,
+                    success:((res)=>{
+                        this.AreaList = res.data
+                    }) ,
+                });
+            }
+        }
+    })
+
+    $("input[name='trainDate']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+    $("input[name='createDate']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+    $("input[name='updateDate']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+    $("input[name='trainTimeend']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+</script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/trainnum/trainnum.html

@@ -51,11 +51,12 @@
 </div>
 <th:block th:include="include :: footer" />
 <script th:inline="javascript">
-    var detailFlag = [[${@permission.hasPermi('system:trainnum:print')}]];
+    var detailFlag = [[${@permission.hasPermi('system:trainnum:detail')}]];
+    var listFlag = [[${@permission.hasPermi('system:trainnum:list')}]];
     var trainTypeDatas = [[${@dict.getType('sys_usertrain_typer')}]];
     var trainSubjectDatas = [[${@dict.getType('sys_usertrain_obj')}]];
     var trainStateDatas = [[${@dict.getType('sys_examine_state')}]];
-    var prefix = ctx + "system/train";
+    var prefix = ctx + "system/trainnum";
 
     $(function() {
         var options = {

ruoyi-admin/src/main/resources/templates/system/user/add.html

@@ -13,7 +13,7 @@
             <div class="row">
             	<div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label is-required">用户名称：</label>
+                        <label class="col-sm-4 control-label is-required">人员姓名：</label>
                         <div class="col-sm-8">
                             <input name="userName" placeholder="请输入用户名称" class="form-control" type="text" maxlength="30" required>
                         </div>
@@ -21,10 +21,10 @@
                 </div>
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label is-required" >归属部门：</label>
+                        <label class="col-sm-4 control-label is-required" >所属单位：</label>
                         <div class="col-sm-8">
                             <div class="input-group">
-                            	<input name="deptName" required onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择归属部门" class="form-control">
+                            	<input name="deptName" required onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择所属单位" class="form-control">
                                 <span class="input-group-addon"><i class="fa fa-search"></i></span>
                             </div>
                         </div>
@@ -84,6 +84,7 @@
                         <label class="col-sm-4 control-label is-required">用户性别：</label>
                         <div class="col-sm-8">
                             <select name="sex" required class="form-control m-b" th:with="type=${@dict.getType('sys_user_sex')}">
+                                <option value="">---请选择---</option>
 				                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
 				            </select>
                         </div>
@@ -104,8 +105,8 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label is-required">岗位：</label>
                         <div class="col-sm-8">
-                            <select id="post"  class="form-control select2-multiple" multiple>
-								<option th:each="post:${posts}" th:value="${post.postId}" th:text="${post.postName}" th:disabled="${post.status == '1'}" required></option>
+                            <select id="post"  class="form-control select2-multiple" required multiple>
+								<option th:each="post:${posts}" th:value="${post.postId}" th:text="${post.postName}" th:disabled="${post.status == '1'}"></option>
 							</select>
                         </div>
                     </div>
@@ -115,7 +116,7 @@
                         <label class="col-sm-4 control-label is-required">角色：</label>
                         <div class="col-sm-8">
                             <label th:each="role:${roles}"  class="check-box">
-                                <input name="role"  type="checkbox" th:value="${role.roleId}" th:text="${role.roleName}" th:disabled="${role.status == '1'}" >
+                                <input name="role" type="checkbox" th:value="${role.roleId}" th:text="${role.roleName}" th:disabled="${role.status == '1'}" >
                             </label>
                         </div>
                     </div>
@@ -135,6 +136,7 @@
                         <label class="col-sm-4 control-label is-required">民族：</label>
                         <div class="col-sm-8">
                             <select name="nation" required class="form-control m-b" th:with="type=${@dict.getType('sys_user_nation')}">
+                                <option value="">---请选择---</option>
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                             </select>
                         </div>
@@ -158,6 +160,7 @@
                         <label class="col-sm-4 control-label">政治面貌：</label>
                         <div class="col-sm-8">
                             <select name="politics" class="form-control m-b" th:with="type=${@dict.getType('sys_user_politics')}">
+                                <option value="">---请选择---</option>
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                             </select>
                         </div>
@@ -170,6 +173,7 @@
                         <label class="col-sm-4 control-label is-required">涉密程度：</label>
                         <div class="col-sm-8">
                             <select name="shemichengdu" required class="form-control m-b" th:with="type=${@dict.getType('sys_user_shemi')}">
+                                <option value="">---请选择---</option>
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                             </select>
                         </div>
@@ -215,7 +219,7 @@
             </div>
         </form>
     </div>
-      
+
     <div class="row">
         <div class="col-sm-offset-5 col-sm-10">
             <button type="button" class="btn btn-sm btn-primary" onclick="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;
@@ -227,7 +231,7 @@
     <th:block th:include="include :: datetimepicker-js" />
 	<script>
 	    var prefix = ctx + "system/user";
-	
+
         $("#form-user-add").validate({
         	onkeyup: false,
         	rules:{
@@ -310,7 +314,7 @@
 	        	$.operate.saveTab(prefix + "/add", data);
 	        }
 	    }
-         
+
         /* 用户管理-新增-选择部门树 */
         function selectDeptTree() {
         	var treeId = $("#treeId").val();
@@ -324,7 +328,7 @@
 			};
 			$.modal.openOptions(options);
 		}
-		
+
 		function doSubmit(index, layero){
 			var body = $.modal.getChildFrame(index);
    			$("#treeId").val(body.find('#treeId').val());
@@ -340,4 +344,4 @@
         })
     </script>
 </body>
-</html>
+</html>

ruoyi-admin/src/main/resources/templates/system/user/authRole.html

@@ -11,7 +11,7 @@
             <div class="row">
             	<div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label is-required">用户名称：</label>
+                        <label class="col-sm-4 control-label is-required">人员名称：</label>
                         <div class="col-sm-8">
                             <input name="userName" class="form-control" type="text" disabled th:value="${user.userName}">
                         </div>
@@ -24,9 +24,9 @@
                             <input name="loginName" class="form-control" type="text" disabled th:value="${user.loginName}">
                         </div>
                     </div>
-                </div> 
+                </div>
             </div>
-           
+
             <h4 class="form-header h4">分配角色</h4>
             <div class="row">
                 <div class="col-sm-12">
@@ -37,7 +37,7 @@
             </div>
         </form>
     </div>
-      
+
     <div class="row">
         <div class="col-sm-offset-5 col-sm-10">
             <button type="button" class="btn btn-sm btn-primary" onclick="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;
@@ -48,7 +48,7 @@
 	<script th:inline="javascript">
 	    var prefix = ctx + "system/user/authRole";
 	    var roles = [[${roles}]]
-	    
+
 	    $(function() {
 		    var options = {
 		        data: roles,
@@ -97,7 +97,7 @@
 		    };
 		    $.table.init(options);
 		});
-	    
+
 	    /* 添加角色-提交 */
         function submitHandler(index, layero){
             var roleIds = [];
@@ -111,4 +111,4 @@
         }
     </script>
 </body>
-</html>
+</html>