From 6a3e09aa635b91cf4c0637f9acef7b897f4f1c99 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期四, 15 九月 2022 15:03:16 +0800
Subject: [PATCH] 修改了器具清单功能
---
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 10 +++++-----
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 25 +++++++++++++------------
2 files changed, 18 insertions(+), 17 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index 9708928..f13a049 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -969,7 +969,7 @@
$("#HEmpNumber").val(data1.data[0].HNumber);
$("#HEmpName").val(data1.data[0].HName);
$("#HEmpID").val(data1.data[0].HItemID);
- layer.alert($("#HEmpID").val());
+ //layer.alert($("#HEmpID").val());
}
else {
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -993,7 +993,7 @@
$("#HEmpNumber2").val(data1.data[0].HNumber);
$("#HEmpName2").val(data1.data[0].HName);
$("#HEmpID2").val(data1.data[0].HItemID);
- layer.alert($("#HEmpID2").val());
+ //layer.alert($("#HEmpID2").val());
}
else {
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -1016,7 +1016,7 @@
$("#HEmpNumber3").val(data1.data[0].HNumber);
$("#HEmpName3").val(data1.data[0].HName);
$("#HEmpID3").val(data1.data[0].HItemID);
- layer.alert($("#HEmpID3").val());
+ //layer.alert($("#HEmpID3").val());
}
else {
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -1039,7 +1039,7 @@
$("#HEmpNumber4").val(data1.data[0].HNumber);
$("#HEmpName4").val(data1.data[0].HName);
$("#HEmpID4").val(data1.data[0].HItemID);
- layer.alert($("#HEmpID4").val());
+ //layer.alert($("#HEmpID4").val());
}
else {
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -1062,7 +1062,7 @@
$("#HEmpNumber5").val(data1.data[0].HNumber);
$("#HEmpName5").val(data1.data[0].HName);
$("#HEmpID5").val(data1.data[0].HItemID);
- layer.alert($("#HEmpID5").val());
+ //layer.alert($("#HEmpID5").val());
}
else {
layer.alert(data1.code + data1.Message, { icon: 5 });
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index e06070a..e66b69e 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -94,6 +94,9 @@
</div>
</div>
</div>
+ <!--<div class="layui-tab-item layui-show">-->
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <!--</div>-->
<!--<table class="" id="mainTable" lay-filter="mainTable"></table>
<table class="" id="mainTable2" lay-filter="mainTable2"></table>-->
<div class="layui-tab layui-tab-card">
@@ -104,13 +107,10 @@
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
- </div>
- <div class="layui-tab-item layui-show">
- <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+ <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
</div>
<div class="layui-tab-item">
- <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
+ <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
</div>
</div>
</div>
@@ -236,6 +236,7 @@
set_InitGrid();
//鍒濆鍖栦粠琛ㄥ垪琛�
set_InitGrid2();
+ table.render(option2);
//鏌ヨ
get_FastQuery();
}
@@ -339,26 +340,26 @@
}
});
DisPlay_HideColumn_Sec();
- set_ClearBill(HMainID); //鍣ㄥ叿娓呭崟
+ set_ClearBillHMainID(HMainID); //鍣ㄥ叿娓呭崟
});
//#endregion
- function set_ClearBill(HMainID) {
+ function set_ClearBillHMainID(HMainID) {
resultTableHead = []; //娓呯┖琛ㄥご鍒楋紝闃叉閲嶅娓叉煋
//鍒濆鏌ヨ
- get_Display(HMainID);
+ get_DisplayHMainID(HMainID);
}
//#endregion
//#region 鏌ヨ
- function get_Display(HMainID) {
+ function get_DisplayHMainID(HMainID) {
var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + '/Sc_ProcessExchangeBillList/QJQD',
type: "GET",
- data: { "HMainID": HMainID },
+ data: { "HProcExchHinteID": HMainID },
success: function (data1) {
if (data1.count == 1) {
var data = [];
@@ -366,7 +367,7 @@
for (var key in data1.list) {
data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
}
-
+ var col = [];
for (var i = 0; i < data.length; i++) {
if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
@@ -552,7 +553,7 @@
, { field: '涓嶈壇鍝佸叧鑱旀暟閲�', title: '涓嶈壇鍝佸叧鑱旀暟閲�' }
]]
};
- table.render(option2);
+
}
//#region 鏌ヨ
function get_Display(sWhere) {
--
Gitblit v1.9.1