From a0b6700c9f35fcbaf31e150f0360bc315a27f5b1 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 27 五月 2025 14:33:07 +0800
Subject: [PATCH] 器具分类：维护页面 改成动态列。且字段设置为中文。过来条件增加组织下拉列表。
---
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user | 2
WebTM/views/基础资料/公用基础资料/Gy_MouldType.html | 110 +++++++++++++++++++++++++++++++++++++-----------------
2 files changed, 76 insertions(+), 36 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
index 915e045..5338de2 100644
--- a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
@@ -3545,7 +3545,7 @@
<publishTime>10/11/2024 11:32:36</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType.html">
- <publishTime>05/22/2025 11:29:06</publishTime>
+ <publishTime>05/27/2025 14:31:26</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType_Excel.html">
<publishTime>10/11/2024 11:32:36</publishTime>
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_MouldType.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_MouldType.html"
index 68d6e8e..8e7418a 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_MouldType.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_MouldType.html"
@@ -32,13 +32,12 @@
<span>鏇村</span>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
- </div>
- </div>
-
+ <!--<div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
+ </div>
+ </div>-->
<!--<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
@@ -57,6 +56,14 @@
<input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐<label style="color:red"> * </label></label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 300px;">
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </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>
@@ -70,7 +77,7 @@
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
</select>
</div>
</div>
@@ -332,12 +339,14 @@
function set_ClearBill() {
+ Organ();
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_Display(sWhere);
+ //get_Display(sWhere);
+ get_FastQuery();
ColFilter();
DisPlay_HideColumn();
get_DefaultModule();
@@ -378,7 +387,7 @@
var data = obj.data;
//鍗曟嵁鍙疯秴閾炬帴
- if (obj.event == '浠ｇ爜') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+ if (obj.event == '鍣ㄥ叿鍒嗙被浠ｇ爜') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
var hID = data.HItemID;
TagParentId = data.HParentID;
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
@@ -433,12 +442,10 @@
}
else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
- } else if (data[i].name == '鍗曟嵁鍙�') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
- } else if (data[i].name == 'HNumber') {
+ } else if (data[i].name == '鍣ㄥ叿鍒嗙被浠ｇ爜') {
col.push({
- field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '浠ｇ爜', templet: function (d) {
- return '<span style="color: blue;">' + d.HNumber + '</span>'
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍣ㄥ叿鍒嗙被浠ｇ爜', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍣ㄥ叿鍒嗙被浠ｇ爜 + '</span>'
}, style: 'cursor: pointer;'
});
}
@@ -457,23 +464,23 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- //, cols: [col]
- , cols: [[
- { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
- , { field: 'HItemID', title: 'HItemID', sort: true, hide: true, sort: true }
- , { field: 'HParentID', title: 'HParentID', sort: true, hide: true, sort: true }
- , {
- field: 'HNumber', title: '浠ｇ爜', width: 200, sort: true, event: '浠ｇ爜', templet: function (d) {
- return '<span style="color: blue;">' + d.HNumber + '</span>'
- }, style: 'cursor: pointer;'
- }
- , { field: 'HName', title: '鍚嶇О', width: 200, sort: true }
- , { field: 'HLevel', title: '绛夌骇', width: 200, sort: true }
- , { field: 'HEndFlag', title: '鏄庣粏鏍囪', width: 200, sort: true }
- , { field: 'HStopFlag', title: '绂佺敤鏍囪', width: 200, sort: true }
- , { field: 'HRemark', title: '澶囨敞', width: 200, sort: true }
- , { field: 'HUseFlag', title: '浣跨敤鏍囪', width: 200, sort: true }
- ]]
+ , cols: [col]
+ //, cols: [[
+ // { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
+ // , { field: 'HItemID', title: 'HItemID', sort: true, hide: true, sort: true }
+ // , { field: 'HParentID', title: 'HParentID', sort: true, hide: true, sort: true }
+ // , {
+ // field: 'HNumber', title: '浠ｇ爜', width: 200, sort: true, event: '浠ｇ爜', templet: function (d) {
+ // return '<span style="color: blue;">' + d.HNumber + '</span>'
+ // }, style: 'cursor: pointer;'
+ // }
+ // , { field: 'HName', title: '鍚嶇О', width: 200, sort: true }
+ // , { field: 'HLevel', title: '绛夌骇', width: 200, sort: true }
+ // , { field: 'HEndFlag', title: '鏄庣粏鏍囪', width: 200, sort: true }
+ // , { field: 'HStopFlag', title: '绂佺敤鏍囪', width: 200, sort: true }
+ // , { field: 'HRemark', title: '澶囨敞', width: 200, sort: true }
+ // , { field: 'HUseFlag', title: '浣跨敤鏍囪', width: 200, sort: true }
+ //]]
, data: data1.data
, height: 800
, page: true
@@ -489,7 +496,7 @@
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
- //DisPlay_HideColumn();
+
option.data = data1.data;
table.render(option);
layer.close(ajaxLoad);
@@ -592,6 +599,8 @@
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
+ var HUSEORGID = $("#HUSEORGID").val();
+
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
@@ -668,11 +677,16 @@
}
if (HNumber) {
- sWhere += " and HNumber like '%" + HNumber + "%'";
+ sWhere += " and 鍣ㄥ叿鍒嗙被浠ｇ爜 like '%" + HNumber + "%'";
}
if (HName) {
- sWhere += " and HName like '%" + HName + "%'";
+ sWhere += " and 鍣ㄥ叿鍒嗙被鍚嶇О like '%" + HName + "%'";
}
+
+ if (HUSEORGID != "0") {
+ sWhere += " and HUSEORGID = " + HUSEORGID;
+ }
+
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -968,6 +982,32 @@
}
//#endregion
+ //#region 鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ async: false,
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HUSEORGID").append(Organization);
+
+ var HOrgIDBar = sessionStorage["OrganizationID"];
+
+ $("#HUSEORGID").val(HOrgIDBar);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+ //#endregion
//淇敼鎸夐挳
function set_ShowBill() {
--
Gitblit v1.9.1