From f1c92fed2c86c6996162b589adb1be81e6d90452 Mon Sep 17 00:00:00 2001
From: dshclm <3321914460@qq.com>
Date: Mon, 1 Jul 2024 15:41:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=BF=E7=94=A8=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E5=A1=AB=E5=86=99=E6=96=B9=E5=BC=8F=E4=B8=BA=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/system/network/network/add.html | 24 ++++++++++++++++-
 .../system/network/network/edit.html          | 23 +++++++++++++++-
 .../system/network/network/network.html       |  8 +++---
 .../system/property/property/add.html         | 27 ++++++++++++++++---
 .../system/property/property/edit.html        | 25 +++++++++++++++--
 5 files changed, 96 insertions(+), 11 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/network/network/add.html b/ruoyi-admin/src/main/resources/templates/system/network/network/add.html
index 0e1d4b2..5a9c479 100644
--- a/ruoyi-admin/src/main/resources/templates/system/network/network/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/network/network/add.html
@@ -32,7 +32,10 @@
             <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">
@@ -128,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",
diff --git a/ruoyi-admin/src/main/resources/templates/system/network/network/edit.html b/ruoyi-admin/src/main/resources/templates/system/network/network/edit.html
index 1bccc08..b42535f 100644
--- a/ruoyi-admin/src/main/resources/templates/system/network/network/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/network/network/edit.html
@@ -33,7 +33,10 @@
             <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">
@@ -129,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",
diff --git a/ruoyi-admin/src/main/resources/templates/system/network/network/network.html b/ruoyi-admin/src/main/resources/templates/system/network/network/network.html
index d37ec4e..0740bf1 100644
--- a/ruoyi-admin/src/main/resources/templates/system/network/network/network.html
+++ b/ruoyi-admin/src/main/resources/templates/system/network/network/network.html
@@ -114,10 +114,10 @@
                     field: 'netDepart',
                     title: '使用单位'
                 },
-                {
-                    field: 'part',
-                    title: '使用部门'
-                },
+                // {
+                //     field: 'part',
+                //     title: '使用部门'
+                // },
                 {
                     field: 'netUser',
                     title: '登记人员'
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/property/add.html b/ruoyi-admin/src/main/resources/templates/system/property/property/add.html
index 478c4cb..9dc2be0 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/property/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/property/add.html
@@ -36,9 +36,12 @@
                 </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",
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html b/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html
index f939f28..41779cf 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html
@@ -39,7 +39,10 @@
             <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">
@@ -147,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",