From 3b4c230bbd4673f5b826bc01d52f84d38bc732c8 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 08 二月 2023 11:32:28 +0800
Subject: [PATCH] 日计划维护
---
WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillList.html | 12 +
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatFormImport.html | 1
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 88 +++++++++-----
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 82 ++++++++++++-
WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillEdit.html | 1
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 117 ++++++++++++++----
6 files changed, 231 insertions(+), 70 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
index 19c0454..2de678f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
@@ -938,6 +938,7 @@
$.ajax({
type: "get",
url: GetWEBURL() + "/Web/GetOrganizations",
+ async: false,
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
index 8b034b0..b77ef26 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
@@ -391,19 +391,21 @@
function set_DeleteBill() {
var CheckStatus = table.checkStatus("mainTable");
- if (CheckStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!")
+ if (CheckStatus.data.length == 0) {
+ return layer.msg("璇烽�夋嫨鏁版嵁!")
} else {
layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
btn: ['纭畾', '鍙栨秷'] //鎸夐挳
, btn1: function () {
- var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
- var HEntryID = CheckStatus.data[0].hsubid; //鑾峰彇绗嚑鏉″瓙鏁版嵁
+ var HInterID = [];
+ for (var i = 0; i < CheckStatus.data.length; i++) {
+ HInterID.push(CheckStatus.data[i].hmainid + "_" + CheckStatus.data[i].hsubid)
+ }
$.ajax({
url: GetWEBURL() + '/Sc_WorkBillSortBill/DelWorkBillSortBillList'
, type: "GET"
- , data: { "HInterID": HInterID, "HEntryID": HEntryID, "User": sessionStorage["HUserName"] }
+ , data: { "HInterID": HInterID.toString(), DataType: "1", "User": sessionStorage["HUserName"] }
, success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
index ea78ace..ba3dcba 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
@@ -148,6 +148,10 @@
</div>
</body>
</html>
+<script type="text/html" id="barDemo">
+ <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
<script>
var treeCkData = { id: 0 };
var TagId = "";
@@ -244,6 +248,10 @@
case 'set_HideColumn':
get_HideColumn();
break;
+ //鍒犻櫎琛�
+ case 'set_DeleteBill':
+ set_DeleteBill();
+ break;
}
});
@@ -296,6 +304,7 @@
//琛屽唴浜嬩欢
table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
});
@@ -531,6 +540,7 @@
columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150 });//0
columns.push({ field: '璁㈠崟鍙帓鏁伴噺', title: '璁㈠崟鍙帓鏁伴噺', width: 150 });
columns.push({ field: '鏈叆搴撴暟閲�', title: '鏈叆搴撴暟閲�', width: 150 });//0
+ columns.push({ fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' });
option = {
elem: '#mainTable'
@@ -894,14 +904,15 @@
}
//鑾峰彇鏁版嵁
var hmainid = [];
- var HEntryID = [];
+ //var HEntryID = [];
for (var i = 0; i < checkStatus.data.length; i++) {
- hmainid.push(checkStatus.data[i]["hmainid"]);
- HEntryID.push(checkStatus.data[i]["HEntryID"]);
+ if ($.inArray(checkStatus.data[i]["hmainid"] + '_' + checkStatus.data[i]["HEntryID"], hmainid)==-1) {
+ hmainid.push(checkStatus.data[i]["hmainid"] + '_' + checkStatus.data[i]["HEntryID"]);
+ }
}
//鏌ヨ鐢熶骇璁㈠崟
- SelectICMOBill(hmainid, HEntryID);
+ SelectICMOBill(hmainid);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -910,12 +921,12 @@
}
//鏌ヨ鐢熶骇璁㈠崟
- function SelectICMOBill(hmainid, HEntryID) {
+ function SelectICMOBill(hmainid) {
var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_ICMOBillList',
type: "GET",
- data: { "hmainid": hmainid.toString(), "HEntryID": HEntryID.toString() },
+ data: { "hmainid": hmainid.toString() },
success: function (data1) {
if (data1.count == 1) {
var dataPush = [];
@@ -954,6 +965,65 @@
});
}
+ //琛屽唴鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ obj.del();
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ //table.reload(option);
+ layer.close(index);
+ }
+ });
+ }
+ }
+
+ //鍒犻櫎琛�
+ function set_DeleteBill() {
+ var CheckStatus = table.checkStatus("mainTable");
+
+ if (CheckStatus.data.length == 0) {
+ return layer.msg("璇烽�夋嫨鏁版嵁!")
+ } else {
+ layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , btn1: function () {
+ var HInterID = [];
+ for (var i = 0; i < CheckStatus.data.length; i++) {
+ HInterID.push(CheckStatus.data[i].hmainid); //鑾峰彇缂栧彿
+ }
+
+ $.ajax({
+ url: GetWEBURL() + '/Sc_WorkBillSortBill/DelWorkBillSortBillList'
+ , type: "GET"
+ , data: { "HInterID": HInterID.toString(), DataType: "2", "User": sessionStorage["HUserName"] }
+ , success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ ////閲嶈浇tree
+ //tree.reload('treeDepartment', {});
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }
+ })
+ }
+ })
+ }
+ }
+
//淇濆瓨
function set_AddNew(data) {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html"
index 8f0da1c..5042bcf 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html"
@@ -240,6 +240,7 @@
columns.push({ field: '鎬婚綈濂楁暟閲�', title: '鎬婚綈濂楁暟閲�', width: 200 });
columns.push({ field: 'ICMOBillHInterID', title: 'ICMOBillHInterID', hide: true});
columns.push({ field: 'ICMOBillHEntryID', title: 'ICMOBillHEntryID', hide: true });
+ columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
for (var i = 0; i <= (SumMonth - dd); i++) {
columns.push({ field: Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (dd + i), 'MM.dd'), edit: 'text', width:60 })
}
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 2c80c1f..bb3d2df 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"
@@ -290,13 +290,13 @@
<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" name="" id="" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="hmakers" id="hmakers" style="background-color:#efefef4d;" readonly>
</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" name="" id="" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="hchecker" id="hchecker" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
@@ -310,13 +310,13 @@
<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" name="" id="" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="hmakedate" id="hmakedate" style="background-color:#efefef4d;" readonly>
</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" name="" id="" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="hcheckdate" id="hcheckdate" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
@@ -336,13 +336,13 @@
<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" name="" id="" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="hupdater" id="hupdater" style="background-color:#efefef4d;" readonly>
</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" name="" id="" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="hdeleteman" id="hdeleteman" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -356,13 +356,13 @@
<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" name="" id="" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="hupdatedate" id="hupdatedate" style="background-color:#efefef4d;" readonly>
</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" name="" id="" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="hdeletedate" id="hdeletedate" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -407,14 +407,14 @@
<!--澶嶉�夋 涓嬮亾娴佽浆宸ュ簭-->
<script type="text/html" id="HNextProcFlag">
<div class="layui-input-block" style="margin-left: 20px;">
- <input type="checkbox" name="HNextProcFlag" lay-filter="HNextProcFlag" id="HNextProcFlag{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+ <input type="checkbox" name="HNextProcFlag" disabled="disabled" lay-filter="HNextProcFlag" id="HNextProcFlag{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
</div>
</script>
<!--澶嶉�夋 娴佽浆宸ュ簭-->
<script type="text/html" id="HFlowProc">
<div class="layui-input-block" style="margin-left: 20px;">
- <input type="checkbox" name="HFlowProc" lay-filter="HFlowProc" id="HFlowProc{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+ <input type="checkbox" name="HFlowProc" disabled="disabled" lay-filter="HFlowProc" id="HFlowProc{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
</div>
</script>
@@ -485,7 +485,7 @@
, { field: 'HProcID_S', title: '宸ユ', edit: 'text' }
, { field: 'HProcType', title: '宸ュ簭绫诲瀷', templet: '#HProcType' }//閫夋嫨
, { field: 'HCenterID_SName', title: '浜х嚎涓績', edit: 'text', event: "CheckHCenterID_S" }//f7
- //, { field: 'HCenterID_S', title: '浜х嚎涓績id', hide: true }//hide: true
+ , { field: 'HCenterID_S', title: '浜х嚎涓績id', hide: true }//hide: true
, { field: 'HWorkQty_S', title: '浜х嚎浜ц兘', edit: 'text' }
, { field: 'HSubStdEmpQty_S', title: '浜х嚎浜烘暟', edit: 'text' }
, { field: 'HMouldNo', title: '妯″叿缂栧彿', edit: 'text' }
@@ -496,11 +496,11 @@
, { field: 'HMyWorkDays', title: '鐢熶骇鍛ㄦ湡', edit: 'text' }
, { field: 'HMyFixWorkDays', title: '鍥哄畾鐢熶骇澶╂暟', edit: 'text' }
, { field: '宸ュ簭', title: '宸ュ簭', edit: 'text', event: "CheckHProcID" }//f7
- //, { field: 'HProcID', title: '宸ュ簭ID', hide: true }//, hide: true
+ , { field: 'HProcID', title: '宸ュ簭ID', hide: true }//, hide: true
, { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜' }//涓嶅～
- //, { field: 'HCenterID', title: '宸ヤ綔涓績id', hide: true }//, hide: true
+ , { field: 'HCenterID', title: '宸ヤ綔涓績id', hide: true }//, hide: true
, { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績', edit: 'text', event: "CheckHCenterID" }//f7
- //, { field: 'HSupID', title: '渚涘簲鍟咺D', hide: true }
+ , { field: 'HSupID', title: '渚涘簲鍟咺D', hide: true }
, { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
, { field: '渚涘簲鍟�', title: '渚涘簲鍟�', edit: 'text', width: 110, event: "CheckHSupID" }//f7
, { field: 'HSupFlag', title: '澶栧崗鏍囪', templet: "#HSupFlag" }//checkbox
@@ -595,7 +595,7 @@
}
else if (OperationType == 2) {
//绂佺敤缁勭粐閫夐」
- $("#HOrgID").attr("disabled", true);
+ //$("#HOrgID").attr("disabled", true);
RoadBillMain(linterid);
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
@@ -851,6 +851,22 @@
});
+ //琛屽唴榧犳爣绂诲紑浜嬩欢
+ table.on('edit(mainTable)', function (obj) {
+ if (obj.field == "HProcNo") {
+ var num = 0;
+ for (var i = 0; i < option.data.length; i++) {
+ if (obj.value == option.data[i]["HProcNo"]) {
+ num += 1;
+ }
+ if (num > 1) {
+ layer.msg("娴佹按鍙�:" + obj.value + "閲嶅!");
+ return false;
+ }
+ }
+ }
+ })
+
$('#HName').on('keydown', function (event) {//宸ヨ壓璺嚎鍚嶇О
if (event.keyCode == 118) {
layer.msg("宸ヨ壓璺嚎鍚嶇ОF7鎸夐挳")
@@ -1079,6 +1095,8 @@
$("#HMaterName").val(checkStatus.data[0].HName);//鐗╂枡鍚嶇О
$("#HMaterNumber").val(checkStatus.data[0].HNumber);//鐗╂枡浠ｇ爜
$("#HMaterModel").val(checkStatus.data[0].HModel);//瑙勬牸鍨嬪彿
+ $("#HUnitID").val(checkStatus.data[0].HUnitID);//璁￠噺鍗曚綅id
+ $("#HUnitName").val(checkStatus.data[0].HUnitName);//璁￠噺鍗曚綅鍚嶇О
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1352,7 +1370,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../Baseset/鍩虹璧勬枡/Gy_SupplierList.html", "yes"]
+ , content: ["../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1364,9 +1382,9 @@
}
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- "渚涘簲鍟�": checkStatus.data[0].HName
+ "渚涘簲鍟�": checkStatus.data[0].渚涘簲鍟嗗悕绉�
, "HSupID": checkStatus.data[0].HItemID
- , "渚涘簲鍟嗕唬鐮�": checkStatus.data[0].HNumber
+ , "渚涘簲鍟嗕唬鐮�": checkStatus.data[0].渚涘簲鍟嗕唬鐮�
})
layer.close(index);//鍏抽棴寮圭獥
}
@@ -1396,6 +1414,9 @@
var IsHStopflag = d.data[0].榛樿宸ヨ壓;
if (IsHStopflag == 1) {
$("input[name='checkboxHStandard']").prop("checked", true);
+ }
+ else {
+ $("input[name='checkboxHStandard']").prop("checked", false);
}
//涓昏〃
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
@@ -1430,6 +1451,15 @@
, "HProductNum": d.data[0].鎴愬搧缂栧彿
, "HVerNum": d.data[0].鐗堟湰
, "HOrgID": d.data[0].HOrgID
+ //鍏朵粬淇℃伅
+ , "hmakers": d.data[0].鍒跺崟浜�
+ , "hmakedate": d.data[0].鍒跺崟鏃ユ湡==null?"":Format(new Date(d.data[0].鍒跺崟鏃ユ湡), "yyyy-MM-dd")
+ , "hchecker": d.data[0].瀹℃牳浜�
+ , "hcheckdate": d.data[0].瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(d.data[0].瀹℃牳鏃ユ湡), "yyyy-MM-dd")
+ , "hupdater": d.data[0].淇敼浜�
+ , "hupdatedate": d.data[0].淇敼鏃ユ湡 == null ? "" : Format(new Date(d.data[0].淇敼鏃ユ湡), "yyyy-MM-dd")
+ , "hdeleteman": d.data[0].浣滃簾浜�
+ , "hdeletedate": d.data[0].浣滃簾鏃ユ湡 == null ? "" :Format(new Date(d.data[0].浣滃簾鏃ユ湡), "yyyy-MM-dd")
});
//瀛愯〃 璧嬪��
@@ -1548,21 +1578,17 @@
// layer.msg("鐢熶骇鐝粍娌℃湁閫夋嫨");
// return false;
//}
+ var num = [];
+ for (var i = 0; i < option.data.length; i++) {
+ if ($.inArray(option.data[i]["HProcNo"], num) == -1) {
+ num.push(option.data[i]["HProcNo"]);
+ } else {
+ layer.msg("娴佹按鍙�:" + option.data[i]["HProcNo"] + "閲嶅!");
+ return false;
+ }
+ }
return true;
- //if ($("#HBillNo").val() == '') {
- // layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return false;
- //}
- //if ($("#HInterID").val() == '') {
- // layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return false;
- //}
- //if (typeof (sSubStr) == "undefined") {
- // layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return false;
- //}
-
}
//闅愯棌鍒楄缃�
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_RoutingBillList.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_RoutingBillList.html"
index 170f30d..0d1ebde 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_RoutingBillList.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_RoutingBillList.html"
@@ -35,9 +35,13 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
<div class="layui-inline">
@@ -56,30 +60,44 @@
<div class="layui-row" style="margin-top:10px;">
<!--鍏朵粬鏉′欢-->
<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;">
- <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </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;">
- <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
+ <label class="layui-form-label" style="width: 76px;">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 107px;">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
</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" name="HModel" id="HModel" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HModel" id="HModel">
</div>
</div>
</div>
- <div class="layui-row" style="margin: 10px 0 10px;">
-
+ <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
+ <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;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
@@ -93,10 +111,10 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
@@ -299,10 +317,12 @@
$("#HMaterNumber").val("");//鐗╂枡
$("#HModel").val("");//鐗╂枡
$("#HOrderProcNO").val("");//鍗曟嵁绫诲瀷
- $("#btnSearch").click();
- $("#HName").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
$("#HOrgID").val(sessionStorage["OrganizationID"]);
form.render('select');
+ $("#btnSearch").click();
sWhere = "";
}
//#endregion
@@ -329,8 +349,6 @@
}
$("#HMaterID").val(checkStatus.data[0].HItemID);
$("#HMaterName").val(checkStatus.data[0].HName);
- $("#HMaterNumber").val(checkStatus.data[0].HNumber);
- $("#HModel").val(checkStatus.data[0].HModel);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
})
@@ -350,6 +368,10 @@
option.data = data1.data;
table.render(option);
layer.close(ajaxLoad);
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
layer.close(ajaxLoad);
@@ -367,12 +389,37 @@
function get_FastQuery(number) {
var HOrgID = "";
var HOrderProcNO = $("#HOrderProcNO").val();//鍗曟嵁绫诲瀷
- var HMaterID = $("#HMaterID").val();
+ //var HMaterID = $("#HMaterID").val();
var HMaterName = $("#HMaterName").val();
var HMaterNumber = $("#HMaterNumber").val();
var HModel = $("#HModel").val();
- //var HName = $("#HName").val();
var WorkCenter = $("#WorkCenter").val();//鍗曟嵁鍙�
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName + " " + com;
+ }
+
if (number == 1) {
HOrgID = sessionStorage["OrganizationID"];
@@ -385,7 +432,7 @@
sWhere += " and 鍗曟嵁绫诲瀷 like '%" + HOrderProcNO + "%'";
}
if (HMaterName) {
- sWhere += "and HMaterID=" + HMaterID+" and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
+ sWhere += "and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
}
if (HMaterNumber) {
sWhere += "and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
@@ -636,6 +683,20 @@
}
})
}
+
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+ //#endregion
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
--
Gitblit v1.9.1