From e6a12ca0cef42a0ec3b7dd6f11a210578291833b Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 30 五月 2025 14:03:35 +0800
Subject: [PATCH] 器具状态：维护页面过滤条件设置为 代码、名称、组织
---
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user | 2
WebTM/views/基础资料/基础资料/Gy_MouldStatus.html | 60 ++++++++++++++++++++++++-----
2 files changed, 50 insertions(+), 12 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
index c534235..6b87012 100644
--- a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
@@ -4081,7 +4081,7 @@
<publishTime>03/18/2025 09:33:56</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_MouldStatus.html">
- <publishTime>05/30/2025 13:47:14</publishTime>
+ <publishTime>05/30/2025 13:58:11</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_MouldStatusEdit.html">
<publishTime>04/11/2023 16:34:43</publishTime>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldStatus.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldStatus.html"
index 97d10bb..2bd3c79 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldStatus.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldStatus.html"
@@ -31,15 +31,18 @@
</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="HUseFlag" id="HUseFlag" lay-filter="HUseFlag">
- <option value="鏈娴�">鏈娴�</option>
- <option value="鏈娇鐢�" selected>鏈娇鐢�</option>
- <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
+ <label class="layui-form-label">鍚嶇О</label>
+ <div class="layui-input-block">
+ <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 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>
@@ -266,6 +269,8 @@
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
+ Organ();
+
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
@@ -290,7 +295,7 @@
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
$("#HNumber").val("");
- $("#HUseFlag").val("鏈娇鐢�");
+ $("#HName").val("");
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
@@ -389,7 +394,8 @@
//#region 蹇�熻繃婊�
function get_FastQuery() {
var HNumber = $("#HNumber").val();
- var HUseFlag = $("#HUseFlag").val();
+ var HName = $("#HName").val();
+ var HUSEORGID = $("#HUSEORGID").val();
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
@@ -466,8 +472,12 @@
if (HNumber) {
sWhere += " and 浠ｇ爜 like '%" + HNumber + "%'";
}
- if (HUseFlag) {
- sWhere += " and 浣跨敤鐘舵�� like '%" + HUseFlag + "%'";
+ if (HName) {
+ sWhere += " and 鍚嶇О like '%" + HName + "%'";
+ }
+
+ if (HUSEORGID != "0") {
+ sWhere += " and HUSEORGID = " + HUSEORGID;
}
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -715,6 +725,34 @@
}
//#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
+
//#region 鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
var Organization = '<option value="0" selected="selected" ></option>';
--
Gitblit v1.9.1