From 88c89393357a28a8793c7c1dcecc50891e2ba23b Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 14 八月 2024 09:14:24 +0800
Subject: [PATCH] 增加 项目 字段过滤功能(下拉框的方式,加载 现有 项目工程表里 前20位 ); 物料、工艺路线维护、工艺路线查询、产品工艺参数列表、生产订单维护、工序流转卡维护、首件检验单维护、 巡检单维护、工序转移检验单、库存检验单维护、车间自检单维护 并且
---
WebTM/views/计划管理/工艺路线/Gy_RoutingBillListQuery.html | 68 ++++++++++++++++++++++++++++-----
1 files changed, 57 insertions(+), 11 deletions(-)
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillListQuery.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillListQuery.html"
index 80cc532..bb44125 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillListQuery.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillListQuery.html"
@@ -65,18 +65,28 @@
</button>
</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="HOrgID" id="HOrgID" lay-verify="HOrgID">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
+ <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
+ <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="HOrgID" id="HOrgID" lay-verify="HOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
</div>
- </div>
- <button class="layui-btn layuiadmin-btn-order" type="button" style="display:none;" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px; display: none;">閲嶇疆</button>
+ <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="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" style="display:none;" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px; display: none;">閲嶇疆</button>
+ </div>
<div class="layui-row" style="margin-top:10px;margin-left:5%;">
<!--鍏朵粬鏉′欢-->
<div class="layui-inline">
@@ -390,8 +400,11 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
Organ();
+ //鏌ヨ椤圭洰鍙�
+ Get_HProject();
//鏌ヨ
get_FastQuery(1);
+
}
//#endregion
@@ -422,6 +435,7 @@
$("#HMaterNumber").val("");//鐗╂枡
$("#HModel").val("");//鐗╂枡
$("#HOrderProcNO").val("");//鍗曟嵁绫诲瀷
+ $("#HProject").val("");
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
@@ -454,6 +468,31 @@
form.render('select');
$("#HInitTimeCycle").val("29");
+ }
+ //#endregion
+
+ //#region 鑾峰彇椤圭洰鍙�
+ function Get_HProject() {
+ //鑾峰彇椤圭洰鍙�
+ var HProjectList = '<option value="0" style="color:red;" selected></option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Gy_Material/Get_HProject",
+ async: false,
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ HProjectList += '<option style="color:blue;" value="' + data[i].HName + '" >' + data[i].HName + '</option>';
+ }
+ $("#HProject").append(HProjectList);
+ form.render('select');
+
+ }
+ layer.closeAll("loading");
+ }
+ })
}
//#endregion
@@ -710,6 +749,7 @@
var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HOrgID = "";
+ var HProject = $("#HProject").val();
var HOrderProcNO = $("#HOrderProcNO").val();//鍗曟嵁绫诲瀷
//var HMaterID = $("#HMaterID").val();
var HMaterName = $("#HMaterName").val();
@@ -822,6 +862,12 @@
if (HOrgID) {
sWhere += " and HOrgID = '" + HOrgID + "'";
}
+ if (number==2) {
+ if (HProject) {
+ sWhere += " and 椤圭洰鍙� like '%" + HProject + "%'";
+ }
+ }
+
sWhere += " and HBillSubType<>'SUB' ";
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
--
Gitblit v1.9.1