From 103959139b12e89ecf25b6773370ada476ad2889 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 23 十月 2025 08:52:30 +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/车间管理/工序流转卡/Sc_ProcessSendWorkEdit.html | 79 ++
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 19
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html | 605 +++++++++++------
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 2
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeArrangementHEmp.html | 1007 ++++++++++++++++++++++++++++++
WebTM/WebTM.csproj | 1
12 files changed, 1,662 insertions(+), 288 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/WebTM.csproj b/WebTM/WebTM.csproj
index 3c8a829..c5ee76b 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -919,6 +919,7 @@
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBillSync.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_CenterCheckBill.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_CenterCheckBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeArrangementHEmp.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillLIst_QueryCheckRecord.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill_Exchange.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillList_Source.html" />
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index 31af6c4..55db939 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -198,7 +198,7 @@
} else {
debugger;
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
- var linterid = params[params[1]];//婧愬崟id
+ var linterid = params[params[1]];//婧愬崟id(椤甸潰鐩存帴璋冩暣鎵撳嵃鏃犻渶鐧诲綍鍔熻兘锛�1.浣滀负鍗曟嵁鍙�2.(1,2,3)@(1,2,3)浼犲叆杩欑鏍煎紡鐨勪富id鍜屽瓙id锛�)
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
var closeType = params[params[3]]; //鍏抽棴绫诲瀷
var loginCard = params[params[4]]; //鑷姩鐧诲綍ic鍗″彿
@@ -278,7 +278,7 @@
if (login_result) {
$("#HSourceBillType").val(HSouceBillType);
form.render('select');
- $("#HSourceBillNo").val(linterid);
+ //$("#HSourceBillNo").val(linterid);
}
}
@@ -319,7 +319,7 @@
initFunction(1, "Gy_BarCodeBill", sessionStorage["HTranSlate"]);
form.render('select');
- //鐧诲綍鍚庨�変腑婧愬崟鍔ㄤ綔
+ //鑷姩鐧诲綍鍚庨�変腑婧愬崟鍔ㄤ綔
if (loginCard != undefined && login_result == true) {
let HSourceBillType = getSupType();
getBarCodeByHBillNo(linterid, HSourceBillType)
@@ -2033,7 +2033,15 @@
//鏍规嵁鍗曟嵁鍙疯幏鍙栨潯鐮佷俊鎭�
function getBarCodeByHBillNo(HBillNo,HSouceBillType) {
var ajaxLoad = layer.load();
- let sWhere1 = " and 鍗曟嵁鍙� = '" + HBillNo +"'"
+ HBillNo = decodeURIComponent(HBillNo);
+ let sWhere1 = "";
+ if (HBillNo.includes('@')) {
+ str = HBillNo.split('@', 2);
+ sWhere1 = " and HMainID in " + str[0] + " and HSubID in " + str[1];
+ } else {
+ sWhere1 = " and 鍗曟嵁鍙� = '" + HBillNo + "'"
+ }
+
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
url: GetWEBURL() + '/Sc_BarCode/ReportFromBillList',
@@ -2049,7 +2057,8 @@
var checkStatus = data1;//鑾峰彇table鐨別lem:"#test"
if (checkStatus.data === null) {
layer.close(ajaxLoad);
- return layer.msg(get_MessageError('[0000-1-020]璇烽�夋嫨鍗曟嵁鏁版嵁', sessionStorage["HTranSlate"]));
+ /*return layer.msg(get_MessageError('[0000-1-020]璇烽�夋嫨鍗曟嵁鏁版嵁', sessionStorage["HTranSlate"]));*/
+ return layer.msg("娌℃湁瀵瑰簲鍙敓鎴愬崟鎹�");
}
var list = [];
var BillSelect = [];
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\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangementHEmp.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangementHEmp.html"
new file mode 100644
index 0000000..a5f1b91
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangementHEmp.html"
@@ -0,0 +1,1007 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>宸ュ簭娴佽浆鍗℃淳宸�(鑱屽憳)</title>
+ <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, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/ext/soulTable.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/layui/layui1.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style>
+ /*鏍戠姸鍥剧偣鍑婚珮浜彉鑹�*/
+ .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
+ background: #aef0f7;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label">鑱屽憳浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HEmpNumber" id="HEmpNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鑱屽憳鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HEmpName" id="HEmpName">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch_cx" id="btnSearch_cx">
+ 鑱屽憳鏌ヨ
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch_cx" id="btnReSearch_cx" style="padding:0 5px">鑱屽憳閲嶇疆</button>
+
+
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HNumber" id="HNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">娴佽浆鍗″彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇璁㈠崟鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HICMBillNO" id="HICMBillNO">
+ </div>
+ </div>
+ <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>
+ </div>
+ <div class="layui-row" style="margin-top:10px;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">宸ュ簭浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HProcNumber" id="HProcNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">宸ュ簭鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HProcName" id="HProcName">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HName" id="HName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HModel" id="HModel">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="padding:10px 0">
+ <div class="layui-col-xs3 layui-inline" style="border: solid 1.5px #e0d6d64d;">
+ <div id="TreeTable" class="demo-tree demo-tree-box" style="height: 400px; overflow: auto;"></div>
+ </div>
+ <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 73%">
+ <div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="padding:10px 0">
+ <div class="layui-col-xs12 layui-inline" style="padding-left: 10px;">
+ <div>
+ <table class="" id="mainTable2" lay-filter="mainTable2"></table>
+ </div>
+ </div>
+ </div>
+
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AdutArrangement"><i class="layui-icon layuiiconform"></i>鍙栨秷鎺掑崟</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_print"><i class="layui-icon layuiiconform"></i>鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layuiiconform"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ </div>
+ </script>
+ <script type="text/html" id="toolbarDemo2">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Arrangement"><i class="layui-icon layuiiconform"></i>鎺掑崟</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2"><i class="layui-icon layuiiconform"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ soulTable: 'soulTable'
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'tree', 'soulTable'], function () {
+ //#region 鍏敤鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , tree = layui.tree
+ , soulTable = layui.soulTable
+ var sWhere = "";
+
+ var option = [];
+ var option2 = [];
+ var Organization = sessionStorage["Organization"];
+ var HModName = "Sc_ProcessExchangeArrangementHEmp";
+ var HModName2 = "Sc_ProcessExchangeArrangementHEmp2";
+ // 瀛樺偍褰撳墠閫変腑鐨勮妭鐐癸紙鏀寔澶氶�夛級
+ var selectedNodes = [];
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch (obj.event) {
+ //鍙栨秷鎺掔几
+ case 'set_AdutArrangement':
+ set_AdutArrangement();
+ break;
+ //鎵撳嵃
+ case 'get_print':
+ get_print();
+ break;
+ //閫�鍑烘寜閽�
+ case 'btn-Close':
+ parent.layui.admin.events.closeThisTabs();
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumnNoPage(HModName, 1, option, get_Display)
+ break;
+ };
+ });
+
+ table.on('toolbar(mainTable2)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch (obj.event) {
+ //鎺掔几
+ case 'set_Arrangement':
+ set_Arrangement();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_FastQuery();
+ break;
+ //閫�鍑烘寜閽�
+ case 'btn-Close':
+ parent.layui.admin.events.closeThisTabs();
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn2':
+ get_HideColumnNoPage(HModName2, 1, option2, get_FastQuery)
+ break;
+ };
+ });
+
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ });
+
+ table.on('sort(mainTable2)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable2', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option2.data = layui.table.cache["mainTable2"];
+ table.render(option);
+ });
+ //#endregion
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ //#endregion
+
+ //浜х嚎鏌ヨ
+ form.on('submit(btnSearch_cx)', function (data) {
+ get_Display_Tree();
+ });
+
+ //鏉″舰鐮佸洖杞︽柟娉�
+ $('#HProcExchBillNo').on('keydown', function (event) {
+ var HBarCode = $('#HProcExchBillNo').val();
+ if (event.keyCode == 13) {
+ if (!HBarCode) {
+ layer.msg("娴佽浆鍗″彿涓嶈兘涓虹┖锛�")
+ return;
+ }
+ get_FastQuery();
+ }
+ });
+
+
+ //鏉″舰鐮佸洖杞︽柟娉�
+ $('#HICMBillNO').on('keydown', function (event) {
+ var HBarCode = $('#HICMBillNO').val();
+ if (event.keyCode == 13) {
+ if (!HBarCode) {
+ layer.msg("鐢熶骇璁㈠崟鍙蜂笉鑳戒负绌猴紒")
+ return;
+ }
+ get_FastQuery();
+ }
+ });
+
+
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ //$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ //$(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+
+ table.on('row(mainTable2)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ //$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ //$(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable2 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable2, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+
+ //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display();
+ get_FastQuery();
+ get_Display_Tree();
+ }
+ //#endregion
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [[]]
+ , data: []
+ , height: 400
+ , page: true
+ , totalRow: true
+ , limits: [50, 500, 1000]
+ , filter: {
+ bottom: false
+ }
+ , limit: 50
+ , cellMinWidth: 90
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+
+ }
+ }
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option2 = {
+ elem: '#mainTable2'
+ , toolbar: '#toolbarDemo2'
+ , cols: [[]]
+ , data: []
+ , height: 400
+ , page: true
+ , totalRow: true
+ , filter: {
+ bottom: false
+ }
+ , limits: [50, 500, 1000]
+ , limit: 50
+ , cellMinWidth: 90
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+
+ }
+ }
+
+ }
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HNumber").val("");
+ $("#HName").val("");
+ $("#HModel").val("");
+ $("#HProcExchBillNo").val("");
+ $("#HICMBillNO").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ form.render('select');
+ sWhere = "";
+ }
+ //#endregion
+ //#region 鏌ヨ宸叉淳宸ョ殑鏁版嵁
+ function get_Display(sWhere = "", HEmpIDs="") {
+ if (HEmpIDs != "") {
+ sWhere += " and 鎿嶄綔宸D in (" + HEmpIDs + ")";
+ }
+ sWhere += ` order by hmainid desc` ;
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ProcExchSendWorkBill/Sc_ProcExchSendWorkBillListByEmp',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HEmpID": 0},
+ success: function (data1) {
+ if (data1.count == 1) {
+ var totalArray=["鏁伴噺"]
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
+ }
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120, filter: true });
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120, filter: true });
+ break;
+
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, filter: true });
+ }
+ }
+ }
+
+ option.cols = [col];
+ option.data = data1.data
+
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, []);
+ table.render(option);
+ layer.close(ajaxLoad);
+
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //鏌ヨ鏈淳宸ョ殑娴佽浆鍗�
+ function get_Display2(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ProcExchSendWorkBill/Sc_ProcessExchangeHEmpList',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "OperationType": 1 },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var totalArray = ["鐢熸垚鏁伴噺", "浠诲姟鍗曟暟閲�", "璁″垝鏁伴噺", "娴佽浆鍗℃暟閲�", "寮�宸ヤ綑閲忓ぉ鏁�", "寮�宸ヤ綑閲忓浐鏁�", "涓婇亾鍥哄畾澶╂暟", "鍔犲伐鍗曚环", "鍔犲伐璐圭敤閲戦", "鎷嗗垎鏁伴噺", "鍓╀綑鏁伴噺", "涓嶈壇鍝佸叧鑱旀暟閲�", "杩涚珯鍏宠仈鏁伴噺", "鍑虹珯鍏宠仈鏁伴噺", "鍑虹珯鎶ュ簾鍏宠仈鏁伴噺"];
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
+ }
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120, filter: true });
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120, filter: true});
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, filter: true });
+ }
+ }
+ }
+
+
+ option2.cols = [col];
+ option2.data = data1.data;
+
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn(HModName2, sessionStorage["HUserName"], option2,[]);
+ table.render(option2);
+ layer.close(ajaxLoad);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //鎵撳嵃
+ function get_print() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length == 1) {
+ var linterid = data[0].hmainid.toString();
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + '&MyMsg=' + linterid.toString() + '&Type=Sc_ProcessExchangeArrangement', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HProcNumber = $("#HProcNumber").val();
+ var HProcName = $("#HProcName").val();
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+ var HModel = $("#HModel").val();
+ var HProcExchBillNo = $("#HProcExchBillNo").val();
+ var HICMBillNO = $("#HICMBillNO").val();
+
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName + " " + com;
+ }
+
+ if (HProcNumber) {
+ sWhere += " and 宸ュ簭浠ｇ爜 like '%" + HProcNumber + "%'";
+ }
+ if (HProcName) {
+ sWhere += " and 宸ュ簭 like '%" + HProcName + "%'";
+ }
+ if (HNumber) {
+ sWhere += " and 浜у搧浠ｇ爜 like '%" + HNumber + "%'";
+ }
+ if (HName) {
+ sWhere += " and 浜у搧鍚嶇О like '%" + HName + "%'";
+ }
+ if (HModel) {
+ sWhere += " and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
+ }
+ if (HProcExchBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HProcExchBillNo + "%'";
+ }
+ if (HICMBillNO) {
+ sWhere += " and 鐢熶骇璁㈠崟鍙� like '%" + HICMBillNO + "%'";
+ }
+ //娣诲姞宸ュ簭 杞﹂棿閮ㄩ棬杩囨护
+ sWhere += getDeptIDByUser();
+ sWhere += getProcIDByUser();
+ sWhere += " and 涓嬮亾娴佽浆宸ュ簭<>'杞�' and 濮斿鏍囪=0 and 娴佽浆鏍囪=1 and 鏈姤宸ユ暟閲�>0 order by hmainid DESC "
+ get_Display2(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ var DataEmpID = "";
+ //鎺掔几鍔熻兘
+ function set_Arrangement() {
+ var checkStatus = table.checkStatus('mainTable2')
+ , data = checkStatus.data;
+ var array = [];
+ var interid = [];
+ var ieid = [];
+ if (DataEmpID == "" || DataEmpID == "100" ) {
+ return layer.msg("璇烽�夋嫨闇�瑕佹淳宸ョ殑鍛樺伐!");
+ }
+ for (let i = 0; i < data.length; i++) {
+ array.push(checkStatus.data[i]["hsubid"]); //鑾峰彇娴佽浆鍗″瓙琛↖D
+ interid.push(checkStatus.data[i]["hmainid"]);
+ ieid.push(checkStatus.data[i]["hmainid"].toString() + checkStatus.data[i]["hsubid"].toString());
+ //鍒ゆ柇鍗曟嵁鍙锋槸鍚︾浉鍚�
+ //if (checkStatus.data[0]["鍗曟嵁鍙�"] != checkStatus.data[i]["鍗曟嵁鍙�"]) {
+ // layer.msg("鍕鹃�変簡涓嶅悓娴佽浆鍗″彿锛岃纭");
+ // return;
+ //}
+ }
+ var HEntryID = array.join(",");//鐢ㄩ�楀彿鍒嗗壊鏁扮粍
+ var HInterID = interid.join(",");
+ var HIeID = ieid.join(",");
+ if (checkStatus.data.length >= 1) {
+ if (checkStatus.data[0]["宸ュ簭鍙�"] != "9999") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "宸ュ簭娲惧伐鍗曠紪杈�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["100%", "100%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessSendWorkEdit.html?OperationType=1&linterid=' + HInterID.toString() + '&HEntryID=' + HEntryID.toString() + '&HIeID=' + HIeID + '&HEmpIDs=' + DataEmpID, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //get_Display();
+ //get_FastQuery();
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ //DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , success: function (layero, index, that) {
+
+ }
+ , end: function () {
+ get_Display();
+ get_FastQuery();
+ }
+ })
+ } else {
+ layer.msg('娲惧伐宸ュ簭涓嶈兘鏄浆宸ュ簭锛�');
+ }
+ } else {
+ layer.msg('璇烽�夋嫨鏁版嵁缂栬緫锛�');
+ }
+ }
+
+
+ // 鍒犻櫎
+ function set_AdutArrangement() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hmainid = data[0].hmainid;
+ var hsubid = data[0].hentryid;
+ layer.confirm("纭瑕佸彇娑堝悧锛屽彇娑堝悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ProcExchSendWorkBill/DelProcessSendWork_Sec',
+ type: "GET",
+ data: { "HInterID": hmainid, "HEntryID": hsubid, "User": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ layer.msg(result.Message);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ get_Display();
+ get_FastQuery();
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+
+ }
+
+
+ // 鏍戠姸鍥炬煡璇�
+ function get_Display_Tree() {
+ var sql = " where 1=1";
+ //鑾峰彇鍏宠仈鑱屽憳
+ sql += getEmpIDByUser();
+ //sql += " and HUSEORGID=" + sessionStorage["OrganizationID"];
+
+ var HEmpNumber = $('#HEmpNumber').val();
+ var HEmpName = $('#HEmpName').val();
+ if (HEmpNumber) {
+ sql += " and hnumber like '%" + HEmpNumber + "%'";
+ }
+ if (HEmpName) {
+ sql += " and hname like '%" + HEmpName + "%'";
+ }
+
+
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Employee/Gy_EmployeeTreeList',
+ type: "GET",
+ data: { "sWhere": sql},
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(ajaxLoad);
+ var data = JSON.parse(data1.data);
+ MenuMain(data);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //#region 鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈鑱屽憳鐨勮繃婊ゆ潯浠�
+ function getEmpIDByUser() {
+ var res = "";
+ $.ajax({
+ type: "GET",
+ async: false,
+ url: GetWEBURL() + "/Xt_User/UserEmployeelistPlaylist", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HUserID": sessionStorage["Czybm"] },
+ success: function (result) {
+ if (result.count == 1) {
+ if (result.data.length > 0) {
+ for (let item of result.data) {
+ res += item.HItemID.toString() + ","
+ }
+ res = res.slice(0, -1);
+ res = ` and hitemid in (${res})`
+ }
+
+ }
+ }, error: function (err) {
+ res = " and 1 = 0";
+ layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+ }
+ });
+ return res;
+ }
+ //#endregion
+
+ //#region 鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈閮ㄩ棬鐨勮繃婊ゆ潯浠�
+ function getDeptIDByUser() {
+ var res = "";
+ $.ajax({
+ type: "GET",
+ async: false,
+ url: GetWEBURL() + "/Xt_User/UserDeptlistPlaylist", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HUserID": sessionStorage["Czybm"] },
+ success: function (result) {
+ if (result.count == 1) {
+ if (result.data.length > 0) {
+ for (let item of result.data) {
+ res += item.HItemID.toString() + ","
+ }
+ res = res.slice(0, -1);
+ res = ` and HWorkShopID in (${res})`
+ }
+
+ }
+ }, error: function (err) {
+ res = " and 1 = 0";
+ layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+ }
+ });
+ return res;
+ }
+ //#endregion
+
+ //#region 鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈宸ュ簭鐨勮繃婊ゆ潯浠�
+ function getProcIDByUser() {
+ var res = "";
+ $.ajax({
+ type: "GET",
+ async: false,
+ url: GetWEBURL() + "/Xt_User/ProcessPlaylist", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HUserID": sessionStorage["Czybm"] },
+ success: function (result) {
+ if (result.count == 1) {
+ if (result.data.length > 0) {
+ for (let item of result.data) {
+ res += item.HProcID.toString() + ","
+ }
+ res = res.slice(0, -1);
+ res = ` and HProcID in (${res})`
+ }
+
+ }
+ }, error: function (err) {
+ res = " and 1 = 0";
+ layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+ }
+ });
+ return res;
+ }
+ //#endregion
+
+ //閬嶅巻鐢熸垚涓昏彍鍗�
+ function MenuMain(data) {
+ var liStr = '[';
+ //閬嶅巻鐢熸垚涓昏彍鍗�
+ for (var i = 0; i < data.length; i++) {
+ // 鍒ゆ柇鏄惁瀛樺湪瀛愯彍鍗�
+ if (data[i].children != null && data[i].children.length > 0) {
+ liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
+ // 閬嶅巻鑾峰彇瀛愯彍鍗�
+ for (var k = 0; k < data[i].children.length; k++) {
+ liStr += getChildMenu(data[i].children[k], 0);
+ }
+ liStr = liStr.substring(0, liStr.length - 1);
+ liStr += ']},';
+ } else {
+ liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
+ }
+ };
+ liStr = liStr.substring(0, liStr.length - 1);
+ liStr += "]";
+ var treeTable = JSON.parse(liStr);
+ tree.render({
+ elem: '#TreeTable' //榛樿鏄偣鍑昏妭鐐瑰彲杩涜鏀剁缉
+ , data: treeTable
+ , onlyIconControl: true
+ , click: function (obj) {
+ var $node = obj.elem; // 褰撳墠鐐瑰嚮鐨勮妭鐐瑰厓绱�
+ var data = obj.data; // 褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
+ //debugger
+ // 鍒ゆ柇鏄惁鏄渶涓婂眰鑺傜偣锛堝亣璁炬牴鑺傜偣鐨� id 涓� "" 鎴� "root"锛�
+ if (data.id === "" || data.id === "0" || data.isRoot) {
+ // 鐐瑰嚮鏍硅妭鐐� 鈫� 娓呯┖鎵�鏈夐�変腑鐘舵��
+ selectedNodes = [];
+ $(".layui-tree-set").removeClass('layui-tree-set-active'); // 绉婚櫎鎵�鏈夐珮浜�
+ DataEmpID = ""; // 娓呯┖鍏ㄥ眬鍙橀噺
+ get_Display("", DataEmpID); // 璋冪敤鏂规硶
+ return; // 鐩存帴杩斿洖锛屼笉鍐嶆墽琛屽悗缁�昏緫
+ }
+
+ // 鏅�氳妭鐐� 鈫� 澶氶�夐�昏緫
+ var nodeId = data.id;
+ var index = selectedNodes.indexOf(nodeId);
+
+ if (index === -1) {
+ // 鏈�変腑 鈫� 娣诲姞鍒伴�変腑鍒楄〃锛屽苟楂樹寒
+ selectedNodes.push(nodeId);
+ $node.addClass('layui-tree-set-active');
+ } else {
+ // 宸查�変腑 鈫� 浠庨�変腑鍒楄〃绉婚櫎锛屽苟鍙栨秷楂樹寒
+ selectedNodes.splice(index, 1);
+ $node.removeClass('layui-tree-set-active');
+ }
+
+ // 鏇存柊鍏ㄥ眬鍙橀噺锛堝涓� ID 鐢ㄩ�楀彿鍒嗛殧锛�
+ DataEmpID = selectedNodes.join(',');
+ get_Display("", DataEmpID); // 璋冪敤鏂规硶
+ }
+ });
+ }
+
+ // 閫掑綊鐢熸垚瀛愯彍鍗�
+ function getChildMenu(subMenu, num) {
+ num++;
+ var subStr = '';
+ if (subMenu.children != null && subMenu.children.length > 0) {
+ subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
+ for (var j = 0; j < subMenu.children.length; j++) {
+ subStr += getChildMenu(subMenu.children[j], num);
+ if (j + 1 == subMenu.children.length) {
+ subStr = subStr.substring(0, subStr.length - 1);
+ }
+ }
+ subStr += ']},';
+ } else {
+ subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
+ }
+ return subStr;
+ }
+
+
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option2.cols[0].length; i++) {
+ if (option2.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option2.cols[0][i].field + '">' + option2.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+ });
+
+ //宸ヤ綔涓績
+ function GetWorkCenterValue(obj) {
+ $("#HCenterID").val(obj[0].HItemID);
+ $("#HCenterName").val(obj[0].宸ヤ綔涓績鍚嶇О);
+ }
+ //鐢熶骇杞﹂棿
+ function GetHDeptNameValue(obj) {
+ $("#HDeptID").val(obj[0].HItemID);
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ }
+ //宸ュ簭
+ function GetProcessValue(obj) {
+ $("#HProcID").val(obj[0].HItemID);
+ $("#HProcName").val(obj[0].宸ュ簭鍚嶇О);
+ }
+
+ //#endregion
+ </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessSendWorkEdit.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessSendWorkEdit.html"
index 291a064..5d5c0e2 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessSendWorkEdit.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessSendWorkEdit.html"
@@ -12,6 +12,7 @@
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
<style>
.main-btn { /*澶撮儴涓绘寜閽�*/
padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
@@ -25,6 +26,11 @@
/* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
.layui-table-cell {
overflow: visible !important;
+ }
+ .layui-table th, .layui-table td {
+ white-space: nowrap; /* 涓嶆崲琛� */
+ overflow: hidden; /* 瓒呭嚭鍐呭闅愯棌 */
+ text-overflow: ellipsis; /* 鏄剧ず鐪佺暐鍙� */
}
/* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
td .layui-form-select {
@@ -88,7 +94,7 @@
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">鐢熶骇缁勭粐</label>
<div class="layui-input-inline">
- <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ <select name="HPRDORGID" id="HPRDORGID" lay-verify="HPRDORGID">
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
</div>
@@ -205,6 +211,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
</form>
@@ -250,6 +257,7 @@
$("h1").html('<b>' + HPageTitle + '</b>');
//#endregion
+ var HModName = 'Sc_ProcessSendWorkEdit'
//鍒濆鍖栫晫闈�
set_ClearBill();
@@ -265,6 +273,7 @@
var linterid = params[params[1]];//婧愬崟id
var HEntryID = params[params[2]];//婧愬崟瀛恑d
var HIeID = params[params[3]]; //婧愬崟id + 婧愬崟瀛恑d
+ var HEmpIDs = params[params[4]];//鑱屽憳鍒楄〃
}
//宸ュ簭娲惧伐鏂板
@@ -280,13 +289,13 @@
$("#HMaker").val(sessionStorage["HUserName"]);
}
});
- //鏌ヨ宸ュ簭娴佽浆鍗�
- get_ProcessExchange();
//鍒濆鍖栫晫闈�
set_ClearBill();
+ //鏌ヨ宸ュ簭娴佽浆鍗�
+ get_ProcessExchange();
} else if (OperationType == 3) {
//绂佺敤缁勭粐閫夐」
- $("#HUSEORGID").attr("disabled", true);
+ $("#HPRDORGID").attr("disabled", true);
//鍒濆鍖栫晫闈�
set_ClearBill();
RoadBillMain(linterid);
@@ -338,6 +347,10 @@
}
form.render('select');
}
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table)
break;
}
});
@@ -630,6 +643,7 @@
$("#HPlanEndDate").val(Format(new Date().setMonth(new Date().getMonth() + 1), "yyyy-MM-dd"));//宸ュ簭璁″垝瀹屽伐鏃ユ湡
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table)
}
//鑾峰彇缁勭粐
@@ -645,8 +659,8 @@
for (var i = 0; i < data.length; i++) {
Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
}
- $("#HUSEORGID").append(Organization);
- $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+ $("#HPRDORGID").append(Organization);
+ $("#HPRDORGID").val(sessionStorage["OrganizationID"])
form.render('select');
}
layer.closeAll("loading");
@@ -659,7 +673,7 @@
//琛ㄥご
columns = [ //琛ㄥご
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'numbers', title: '搴忓彿' }
+ , { type: 'numbers', field: '搴忓彿', title: '搴忓彿' }
, { field: 'HMainID', title: '娲惧伐鍗曚富ID', hide: true }// 鐢ㄤ簬鎵撳嵃鏃惰幏鍙栨暟鎹�
, { field: 'HEntryID', title: '娲惧伐鍗曞瓙ID', hide: true }// 鐢ㄤ簬鎵撳嵃鏃惰幏鍙栨暟鎹�
, { field: 'HSourceInterID', title: '娴佽浆鍗D', hide: true }
@@ -683,7 +697,7 @@
, { field: 'HSourceNumber', title: '鐢熶骇璧勬簮浠ｇ爜', edit: 'text', event: "HSourceCheck" }
, { field: 'HSourceName', title: '鐢熶骇璧勬簮鍚嶇О' }
, { field: 'HWorkerID', title: '鎿嶄綔宸D', hide: true }
- , { field: 'HWorkerNumber', title: '鎿嶄綔宸ヤ唬鐮�', edit: 'text', event: "HWorkerCheck", hide: true }
+ , { field: 'HWorkerNumber', title: '鎿嶄綔宸ヤ唬鐮�', edit: 'text', event: "HWorkerCheck", hide: false }
, { field: 'HWorkerName', title: '鎿嶄綔宸ュ悕绉�', hide: true }
, { field: 'HGroupID', title: '鐝粍ID', hide: true }
, { field: 'HGroupNumber', title: '鐝粍浠ｇ爜', edit: 'text', event: "HGroupCheck", hide: true}
@@ -771,6 +785,9 @@
)
}
option.data = rowdata;
+
+ setTableHEmp(HEmpIDs);
+
table.render(option);
form.render('select');
} else {
@@ -783,7 +800,53 @@
});
}
+ function setTableHEmp(HEmpIDs) {
+ if (HEmpIDs != undefined && HEmpIDs != null && HEmpIDs != 0 && HEmpIDs != "") {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Employee/list",
+ async: false,
+ type: "GET",
+ data: {
+ "sWhere": " and HItemID in (" + HEmpIDs + ")", "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"]
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ const newData = [];
+ // 閬嶅巻 option.data 鐨勬瘡涓璞�
+ option.data.forEach(templateItem => {
+ // 瀵规瘡涓� templateItem锛屽鍒� data1.length 娆�
+ data.forEach(dataItem => {
+ // 娣辨嫹璐� templateItem
+ const newItem = JSON.parse(JSON.stringify(templateItem));
+
+ // 鏇挎崲瀛楁
+ newItem.HWorkerID = dataItem.HItemID;
+ newItem.HWorkerNumber = dataItem.鑱屽憳浠ｇ爜;
+ newItem.HWorkerName = dataItem.鑱屽憳鍚嶇О;
+
+ // 娣诲姞鍒版柊鏁扮粍
+ newData.push(newItem);
+ });
+ });
+
+ // 鏇挎崲鍘� option.data
+ option.data = newData;
+ table.render(option);
+ 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 });
+ }
+ });
+ }
+ }
//闈炵┖楠岃瘉
function AllowLoadData(data) {
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