From e192600a773d5b4afe4c5ad3d4a13773c0f61d29 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 26 五月 2025 09:18:31 +0800
Subject: [PATCH] 报表更新
---
WebTM/views/生产管理/生产任务单/Sc_ICMOBillEdit_NoTable.html | 850 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 733 insertions(+), 117 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
index d872424..674e056 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
@@ -14,6 +14,7 @@
<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/PageTitle.js"></script>
<style>
.main-btn { /*澶撮儴涓绘寜閽�*/
padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
@@ -63,6 +64,7 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCancelltion" id="set_AbandonCancelltion">鍙嶄綔搴�</button>
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
+ <h1 style="text-align: center; padding: 10px 0;"><b>鐢熶骇璁㈠崟</b></h1>
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
<li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
@@ -80,7 +82,7 @@
<input type="hidden" name="HSTOCKINORGID" id="HSTOCKINORGID" lay-verify="HSTOCKINORGID">
</div>
</div>
-
+
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏃ユ湡*</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -98,8 +100,66 @@
</button>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">閿�鍞鍗曠被鍨�</label>
+ <div class="layui-input-inline">
+ <select name="HMainSourceBillSubType" id="HMainSourceBillSubType" lay-filter="HMainSourceBillSubType" disabled="disabled" style="width: 180px; ">
+ <option style="color:blue;" selected="selected" value=""></option>
+ <option style="color:blue;" value="0">鏅�氬崟鎹�</option>
+ <option style="color:blue;" value="1">杩斾慨鍗曟嵁</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">涓氬姟鐘舵��</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HSTATUS" lay-filter="HSTATUS" id="HSTATUS">
+ <option value="1">璁″垝</option>
+ <option value="2">璁″垝纭</option>
+ <option value="3">涓嬭揪</option>
+ <option value="4" selected>寮�宸�</option>
+ <option value="5">瀹屽伐</option>
+ <option value="6">缁撴</option>
+ <option value="7">缁撶畻</option>
+ </select>
+ </div>
+ </div>
</div>
<div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">閿�鍞槸鍚﹀彇搴撳瓨</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 70px;">
+ <select name="HIsStockQty_SeOrderBill" lay-filter="HIsStockQty_SeOrderBill" id="HIsStockQty_SeOrderBill">
+ <option value="0" selected>鍚�</option>
+ <option value="1">鏄�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇鏄惁鍙栧簱瀛�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 70px;">
+ <select name="HIsStockQty" lay-filter="HIsStockQty" id="HIsStockQty">
+ <option value="0" selected>鍚�</option>
+ <option value="1">鏄�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">璁″垝鐢熶骇鏁伴噺*</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HQty" lay-verify="HQty" id="HQty" style="width:70px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">璁￠噺鍗曚綅*</label>
+ <div class="layui-input-block" style="margin-left: 71px;">
+ <input type="text" class="layui-input" lay-verify="HUnitName" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HUnitID" id="HUnitID" lay-verify="HUnitID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHUnit" id="btnHUnit" 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" style="width: 85px;padding: 9px 18px;">涓氬姟鍛�</label>
<div class="layui-input-block" style="margin-left: 77px;">
@@ -111,22 +171,11 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐢熶骇杞﹂棿</label>
- <div class="layui-input-block" style="margin-left: 71px;">
- <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" 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" style="width: 51%;">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹㈡埛</label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" lay-verify="HCusName" name="HCusName" id="HCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HCusName" name="HCusName" id="HCusName" style="background-color:#efefef4d;width: 43%;display: inline-block;" readonly>
<input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCus" id="btnHCus" style="padding: 0 10px; float: right; margin-right: 210px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCus" id="btnHCus" style="padding: 0 10px;margin-right: 85px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
@@ -134,15 +183,9 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">璁″垝鐢熶骇鏁伴噺*</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HQty" lay-verify="HQty" id="HQty">
- </div>
- </div>
- <div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鐗╂枡缂栫爜*</label>
<div class="layui-input-block" style="margin-left: 71px;">
- <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="width: 60%;display: inline-block;">
<input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMater" id="btnHMater" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -161,40 +204,126 @@
<input type="text" class="layui-input" name="HModel" lay-verify="HModel" id="HModel" style="background-color:#efefef4d;display: inline-block;" readonly>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">骞呭</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HWidth" lay-verify="HWidth" id="HWidth" value="0" style="background-color:#efefef4d;display: inline-block;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍏嬮噸</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HWeight" lay-verify="HWeight" id="HWeight" value="0" style="background-color:#efefef4d;display: inline-block;" readonly>
+ </div>
+ </div>
</div>
<div class="layui-row">
<!--<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐢熶骇璧勬簮</label>
- <div class="layui-input-block" style="margin-left: 75px;">
- <input type="text" class="layui-input" lay-verify="HSourceName" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HSourceID" id="HSourceID" lay-verify="HSourceID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>-->
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇璧勬簮</label>
+ <div class="layui-input-block" style="margin-left: 75px;">
+ <input type="text" class="layui-input" lay-verify="HSourceName" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HSourceID" id="HSourceID" lay-verify="HSourceID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" 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" style="width: 85px;">璁￠噺鍗曚綅*</label>
- <div class="layui-input-block" style="margin-left: 71px;">
- <input type="text" class="layui-input" lay-verify="HUnitName" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HUnitID" id="HUnitID" lay-verify="HUnitID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHUnit" id="btnHUnit" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <label class="layui-form-label" style="width: 50px;">杈呮暟閲�</label>
+ <div class="layui-input-inline" style="margin-left: 1px;">
+ <input type="text" class="layui-input" name="HAuxQty" lay-verify="HAuxQty" style="width:70px" id="HAuxQty" value="0">
+ </div>
+ </div>
+ <div class="layui-inline" style="margin-left:-140px;">
+ <label class="layui-form-label" style="width: 30px;">杈呭姪鍗曚綅</label>
+ <div class="layui-input-inline" style="margin-left: 1px;margin-top:10px;">
+ <input type="text" class="layui-input" lay-verify="HAuxUnitName" name="HAuxUnitName" id="HAuxUnitName" style="background-color:#efefef4d;width: 30%;display: inline-block;" readonly>
+ <input type="hidden" name="HAuxUnit" id="HAuxUnit" lay-verify="HAuxUnit" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHAuxUnit" id="btnHAuxUnit" style="padding: 0 10px;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
</div>
+ <div class="layui-inline" style="margin-left:-100px;">
+ <label class="layui-form-label" style="width: 85px;">鏌撹壊瑕佹眰</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HColorRemark" lay-verify="HColorRemark" id="HColorRemark">
+ </div>
+ </div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">涓氬姟鐘舵��</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
- <select name="HSTATUS" lay-filter="HSTATUS" id="HSTATUS">
- <option value="1">璁″垝</option>
- <option value="2">璁″垝纭</option>
- <option value="3">涓嬭揪</option>
- <option value="4" selected>寮�宸�</option>
- <option value="5">瀹屽伐</option>
- <option value="6">缁撴</option>
- <option value="7">缁撶畻</option>
- </select>
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇瑙勬牸</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HRemark_New" lay-verify="HRemark_New" id="HRemark_New">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇骞呭</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HWidth_New" lay-verify="HWidth_New" id="HWidth_New" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇鍏嬮噸</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HWeight_New" lay-verify="HWeight_New" id="HWeight_New" style="display: inline-block;" value="0">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 50px;">杈呮暟閲�2</label>
+ <div class="layui-input-inline" style="margin-left: 1px;">
+ <input type="text" class="layui-input" name="HAuxQty2" lay-verify="HAuxQty2" style="width:70px" id="HAuxQty2" value="0">
+ </div>
+ </div>
+ <div class="layui-inline" style="margin-left:-140px;">
+ <label class="layui-form-label" style="width: 30px;">杈呭姪鍗曚綅2</label>
+ <div class="layui-input-inline" style="margin-left: 1px;margin-top:10px;">
+ <input type="text" class="layui-input" lay-verify="HAuxUnitName2" name="HAuxUnitName2" id="HAuxUnitName2" style="background-color:#efefef4d;width: 30%;display: inline-block;" readonly>
+ <input type="hidden" name="HAuxUnit2" id="HAuxUnit2" lay-verify="HAuxUnit2" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHAuxUnit2" id="btnHAuxUnit2" style="padding: 0 10px;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹㈡埛鐗╂枡缂栫爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCusMaterNumber" lay-verify="HCusMaterNumber" id="HCusMaterNumber" style="display: inline-block;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹㈡埛鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCusMaterName" lay-verify="HCusMaterName" id="HCusMaterName" style="display: inline-block;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹㈡埛瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCusModel" lay-verify="HCusModel" id="HCusModel" style="display: inline-block;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">璁″垝寮�宸ユ棩鏈�</label>
+ <div class="layui-input-block" style="margin-left: 115px;">
+ <input type="date" class="layui-input" lay-verify="HPlanBeginDate" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 80px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">璁″垝瀹屽伐鏈�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="date" class="layui-input" lay-verify="HPlanEndDate" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 80px;">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline" style="width: 56%;">
+ <label class="layui-form-label" style="width: 85px;">鐧藉澂瑕佹眰</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
</div>
</div>
<div class="layui-inline">
@@ -207,54 +336,16 @@
</div>
</div>
<div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">杈呮暟閲�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HAuxQty" lay-verify="HAuxQty" id="HAuxQty" value="0">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">杈呭姪鍗曚綅</label>
- <div class="layui-input-block" style="margin-left: 80px;">
- <input type="text" class="layui-input" lay-verify="HAuxUnitName" name="HAuxUnitName" id="HAuxUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HAuxUnit" id="HAuxUnit" lay-verify="HAuxUnit" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHAuxUnit" id="btnHAuxUnit" 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" style="width: 85px;">骞呭</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HWidth" lay-verify="HWidth" id="HWidth" style="background-color:#efefef4d;display: inline-block;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍏嬮噸</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HWeight" lay-verify="HWeight" id="HWeight" style="background-color:#efefef4d;display: inline-block;" readonly>
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">璁″垝寮�宸ユ棩鏈�</label>
- <div class="layui-input-block" style="margin-left: 115px;">
- <input type="date" class="layui-input" lay-verify="HPlanBeginDate" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 80px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">璁″垝寮�瀹屽伐鏈�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="date" class="layui-input" lay-verify="HPlanEndDate" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 80px;">
- </div>
- </div>
- </div>
- <div class="layui-row">
<div class="layui-inline" style="width: 56%;">
- <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
+ <label class="layui-form-label" style="width: 85px;">搴曢儴澶囨敞</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ <input type="text" class="layui-input" name="HRemark3" id="HRemark3" lay-verify="HRemark3" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">璁㈠崟鍖呰澶囨敞</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HOrderPickRemark" lay-verify="HOrderPickRemark" id="HOrderPickRemark" style="display: inline-block;">
</div>
</div>
</div>
@@ -378,6 +469,36 @@
</div>
</div>
</div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇杞﹂棿</label>
+ <div class="layui-input-block" style="margin-left: 71px;">
+ <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" 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" style="width: 85px;">璁㈠崟璺熻釜鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HPlanOrderProcNo" id="HPlanOrderProcNo" value="" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+
+ <!--闅愯棌瀛楁-->
+ <div class="layui-row" style="display:none;">
+ <div class="layui-inline">
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="hidden" name="HSourceInterID" id="HSourceInterID" lay-verify="HSourceInterID" value="0">
+ <input type="hidden" name="HSourceEntryID" id="HSourceEntryID" lay-verify="HSourceEntryID" value="0">
+ <input type="hidden" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" value="">
+ <input type="hidden" name="HSourceBillType" id="HSourceBillType" lay-verify="HSourceBillType" value="">
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -387,6 +508,11 @@
</div>
</div>
<script>
+ //#region 鏂囨湰妗嗚緭鍏ユ悳绱㈢浉鍏虫暟鎹�-鍙橀噺
+ var childPage = null; //鑾峰彇瀛愮獥鍙ｅ璞★紝鐢ㄤ簬鎿嶄綔瀛愮獥鍙ｇ殑鍙橀噺鍜屾柟娉�
+ var currRowIndex = 0; //鐢ㄤ簬瀹氫綅瀛愮獥鍙ｅ綋鍓嶉�変腑鐨勮
+ var childData = null; //鐢ㄤ簬鑾峰彇瀛愮獥鍙ｈ繑鍥炵殑鏁版嵁
+ //#endregion
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -406,9 +532,17 @@
var option = [];
var num = 0;
+ var HIsStockQtyTemp = "0"; //璁板綍鏄惁鍙栧簱瀛樺��
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ var HModuleType = "3710";
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+ $("h1").html('<b>' + HPageTitle + '</b>');
+ //#endregion
//鍒濆鍖�
set_ClearBill();
@@ -431,17 +565,148 @@
}
});
}
- else {//濡傛灉淇敼鍒欒蛋涓嬮潰
+ else if (OperationType == 2) {
+ RoadBillMain(linterid);
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3710' },
+ success: function (d) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ }
+ });
+ }
+ else if (OperationType == 3) {//濡傛灉淇敼鍒欒蛋涓嬮潰
//绂佺敤缁勭粐閫夐」
$("#HPRDORGID").attr("disabled", true);
$("#HDate").attr("disabled", true);
RoadBillMain(linterid);
}
+ else if (OperationType == 4) { //閿�鍞鍗曚笅鎺ㄧ敓浜ц鍗�-椤甸潰鍒濆鍖�
+ setInit_PushBill();
+ }
HfBtn();
+ $('#HIsStockQty_SeOrderBill').prop('disabled', true);
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //#region 琛ㄥご鍩虹璧勬枡閫夋嫨寮圭獥
+ //#region 鏂囨湰妗嗙洃鍚�
+ $(document).ready(function () {
+ //#region 鏍规嵁鐗╂枡浠ｇ爜鑾峰彇鐗╂枡鍩虹璧勬枡绛涢�夊脊绐�
+ //鏍规嵁鍏冪礌ID瀵瑰厓绱犺繘琛岀洃鍚�=============================================================================
+ $("#HMaterNumber").on('keydown', function (data) {
+ //================================================================================================
+ var errKeys = ["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Enter"];
+ if ($.inArray(event.key, errKeys) == -1) { //濡傛灉鎸変笅鐨勯敭浣嶄笉鏄� 鏂瑰悜閿紝鍒欏埛鏂板脊绐椾腑鐨勬暟鎹�
+ if (childPage == null) { //鍒ゆ柇褰撳墠瀛愮獥鍙ｆ槸鍚﹀凡缁忔墦寮�锛岃嫢鏈墦鍗★紝鍒欐墦寮�椤甸潰锛屽苟鑾峰彇瀛愮獥鍙ｇ殑瀵硅薄
+ var offset = $(this).offset(); //鑾峰彇瑙﹀彂浜嬩欢鐨勫厓绱犵殑浣嶇疆锛岀敤浜庡畾浣嶅瓙绐楀彛鎵撳紑鐨勪綅缃�
+ var innerHeight = window.innerHeight;
+ var top = offset.top + 0.05 * innerHeight;
+ var left = offset.left;
+ if (top + 0.05 * innerHeight + 0.3 * innerHeight > innerHeight) {
+ top = top - 0.3 * innerHeight - 0.05 * innerHeight;
+ }
+ layer.open({
+ type: 2 //寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['25%', '30%'] //澶у皬
+ , shadeClose: true //鐐瑰嚮閬僵鏃跺叧闂脊绐�
+ , offset: [top, left]
+ , title: false //涓嶆樉绀烘爣棰樻爮
+ //, title: '椤圭洰璐圭敤鍒楄〃' //鏍囬
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , closeBtn: 0 //绂佺敤鍏抽棴鎸夐挳
+ , content: ["../../鍩虹璧勬枡/閫氱敤鍩虹璧勬枡/Gy_CommonBaseData.html?OperationType=2", "yes"]
+ , success: function (layero, index) {
+ setTimeout(function () {
+ //淇敼锛屾牴鎹枃鏈鏁版嵁锛岀紪鍐欐煡璇㈣鍙�================================================================================================
+ var value = $("#HMaterNumber").val().replace(/'/g, ""); //鑾峰彇鏂囨湰妗嗘渶鏂板��
+ currRowIndex = 0;
+ var tableView = "h_v_Gy_MaterialList";
+ var childSWhere = "select top(10) HItemID,鐗╂枡浠ｇ爜,鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,HUnitID,璁￠噺鍗曚綅鍚嶇О,骞呭,鍏嬮噸,鏌撹壊瑕佹眰,澶囨敞 from " + tableView + " where 1=1 and 缁勭粐鍚嶇О = '" + sessionStorage["Organization"] + "' and (鐗╂枡浠ｇ爜 like '%" + value + "%' or 鐗╂枡鍚嶇О like '%" + value + "%') order by 鐗╂枡浠ｇ爜 desc";
+ childPage.getData(childSWhere, tableView);
+ //===================================================================================================================================
+ }, 200);
+ }
+ , end: function () {
+ childPage = null;
+ currRowIndex = 0;
+ if (childData != null) {
+ //鏍规嵁寮圭獥杩斿洖鏁版嵁璁剧疆鏂囨湰妗嗘暟鎹�=================================================================================================
+ //鑾峰彇鏁版嵁
+ $("#HMaterID").val(childData.HItemID);
+ $("#HMaterNumber").val(childData.鐗╂枡浠ｇ爜);
+ $("#HMaterName").val(childData.鐗╂枡鍚嶇О);
+ $("#HModel").val(childData.瑙勬牸鍨嬪彿);
+ $("#HUnitID").val(childData.HUnitID);//璁￠噺鍗曚綅id
+ $("#HUnitName").val(childData.璁￠噺鍗曚綅鍚嶇О);//璁￠噺鍗曚綅鍚嶇О
+ $("#HWidth").val(childData.骞呭);//骞呭
+ $("#HWeight").val(childData.鍏嬮噸);//鍏嬮噸
+ $("#HColorRemark").val(childData.鏌撹壊瑕佹眰);//鏌撹壊瑕佹眰
+ $("#HRemark").val(childData.澶囨敞);//澶囨敞
+ //===============================================================================================================================
+
+ childData = null;
+ }
+ }
+ });
+ } else {
+ setTimeout(function () {
+ //淇敼锛屾牴鎹枃鏈鏁版嵁锛岀紪鍐欐煡璇㈣鍙�================================================================================================
+ var value = $("#HMaterNumber").val().replace(/'/g, ""); //鑾峰彇鏂囨湰妗嗘渶鏂板��
+ currRowIndex = 0;
+ var tableView = "h_v_Gy_MaterialList";
+ var childSWhere = "select top(10) HItemID,鐗╂枡浠ｇ爜,鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,HUnitID,璁￠噺鍗曚綅鍚嶇О,骞呭,鍏嬮噸,鏌撹壊瑕佹眰,澶囨敞 from " + tableView + " where 1=1 and 缁勭粐鍚嶇О = '" + sessionStorage["Organization"] + "' and (鐗╂枡浠ｇ爜 like '%" + value + "%' or 鐗╂枡鍚嶇О like '%" + value + "%') order by 鐗╂枡浠ｇ爜 desc";
+ childPage.getData(childSWhere, tableView);
+ //=================================================================================================================================
+ }, 200);
+ }
+ } else { //濡傛灉鎸変笅鐨勯敭浣嶆槸 鏂瑰悜閿紝鍒欒皟鏁寸獥鍙ｄ腑 閫変腑琛� 鐨勪綅缃�
+ if (event.key == "ArrowUp") {
+ currRowIndex--;
+ childPage.setSelectedRow(currRowIndex);
+ } else if (event.key == "ArrowDown") {
+ currRowIndex++;
+ childPage.setSelectedRow(currRowIndex);
+ } else if (event.key == "Enter") {
+ //鎵嬪姩澶辩劍
+ var element = document.getElementById("HMaterNumber");
+ element.blur();
+
+ childPage.getSelectedData(currRowIndex);
+
+ if (childData != null) {
+ //鏍规嵁寮圭獥杩斿洖鏁版嵁璁剧疆鏂囨湰妗嗘暟鎹�=================================================================================================
+ //鑾峰彇鏁版嵁
+ $("#HMaterID").val(childData.HItemID);
+ $("#HMaterNumber").val(childData.鐗╂枡浠ｇ爜);
+ $("#HMaterName").val(childData.鐗╂枡鍚嶇О);
+ $("#HModel").val(childData.瑙勬牸鍨嬪彿);
+ $("#HUnitID").val(childData.HUnitID);//璁￠噺鍗曚綅id
+ $("#HUnitName").val(childData.璁￠噺鍗曚綅鍚嶇О);//璁￠噺鍗曚綅鍚嶇О
+ $("#HWidth").val(childData.骞呭);//骞呭
+ $("#HWeight").val(childData.鍏嬮噸);//鍏嬮噸
+ $("#HColorRemark").val(childData.鏌撹壊瑕佹眰);//鏌撹壊瑕佹眰
+ $("#HRemark").val(childData.澶囨敞);//澶囨敞
+ //===============================================================================================================================
+
+ childData = null;
+ }
+
+
+ childPage = null;
+ currRowIndex = 0;
+ childData = null;
+ }
+ }
+ });
+ //#endregion
+ });
+ //#endregion
+ //#endregion
//閫夋嫨閿�鍞鍗曞彿鎸夐挳
form.on('submit(btnHSeOrder)', function () {
@@ -488,6 +753,11 @@
get_btnHAuxUnit();
});
+ //閫夋嫨杈呭姪鍗曚綅2鎸夐挳
+ form.on('submit(btnHAuxUnit2)', function () {
+ get_btnHAuxUnit2();
+ });
+
//閫夋嫨BOM鎸夐挳
form.on('submit(btnBom)', function () {
get_btnBom();
@@ -504,6 +774,26 @@
//淇濆瓨鎻愪氦
form.on('submit(btnSave)', function (data) {//鎻愪氦
+ //#region 鍒ゆ柇婧愬崟鐘舵��
+ var HSourceBillData = "";
+ var HSourceBillData = getSourceBillStatus_SeOrderBill(); //鑾峰彇婧愬崟鏁版嵁
+ if (HSourceBillData != "none") {
+ if (HSourceBillData.length == 0) {
+ if ($("#HSourceInterID").val() != 0) {
+ layer.alert("淇濆瓨澶辫触!鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
+ return;
+ }
+ } else if (HSourceBillData[0]["鐘舵��"] != "宸插鏍�") {
+ layer.alert("淇濆瓨澶辫触!婧愬崟鍗曟嵁鐘舵�佹湭涓�'宸插鏍�'鐘舵��!", { icon: 5 });
+ return;
+ }
+ } else {
+ return;
+ }
+ //#endregion
+
+
+
if (AllowLoadData(data)) {
set_AddNew(data);
}
@@ -545,6 +835,21 @@
$("#HSTOCKINORGID").val(data.value);
});
+ //#region 鏄惁鍙栧簱瀛樹笅鎷夊垪琛ㄧ洃鍚�
+ form.on('select(HIsStockQty)', function (data) {
+ var HIsStockQtyTemp1 = $("#HIsStockQty").val();
+ $("#HIsStockQty").val(HIsStockQtyTemp);
+ form.render("select");
+ layer.confirm("纭畾瑕佷慨鏀规槸鍚﹀彇搴撳瓨鍚�?", function (index) {
+ var wait = layer.load();
+ $("#HIsStockQty").val(HIsStockQtyTemp1);
+ HIsStockQtyTemp = $("#HIsStockQty").val();
+ form.render("select");
+ layer.close(wait);
+ layer.closeAll();
+ })
+ });
+ //#endregion
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -608,6 +913,11 @@
$("#HSeOrderBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
$("#HSeOrderEntryID").val(checkStatus.data[0].hsubid);
+ $("#HSourceInterID").val(checkStatus.data[0].hmainid);
+ $("#HSourceEntryID").val(checkStatus.data[0].hsubid);
+ $("#HSourceBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+ $("#HSourceBillType").val("1401");
+
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -622,7 +932,7 @@
, area: ['90%', '90%']//澶у皬
, title: '涓氬姟鍛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?type=HEmp', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -657,8 +967,10 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
//鑾峰彇鏁版嵁
- $("#HCusID").val(checkStatus.data[0].HItemID);
- $("#HCusName").val(checkStatus.data[0].瀹㈡埛鍚嶇О);
+ //$("#HCusID").val(checkStatus.data[0].HItemID);
+ //$("#HCusName").val(checkStatus.data[0].瀹㈡埛鍚嶇О);
+
+ getCustomerByCusID(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -674,7 +986,7 @@
, area: ['90%', '90%']//澶у皬
, title: "鐢熶骇杞﹂棿鍒楄〃" //鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -684,7 +996,7 @@
}
//鑾峰彇鏁版嵁
$("#HDeptID").val(checkStatus.data[0].HItemID);
- $("#HDeptName").val(checkStatus.data[0].HName);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -700,7 +1012,7 @@
, area: ['90%', '90%']//澶у皬
, title: '宸ヤ綔涓績'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -710,7 +1022,7 @@
}
//鑾峰彇鏁版嵁
$("#HCenterID").val(checkStatus.data[0].HItemID);
- $("#HCenterName").val(checkStatus.data[0].宸ヤ綔涓績);
+ $("#HCenterName").val(checkStatus.data[0].宸ヤ綔涓績鍚嶇О);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -741,8 +1053,9 @@
$("#HModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
$("#HUnitID").val(checkStatus.data[0].HUnitID);//璁￠噺鍗曚綅id
$("#HUnitName").val(checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О);//璁￠噺鍗曚綅鍚嶇О
- $("#HWidth").val(checkStatus.data[0].HWidth);//骞呭
- $("#HWeight").val(checkStatus.data[0].HWeight);//鍏嬮噸
+ $("#HWidth").val(checkStatus.data[0].骞呭);//骞呭
+ $("#HWeight").val(checkStatus.data[0].鍏嬮噸);//鍏嬮噸
+ $("#HColorRemark").val(checkStatus.data[0].鏌撹壊瑕佹眰);//鏌撹壊瑕佹眰
$("#HRemark").val(checkStatus.data[0].澶囨敞);//澶囨敞
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -784,7 +1097,7 @@
, area: ['90%', '90%']//澶у皬
, title: "璁￠噺鍗曚綅鍒楄〃" //鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -794,7 +1107,7 @@
}
//鑾峰彇鏁版嵁
$("#HUnitID").val(checkStatus.data[0].HItemID);
- $("#HUnitName").val(checkStatus.data[0].HName);
+ $("#HUnitName").val(checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -810,7 +1123,7 @@
, area: ['90%', '90%']//澶у皬
, title: "璁￠噺鍗曚綅鍒楄〃" //鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -820,7 +1133,33 @@
}
//鑾峰彇鏁版嵁
$("#HAuxUnit").val(checkStatus.data[0].HItemID);
- $("#HAuxUnitName").val(checkStatus.data[0].HName);
+ $("#HAuxUnitName").val(checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //杈呭姪鍗曚綅2
+ function get_btnHAuxUnit2() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: "璁￠噺鍗曚綅鍒楄〃" //鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit2', '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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HAuxUnit2").val(checkStatus.data[0].HItemID);
+ $("#HAuxUnitName2").val(checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -854,6 +1193,96 @@
})
}
+ //#region 涓嬫帹椤甸潰鍒濆鍖�
+ function setInit_PushBill() {
+ //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3710' },
+ success: function (d) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ }
+ });
+
+ //鏌ヨ 閿�鍞鍗� 鏄惁瀛樺湪
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Xs_SeOrderBill/loadXs_SeOrderBill_InitICMO",
+ async: false,
+ type: "GET",
+ data: {
+ "HInterID": linterid
+ , "HEntryID": HEntryID
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HSeOrderBillNo": data.鍗曟嵁鍙�
+ , "HSeOrderInterID": data.hmainid
+ , "HSeOrderEntryID": data.hsubid
+
+ , "HSourceInterID": data.hmainid
+ , "HSourceEntryID": data.hsubid
+ , "HSourceBillNo": data.鍗曟嵁鍙�
+ , "HSourceBillType": "1401"
+ , "HMainSourceBillSubType": data.HBillSubType
+
+ , "HPlanOrderProcNo": data.鍗曟嵁鍙�
+
+ , "HEmpID": data.HEmpID
+ , "HEmpName": data.涓氬姟鍛�
+ , "HCusID": data.HCusID
+ , "HCusName": data.瀹㈡埛
+ , "HQty": data.鏁伴噺
+ , "HMaterID": data.HMaterID
+ , "HMaterNumber": data.鐗╂枡浠ｇ爜
+ , "HMaterName": data.鐗╂枡鍚嶇О
+ , "HModel": data.瑙勬牸鍨嬪彿
+ , "HUnitID": data.HUnitID
+ , "HUnitName": data.璁￠噺鍗曚綅
+ , "HWidth": data.骞呭
+ , "HWeight": data.鍏嬮噸
+ , "HColorRemark": data.鏌撹壊瑕佹眰
+ , "HRemark": data.鐧藉澂瑕佹眰
+ , "HRemark3": data.琛ㄥご澶囨敞
+ , "HCusMaterNumber": data.瀹㈡埛鐗╂枡缂栫爜
+ , "HCusModel": data.瀹㈡埛瑙勬牸鍨嬪彿
+ , "HCusMaterName": data.瀹㈡埛鐗╂枡鍚嶇О
+ , "HIsStockQty": data.鏄惁鍙栧簱瀛� == "Y" ? 1 : 0
+ , "HIsStockQty_SeOrderBill": data.鏄惁鍙栧簱瀛� == "Y" ? 1 : 0
+ });
+
+ HIsStockQtyTemp = data.鏄惁鍙栧簱瀛� == "Y" ? 1 : 0;
+
+ //绂佹淇敼閿�鍞鍗曞彿
+ $('#btnHSeOrder').prop('disabled', true);
+ //$('#HIsStockQty').prop('disabled', true);
+ $('#HIsStockQty_SeOrderBill').prop('disabled', true);
+ $('#btnHCus').prop('disabled', true);
+ $('#btnHMater').prop('disabled', true);
+ $('#btnHUnit').prop('disabled', true);
+ $('#HMainSourceBillSubType').prop('disabled', true);
+ //$('#HCusMaterNumber').prop('disabled', true);
+ //$('#HCusModel').prop('disabled', true);
+ //$('#HCusMaterName').prop('disabled', true);
+
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
//淇濆瓨HMaker
function set_AddNew(data) {
@@ -881,7 +1310,7 @@
////$('#set_CancelCloseBill').removeClass("layui-btn-disabled").attr("disabled", false);
//$('#set_CancelltionBill').removeClass("layui-btn-disabled").attr("disabled", false);
////$('#set_AbandonCancelltion').removeClass("layui-btn-disabled").attr("disabled", false);
-
+
}
else {
layer.close(index);
@@ -941,6 +1370,13 @@
, "HSeOrderBillNo": d.data[0].婧愬崟鍗曞彿
, "HSeOrderInterID": d.data[0].婧愬崟涓诲唴鐮�
, "HSeOrderEntryID": d.data[0].婧愬崟瀛愬唴鐮�
+ , "HMainSourceBillSubType": d.data[0].HMainSourceBillSubType
+
+ , "HSourceInterID": d.data[0].HSourceInterID
+ , "HSourceEntryID": d.data[0].HSourceEntryID
+ , "HSourceBillNo": d.data[0].HSourceBillNo
+ , "HSourceBillType": d.data[0].HSourceBillType
+
, "HEmpID": d.data[0].HEmpID
, "HEmpName": d.data[0].涓氬姟鍛�
, "HCusID": d.data[0].HEntryCusID
@@ -959,6 +1395,8 @@
, "HUnitID": d.data[0].HUnitID
, "HUnitName": d.data[0].璁￠噺鍗曚綅
, "HSTATUS": HSTATUS
+ , "HIsStockQty": d.data[0].HIsStockQty
+ , "HIsStockQty_SeOrderBill": d.data[0].HIsStockQty_SeOrderBill ? 1 : 0
, "HBomID": d.data[0].HBomID
, "HBomName": d.data[0].BOM鍗曠紪鐮�
, "HPlanBeginDate": Format(new Date(d.data[0].璁″垝寮�宸ユ棩鏈�), "yyyy-MM-dd")
@@ -966,23 +1404,49 @@
, "HBeginDate": Format(new Date(d.data[0].鏈�杩熷紑宸ユ棩鏈�), "yyyy-MM-dd")
, "HEndDate": Format(new Date(d.data[0].鏈�杩熷畬宸ユ棩鏈�), "yyyy-MM-dd")
, "HRemark": d.data[0].琛ㄥご澶囨敞
+ , "HRemark3": d.data[0].搴曢儴澶囨敞
, "HAuxQty": d.data[0].HAuxQty
, "HAuxUnit": d.data[0].HAuxUnit
, "HAuxUnitName": d.data[0].HAuxUnitName
+
+ , "HAuxQty2": d.data[0].HAuxQty2
+ , "HAuxUnit2": d.data[0].HAuxUnit2
+ , "HAuxUnitName2": d.data[0].HAuxUnitName2
+
, "HWidth": d.data[0].HWidth
, "HWeight": d.data[0].HWeight
+ , "HColorRemark": d.data[0].鏌撹壊瑕佹眰
+ , "HCusMaterName": d.data[0].瀹㈡埛鐗╂枡鍚嶇О
+ , "HCusModel": d.data[0].瀹㈡埛瑙勬牸鍨嬪彿
+ , "HCusMaterNumber": d.data[0].瀹㈡埛鐗╂枡缂栫爜
+ , "HOrderPickRemark": d.data[0].璁㈠崟鍖呰澶囨敞
+ , "HWidth_New": d.data[0].鐢熶骇骞呭
+ , "HWeight_New": d.data[0].鐢熶骇鍏嬮噸
+ , "HRemark_New": d.data[0].鐢熶骇瑙勬牸
//鍏朵粬淇℃伅
- , "hmakers": d.data[0].鍒跺崟浜�
- , "hmakedate": d.data[0].鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍒跺崟鏃ユ湡), "yyyy-MM-dd")
- , "hchecker": d.data[0].瀹℃牳浜�
- , "hcheckdate": d.data[0].瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(d.data[0].瀹℃牳鏃ユ湡), "yyyy-MM-dd")
- , "hupdater": d.data[0].淇敼浜�
- , "hupdatedate": d.data[0].淇敼鏃ユ湡 == null ? "" : Format(new Date(d.data[0].淇敼鏃ユ湡), "yyyy-MM-dd")
- , "hdeleteman": d.data[0].浣滃簾浜�
- , "hdeletedate": d.data[0].浣滃簾鏃ユ湡 == null ? "" : Format(new Date(d.data[0].浣滃簾鏃ユ湡), "yyyy-MM-dd")
+ , "hmakers": OperationType == 2 ? "" : d.data[0].鍒跺崟浜�
+ , "hmakedate": OperationType == 2 ? "" : d.data[0].鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍒跺崟鏃ユ湡), "yyyy-MM-dd")
+ , "hchecker": OperationType == 2 ? "" : d.data[0].瀹℃牳浜�
+ , "hcheckdate": OperationType == 2 ? "" : d.data[0].瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(d.data[0].瀹℃牳鏃ユ湡), "yyyy-MM-dd")
+ , "hupdater": OperationType == 2 ? "" : d.data[0].淇敼浜�
+ , "hupdatedate": OperationType == 2 ? "" : d.data[0].淇敼鏃ユ湡 == null ? "" : Format(new Date(d.data[0].淇敼鏃ユ湡), "yyyy-MM-dd")
+ , "hdeleteman": OperationType == 2 ? "" : d.data[0].浣滃簾浜�
+ , "hdeletedate": OperationType == 2 ? "" : d.data[0].浣滃簾鏃ユ湡 == null ? "" : Format(new Date(d.data[0].浣滃簾鏃ユ湡), "yyyy-MM-dd")
+ , "HPlanOrderProcNo": d.data[0].HPlanOrderProcNo
});
form.render('select');
-
+
+ HIsStockQtyTemp = d.data[0].HIsStockQty;
+
+ if (d.data[0].婧愬崟涓诲唴鐮� != 0 && d.data[0].HSourceBillType=="1401") {
+ $('#btnHSeOrder').prop('disabled', true);
+ //$('#HIsStockQty').prop('disabled', true);
+ $('#HIsStockQty_SeOrderBill').prop('disabled', true);
+ $('#btnHCus').prop('disabled', true);
+ $('#btnHMater').prop('disabled', true);
+ $('#btnHUnit').prop('disabled', true);
+ $('#HMainSourceBillSubType').prop('disabled', true);
+ }
}
})
}
@@ -1212,6 +1676,11 @@
return false;
}
+ if ($("#HCusID").val() == "0" || $("#HCusName").val() == "") {
+ layer.msg("瀹㈡埛涓嶈兘涓虹┖!");
+ return false;
+ }
+
if ($("#HMaterNumber").val() == "") {
layer.msg("鐗╂枡缂栫爜娌℃湁閫夋嫨");
return false;
@@ -1236,6 +1705,31 @@
return false;
}
+
+ var HQty = $('#HQty').val();
+ if (HQty.substring(HQty.length - 1, HQty.length) == ".") {
+ layer.msg("璁″垝鐢熶骇鏁伴噺鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HQty)) {
+ layer.msg("璁″垝鐢熶骇鏁伴噺璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var HAuxQty = $('#HAuxQty').val();
+ if (HAuxQty.substring(HAuxQty.length - 1, HAuxQty.length) == ".") {
+ layer.msg("杈呮暟閲忕殑缁撳熬涓嶈兘鏄�.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HAuxQty)) {
+ layer.msg("杈呮暟閲忚杈撴纭叆鏁板瓧锛�");
+ return;
+ }
+ }
+
//if ($("#HDeptName").val() == "") {
// layer.msg("鐢熶骇杞﹂棿娌℃湁閫夋嫨");
// return false;
@@ -1250,7 +1744,7 @@
// layer.msg("BOM娌℃湁閫夋嫨");
// return false;
//}
-
+
return true;
}
@@ -1267,11 +1761,133 @@
return vars;
}
+
+ //#region 鑾峰彇婧愬崟-閿�鍞鍗曞崟鎹姸鎬�
+ function getSourceBillStatus_SeOrderBill() {
+ var HSourceBillData = "none";
+ var sWhere = " and hmainid = " + $("#HSourceInterID").val();
+ $.ajax({
+ url: GetWEBURL() + '/Xs_SeOrderBill/list',
+ async: false,
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ HSourceBillData = data1.data;
+ } else {
+ layer.alert(data1.code + "婧愬崟鍗曟嵁鐘舵�佸垽鏂け璐ワ紒", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ return HSourceBillData;
+ }
+ //#endregion
//#endregion
});
+ function GetHSupValue(obj) //杩斿洖瀹㈡埛
+ {
+ //$("#HCusName").val(obj[0].HName);
+ //$("#HCusID").val(obj[0].HItemID);
+ //鏍规嵁瀹㈡埛鑾峰彇鐩稿叧淇℃伅
+ getCustomerByCusID(obj[0].HItemID);
+ }
+ //#region 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜囥�佺粨绠楁柟寮忋�佸鎴蜂俊鐢ㄩ搴︺�佽仈绯讳汉銆佽仈绯荤數璇�
+ function getCustomerByCusID(HCusID) {
+ $.ajax({
+ url: GetWEBURL() + "/Xs_SeOrderBill/getCustomerByCusID",
+ async: false,
+ type: "GET",
+ data: {
+ "HCusID": HCusID
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+
+ $("#HCusID").val(data.HCusID);
+ $("#HCusName").val(data.HCusName);
+ //$("#HCurID").val(data.HCurID);
+ //$("#HCurName").val(data.HCurName);
+ //$("#HExRate").val(data.HExRate);
+ //$("#HSSID").val(data.HSSID);
+ //$("#HSSName").val(data.HSSName);
+ //$("#HCreditRating_Now").val(data.HCreditRating_Now);
+ //$("#HLinkMan").val(data.HLinkMan);
+ //$("#HLinkPhone").val(data.HLinkPhone);
+
+ //subHTaxRate = data.HTaxRate;
+
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+
+ //璁￠噺鍗曚綅
+ function GetUnitValue(obj) {
+ $("#HUnitID").val(obj[0].HItemID);
+ $("#HUnitName").val(obj[0].璁￠噺鍗曚綅鍚嶇О);
+ }
+ //涓氬姟鍛�
+ function GetHEmpValue(obj) {
+ $("#HEmpID").val(obj[0].HItemID);
+ $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+ }
+ //瀹㈡埛
+ function GetHCusNameValue(obj) {
+ $("#HCusID").val(obj[0].HItemID);
+ $("#HCusName").val(obj[0].瀹㈡埛鍚嶇О);
+ }
+ //鐗╂枡
+ function GetMaterValue(obj) {
+ $("#HMaterID").val(obj[0].HItemID);
+ $("#HMaterNumber").val(obj[0].鐗╂枡浠ｇ爜);
+ $("#HMaterName").val(obj[0].鐗╂枡鍚嶇О);
+ $("#HModel").val(obj[0].瑙勬牸鍨嬪彿);
+ $("#HUnitID").val(obj[0].HUnitID);//璁￠噺鍗曚綅id
+ $("#HUnitName").val(obj[0].璁￠噺鍗曚綅鍚嶇О);//璁￠噺鍗曚綅鍚嶇О
+ $("#HWidth").val(obj[0].骞呭);//骞呭
+ $("#HWeight").val(obj[0].鍏嬮噸);//鍏嬮噸
+ $("#HColorRemark").val(obj[0].鏌撹壊瑕佹眰);//鏌撹壊瑕佹眰
+ $("#HRemark").val(obj[0].澶囨敞);//澶囨敞
+ }
+ //杈呭姪璁￠噺鍗曚綅
+ function GetAuxiliaryUnitValue(obj) {
+ $("#HAuxUnit").val(obj[0].HItemID);
+ $("#HAuxUnitName").val(obj[0].璁￠噺鍗曚綅鍚嶇О);
+ }
+
+ //杈呭姪璁￠噺鍗曚綅2
+ function GetAuxiliaryUnit2Value(obj) {
+ $("#HAuxUnit2").val(obj[0].HItemID);
+ $("#HAuxUnitName2").val(obj[0].璁￠噺鍗曚綅鍚嶇О);
+ }
+
+ //宸ヤ綔涓績
+ function GetWorkCenterValue(obj) {
+ $("#HCenterID").val(obj[0].HItemID);
+ $("#HCenterName").val(obj[0].宸ヤ綔涓績鍚嶇О);
+ }
+ //bom
+ function GetICBomValue(obj) {
+ $("#HBomID").val(obj[0].hmainid);
+ $("#HBomName").val(obj[0].鍗曟嵁鍙�);
+ }
+ //鐢熶骇杞﹂棿
+ function GetHDeptNameValue(obj) {
+ $("#HDeptID").val(obj[0].HItemID);
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ }
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1