From 490263f1a9af4142d3c7441e3755e2a5160d06c1 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 11 七月 2024 13:36:26 +0800
Subject: [PATCH] 物料树状图等级完善

---
 WebTM/views/基础资料/公用基础资料/Gy_MaterType.html |   37 +++++++++++++++++++++++++++++++++++++
 WebTM/views/基础资料/公用基础资料/Gy_Material.html  |    2 +-
 2 files changed, 38 insertions(+), 1 deletions(-)

diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterType.html"
index b52b373..68ed8e2 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterType.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterType.html"
@@ -35,6 +35,14 @@
                                         <input type="text" class="layui-input" name="HName" id="HName">
                                     </div>
                                 </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HOrgName" id="HOrgName" lay-verify="HOrgName">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
+                                    </div>
+                                </div>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                 </button>
@@ -255,12 +263,37 @@
 
             //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
 
+
             //#region 鍒濆鍖栫晫闈�
             function set_ClearBill() {
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
                 //鏌ヨ
                 get_Display(sWhere);
+                Organ();
+            }
+            //#endregion
+
+            //#region 鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        var Organization = "";
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].Name + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HOrgName").append(Organization);
+                            $("#HOrgName").val(sessionStorage["Organization"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
             }
             //#endregion
 
@@ -303,6 +336,7 @@
             function set_ClearQuery() {
                 $("#HNumber").val("");
                 $("#HName").val("");
+                $("#HOrgName").val(sessionStorage["OrganizationName"]);
                 $("#ColContent").val("");
                 $("#ColName").val("0");
                 $("#Comparator").val("0"); $("#ColContent2").val("");
@@ -320,6 +354,9 @@
             function get_Display(sWhere) {
                 var wait = layer.load();//閬僵
                 var ajaxLoad = layer.load();
+                if ($("#HOrgName").val() != null) {
+                    Organization = $("#HOrgName").val();
+                }
                 $.ajax({
                     url: GetWEBURL() + '/Gy_MaterType/Gy_MaterTypeList',
                     type: "GET",
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
index f261a2e..b03b58e 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
@@ -857,7 +857,7 @@
             function get_Display_Tree() {
                 var ajaxLoad = layer.load();
                 $.ajax({
-                    url: GetWEBURL() + '/Gy_MaterType/Gy_MaterTypeTreeList',
+                    url: GetWEBURL() + '/Gy_MaterType/Gy_MaterTypeTreeListByLevel',
                     type: "GET",
                     success: function (data1) {
                         if (data1.count == 1) {

--
Gitblit v1.9.1