From 53d1f6c4020ed3b4d16d7dc96ccc567231977703 Mon Sep 17 00:00:00 2001
From: 仲国强 <519541279@qq.com>
Date: 星期三, 08 九月 2021 15:54:27 +0800
Subject: [PATCH] 恢复工序进站单列表
---
WebTM/views/车间管理/工序进站接收单/Cj_StationInBillList.html | 173 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 145 insertions(+), 28 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
index 9cf037a..dc79240 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
@@ -63,6 +63,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;">
+ <input type="text" class="layui-input" name="HWorkBillNo" id="HWorkBillNo">
+ </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="HBillNo" id="HBillNo">
+ </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="宸ュ簭娴佽浆鍗″彿">
@@ -77,12 +89,12 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>-->
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-FirstPieceCheck" id="btn-FirstPieceCheck">棣栨</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="btn-Cell"><i class="layui-icon layui-icon-ok"></i>淇濆瓨鍒楀</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="btn-RefreshCell"><i class="layui-icon layui-icon-refresh"></i>榛樿鍒楀</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="btn-Cell"><i class="layui-icon layui-icon-ok"></i>淇濆瓨鍒楀</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="btn-RefreshCell"><i class="layui-icon layui-icon-refresh"></i>榛樿鍒楀</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit" id="btn-Exit">閫�鍑�</button>
</div>
</script>
@@ -127,6 +139,40 @@
get_FastQuery();
});
+ //鐢熶骇璁㈠崟鍥炶溅鏂规硶
+ $('#HWorkBillNo').on('keydown', function (event) {
+ var HWorkBillNo = $('#HWorkBillNo').val();
+ if (event.keyCode == 13) {
+ if (!HWorkBillNo) {
+ layer.msg("浠诲姟鍗曞彿涓嶈兘涓虹┖锛�")
+ return;
+ }
+ $("#btnSearch").click();
+ }
+ });
+ //鍗曟嵁鍙峰洖杞︽柟娉�
+ $('#HBillNo').on('keydown', function (event) {
+ var HBillNo = $('#HBillNo').val();
+ if (event.keyCode == 13) {
+ if (!HBillNo) {
+ layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌猴紒")
+ return;
+ }
+ $("#btnSearch").click();
+ }
+ });
+ //宸ュ簭娴佽浆鍗″洖杞︽柟娉�
+ $('#宸ュ簭娴佽浆鍗″彿').on('keydown', function (event) {
+ var HStepBillNo = $('#宸ュ簭娴佽浆鍗″彿').val();
+ if (event.keyCode == 13) {
+ if (!HStepBillNo) {
+ layer.msg("宸ュ簭娴佽浆鍗″彿涓嶈兘涓虹┖锛�")
+ return;
+ }
+ $("#btnSearch").click();
+ }
+ });
+
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
@@ -137,13 +183,13 @@
case 'btn-Edit': set_ShowBill();
break;
//鍒犻櫎
- case 'btn-Delete': layer.msg('鍒犻櫎');
+ case 'btn-Delete': btn_Delete();
break;
//瀹℃牳
case 'btn-Audit': set_CheckBill();
break;
//鍙嶅鏍�
- case 'btn-DeAudit': layer.msg('鍙嶅鏍革紒');
+ case 'btn-DeAudit': set_AbandonCheck();
break;
//棣栨
case 'btn-FirstPieceCheck': set_FirstPieceCheck();
@@ -164,7 +210,7 @@
});
- //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
//#region缂栬緫鍓嶅垽鏂�
function set_ShowBillJudge(data) {
@@ -211,14 +257,14 @@
}
//#endregion
- //#endregion
+ //#endregion
//鍔熻兘鎸夐挳鏄惁绂佺敤鏂规硶锛屾瘡娆″姞杞借〃鏍奸兘瑕佽皟鐢�
function btnIs() {
//$('#btn-Add').addClass("layui-btn-disabled").attr("disabled", true);//鏂板鎸夐挳
- $('#btn-Delete').addClass("layui-btn-disabled").attr("disabled", true);//鍒犻櫎鎸夐挳
- $('#btn-Audit').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳
- $('#btn-DeAudit').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽�
+ //$('#btn-Delete').addClass("layui-btn-disabled").attr("disabled", true);//鍒犻櫎鎸夐挳
+ //$('#btn-Audit').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳
+ //$('#btn-DeAudit').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽�
$('#btn-Print').addClass("layui-btn-disabled").attr("disabled", true);//棰勮鎸夐挳
$('#btn-Cell').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍒楀鎸夐挳
$('#btn-RefreshCell').addClass("layui-btn-disabled").attr("disabled", true);//榛樿鍒楀鎸夐挳
@@ -239,15 +285,15 @@
, cols: [[
{ type: 'checkbox', fixed: 'left' }
, { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
- , { field: '浠诲姟鍗�', title: '浠诲姟鍗�' }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
- , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿' }
+ , { field: '浠诲姟鍗�', title: '浠诲姟鍗�', width: 125 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 190 }
+ , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 125 }
, { field: 'HProcID', title: 'HProcID', hide: true }
- , { field: '褰撳墠宸ュ簭浠ｇ爜', title: '褰撳墠宸ュ簭浠ｇ爜' }
+ , { field: '褰撳墠宸ュ簭浠ｇ爜', title: '褰撳墠宸ュ簭浠ｇ爜', width: 125 }
, { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭' }
, { field: 'HMaterID', title: 'HMaterID', hide: true }
, { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 125 }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
, {
field: '杩涚珯鏃堕棿', title: '杩涚珯鏃堕棿', width: 105, templet: function (d) {
@@ -258,13 +304,14 @@
}
}
, { field: 'HEmpID', title: 'HEmpID', hide: true }
- , { field: '鎿嶄綔鍛樹唬鐮�', title: '鎿嶄綔鍛樹唬鐮�' }
+ , { field: '鎿嶄綔鍛樹唬鐮�', title: '鎿嶄綔鍛樹唬鐮�', width: 125 }
, { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�' }
, { field: 'HSourceID', title: 'HSourceID', hide: true }
- , { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜' }
+ , { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜', width: 125 }
, { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮' }
, { field: 'HGroupID', title: 'HGroupID', hide: true }
- , { field: '鐢熶骇鐝粍浠ｇ爜', title: '鐢熶骇鐝粍浠ｇ爜' }
+ , { field: '鐢熶骇鐝粍浠ｇ爜', title: '鐢熶骇鐝粍浠ｇ爜', width: 125 }
+ , { field: '鐢熶骇鐝粍浠ｇ爜', title: '鐢熶骇鐝粍浠ｇ爜', width: 125 }
, { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍' }
, { field: 'LOT鏁伴噺', title: 'LOT鏁伴噺' }
, { field: '鎺ユ敹鏁伴噺', title: '鎺ユ敹鏁伴噺' }
@@ -305,6 +352,8 @@
function get_FastQuery() {
var HStatus = $("select[name='HStatus']").val();//鐘舵��
var 宸ュ簭娴佽浆鍗″彿 = $("#宸ュ簭娴佽浆鍗″彿").val();
+ var HWorkBillNo = $("#HWorkBillNo").val(); //浠诲姟鍗曞彿
+ var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
if (宸ュ簭娴佽浆鍗″彿) {
@@ -315,6 +364,12 @@
}
if (HEndDate) {
sWhere += " and CONVERT(varchar(100),杩涚珯鏃堕棿, 23) <= '" + HEndDate + "'";
+ }
+ if (HWorkBillNo) {
+ sWhere += " and 浠诲姟鍗� like '%" + HWorkBillNo + "%'";
+ }
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
if (HStatus) {
switch (HStatus) {
@@ -338,6 +393,8 @@
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
+ $("#HWorkBillNo").val();
+ $("#HBillNo").val("");
$("#宸ュ簭娴佽浆鍗″彿").val("");
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
@@ -348,10 +405,40 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- //缂栬緫鍓嶅垽鏂�
- //set_ShowBillJudge(data);
//鎵撳紑缂栬緫椤甸潰
set_ShowBill_open(data);
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+
+ //鍒犻櫎鍗曟嵁
+ function btn_Delete() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.confirm('纭畾鍒犻櫎' + data[0].鍗曟嵁鍙� + '鍚楋紵', function (index) {
+ var ajaxLoad = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/Cj_StationInBill/del_StationInBill',
+ type: "GET",
+ data: { "HInterID": data[0].HInterID, "HDeleteMan": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ get_FastQuery();
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ layer.close(index);
+ });
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
@@ -366,7 +453,7 @@
, shade: 0.6
, maxmin: false
, anim: 0
- , content: ['Cj_StationInBill.html?OperationType=' + 1 + '&linterid=' + 0 +'&HBillNo'+0, 'yes']
+ , content: ['Cj_StationInBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=0&closeType=1', 'yes']
, resize: false
, cancel: function () {
btnIs();
@@ -391,12 +478,12 @@
, shade: 0.6
, maxmin: false
, anim: 0
- , content: ['../../璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=' + 3790, 'yes']
+ , content: ['../../璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3790&HICMOEntryID=0', 'yes']
, resize: false
, cancel: function () {
btnIs();
}
- ,end: function () {
+ , end: function () {
get_FastQuery(table, option);
}
})
@@ -407,7 +494,7 @@
//閫�鍑�
function get_Exit() {
- parent.layui.admin.events.closeThisTabs();
+ Pub_Close(2);
}
//瀹℃牳
@@ -423,7 +510,7 @@
url: GetWEBURL() + "/Cj_StationInBill/set_CheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
- if (result.count == 0) {
+ if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
get_FastQuery(table, option);
} else {
@@ -441,6 +528,36 @@
}
}
+ //鍙嶅鏍�
+ function set_AbandonCheck() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ var wait = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cj_StationInBill/set_AbandonCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 });
+ get_FastQuery(table, option);
+ } else {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ layer.close(wait);
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
//浠ヤ笂鏄痩ayui妯″潡
});
@@ -451,4 +568,4 @@
</script>
</body>
-</html>
+</html>
\ No newline at end of file
--
Gitblit v1.9.1