From 7364400a15764fdb61522941f9fca45b0a1405e4 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 10 七月 2024 10:30:40 +0800
Subject: [PATCH] 客户条码扫码记录单：扫码慢问题解决
---
WebTM/views/生产管理/生产开工单/Sc_Add_MESBeginWorkBillList.html | 544 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 351 insertions(+), 193 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
index 44e5a94..2a87db1 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
@@ -14,6 +14,7 @@
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<style type="text/css">
.layui-form-label {
@@ -85,8 +86,8 @@
<form id="form0" class="layui-form" lay-filter="component-form-group" action="">
<div class="layui-card-header">
<div class="layui-btn-group">
-
<button type="button" id="Saver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
@@ -318,25 +319,22 @@
</div>
<script>
//鑾峰彇鍙傛暟
+ var OptionData = [];
var HBillType = ""; //鍗曟嵁绫诲瀷
var HSourceInterID = ""; //婧愬崟涓诲唴鐮�
var HSourceEntryID = ""; //婧愬崟瀛愬唴鐮�
var HSourceBillNo = ""; //婧愬崟鍗曞彿
var HSourceBillType = ""; //婧愬崟绫诲瀷
- function getUrlVars() {
- var vars = [], hash;
- var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
- for (var i = 0; i < hashes.length; i++) {
- hash = hashes[i].split('=');
- vars.push(hash[0]);
- vars[hash[0]] = hash[1];
- }
- return vars;
+ var refSav = ""; //鎻愪氦绫诲瀷
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟 //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSBillType = params[params[2]];//婧愬崟绫诲瀷
}
-
- var params = getUrlVars();
- var hID = params[params[0]];//缂栬緫鏌ョ湅
- var Type = params[params[1]];//鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
var edit = function (data) {
HBillType = data[0].HBillType;
@@ -353,6 +351,7 @@
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ //#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -360,121 +359,86 @@
, form = layui.form
, laydate = layui.laydate
, element = layui.element;
+ //#endregion
- //鏃ユ湡鏃堕棿閫夋嫨鍣�
- laydate.render({
- elem: '#HBeginDate'
- , type: 'datetime'
- });
- laydate.render({
- elem: '#HEndDate'
- , type: 'datetime'
- });
- laydate.render({
- elem: '#HDate'
- , type: 'datetime'
- });
- laydate.render({
- elem: '#HMakeDate'
- , type: 'datetime'
- });
- laydate.render({
- elem: '#HUpDateDate'
- , type: 'datetime'
- });
- laydate.render({
- elem: '#HCheckDate'
- , type: 'datetime'
- });
- laydate.render({
- elem: '#HCloseDate'
- , type: 'datetime'
- });
- laydate.render({
- elem: '#HDeleteDate'
- , type: 'datetime'
- });
+ //鍒濆鍖栬〃鍗曟彃浠�
+ set_InitFrom();
- //鍒濆鍩烘湰淇℃伅璧嬪��
- $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")) //寮�宸ユ棩鏈�
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒跺崟鏃ユ湡
- $("#HMaker").val(sessionStorage["HUserName"]); //鍒跺崟浜�
+ //鍒ゆ柇鎿嶄綔绫诲瀷
+ if (OperationType == 1) {//鏃犳簮鍗�
+ $("#HEmpID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛業D
+ $("#HEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛�
+ $("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+ $("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
+ set_AddFNew();
+ }
+ else if (OperationType == 2) {//鏈夋簮鍗�
+ $("#HEmpID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛業D
+ $("#HEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛�
+ $("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+ $("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
+ set_AddNew();
+ }
+ else if (OperationType == 3) {//缂栬緫
+
+ set_EditFromGrid();
+ }
+ else {
+ layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+ }
- //鍒ゆ柇鏄惁鏂板
- if (hID == null || hID == 0) {
- //鑾峰彇鏈�澶у崟鎹彿 new
- $("#HInterID").val("0");
- $("#HBillNo").val("");
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '3787' },
- success: function (d) {
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HInterID").val(0);
- }
+ //鍒濆鍖栨彃浠�
+ function set_InitFrom() {
+ //鏃ユ湡鏃堕棿閫夋嫨鍣�
+ laydate.render({
+ elem: '#HBeginDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HEndDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HMakeDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HUpDateDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HCheckDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HCloseDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HDeleteDate'
+ , type: 'datetime'
});
}
- else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
- RoadBillMain(hID);
- /* RoadBillSub(linterid);*/
- }
-
- //鑾峰彇涓嬫媺閫変腑鍊�
- form.on('select(SourceType)', function (data) {
- Sctag = data.value;
- form.render('select');
- if (Sctag != "2") //鏃犳簮鍗�
- {
- $("#HMainSourceInterID").val("");
- $("#HMainSourceEntryID").val("");
- $("#HMainSourceBillNo").val("");
- $("#HMainSourceBillType").val("");
- $('#HMainSourceBillNo').attr("disabled", false);
- $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
- }
- else {
- $('#HMainSourceBillNo').attr("disabled", true);
- $('#XDHList').removeClass("layui-btn-disabled").attr("disabled", false);
- }
- });
//鏃犳簮鍗曟柊澧�
- if (Type == 1)
+ function set_AddFNew()
{
-
//鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
- $('#HMaterCode').attr("disabled", true);
- $('#HMaterList').removeClass("layui-btn-disabled").attr("disabled", false);
- $('#HMaterName').attr("disabled", true);
- $('#HMaterSpec').attr("disabled", true);
- $('#HBeginDate').attr("disabled", true);
- $('#HEmpName').attr("disabled", true);
- $('#HEmpList').removeClass("layui-btn-disabled").attr("disabled", false);
- $('#HSourceName').attr("disabled", true);
- $('#HSourceList').removeClass("layui-btn-disabled").attr("disabled", false);
- $('#HMainSourceBillNo').attr("disabled", true);
- $('#XDHList').removeClass("layui-btn-disabled").attr("disabled", false);
- $('#HGroupName').attr("disabled", true);
- $('#HGroupList').removeClass("layui-btn-disabled").attr("disabled", false);
- $('#HDeptName').attr("disabled", true);
- $('#HDeptList').removeClass("layui-btn-disabled").attr("disabled", false);
- form.render('select');
- $('#HICMOBillNo').attr("disabled", false);
- //$('#HICMOBillNo').val("0");
- $("#HProcID").val("0"); //宸ュ簭ID
- $("#HMainSourceInterID").val("0"); //婧愬崟涓籌D
- $("#HMainSourceEntryID").val("0"); //婧愬崟瀛愬唴鐮�
- $("#HICMOInterID").val("0"); //鐢熶骇璁㈠崟ID
- $("#HICMOEntryID").val("0"); //鐢熶骇璁㈠崟瀛怚D
}
//鏈夋簮鍗曟柊澧�
- if (Type == 2)
- {
+ function set_AddNew() {
+ refSav = "Add";
+ //鍒濆鍩烘湰淇℃伅璧嬪��
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
+ $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")) //寮�宸ユ棩鏈�
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒跺崟鏃ユ湡
+ $("#HMaker").val(sessionStorage["HUserName"]); //鍒跺崟浜�
//鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
@@ -517,7 +481,7 @@
$("#HMaterSpec").val(LoadData[0].HModel); //浜у搧瑙勬牸
$("#HSourceID").val(LoadData[0].HSourceID); //鐢熶骇璧勬簮ID
$("#HSourceName").val(LoadData[0].HSourceName); //鐢熶骇璧勬簮
- $("#HMainSourceBillNo").val(LoadData[0].HICMOBillNo); //婧愬崟鍗曞彿锛堟殏鏃跺彇鍊艰鍗曠紪鍙凤級
+ $("#HMainSourceBillNo").val(LoadData[0].HSourceBillNo); //婧愬崟鍗曞彿
$("#HMainSourceInterID").val(LoadData[0].HSourceInterID); //婧愬崟涓诲唴鐮�(鍙栧�糎InterID)
$("#HMainSourceEntryID").val(LoadData[0].HSourceEntryID); //婧愬崟瀛愬唴鐮�(婧愬崟琛屽彿)
$("#HMainSourceBillType").val(HSourceBillType); //婧愬崟绫诲瀷
@@ -537,35 +501,163 @@
}
});
}
-
+
//缂栬緫
- if (Type == 3)
+ function set_EditFromGrid()
{
+ refSav = "Update";
+ $('#HMaterCode').attr("disabled", true);
+ $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#HMaterName').attr("disabled", true);
+ $('#HMaterSpec').attr("disabled", true);
+ $('#HBeginDate').attr("disabled", true);
+ $('#HSourceName').attr("disabled", true);
+ $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#HMainSourceBillNo').attr("disabled", true);
+ $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#HDeptName').attr("disabled", true);
+ $('#HDeptList').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#SourceType').attr("disabled", true);
+ form.render('select');
+ $('#HICMOBillNo').attr("disabled", true);
+ $.ajax({
+ url: GetWEBURL() + "Sc_MESBeginWorkBill/Sc_MESBeginWorkBillListCheckDetai",
+ type: "GET",
+ data: {
+ "HID": linterid
+ },
+ success: function (result) {
+
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data.h_v_Sc_MESBeginWorkBillList_NEW[0];
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HInterID": data.hmainid
+ , "HBillNo": data.鍗曟嵁鍙�
+ , "HDate": formatDate(data.鏃ユ湡)
+ , "HProcID": data.HProcID
+ , "HProcName": data.宸ュ簭鍚嶇О
+ , "HMaterID": data.HMaterID
+ , "HMaterCode": data.浜у搧浠ｇ爜
+ , "HMaterName": data.浜у搧鍚嶇О
+ , "HMaterSpec": data.瑙勬牸鍨嬪彿
+ , "HBeginDate": data.寮�宸ユ椂闂�
+ , "HSourceID": data.HSourceID //璧勬簮ID
+ , "HSourceName": data.璧勬簮鍚嶇О //璧勬簮鍚嶇О
+ , "HEmpID": data.HEmpID //鎿嶄綔鍛業D
+ , "HEmpName": data.鐢宠寮�宸ヤ汉鍛� //鎿嶄綔鍛�
+ , "HMainSourceInterID": data.HMainSourceInterID //婧愬崟ID
+ , "HMainSourceEntryID": data.HMainSourceEntryID //婧愬崟瀛怚D
+ , "HMainSourceBillNo": data.HMainSourceBillNo //婧愬崟鍗曞彿
+ , "HMainSourceBillType": data.HMainSourceBillType //婧愬崟绫诲瀷
+ , "HGroupID": data.HGroupID //鐝粍ID
+ , "HGroupName": data.鐝粍鍚嶇О //鐝粍鍚嶇О
+ , "HDeptID": data.HDeptID //閮ㄩ棬ID
+ , "HDeptName": data.閮ㄩ棬鍚嶇О //閮ㄩ棬鍚嶇О
+ , "HICMOInterID": data.HICMOInterID //鐢熶骇璁㈠崟涓籌D
+ , "HICMOEntryID": data.HICMOEntryID //鐢熶骇璁㈠崟瀛怚D
+ , "HICMOBillNo": data.HICMOBillNo //鐢熶骇璁㈠崟
+ , "HRemark": data.澶囨敞 //澶囨敞
+ , "HMaker": data.鍒跺崟浜� //鍒跺崟浜�
+ , "HMakeDate": data.鍒跺崟鏃ユ湡 //鍒跺崟鏃ユ湡
+ , "HUpDater": sessionStorage["HUserName"] //淇敼浜�
+ , "HUpDateDate": Format(new Date(), "yyyy-MM-dd hh:mm:ss")//淇敼鏃ユ湡
+ , "HChecker": data.瀹℃牳浜� //瀹℃牳浜�
+ , "HCheckDate": data.瀹℃牳鏃ユ湡 //瀹℃牳鏃ユ湡
+ , "HCloseMan": data.鍏抽棴浜� //鍏抽棴浜�
+ , "HCloseDate": data.鍏抽棴鏃ユ湡 //鍏抽棴鏃ユ湡
+ , "HDeleteMan": data.浣滃簾浜� //浣滃簾浜�
+ , "HDeleteDate": data.浣滃簾鏃ユ湡 //浣滃簾鏃ユ湡
+
+ });
+
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
}
+
+
+ //鍒ゆ柇鏄惁鏂板
+ if (linterid == null || linterid == 0) {
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ $("#HInterID").val("0");
+ $("#HBillNo").val("");
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3787' },
+ success: function (d) {
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HInterID").val(0);
+ }
+ });
+ }
+ else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+ $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+ }
+
+ //鑾峰彇涓嬫媺閫変腑鍊�
+ form.on('select(SourceType)', function (data) {
+ Sctag = data.value;
+ form.render('select');
+ if (Sctag != "2") //鏃犳簮鍗�
+ {
+ $("#HMainSourceInterID").val("");
+ $("#HMainSourceEntryID").val("");
+ $("#HMainSourceBillNo").val("");
+ $("#HMainSourceBillType").val("");
+ $('#HMainSourceBillNo').attr("disabled", false);
+ $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
+ OperationType = 1;
+ }
+ else {
+ $('#HMainSourceBillNo').attr("disabled", true);
+ $('#XDHList').removeClass("layui-btn-disabled").attr("disabled", false);
+ OperationType = 2;
+ }
+ });
+
+
//淇濆瓨鎻愪氦
form.on('submit(Saver)', function (data) {
-
- var sMainStr = JSON.stringify(data.field);
- console.log(sMainStr);
+ //绂佺敤淇濆瓨鎸夐挳
+ $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
+ //鍒ゆ柇绯荤粺鍙傛暟鏄惁鍕鹃��
+ Xt_AllowLoadData(data);
+
+ });
+
+ //瀹℃牳鎸夐挳鎻愪氦
+ form.on('submit(VerIfySaver)', function (data) {
+ SaveVerify();
+ });
+
+ //瀹℃牳鎻愪氦
+ function SaveVerify()
+ {
+ var InterID = $("#HInterID").val();
if (!AllowLoadData())//鏁版嵁楠岃瘉
{
return false;
}
$.ajax({
- type: "POST",
- url: GetWEBURL() + "/Sc_MESBeginWorkBill/SaveGetMESBeginWorkFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MESBeginWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
- data: { "msg": sMainStr },
+ data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
- layer.close(layer.index);
- window.parent.location.reload();
+ //layer.close(layer.index);
+ //window.parent.location.reload();
});
}
else {
@@ -576,12 +668,13 @@
layer.alert(err, { icon: 5 })
}
})
- });
+ }
+
//閫�鍑�
form.on('submit(Exit)', function (data) {
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ Pub_Close(1);
+ parent.location.reload();
});
@@ -596,7 +689,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../PublicPage/PartInformation.html', 'yes'],
+ content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -606,10 +699,10 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HMaterName").val(checkStatus.data[0].HName);
- $("#HMaterCode").val(checkStatus.data[0].HNumber);
+ $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+ $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);
$("#HMaterID").val(checkStatus.data[0].HItemID);
- $("#HMaterSpec").val(checkStatus.data[0].HModel);
+ $("#HMaterSpec").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -636,7 +729,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../PublicPage/SourceInformation.html', 'yes'],
+ content: ['../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -646,7 +739,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HSourceName").val(checkStatus.data[0].HName);
+ $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
$("#HSourceID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -674,7 +767,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../PublicPage/UserInformation.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?type=HEmp', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -684,7 +777,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HEmpName").val(checkStatus.data[0].HName);
+ $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
$("#HEmpID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -714,7 +807,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../PublicPage/GroupInformation.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?type=HGroup', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -724,7 +817,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HGroupName").val(checkStatus.data[0].HName);
+ $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
$("#HGroupID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -752,7 +845,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../PublicPage/DeptInformation.html', 'yes'],
+ content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -762,7 +855,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HDeptName").val(checkStatus.data[0].HName);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
$("#HDeptID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -817,7 +910,7 @@
layer.msg("杞﹂棿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if (Type == "2") {
+ if (OperationType == "2") {
if ($("#HICMOInterID").val() == '' || $("#HICMOInterID").val() == null) {
layer.msg("鐢熶骇璁㈠崟涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
@@ -826,60 +919,110 @@
return Result;
}
- function RoadBillMain(hID)//鍔犺浇琛ㄥご
- {
- //alert(hID);
- //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+ //鍒ゆ柇绯荤粺鍙傛暟鏄惁閫変腑
+ function Xt_AllowLoadData(data2) {
$.ajax({
- url: GetWEBURL() + "Sc_MESBeginWorkBill/Sc_MESBeginWorkBillListCheckDetai",
type: "GET",
- data: {
- "HID": hID
- },
- success: function (result) {
-
- if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data.h_v_Sc_MESBeginWorkBillList_NEW[0];
- form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HInterID": data.hmainid
- ,"HBillNo": data.鍗曟嵁鍙�
- , "HDate": formatDate(data.鏃ユ湡)
- , "HProcID": data.HProcID
- , "HProcName": data.宸ュ簭鍚嶇О
- , "HMaterID": data.HMaterID
- , "HMaterCode": data.浜у搧浠ｇ爜
- , "HMaterName": data.浜у搧鍚嶇О
- , "HMaterSpec": data.瑙勬牸鍨嬪彿
- , "HBeginDate": data.寮�宸ユ椂闂�
- , "HSourceID": data.HSourceID //璧勬簮ID
- , "HSourceName": data.璧勬簮鍚嶇О //璧勬簮鍚嶇О
- , "HEmpID": data.HEmpID //鎿嶄綔鍛業D
- , "HEmpName": data.鐢宠寮�宸ヤ汉鍛� //鎿嶄綔鍛�
- , "HMainSourceInterID": data.HMainSourceInterID //婧愬崟ID
- , "HMainSourceEntryID": data.HMainSourceEntryID //婧愬崟瀛怚D
- , "HMainSourceBillNo": data.HMainSourceBillNo //婧愬崟鍗曞彿
- , "HMainSourceBillType": data.HMainSourceBillType //婧愬崟绫诲瀷
- , "HGroupID": data.HGroupID //鐝粍ID
- , "HGroupName": data.鐝粍鍚嶇О //鐝粍鍚嶇О
- , "HDeptID": data.HDeptID //閮ㄩ棬ID
- , "HDeptName": data.閮ㄩ棬鍚嶇О //閮ㄩ棬鍚嶇О
- , "HICMOInterID": data.HICMOInterID //鐢熶骇璁㈠崟涓籌D
- , "HICMOEntryID": data.HICMOEntryID //鐢熶骇璁㈠崟瀛怚D
- , "HICMOBillNo": data.HICMOBillNo //鐢熶骇璁㈠崟
- , "HRemark": data.澶囨敞 //澶囨敞
- , "HMaker": data.鍒跺崟浜� //鍒跺崟浜�
- , "HMakeDate": data.鍒跺崟鏃ユ湡 //鍒跺崟鏃ユ湡
- , "HUpDater": data.淇敼浜� //淇敼浜�
- , "HUpDateDate": data.淇敼鏃ユ湡 //淇敼鏃ユ湡
- });
-
- } else {
- layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ url: GetWEBURL() + "/Sc_MESBeginWorkBill/Xt_AllowLoadData", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "HKey": "Sc_MESBeginWorkBill_SwipeCardStart" },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ if (data.Verify == "Y") //鍒峰崱楠岃瘉
+ {
+ layer.msg("闇�瑕佽繘琛屽埛鍗￠獙璇�!", { time: 1 * 1000, icon: 1 }, function (index) {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: 'IC鍒峰崱',
+ closeBtn: 1,
+ shift: 2,
+ area: ['50%', '80%'],
+ maxmin: true,
+ content: '../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_SwipeCardStart.html?HSourceInterID=' + HSourceInterID,
+ end: function () {
+ if (OptionData.length > 0) {
+ if (OptionData[0]["data"] == "1") {
+ save(data2);
+ } else if (OptionData[0]["data"] == "0") {
+ layer.msg("鍥犱负鎶�鑳戒笉鍖归厤,鏃犳硶淇濆瓨!")
+ }
+ OptionData = [];
+ } else {
+ $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);
+ }
+ }
+ });
+ });
+ }
+ else {
+ save(data2);
+ }
}
- }, error: function () {
- layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ else {
+ layer.alert(data.Message, { icon: 5 })
+ }
+ },
+ error: function (err) {
+ layer.alert(err, { icon: 5 })
}
- });
+ })
+ }
+
+ function save(data) {
+ var index = layer.load();
+ var sMainStr = JSON.stringify(data.field);
+ var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
+ if (!AllowLoadData())//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Sc_MESBeginWorkBill/SaveGetMESBeginWorkFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+ layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
+ //layer.close(layer.index);
+ //window.parent.location.reload();
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ layer.close(index);
+ SaveVerify(); //瀹℃牳
+ }
+ else {
+ layer.close(index);
+ }
+ });
+ layer.close(index);
+
+ //layer.confirm(data.Message, {
+ // btn: ['纭']
+ //}, function (index) {
+ // if (data.Verify == "Y") //鑷姩瀹℃牳
+ // {
+ // layer.close(index);
+ // SaveVerify(); //瀹℃牳
+ // }
+ // else {
+ // layer.close(index);
+ // }
+ //});
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 })
+ layer.close(index);
+ }
+ },
+ error: function (err) {
+ layer.alert(err, { icon: 5 })
+ layer.close(index);
+ }
+ })
}
function formatDate(date) {
@@ -893,6 +1036,21 @@
return [year, month, day].join('-');
}
+
+ //鎿嶄綔鍛�
+ function GetHEmpValue(obj) {
+ $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+ $("#HEmpID").val(obj[0].HItemID);
+ }
+ //鐢熶骇鐝粍
+ function GetHGroupValue(obj) {
+ $("#HGroupName").val(obj[0].鐝粍鍚嶇О);
+ $("#HGroupID").val(obj[0].HItemID);
+ }
+
+ function GetSwipeCardStart(obj) {
+ OptionData[0] = obj;
+ }
</script>
</body>
</html>
--
Gitblit v1.9.1