From a82554041564f5e3dbd21ea936c8f38ad7e976d5 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 23 十月 2025 15:13:40 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/质量管理/来料检验单/QC_Add_Edit_POStockInCheckBillList.html | 43 ++
WebTM/views/领料发货/领料出库/Kf_MateOutBillEdit_YangMao.html | 59 ++-
.gitignore | 2
WebTM/views/质量管理/出厂检验单/QC_OutCompCheckBill.html | 74 ++++
WebTM/views/领料发货/领料出库/Kf_MateOutBillList.html | 17
WebTM/views/质量管理/产品入库检验单/QC_LastPieceCheckBill_v2.html | 42 ++
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html | 605 ++++++++++++++++++++++++-------------
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 103 +++++-
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 2
9 files changed, 652 insertions(+), 295 deletions(-)
diff --git a/.gitignore b/.gitignore
index 306a809..0ea5c64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,4 @@
/.vs
/WebTM.csproj.user
/WebTM/Properties/PublishProfiles
-
\ No newline at end of file
+/.vscode
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
index 490183d..6200936 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
@@ -7,7 +7,7 @@
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport"
- content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
@@ -44,15 +44,15 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="copy-btn" class="layui-btn layui-btn-normal layui-btn-radius"
- lay-submit="" lay-filter="Copy">
+ lay-submit="" lay-filter="Copy">
澶嶅埗
</button>
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius"
- lay-submit="" lay-filter="Saver">
+ lay-submit="" lay-filter="Saver">
淇濆瓨
</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
- lay-filter="Exit">
+ lay-filter="Exit">
閫�鍑�
</button>
<!--<button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">棰勮</button>-->
@@ -78,7 +78,7 @@
<label class="layui-form-label">鐗╂枡浠ｇ爜*</label>
<div class="layui-input-inline">
<input class="layui-input" name="HNumber" lay-verify="HNumber"
- id="HNumber" autocomplete="off">
+ id="HNumber" autocomplete="off">
<input id="HItemID" name="HItemID" type="hidden" />
</div>
</div>
@@ -86,14 +86,14 @@
<label class="layui-form-label">鐗╂枡鍚嶇О*</label>
<div class="layui-input-inline">
<input class="layui-input" name="HName" id="HName"
- autocomplete="off">
+ autocomplete="off">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">瑙勬牸鍨嬪彿*</label>
<div class="layui-input-inline">
<input class="layui-input" name="HModel" id="HModel"
- autocomplete="off">
+ autocomplete="off">
</div>
</div>
@@ -101,14 +101,14 @@
<label class="layui-form-label">鍔╄鐮侊細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HHelpCode" id="HHelpCode"
- autocomplete="off">
+ autocomplete="off">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍦嗘満浠ｇ爜锛�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HCircularKnittingMachineCode" id="HCircularKnittingMachineCode"
- autocomplete="off">
+ <input class="layui-input" name="HCircularKnittingMachineCode"
+ id="HCircularKnittingMachineCode" autocomplete="off">
</div>
</div>
</div>
@@ -118,16 +118,16 @@
<label class="layui-form-label">涓昏閲忓崟浣�*</label>
<div class="layui-input-inline">
<input type="text" readonly name="HUnitName" id="HUnitName"
- class="layui-input" value=""
- style="float: left; width: 100px;">
+ class="layui-input" value=""
+ style="float: left; width: 100px;">
<input type="hidden" name="HUnitID" id="HUnitID"
- class="layui-input" value="0"
- style="float:left;width:150px;">
+ class="layui-input" value="0"
+ style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn"
- lay-filter="HUnitList" id="HUnitList"
- style="width:40px;">
+ lay-filter="HUnitList" id="HUnitList"
+ style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -146,22 +146,22 @@
<label class="layui-form-label">鍏嬮噸</label>
<div class="layui-input-inline" style="">
<input class="layui-input" name="HWeight" lay-verify="HWeight"
- id="HWeight" placeholder="璇疯緭鍏ユ暟瀛�" autocomplete="off"
- value="0">
+ id="HWeight" placeholder="璇疯緭鍏ユ暟瀛�" autocomplete="off"
+ value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">榛樿浠撳簱</label>
<div class="layui-input-inline">
<input type="text" readonly name="HWhName" id="HWhName"
- class="layui-input" value=""
- style="float: left; width: 100px;">
+ class="layui-input" value=""
+ style="float: left; width: 100px;">
<input type="hidden" name="HWhID" id="HWhID" class="layui-input"
- value="0" style="float:left;width:150px;">
+ value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn"
- lay-filter="HWhList" id="HWhList" style="width:40px;">
+ lay-filter="HWhList" id="HWhList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -169,7 +169,7 @@
<label class="layui-form-label">鏌撹壊瑕佹眰</label>
<div class="layui-input-inline" style="">
<input class="layui-input" name="HColorRemark"
- lay-verify="HColorRemark" id="HColorRemark" value="">
+ lay-verify="HColorRemark" id="HColorRemark" value="">
</div>
</div>
</div>
@@ -178,31 +178,31 @@
<label class="layui-form-label"> 棰滆壊锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HColor" lay-verify="HColor"
- id="HColor" autocomplete="off">
+ id="HColor" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">骞呭</label>
<div class="layui-input-inline" style="">
<input class="layui-input" name="HWidth" lay-verify="HWidth"
- id="HWidth" placeholder="璇疯緭鍏ユ暟瀛�" autocomplete="off"
- value="0">
+ id="HWidth" placeholder="璇疯緭鍏ユ暟瀛�" autocomplete="off"
+ value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 鐗╂枡鍒嗙被锛�</label>
<div class="layui-input-inline">
<input type="text" readonly name="HMaterClsName"
- id="HMaterClsName" class="layui-input" value=""
- style="float: left; width: 100px;">
+ id="HMaterClsName" class="layui-input" value=""
+ style="float: left; width: 100px;">
<input type="hidden" name="HMaterTypeID" id="HMaterTypeID"
- class="layui-input" value="0"
- style="float:left;width:150px;">
+ class="layui-input" value="0"
+ style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn"
- lay-filter="btnHMaterTypeID" id="btnHMaterTypeID"
- style="width:40px;">
+ lay-filter="btnHMaterTypeID" id="btnHMaterTypeID"
+ style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -213,7 +213,7 @@
<div class="layui-form">
<div class="layui-form-item">
<select name="HMaterClsID" id="HMaterClsID"
- lay-verify="HMaterClsID">
+ lay-verify="HMaterClsID">
<option value="1" selected>澶栬喘</option>
<option value="2">鑷埗</option>
<option value="3">濮斿</option>
@@ -228,15 +228,15 @@
<label class="layui-form-label">棣栦欢妫�楠屾柟妗�</label>
<div class="layui-input-inline">
<input type="text" name="HQCSchemeName_Fst"
- id="HQCSchemeName_Fst" class="layui-input" value=""
- style="float: left; width: 100px; background-color: #efefef4d;"
- readonly>
+ id="HQCSchemeName_Fst" class="layui-input" value=""
+ style="float: left; width: 100px; background-color: #efefef4d;"
+ readonly>
<input type="hidden" name="HQCSchemeID_Fst" id="HQCSchemeID_Fst"
- value="0">
+ value="0">
<button type="button" lay-submit="" class="layui-btn"
- lay-filter="HQCSchemeID_Fst-BT" style="width:40px;">
+ lay-filter="HQCSchemeID_Fst-BT" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -244,15 +244,15 @@
<label class="layui-form-label">杞簭妫�楠屾柟妗�</label>
<div class="layui-input-inline">
<input type="text" name="HQCSchemeName_Proc"
- id="HQCSchemeName_Proc" class="layui-input" value=""
- style="float: left; width: 100px; background-color: #efefef4d;"
- readonly>
+ id="HQCSchemeName_Proc" class="layui-input" value=""
+ style="float: left; width: 100px; background-color: #efefef4d;"
+ readonly>
<input type="hidden" name="HQCSchemeID_Proc"
- id="HQCSchemeID_Proc" value="0">
+ id="HQCSchemeID_Proc" value="0">
<button type="button" lay-submit="" class="layui-btn"
- lay-filter="HQCSchemeID_Proc-BT" style="width:40px;">
+ lay-filter="HQCSchemeID_Proc-BT" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -260,25 +260,77 @@
<label class="layui-form-label">宸℃妫�楠屾柟妗�</label>
<div class="layui-input-inline">
<input type="text" name="HQCSchemeName_Patrol"
- id="HQCSchemeName_Patrol" class="layui-input" value=""
- style="float: left; width: 100px; background-color: #efefef4d;"
- readonly>
+ id="HQCSchemeName_Patrol" class="layui-input" value=""
+ style="float: left; width: 100px; background-color: #efefef4d;"
+ readonly>
<input type="hidden" name="HQCSchemeID_Patrol"
- id="HQCSchemeID_Patrol" value="0">
+ id="HQCSchemeID_Patrol" value="0">
<button type="button" lay-submit="" class="layui-btn"
- lay-filter="HQCSchemeID_Patrol-BT" style="width:40px;">
+ lay-filter="HQCSchemeID_Patrol-BT" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">鏀舵枡鍏ュ簱妫�楠屾柟妗�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HQCSchemeName_POStockIn"
+ id="HQCSchemeName_POStockIn" class="layui-input" value=""
+ style="float: left; width: 100px; background-color: #efefef4d;"
+ readonly>
+ <input type="hidden" name="HQCSchemeID_POStockIn"
+ id="HQCSchemeID_POStockIn" value="0">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="HQCSchemeID_POStockIn-BT" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"
+ style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇鍏ュ簱妫�楠屾柟妗�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HQCSchemeName_LastPiece"
+ id="HQCSchemeName_LastPiece" class="layui-input" value=""
+ style="float: left; width: 100px; background-color: #efefef4d;"
+ readonly>
+ <input type="hidden" name="HQCSchemeID_LastPiece"
+ id="HQCSchemeID_LastPiece" value="0">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="HQCSchemeID_LastPiece-BT" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"
+ style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍑哄巶妫�楠屾柟妗�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HQCSchemeName_OutComp"
+ id="HQCSchemeName_OutComp" class="layui-input" value=""
+ style="float: left; width: 100px; background-color: #efefef4d;"
+ readonly>
+ <input type="hidden" name="HQCSchemeID_OutComp"
+ id="HQCSchemeID_OutComp" value="0">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="HQCSchemeID_OutComp-BT" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"
+ style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label"> 鐗╂枡鍏紡锛�</label>
<div class="layui-input-inline">
<div class="layui-form">
<div class="layui-form-item">
<select name="HMaterRuleType" id="HMaterRuleType"
- lay-verify="HMaterRuleType">
+ lay-verify="HMaterRuleType">
<option value="鍏朵粬" selected>鍏朵粬</option>
<option value="鏌撴枡">鏌撴枡</option>
<option value="鍔╁墏">鍔╁墏</option>
@@ -288,13 +340,16 @@
</div>
</div>
</div>
- <div class="layui-inline" style="display: inline-flex; flex-direction: row;">
- <label class="layui-form-label" style="width: 9em;"> 鐗╂枡鍏紡(缇婃瘺): </label>
+ <div class="layui-inline"
+ style="display: inline-flex; flex-direction: row;">
+ <label class="layui-form-label" style="width: 9em;"> 鐗╂枡鍏紡(缇婃瘺):
+ </label>
<div class="layui-input-inline">
<div class="layui-form">
<div class="layui-form-item">
- <select name="HMaterRuleExternType" id="HMaterRuleExternType"
- lay-verify="HMaterRuleExternType">
+ <select name="HMaterRuleExternType"
+ id="HMaterRuleExternType"
+ lay-verify="HMaterRuleExternType">
<option value="鍏朵粬" selected>鍏朵粬</option>
<option value="鏌撴枡">鏌撴枡</option>
<option value="鍔╁墏">鍔╁墏</option>
@@ -304,13 +359,16 @@
</div>
</div>
</div>
- <div class="layui-inline" style="display: inline-flex; flex-direction: row;">
- <label class="layui-form-label" style="width: 9em;"> 鐗╂枡鍏紡(姣涘皷): </label>
+ <div class="layui-inline"
+ style="display: inline-flex; flex-direction: row;">
+ <label class="layui-form-label" style="width: 9em;"> 鐗╂枡鍏紡(姣涘皷):
+ </label>
<div class="layui-input-inline">
<div class="layui-form">
<div class="layui-form-item">
- <select name="HMaterRuleExternType1" id="HMaterRuleExternType1"
- lay-verify="HMaterRuleExternType1">
+ <select name="HMaterRuleExternType1"
+ id="HMaterRuleExternType1"
+ lay-verify="HMaterRuleExternType1">
<option value="鍏朵粬" selected>鍏朵粬</option>
<option value="鏌撴枡">鏌撴枡</option>
<option value="鍔╁墏">鍔╁墏</option>
@@ -328,34 +386,34 @@
<label class="layui-form-label"> 棰滆壊鑹插彿锛�</label>
<div class="layui-input-inline" style="width: 151px;">
<input type="text" value="" placeholder="璇烽�夋嫨棰滆壊"
- class="layui-input" id="HColorNo" name="HColorNo"
- style="width: 101px; float: left;background-color: #efefef4d;"
- readonly>
+ class="layui-input" id="HColorNo" name="HColorNo"
+ style="width: 101px; float: left;background-color: #efefef4d;"
+ readonly>
<div id="HColorNoName" name="HColorNoName"
- style="width: 50px; "></div>
+ style="width: 50px; "></div>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">涓�娆″悎鏍�<br />鐜囨爣鍑嗗��</label>
<div class="layui-input-inline">
<input class="layui-input" name="HOnceRightRate"
- id="HOnceRightRate" autocomplete="off"
- onfocus="this.select();" value="0" style="margin-top:10px;">
+ id="HOnceRightRate" autocomplete="off"
+ onfocus="this.select();" value="0" style="margin-top:10px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 鐧藉澂瑕佹眰锛�</label>
<div class="layui-input-inline ">
<textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea"
- name="HRemark" id="HRemark"></textarea>
+ name="HRemark" id="HRemark"></textarea>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">绂佺敤鏍囧織锛�</label>
<div class="layui-input-inline">
<input type="checkbox" name="HStopflag" id="HStopflag"
- lay-skin="primary" lay-filter="checkbox" value="true"
- title="鏄惁绂佺敤" disabled>
+ lay-skin="primary" lay-filter="checkbox" value="true"
+ title="鏄惁绂佺敤" disabled>
<input type="hidden" name="UnitType" id="UnitType">
</div>
</div>
@@ -372,21 +430,21 @@
<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="HHeight_M"
- id="HHeight_M">
+ id="HHeight_M">
</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="HInches_M"
- id="HInches_M">
+ id="HInches_M">
</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="HAl1Long_M"
- id="HAl1Long_M">
+ id="HAl1Long_M">
</div>
</div>
</div>
@@ -395,21 +453,21 @@
<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="HDensity_M"
- id="HDensity_M">
+ id="HDensity_M">
</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="HTela_M"
- id="HTela_M">
+ id="HTela_M">
</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="HUnderTela_M"
- id="HUnderTela_M">
+ id="HUnderTela_M">
</div>
</div>
</div>
@@ -418,7 +476,7 @@
<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="HSizing_M"
- id="HSizing_M">
+ id="HSizing_M">
</div>
</div>
</div>
@@ -432,38 +490,38 @@
<label class="layui-form-label"> 榛樿浠撲綅缁勶細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HSPGroupID"
- lay-verify="HSPGroupID" id="HSPGroupID" autocomplete="off"
- value="0">
+ lay-verify="HSPGroupID" id="HSPGroupID" autocomplete="off"
+ value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 榛樿浠撲綅锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HSPID" lay-verify="HSPID"
- id="HSPID" autocomplete="off" value="0">
+ id="HSPID" autocomplete="off" value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 榛樿bom锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HBomID" lay-verify="HBomID"
- id="HBomID" autocomplete="off" value="0">
+ id="HBomID" autocomplete="off" value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 鎹㈢畻鐜囷細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HSecUnitRate"
- lay-verify="HSecUnitRate" id="HSecUnitRate"
- autocomplete="off" value="0">
+ lay-verify="HSecUnitRate" id="HSecUnitRate"
+ autocomplete="off" value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 榛樿鎵撳嵃妯℃澘锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HBarCodePrintName"
- lay-verify="HBarCodePrintName" id="HBarCodePrintName"
- autocomplete="off" value="">
+ lay-verify="HBarCodePrintName" id="HBarCodePrintName"
+ autocomplete="off" value="">
</div>
</div>
</div>
@@ -472,8 +530,8 @@
<label class="layui-form-label"> 鏈�楂樺簱瀛橈細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HHighStock"
- lay-verify="HHighStock" id="HHighStock" autocomplete="off"
- value="0">
+ lay-verify="HHighStock" id="HHighStock" autocomplete="off"
+ value="0">
</div>
</div>
@@ -481,24 +539,24 @@
<label class="layui-form-label"> 鏈�浣庡簱瀛橈細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HLowStock"
- lay-verify="HLowStock" id="HLowStock" autocomplete="off"
- value="0">
+ lay-verify="HLowStock" id="HLowStock" autocomplete="off"
+ value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 瀹夊叏搴撳瓨锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HSafeStock"
- lay-verify="HSafeStock" id="HSafeStock" autocomplete="off"
- value="0">
+ lay-verify="HSafeStock" id="HSafeStock" autocomplete="off"
+ value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 閲囪喘鍗曚环锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HOrderPrice"
- lay-verify="HOrderPrice" id="HOrderPrice" autocomplete="off"
- value="0">
+ lay-verify="HOrderPrice" id="HOrderPrice" autocomplete="off"
+ value="0">
</div>
</div>
</div>
@@ -507,8 +565,8 @@
<label class="layui-form-label"> 閿�鍞崟浠凤細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HSalePrice"
- lay-verify="HSalePrice" id="HSalePrice" autocomplete="off"
- value="0">
+ lay-verify="HSalePrice" id="HSalePrice" autocomplete="off"
+ value="0">
</div>
</div>
@@ -516,31 +574,31 @@
<label class="layui-form-label"> 璁″垝鍗曚环锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HPlanPrice"
- lay-verify="HPlanPrice" id="HPlanPrice" autocomplete="off"
- value="0">
+ lay-verify="HPlanPrice" id="HPlanPrice" autocomplete="off"
+ value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 鏍囧噯鎴愭湰锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HstdPrice"
- lay-verify="HstdPrice" id="HstdPrice" autocomplete="off"
- value="0">
+ lay-verify="HstdPrice" id="HstdPrice" autocomplete="off"
+ value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 鏈�澶ц璐ч噺锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HQtyMax" lay-verify="HQtyMax"
- id="HQtyMax" autocomplete="off" value="0">
+ id="HQtyMax" autocomplete="off" value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 鍗曚欢鏈�澶т笂闄愶細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HPieceMaxQty"
- lay-verify="HPieceMaxQty" id="HPieceMaxQty"
- autocomplete="off" value="0">
+ lay-verify="HPieceMaxQty" id="HPieceMaxQty"
+ autocomplete="off" value="0">
</div>
</div>
</div>
@@ -549,38 +607,38 @@
<label class="layui-form-label"> 鐗堟湰鍙凤細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HVersion" lay-verify="HVersion"
- id="HVersion" autocomplete="off">
+ id="HVersion" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 杈呭姪灞炴�э細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HPropertyTypeID"
- lay-verify="HPropertyTypeID" id="HPropertyTypeID"
- autocomplete="off" value="0">
+ lay-verify="HPropertyTypeID" id="HPropertyTypeID"
+ autocomplete="off" value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 鏁伴噺绮惧害锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HQtyDec" lay-verify="HQtyDec"
- id="HQtyDec" autocomplete="off" value="0">
+ id="HQtyDec" autocomplete="off" value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 鍗曚环绮惧害锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HPriceDec"
- lay-verify="HPriceDec" id="HPriceDec" autocomplete="off"
- value="0">
+ lay-verify="HPriceDec" id="HPriceDec" autocomplete="off"
+ value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 閲戦绮惧害锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HMoneyDec"
- lay-verify="HMoneyDec" id="HMoneyDec" autocomplete="off"
- value="0">
+ lay-verify="HMoneyDec" id="HMoneyDec" autocomplete="off"
+ value="0">
</div>
</div>
</div>
@@ -593,16 +651,16 @@
<label class="layui-form-label">璁￠噺鍗曚綅缁�</label>
<div class="layui-input-inline">
<input type="text" readonly name="HUnitGroupName"
- id="HUnitGroupName" class="layui-input" value=""
- style="float: left; width: 100px;">
+ id="HUnitGroupName" class="layui-input" value=""
+ style="float: left; width: 100px;">
<input type="hidden" name="HUnitGroupID" id="HUnitGroupID"
- class="layui-input" value="0"
- style="float:left;width:150px;">
+ class="layui-input" value="0"
+ style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn"
- lay-filter="HUnitGroupList" id="HUnitGroupList"
- style="width:40px;">
+ lay-filter="HUnitGroupList" id="HUnitGroupList"
+ style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -613,7 +671,7 @@
<label class="layui-form-label"> 闄勫姞灞炴��1锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HSubjoin" lay-verify="HSubjoin"
- id="HSubjoin" autocomplete="off">
+ id="HSubjoin" autocomplete="off">
</div>
</div>
@@ -621,23 +679,23 @@
<label class="layui-form-label">鏉ユ枡妫�楠岋細</label>
<div class="layui-input-inline">
<input type="checkbox" name="HCHECKINCOMING" id="HCHECKINCOMING"
- lay-skin="primary" lay-filter="checkbox" value="true"
- title="鏄惁鏉ユ枡妫�楠�">
+ lay-skin="primary" lay-filter="checkbox" value="true"
+ title="鏄惁鏉ユ枡妫�楠�">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">浜у搧妫�楠岋細</label>
<div class="layui-input-inline">
<input type="checkbox" name="HCHECKPRODUCT" id="HCHECKPRODUCT"
- lay-skin="primary" lay-filter="checkbox" value="true"
- title="鏄惁浜у搧妫�楠�">
+ lay-skin="primary" lay-filter="checkbox" value="true"
+ title="鏄惁浜у搧妫�楠�">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 闄勫姞灞炴��2锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HSubjoin2" lay-verify="HSubjoin2"
- id="HSubjoin2" autocomplete="off">
+ id="HSubjoin2" autocomplete="off">
</div>
</div>
@@ -645,21 +703,21 @@
<label class="layui-form-label"> 鑻辨枃鍚嶇О锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HEngName" lay-verify="HEngName"
- id="HEngName" autocomplete="off">
+ id="HEngName" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 榛樿宸ヨ壓璺嚎锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HRoutingID" lay-verify="HRoutingID"
- id="HRoutingID" autocomplete="off" value="0">
+ id="HRoutingID" autocomplete="off" value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 鑻辨枃瑙勬牸锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HEngModel" lay-verify="HEngModel"
- id="HEngModel" autocomplete="off">
+ id="HEngModel" autocomplete="off">
</div>
</div>
@@ -667,15 +725,15 @@
<label class="layui-form-label">椤圭洰</label>
<div class="layui-input-inline">
<input type="text" readonly name="HProjectName" id="HProjectName"
- class="layui-input" value="" style="float: left; width: 100px;">
+ class="layui-input" value="" style="float: left; width: 100px;">
<input type="hidden" name="HProjectBillMainID"
- id="HProjectBillMainID" class="layui-input" value="0"
- style="float:left;width:150px;">
+ id="HProjectBillMainID" class="layui-input" value="0"
+ style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn"
- lay-filter="HProjectGroupList" id="HProjectGroupList"
- style="width:40px;">
+ lay-filter="HProjectGroupList" id="HProjectGroupList"
+ style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -684,7 +742,7 @@
<div class="layui-input-inline">
<div class="layui-form-item">
<select name="HDivisionID" id="HDivisionID"
- lay-verify="HDivisionID">
+ lay-verify="HDivisionID">
<option value="0" selected>璇烽�夋嫨</option>
<option value="3" selected>娉ㄥ浜嬩笟閮�</option>
<option value="4">杞浜嬩笟閮�</option>
@@ -703,16 +761,16 @@
<label class="layui-form-label">杈呭姪璁￠噺鍗曚綅</label>
<div class="layui-input-inline">
<input type="text" readonly name="HSecUnitName"
- id="HSecUnitName" class="layui-input" value=""
- style="float: left; width: 100px;">
+ id="HSecUnitName" class="layui-input" value=""
+ style="float: left; width: 100px;">
<input type="hidden" name="HSecUnitID" id="HSecUnitID"
- class="layui-input" value="0"
- style="float:left;width:150px;">
+ class="layui-input" value="0"
+ style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn"
- lay-filter="HSecUnitList" id="HSecUnitList"
- style="width:40px;">
+ lay-filter="HSecUnitList" id="HSecUnitList"
+ style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -721,8 +779,8 @@
<label class="layui-form-label"> 淇濊川鏈燂細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HKeepDays"
- lay-verify="HKeepDays" id="HKeepDays" autocomplete="off"
- value="0">
+ lay-verify="HKeepDays" id="HKeepDays" autocomplete="off"
+ value="0">
</div>
</div>
@@ -730,24 +788,24 @@
<label class="layui-form-label"> 鏈�灏忓寘瑁呴噺锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HMinPickQty"
- lay-verify="HMinPickQty" id="HMinPickQty" autocomplete="off"
- value="0">
+ lay-verify="HMinPickQty" id="HMinPickQty" autocomplete="off"
+ value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 娴佽浆鍗℃暟閲忥細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HLotcardQty"
- lay-verify="HLotcardQty" id="HLotcardQty" autocomplete="off"
- value="0">
+ lay-verify="HLotcardQty" id="HLotcardQty" autocomplete="off"
+ value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 宸ヤ綅鏁伴噺锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HCubicleQty"
- lay-verify="HCubicleQty" id="HCubicleQty" autocomplete="off"
- value="0">
+ lay-verify="HCubicleQty" id="HCubicleQty" autocomplete="off"
+ value="0">
</div>
</div>
</div>
@@ -761,16 +819,16 @@
<label class="layui-form-label">閿�鍞閲忓崟浣�</label>
<div class="layui-input-inline">
<input type="text" readonly name="HSALEUNITName"
- id="HSALEUNITName" class="layui-input" value=""
- style="float: left; width: 100px;">
+ id="HSALEUNITName" class="layui-input" value=""
+ style="float: left; width: 100px;">
<input type="hidden" name="HSALEUNITID" id="HSALEUNITID"
- class="layui-input" value="0"
- style="float:left;width:150px;">
+ class="layui-input" value="0"
+ style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn"
- lay-filter="HSALEUNITList" id="HSALEUNITList"
- style="width:40px;">
+ lay-filter="HSALEUNITList" id="HSALEUNITList"
+ style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -780,16 +838,16 @@
<label class="layui-form-label">閿�鍞浠�<br />璁￠噺鍗曚綅</label>
<div class="layui-input-inline" style="margin-top:10px">
<input type="text" readonly name="HSALEPRICEUNITName"
- id="HSALEPRICEUNITName" class="layui-input" value=""
- style="float: left; width: 100px;">
+ id="HSALEPRICEUNITName" class="layui-input" value=""
+ style="float: left; width: 100px;">
<input type="hidden" name="HSALEPRICEUNITID"
- id="HSALEPRICEUNITID" class="layui-input" value="0"
- style="float:left;width:150px;">
+ id="HSALEPRICEUNITID" class="layui-input" value="0"
+ style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn"
- lay-filter="HSALEPRICEUNITList" id="HSALEPRICEUNITList"
- style="width:40px;">
+ lay-filter="HSALEPRICEUNITList" id="HSALEPRICEUNITList"
+ style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -799,16 +857,16 @@
<label class="layui-form-label">鍩烘湰璁￠噺鍗曚綅</label>
<div class="layui-input-inline">
<input type="text" readonly name="HBASEUNITName"
- id="HBASEUNITName" class="layui-input" value=""
- style="float: left; width: 100px;">
+ id="HBASEUNITName" class="layui-input" value=""
+ style="float: left; width: 100px;">
<input type="hidden" name="HBASEUNITID" id="HBASEUNITID"
- class="layui-input" value="0"
- style="float:left;width:150px;">
+ class="layui-input" value="0"
+ style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn"
- lay-filter="HBASEUNITList" id="HBASEUNITList"
- style="width:40px;">
+ lay-filter="HBASEUNITList" id="HBASEUNITList"
+ style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -818,16 +876,16 @@
<label class="layui-form-label">搴撳瓨璁￠噺鍗曚綅</label>
<div class="layui-input-inline">
<input type="text" readonly name="HSTOREUNITName"
- id="HSTOREUNITName" class="layui-input" value=""
- style="float: left; width: 100px;">
+ id="HSTOREUNITName" class="layui-input" value=""
+ style="float: left; width: 100px;">
<input type="hidden" name="HSTOREUNITID" id="HSTOREUNITID"
- class="layui-input" value="0"
- style="float:left;width:150px;">
+ class="layui-input" value="0"
+ style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn"
- lay-filter="HSTOREUNITList" id="HSTOREUNITList"
- style="width:40px;">
+ lay-filter="HSTOREUNITList" id="HSTOREUNITList"
+ style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -837,16 +895,16 @@
<label class="layui-form-label">閲囪喘璁￠噺鍗曚綅</label>
<div class="layui-input-inline">
<input type="text" readonly name="HPOUnitName"
- id="HPOUnitName" class="layui-input" value=""
- style="float: left; width: 100px;">
+ id="HPOUnitName" class="layui-input" value=""
+ style="float: left; width: 100px;">
<input type="hidden" name="HPOUnitID" id="HPOUnitID"
- class="layui-input" value="0"
- style="float:left;width:150px;">
+ class="layui-input" value="0"
+ style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn"
- lay-filter="HPOUnitList" id="HPOUnitList"
- style="width:40px;">
+ lay-filter="HPOUnitList" id="HPOUnitList"
+ style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
- style="margin-left:-9px;"></i>
+ style="margin-left:-9px;"></i>
</button>
</div>
</div>
@@ -857,16 +915,16 @@
<label class="layui-form-label"> 鏍囧噯宸ユ椂锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HPERUNITSTANDHOUR"
- lay-verify="HPERUNITSTANDHOUR" id="HPERUNITSTANDHOUR"
- autocomplete="off" value="0">
+ lay-verify="HPERUNITSTANDHOUR" id="HPERUNITSTANDHOUR"
+ autocomplete="off" value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 鏍囧噯浜哄憳<br />鍑嗗宸ユ椂</label>
<div class="layui-input-inline" style="margin-top:10px">
<input class="layui-input" name="HSTDLABORPREPARETIME"
- lay-verify="HSTDLABORPREPARETIME" id="HSTDLABORPREPARETIME"
- autocomplete="off" value="0">
+ lay-verify="HSTDLABORPREPARETIME" id="HSTDLABORPREPARETIME"
+ autocomplete="off" value="0">
</div>
</div>
@@ -874,24 +932,24 @@
<label class="layui-form-label"> 鏍囧噯鏈哄櫒<br />鍑嗗宸ユ椂</label>
<div class="layui-input-inline" style="margin-top:10px">
<input class="layui-input" name="HSTDMACHINEPREPARETIME"
- lay-verify="HSTDMACHINEPREPARETIME"
- id="HSTDMACHINEPREPARETIME" autocomplete="off" value="0">
+ lay-verify="HSTDMACHINEPREPARETIME"
+ id="HSTDMACHINEPREPARETIME" autocomplete="off" value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">甯哥敤鏉愭枡锛�</label>
<div class="layui-input-inline">
<input type="checkbox" name="HCommonUseFlag" id="HCommonUseFlag"
- lay-skin="primary" lay-filter="checkbox" value="true"
- title="鏄惁甯哥敤鏉愭枡">
+ lay-skin="primary" lay-filter="checkbox" value="true"
+ title="鏄惁甯哥敤鏉愭枡">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 鍔犳潈骞冲潎浠凤細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HAvgStockPrice"
- lay-verify="HAvgStockPrice" id="HAvgStockPrice"
- autocomplete="off" value="0">
+ lay-verify="HAvgStockPrice" id="HAvgStockPrice"
+ autocomplete="off" value="0">
</div>
</div>
</div>
@@ -900,38 +958,38 @@
<label class="layui-form-label">榛樿绋庣巼</label>
<div class="layui-input-inline" style="margin-top:10px">
<input class="layui-input" name="HTaxRate" lay-verify="HTaxRate"
- id="HTaxRate" autocomplete="off" value="13">
+ id="HTaxRate" autocomplete="off" value="13">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">榛樿鍒╂鼎鐜�</label>
<div class="layui-input-inline" style="margin-top:10px">
<input class="layui-input" name="HProfitRate"
- lay-verify="HProfitRate" id="HProfitRate" autocomplete="off"
- value="0">
+ lay-verify="HProfitRate" id="HProfitRate" autocomplete="off"
+ value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 缁撶畻浠�</label>
<div class="layui-input-inline" style="margin-top:10px">
<input class="layui-input" name="HFootPrice"
- lay-verify="HFootPrice" id="HFootPrice" autocomplete="off"
- value="0">
+ lay-verify="HFootPrice" id="HFootPrice" autocomplete="off"
+ value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 鍚◣鎴愭湰浠�</label>
<div class="layui-input-inline" style="margin-top:10px">
<input class="layui-input" name="HTaxCost" lay-verify="HTaxCost"
- id="HTaxCost" autocomplete="off" value="0">
+ id="HTaxCost" autocomplete="off" value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"> 涓嶅惈绋庢垚鏈环</label>
<div class="layui-input-inline" style="margin-top:10px">
<input class="layui-input" name="HNoTaxCost"
- lay-verify="HNoTaxCost" id="HNoTaxCost" autocomplete="off"
- value="0">
+ lay-verify="HNoTaxCost" id="HNoTaxCost" autocomplete="off"
+ value="0">
</div>
</div>
</div>
@@ -945,7 +1003,7 @@
<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="HMakeEmp"
- id="HMakeEmp" style="background-color:#efefef4d;" readonly>
+ id="HMakeEmp" style="background-color:#efefef4d;" readonly>
</div>
</div>
@@ -953,14 +1011,14 @@
<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="HCheckEmp"
- id="HCheckEmp" style="background-color:#efefef4d;" readonly>
+ id="HCheckEmp" style="background-color:#efefef4d;" 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="HStopEmp"
- id="HStopEmp" style="background-color:#efefef4d;" readonly>
+ id="HStopEmp" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -969,7 +1027,7 @@
<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="HMakeDate"
- id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ id="HMakeDate" style="background-color:#efefef4d;" readonly>
</div>
</div>
@@ -977,15 +1035,15 @@
<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="HCheckDate"
- id="HCheckDate" style="background-color:#efefef4d;"
- readonly>
+ id="HCheckDate" style="background-color:#efefef4d;"
+ 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="HStopDate"
- id="HStopDate" style="background-color:#efefef4d;" readonly>
+ id="HStopDate" style="background-color:#efefef4d;" readonly>
</div>
</div>
@@ -996,11 +1054,10 @@
<div class="layui-tab-item">
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-upload">
- <button type="button" class="layui-btn"
- id="testList">
+ <button type="button" class="layui-btn" id="testList">
閫夋嫨鏂囦欢
- </button><input class="layui-upload-file"
- type="file" accept="" name="file" multiple="">
+ </button><input class="layui-upload-file" type="file" accept=""
+ name="file" multiple="">
<div class="layui-upload-list">
<table class="layui-table" lay-filter="mainTable">
<thead>
@@ -1235,6 +1292,22 @@
get_checkHQCSchemeID_Patrol();
});
+ //閫夋嫨鏀舵枡鍏ュ簱妫�楠屾柟妗堟寜閽�
+ form.on('submit(HQCSchemeID_POStockIn-BT)', function () {
+ get_checkHQCSchemeID_POStockIn();
+ });
+
+ //閫夋嫨鐢熶骇鍏ュ簱妫�楠屾柟妗堟寜閽�
+ form.on('submit(HQCSchemeID_LastPiece-BT)', function () {
+ get_checkHQCSchemeID_LastPiece();
+ });
+
+ //閫夋嫨鍑哄巶妫�楠屾柟妗堟寜閽�
+ form.on('submit(HQCSchemeID_OutComp-BT)', function () {
+ get_checkHQCSchemeID_OutComp();
+ });
+
+
//鐩戝惉涓�娆″悎鏍肩巼鏍囧噯鍊�
$("#HOnceRightRate").blur(function (data) {
@@ -1404,6 +1477,12 @@
, "HQCSchemeName_Proc": data.杞簭妫�楠屾柟妗�
, "HQCSchemeID_Patrol": data.HQCSchemeID_Patrol
, "HQCSchemeName_Patrol": data.宸℃妫�楠屾柟妗�
+ , "HQCSchemeID_POStockIn": data.HQCSchemeID_POStockIn
+ , "HQCSchemeName_POStockIn": data.棰嗘枡鍏ュ簱妫�楠屾柟妗�
+ , "HQCSchemeID_LastPiece": data.HQCSchemeID_LastPiece
+ , "HQCSchemeName_LastPiece": data.鐢熶骇鍏ュ簱妫�楠屾柟妗�
+ , "HQCSchemeID_OutComp": data.HQCSchemeID_OutComp
+ , "HQCSchemeName_OutComp": data.鍑哄巶妫�楠屾柟妗�
, "HMaterRuleType": data.鐗╂枡鍏紡
, "HMaterRuleExternType": data.缇婃瘺鐗╂枡鍏紡
, "HMaterRuleExternType1": data.姣涘皷鐗╂枡鍏紡
@@ -1429,7 +1508,7 @@
, "HSizing_M": data.瀹氬瀷娴嗘枡
, "HLotcardQty": data.鍗曚釜娴佽浆鍗℃暟閲�
, "HCubicleQty": data.宸ヤ綅鏁伴噺
- ,"HBarCodePrintName":data.榛樿鎵撳嵃妯℃澘
+ , "HBarCodePrintName": data.榛樿鎵撳嵃妯℃澘
, "HMakeEmp": data["鍒涘缓浜�"]
, "HMakeDate": data["鍒涘缓鏃ユ湡"] == null ? "" : Format(new Date(data["鍒涘缓鏃ユ湡"]), "yyyy-MM-dd")
, "HCheckEmp": data["瀹℃牳浜�"]
@@ -1922,6 +2001,102 @@
}
//#endregion
+ //#region 閫夋嫨鏀舵枡鍏ュ簱妫�楠屾柟妗堟柟娉�
+ function get_checkHQCSchemeID_POStockIn() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '妫�楠屾柟妗堝垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HQCSchemeName_POStockIn").val(checkStatus.data[0].妫�楠屾柟妗堝悕绉�);
+ $("#HQCSchemeID_POStockIn").val(checkStatus.data[0].hmainid);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ , end: function (index, layero) {
+ if (OptionData.length > 0) {
+ $("#HQCSchemeName_POStockIn").val(OptionData[0].妫�楠屾柟妗堝悕绉�);
+ $("#HQCSchemeID_POStockIn").val(OptionData[0].hmainid);
+ }
+ OptionData = [];
+ }
+ })
+ }
+ //#endregion
+
+ //#region 閫夋嫨鐢熶骇鍏ュ簱妫�楠屾柟妗堟柟娉�
+ function get_checkHQCSchemeID_LastPiece() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '妫�楠屾柟妗堝垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HQCSchemeName_LastPiece").val(checkStatus.data[0].妫�楠屾柟妗堝悕绉�);
+ $("#HQCSchemeID_LastPiece").val(checkStatus.data[0].hmainid);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ , end: function (index, layero) {
+ if (OptionData.length > 0) {
+ $("#HQCSchemeName_LastPiece").val(OptionData[0].妫�楠屾柟妗堝悕绉�);
+ $("#HQCSchemeID_LastPiece").val(OptionData[0].hmainid);
+ }
+ OptionData = [];
+ }
+ })
+ }
+ //#endregion
+
+ //#region 閫夋嫨鍑哄巶妫�楠屾柟妗堟柟娉�
+ function get_checkHQCSchemeID_OutComp() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '妫�楠屾柟妗堝垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HQCSchemeName_OutComp").val(checkStatus.data[0].妫�楠屾柟妗堝悕绉�);
+ $("#HQCSchemeID_OutComp").val(checkStatus.data[0].hmainid);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ , end: function (index, layero) {
+ if (OptionData.length > 0) {
+ $("#HQCSchemeName_OutComp").val(OptionData[0].妫�楠屾柟妗堝悕绉�);
+ $("#HQCSchemeID_OutComp").val(OptionData[0].hmainid);
+ }
+ OptionData = [];
+ }
+ })
+ }
+ //#endregion
+
//閫夋嫨璁￠噺鍗曚綅
form.on('submit(HUnitList)', function () {//閫夋嫨鑱屽姟
$("#UnitType").val(1);
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index 833dd3b..4cbe021 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -104,7 +104,7 @@
</select>
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" style="" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px;">閲嶇疆</button>
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBill_v2.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBill_v2.html"
index 9bab4c8..0105d0c 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBill_v2.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBill_v2.html"
@@ -1001,7 +1001,7 @@
if (HSouceBillType == '3711') {
// 鐢熶骇姹囨姤鍗曚笅鎺�
LoadingInformation_ICMOReportBill();
- //GetCheckItemID();
+ GetCheckItemID();
}
else {
layer.alert("婧愬崟绫诲瀷鏃犳晥锛�", { icon: 5 });
@@ -2661,8 +2661,8 @@
$("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
$("#HProcID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- get_ICMOBillStatusList();
- get_QC_TakeSampleCheckBillList();
+ // get_ICMOBillStatusList();
+ // get_QC_TakeSampleCheckBillList();
GetCheckItemID();
}
, btn2: function (index, layero) {
@@ -2748,8 +2748,8 @@
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
- end: function () {
-
+ end: function (layero, index) {
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
},
success: function (layero, index) {
@@ -4262,7 +4262,7 @@
if (HProcID == "0" || HProcID == "") {
return layer.msg("璇烽�夋嫨宸ュ簭!");
}
- sWhere = " and 宸ュ簭娴佽浆鍗′富鍐呯爜='" + HProcExchInterID + "' and HProcID=" + HProcID;
+ sWhere = " and HProcID=" + HProcID;
$.ajax({
url: GetWEBURL() + "/QC_TakeSampleCheckBill/QC_TakeSampleCheckBillMainList",
type: "GET",
@@ -4468,6 +4468,29 @@
}
//#endregion
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ function GetCheckItemID() {
+ var HName = $("#HMaterName").val();
+ var HProName = $("#HProcName").val();
+ var HSourceID = $("#HSourceID").val();
+ if (HName != '' && HName != undefined && HProName != '' && HProName != undefined) {
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetCheckItemID",
+ type: "GET",
+ async: false,
+ data: { "HName": HName, "HProName": HProName,"HSourceID": HSourceID },
+ success: function (result) {
+ if (result.code == 1) {
+ $("#HQCSchemeID").val(result.data[0].hmainid);
+ $("#HQCSchemeName").val(result.data[0].妫�楠屾柟妗堝悕绉�);
+ get_CheckItem();
+ } else {
+ layer.msg(result.code + result.Message, { icon: 5 });
+ }
+ }
+ })
+ }
+ }
window.GetCheckItemID = function () {
var HName = $("#HMaterName").val();
@@ -4687,9 +4710,9 @@
}
function GetGyMaterial(obj) { //鐗╂枡
- $("#HMaterNumber").val(obj[0].鐗╂枡浠ｇ爜);
- $("#HMaterName").val(obj[0].鐗╂枡鍚嶇О);
- $("#HMaterID").val(obj[0].HItemID);
+ $("#HMaterNumber").val(obj.鐗╂枡浠ｇ爜);
+ $("#HMaterName").val(obj.鐗╂枡鍚嶇О);
+ $("#HMaterID").val(obj.HItemID);
GetCheckItemID();
}
@@ -4712,6 +4735,7 @@
function GetProcessValue(obj) {
$("#HProcName").val(obj[0].宸ュ簭鍚嶇О);
$("#HProcID").val(obj[0].HItemID);
+ GetCheckItemID();
}
//璁￠噺鍗曚綅
function GetHUnitListValue(obj) {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html"
index 61762fb..0471fdb 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html"
@@ -775,6 +775,7 @@
<input type="hidden" name="HDeptID" id="HDeptID" value="0">
<input type="hidden" name="HSourceOrgID" id="HSourceOrgID" value="0"><!--鏉ユ簮缁勭粐-->
<input type="hidden" name="HInspectOrgID" id="HInspectOrgID" value="0"><!--璐ㄦ缁勭粐-->
+ <input type="hidden" name="HQCSchemeID_OutComp" id="HQCSchemeID_OutComp" value="0"><!-- 鍑哄巶妫�楠屾柟妗圛D -->
</form>
</div>
</div>
@@ -929,12 +930,12 @@
if (HSouceBillType == 1401) {
// 閿�鍞鍗曚笅鎺�
LoadingInformation_SeOrder();
- //GetCheckItemID();
+ GetCheckItemID();
}
else if (HSouceBillType == 1402) {
// 鍙戣揣閫氱煡鍗曚笅鎺�
LoadingInformation_SeOutStock();
- //GetCheckItemID();
+ GetCheckItemID();
} else {
layer.alert("婧愬崟绫诲瀷鏃犳晥锛�", { icon: 5 });
}
@@ -1202,8 +1203,9 @@
$("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
$("#HProcID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- get_ICMOBillStatusList();
- get_QC_TakeSampleCheckBillList();
+ // get_ICMOBillStatusList();
+ // get_QC_TakeSampleCheckBillList();
+ GetCheckItemID();
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -1281,14 +1283,15 @@
$("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);
$("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
$("#HMaterID").val(checkStatus.data[0].HItemID);
+
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
- end: function () {
-
+ end: function (layero, index) {
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
},
success: function (layero, index) {
@@ -4074,6 +4077,54 @@
})
}
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ function GetCheckItemID() {
+ var HName = $("#HMaterName").val();
+ var HProName = $("#HProcName").val();
+ var HSourceID = $("#HSourceID").val();
+ if (HName != '' && HName != undefined && HProName != '' && HProName != undefined) {
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetCheckItemID",
+ type: "GET",
+ async: false,
+ data: { "HName": HName, "HProName": HProName, "HSourceID": HSourceID },
+ success: function (result) {
+ if (result.code == 1) {
+ $("#HQCSchemeID").val(result.data[0].hmainid);
+ $("#HQCSchemeName").val(result.data[0].妫�楠屾柟妗堝悕绉�);
+ get_CheckItem();
+ } else {
+ layer.msg(result.code + result.Message, { icon: 5 });
+ }
+ }
+ })
+ }
+ }
+
+ window.GetCheckItemID = function () {
+ var HName = $("#HMaterName").val();
+ var HProName = $("#HProcName").val();
+ var HSourceID = $("#HSourceID").val();
+ if (HName != '' && HName != undefined && HProName != '' && HProName != undefined) {
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetCheckItemID",
+ type: "GET",
+ async: false,
+ data: { "HName": HName, "HProName": HProName, "HSourceID": HSourceID },
+ success: function (result) {
+ if (result.code == 1) {
+ $("#HQCSchemeID").val(result.data[0].hmainid);
+ $("#HQCSchemeName").val(result.data[0].妫�楠屾柟妗堝悕绉�);
+ get_CheckItem();
+ } else {
+ layer.msg(result.code + result.Message, { icon: 5 });
+ }
+ }
+ })
+ }
+ }
+
+
//淇濆瓨
function set_SaveBill(data) {
//淇濆瓨鏈�鍚庝竴娆＄偣鍑昏鐨勬楠屽��
@@ -4138,7 +4189,7 @@
layer.msg("鎻愪氦鎴愬姛");
$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳
$('#set_CheckBill').removeClass("layui-btn-disabled").removeAttr("disabled").addClass("layui-btn-normal");
-
+
}
else {
layer.close(index);
@@ -4201,6 +4252,8 @@
+
+
//闈炵┖楠岃瘉
function GetHCusNameValue(obj) { //瀹㈡埛
$("#HCusName").val(obj[0].瀹㈡埛鍚嶇О);
@@ -4242,9 +4295,9 @@
}
function GetGyMaterial(obj) { //鐗╂枡
- $("#HMaterNumber").val(obj[0].鐗╂枡浠ｇ爜);
- $("#HMaterName").val(obj[0].鐗╂枡鍚嶇О);
- $("#HMaterID").val(obj[0].HItemID);
+ $("#HMaterNumber").val(obj.鐗╂枡浠ｇ爜);
+ $("#HMaterName").val(obj.鐗╂枡鍚嶇О);
+ $("#HMaterID").val(obj.HItemID);
GetCheckItemID();
}
@@ -4267,6 +4320,7 @@
function GetProcessValue(obj) {
$("#HProcName").val(obj[0].宸ュ簭鍚嶇О);
$("#HProcID").val(obj[0].HItemID);
+ GetCheckItemID();
}
//璁￠噺鍗曚綅
function GetHUnitListValue(obj) {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html"
index a099f85..685f28d 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html"
@@ -1002,12 +1002,12 @@
if (HSouceBillType == 1102) {
// 閲囪喘璁㈠崟涓嬫帹
LoadingInformation_POOrderBill();
- //GetCheckItemID();
+ GetCheckItemID();
}
else if (HSouceBillType == 1103) {
// 鏀舵枡閫氱煡鍗曚笅鎺�
LoadingInformation_POInStockBill();
- //GetCheckItemID();
+ GetCheckItemID();
} else {
layer.alert("婧愬崟绫诲瀷鏃犳晥锛�", { icon: 5 });
}
@@ -2677,8 +2677,8 @@
$("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
$("#HProcID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- get_ICMOBillStatusList();
- get_QC_TakeSampleCheckBillList();
+ // get_ICMOBillStatusList();
+ // get_QC_TakeSampleCheckBillList();
GetCheckItemID();
}
, btn2: function (index, layero) {
@@ -4483,9 +4483,8 @@
}
}
//#endregion
-
-
- window.GetCheckItemID = function () {
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ function GetCheckItemID() {
var HName = $("#HMaterName").val();
var HProName = $("#HProcName").val();
var HSourceID = $("#HSourceID").val();
@@ -4495,6 +4494,29 @@
type: "GET",
async: false,
data: { "HName": HName, "HProName": HProName, "HSourceID": HSourceID },
+ success: function (result) {
+ if (result.code == 1) {
+ $("#HQCSchemeID").val(result.data[0].hmainid);
+ $("#HQCSchemeName").val(result.data[0].妫�楠屾柟妗堝悕绉�);
+ get_CheckItem();
+ } else {
+ layer.msg(result.code + result.Message, { icon: 5 });
+ }
+ }
+ })
+ }
+ }
+
+ window.GetCheckItemID = function () {
+ var HName = $("#HMaterName").val();
+ var HProName = $("#HProcName").val();
+ var HSourceID = $("#HSourceID").val();
+ if (HName != '' && HName != undefined && HProName != '' && HProName != undefined) {
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetCheckItemID2",
+ type: "GET",
+ async: false,
+ data: { "HName": HName, "HSourceID": HSourceID },
success: function (result) {
if (result.code == 1) {
$("#HQCSchemeID").val(result.data[0].hmainid);
@@ -4769,9 +4791,9 @@
}
function GetGyMaterial(obj) { //鐗╂枡
- $("#HMaterNumber").val(obj[0].鐗╂枡浠ｇ爜);
- $("#HMaterName").val(obj[0].鐗╂枡鍚嶇О);
- $("#HMaterID").val(obj[0].HItemID);
+ $("#HMaterNumber").val(obj.鐗╂枡浠ｇ爜);
+ $("#HMaterName").val(obj.鐗╂枡鍚嶇О);
+ $("#HMaterID").val(obj.HItemID);
GetCheckItemID();
}
@@ -4794,6 +4816,7 @@
function GetProcessValue(obj) {
$("#HProcName").val(obj[0].宸ュ簭鍚嶇О);
$("#HProcID").val(obj[0].HItemID);
+ GetCheckItemID();
}
//璁￠噺鍗曚綅
function GetHUnitListValue(obj) {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index f5bfdf0..07cd038 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -2134,7 +2134,8 @@
"HStrictness": data[i].涓ユ牸搴�, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷
}
);
- SampleNum.push(5);
+ //SampleNum.push(5);
+ SampleNum.push(data[0].鏍锋湰閲�);
}
//妫�楠岄」鐩�
@@ -2168,10 +2169,59 @@
$("tr[data-index = " + (result.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
trindex = result.data.length - 1;
- $("#HEntryID").val() - 1
+ $("#HEntryID").val() - 1
+
+ //鎼哄甫鍑鸿川妫�鏂规
+ ReturnSampleScheme(data);
}
}
})
+ }
+
+ //鏍规嵁璐ㄦ鏂规鑷姩甯﹀嚭鎶芥牱鏂规淇℃伅
+ function ReturnSampleScheme(data) {
+ $("#HSampleSchemeID").val(data[data.length - 1].hmainid);
+ $("#HSampleSchemeName").val(data[data.length - 1].鎶芥牱鏂规鍚嶇О);
+ $("#HSamplingType").val(data[data.length - 1].鎶芥牱绫诲瀷);
+ $("#HInspectionLevel").val(data[data.length - 1].妫�楠屾按骞�);
+ $("#HStrictness").val(data[data.length - 1].涓ユ牸搴�);
+ $("#HAQL").val(data[data.length - 1].AQL);
+ $("#HSampleQty").val(data[data.length - 1].鏍锋湰閲�);
+ $("#HSampleQty2").val(data[data.length - 1].鏍锋湰閲�);
+ $("#HAcceptQty").val(data[data.length - 1].鍏佽鏁�);
+
+ $("#HRejectQty").val(data[data.length - 1].鎷掔粷鏁�);
+ //鏄剧ず鏈�鍚庝竴琛岀殑妫�娴嬪�奸〉绛句腑鐨勭洰鏍囧�笺�佷笂闄愬�笺�佷笅闄愬��
+ $("#HTargetVal").val(data[data.length - 1].鐩爣鍊�);
+ $("#HUpLimit").val(data[data.length - 1].涓婇檺鍊�);
+ $("#HDownLimit").val(data[data.length - 1].涓嬮檺鍊�);
+
+
+ if ($("#HEntryID").val() - 1 >= 0) {
+ option.data[$("#HEntryID").val() - 1].HSampleSchemeID = data[data.length - 1].hmainid;
+ option.data[$("#HEntryID").val() - 1].HSampleSchemeName = data[data.length - 1].鎶芥牱鏂规鍚嶇О;
+ option.data[$("#HEntryID").val() - 1].HSamplingType = data[data.length - 1].鎶芥牱绫诲瀷;
+ option.data[$("#HEntryID").val() - 1].HInspectionLevel = data[data.length - 1].妫�楠屾按骞�;
+ option.data[$("#HEntryID").val() - 1].HStrictness = data[data.length - 1].涓ユ牸搴�;
+ option.data[$("#HEntryID").val() - 1].HAQL = data[data.length - 1].AQL;
+ option.data[$("#HEntryID").val() - 1].HSampleQty = data[data.length - 1].鏍锋湰閲�;
+ option.data[$("#HEntryID").val() - 1].HSampleQty2 = data[data.length - 1].鏍锋湰閲�;
+ option.data[$("#HEntryID").val() - 1].HAcceptQty = data[data.length - 1].鍏佽鏁�;
+ option.data[$("#HEntryID").val() - 1].HRejectQty = data[data.length - 1].鎷掔粷鏁�;
+ option.data[$("#HEntryID").val() - 1].HUpLimit = data[data.length - 1].涓婇檺鍊�;
+ option.data[$("#HEntryID").val() - 1].HDownLimit = data[data.length - 1].涓嬮檺鍊�;
+ }
+
+ rowdata_Value = [];
+ for (let i = 1; i <= data[data.length - 1].鏍锋湰閲�; i++) {
+ rowdata_Value.push({
+ "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
+ });
+ }
+ option_Value.data = rowdata_Value;
+ table.render(option_Value);
+
+ IsHide(table.cache["mainTable"][$("#HEntryID").val() - 1].HAnalysisMethod); //闅愯棌妫�娴嬪�煎瓧娈�
}
//鐢ㄤ簬鍙屽嚮妫�楠屾柟妗堜娇鐢�
@@ -2198,7 +2248,8 @@
"HStrictness": data[i].涓ユ牸搴�, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷
}
);
- SampleNum.push(5);
+ //SampleNum.push(5);
+ SampleNum.push(data[0].鏍锋湰閲�);
}
//妫�楠岄」鐩�
@@ -2570,6 +2621,7 @@
, { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
, { field: 'HInspectVal', title: '妫�楠屽��', edit: 'text' }
, { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' }
+ , { field: 'HTargetVal', title: '鐩爣鍊�' }
, { field: 'HUpLimit', title: '涓婇檺鍊�' }
, { field: 'HDownLimit', title: '涓嬮檺鍊�' }
, { field: 'HMax', title: '鏈�澶у��', edit: 'text', totalRow: true }
@@ -2627,7 +2679,7 @@
elem: '#ValueTable'
//, toolbar: '#toolbarDemo_Value'
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
- , height: 'full-50'
+ , height: 'full-370'
, cellMinWidth: 150
, totalRow: true
, cols: [[ //琛ㄥご
@@ -2876,9 +2928,16 @@
editIndex = Number(nowindex) + Number(1);
LastIndex = nowindex;
- $("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
- //$("[name='HQCCheckItemID']").attr("value", option_Check[nowindex].HQCCheckItemID);
- //$("[name='HQCCheckItemName']").attr("value", option_Check[nowindex].妫�楠岄」鐩�);
+ if (option_Check.length > 0) {
+ $("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
+ $("[name='HQCCheckItemID']").attr("value", option_Check[nowindex].HQCCheckItemID);
+ $("[name='HQCCheckItemName']").attr("value", option_Check[nowindex].妫�楠岄」鐩�);
+ //鏄剧ず褰撳墠鍙屽嚮琛岀殑妫�娴嬪�奸〉绛句腑鐨勭洰鏍囧�笺�佷笂闄愬�笺�佷笅闄愬��
+ $("#HTargetVal").val(option_Check[nowindex].鐩爣鍊�);
+ $("#HUpLimit").val(option_Check[nowindex].涓婇檺鍊�);
+ $("#HDownLimit").val(option_Check[nowindex].涓嬮檺鍊�);
+ }
+
//閫変腑琛屾敼鍙橀鑹�
check_row(obj);
@@ -2903,7 +2962,7 @@
var row_value = [];
for (let i = 0; i < SampleNum[nowindex]; i++) {
row_value.push({
- "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
+ "HSEQ": (i+1), "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
});
}
//鍒锋柊妫�楠屽�艰〃鏍�
@@ -3547,17 +3606,17 @@
HSampleQty: option.data[nowindex].HSampleQty, //鏍锋湰閲�
HInspectResultToSee: '', //妫�楠岀粨鏋�
HInspectResultToSee2: '', //妫�楠岀粨鏋�2
- HSampleUnRightQty: option.data[nowindex].HSampleUnRightQty,//鏍锋湰涓嶅悎鏍兼暟
- HUnitID: option.data[nowindex].HUnitID, //鍗曚綅ID
+ //HSampleUnRightQty: option.data[nowindex].HSampleUnRightQty,//鏍锋湰涓嶅悎鏍兼暟
+ //HUnitID: option.data[nowindex].HUnitID, //鍗曚綅ID
HUnitName: option.data[nowindex].HUnit, //鍗曚綅
HInspectValB: option.data[nowindex].HInspectValB,//妫�楠屽�糏D
- HInspectVal: option.data[nowindex].HInspectVal, //妫�楠屽��
+ //HInspectVal: option.data[nowindex].HInspectVal, //妫�楠屽��
HTargetValB: option.data[nowindex].HTargetValB, //鐩爣鍊糏D
- HTargetVal: option.data[nowindex].HTargetVal,//鐩爣鍊�
- HUpLimit: option.data[nowindex].HUpLimit, //涓婇檺鍊�
- HDownLimit: option.data[nowindex].HDownLimit, //涓嬮檺鍊�
- HUpOffSet: option.data[nowindex].HUpOffSet, //涓婂亸宸�
- HDownOffSet: option.data[nowindex].HDownOffSet, //涓嬪亸宸�
+ //HTargetVal: option.data[nowindex].HTargetVal,//鐩爣鍊�
+ //HUpLimit: option.data[nowindex].HUpLimit, //涓婇檺鍊�
+ //HDownLimit: option.data[nowindex].HDownLimit, //涓嬮檺鍊�
+ //HUpOffSet: option.data[nowindex].HUpOffSet, //涓婂亸宸�
+ //HDownOffSet: option.data[nowindex].HDownOffSet, //涓嬪亸宸�
};
}
//if (option.data[0].HSampleSchemeID == 0) {
@@ -3607,9 +3666,9 @@
$("#HUnitID").val(maindata[nowindex].HUnitID);
$("#HUnit").val(maindata[nowindex].HUnit);
$("#HInspectVal").val(maindata[nowindex].HInspectVal);
- $("#HTargetVal").val(maindata[nowindex].HTargetVal);
- $("#HUpLimit").val(maindata[nowindex].HUpLimit);
- $("#HDownLimit").val(maindata[nowindex].HDownLimit);
+ $("#HTargetVal").val(maindata[nowindex].HTargetVal == "" ? (option_Check.length > 0 ? option_Check[nowindex].鐩爣鍊� : "") : maindata[nowindex].HTargetVal );
+ $("#HUpLimit").val(maindata[nowindex].HUpLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].涓婇檺鍊� : "") : maindata[nowindex].HUpLimit );
+ $("#HDownLimit").val(maindata[nowindex].HDownLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].涓嬮檺鍊� : "") : maindata[nowindex].HDownLimit );
$("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
$("#HDownOffSet").val(maindata[nowindex].HDownOffSet);
$("#HSampleDamageQty").val(maindata[nowindex].HSampleDamageQty);
@@ -3632,7 +3691,7 @@
$("#HInspectValB").val(maindata[nowindex].HInspectValB);
$("#HInspectVal").val(maindata[nowindex].HInspectVal);
$("#HTargetValB").val(maindata[nowindex].HTargetValB);
- $("#HTargetVal").val(maindata[nowindex].HTargetVal);
+ //$("#HTargetVal").val(maindata[nowindex].HTargetVal);
$("#HUpLimit").val(maindata[nowindex].HUpLimit);
$("#HDownLimit").val(maindata[nowindex].HDownLimit);
$("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
@@ -3691,6 +3750,9 @@
}];
table.render(option_Value);
//layer.msg(result.code + result.Message, { icon: 5 });
+
+ IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //闅愯棌妫�娴嬪�煎瓧娈�
+ form.render('select');
}
}
})
@@ -4242,6 +4304,7 @@
if (result.code == 1) {
$("#HQCSchemeID").val(result.data[0].hmainid);
$("#HQCSchemeName").val(result.data[0].妫�楠屾柟妗堝悕绉�);
+ //甯﹀嚭妫�楠岄」鐩�佹娊鏍锋柟妗�
get_CheckItem();
} else {
layer.msg(result.code + result.Message, { icon: 5 });
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillEdit_YangMao.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillEdit_YangMao.html"
index 12d574b..c59e5e4 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillEdit_YangMao.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillEdit_YangMao.html"
@@ -995,11 +995,11 @@
var HMaterRuleType = option.data[i].HMaterRuleType;
var HMaterRuleExternType = option.data[i].HMaterRuleExternType;
if (HMaterRuleExternType == "鏌撴枡") {
- option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight);
+ option.data[i].HQty = roundNumber(dealDoubleToFixed(option.data[i].HRate * HWeight), 3).toFixed(3);
} else if (HMaterRuleExternType == "鍔╁墏") {
- option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001);
+ option.data[i].HQty = roundNumber(dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001), 3).toFixed(3);
} else if (HMaterRuleExternType == "鍔╁墏锛堟寜甯冪畻锛�") {
- option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
+ option.data[i].HQty = roundNumber(dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001), 3).toFixed(3);
}
//if (HMaterRuleExternType == '缇婃瘺') {
// option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
@@ -1020,11 +1020,11 @@
var HMaterRuleType = option.data[i].HMaterRuleType;
var HMaterRuleExternType = option.data[i].HMaterRuleExternType;
if (HMaterRuleExternType == "鏌撴枡") {
- option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight);
+ option.data[i].HQty = roundNumber(dealDoubleToFixed(option.data[i].HRate * HWeight), 3).toFixed(3);
} else if (HMaterRuleExternType == "鍔╁墏") {
- option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001);
+ option.data[i].HQty = roundNumber(dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001), 3).toFixed(3);
} else if (HMaterRuleExternType == "鍔╁墏锛堟寜甯冪畻锛�") {
- option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
+ option.data[i].HQty = roundNumber(dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001), 3).toFixed(3);
}
//if (HMaterRuleExternType == '缇婃瘺') {
// option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
@@ -1231,11 +1231,11 @@
var HMaterRuleType = obj.data.HMaterRuleType;
var HMaterRuleExternType = obj.data.HMaterRuleExternType;
if (HMaterRuleExternType == "鏌撴枡") {
- HQty = dealDoubleToFixed(HRate * HWeight);
+ HQty = roundNumber(dealDoubleToFixed(HRate * HWeight), 3).toFixed(3);
} else if (HMaterRuleExternType == "鍔╁墏") {
- HQty = dealDoubleToFixed(HRate * HWaterQty * 0.001);
+ HQty = roundNumber(dealDoubleToFixed(HRate * HWaterQty * 0.001), 3).toFixed(3);
} else if (HMaterRuleExternType == "鍔╁墏锛堟寜甯冪畻锛�") {
- HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
+ HQty = roundNumber(dealDoubleToFixed(HRate * HWeight * 0.001), 3).toFixed(3);
}
//if (HMaterRuleExternType == '缇婃瘺') {
// HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
@@ -1254,11 +1254,11 @@
var HQty = 0;
var HMaterRuleType = value;
if (HMaterRuleType == "鏌撴枡") {
- HQty = dealDoubleToFixed(HRate * HWeight);
+ HQty = roundNumber(dealDoubleToFixed(HRate * HWeight), 3).toFixed(3);
} else if (HMaterRuleType == "鍔╁墏") {
- HQty = dealDoubleToFixed(HRate * HWaterQty * 0.001);
+ HQty = roundNumber(dealDoubleToFixed(HRate * HWaterQty * 0.001), 3).toFixed(3);
} else if (HMaterRuleType == "鍔╁墏锛堟寜甯冪畻锛�") {
- HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
+ HQty = roundNumber(dealDoubleToFixed(HRate * HWeight * 0.001), 3).toFixed(3);
}
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
@@ -1436,7 +1436,7 @@
, { field: 'HUnitName', title: '璁￠噺鍗曚綅', width: 100 }
, { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 100, hide: true }
, { field: 'HRate', title: '鐢ㄩ噺鈥�', edit: 'text', width: 100 }
- , { field: 'HQty', title: '閲嶉噺', edit: 'text', width: 100 }
+ , { field: 'HQty', title: '閲嶉噺', edit: 'text', width: 100, }
, { field: 'HWeight', title: '瀹為檯绉伴噸', width: 100 }
, { field: 'HPrice', title: '鍗曚环', width: 100, hide: true }
, { field: 'HMoney', title: '閲戦', width: 100, hide: true }
@@ -1625,6 +1625,7 @@
option.data = result.list[0];
for (var i = 0; i < option.data.length; i++) {
option.data[i]["HRate"] = (option.data[i]["HRate"] * 1).toFixed(6);
+ option.data[i]["HQty"] = roundNumber((option.data[i]["HQty"] * 1), 3).toFixed(3);
}
table.render(option);
//option1.data = result.list[1];
@@ -1836,11 +1837,11 @@
var HWeight = $("#HWeight").val();
var HWaterQty = $("#HWaterQty").val();
if (option.data[rowIndex + i].HMaterRuleExternType == "鏌撴枡") {
- option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight);
+ option.data[rowIndex + i].HQty = roundNumber(dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight), 3).toFixed(3);
} else if (option.data[rowIndex + i].HMaterRuleExternType == "鍔╁墏") {
- option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWaterQty * 0.001);
+ option.data[rowIndex + i].HQty = roundNumber(dealDoubleToFixed(option.data[rowIndex + i].HRate * HWaterQty * 0.001), 3).toFixed(3);
} else if (option.data[rowIndex + i].HMaterRuleExternType == "鍔╁墏锛堟寜甯冪畻锛�") {
- option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);
+ option.data[rowIndex + i].HQty = roundNumber(dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001), 3).toFixed(3);
}
//if (option.data[rowIndex + i].HMaterRuleExternType == "缇婃瘺") {
// option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);
@@ -2281,22 +2282,28 @@
//#region 瀛愯〃鍏抽敭瀛楁閲嶅妫�楠�
- var num = [];
- for (var i = 0; i < option.data.length; i++) {
- temp = option.data[i]["HMaterID"];
- if ($.inArray(temp, num) != -1) {
- layer.msg("绗�" + (i + 1) + "琛岋細鐗╂枡閲嶅锛岃閲嶆柊閫夋嫨锛�");
- console.log(option);
- return Result = false;
- }
- num.push(temp);
- }
+ // var num = [];
+ // for (var i = 0; i < option.data.length; i++) {
+ // temp = option.data[i]["HMaterID"];
+ // if ($.inArray(temp, num) != -1) {
+ // layer.msg("绗�" + (i + 1) + "琛岋細鐗╂枡閲嶅锛岃閲嶆柊閫夋嫨锛�");
+ // console.log(option);
+ // return Result = false;
+ // }
+ // num.push(temp);
+ // }
//#endregion
return Result;
}
//#endregion
+ // 鍥涜垗浜斿叆鏂规硶
+ function roundNumber(num, decimalPlaces) {
+ var factor = Math.pow(10, decimalPlaces);
+ return Math.round((num + Math.pow(2, -52)) * factor) / factor;
+ }
+
//#region 鏍规嵁宸ヨ壓鍗曞彿鑾峰彇琛ㄥご淇℃伅
function getMainInfoByHProcExchBillNo() {
var HProcExchBillNo = $("#HProcExchBillNo").val();
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html"
index 4eec288..5e7a846 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html"
@@ -909,7 +909,7 @@
DisPlay_HideColumn()
ins = table.render(option);
- if($("#ColName option").length < 1){
+ if ($("#ColName option").length < 1) {
ColFilter()
}
@@ -1311,15 +1311,26 @@
});
var linterid = obj.data["hmainid"];
+
+ var title = '缂栬緫鐢熶骇棰嗘枡鍗�'
+ var content = '../棰嗘枡鍑哄簱/Kf_MateOutBillLEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
+ if (subType) {
+ if (subType == '缇婃瘺鏌撹壊') {
+ content = '../棰嗘枡鍑哄簱/Kf_MateOutBillEdit_YangMao.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
+ } else if (subType == '姣涘皷') {
+ content = '../棰嗘枡鍑哄簱/Kf_MateOutBillEdit_MaoJian.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
+ }
+ }
+
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '缂栬緫鐢熶骇棰嗘枡鍗�'
+ , title: title
, closeBtn: 1
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../棰嗘枡鍑哄簱/Kf_MateOutBillLEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
+ , content: content
, resize: false,
end: function () {
//get_FastQuery(table, option);
--
Gitblit v1.9.1