From b82de922f1919d953ac8c99ade9537f45cb642fc Mon Sep 17 00:00:00 2001
From: dshclm <3321914460@qq.com>
Date: Thu, 20 Jun 2024 10:22:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/system/train/add.html | 58 ++++++++++++-------
 .../templates/system/train/detail.html        | 24 ++++++--
 .../templates/system/train/edit.html          | 25 ++++++--
 .../templates/system/train/examine.html       | 24 ++++++--
 .../templates/system/trainnum/detail.html     |  3 +-
 .../resources/templates/system/user/add.html  |  4 +-
 .../resources/templates/system/user/edit.html |  2 +-
 .../user/userexamine/examinedetail.html       |  2 +-
 8 files changed, 103 insertions(+), 39 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/train/add.html b/ruoyi-admin/src/main/resources/templates/system/train/add.html
index beb038d..31f3e93 100644
--- a/ruoyi-admin/src/main/resources/templates/system/train/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/train/add.html
@@ -40,7 +40,7 @@
                     <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 class="form-control m-b">
+                            <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 }}
@@ -51,19 +51,29 @@
                 </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">
-                            <input name="deptName" placeholder="请输入单位名称" required class="form-control m-b" type="text">
+                            <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="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>
+                        <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">
+                            <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>
@@ -81,17 +91,6 @@
             </div>
 
             <div class="row">
-                <div class="col-sm-6">
-                    <div class="form-group">
-                        <label class="col-sm-4 control-label is-required">培训对象：</label>
-                        <div class="col-sm-8">
-                            <select name="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 class="col-sm-6">
                     <div class="form-group">
                         <label class="col-sm-4 control-label">培训人员：</label>
@@ -100,12 +99,10 @@
                         </div>
                     </div>
                 </div>
-            </div>
-            <div class="row">
-                <div class="col-sm-12">
+                <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-2 control-label is-required">培训日期：</label>
-                        <div class="col-sm-10">
+                        <label class="col-sm-4 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>
@@ -142,10 +139,12 @@
                 userList:[],
                 City:'',
                 Area:'',
+                dept:'',
                 params:{
                     parentId:'',
                 },
-                userPost:"system/user/list"
+                userPost:"system/user/list",
+                deptObj:{}
             },
             mounted(){
                 // 初始化地市列表
@@ -156,6 +155,21 @@
                 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,
diff --git a/ruoyi-admin/src/main/resources/templates/system/train/detail.html b/ruoyi-admin/src/main/resources/templates/system/train/detail.html
index d5dba37..ccfeb6d 100644
--- a/ruoyi-admin/src/main/resources/templates/system/train/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/train/detail.html
@@ -43,7 +43,7 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label">人员姓名：</label>
                     <div class="col-sm-8">
-                        <select id="User" name="USERNAME" disabled required v-model="userName" class="form-control m-b">
+                        <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 }}
@@ -54,9 +54,9 @@
             </div>
             <div class="col-sm-6">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label">单位名称：</label>
+                    <label class="col-sm-4 control-label is-required ">所属单位：</label>
                     <div class="col-sm-8">
-                        <input name="deptName" disabled th:field="*{deptName}" class="form-control m-b" type="text">
+                        <input placeholder="请输入单位名称" disabled v-model="deptObj.deptName" required class="form-control m-b" type="text">
                     </div>
                 </div>
             </div>
@@ -170,7 +170,8 @@
             params:{
                 parentId:'',
             },
-            userPost:"system/user/list"
+            userPost:"system/user/list",
+            deptObj:{}
         },
         mounted(){
             // 初始化地市列表
@@ -179,8 +180,23 @@
                 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,
diff --git a/ruoyi-admin/src/main/resources/templates/system/train/edit.html b/ruoyi-admin/src/main/resources/templates/system/train/edit.html
index 4aa002a..1b06d36 100644
--- a/ruoyi-admin/src/main/resources/templates/system/train/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/train/edit.html
@@ -41,7 +41,7 @@
                     <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 v-model="userName" class="form-control m-b">
+                            <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 }}
@@ -52,9 +52,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">
-                            <input name="deptName" required th:field="*{deptName}" class="form-control m-b" type="text">
+                            <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>
@@ -142,7 +143,8 @@
                 params:{
                     parentId:'',
                 },
-                userPost:"system/user/list"
+                userPost:"system/user/list",
+                deptObj:{}
             },
             mounted(){
                 // 初始化地市列表
@@ -151,8 +153,23 @@
                     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,
diff --git a/ruoyi-admin/src/main/resources/templates/system/train/examine.html b/ruoyi-admin/src/main/resources/templates/system/train/examine.html
index 38c7fa3..80c5762 100644
--- a/ruoyi-admin/src/main/resources/templates/system/train/examine.html
+++ b/ruoyi-admin/src/main/resources/templates/system/train/examine.html
@@ -42,7 +42,7 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label">人员姓名：</label>
                     <div class="col-sm-8">
-                        <select id="User" name="USERNAME" disabled required v-model="userName" class="form-control m-b">
+                        <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 }}
@@ -53,9 +53,9 @@
             </div>
             <div class="col-sm-6">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label">单位名称：</label>
+                    <label class="col-sm-4 control-label is-required ">所属单位：</label>
                     <div class="col-sm-8">
-                        <input name="deptName" disabled th:field="*{deptName}" class="form-control m-b" type="text">
+                        <input placeholder="请输入单位名称" disabled v-model="deptObj.deptName" required class="form-control m-b" type="text">
                     </div>
                 </div>
             </div>
@@ -171,7 +171,8 @@
             params:{
                 parentId:'',
             },
-            userPost:"system/user/list"
+            userPost:"system/user/list",
+            deptObj:{}
         },
         mounted(){
             // 初始化地市列表
@@ -180,8 +181,23 @@
                 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,
diff --git a/ruoyi-admin/src/main/resources/templates/system/trainnum/detail.html b/ruoyi-admin/src/main/resources/templates/system/trainnum/detail.html
index 9e0afa7..4b0237c 100644
--- a/ruoyi-admin/src/main/resources/templates/system/trainnum/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/trainnum/detail.html
@@ -48,7 +48,7 @@
             </div>
             <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 name="deptName" disabled th:field="*{deptName}" class="form-control" type="text">
                     </div>
@@ -181,6 +181,7 @@
             }
         },
         methods:{
+
             getCityList(){
                 $.ajax({
                     url: ctx + "system/area/getSysAreaList",
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/add.html b/ruoyi-admin/src/main/resources/templates/system/user/add.html
index 46ecdf9..8bd9525 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/add.html
@@ -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>
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/edit.html b/ruoyi-admin/src/main/resources/templates/system/user/edit.html
index 12dbbaf..70c2687 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/edit.html
@@ -22,7 +22,7 @@
                 </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 class="form-control" required type="text" name="deptName" onclick="selectDeptTree()" id="treeName" th:field="*{dept.deptName}">
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/userexamine/examinedetail.html b/ruoyi-admin/src/main/resources/templates/system/user/userexamine/examinedetail.html
index 26020fe..5bb3407 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/userexamine/examinedetail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/userexamine/examinedetail.html
@@ -37,7 +37,7 @@
             </div>
             <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">
                         <div class="input-group">
                             <input class="form-control" disabled type="text" name="deptName" onclick="selectDeptTree()" id="treeName" th:field="*{dept.deptName}">