From 3a6caf8b267195622748f0aa7b591597c5c78dc8 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 30 十月 2024 16:44:20 +0800
Subject: [PATCH] 工艺路线相关页面跳转，pda班组页面bug修复
---
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 39 +++++++++++++++++++++++++++------------
WebTM/views/Baseset/基础资料/Gy_GetProductionTeamList.html | 3 ++-
WebTM/views/计划管理/工艺路线/Gy_RoutingBillCheckQuery.html | 2 +-
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html | 5 +++--
4 files changed, 33 insertions(+), 16 deletions(-)
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_GetProductionTeamList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_GetProductionTeamList.html"
index 5e8e3b1..3252ad9 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_GetProductionTeamList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_GetProductionTeamList.html"
@@ -81,7 +81,6 @@
}
parent.layer.close(index);
});
- RoadQuery($('#Value').val());
table.render({
elem: '#mainTable'
// , url: '/demo/table/user/'
@@ -97,6 +96,8 @@
, limits: [50, 500, 5000, 50000],
limit: 50
});
+ RoadQuery($('#Value').val());
+
///鍔犺浇鏄剧ず鏁版嵁
function RoadQuery(Where) {
var Value = " and HUSEORGID = " + sessionStorage["OrganizationID"] + "";
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
index 215f3b1..cc7e971 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
@@ -321,7 +321,7 @@
$("#HSourceBillNo").val("");
$("#HMaterNumber").val("");
sWhere = "";
- get_Display(sWhere);
+ get_DisplayPage(sWhere);
break;
//浣滃簾鎸夐挳
@@ -607,7 +607,8 @@
//do something
page = obj.curr;
size = obj.limit;
- get_DisplayPage("");
+ // 鍋囪鎸夐挳鏈変竴涓狪D涓�"myButton"
+ $("#btnSearch").trigger("click");
}
}
}
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_RoutingBill.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_RoutingBill.html"
index 60ed9ee..48893ae 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_RoutingBill.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_RoutingBill.html"
@@ -98,7 +98,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">宸ヨ壓璺嚎鍚嶇О<label style="color:red"> * </label></label>
+ <label class="layui-form-label" style="width: 90px;">宸ヨ壓璺嚎鍚嶇О*</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" lay-verify="HName" name="HName" id="HName">
</div>
@@ -108,7 +108,7 @@
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧浠ｇ爜*</label>
- <div class="layui-input-block" style="margin-left: 77px;">
+ <div class="layui-input-block" style="margin-left: 83px;">
<input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -133,7 +133,7 @@
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璁￠噺鍗曚綅*</label>
- <div class="layui-input-block" style="margin-left: 77px;">
+ <div class="layui-input-block" style="margin-left: 83px;">
<input type="text" class="layui-input" name="HUnitName" lay-verify="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HUnitID" id="HUnitID" lay-verify="HUnitID" value="0">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnUnit" id="btnUnit" style="padding: 0 10px;float: right;margin-right: 3px;">
@@ -151,11 +151,19 @@
</div>
</div>
<div class="layui-inline">
- <div class="layui-input-block" style="margin-left: 96px;">
+ <div class="layui-input-block" style="margin-left: 0px;">
<input type="checkbox" name="checkboxHStandard" id="checkboxHStandard" lay-skin="primary" lay-filter="checkboxHStandard" checked title="鏄惁榛樿宸ヨ壓">
<input type="hidden" value="true" name="HStandard" id="HStandard" lay-verify="HStandard">
<!--<input type="checkbox" name="checkboxHUseFlag" id="checkboxHUseFlag" title="鏄惁鍚敤" lay-skin="primary" lay-filter="checkboxHUseFlag">
<input type="hidden" value="false" name="HUseFlag" id="HUseFlag">-->
+ </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: 501px;">
+ <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
</div>
</div>
</div>
@@ -173,13 +181,20 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">寮�濮嬫棩鏈�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 80px;">
+ <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 20px;">
</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="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 80px;">
+ </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="hidden" class="layui-input" name="HMaker" id="HMaker" lay-verify="HMaker" value="">
+ <input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style=" width: 500px;">
</div>
</div>
<!--<div class="layui-inline">
@@ -248,26 +263,26 @@
</div>-->
</div>
<div class="layui-row">
- <div class="layui-inline">
+ <!--<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">澶囨敞</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="hidden" class="layui-input" name="HMaker" id="HMaker" lay-verify="HMaker" value="">
<input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style=" width: 500px;">
</div>
- </div>
+ </div>-->
</div>
<div class="layui-row">
- <div class="layui-inline">
+ <!--<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">缁勭粐*</label>
<div class="layui-input-block" style="margin-left: 120px; width: 501px;">
- <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
+ <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">-->
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
+ <!--</select>
</div>
- </div>
+ </div>-->
</div>
</div>
</div>
@@ -573,7 +588,7 @@
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
, totalRow: true
//, cellMinWidth: 120
- , height: 400
+ , height: 450
, cols: [[ //琛ㄥご
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', field: '搴忓彿', title: '搴忓彿', totalRow: true }
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_RoutingBillCheckQuery.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_RoutingBillCheckQuery.html"
index 6743298..971a2eb 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_RoutingBillCheckQuery.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_RoutingBillCheckQuery.html"
@@ -493,7 +493,7 @@
var url = "";
var user = sessionStorage["HUserName"];
if (type == 1) {
- var sWhere = "and 鍒跺崟浜� = '" + user + "'"
+ var sWhere = "and 鍒跺崟浜� = '" + user + "'" + " and 宸ュ簭浠ｇ爜 != '9999' and HBillSubType<>'SUB'"
url = '/LEMS/MES_Gy_RoutingBillList_Json';
userData = { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": "3301" };
--
Gitblit v1.9.1