From 7ae052d141e69fe9e19392172fc2960134a03232 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 01 十二月 2025 15:54:52 +0800
Subject: [PATCH] 1.采购入库单列表、直接调拨单列表、其他出库单列表、生产入库列表、销售出库单列表：layui中开发 查看包装明细
---
WebTM/views/质量管理/检验取样还样单/QC_Add_TakeSampleCheckBill.html | 356 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 263 insertions(+), 93 deletions(-)
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_Add_TakeSampleCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_Add_TakeSampleCheckBill.html"
index 069def4..a59d783 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_Add_TakeSampleCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_Add_TakeSampleCheckBill.html"
@@ -10,12 +10,13 @@
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<!--寮曠敤layui js鏂囦欢-->
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/layui/layui.js"></script>
<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>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
.layui-form-label {
width: 85px;
@@ -115,21 +116,21 @@
<div class="layui-inline">
<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">
+ <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">褰撳墠宸ュ簭:</label>
<div class="layui-input-inline">
<input class="layui-input" name="HProcName" lay-verify="HProcName" id="HProcName" disabled autocomplete="off">
- <input id="HProcID" name="HProcID" type="hidden" />
+ <input id="HProcID" name="HProcID" type="hidden" value="0"/>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">璁￠噺鍗曚綅:</label>
<div class="layui-input-inline">
<input class="layui-input" name="HUnitName" lay-verify="HUnitName" id="HUnitName" disabled autocomplete="off">
- <input id="HUnitID" name="HUnitID" type="hidden" />
+ <input id="HUnitID" name="HUnitID" type="hidden" value="0" />
</div>
</div>
</div>
@@ -137,7 +138,7 @@
<div class="layui-inline">
<label class="layui-form-label">浜у搧缂栫爜</label>
<div class="layui-input-inline">
- <input type="text" name="HMaterCode" id="HMaterCode" class="layui-input" value="0" style="float:left;width:150px;" disabled>
+ <input type="text" name="HMaterCode" id="HMaterCode" class="layui-input" value="" style="float:left;width:150px;" disabled>
<input type="hidden" name="HMaterID" id="HMaterID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" id="HMaterList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -160,7 +161,7 @@
<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;">
- <input type="hidden" name="HSourceID" id="HSourceID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSourceID" id="HSourceID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceList" id="HSourceList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -171,14 +172,18 @@
<div class="layui-inline">
<label class="layui-form-label">宸ュ簭娴佽浆鍗″彿</label>
<div class="layui-input-inline">
- <input type="text" name="HProcExchBillNo" id="HProcExchBillNo" class="layui-input" value="0" disabled>
- <input type="hidden" name="HProcExchInterID" id="HProcExchInterID" class="layui-input" value="0" style="float:left;width:150px;" disabled>
- <input type="hidden" name="HProcExchEntryID" id="HProcExchEntryID" class="layui-input" value="0" style="float:left;width:150px;" disabled>
+ <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;width: 75%;display: inline-block;" readonly>
+ <input type="hidden" name="HProcExchInterID" id="HProcExchInterID" class="layui-input" value="0">
+ <input type="hidden" name="HProcExchEntryID" id="HProcExchEntryID" class="layui-input" value="0">
<input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="0">
<input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="0">
<input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" class="layui-input" value="0">
<input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="0" autocomplete="off" disabled>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProcExch" id="btnSearchProcExch" 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">娴佽浆鍗℃暟閲�:</label>
@@ -209,21 +214,21 @@
<label class="layui-form-label">浠诲姟鍗曞彿:</label>
<div class="layui-input-inline">
<input class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" disabled autocomplete="off">
- <input id="HICMOInterID" name="HICMOInterID" type="hidden" />
- <input id="HICMOEntryID" name="HICMOEntryID" type="hidden" />
+ <input id="HICMOInterID" name="HICMOInterID" type="hidden" value="0"/>
+ <input id="HICMOEntryID" name="HICMOEntryID" type="hidden" value="0"/>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">浠诲姟鍗曟暟閲�:</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HICMOQty" lay-verify="HICMOQty" id="HICMOQty" disabled autocomplete="off">
+ <input class="layui-input" name="HICMOQty" lay-verify="HICMOQty" id="HICMOQty" value="0" disabled autocomplete="off">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">閮ㄩ棬:</label>
<div class="layui-input-inline">
<input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" id="HDeptList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -233,7 +238,7 @@
<label class="layui-form-label">鐢熶骇鐝粍:</label>
<div class="layui-input-inline">
<input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" id="HGroupList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -245,7 +250,7 @@
<label class="layui-form-label">鐢熶骇鐝</label>
<div class="layui-input-inline">
<input type="text" name="HShiftsName" id="HShiftsName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HShiftsID" id="HShiftsID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HShiftsID" id="HShiftsID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HShiftsList" id="HShiftsList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -254,7 +259,50 @@
<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">
+ <input class="layui-input" name="HQty" lay-verify="HQty" id="HQty" value="0" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐮村潖鎬у疄楠屾暟閲�:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HSampleDamageQty" lay-verify="HSampleDamageQty" id="HSampleDamageQty" value="0" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閫佹祴绫诲瀷:</label>
+ <div class="layui-input-inline">
+ <select name="TestType" lay-filter="TestType" id="TestType">
+ <option value="棣栨">棣栨</option>
+ <option value="宸℃">宸℃</option>
+ <option value="鏈">鏈</option>
+ <option value="瀹為獙">瀹為獙</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">浜у搧鍗曢噸1:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HProdWeight1" lay-verify="HProdWeight1" id="HProdWeight1" value="0" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浜у搧鍗曢噸2:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HProdWeight2" lay-verify="HProdWeight2" id="HProdWeight2" value="0" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浜у搧鍗曢噸3:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HProdWeight3" lay-verify="HProdWeight3" id="HProdWeight3" value="0" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閫佹祴鍐呭</label>
+ <div class="layui-input-inline" style="width:300px;height:15px">
+ <textarea placeholder="璇疯緭鍏ラ�佹祴鍐呭" class="layui-textarea" name="HBadNote" id="HBadNote" value=""></textarea>
</div>
</div>
</div>
@@ -302,19 +350,19 @@
<div class="layui-inline">
<label class="layui-form-label">鍒跺崟鏃ユ湡:</label>
<div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ <input type="date" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">淇敼鏃ユ湡:</label>
<div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ <input type="date" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">瀹℃牳鏃ユ湡:</label>
<div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ <input type="date" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
</div>
</div>
</div>
@@ -336,13 +384,13 @@
<div class="layui-inline">
<label class="layui-form-label">鍏抽棴鏃ユ湡:</label>
<div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ <input type="date" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">浣滃簾鏃ユ湡:</label>
<div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ <input type="date" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
</div>
</div>
</div>
@@ -400,73 +448,56 @@
, laydate = layui.laydate
, element = layui.element;
//#endregion
-
- //鍒濆鍖栬〃鍗曟彃浠�
- set_InitFrom();
+
//璁板綍缁勭粐鐨勫��
var HOrgIDBar = 0;
var HOrgIDBar1 = 0;
+ var HCenterID = "";
+ $("#HInspectOrgID").prop("disabled", true);
+ $("#HSourceOrgID").prop("disabled", true);
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗�
$("#HCheckEmp").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛業D
- $("#HCheckEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛�
+ $("#HCheckEmpName").val(sessionStorage["HUserName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛�
$("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
$("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
+ $("#HDeptID").val(sessionStorage["HDeptID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬ID
+ $("#HDeptName").val(sessionStorage["HDept"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬
+ HCenterID = sessionStorage["HWorkCenterID"]; //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭宸ヤ綔涓績ID
set_AddFNew();
+ get_HWorkShift();
}
else if (OperationType == 2) {//鏈夋簮鍗�
$("#HCheckEmp").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛業D
- $("#HCheckEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛�
+ $("#HCheckEmpName").val(sessionStorage["HUserName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛�
$("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
$("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
+ $("#HDeptID").val(sessionStorage["HDeptID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬ID
+ $("#HDeptName").val(sessionStorage["HDept"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬
+ HCenterID = sessionStorage["HWorkCenterID"]; //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭宸ヤ綔涓績ID
set_AddNew();
}
else if (OperationType == 3) {//缂栬緫
set_EditFromGrid();
}
+ else if (OperationType == 4) {//澶嶅埗
+ $("#HCheckEmp").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛業D
+ $("#HCheckEmpName").val(sessionStorage["HUserName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛�
+ $("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+ $("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
+ $("#HDeptID").val(sessionStorage["HDeptID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬ID
+ $("#HDeptName").val(sessionStorage["HDept"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬
+ HCenterID = sessionStorage["HWorkCenterID"]; //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭宸ヤ綔涓績ID
+ set_EditFromGrid();
+ set_AddFNew();
+ get_HWorkShift();
+
+ }
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
}
-
-
- //鍒濆鍖栨彃浠�
- 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'
- });
- }
//#region 鍒濆鍖栫粍缁�
HSourceOrgan();
@@ -476,16 +507,21 @@
//鏃犳簮鍗曟柊澧�
function set_AddFNew() {
//鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
-
+ refSav = "Add";
+ //鍒濆鍩烘湰淇℃伅璧嬪��
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); //鍗曟嵁鏃ユ湡
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd")); //鍒跺崟鏃ユ湡
+ $("#HMaker").val(sessionStorage["HUserName"]); //鍒跺崟浜�
+ createBillNo();
}
//鏈夋簮鍗曟柊澧�
function set_AddNew() {
+ createBillNo
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")); //鍒跺崟鏃ユ湡
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); //鍗曟嵁鏃ユ湡
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd")); //鍒跺崟鏃ユ湡
$("#HMaker").val(sessionStorage["HUserName"]); //鍒跺崟浜�
//鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
@@ -494,11 +530,13 @@
$('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
$('#HDeptList').addClass("layui-btn-disabled").attr("disabled", true);
+
+ $('#btnSearchProcExch').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂娴佽浆鍗″彿鎸夐挳绂佺敤
$.ajax(
{
type: "GET",
url: GetWEBURL() + "/Sc_MESBeginWorkBill/GetQC_TakeSampleCheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
+ async: false,
data: {
"HSourceInterID": HSourceInterID,
"HSourceEntryID": HSourceEntryID,
@@ -535,6 +573,9 @@
$("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //鐢熶骇璁㈠崟瀛怚D
$("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //鐢熶骇璁㈠崟
$("#HICMOQty").val(LoadData[0].HICMOPlanQty); //鐢熶骇璁㈠崟鏁伴噺
+ HCenterID = LoadData[0].HCenterID == null ? sessionStorage["HWorkCenterID"] : LoadData[0].HCenterID;//宸ヤ綔涓績id
+ //鑾峰彇鐝
+ get_HWorkShift()
}
else {
layer.alert(data.Message, { icon: 5 });
@@ -571,8 +612,8 @@
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data;
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HInterID": data[0]["hmainid"]
- , "HBillNo": data[0]["鍗曟嵁鍙�"]
+ "HInterID": OperationType == 4 ? "" : data[0]["hmainid"]
+ , "HBillNo": OperationType ==4 ? "" : data[0]["鍗曟嵁鍙�"]
, "HDate": formatDate(data[0]["鏃ユ湡"])
, "HDeptID": data[0]["HDeptID"] //閮ㄩ棬ID
, "HDeptName": data[0]["閮ㄩ棬"] //閮ㄩ棬鍚嶇О
@@ -589,6 +630,12 @@
, "HCheckEmp": data[0]["HCheckEmp"] //鍙栨牱鍛業D
, "HCheckEmpName": data[0]["鍙栨牱鍛�"] //鍙栨牱鍛�
, "HQty": data[0]["鍙栨牱鏁伴噺"] //鍙栨牱鏁伴噺
+ , "HSampleDamageQty": data[0]["鐮村潖鎬у疄楠屾暟閲�"] //鐮村潖鎬у疄楠屾暟閲�
+ , "HBadNote": data[0]["鎶ュ簾鍐呭"] //鎶ュ簾鍐呭
+ , "HProdWeight1": data[0]["浜у搧鍗曢噸1"] //浜у搧鍗曢噸1
+ , "HProdWeight2": data[0]["浜у搧鍗曢噸2"] //浜у搧鍗曢噸2
+ , "HProdWeight3": data[0]["浜у搧鍗曢噸3"] //浜у搧鍗曢噸3
+ , "TestType": data[0]["閫佹祴绫诲瀷"] //閫佹祴绫诲瀷
, "HGroupID": data[0]["HGroupID"] //鐝粍ID
, "HGroupName": data[0]["鐢熶骇鐝粍"] //鐝粍鍚嶇О
, "HShiftsID": data[0]["HShiftsID"] //鐝ID
@@ -631,29 +678,20 @@
}
- //鍒ゆ柇鏄惁鏂板
- if (linterid == null || linterid == 0) {
- //鑾峰彇鏈�澶у崟鎹彿 new
- $("#HInterID").val("0");
- $("#HBillNo").val("");
+
+ //#region 鐢熸垚鍗曟嵁鍙�
+ function createBillNo() {
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
data: { "HBillType": '7521' },
success: function (d) {
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HInterID").val(0);
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
}
});
- $("#HInspectOrgID").prop("disabled", true);
- $("#HSourceOrgID").prop("disabled", true);
}
- else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
- $("#HInspectOrgID").prop("disabled", true);
- $("#HSourceOrgID").prop("disabled", true);
- }
-
+ //#endregion
//淇濆瓨鎻愪氦
form.on('submit(Saver)', function (data) {
@@ -712,7 +750,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -752,7 +790,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html?Htype=&openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -866,7 +904,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.html?type=HShifts', 'yes'],
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_WorkShiftList.html?type=HWorkShifts', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -877,7 +915,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HShiftsName").val(checkStatus.data[0].鐝鍚嶇О);
- $("#HShiftsID").val(checkStatus.data[0].HItemID);
+ $("#HShiftsID").val(checkStatus.data[0].HInterID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -904,7 +942,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?openType=2&HOrgName=' + sessionStorage["Organization"], 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -916,6 +954,67 @@
}
$("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
$("#HDeptID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //琛ㄥご淇℃伅宸ュ簭娴佽浆鍗″脊绐�
+ form.on('submit(btnSearchProcExch)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '宸ュ簭娴佽浆鍗″垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList_Source.html?openType=1', '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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HProcID").val(checkStatus.data[0].HProcID); //褰撳墠宸ュ簭ID
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭); //褰撳墠宸ュ簭
+ $("#HMaterID").val(checkStatus.data[0].HMaterID); //浜у搧ID
+ $("#HMaterCode").val(checkStatus.data[0].浜у搧浠ｇ爜); //浜у搧浠ｇ爜
+ $("#HMaterName").val(checkStatus.data[0].浜у搧); //浜у搧鍚嶇О
+ $("#HMaterSpec").val(checkStatus.data[0].瑙勬牸鍨嬪彿); //浜у搧瑙勬牸
+ $("#HUnitID").val(checkStatus.data[0].HUnitID); //璁￠噺鍗曚綅id
+ $("#HUnitName").val(checkStatus.data[0].鍗曚綅); //璁￠噺鍗曚綅
+ $("#HSourceID").val(checkStatus.data[0].HSourceID); //鐢熶骇璧勬簮ID
+ $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮); //鐢熶骇璧勬簮
+ $("#HMainSourceBillNo").val(checkStatus.data[0].鍗曟嵁鍙�); //婧愬崟鍗曞彿
+ $("#HMainSourceInterID").val(checkStatus.data[0].hmainid); //婧愬崟涓诲唴鐮�
+ $("#HMainSourceEntryID").val(checkStatus.data[0].hsubid); //婧愬崟瀛愬唴鐮�
+ $("#HMainSourceBillType").val(3772); //婧愬崟绫诲瀷
+ $("#HProcExchBillNo").val(checkStatus.data[0].鍗曟嵁鍙�); //娴佽浆鍗″彿
+ $("#HProcExchInterID").val(checkStatus.data[0].hmainid); //娴佽浆鍗′富鍐呯爜(鍙栧�糎InterID)
+ $("#HProcExchEntryID").val(checkStatus.data[0].hsubid); //娴佽浆鍗″瓙鍐呯爜(婧愬崟琛屽彿)
+ $("#HBatchNo").val(checkStatus.data[0].HBatchNo); //娴佽浆鍗℃壒娆�
+ $("#HProcExchQty").val(checkStatus.data[0].娴佽浆鍗℃暟閲�); //娴佽浆鍗℃暟閲�
+ $("#HDeptID").val(checkStatus.data[0].HWorkShopID); //杞﹂棿ID
+ $("#HDeptName").val(checkStatus.data[0].鐢熶骇杞﹂棿); //杞﹂棿
+ $("#HICMOInterID").val(checkStatus.data[0].HICMOInterID); //鐢熶骇璁㈠崟ID
+ $("#HICMOEntryID").val(checkStatus.data[0].HICMOEntryID); //鐢熶骇璁㈠崟瀛怚D
+ $("#HICMOBillNo").val(checkStatus.data[0].浠诲姟鍗曞彿); //鐢熶骇璁㈠崟
+ $("#HICMOQty").val(checkStatus.data[0].浠诲姟鍗曟暟閲�); //鐢熶骇璁㈠崟鏁伴噺
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -1033,6 +1132,32 @@
}
//#endregion
+ //鑾峰彇鐝
+ function get_HWorkShift() {
+ var HDeptID = $("#HDeptID").val();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_ShiftsController/Get_HWorkShift", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: {
+ "HDeptID": HDeptID,
+ "HCenterID": HCenterID
+ },
+ success: function (data) {
+ if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ {
+ var LoadData = data.data;
+ $("#HShiftsID").val(LoadData[0].HInterID); //褰撳墠宸ュ簭ID
+ $("#HShiftsName").val(LoadData[0].鐝); //褰撳墠宸ュ簭
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ layer.alert(err, { icon: 5 });
+ }
+ });
+ }
//浠ヤ笂涓簂ayui妯″潡
});
@@ -1093,8 +1218,18 @@
if (day.length < 2) day = '0' + day;
return [year, month, day].join('-');
+ }
+ function GetGyMaterial(obj) { //鐗╂枡
+ $("#HMaterName").val(obj.鐗╂枡鍚嶇О);
+ $("#HMaterCode").val(obj.鐗╂枡浠ｇ爜);
+ $("#HMaterSpec").val(obj.瑙勬牸鍨嬪彿);
+ $("#HMaterID").val(obj.HItemID);
}
+ function GetHDeptNameValue(obj) { //閮ㄩ棬
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(obj[0].HItemID);
+ }
//鎿嶄綔鍛�
function GetHEmpValue(obj) {
$("#HCheckEmpName").val(obj[0].鑱屽憳鍚嶇О);
@@ -1106,9 +1241,44 @@
$("#HGroupID").val(obj[0].HItemID);
}
//鐝
- function GetHShiftsValue(obj) {
+ function GetHWorkShiftsValue(obj) {
$("#HShiftsName").val(obj[0].鐝鍚嶇О);
- $("#HShiftsID").val(obj[0].HItemID);
+ $("#HShiftsID").val(obj[0].HInterID);
+ }
+
+ //鐢熶骇璧勬簮
+ function GetGySource(obj) {
+ $("#HSourceName").val(obj[0].鐢熶骇璧勬簮鍚嶇О);
+ $("#HSourceID").val(obj[0].HInterID);
+ }
+
+ //宸ュ簭娴佽浆鍗�
+ function GetProcessExchangeBillValue(obj) {
+ $("#HProcID").val(obj[0].HProcID); //褰撳墠宸ュ簭ID
+ $("#HProcName").val(obj[0].宸ュ簭); //褰撳墠宸ュ簭
+ $("#HMaterID").val(obj[0].HMaterID); //浜у搧ID
+ $("#HMaterCode").val(obj[0].浜у搧浠ｇ爜); //浜у搧浠ｇ爜
+ $("#HMaterName").val(obj[0].浜у搧); //浜у搧鍚嶇О
+ $("#HMaterSpec").val(obj[0].瑙勬牸鍨嬪彿); //浜у搧瑙勬牸
+ $("#HUnitID").val(obj[0].HUnitID); //璁￠噺鍗曚綅id
+ $("#HUnitName").val(obj[0].鍗曚綅); //璁￠噺鍗曚綅
+ $("#HSourceID").val(obj[0].HSourceID); //鐢熶骇璧勬簮ID
+ $("#HSourceName").val(obj[0].鐢熶骇璧勬簮); //鐢熶骇璧勬簮
+ $("#HMainSourceBillNo").val(obj[0].鍗曟嵁鍙�); //婧愬崟鍗曞彿
+ $("#HMainSourceInterID").val(obj[0].hmainid); //婧愬崟涓诲唴鐮�
+ $("#HMainSourceEntryID").val(obj[0].hsubid); //婧愬崟瀛愬唴鐮�
+ $("#HMainSourceBillType").val(3772); //婧愬崟绫诲瀷
+ $("#HProcExchBillNo").val(obj[0].鍗曟嵁鍙�); //娴佽浆鍗″彿
+ $("#HProcExchInterID").val(obj[0].hmainid); //娴佽浆鍗′富鍐呯爜(鍙栧�糎InterID)
+ $("#HProcExchEntryID").val(obj[0].hsubid); //娴佽浆鍗″瓙鍐呯爜(婧愬崟琛屽彿)
+ $("#HBatchNo").val(obj[0].HBatchNo); //娴佽浆鍗℃壒娆�
+ $("#HProcExchQty").val(obj[0].娴佽浆鍗℃暟閲�); //娴佽浆鍗℃暟閲�
+ $("#HDeptID").val(obj[0].HWorkShopID); //杞﹂棿ID
+ $("#HDeptName").val(obj[0].鐢熶骇杞﹂棿); //杞﹂棿
+ $("#HICMOInterID").val(obj[0].HICMOInterID); //鐢熶骇璁㈠崟ID
+ $("#HICMOEntryID").val(obj[0].HICMOEntryID); //鐢熶骇璁㈠崟瀛怚D
+ $("#HICMOBillNo").val(obj[0].浠诲姟鍗曞彿); //鐢熶骇璁㈠崟
+ $("#HICMOQty").val(obj[0].浠诲姟鍗曟暟閲�); //鐢熶骇璁㈠崟鏁伴噺
}
function GetSwipeCardStart(obj) {
--
Gitblit v1.9.1