From 187db2c9b74f4908b143f73874cf72e4b2bd03e1 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 29 十月 2024 10:09:15 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA.html | 345 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 266 insertions(+), 79 deletions(-)
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/MES_StationOutBill_PDA.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/MES_StationOutBill_PDA.html"
index 6b69e4b..252b3ee 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/MES_StationOutBill_PDA.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/MES_StationOutBill_PDA.html"
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>宸ュ簭鍑虹珯姹囨姤鍗�</title>
+ <title class="gxcz">宸ュ簭鍑虹珯姹囨姤鍗�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -101,7 +101,8 @@
th {
width: 70px;
- text-align: center;
+ text-align: left;
+ font-size: 17px;
}
</style>
</head>
@@ -112,12 +113,12 @@
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
<div style="background-color:#0085E8;">
- <span style="color: white;"><i class="layui-icon layui-icon-form"></i>宸ュ簭鍑虹珯姹囨姤鍗�</span>
+ <span style="color: white;" class="gxcz"><i class="layui-icon layui-icon-form"></i>宸ュ簭鍑虹珯姹囨姤鍗�</span>
</div>
<div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
- <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius">鏂板</button>
+ <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius" id="Add">鏂板</button>
<button type="button" lay-submit="" lay-filter="Detail" class="layui-btn layui-btn-radius" id="Detail">鏄庣粏</button>
- <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius">淇濆瓨</button>
+ <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius" id="Saver">淇濆瓨</button>
<button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
</div>
<div class="layui-form-item">
@@ -134,23 +135,49 @@
</td>
</tr>
<tr>
- <th>娴佹按鍙�</th>
+ <th>鎿嶄綔鍛�</th>
<td class="bz_td">
- <input type="text" name="HProcNo" class="layui-input" id="HProcNo" placeholder="璇烽�夋嫨娴佹按鍙峰悗鍥炶溅" style="border-radius: 50px;">
+ <input type="text" name="HEmpName_second" class="layui-input" id="HEmpName_second" placeholder="鎿嶄綔鍛樺鍚�" style="background-color:#efefef4d;border-radius: 50px;height:55px" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>瑙勬牸鍨嬪彿</th>
+ <td class="bz_td">
+ <input type="text" name="HMaterModel" class="layui-input" id="HMaterModel" placeholder="瑙勬牸鍨嬪彿" style="border-radius: 50px;background-color:#efefef4d;height:55px" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>浜у搧鍚嶇О</th>
+ <td class="bz_td">
+ <input type="text" name="HMaterName" class="layui-input" id="HMaterName" placeholder="浜у搧鍚嶇О" style="border-radius: 50px;background-color:#efefef4d;height:55px" readonly>
+ <input type="hidden" name="HMaterID" id="HMaterID" value="0" autocomplete="off" class="layui-input">
+ </td>
+ </tr>
+ <tr>
+ <th>褰撳墠宸ュ簭</th>
+ <td class="bz_td">
+ <input type="text" name="HProcName" class="layui-input" id="HProcName" placeholder="褰撳墠宸ュ簭" style="border-radius: 50px;background-color:#efefef4d;height:55px" readonly>
<input type="hidden" name="HProcID" id="HProcID" value="0" autocomplete="off" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="SerialNum-BT" id="SerialNum-BT" style="font-weight:bolder">...</button>
</td>
</tr>
<tr>
<th>鍚堟牸鏁伴噺</th>
<td class="bz_td">
- <input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="璇疯緭鍏ュ悎鏍兼暟閲�" style="border-radius: 50px;">
+ <input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="璇疯緭鍏ュ悎鏍兼暟閲�" style="border-radius: 50px;height:55px" onfocus="this.select();">
</td>
</tr>
<tr>
<th>鎶ュ簾鏁伴噺</th>
<td class="bz_td">
- <input type="text" name="HWasterQty" class="layui-input" id="HWasterQty" value="0" placeholder="璇疯緭鍏ユ姤搴熸暟閲�" style="border-radius: 50px;">
+ <input type="text" name="HWasterQty" class="layui-input" id="HWasterQty" value="0" placeholder="璇疯緭鍏ユ姤搴熸暟閲�" style="border-radius: 50px;height:55px" onfocus="this.select();">
+ </td>
+ </tr>
+ <tr>
+ <th>娴佹按鍙�</th>
+ <td class="bz_td">
+ <input type="text" name="HProcNo" class="layui-input" id="HProcNo" placeholder="璇烽�夋嫨娴佹按鍙峰悗鍥炶溅" style="border-radius: 50px;">
+ <input type="hidden" name="HProcID" id="HProcID" value="0" autocomplete="off" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="SerialNum-BT" id="SerialNum-BT" style="font-weight:bolder">...</button>
</td>
</tr>
<tr>
@@ -180,7 +207,8 @@
<tr>
<th>鎿嶄綔鍛�</th>
<td class="bz_td">
- <input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="鎿嶄綔鍛樹唬鐮�" autocomplete="off" class="layui-input" style="border-radius: 50px;" >
+ <input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="鎿嶄綔鍛樹唬鐮�" autocomplete="off" class="layui-input" style="border-radius: 50px;">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin_CZY" style="line-height: 30px;">纭畾</button>
</td>
<td class="bz_td">
<input type="text" name="HEmpName" class="layui-input" id="HEmpName" placeholder="閫夋嫨鎿嶄綔鍛�" style="background-color:#efefef4d;border-radius: 50px;" readonly>
@@ -197,16 +225,36 @@
</td>
</tr>
<tr>
- <th>鍗曟嵁鏃ユ湡</th>
- <td class="t1_input">
- <input type="text" name="HDate" class="layui-input" id="HDate" style="border-radius: 50px;" placeholder="璇烽�夋嫨鏃ユ湡">
+ <th>鏆傛斁鍖�</th>
+ <td class="bz_td">
+ <input type="text" name="HTemporaryAreaName" class="layui-input" id="HTemporaryAreaName" placeholder="閫夋嫨鏆傛斁鍖�" style="background-color:#efefef4d;border-radius: 50px;">
+ <input type="hidden" name="HTemporaryAreaID" id="HTemporaryAreaID" value="0" autocomplete="off" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="BtnHTemporaryAreaName" id="BtnHTemporaryAreaName" style="font-weight:bolder">...</button>
</td>
</tr>
<tr>
- <th>鍗曟嵁鍙�</th>
+ <th>娴佽浆鍗″彿</th>
<td class="bz_td">
- <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="鍗曟嵁鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
- <input type="hidden" name="HInterID" id="HInterID" value="0" autocomplete="off" class="layui-input">
+ <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HProcExchHinteID" id="HProcExchHinteID" autocomplete="off" class="layui-input">
+ </td>
+ </tr>
+ <tr>
+ <th>娴佽浆鍗℃暟閲�</th>
+ <td class="bz_td" readonly>
+ <input type="text" name="HPlanQty" class="layui-input" id="HPlanQty" value="0" placeholder="娴佽浆鍗℃暟閲�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>鏈嚭绔欐暟閲�</th>
+ <td class="bz_td">
+ <input type="text" name="NoOutboundHqty" class="layui-input" id="NoOutboundHqty" value="0" placeholder="鏈嚭绔欐暟閲�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>璁㈠崟鏁伴噺</th>
+ <td class="bz_td">
+ <input type="text" name="HICMOQty" class="layui-input" id="HICMOQty" value="0" placeholder="璁㈠崟鏁伴噺" style="border-radius: 50px;background-color:#efefef4d;" readonly>
</td>
</tr>
<tr>
@@ -236,48 +284,16 @@
</td>
</tr>
<tr>
- <th>浜у搧鍚嶇О</th>
+ <th>鍗曟嵁鍙�</th>
<td class="bz_td">
- <input type="text" name="HMaterName" class="layui-input" id="HMaterName" placeholder="浜у搧鍚嶇О" style="border-radius: 50px;background-color:#efefef4d;" readonly>
- <input type="hidden" name="HMaterID" id="HMaterID" value="0" autocomplete="off" class="layui-input">
+ <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="鍗曟嵁鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID" value="0" autocomplete="off" class="layui-input">
</td>
</tr>
<tr>
- <th>瑙勬牸鍨嬪彿</th>
- <td class="bz_td">
- <input type="text" name="HMaterModel" class="layui-input" id="HMaterModel" placeholder="瑙勬牸鍨嬪彿" style="border-radius: 50px;background-color:#efefef4d;" readonly>
- </td>
- </tr>
- <tr>
- <th>娴佽浆鍗″彿</th>
- <td class="bz_td">
- <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿" style="border-radius: 50px;background-color:#efefef4d;" readonly>
- <input type="hidden" name="HProcExchHinteID" id="HProcExchHinteID" autocomplete="off" class="layui-input">
- </td>
- </tr>
- <tr>
- <th>娴佽浆鍗℃暟閲�</th>
- <td class="bz_td" readonly>
- <input type="text" name="HPlanQty" class="layui-input" id="HPlanQty" value="0" placeholder="娴佽浆鍗℃暟閲�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
- </td>
- </tr>
- <tr>
- <th>鏈嚭绔欐暟閲�</th>
- <td class="bz_td">
- <input type="text" name="NoOutboundHqty" class="layui-input" id="NoOutboundHqty" value="0" placeholder="鏈嚭绔欐暟閲�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
- </td>
- </tr>
- <tr>
- <th>璁㈠崟鏁伴噺</th>
- <td class="bz_td">
- <input type="text" name="HICMOQty" class="layui-input" id="HICMOQty" value="0" placeholder="璁㈠崟鏁伴噺" style="border-radius: 50px;background-color:#efefef4d;" readonly>
- </td>
- </tr>
- <tr>
- <th>褰撳墠宸ュ簭</th>
- <td class="bz_td">
- <input type="text" name="HProcName" class="layui-input" id="HProcName" placeholder="褰撳墠宸ュ簭" style="border-radius: 50px;background-color:#efefef4d;" readonly>
- <input type="hidden" name="HProcID" id="HProcID" value="0" autocomplete="off" class="layui-input">
+ <th>鍗曟嵁鏃ユ湡</th>
+ <td class="t1_input">
+ <input type="text" name="HDate" class="layui-input" id="HDate" style="border-radius: 50px;" placeholder="璇烽�夋嫨鏃ユ湡">
</td>
</tr>
<tr>
@@ -362,6 +378,7 @@
</tbody>
</table>
</div>
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
</div>
<ul class="layui-tab-title">
<li class="layui-this">鍗曟嵁淇℃伅</li>
@@ -408,7 +425,7 @@
var FirstEndHProcNo = 0; // 榛樿0 棣栭亾宸ュ簭1 鏈亾宸ュ簭2
$('#Detail').addClass("layui-btn-disabled").attr("disabled", true);//绂佺敤鏄庣粏鎸夐挳
-
+ $("#Add").attr("style", "display:none;");//闅愯棌鏂板鎸夐挳
/*鍥哄畾浠ｇ爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
/* 1.鏃犳簮鍗曟柊澧�
* 2.鏈夋簮鍗曟柊澧�
@@ -446,7 +463,14 @@
txtHProcNo_KeyDown(HBarCode, sProcNo);
get_DisplayTech(HBillNo);
}
- } else {
+ } else if (params[params[0]] == "wgd") {
+ var OperationType = 5;
+ $(".gxcz").text("鎸囧紩鍗″畬宸ュ崟");
+
+ } else if (params[params[0]] == "czd") {
+ var OperationType = 1;
+
+ } else {
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
@@ -506,7 +530,7 @@
}
//鍒ゆ柇鏄惁鏂板
- if (OperationType == 1 || OperationType == 2) {
+ if (OperationType == 1 || OperationType == 2 || OperationType == 5) {
$("#HInterID").val("");
$("#HBillNo").val("");
//鑾峰彇鏈�澶у崟鎹彿
@@ -571,6 +595,9 @@
"HQCCheckName": data.HQCCheckName,
"HEmpID": data.HEmpID,
"HEmpName": data.HEmpName,
+ "HEmpName_second": data.HEmpName,
+ "HTemporaryAreaID": data.HTemporaryAreaID,
+ "HTemporaryAreaName": data.HTemporaryAreaName,
"HEmpID2": data.HEmpID2,
"HEmpName2": data.HEmpName2,
"HEmpID3": data.HEmpID3,
@@ -624,7 +651,8 @@
"HCenterName": data.宸ヤ綔涓績鍚嶇О,
"HEmpID": data.HEmpID,
"HEmpNumber": data.鎿嶄綔鍛樹唬鐮�,
- "HEmpName": data.鎿嶄綔鍛樺悕绉�
+ "HEmpName": data.鎿嶄綔鍛樺悕绉�,
+ "HEmpName_second": data.鎿嶄綔鍛樺悕绉�
});
layer.close(index);
}
@@ -705,6 +733,7 @@
"HCenterID": data.HCenterID,
"NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
});
+ $("#HProcNo").attr('disabled', 'disabled');
HProcExchBillNoFlag = true;
break;
case "GXLX":
@@ -725,10 +754,16 @@
"HPRDOrgID": data.缁勭粐,
"HPRDOrg": data.缁勭粐鍚嶇О,
"HCenterName": data.宸ヤ綔涓績,
- "HCenterID": data.HCenterID
+ "HCenterID": data.HCenterID,
+ "lngBillSubKey": data.hsubid,
+ "HProcName": data.宸ュ簭,
+ "HProcID": data.HProcID,
+ "HProcNo": data.宸ュ簭鍙�,
+ "NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
});
//$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
//$("#HBarCode").css("background-color", "#efefef4d");
+ $("#HProcNo").attr('disabled', 'disabled');
HProcExchBillNoFlag = true;
var HProcExchHinteID = $('#HProcExchHinteID').val();
@@ -769,25 +804,90 @@
toolbar: '#toolbarDemo'
, where: { HProcExchHinteID: HProcExchHinteID }
, cols: [[
- { type: 'numbers', title: '搴忓彿', totalRow: true }
- , { field: 'HOrderProcNO', title: '璁㈠崟璺熻釜鍙�', edit: 'text' }
- , { field: 'hbillno', title: '娴佽浆鍗″彿', hide: true }
- , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', edit: 'text' }
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', edit: 'text' }
- , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
- , { field: '娴佹按鍙�', title: '娴佹按鍙�', edit: 'text' }
- , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
- , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
- , { field: '鏄惁濮斿', title: '鏄惁濮斿', edit: 'text' }
- , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
- , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
- , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺', edit: 'text' }
- , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺' }
+ { field: '娴佹按鍙�', title: '娴佹按鍙�', hide: true }
+ , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О', width: 180 }
+ , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺', width: 90 }
+ , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', width: 100 }
+ , { field: '宸ヨ壓鍙傛暟', title: '宸ヨ壓鍙傛暟', hide: true }
+ , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺', hide: true }
]]
, height: 500
}
table.render(option)
+ break;
+ case "P201":
+ case "P202":
+ case "P203":
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HICMOInterID": data.hicmointerid,
+ "HICMOBillNo": data.浠诲姟鍗曞彿,
+ "HMaterID": data.HMaterID,
+ "HMaterName": data.浜у搧,
+ "HMaterNumber": data.浜у搧浠ｇ爜,
+ "HMaterModel": data.瑙勬牸鍨嬪彿,
+ "HPieceQty": data.娴佽浆鍗℃暟閲�,
+ "HPlanQty": data.娴佽浆鍗℃暟閲�,
+ "lngBillKey": data.hmainid,
+ "HProcExchBillNo": data.鍗曟嵁鍙�,
+ "HProcExchHinteID": data.hmainid,
+ "HProcPlanEntryID": data.hsubid,
+ "HICMOQty": data.浠诲姟鍗曟暟閲�,
+ "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
+ "HPRDOrgID": data.缁勭粐
+ });
+ $("#HProcNo").attr('disabled', 'disabled');
+ HProcExchBillNoFlag = true;
+
+ var HProcExchHinteID = $('#HProcExchHinteID').val();
+ var HInterID = data.hmainid;
+ //鑷姩鍖归厤娴佹按鍙�
+ $.ajax({
+ url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
+ type: "GET",
+ data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID, "BillType": "Out" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data[0];
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "lngBillSubKey": data.hsubid,
+ "HProcName": data.宸ュ簭,
+ "HProcID": data.宸ュ簭ID,
+ "HProcNo": data.娴佹按鍙�,
+ "HCenterName": data.宸ヤ綔涓績,
+ "HCenterID": data.HCenterID,
+ "NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺),
+ "HQty": data.鍚堟牸鏁伴噺
+ });
+
+ if (data.棣栭亾宸ュ簭 == "鏄�") {
+ FirstEndHProcNo = 1;
+ } else if (data.鏈亾宸ュ簭 == "鏄�") {
+ FirstEndHProcNo = 2;
+ }
+ $("#HProcNo").attr("readonly", "readonly");
+ $("#HProcNo").css("background-color", "#efefef4d");
+ }
+ }
+ })
+
+ option = {
+ elem: '#mainTable',
+ url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
+ //, cellMinWidth: 80
+ toolbar: '#toolbarDemo'
+ , where: { HProcExchHinteID: HProcExchHinteID }
+ , cols: [[
+ { field: '娴佹按鍙�', title: '娴佹按鍙�', hide: true }
+ , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О', width: 180 }
+ , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺', width: 90 }
+ , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', width: 100 }
+ , { field: '宸ヨ壓鍙傛暟', title: '宸ヨ壓鍙傛暟', hide: true }
+ , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺', hide: true }
+ ]]
+ , height: 500
+ }
+ table.render(option)
+
break;
}
@@ -814,6 +914,7 @@
"HEmpID": data.HItemID,
"HEmpNumber": data.鑱屽憳浠ｇ爜,
"HEmpName": data.鑱屽憳鍚嶇О,
+ "HEmpName_second": data.鑱屽憳鍚嶇О,
"HGroupID": data.鐝粍ID,
"HGroupName": data.鐝粍鍚嶇О
});
@@ -1049,6 +1150,38 @@
}
});
}
+
+ //鎿嶄綔鍛樺洖杞︽柟娉�
+ function Operator_KeyDown(sBillNo) {
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown_Operator",
+ type: "GET",
+ data: { "HBarCode": sBillNo, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "Out" },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data[0];
+
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HEmpID": data.HItemID,
+ "HEmpNumber": data.鑱屽憳浠ｇ爜,
+ "HEmpName": data.鑱屽憳鍚嶇О
+ });
+
+ layer.close(index);
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
//#endregion
//#region 鏌ヨ 宸ヨ壓鍙傛暟
@@ -1112,7 +1245,7 @@
//娴佹按鍙凤紙宸ュ簭鍙凤級鍥炶溅鏂规硶
$('#HProcNo').on('keydown', function (event) {
var sProcNo = $('#HProcNo').val();
- var sBillNo = $('#HBarCode').val();
+ var sBillNo = $('#HProcExchBillNo').val();
if (event.keyCode == 13) {
if (!HProcExchBillNoFlag) {
layer.msg("娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栬�呭湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒");
@@ -1138,6 +1271,7 @@
, "HCenterName": data.宸ヤ綔涓績
, "HCenterID": data.HCenterID
, "NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
+ , "HQty": data.鍚堟牸鏁伴噺
});
if (data.棣栭亾宸ュ簭 == "鏄�") {
FirstEndHProcNo = 1;
@@ -1314,8 +1448,14 @@
return;
}
+ //鎶婃祦杞崱鍙疯祴鍊肩粰鏉″舰鐮�
+ $("#HBarCode").val($("#HProcExchBillNo").val());
+
+ data.field.HMaterModel = data.field.HMaterModel.replace("\"", "鈥�").replace(";", "锛�");
+ data.field.HMaterName = data.field.HMaterName.replace("\"", "鈥�").replace(";", "锛�");
+
var tableData = data.field;
- var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+ var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"] + ";"+OperationType;
var index = layer.load();
$.ajax({
type: "POST",
@@ -1325,8 +1465,12 @@
dataType: "json",
success: function (data) {
if (data.count == 1) {
+ //娓呯┖鏉″舰鐮佽緭鍏ユ鍐呭
+ $("#HBarCode").val("");
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
+ $("#Add").attr("style", "display:inline;");//鏄剧ず鏂板鎸夐挳
+ $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//绂佺敤淇濆瓨鎸夐挳
if (sessionStorage["OrganizationID"] == 100038) {
if (FirstEndHProcNo == 1) {
//姹囨姤
@@ -1387,6 +1531,8 @@
//}
}
else {
+ //娓呯┖鏉″舰鐮佽緭鍏ユ鍐呭
+ $("#HBarCode").val("");
layer.close(index);
layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
@@ -1407,6 +1553,17 @@
return;
}
txtHBarCode_KeyDown(HBarCode);
+ });
+ //#endregion
+
+ //#region 鎿嶄綔鍛樼‘瀹氭寜閽�
+ form.on('submit(QueDin_CZY)', function (data) {//
+ var sBillNo = $('#HEmpNumber').val();
+ if (!HProcExchBillNoFlag) {
+ layer.msg("娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栬�呭湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒");
+ return;
+ }
+ Operator_KeyDown(sBillNo);
});
//#endregion
@@ -1480,8 +1637,10 @@
}
, end: function () {
var sProcNo = $('#HProcNo').val();
- var sBillNo = $('#HBarCode').val();
- txtHProcNo_KeyDown(sBillNo, sProcNo);
+ var sBillNo = $('#HProcExchBillNo').val();
+ if (sProcNo != "") {
+ txtHProcNo_KeyDown(sBillNo, sProcNo);
+ }
}
//, btn: ['纭畾', '鍙栨秷']
//, btn1: function (index, layero) {
@@ -1530,6 +1689,32 @@
, content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
, resize: false
, cancel: function (index, layero) {
+ }
+ })
+ });
+
+ //鏆傛斁鍖�
+ form.on('submit(BtnHTemporaryAreaName)', function (data) {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鏆傛斁鍖哄垪琛�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TemporaryArea.html?', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HTemporaryAreaID").val(checkStatus.data[0].HItemID);
+ $("#HTemporaryAreaName").val(checkStatus.data[0].鏆傛斁鍖哄悕绉�);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
})
});
@@ -1583,6 +1768,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HEmpName").val(checkStatus.data[0].HName);
+ $("#HEmpName_second").val(checkStatus.data[0].HName);
$("#HEmpID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -2141,6 +2327,7 @@
//杩斿洖鎿嶄綔鍛�
function GetHWorkerValue(obj) {
$("#HEmpName").val(obj[0].HName);
+ $("#HEmpName_second").val(obj[0].HName);
$("#HEmpID").val(obj[0].HItemID);
}
//杩斿洖鎿嶄綔鍛�2
--
Gitblit v1.9.1