From c1ca8a9ce9514d13a621e75115cb4fb936a2dbd5 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 19 三月 2025 14:47:28 +0800
Subject: [PATCH] 生产汇报单、产量汇报单、生产质量汇报单 增加：三个自定义过滤；日期间隔；审核，反审核， 基本信息页签 和 制单信息页签， 选基础资料时，应该是已审核未禁用的资料（包括 单据型基础资料
---
WebTM/views/生产管理/报工台工序/产量汇报/Sc_Add_ProductReportStepBillList.html | 327 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 250 insertions(+), 77 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportStepBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportStepBillList.html"
index 85547e6..f8f04b9 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportStepBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportStepBillList.html"
@@ -16,6 +16,7 @@
<script src="../../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../../layuiadmin/PubCustom.js"></script>
<script src="../../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
.layui-form-label {
width: 85px;
@@ -86,8 +87,7 @@
<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="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <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" id="ReVerIfySaver" class="layui-btn layui-btn-normal layui-btn-circle" lay-submit="" lay-filter="ReVerIfySaver">鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
@@ -118,6 +118,24 @@
<label class="layui-form-label">鍗曟嵁鏃ユ湡:</label>
<div class="layui-input-inline">
<input class="layui-input" name="HDate" id="HDate" disabled autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ <!--<div class="layui-inline">
+ <label class="layui-form-label">缁勭粐:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HOrgID" lay-verify="HOrgID" id="HOrgID" autocomplete="off">
+ </div>
+ </div>-->
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">缁勭粐锛�</label>
+ <div class="layui-input-inline" style="margin-bottom: -15px;">
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -175,12 +193,6 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">璁″垝鏁伴噺:</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HPlanQty" lay-verify="HPlanQty" id="HPlanQty" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
<label class="layui-form-label">鐢熶骇璧勬簮</label>
<div class="layui-input-inline">
<input type="text" name="HSourceName" id="HSourceName" class="layui-input" value="" style="float:left;width:150px;">
@@ -202,8 +214,6 @@
</button>
</div>
</div>
- </div>
- <div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">鎿嶄綔鍛�:</label>
<div class="layui-input-inline">
@@ -215,6 +225,29 @@
</button>
</div>
</div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">璁″垝鏁伴噺:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HPlanQty" lay-verify="HPlanQty" id="HPlanQty" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閲囬泦鏁伴噺:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="GatherQty" lay-verify="GatherQty" id="GatherQty" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍚堟牸鏁伴噺:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HQty" lay-verify="HQty" id="HQty" autocomplete="off">
+ </div>
+ </div>
+
+ </div>
+ <div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">涓嶈壇鏁伴噺:</label>
<div class="layui-input-inline">
@@ -227,23 +260,28 @@
<input class="layui-input" name="HWasterQty" lay-verify="HWasterQty" id="HWasterQty" autocomplete="off">
</div>
</div>
- <div class="layui-inline">
+ <!--<div class="layui-inline">
<label class="layui-form-label">鍥犳枡鎶ュ簾鏁�:</label>
<div class="layui-input-inline">
<input class="layui-input" name="HWasterQty2" lay-verify="HWasterQty2" id="HWasterQty2" autocomplete="off">
</div>
- </div>
+ </div>-->
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">鎶ュ伐鏁伴噺:</label>
+ <label class="layui-form-label">寮�宸ユ椂闂�:</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HQty" lay-verify="HQty" id="HQty" autocomplete="off">
+ <input class="layui-input" name="HWorkBeginDate" id="HWorkBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
</div>
- </div>
- <div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label">鎶ュ伐鏃堕棿:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HWorkReportDate" id="HWorkReportDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+
+ <!--<div class="layui-inline">
<label class="layui-form-label">寮�宸ユ椂闂�:</label>
<div class="layui-input-inline">
<input class="layui-input" name="HRelBeginDate" id="HRelBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
@@ -254,7 +292,7 @@
<div class="layui-input-inline">
<input class="layui-input" name="HRelEndDate" id="HRelEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
- </div>
+ </div>-->
</div>
</div>
<div class="layui-tab-item">
@@ -340,7 +378,7 @@
<script>
//鑾峰彇鍙傛暟
var HBillType = ""; //鍗曟嵁绫诲瀷
- var HSourceInterID = ""; //婧愬崟涓诲唴鐮�
+ var HSourceInterID = ""; //婧愬崟涓诲唴鐮侊紙鐢熶骇鐘舵�佷复鏃惰〃涓诲唴鐮侊級
var HSourceEntryID = ""; //婧愬崟瀛愬唴鐮�
var HSourceBillNo = ""; //婧愬崟鍗曞彿
var HSourceBillType = ""; //婧愬崟绫诲瀷
@@ -353,16 +391,23 @@
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
var HSBillType = params[params[2]];//婧愬崟绫诲瀷
+ var HBillType = params[params[3]];
+ var HSourceInterID = params[params[4]];
+ var HSourceEntryID = params[params[5]];
+ var HSourceBillNo = params[params[6]];
+ var HSourceBillType = params[params[7]];
}
+ //鑾峰彇鐧诲綍缁勭粐
+ //$('#HOrgID').val(sessionStorage["Organization"])
- var edit = function (data) {
- HBillType = data[0].HBillType;
- HSourceInterID = data[0].HSourceInterID;
- HSourceEntryID = data[0].HSourceEntryID;
- HSourceBillNo = data[0].HSourceBillNo;
- HSourceBillType = data[0].HSourceBillType;
+ //var edit = function (data) {
+ // HBillType = data[0].HBillType;
+ // HSourceInterID = data[0].HSourceInterID;
+ // HSourceEntryID = data[0].HSourceEntryID;
+ // HSourceBillNo = data[0].HSourceBillNo;
+ // HSourceBillType = data[0].HSourceBillType;
- }
+ //}
layui.config({
@@ -383,7 +428,14 @@
//鍒濆鍖栬〃鍗曟彃浠�
set_InitFrom();
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ var HModuleType = "3724";
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+ $("h1").html('<b>' + HPageTitle + '</b>');
+ //#endregion
+ Organ();//鏄剧ず缁勭粐
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗�
set_AddFNew();
@@ -395,6 +447,8 @@
var HICMOInID = params[params[3]];//鐢熶骇璁㈠崟涓讳富ID
var HICMOEnID = params[params[4]];//鐢熶骇璁㈠崟瀛怚D
set_EditFromGrid(linterid, HICMOInID, HICMOEnID);
+ //绂佺敤缁勭粐閫夐」
+ $("#HOrgID").attr("disabled", true);
}
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
@@ -404,11 +458,11 @@
function set_InitFrom() {
//鏃ユ湡鏃堕棿閫夋嫨鍣�
laydate.render({
- elem: '#HRelBeginDate'
+ elem: '#HWorkBeginDate'
, type: 'datetime'
});
laydate.render({
- elem: '#HRelEndDate'
+ elem: '#HWorkReportDate'
, type: 'datetime'
});
laydate.render({
@@ -442,7 +496,7 @@
{
//鍒濆鍩烘湰淇℃伅璧嬪��
$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HRelEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")) //鎶ュ伐鏃ユ湡
+ $("#HWorkReportDate").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"]); //鍒跺崟浜�
}
@@ -452,7 +506,7 @@
refSav = "Add";
//鍒濆鍩烘湰淇℃伅璧嬪��
$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HRelEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")) //鎶ュ伐鏃ユ湡
+ $("#HWorkReportDate").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"]); //鍒跺崟浜�
@@ -468,8 +522,8 @@
$('#HPlanQty').attr("disabled", true);
$('#HSourceName').attr("disabled", true);
$('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
- $('#HRelBeginDate').attr("disabled", true);
- $('#HRelEndDate').attr("disabled", true);
+ $('#HWorkBeginDate').attr("disabled", true);
+ $('#HWorkReportDate').attr("disabled", true);
$.ajax(
{
@@ -498,15 +552,16 @@
$("#HSourceName").val(LoadData[0].HSourceName); //鐢熶骇璧勬簮
$("#HSourceBillNo").val(LoadData[0].HICMOBillNo); //婧愬崟鍗曞彿锛堟殏鏃跺彇鍊艰鍗曠紪鍙凤級
$("#HSourceInterID").val(LoadData[0].HSourceInterID); //婧愬崟涓诲唴鐮�(鍙栧�糎InterID)
+ //$("#HSourceInterID").val(LoadData[0].HICMOInterID); //婧愬崟涓诲唴鐮�
$("#HSourceEntryID").val(LoadData[0].HSourceEntryID); //婧愬崟瀛愬唴鐮�(婧愬崟琛屽彿)
$("#HSourceBillType").val(HSourceBillType); //婧愬崟绫诲瀷
- $("#HGroupID").val(LoadData[0].HDeptID); //鐝粍ID
- $("#HGroupNumber").val(LoadData[0].HDeptNumber); //鐝粍缂栫爜
- $("#HGroupName").val(LoadData[0].HDeptName); //鐝粍
+ //$("#HGroupID").val(LoadData[0].HDeptID); //鐝粍ID
+ //$("#HGroupNumber").val(LoadData[0].HDeptNumber); //鐝粍缂栫爜
+ //$("#HGroupName").val(LoadData[0].HDeptName); //鐝粍
$("#HICMOInterID").val(LoadData[0].HICMOInterID); //鐢熶骇璁㈠崟ID
$("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //鐢熶骇璁㈠崟瀛怚D
$("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //鐢熶骇璁㈠崟
- $("#HRelBeginDate").val(LoadData[0].HBeginDate); //寮�宸ユ椂闂�
+ $("#HWorkBeginDate").val(LoadData[0].HBeginDate); //寮�宸ユ椂闂�
$("#HPlanQty").val(LoadData[0].HDatePlanQty); //璁″垝鏁伴噺
}
@@ -537,8 +592,8 @@
$('#HPlanQty').attr("disabled", true);
$('#HSourceName').attr("disabled", true);
$('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
- $('#HRelBeginDate').attr("disabled", true);
- $('#HRelEndDate').attr("disabled", true);
+ $('#HWorkBeginDate').attr("disabled", true);
+ $('#HWorkReportDate').attr("disabled", true);
$.ajax(
{
@@ -580,13 +635,13 @@
$("#HICMOInterID").val(LoadData[0].HICMOInterID); //鐢熶骇璁㈠崟ID
$("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //鐢熶骇璁㈠崟瀛怚D
$("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //鐢熶骇璁㈠崟
- $("#HRelBeginDate").val(formatDate(LoadData[0].寮�宸ユ椂闂�)); //寮�宸ユ椂闂�
- $("#HRelEndDate").val(formatDate(LoadData[0].鎶ュ伐鏃堕棿)); //鎶ュ伐鏃堕棿
+ $("#HWorkBeginDate").val(formatDate(LoadData[0].寮�宸ユ椂闂�)); //寮�宸ユ椂闂�
+ $("#HWorkReportDate").val(formatDate(LoadData[0].鎶ュ伐鏃堕棿)); //鎶ュ伐鏃堕棿
$("#HPlanQty").val(LoadData[0].HDatePlanQty); //璁″垝鏁伴噺
$("#HQty").val(LoadData[0].姹囨姤鏁伴噺); //鎶ュ伐鏁伴噺
$("#HBadCount").val(LoadData[0].涓嶈壇鏁伴噺); //涓嶈壇鏁伴噺
$("#HWasterQty").val(LoadData[0].鍥犲伐鎶ュ簾鏁伴噺); //鍥犲伐鎶ュ簾鏁伴噺
- $("#HWasterQty2").val(LoadData[0].鍥犳枡鎶ュ簾鏁伴噺); //鍥犳枡鎶ュ簾鏁伴噺
+ /*$("#HWasterQty2").val(LoadData[0].鍥犳枡鎶ュ簾鏁伴噺); //鍥犳枡鎶ュ簾鏁伴噺*/
$("#HMaker").val(LoadData[0].鍒跺崟浜�); //鍒跺崟浜�
$("#HMakeDate").val(formatDate(LoadData[0].鍒跺崟鏃ユ湡)); //鍒跺崟鏃ユ湡
$("#HUpDater").val(sessionStorage["HUserName"]); //淇敼浜�
@@ -597,7 +652,7 @@
$("#HCloseDate").val(formatDate(LoadData[0].鍏抽棴鏃ユ湡)); //鍏抽棴鏃ユ湡
$("#HDeleteMan").val(LoadData[0].浣滃簾浜�); //浣滃簾浜�
$("#HDeleteDate").val(formatDate(LoadData[0].浣滃簾鏃ユ湡)); //浣滃簾鏃ユ湡
-
+ $("#HOrgID").val(LoadData[0].缁勭粐); //缁勭粐
}
else {
layer.alert(data.Message, { icon: 5 });
@@ -619,7 +674,7 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3714' },
+ data: { "HBillType": '3724' },
success: function (d) {
$("#HBillNo").val(d.data[0].HBillNo);
$("#HInterID").val(0);
@@ -652,12 +707,12 @@
//淇濆瓨鎻愪氦
- form.on('submit(Saver)', function (data) {
+ form.on('submit(Saver)', function (objdata) {
if (!AllowLoadData())//鏁版嵁楠岃瘉
{
return false;
}
- OverStepQty(data);
+ OverStepQty(objdata);
});
@@ -676,6 +731,7 @@
//閫�鍑�
form.on('submit(Exit)', function (data) {
Pub_Close(1);
+ parent.location.reload();
});
@@ -690,7 +746,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../PublicPage/PartInformation.html', 'yes'],
+ content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -700,8 +756,8 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HMaterName").val(checkStatus.data[0].HName);
- $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+ $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+ $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);
$("#HMaterID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -729,7 +785,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../PublicPage/SourceInformation.html', 'yes'],
+ content: ['../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html?Htype=&openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -739,7 +795,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鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -767,7 +823,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../PublicPage/UserInformation.html', 'yes'],
+ content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?type=HEmp&openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -777,8 +833,8 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HEmpName").val(checkStatus.data[0].HName);
- $("#HEmpNumber").val(checkStatus.data[0].HNumber);
+ $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+ $("#HEmpNumber").val(checkStatus.data[0].鑱屽憳浠ｇ爜);
$("#HEmpID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -808,7 +864,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../PublicPage/GroupInformation.html', 'yes'],
+ content: ['../../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?type=HGroup&openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -818,8 +874,8 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HGroupName").val(checkStatus.data[0].HName);
- $("#HGroupNumber").val(checkStatus.data[0].HNumber);
+ $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
+ $("#HGroupNumber").val(checkStatus.data[0].鐝粍浠ｇ爜);
$("#HGroupID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -836,10 +892,30 @@
});
});
-
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HOrgID").append(Organization);
+ $("#HOrgID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
//楠岃瘉姹囨姤鏁伴噺鏄惁瓒呰繃璁″垝鏁伴噺
- function OverStepQty(data) {
+ function OverStepQty(objdata) {
var sWhere = "";
if (OperationType == 3) //缂栬緫
{
@@ -848,7 +924,7 @@
HSourceBillNo = $("#HSourceBillNo").val();
HSourceBillType = $("#HSourceBillType").val();
}
- sWhere = " where HSourceID='" + $("#HSourceID").val() + "' and HSourceInterID='" + HSourceInterID + "' and HSourceEntryID='" + HSourceEntryID + "' and HSourceBillNo='" + HSourceBillNo + "' and HSourceBillType='" + HSourceBillType + "' ";
+ sWhere = " where HSourceID='" + $("#HSourceID").val() + "' and HProcID='" + $("#HProcID").val() + "' and HSourceInterID='" + $("#HSourceInterID").val() + "' and HSourceEntryID='" + HSourceEntryID + "' and HSourceBillNo='" + HSourceBillNo + "' and HSourceBillType='" + HSourceBillType + "' ";
$.ajax({
url: GetWEBURL() + "/Sc_MESBeginStepWorkBill/GetMESOverStepQty",
type: "GET",
@@ -858,10 +934,10 @@
success: function (datas) {
var LoadData = datas.data.Sc_ICMOBillWorkQtyStatus_Tmp;
var HQty = LoadData[0].HQty;
- var HBadCount = LoadData[0].HBadCount;
+ var HBadCount = LoadData[0].HBadQty;
var HWasterQty = LoadData[0].HWasterQty;
- var HWasterQty2 = LoadData[0].HWasterQty2;
- var yessqty = HQty + HBadCount + HWasterQty + HWasterQty2;
+ //var HWasterQty2 = LoadData[0].HWasterQty2;
+ var yessqty = HQty + HBadCount + HWasterQty; //+ HWasterQty2;
var sumqty = parseFloat($("#HQty").val()) + yessqty;
if (sumqty > parseFloat($("#HPlanQty").val())) {
layer.confirm("宸叉眹鎶ユ暟閲�:銆�" + yessqty + "銆�,褰撳墠姹囨姤鏁伴噺:銆�" + parseFloat($("#HQty").val()) + "銆戜笉鑳藉ぇ浜庤鍒掓暟閲�:銆�" + parseFloat($("#HPlanQty").val()) + "銆戯紒", {
@@ -875,7 +951,7 @@
});
}
else {
- Submit(data);
+ Submit(objdata);
}
},
error: function (err) {
@@ -885,18 +961,19 @@
}
//鎻愪氦璇锋眰ajax
- function Submit(data) {
- if (data.field.HBadCount == "" || data.field.HBadCount == null) {
- data.field.HBadCount = 0;
+ function Submit(objdata) {
+ if (objdata.field.HBadCount == "" || objdata.field.HBadCount == null) {
+ objdata.field.HBadCount = 0;
}
- if (data.field.HWasterQty == "" || data.field.HWasterQty == null) {
- data.field.HWasterQty = 0;
+ if (objdata.field.HWasterQty == "" || objdata.field.HWasterQty == null) {
+ objdata.field.HWasterQty = 0;
}
- if (data.field.HWasterQty2 == "" || data.field.HWasterQty2 == null) {
- data.field.HWasterQty2 = 0;
- }
- var sMainStr = JSON.stringify(data.field);
- var sMainSub = sMainStr + ';' + refSav;
+ //if (objdata.field.HWasterQty2 == "" || objdata.field.HWasterQty2 == null) {
+ // objdata.field.HWasterQty2 = 0;
+ //}
+ var sMainStr = JSON.stringify(objdata.field);
+ var sMainSub = sMainStr + ';' + refSav + ";" + sessionStorage["HUserName"];
+
$.ajax({
type: "POST",
@@ -996,6 +1073,78 @@
}
});
}
+
+ //#region 鐩戝惉杈撳叆妗嗘敼鍙樺��
+ //杈撳叆妗嗙殑鍊兼敼鍙樻椂瑙﹀彂
+ $("#HBadCount").on("input", function (e) {
+ //鑾峰彇input杈撳叆鐨勫��
+ var HBadCount = e.delegateTarget.value == '' ? '0' : e.delegateTarget.value;
+ //鑾峰彇閲囬泦鏁伴噺
+ var GatherQty = $("#GatherQty").val() == '' ? '0' : $("#GatherQty").val();
+ //鑾峰彇鍚堟牸鏁伴噺
+ var Hqy = $("#HQty").val() == '' ? '0' : $("#HQty").val();//parseFloat($("#HQty").val())
+ //鍥犲伐鎶ュ簾鏁�
+ var HWasterQty = $("#HWasterQty").val() == '' ? '0' : $("#HWasterQty").val();
+ //鍥犳枡鎶ュ簾鏁�
+ //var HWasterQty2 = $("#HWasterQty2").val() == '' ? '0' : $("#HWasterQty2").val();
+ //鍚堟牸=閲囬泦-(涓嶈壇+鎶ュ簾)GatherQty
+ Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty));
+ if (Hqy < 0)
+ {
+ layer.msg("鍚堟牸鏁伴噺涓嶈兘涓鸿礋鏁�!");
+ HBadCount = 0;
+ Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty));
+ $("#HBadCount").val(HBadCount);
+ $("#HBadCount").focus();
+ }
+ $("#HQty").val(Hqy);
+ });
+ $("#HWasterQty").on("input", function (e) {
+ //鑾峰彇input杈撳叆鐨勫��
+ var HWasterQty = e.delegateTarget.value == '' ? '0' : e.delegateTarget.value;
+ //鑾峰彇閲囬泦鏁伴噺
+ var GatherQty = $("#GatherQty").val() == '' ? '0' : $("#GatherQty").val();
+ //鑾峰彇鍚堟牸鏁伴噺
+ var Hqy = $("#HQty").val() == '' ? '0' : $("#HQty").val();//parseFloat($("#HQty").val())
+ //涓嶈壇鏁伴噺
+ var HBadCount = $("#HBadCount").val() == '' ? '0' : $("#HBadCount").val();
+ //鍥犳枡鎶ュ簾鏁�
+ //var HWasterQty2 = $("#HWasterQty2").val() == '' ? '0' : $("#HWasterQty2").val();
+ //鍚堟牸=閲囬泦-(涓嶈壇+鎶ュ簾)GatherQty
+ Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty));
+ if (Hqy < 0) {
+ layer.msg("鍚堟牸鏁伴噺涓嶈兘涓鸿礋鏁�!");
+ HWasterQty = 0;
+ Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty));
+ $("#HWasterQty").val(HWasterQty);
+ $("#HWasterQty").focus();
+ }
+ $("#HQty").val(Hqy);
+ });
+ $("#HWasterQty2").on("input", function (e) {
+ //鑾峰彇input杈撳叆鐨勫��
+ var HWasterQty2 = e.delegateTarget.value == '' ? '0' : e.delegateTarget.value;
+ //鑾峰彇閲囬泦鏁伴噺
+ var GatherQty = $("#GatherQty").val() == '' ? '0' : $("#GatherQty").val();
+ //鑾峰彇鍚堟牸鏁伴噺
+ var Hqy = $("#HQty").val() == '' ? '0' : $("#HQty").val();//parseFloat($("#HQty").val())
+ //涓嶈壇鏁伴噺
+ var HBadCount = $("#HBadCount").val() == '' ? '0' : $("#HBadCount").val();
+ //鍥犲伐鎶ュ簾鏁�
+ var HWasterQty = $("#HWasterQty").val() == '' ? '0' : $("#HWasterQty").val();
+ //鍚堟牸=閲囬泦-(涓嶈壇+鎶ュ簾)GatherQty
+ Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty) + parseFloat(HWasterQty2));
+ if (Hqy < 0) {
+ layer.msg("鍚堟牸鏁伴噺涓嶈兘涓鸿礋鏁�!");
+ HWasterQty2 = 0;
+ Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty) + parseFloat(HWasterQty2));
+ $("#HWasterQty2").val(HWasterQty2);
+ $("#HWasterQty2").focus();
+ }
+ $("#HQty").val(Hqy);
+ });
+ //#endregion
+
//浠ヤ笂涓簂ayui妯″潡
});
@@ -1014,11 +1163,11 @@
layer.msg("浜у搧缂栫爜涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if ($("#HRelBeginDate").val() == '' || $("#HWorkBeginDate").val() == null) {
+ if ($("#HWorkBeginDate").val() == '' || $("#HWorkBeginDate").val() == null) {
layer.msg("寮�宸ユ椂闂翠笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if ($("#HRelEndDate").val() == '' || $("#HRelEndDate").val() == null) {
+ if ($("#HWorkReportDate").val() == '' || $("#HWorkReportDate").val() == null) {
layer.msg("寮�宸ユ椂闂翠笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
@@ -1028,6 +1177,10 @@
}
if ($("#HEmpID").val() == '' || $("#HEmpID").val() == null) {
layer.msg("鎿嶄綔鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#GatherQty").val() == '' || $("#GatherQty").val() == null) {
+ layer.msg("閲囬泦鏁伴噺涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
if ($("#HQty").val() == '' || $("#HQty").val() == null) {
@@ -1044,9 +1197,29 @@
}
return Result;
}
-
-
-
+ //鐗╂枡
+ function GetMaterValue(obj) {
+ $("#HMaterName").val(obj[0].鐗╂枡鍚嶇О);
+ $("#HMaterNumber").val(obj[0].鐗╂枡浠ｇ爜);
+ $("#HMaterID").val(obj[0].HItemID);
+ }
+ //鐢熶骇璧勬簮
+ function GetGySource(obj) {
+ $("#HSourceName").val(obj.鐢熶骇璧勬簮鍚嶇О);
+ $("#HSourceID").val(obj.HItemID);
+ }
+ //鐢熶骇鐝粍
+ function GetHGroupValue(obj) {
+ $("#HGroupName").val(obj[0].鐝粍鍚嶇О);
+ $("#HGroupNumber").val(obj[0].鐝粍浠ｇ爜);
+ $("#HGroupID").val(obj[0].HItemID);
+ }
+ //鎿嶄綔鍛�
+ function GetHEmpValue(obj) {
+ $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+ $("#HEmpNumber").val(obj[0].鑱屽憳浠ｇ爜);
+ $("#HEmpID").val(obj[0].HItemID);
+ }
</script>
</body>
--
Gitblit v1.9.1