From b8e971baad80b5790a3226daa6c804df295b7464 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 08 十一月 2021 14:37:25 +0800
Subject: [PATCH] 基础资料列表优化
---
WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html | 2
WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html | 5 +-
WebTM/views/基础资料/销售基础资料/Gy_Customer.html | 2
WebTM/views/基础资料/公用基础资料/Gy_ClassTimePrj.html | 2
WebTM/views/PublicPage/SupplierInformation.html | 2
WebTM/views/基础资料/公用基础资料/Gy_PropertyList.html | 10 ++--
WebTM/views/基础资料/公用基础资料/Gy_Unit.html | 38 +++++++++---------
WebTM/views/基础资料/公用基础资料/Xt_ORGANIZATIONSList.html | 2
WebTM/views/基础资料/公用基础资料/Gy_EmployeeList.html | 2
WebTM/views/基础资料/公用基础资料/Gy_Material.html | 4 +-
WebTM/views/基础资料/采购基础资料/Gy_Supplier.html | 2
WebTM/views/基础资料/公用基础资料/Gy_Currency.html | 2
12 files changed, 36 insertions(+), 37 deletions(-)
diff --git a/WebTM/views/PublicPage/SupplierInformation.html b/WebTM/views/PublicPage/SupplierInformation.html
index 86fbf7a..57d124d 100644
--- a/WebTM/views/PublicPage/SupplierInformation.html
+++ b/WebTM/views/PublicPage/SupplierInformation.html
@@ -88,7 +88,7 @@
, util = layui.util
, tree = layui.tree
var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鏍戝瀷
- var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = 1 "; //鍒楄〃
+ var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鍒楄〃
//tree.render({
// elem: '#treeSupplier',
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_ClassTimePrj.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_ClassTimePrj.html"
index 1492fed..e4c3ce6 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_ClassTimePrj.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_ClassTimePrj.html"
@@ -81,7 +81,7 @@
, util = layui.util
var sWhere = "";
var option = [];
- var Organization = sessionStorage["OrganizationID"];
+ var Organization = sessionStorage["Organization"]
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
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_Currency.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_Currency.html"
index 3ae9497..42bdd44 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_Currency.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_Currency.html"
@@ -124,7 +124,7 @@
, util = layui.util
, tree = layui.tree
var sWhere = "";
- var Organization = sessionStorage["OrganizationID"];
+ var Organization = sessionStorage["Organization"]
//#endregion
//#region 鍒濆鍖栬〃鏍�
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_DepartmentList.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_DepartmentList.html"
index 8e4d432..210ed96 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_DepartmentList.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_DepartmentList.html"
@@ -75,9 +75,9 @@
, element = layui.element
, laypage = layui.laypage
, laydate = layui.laydate
- var sWhere = "and HUSEORGID=" + sessionStorage["OrganizationID"];
+ var sWhere = "";
var option = [];
- var Organization = sessionStorage["OrganizationID"];
+ var Organization = sessionStorage["Organization"]
//#endregion
@@ -201,7 +201,6 @@
sWhere += " and 閮ㄩ棬鍚嶇О like '%" + HName + "%'";
}
get_Display(sWhere);
- sWhere = "and HUSEORGID=" + sessionStorage["OrganizationID"];//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
//#endregion
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_EmployeeList.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_EmployeeList.html"
index 04d7a6a..c9a5255 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_EmployeeList.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_EmployeeList.html"
@@ -78,7 +78,7 @@
, laydate = layui.laydate
var sWhere = "";
var option = [];
- var Organization = sessionStorage["OrganizationID"];
+ var Organization = sessionStorage["Organization"]
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
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 f8e009d..2b51227 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"
@@ -94,7 +94,7 @@
var sWhere = "";
var option = [];
- var Organization = sessionStorage["OrganizationID"];
+ var Organization = sessionStorage["Organization"];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -223,7 +223,7 @@
table.render(option);
layer.close(wait);
} else {
- layer.close(index);
+ layer.close(wait);
layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
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_PropertyList.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_PropertyList.html"
index df51c4f..9c685b5 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_PropertyList.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_PropertyList.html"
@@ -25,14 +25,14 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">杈呭姪灞炴�т唬鐮�</label>
- <div class="layui-input-block">
+ <label class="layui-form-label" style="width: 85px;">杈呭姪灞炴�т唬鐮�</label>
+ <div class="layui-input-block" style="margin-left: 120px;" >
<input type="text" class="layui-input" name="HNumber" id="HNumber">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">杈呭姪灞炴�у悕绉�</label>
- <div class="layui-input-block">
+ <label class="layui-form-label" style="width: 85px;">杈呭姪灞炴�у悕绉�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HName" id="HName">
</div>
</div>
@@ -91,7 +91,7 @@
, page: true
,cellMinWidth: 90
, cols: [[
- { field: '閫夋嫨', title: '閫夋嫨', hide: true }
+ { type: 'checkbox', fixed: 'left' }
, { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
, { field: '杈呭姪灞炴�т唬鐮�', title: '杈呭姪灞炴�т唬鐮�' }
, { field: '杈呭姪灞炴�у悕绉�', title: '杈呭姪灞炴�у悕绉�' }
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_Unit.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_Unit.html"
index 6e2f4eb..defcb88 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_Unit.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_Unit.html"
@@ -107,26 +107,26 @@
, util = layui.util
, tree = layui.tree
var sWhere = "";
- var Organization = sessionStorage["OrganizationID"];
+ var Organization = sessionStorage["Organization"]
- $.ajax({
- url: GetWEBURL() + '/Gy_Unit/LoadTree',
- type: "GET",
- data: { "sWhere": sWhere },
- success: function (result) {
- var data = result.data;
- //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
- var treeData = LoadTree(data);
- tree.render({
- elem: '#treeunit',
- data: treeData,
- id: 'treeId',
- disabled: 'disabled',
- showCheckbox: false, //鏄惁鏄剧ず澶嶉�夋
- showLine: false
- });
- }
- });
+ //$.ajax({
+ // url: GetWEBURL() + '/Gy_Unit/LoadTree',
+ // type: "GET",
+ // data: { "sWhere": sWhere },
+ // success: function (result) {
+ // var data = result.data;
+ // //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
+ // var treeData = LoadTree(data);
+ // tree.render({
+ // elem: '#treeunit',
+ // data: treeData,
+ // id: 'treeId',
+ // disabled: 'disabled',
+ // showCheckbox: false, //鏄惁鏄剧ず澶嶉�夋
+ // showLine: false
+ // });
+ // }
+ //});
var option = {
elem: '#mainTable'
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_Warehouse.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_Warehouse.html"
index bb9db44..da5b6af 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_Warehouse.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_Warehouse.html"
@@ -85,7 +85,7 @@
, laydate = layui.laydate
var sWhere = "";
var option = [];
- var Organization = sessionStorage["OrganizationID"];
+ var Organization = sessionStorage["Organization"]
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
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/Xt_ORGANIZATIONSList.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/Xt_ORGANIZATIONSList.html"
index dbc04db..6a81bf5 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/Xt_ORGANIZATIONSList.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/Xt_ORGANIZATIONSList.html"
@@ -80,7 +80,7 @@
, laypage = layui.laypage
, laydate = layui.laydate
var sWhere = "";
- var Organization = sessionStorage["OrganizationID"];
+ var Organization = sessionStorage["Organization"]
//鍒濆鍖栫晫闈�
set_ClearBill();
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
index 2c334bf..0e894d9 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
@@ -84,7 +84,7 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
- var Organization = sessionStorage["OrganizationID"];
+ var Organization = sessionStorage["Organization"]
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
index 524c6be..442c051 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
@@ -82,7 +82,7 @@
, laydate = layui.laydate
var sWhere = "";
var option = [];
- var Organization = sessionStorage["OrganizationID"];
+ var Organization = sessionStorage["Organization"]
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
--
Gitblit v1.9.1