From e515f8e29261bc5d494709068d81a56274d12101 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 28 十二月 2022 08:50:25 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/Baseset/基础资料/Gy_EquipFileBillMainList.html | 103
WebTM/views/index_Mobile.html | 24
WebTM/views/基础资料/基础资料/Gy_OperatorEdit.html | 95
WebTM/views/领料发货/其他出库/Kf_OtherOutBill_Fast.html | 10
WebTM/views/领料发货/委外补料/Kf_EntrustReplenishOutBill_Check_New.html | 639 ++++
WebTM/views/质量管理/来料检验单/Kf_QCStockInCheckBill_Fast.html | 60
WebTM/views/home/console.html | 6
WebTM/views/基础资料/销售基础资料/Gy_Customer.html | 2
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBill_OutList.html | 538 +++
WebTM/views/模治具管理/模治具管理/KF_BarCodeStatusChangeBill.html | 528 +--
WebTM/views/home/console_Mobile.html | 6
WebTM/views/设备管理/设备备品备件/Sb_EquipSparepartsBill.html | 751 +++++
WebTM/views/index.html | 8
WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html | 20
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBill_Out.html | 917 ++++++
WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html | 20
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html | 6
WebTM/views/质量管理/来料检验单/Kf_SCStockInCheckBill_Fast.html | 12
WebTM/views/Baseset/基础资料/Gy_MouldFileMainList.html | 103
WebTM/views/基础资料/采购基础资料/Gy_Supplier.html | 4
WebTM/views/设备管理/设备备品备件/Sb_EquipSparepartsBillList.html | 522 +++
WebTM/views/设备管理/设备备品备件/Sb_EquipSparepartsChangeBillList.html | 522 +++
WebTM/views/领料发货/收料入库/Kf_ReciveBill_Fast_AR.html | 444 +++
WebTM/views/设备管理/设备备品备件/Sb_EquipSparepartsChangeBill.html | 761 +++++
WebTM/views/模治具管理/模治具管理/KF_BarCodeStatusChangeBillList.html | 514 +++
WebTM/views/验收入库/外购入库/Kf_POStockInBill_FastList.html | 2
WebTM/views/领料发货/委外出库/Kf_EntrustOutBill_CheckList_New.html | 402 ++
WebTM/views/基础资料/基础资料/Gy_Operator.html | 2
WebTM/views/领料发货/委外补料/Kf_EntrustReplenishOutBill_CheckList_New.html | 402 ++
WebTM/views/领料发货/委外出库/Kf_EntrustOutBill_Check_New.html | 639 ++++
WebTM/views/领料发货/收料入库/Kf_ReciveBill_Fast.html | 61
WebTM/WebTM.csproj | 14
32 files changed, 7,727 insertions(+), 410 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 17a9d6a..11acd9b 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -103,9 +103,11 @@
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_BadWHList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ClassTimePrjGroupEdit.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ClassTimePrjList.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_EquipFileBillMainList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_GetProcNoList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_LineCenter.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_MaterList.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_MouldFileMainList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_MouldList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_OrganizationtList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_PoStockStyle.html" />
@@ -874,11 +876,14 @@
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldDotCheckBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldMaintainBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱BatchGen_MouldFile.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_BarCodeBill_Out.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_BarCodeBill_OutList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_CheckToolsFileMainList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_MouldFileList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_MouldFile.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_MouldFileResume.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱KF_BarCodeStatusChangeBill.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱KF_BarCodeStatusChangeBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sb_Add_MouldRepairWorkBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_Add_MouldConkBookBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_Add_MouldDotCheckBillList.html" />
@@ -1053,6 +1058,10 @@
<Content Include="views\璁惧绠＄悊\Sb_EquipMaintainPlanBillEdit.html" />
<Content Include="views\璁惧绠＄悊\Sb_EquipMaintainPlanBillList.html" />
<Content Include="views\璁惧绠＄悊\Sc_Add_MouldDotCheckBillList.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧澶囧搧澶囦欢\Sb_EquipSparepartsBill.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧澶囧搧澶囦欢\Sb_EquipSparepartsBillList.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧澶囧搧澶囦欢\Sb_EquipSparepartsChangeBill.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧澶囧搧澶囦欢\Sb_EquipSparepartsChangeBillList.html" />
<Content Include="views\璁惧绠＄悊\璁惧妗ｆ\Gy_EquipFileBillResume.html" />
<Content Include="views\璁惧绠＄悊\璁惧妗ｆ\Gy_EquipFileMainEdit.html" />
<Content Include="views\璁惧绠＄悊\璁惧妗ｆ\Gy_EquipFileMainList.html" />
@@ -1129,7 +1138,12 @@
<Content Include="views\棰嗘枡鍙戣揣\鍏朵粬鍑哄簱\Kf_OtherOutBill_Check.html" />
<Content Include="views\棰嗘枡鍙戣揣\鍒嗘寮忚皟鍑哄崟\Fb_StepFoldOutBillList.html" />
<Content Include="views\棰嗘枡鍙戣揣\濮斿鍑哄簱\Kf_EntrustOutBillList.html" />
+ <Content Include="views\棰嗘枡鍙戣揣\濮斿鍑哄簱\Kf_EntrustOutBill_Check_New.html" />
+ <Content Include="views\棰嗘枡鍙戣揣\濮斿鍑哄簱\Kf_EntrustOutBill_CheckList_New.html" />
+ <Content Include="views\棰嗘枡鍙戣揣\濮斿琛ユ枡\Kf_EntrustReplenishOutBill_Check_New.html" />
+ <Content Include="views\棰嗘枡鍙戣揣\濮斿琛ユ枡\Kf_EntrustReplenishOutBill_CheckList_New.html" />
<Content Include="views\棰嗘枡鍙戣揣\鏀舵枡鍏ュ簱\Kf_ReciveBill_Check.html" />
+ <Content Include="views\棰嗘枡鍙戣揣\鏀舵枡鍏ュ簱\Kf_ReciveBill_Fast_AR.html" />
<Content Include="views\棰嗘枡鍙戣揣\鏀舵枡鍏ュ簱\Kf_ReciveBill_Fast.html" />
<Content Include="views\棰嗘枡鍙戣揣\鐢熶骇琛ユ枡\Kf_MateReplenishOutBill_Check_New.html" />
<Content Include="views\棰嗘枡鍙戣揣\鐢熶骇琛ユ枡\Kf_MateReplenishOutBill_CheckList_New.html" />
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipFileBillMainList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipFileBillMainList.html"
new file mode 100644
index 0000000..74cd9e7
--- /dev/null
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipFileBillMainList.html"
@@ -0,0 +1,103 @@
+锘�<!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.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">
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-card">
+ <!--<div class="layui-card-header"></div>-->
+ <div class="layui-card-body" style="padding: 15px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护鍒�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
+ </div>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
+ <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>-->
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="mainTable"></table>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script>
+ layui.use(['table', 'form', 'layer'], function () {
+ var table = layui.table
+ , form = layui.form
+ , layer = layui.layer;
+
+ form.on('submit(HQuery)', function () {//閫夋嫨浠撳簱
+ //var sMainStr = JSON.stringify(table.cache['mainTable']);
+ RoadQuery($('#Value').val());
+ });
+ form.on('submit(FH)', function () {//閫夋嫨浠撳簱
+ //var sMainStr = JSON.stringify(table.cache['mainTable']);
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ parent.GetHEquipNameValue(data);
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+ RoadQuery($('#Value').val());
+ table.render({
+ elem: '#mainTable'
+ // , url: '/demo/table/user/'
+ , data: []
+ , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HInterID', title: '璁惧涓绘。ID', hide: true }
+ , { field: 'HEquipFileNumber', title: '璁惧涓绘。浠ｇ爜' }
+ , { field: 'HName', title: '璁惧涓绘。鍚嶇О', sort: true }
+ ]]
+ , page: true
+ });
+ ///鍔犺浇鏄剧ず鏁版嵁
+ function RoadQuery(Where) {
+ var Value = Where;
+ if (Value == null) {
+ Value = '';
+ }
+ $.ajax({
+ type: "get",
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetDepartmentList_Json",
+ url: GetWEBURL() + "/Web/GetGy_EquipFileBillMainList_Json",
+ async: true,
+ data: { "EquipFileBill": Value },
+ //data: { "Value": Value },
+ success: function (result) {
+ ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+ table.reload('mainTable', {
+ data: ajaxReturnData
+ , height: 'full-10'
+ , loading: false
+ , done: function (index, res) {
+
+ }
+ });
+ },
+ error: function (result) {
+ console.log(result);
+ //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+ }
+ });
+ };
+ });
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldFileMainList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldFileMainList.html"
new file mode 100644
index 0000000..94b6677
--- /dev/null
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldFileMainList.html"
@@ -0,0 +1,103 @@
+锘�<!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.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">
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-card">
+ <!--<div class="layui-card-header"></div>-->
+ <div class="layui-card-body" style="padding: 15px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护鍒�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
+ </div>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
+ <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>-->
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="mainTable"></table>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script>
+ layui.use(['table', 'form', 'layer'], function () {
+ var table = layui.table
+ , form = layui.form
+ , layer = layui.layer;
+
+ form.on('submit(HQuery)', function () {//閫夋嫨浠撳簱
+ //var sMainStr = JSON.stringify(table.cache['mainTable']);
+ RoadQuery($('#Value').val());
+ });
+ form.on('submit(FH)', function () {//閫夋嫨浠撳簱
+ //var sMainStr = JSON.stringify(table.cache['mainTable']);
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ parent.GetHMaterNameValue(data);
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+ RoadQuery($('#Value').val());
+ table.render({
+ elem: '#mainTable'
+ // , url: '/demo/table/user/'
+ , data: []
+ , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HInterID', title: '鍣ㄥ叿ID', hide: true }
+ , { field: 'HNumber', title: '鍣ㄥ叿浠ｇ爜' }
+ , { field: 'HName', title: '鍣ㄥ叿鍚嶇О', sort: true }
+ ]]
+ , page: true
+ });
+ ///鍔犺浇鏄剧ず鏁版嵁
+ function RoadQuery(Where) {
+ var Value = Where;
+ if (Value == null) {
+ Value = '';
+ }
+ $.ajax({
+ type: "get",
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetDepartmentList_Json",
+ url: GetWEBURL() + "/Web/GetGy_MouldFileMainList_Json",
+ async: true,
+ data: { "MouldFileMain": Value },
+ //data: { "Value": Value },
+ success: function (result) {
+ ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+ table.reload('mainTable', {
+ data: ajaxReturnData
+ , height: 'full-10'
+ , loading: false
+ , done: function (index, res) {
+
+ }
+ });
+ },
+ error: function (result) {
+ console.log(result);
+ //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+ }
+ });
+ };
+ });
+ </script>
+
+</body>
+</html>
diff --git a/WebTM/views/home/console.html b/WebTM/views/home/console.html
index d0f45b0..862531f 100644
--- a/WebTM/views/home/console.html
+++ b/WebTM/views/home/console.html
@@ -111,6 +111,12 @@
<cite>鏉ユ枡妫�楠屽崟</cite>
</a>
</li>
+ <li class="layui-col-xs3">
+ <a href="../棰嗘枡鍙戣揣/鏀舵枡鍏ュ簱/Kf_ReciveBill_Fast_AR.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-find-fill"></i>
+ <cite>鍒拌揣纭(瀹夌憺)</cite>
+ </a>
+ </li>
<!--<li class="layui-col-xs3">
<a lay-href="set/user/info.html">
<i class="layui-icon layui-icon-set"></i>
diff --git a/WebTM/views/home/console_Mobile.html b/WebTM/views/home/console_Mobile.html
index cc11353..213136b 100644
--- a/WebTM/views/home/console_Mobile.html
+++ b/WebTM/views/home/console_Mobile.html
@@ -160,6 +160,12 @@
<cite>鐢熶骇妫�楠屽崟</cite>
</a>
</li>
+ <li class="layui-col-xs3">
+ <a href="../棰嗘枡鍙戣揣/鏀舵枡鍏ュ簱/Kf_ReciveBill_Fast_AR.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-find-fill"></i>
+ <cite>鍒拌揣纭(瀹夌憺)</cite>
+ </a>
+ </li>
</ul>
</div>
</div>
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index f88c1b8..37aa8c0 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -234,7 +234,9 @@
<dl class="layui-nav-child">
<dd><a lay-href="浠撳瓨绠＄悊/鏉＄爜鐢熸垚/Gy_BarCodeBill.html">鏉＄爜鐢熸垚</a></dd>
<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBillList.html">鏉＄爜涓绘。缁存姢</a></dd>
- <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/KF_BarCodeStatusChangeBill.html">鏉＄爜鐘舵��</a></dd>
+ <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/KF_BarCodeStatusChangeBill.html">鏉＄爜鐘舵�佸彉鏇村崟</a></dd>
+ <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/KF_BarCodeStatusChangeBillList.html">鏉＄爜鐘舵�佸彉鏇村崟缁存姢</a></dd>
+ <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBill_OutList.html">鏉＄爜褰掓。缁存姢</a></dd>
</dl>
</dd>
<dd>
@@ -686,6 +688,10 @@
<dd><a lay-href="璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipMaintainRuleEdit.html">璁惧淇濆吇瑙勭▼鍗�</a></dd>
<dd><a lay-href="璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipMaintainRuleList.html">璁惧淇濆吇瑙勭▼鍗曠淮鎶�</a></dd>
<!--<dd><a lay-href="璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileBillResume.html">璁惧灞ュ巻</a></dd>-->
+ <dd><a lay-href="璁惧绠＄悊/璁惧澶囧搧澶囦欢/Sb_EquipSparepartsBill.html">璁惧澶囧搧澶囦欢</a></dd>
+ <dd><a lay-href="璁惧绠＄悊/璁惧澶囧搧澶囦欢/Sb_EquipSparepartsBillList.html">璁惧澶囧搧澶囦欢缁存姢</a></dd>
+ <dd><a lay-href="璁惧绠＄悊/璁惧澶囧搧澶囦欢/Sb_EquipSparepartsChangeBill.html">璁惧澶囧搧澶囦欢鍙樻洿鍗�</a></dd>
+ <dd><a lay-href="璁惧绠＄悊/璁惧澶囧搧澶囦欢/Sb_EquipSparepartsChangeBillList.html">璁惧澶囧搧澶囦欢鍙樻洿鍗曠淮鎶�</a></dd>
</dl>
</dd>
<dd>
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index 4b68c50..669a85e 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -336,6 +336,12 @@
</a>
</dd>
<dd>
+ <a href="棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_Check_New.html" target="main_self_frame" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 濮斿棰嗘枡鏍￠獙
+ </a>
+ </dd>
+ <dd>
<a href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html" target="main_self_frame" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
閿�鍞嚭搴�
@@ -359,6 +365,12 @@
<a href="棰嗘枡鍙戣揣/鐢熶骇琛ユ枡/Kf_MateReplenishOutBill_Check_New.html" target="main_self_frame" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
鐢熶骇琛ユ枡鏍￠獙
+ </a>
+ </dd>
+ <dd>
+ <a href="棰嗘枡鍙戣揣/濮斿琛ユ枡/Kf_EntrustReplenishOutBill_Check_New.html" target="main_self_frame" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 濮斿琛ユ枡鏍￠獙
</a>
</dd>
<dd>
@@ -536,12 +548,24 @@
</a>
</dd>
<dd>
+ <a lay-href="棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_CheckList_New.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 濮斿棰嗘枡鏍￠獙缂撳瓨鍒楄〃
+ </a>
+ </dd>
+ <dd>
<a lay-href="棰嗘枡鍙戣揣/鐢熶骇琛ユ枡/Kf_MateReplenishOutBill_CheckList_New.html" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
鐢熶骇琛ユ枡鏍￠獙缂撳瓨鍒楄〃
</a>
</dd>
<dd>
+ <a lay-href="棰嗘枡鍙戣揣/濮斿琛ユ枡/Kf_EntrustReplenishOutBill_CheckList_New.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 濮斿琛ユ枡鏍￠獙缂撳瓨鍒楄〃
+ </a>
+ </dd>
+ <dd>
<a lay-href="浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockBill_FastList.html" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
鐩存帴璋冩嫧缂撳瓨鍒楄〃
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
index c2f9bd3..90158a4 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
@@ -495,7 +495,7 @@
, { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ //, { field: 'HBatchNo', title: '鎵规', width: 150 }
, { field: 'HMaterID', title: '鐗╂枡鍐呯爜', width: 150, hide: true }
, { field: 'HAuxPropID', title: '', width: 150, hide: true }
, { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 150, hide: true }
@@ -863,7 +863,7 @@
, { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100 }
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100 }
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
- , { field: 'HBatchNo', title: '鎵规', width: 100 }
+ //, { field: 'HBatchNo', title: '鎵规', width: 100 }
, { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 100 }
, { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100 }
, { field: 'HMaterID', title: '鐗╂枡ID', width: 100 }
@@ -1443,7 +1443,7 @@
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
, { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HBatchNo', title: '鎵规', width: 150, hide: true }
+ //, { field: 'HBatchNo', title: '鎵规', width: 150, hide: true }
, { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150, hide: true }
, { field: 'HMaterID', title: 'HMaterID', width: 150, hide: true }
, { field: 'HAuxPropID', title: 'HAuxPropID', width: 150, hide: true }
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Operator.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Operator.html"
index 5a5abda..40810e2 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Operator.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Operator.html"
@@ -118,7 +118,7 @@
var Organization = sessionStorage["Organization"];
var HModName = "Gy_Operator";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HItemID", "HUSEORGID", "HCREATEORGID", "鐖剁骇ID","鐭唬鐮�","鐖剁骇","绛夌骇","HIsUse"];
+ var titleData = ["HItemID", "HUSEORGID", "HCREATEORGID", "鐖剁骇ID", "鐭唬鐮�", "鐖剁骇", "绛夌骇", "HIsUse", "HStopflag","HStaffId","閮ㄩ棬ID"];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_OperatorEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_OperatorEdit.html"
index 03bf71a..cc1a1aa 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_OperatorEdit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_OperatorEdit.html"
@@ -139,7 +139,7 @@
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
- var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == 0) {
@@ -177,8 +177,18 @@
option.data = table.cache["mainTable"];
table.render(option);
+ for (var i = 1; i <= option.data.length; i++) {
+ if (option.data[i - 1].HStopflag == ' ') {
+ option.data[i - 1].HStopflag = false;
+ } else if (option.data[i - 1].HStopflag == 'Y') {
+ option.data[i - 1].HStopflag = true;
+ }
+ $('#HStopflag' + i + '').find("option[value='" + option.data[i - 1].HStopflag + "']").attr("selected", true);
+ }
+ form.render('select');
+ form.render('checkbox');
//鍒锋柊澶嶉�夋
- checkRefresh();
+ //checkRefresh();
break;
case 'btn-CopyLine':
var copydata = JSON.stringify(data);
@@ -194,8 +204,18 @@
table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ for (var i = 1; i <= option.data.length; i++) {
+ if (option.data[i - 1].HStopflag == ' ') {
+ option.data[i - 1].HStopflag = false;
+ } else if (option.data[i - 1].HStopflag == 'Y') {
+ option.data[i - 1].HStopflag = true;
+ }
+ $('#HStopflag' + i + '').find("option[value='" + option.data[i - 1].HStopflag + "']").attr("selected", true);
+ }
+ form.render('select');
+ form.render('checkbox');
//鍒锋柊澶嶉�夋
- checkRefresh();
+ //checkRefresh();
}
break;
}
@@ -240,6 +260,19 @@
sWhere = " and 涓氬姟鍛樼被鍨� = '" + data.value + "'";
get_Display(sWhere);
})
+
+ //鏄惁绂佺敤
+ form.on('select(HStopflag)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HStopflag = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+
+ })
//#endregion
//#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
@@ -278,6 +311,20 @@
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
]]
, data: []
+ //, done: function (res, curr, count) {
+ // for (let i = 0; i < res.data.length; i++) {
+ // layui.each($("select[name='HStopflag']", ""), function (index, item) {
+ // var elem = $(item);
+ // if (res.data[i].HIsUse == true) {
+ // //elem.next().children().children()[i].defaultValue = '鏄�';
+ // } else {
+ // $("#HStopflag1").val('true');
+ // }
+
+ // //elem.val(elem.data('value'));
+ // });
+ // }
+ //}
}
option.data = rowdata;
@@ -329,14 +376,19 @@
data1.data[i].涓氬姟鍛樼被鍨� = '绋嬪簭鍛�'
break;
}
- if (data1.data[i].绂佺敤鏍囪 == 'Y') {
- data1.data[i].绂佺敤鏍囪 = 1
- $("#HStopflag").val("true");
- } else {
- data1.data[i].绂佺敤鏍囪 = 0
- }
+
}
table.render(option);
+ for (let j = 0; j < data1.data.length; j++) {
+ if (data1.data[j].HStopflag == 'Y') {
+ $('#HStopflag' + (j + 1)).find("option[value=true]").attr("selected", true);
+
+ } else {
+ $('#HStopflag' + (j + 1)).find("option[value=false]").attr("selected", true);
+ }
+ }
+ form.render('select');
+
//鍒锋柊琛ㄦ牸鏁版嵁
//DisPlay_HideColumn();
@@ -364,6 +416,11 @@
//if (table.cache["mainTable"][i] != "") {
table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
num.push(table.cache["mainTable"][i])
+ if ($('#HStopflag' + (i + 1)).val() == 'true') {
+ num[i].HStopflag = 1
+ } else {
+ num[i].HStopflag = 0
+ }
var sub = { "HUSEORGID": 0, "涓氬姟缁勭粐": "", "HStaffId": 0, "HName": "", "HNumber": "", "閮ㄩ棬": "", "涓氬姟鍛樼紪鐮�": "", "涓氬姟鍛樺悕绉�": "", "HRemark": "", "HStopflag": 0, "HItemID": 0, "HIsPseDel": 0 };
if (num[i].HIsPseDel != 1) {
@@ -376,16 +433,16 @@
sub.涓氬姟鍛樼紪鐮� = num[i].涓氬姟鍛樼紪鐮�
sub.涓氬姟鍛樺悕绉� = num[i].涓氬姟鍛樺悕绉�
sub.HRemark = num[i].澶囨敞
- sub.HStopflag = num[i].绂佺敤鏍囪
+ sub.HStopflag = num[i].HStopflag
}
sub.HItemID = num[i].HItemID
sub.HIsPseDel = num[i].HIsPseDel
num2.push(sub);
- if (sub.HStopflag == 0) {
- sub.HStopflag = false;
- } else if (sub.HStopflag == 1) {
- sub.HStopflag = true;
- }
+ //if (sub.HStopflag == 'Y') {
+ // sub.HStopflag = 1;
+ //} else {
+ // sub.HStopflag = 0;
+ //}
//}
}
var sMainStr = JSON.stringify(data.field);
@@ -430,11 +487,11 @@
async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
success: function (d) {
- var IsHStopflag = d.data[0].绂佺敤鏍囪;
+ var IsHStopflag = d.data[0].HStopflag;
if (IsHStopflag == 'Y') {
$("input[name='HStopflag']").prop("checked", true);
} else {
- d.data[0].绂佺敤鏍囪 = '';
+ d.data[0].HStopflag = '';
}
//涓昏〃
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
@@ -442,7 +499,7 @@
, "HNumber": d.data[0].涓氬姟鍛樹唬鐮�
, "HName": d.data[0].涓氬姟鍛樺悕绉�
, "HUSEORGID": d.data[0].HUSEORGID
- , "HStopflag": d.data[0].绂佺敤鏍囪
+ , "HStopflag": d.data[0].HStopflag
, "HRemark": d.data[0].澶囨敞
});
form.render('checkbox');
@@ -524,7 +581,7 @@
, "鍛樺伐缂栫爜": checkStatus.data[0].鍛樺伐浠ｇ爜
, "涓氬姟鍛樺悕绉�": checkStatus.data[0].鍛樺伐鍚嶇О
, "閮ㄩ棬": checkStatus.data[0].閮ㄩ棬鍚嶇О
- , "涓氬姟鍛樼紪鐮�": checkStatus.data[0].鍛樺伐浠ｇ爜 + "_" + $("#HOperatorType").val() + "_" + rowdata[0].HUSEORGID
+ , "涓氬姟鍛樼紪鐮�": checkStatus.data[0].鍛樺伐浠ｇ爜 + "_" + $("#HOperatorType").val() + "_" + checkStatus.data[0].鍒涘缓缁勭粐
})
layer.close(index);//鍏抽棴寮圭獥
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
index 1832915..ad0d974 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
@@ -348,7 +348,7 @@
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '瀹㈡埛鍩虹璧勬枡'
+ , title: '渚涘簲鍟嗗熀纭�璧勬枡'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
@@ -361,7 +361,7 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鏂板涓嶈壇鍘熷洜',
+ title: '鏂板渚涘簲鍟�',
closeBtn: 1,
shift: 2,
area: ['100%', '100%'],
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
index 343a775..99340c0 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
@@ -393,7 +393,7 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鏂板涓嶈壇鍘熷洜',
+ title: '鏂板瀹㈡埛',
closeBtn: 1,
shift: 2,
area: ['100%', '100%'],
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBill_Out.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBill_Out.html"
new file mode 100644
index 0000000..b354755
--- /dev/null
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBill_Out.html"
@@ -0,0 +1,917 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta 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.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>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <style>
+ .main-btn { /*澶撮儴涓绘寜閽�*/
+ padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+ height: 30px;
+ line-height: 30px;
+ }
+
+ .btn-title {
+ font-size: 16px;
+ }
+ /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+ /*.layui-table-cell {
+ overflow: visible !important;
+ }*/
+ /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+ /*td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
+ }*/
+
+ .layui-form-item .layui-inline {
+ margin-top: 5px;
+ margin-bottom: 5px;
+ margin-right: 0px;
+ }
+
+ .layui-form-label {
+ width: 25%;
+ }
+ </style>
+
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div style="padding: 10px; ">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鏉″舰鐮�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBarCode" lay-verify="HBarCode" id="HBarCode" style="background-color:#efefef4d;">
+ <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+ <input type="hidden" name="HItemID" id="HItemID" lay-verify="HItemID">
+ </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="HBatchNo" lay-verify="HBatchNo" id="HBatchNo" style="background-color:#efefef4d;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鏉＄爜绫诲瀷</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HBarCodeType" id="HBarCodeType" lay-verify="HBarCodeType">
+ <option style="color:blue;" value="1">鐗╂枡鏉＄爜</option>
+ <option style="color:blue;" value="2">绠卞彿鏉＄爜</option>
+ <option style="color:blue;" value="3">鎵樺彿鏉＄爜</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浠舵暟</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HPieceQty" lay-verify="HPieceQty" id="HPieceQty" style="background-color:#efefef4d;" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鏁伴噺</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HQty" lay-verify="HQty" id="HQty" style="background-color:#efefef4d;" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">灏剧鏁伴噺</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HEndQty" lay-verify="HEndQty" id="HEndQty" style="background-color:#efefef4d;" value="0">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡缂栫爜</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMater" id="btnHMater" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterName" lay-verify="HMaterName" id="HMaterName" style="background-color:#efefef4d;display: inline-block;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HModel" lay-verify="HModel" id="HModel" style="background-color:#efefef4d;display: inline-block;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璁￠噺鍗曚綅</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HUnitName" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HUnitID" id="HUnitID" lay-verify="HUnitID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHUnit" id="btnHUnit" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">寰�鏉ュ崟浣�</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HSupName" name="HSupName" id="HSupName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HSupID" id="HSupID" lay-verify="HSupID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSup" id="btnHSup" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇鐝粍</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HGroupName" name="HGroupName" id="HGroupName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HGroupID" id="HGroupID" lay-verify="HGroupID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHGroup" id="btnHGroup" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">閮ㄩ棬</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">涓氬姟鍛�</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HEmpName" name="HEmpName" id="HEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HEmpID" id="HEmpID" lay-verify="HEmpID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmp" id="btnHEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ュ簭</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿浠撳簱</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HWhName" name="HWhName" id="HWhName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HWhID" id="HWhID" lay-verify="HWhID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWh" id="btnHWh" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿浠撲綅</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HSPName" name="HSPName" id="HSPName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HSPID" id="HSPID" lay-verify="HSPID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSP" id="btnHSP" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡杈呭姪灞炴��</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HAuxPropName" name="HAuxPropName" id="HAuxPropName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HAuxPropID" id="HAuxPropID" lay-verify="HAuxPropID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHAuxProp" id="btnHAuxProp" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹㈡埛</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HCusName" name="HCusName" id="HCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCus" id="btnHCus" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">搴撳瓨缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HSTOCKORGName" name="HSTOCKORGName" id="HSTOCKORGName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSTOCKORG" id="btnHSTOCKORG" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label"> 澶囨敞</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HRemark" id="HRemark">
+ </div>
+ </div>
+ </div>
+ <!--<div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 68px;">
+ </div>
+ </div>
+ </div>-->
+ </div>
+ </div>
+ <!--鍒跺崟淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒朵綔浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaker" id="HMaker" 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="HStopMan " id="HStopMan " style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒朵綔鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" 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="HStopManDate" id="HStopManDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+
+ <script>
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element', 'laydate'], function () {
+
+ //#region 鍏叡鍙橀噺
+
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laydate = layui.laydate
+ var option = [];
+
+ var time = Format(new Date(), "yyyy-MM-dd")
+
+ var HMaterIDVal = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖�
+ set_ClearBill();
+
+ var params = getUrlVars();
+ var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
+ var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+
+ if (linterid == null || linterid == 0) {
+ OperationType = 1;
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3981' },
+ success: function (d) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HInterID").val(d.data[0].HInterID);
+ }
+ });
+ }
+ else {//濡傛灉淇敼鍒欒蛋涓嬮潰
+ //绂佺敤缁勭粐閫夐」
+ $("#HPRDORGID").attr("disabled", true);
+ $("#HDate").attr("disabled", true);
+ RoadBillMain(linterid);
+ $("#HItemID").val(linterid);
+ }
+
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //澶村伐鍏锋爮浜嬩欢
+
+ //閫夋嫨宸ュ簭
+ form.on('submit(btnHProc)', function () {
+ get_btnHProc();
+ });
+
+ //閫夋嫨鐗╂枡
+ form.on('submit(btnHMater)', function () {
+ get_btnHMater();
+ });
+
+ //閫夋嫨璁￠噺鍗曚綅
+ form.on('submit(btnHUnit)', function () {
+ get_btnHUnit();
+ });
+
+ //閫夋嫨寰�鏉ュ崟浣�
+ form.on('submit(btnHSup)', function () {
+ get_btnHSup();
+ });
+
+ //閫夋嫨鐢熶骇鐝粍
+ form.on('submit(btnHGroup)', function () {
+ get_btnHGroup();
+ });
+
+ //閫夋嫨閮ㄩ棬
+ form.on('submit(btnHDept)', function () {
+ get_btnHDept();
+ });
+
+ //閫夋嫨涓氬姟鍛�
+ form.on('submit(btnHEmp)', function () {
+ get_btnHEmp();
+ });
+
+ //閫夋嫨榛樿浠撳簱
+ form.on('submit(btnHWh)', function () {
+ get_btnHWh();
+ });
+
+ //閫夋嫨浠撲綅
+ form.on('submit(btnHSP)', function () {
+ get_btnHSP();
+ });
+
+ //閫夋嫨杈呭姪灞炴��
+ form.on('submit(btnHAuxProp)', function () {
+ get_btnHAuxProp();
+ });
+
+ //閫夋嫨瀹㈡埛
+ form.on('submit(btnHCus)', function () {
+ get_btnHCus();
+ });
+
+ //閫夋嫨搴撳瓨缁勭粐
+ form.on('submit(btnHSTOCKORG)', function () {
+ get_btnHSTOCKORG();
+ });
+
+ //閫�鍑�
+ form.on('submit(btnEdit)', function (data) {
+ if (OperationType == 1 && linterid != "") {
+ Pub_Close(2);
+ } else {
+ Pub_Close(1);
+ }
+ });
+
+ //淇濆瓨鎻愪氦
+ form.on('submit(btnSave)', function (data) {//鎻愪氦
+ set_AddNew(data);
+ });
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ // 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栨棩鏈�
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖� 缁勭粐
+ Organ();
+ }
+
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HPRDORGID").append(Organization);
+ $("#HPRDORGID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+ //#region [鏀惧ぇ闀淽
+ //宸ュ簭
+ function get_btnHProc() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '宸ュ簭'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HProcID").val(checkStatus.data[0].HItemID);
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //鐗╂枡
+ function get_btnHMater() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐗╂枡'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HMaterID").val(checkStatus.data[0].HItemID);
+ $("#HMaterName").val(checkStatus.data[0].HName);
+ $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+ $("#HModel").val(checkStatus.data[0].HModel);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //璁￠噺鍗曚綅
+ function get_btnHUnit() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '璁￠噺鍗曚綅'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HUnitID").val(checkStatus.data[0].HItemID);
+ $("#HUnitName").val(checkStatus.data[0].HName);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //寰�鏉ュ崟浣�
+ function get_btnHSup() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '寰�鏉ュ崟浣�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_SupplierList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HSupID").val(checkStatus.data[0].HItemID);
+ $("#HSupName").val(checkStatus.data[0].HName);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //鐢熶骇鐝粍
+ function get_btnHGroup() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐢熶骇鐝粍'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HGroupID").val(checkStatus.data[0].HItemID);
+ $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //閮ㄩ棬
+ function get_btnHDept() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '閮ㄩ棬'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ $("#HDeptName").val(checkStatus.data[0].HName);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //涓氬姟鍛�
+ function get_btnHEmp() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '涓氬姟鍛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HEmpID").val(checkStatus.data[0].HItemID);
+ $("#HEmpName").val(checkStatus.data[0].HName);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //榛樿浠撳簱
+ function get_btnHWh() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '浠撳簱'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HWhID").val(checkStatus.data[0].HItemID);
+ $("#HWhName").val(checkStatus.data[0].HName);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //榛樿浠撲綅
+ function get_btnHSP() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '浠撲綅'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_StockPlaceList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HSPID").val(checkStatus.data[0].HItemID);
+ $("#HSPName").val(checkStatus.data[0].HName);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //鐗╂枡杈呭姪灞炴��
+ function get_btnHAuxProp() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '杈呭姪灞炴��'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PropertyList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HAuxPropID").val(checkStatus.data[0].HItemID);
+ $("#HAuxPropName").val(checkStatus.data[0].杈呭姪灞炴�у悕绉�);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //瀹㈡埛
+ function get_btnHCus() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '瀹㈡埛'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_CustomerList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HCusID").val(checkStatus.data[0].HItemID);
+ $("#HCusName").val(checkStatus.data[0].HName);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //搴撳瓨缁勭粐
+ function get_btnHSTOCKORG() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '缁勭粐'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Xt_ORGANIZATIONSList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HSTOCKORGID").val(checkStatus.data[0].HItemID);
+ $("#HSTOCKORGName").val(checkStatus.data[0].缁勭粐鍚嶇О);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
+ //淇濆瓨
+ function set_AddNew(data) {
+
+ var sMainStr = JSON.stringify(data.field);
+
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Gy_BarCodeBill_Out/ModifyByID",
+ async: true,
+ data: { "oMain": sMainStr },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+ layer.close(index);
+ layer.msg("鎻愪氦鎴愬姛");
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //缂栬緫 椤甸潰璧嬪��
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+ {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_BarCodeBill_Out/cx",
+ type: "GET",
+ async: false,
+ data: { "HInterID": linterid },
+ success: function (d) {
+
+ //$("#HPRDORGID").val(d.data[0].HPRDORGID);
+ //涓昏〃
+ form.val("formData", {
+ "HBarCode": d.data[0].鏉″舰鐮�
+ , "HInterID": d.data[0].HMainID
+ , "HProcID": d.data[0].HProcID
+ , "HProcName": d.data[0].宸ュ簭
+ , "HMaterID": d.data[0].HMaterID
+ , "HMaterName": d.data[0].鐗╂枡
+ , "HMaterNumber": d.data[0].鐗╂枡浠ｇ爜
+ , "HModel": d.data[0].瑙勬牸鍨嬪彿
+ , "HUnitID": d.data[0].HUnitID
+ , "HUnitName": d.data[0].璁￠噺鍗曚綅
+ , "HPieceQty": d.data[0].浠舵暟
+ , "HQty": d.data[0].鏁伴噺
+ , "HSupID": d.data[0].HSupID
+ , "HSupName": d.data[0].寰�鏉ュ崟浣�
+ , "HGroupID": d.data[0].HGroupID
+ , "HGroupName": d.data[0].鐢熶骇鐝粍
+ , "HDeptID": d.data[0].HDeptID
+ , "HDeptName": d.data[0].閮ㄩ棬
+ , "HEmpID": d.data[0].HEmpID
+ , "HEmpName": d.data[0].涓氬姟鍛�
+ , "HWhID": d.data[0].HWhID
+ , "HWhName": d.data[0].榛樿浠撳簱
+ , "HSPID": d.data[0].HSPID
+ , "HSPName": d.data[0].榛樿浠撲綅
+ , "HAuxPropID": d.data[0].HAuxPropID
+ , "HAuxPropName": d.data[0].鐗╂枡杈呭姪灞炴��
+ , "HCusID": d.data[0].HCusID
+ , "HCusName": d.data[0].瀹㈡埛
+ , "HSTOCKORGID": d.data[0].HSTOCKORGID
+ , "HSTOCKORGName": d.data[0].搴撳瓨缁勭粐
+ , "HRemark": d.data[0].澶囨敞
+ , "HBatchNo": d.data[0].鎵规鍙�
+ , "HEndQty": d.data[0].灏剧鏁伴噺
+ , "HBarCodeType": d.data[0].鏉＄爜绫诲瀷
+ //, "HDate": Format(new Date(d.data[0].鏃ユ湡), "yyyy-MM-dd")
+ });
+
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < d.data.length; i++) {
+ rowdata.push(
+ {
+ "HMaterID_New": d.data[i].HMaterID_New, "HMaterID_Old": d.data[i].HMaterID_Old, "鍣ㄥ叿": d.data[i].鍣ㄥ叿,
+ "HQty": d.data[i].鏁伴噺, "HPartAddr": d.data[i].閮ㄤ綅,
+ "HBeginDate": d.data[i].寮�濮嬫椂闂�, "HEndDate": d.data[i].鏈夋晥鏈熻嚦, "HRemark": d.data[i].琛ㄤ綋澶囨敞
+ }
+ )
+ HMaterIDVal.push(d.data[i].HMaterID_New);
+ }
+ option.data = rowdata;
+ table.render(option);
+ form.render('select');
+ }
+ })
+ }
+
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+
+ //#endregion
+
+ });
+
+
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBill_OutList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBill_OutList.html"
new file mode 100644
index 0000000..94c1cf7
--- /dev/null
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBill_OutList.html"
@@ -0,0 +1,538 @@
+锘�<!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">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+</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="date" class="layui-input" id="HDate">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="margin-left:10px">
+ <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 class="layui-colla-content">
+ <div class="layui-row">
+ <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>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></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>
+ </div>
+ </div>
+ </div>
+ </div>
+ <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/zgqCustom/zgqCustom.js"></script>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+
+ var sWhere = "";
+ var HModName = "Gy_BarCodeBill_OutList";
+
+ var params = getUrlVars();
+
+ //鍒ゆ柇鏄惁鏈夊弬鏁颁紶閫�
+
+
+ //鍒濆鍖栬〃鏍�
+ DisPlay_HideColumn();
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鏂板
+ case 'set_AddNew': set_AddNew();
+ break;
+ //缂栬緫
+ case 'set_Edit': set_Edit();
+ break;
+ //鍒犻櫎
+ case 'set_DeleteBill': set_DeleteBill();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ };
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+ get_FastQuery();
+ });
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_FastQuery();
+ }
+ //#endregion
+
+
+ function set_InitGrid() {
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+ , { field: '鏉″舰鐮�', title: '鏉″舰鐮�', width: 160 }
+ , { field: 'HProcID', title: 'HProcID', width: 160, hide: true }
+ , { field: '宸ュ簭', title: '宸ュ簭', width: 160 }
+ , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true}
+ , { field: '鐗╂枡', title: '鐗╂枡', width: 250 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 250 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 200 }
+ , { field: 'HUnitID', title: 'HUnitID', hide: true }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 200 }
+ , { field: '浠舵暟', title: '浠舵暟', width: 200 }
+ , { field: '鏁伴噺', title: '鏁伴噺', width: 160 }
+ , { field: '鎵规鍙�', title: '鎵规鍙�', width: 160 }
+ , { field: 'HSupID', title: 'HSupID', width: 160, hide: true }
+ , { field: '寰�鏉ュ崟浣�', title: '寰�鏉ュ崟浣�', width: 200 }
+ , { field: 'HGroupID', title: 'HGroupID', width: 200, hide: true }
+ , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍', width: 200 }
+ , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
+ , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 200 }
+ , { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
+ , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 200 }
+ , { field: '澶囨敞', title: '澶囨敞', width: 115 }
+ , { field: 'HWhID', title: 'HWhID', width: 115, hide: true }
+ , { field: '榛樿浠撳簱', title: '榛樿浠撳簱', width: 200 }
+ , { field: 'HSPID', title: 'HSPID', width: 200, hide: true }
+ , { field: '榛樿浠撲綅', title: '榛樿浠撲綅', width: 115 }
+ , { field: 'HAuxPropID', title: 'HAuxPropID', width: 200, hide: true }
+ , { field: '鐗╂枡杈呭姪灞炴��', title: '鐗╂枡杈呭姪灞炴��', width: 200 }
+ , { field: 'HCusID', title: 'HCusID', width: 200, hide: true }
+ , { field: '瀹㈡埛', title: '瀹㈡埛', width: 200 }
+ , { field: 'HSTOCKORGID', title: 'HSTOCKORGID', width: 115, hide: true }
+ , { field: '搴撳瓨缁勭粐', title: '搴撳瓨缁勭粐', width: 200, }
+ , { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟', width: 200 }
+ , { field: '浣滃簾鏍囪', title: '浣滃簾鏍囪', width: 200 }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 115 }
+ , { field: '鐢熶骇鍏ュ簱鏃ユ湡', title: '鐢熶骇鍏ュ簱鏃ユ湡', width: 200, templet: "<div>{{d.鐢熶骇鍏ュ簱鏃ユ湡 ==null ?'':layui.util.toDateString(d.鐢熶骇鍏ュ簱鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '閿�鍞嚭搴撴棩鏈�', title: '閿�鍞嚭搴撴棩鏈�', width: 200, templet: "<div>{{d.閿�鍞嚭搴撴棩鏈� ==null ?'':layui.util.toDateString(d.閿�鍞嚭搴撴棩鏈�, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ ]]
+ };
+ }
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_BarCodeBill_Out/list',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ 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 });
+ }
+ });
+
+ }
+ //#endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HDate = $("#HDate").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 (HDate) {
+ // sWhere += " and 鏃ユ湡 = '" + HDate + "'";
+ //}
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));//鏃ユ湡
+ $("#btnSearch").click();
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ form.render('select');
+ sWhere = "";
+ }
+ //#endregion
+
+ //鏂板
+ function set_AddNew() {
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '鏉＄爜褰掓。鏂板'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: './Gy_BarCodeBill_Out.html?OperationType=1&linterid='
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ }
+
+ // 缂栬緫
+ function set_Edit() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HMainID;
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏉＄爜褰掓。缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: './Gy_BarCodeBill_Out.html?OperationType=3&linterid=' + linterid +''
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+
+ //#region 鍒犻櫎
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hmainid = data[0].HMainID;
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/Gy_BarCodeBill_Out/Delete',
+ type: "GET",
+ data: { "HItemID": hmainid, "user": sessionStorage["HUserName"]},
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+
+ }
+ //#endregion
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ set_ClearQuery();
+ get_Display(sWhere);
+ }
+ //#endregion
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = ["HMainID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+
+
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+ </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBill.html"
index 0c6ea11..54ad5a9 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBill.html"
@@ -59,6 +59,7 @@
<div class="layui-tab" lay-filter="tab-POStockInBill">
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--鍩烘湰淇℃伅-->
@@ -72,7 +73,7 @@
<input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
</div>
</div>
- <div class="layui-inline">
+ <!--<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍗曟嵁鐘舵��</label>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
<select name="HBillStatus" id="HBillStatus" lay-verify="HBillStatus">
@@ -88,62 +89,132 @@
<option style="color:blue;" value="10">楠岃瘉</option>
<option style="color:blue;" value="11">涓嬭揪</option>
<option style="color:blue;" value="12">寮�宸�</option>
- <option style="color:blue;" value="13">鐢宠瀹℃壒</option>
+ <option style="color:blue;" value="13">鐢宠瀹℃壒</option>-->
<!--<option style="color:blue;" value="14">鐢宠妫�楠�</option>-->
- <option style="color:blue;" value="15">鐢宠妫�楠�</option>
+ <!--<option style="color:blue;" value="15">鐢宠妫�楠�</option>
<option style="color:blue;" value="16">鍒ゅ畾鍚堟牸</option>
<option style="color:blue;" value="17">鍒ゅ畾涓嶅悎鏍�</option>
</select>
</div>
- </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
</div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍗曟嵁</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" lay-verify="HSeOrderBillNo" name="HSeOrderBillNo" id="HSeOrderBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HSeOrderInterID" id="HSeOrderInterID" lay-verify="HSeOrderInterID" value="0">
- <input type="hidden" name="HSeOrderEntryID" id="HSeOrderEntryID" lay-verify="HSeOrderEntryID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSeOrder" id="btnHSeOrder" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍙樻洿浜�</label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" lay-verify="HSeOrderBillNo" name="HSeOrderBillNo" id="HSeOrderBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HSeOrderInterID" id="HSeOrderInterID" lay-verify="HSeOrderInterID" value="0">
- <input type="hidden" name="HSeOrderEntryID" id="HSeOrderEntryID" lay-verify="HSeOrderEntryID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSeOrder" id="btnHSeOrder" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璐熻矗閮ㄩ棬</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" lay-verify="HSeOrderBillNo" name="HSeOrderBillNo" id="HSeOrderBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HSeOrderInterID" id="HSeOrderInterID" lay-verify="HSeOrderInterID" value="0">
- <input type="hidden" name="HSeOrderEntryID" id="HSeOrderEntryID" lay-verify="HSeOrderEntryID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSeOrder" id="btnHSeOrder" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <input type="text" class="layui-input" lay-verify="HEmpName" name="HEmpName" id="HEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HEmpID" id="HEmpID" lay-verify="HEmpID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmp" id="btnHEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
</div>
</div>
<div class="layui-row">
- <div class="layui-inline" style="width: 56%;">
- <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璐熻矗閮ㄩ棬</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label"> 澶囨敞</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ <input type="text" class="layui-input" name="HRemark" id="HRemark">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--鍒跺崟淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaker" id="HMaker" 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="HChecker" id="HChecker" 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="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HUpDater" id="HUpDater" 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="HDeleteMan " id="HDeleteMan " 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="HBacker " id="HBacker " style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" 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="HCheckDate" 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="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" 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="HDeleteDate" id="HDeleteDate" 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="HBackDate" id="HBackDate" style="background-color:#efefef4d;" readonly>
+ </div>
</div>
</div>
</div>
@@ -157,7 +228,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>
+ <!--<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>
@@ -168,19 +239,33 @@
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
- <!--琛屼笅鎷夐�夋嫨(涓氬姟鐘舵��)-->
- <script type="text/html" id="HSTATUS">
- <select name="HSTATUS" lay-filter="HSTATUS" id="HSTATUS{{d.LAY_TABLE_INDEX+1}}">
- <option value="1">璁″垝</option>
- <option value="2">璁″垝纭</option>
- <option value="3">涓嬭揪</option>
- <option value="4">寮�宸�</option>
- <option value="5">瀹屽伐</option>
- <option value="6">缁撴</option>
- <option value="7">缁撶畻</option>
+ <!--琛屼笅鎷夐�夋嫨-->
+ <!--<script type="text/html" id="HBarCodeStatus_Old">
+ <select name="HBarCodeStatus_Old" lay-filter="HBarCodeStatus_Old" id="HBarCodeStatus_Old{{d.LAY_TABLE_INDEX+1}}">
+ <option value=""></option>
+ <option value="姝ｅ父">姝ｅ父</option>
+ <option value="鍦ㄥ簱">鍦ㄥ簱</option>
+ <option value="鍑哄簱">鍑哄簱</option>
+ <option value="浣滃簾">浣滃簾</option>
+ <option value="闅旂">闅旂</option>
+ <option value="涓嶈壇">涓嶈壇</option>
+ <option value="鎶ュ簾">鎶ュ簾</option>
+ </select>
+ </script>-->
+
+ <!--琛屼笅鎷夐�夋嫨-->
+ <script type="text/html" id="HBarCodeStatus_New">
+ <select name="HBarCodeStatus_New" lay-filter="HBarCodeStatus_New" id="HBarCodeStatus_New{{d.LAY_TABLE_INDEX+1}}">
+ <option value=""></option>
+ <option value="姝ｅ父">姝ｅ父</option>
+ <option value="鍦ㄥ簱">鍦ㄥ簱</option>
+ <option value="鍑哄簱">鍑哄簱</option>
+ <option value="浣滃簾">浣滃簾</option>
+ <option value="闅旂">闅旂</option>
+ <option value="涓嶈壇">涓嶈壇</option>
+ <option value="鎶ュ簾">鎶ュ簾</option>
</select>
</script>
-
<script>
layui.config({
@@ -200,15 +285,15 @@
, laydate = layui.laydate
var option = [];
-
+ var HBarCodeStatusVal = [];
+ var CopyHBarCodeStatusVal = [];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
var rowdata = [{
- "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HModel": "", "HSourceID": 0
- , "HSourceName": "", "HDeptID": 0, "HDeptName": "", "HUnitID": 0, "HUnitName": ""
- , "HQty": "", "HSTATUS": "1", "HPlanBeginDate": "", "HPlanEndDate": ""
+ "HRelationQty": 0, "HRelationMoney": 0, "HRemark": "", "HBarCode": "", "HBarCodeStatus_Old": ""
+ , "HBarCodeStatus_New": ""
}];
//鍒濆鍖�
set_ClearBill();
@@ -222,10 +307,11 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3710' },
+ data: { "HBillType": '1288' },
success: function (d) {
$("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
+ $("#HInterID").val(d.data[0].HInterID);
}
});
}
@@ -234,9 +320,10 @@
$("#HPRDORGID").attr("disabled", true);
$("#HDate").attr("disabled", true);
RoadBillMain(linterid);
+ $("#HInterID").val(linterid);
}
-
+ $("#HMaker").val(sessionStorage["HUserName"]);
//#endregion
@@ -248,16 +335,20 @@
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HModel": "", "HSourceID": 0
- , "HSourceName": "", "HDeptID": 0, "HDeptName": "", "HUnitID": 0, "HUnitName": ""
- , "HQty": "", "HSTATUS": "1", "HPlanBeginDate": "", "HPlanEndDate": ""
+ "HRelationQty": 0, "HRelationMoney": 0, "HRemark": "", "HBarCode": "", "HBarCodeStatus_Old": ""
+ , "HBarCodeStatus_New": ""
};
switch (obj.event) {
case 'btn-AddLine':
table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
-
table.render(option);
+
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HBarCodeStatus_New' + i + '').find("option[value='" + option.data[i - 1].HBarCodeStatus_New + "']").attr("selected", true);
+ }
+ form.render('select');
+ form.render('checkbox');
//鍒锋柊澶嶉�夋
checkRefresh();
break;
@@ -275,6 +366,12 @@
table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HBarCodeStatus_New' + i + '').find("option[value='" + option.data[i - 1].HBarCodeStatus_New + "']").attr("selected", true);
+ }
+ form.render('select');
+ form.render('checkbox');
//鍒锋柊澶嶉�夋
checkRefresh();
}
@@ -286,37 +383,14 @@
}
});
- //閫夋嫨閿�鍞鍗曞彿鎸夐挳
- form.on('submit(btnHSeOrder)', function () {
- get_btnHSeOrder();
- });
-
- //閫夋嫨涓氬姟鍛樻寜閽�
+ //閫夋嫨鍙樻洿浜�
form.on('submit(btnHEmp)', function () {
get_btnHEmp();
});
- //閫夋嫨瀹㈡埛鎸夐挳
- form.on('submit(btnHCus)', function () {
- get_btnHCus();
- });
-
- //閫夋嫨宸ヤ綔涓績鎸夐挳
- form.on('submit(btnHCenter)', function () {
- get_btnHCenter();
- });
-
-
- //琛岄�夋嫨澶勭悊锛堝伐搴忕被鍨嬶級
- form.on('select(HSTATUS)', function (data) {
- //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
- var elem = data.othis.parents('tr');
- var dataindex = elem.attr("data-index");
- $.each(option.data, function (index, value) {
- if (value.LAY_TABLE_INDEX == dataindex) {
- value.HSTATUS = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
- }
- });
+ //閫夋嫨璐熻矗閮ㄩ棬
+ form.on('submit(btnHDept)', function () {
+ get_btnHDept();
});
//閫�鍑�
@@ -338,47 +412,20 @@
set_GridDelete(obj); //琛屽唴鍒犻櫎
set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
- //#region 淇敼琛� 鏃堕棿
-
- var data = obj.data;
- //璁″垝寮�濮嬫棩鏈�
- if (obj.event == 'HPlanBeginDate') {
- var field = $(this).data('field');
- laydate.render({
- elem: this.firstChild
- , show: true //鐩存帴鏄剧ず
- , closeStop: this
- , done: function (nowDate) {
- //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
- data[field] = nowDate;
- obj.update(data);
- //鍒锋柊澶嶉�夋
- checkRefresh();
- }
- });
- }
-
- //璁″垝瀹屽伐鏃ユ湡
- if (obj.event == 'HPlanEndDate') {
- var field = $(this).data('field');
- laydate.render({
- elem: this.firstChild
- , show: true //鐩存帴鏄剧ず
- , closeStop: this
- , done: function (nowDate) {
- //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
- data[field] = nowDate;
- obj.update(data);
- //鍒锋柊澶嶉�夋
- checkRefresh();
- }
- });
- }
-
- //#endregion
-
});
+ //鐘舵��
+ form.on('select(HBarCodeStatus_New)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HBarCodeStatus_New = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+
+ })
//#endregion
@@ -426,21 +473,13 @@
, cols: [[ //琛ㄥご
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', title: '搴忓彿', totalRow: true }
- , { field: 'HMaterID', title: 'HMaterID', hide: true }
- , { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', edit: 'text', event: "HMaterID" }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О' }
- , { field: 'HModel', title: '瑙勬牸鍨嬪彿' }
- , { field: 'HSourceID', title: 'HSourceID', hide: true }
- , { field: 'HSourceName', title: '鐢熶骇璧勬簮', edit: 'text', event: "HSourceID" }//f7
- , { field: 'HDeptID', title: 'HDeptID', hide: true }
- , { field: 'HDeptName', title: '鐢熶骇杞﹂棿', edit: 'text', event: "HDeptID" }//f7
- , { field: 'HUnitID', title: 'HUnitID', hide: true }
- , { field: 'HUnitName', title: '璁￠噺鍗曚綅', edit: 'text', event: "HUnitID" }//f7
- , { field: 'HQty', title: '鏁伴噺', edit: 'text' }
- , { field: 'HSTATUS', title: '涓氬姟鐘舵��', templet: "#HSTATUS" }
- , { field: 'HPlanBeginDate', title: '璁″垝寮�宸ユ棩鏈�', event: 'HPlanBeginDate' }
- , { field: 'HPlanEndDate', title: '璁″垝瀹屽伐鏃ユ湡', event: 'HPlanEndDate' }
- , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ , { field: 'HBarCode', title: '鏉″舰鐮�', edit: 'text' }
+ , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', edit: 'text' }
+ , { field: 'HRelationMoney', title: '鍏宠仈閲戦', edit: 'text' }
+ , { field: 'HBarCodeStatus_Old', title: '鍘熺姸鎬�', templet: "#HBarCodeStatus_Old", hide: true }
+ , { field: 'HBarCodeStatus_New', title: '鐘舵��', templet: "#HBarCodeStatus_New" }
+ , { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text' }//f7
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 80 }
]]
}
@@ -448,15 +487,15 @@
table.render(option);
}
- //閿�鍞鍗�
- function get_btnHSeOrder() {
+ //閮ㄩ棬
+ function get_btnHDept() {
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
- , title: '閿�鍞鍗�'//鏍囬
+ , title: '閮ㄩ棬'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html', 'yes']
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -465,9 +504,8 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
//鑾峰彇鏁版嵁
- $("#HSeOrderInterID").val(checkStatus.data[0].hmainid);
- $("#HSeOrderBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
- $("#HSeOrderEntryID").val(checkStatus.data[0].hsubid);
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ $("#HDeptName").val(checkStatus.data[0].HName);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -475,13 +513,13 @@
})
}
- //涓氬姟鍛�
+ //鍙樻洿浜�
function get_btnHEmp() {
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
- , title: '涓氬姟鍛�'//鏍囬
+ , title: '鍙樻洿浜�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
, content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
@@ -522,133 +560,7 @@
//琛屽唴鍒犻櫎蹇嵎閿�
function set_GridCellCheck(obj) {
- $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
- if (event.key == "F7") {
- //鐗╂枡
- if (obj.event == "HMaterID") {
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "鐗╂枡鍒楄〃" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["90%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鎸夐挳涓� 鐨勫洖璋�
- var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
- if (checkStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
- }
-
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "HMaterID": checkStatus.data[0].HItemID
- , "HMaterNumber": checkStatus.data[0].HNumber
- , "HMaterName": checkStatus.data[0].HName
- , "HModel": checkStatus.data[0].HModel
- })
- layer.close(index);//鍏抽棴寮圭獥
- }
- })
- }
- //鐢熶骇璧勬簮
- if (obj.event == "HSourceID") {
- //鎵撳紑浜哄憳琛� 灏忕獥浣�
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "鐢熶骇璧勬簮鍒楄〃" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["90%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html", "yes"]
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鎸夐挳涓� 鐨勫洖璋�
- var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
-
- if (checkStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
- }
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "HSourceID": checkStatus.data[0].HItemID
- , "HSourceName": checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О
- })
- layer.close(index);//鍏抽棴寮圭獥
- }
- })
- }
- //鐢熶骇杞﹂棿
- if (obj.event == "HDeptID") {
- //鎵撳紑浜哄憳琛� 灏忕獥浣�
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "鐢熶骇杞﹂棿鍒楄〃" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["90%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鎸夐挳涓� 鐨勫洖璋�
- var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
-
- if (checkStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
- }
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "HDeptID": checkStatus.data[0].HItemID
- , "HDeptName": checkStatus.data[0].HName
- })
- layer.close(index);//鍏抽棴寮圭獥
- }
- })
- }
- //璁￠噺鍗曚綅
- if (obj.event == "HUnitID") {
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "璁￠噺鍗曚綅鍒楄〃" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["90%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鎸夐挳涓� 鐨勫洖璋�
- var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
-
- if (checkStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
- }
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "HUnitName": checkStatus.data[0].HName
- , "HUnitID": checkStatus.data[0].HItemID
- })
- layer.close(index);//鍏抽棴寮圭獥
- }
- })
- }
- obj.event = "";
- return false;
- }
- })
}
//澶氶�� 鍒锋柊琛ㄦ牸
@@ -662,7 +574,7 @@
form.render('select');
}
- //淇濆瓨HMaker
+ //淇濆瓨
function set_AddNew(data) {
var num = [];
@@ -670,6 +582,18 @@
if (table.cache["mainTable"][i] != "") {
table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
num.push(table.cache["mainTable"][i])
+ }
+ //if ($("#HBarCodeStatus_Old" + (i + 1)).val()) {
+ // num[i].HBarCodeStatus_Old = $("#HBarCodeStatus_Old" + (i + 1)).val();
+ //}
+ if ($("#HBarCodeStatus_New" + (i + 1)).val()) {
+ num[i].HBarCodeStatus_New = $("#HBarCodeStatus_New" + (i + 1)).val();
+ }
+ }
+
+ for (let j = 0; j < num.length; j++) {
+ if (num[j].HBarCodeStatus_New != HBarCodeStatusVal[j]) {
+ num[j].HBarCodeStatus_Old = HBarCodeStatusVal[j]
}
}
@@ -681,7 +605,7 @@
var index = layer.load();
$.ajax({
type: "POST",
- url: GetWEBURL() + "/Sc_ICMOBill/ICMOBillEdit",
+ url: GetWEBURL() + "/KF_BarCodeStatusChangeBill/BarCodeStatusChangeBillEdit",
async: true,
data: { "sMainSub": sMainSub },
dataType: "json",
@@ -706,68 +630,44 @@
//缂栬緫 椤甸潰璧嬪��
function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
- var sWhere = " and HPRDORGID=" + sessionStorage["OrganizationID"] + " and hmainid='" + linterid + "'";
$.ajax({
- url: GetWEBURL() + "/LEMS/MES_IF_ICMOBillList_Json",
+ url: GetWEBURL() + "/KF_BarCodeStatusChangeBill/cx",
type: "GET",
async: false,
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": linterid },
success: function (d) {
//$("#HPRDORGID").val(d.data[0].HPRDORGID);
//涓昏〃
form.val("formData", {
"HBillNo": d.data[0].鍗曟嵁鍙�
- , "HInterID":d.data[0].hmainid
+ , "HInterID": d.data[0].hmainid
, "HDate": Format(new Date(d.data[0].鏃ユ湡), "yyyy-MM-dd")
- , "HSeOrderBillNo": d.data[0].婧愬崟鍗曞彿
- , "HSeOrderInterID": d.data[0].婧愬崟涓诲唴鐮�
- , "HSeOrderEntryID": d.data[0].婧愬崟瀛愬唴鐮�
- , "HEmpID": d.data[0].HEmpID
- , "HEmpName": d.data[0].涓氬姟鍛�
- , "HCenterID": d.data[0].HCenterID
- , "HCenterName": d.data[0].宸ヤ綔涓績
, "HRemark": d.data[0].琛ㄥご澶囨敞
- , "HPlanQty": d.data[0].璁″垝鐢熶骇鏁伴噺
- , "HPRDORGID": d.data[0].HPRDORGID
+ , "HEmpName": d.data[0].鍙樻洿浜�
+ , "HDeptName": d.data[0].璐熻矗閮ㄩ棬
+ , "HBillStatus": d.data[0].鍗曟嵁鐘舵��
+ , "HEmpID": d.data[0].HEmpID
+ , "HDeptID": d.data[0].HDeptID
});
//瀛愯〃 璧嬪��
var rowdata = [];
for (var i = 0; i < d.data.length; i++) {
- var HSTATUS = "";
- switch (d.data[i].鐘舵��) {
- case "璁″垝":
- HSTATUS = "1";
- break;
- case "璁″垝纭":
- HSTATUS = "2";
- break;
- case "涓嬭揪":
- HSTATUS = "3";
- break;
- case "寮�宸�":
- HSTATUS = "4";
- break;
- case "瀹屽伐":
- HSTATUS = "5";
- break;
- case "缁撴":
- HSTATUS = "6";
- break;
- }
rowdata.push(
{
- "HMaterID": d.data[i].HMaterID, "HMaterNumber": d.data[i].浜у搧浠ｇ爜, "HMaterName": d.data[i].浜у搧鍚嶇О
- , "HModel": d.data[i].瑙勬牸鍨嬪彿, "HSourceID": d.data[i].HSourceID, "HSourceName": d.data[i].鐢熶骇璧勬簮
- , "HDeptID": d.data[i].HDeptID, "HDeptName": d.data[i].鐢熶骇杞﹂棿, "HUnitID": d.data[i].HUnitID
- , "HUnitName": d.data[i].璁￠噺鍗曚綅, "HQty": d.data[i].鐢熶骇浠诲姟鍗曟暟閲�, "HSTATUS": HSTATUS
- , "HPlanBeginDate": Format(new Date(d.data[i].璁″垝寮�宸ユ棩鏈�), "yyyy-MM-dd"), "HPlanEndDate": Format(new Date(d.data[i].璁″垝瀹屽伐鏃ユ湡), "yyyy-MM-dd")
+ "HRelationQty": d.data[i].鍏宠仈鏁伴噺, "HRelationMoney": d.data[i].鍏宠仈閲戦, "HRemark": d.data[i].琛ㄤ綋澶囨敞
+ , "HBarCode": d.data[i].鏉″舰鐮�, "HBarCodeStatus_Old": d.data[i].鍘熺姸鎬�, "HBarCodeStatus_New": d.data[i].鏂扮姸鎬�
}
)
+ HBarCodeStatusVal.push(d.data[i].鏂扮姸鎬�);
}
option.data = rowdata;
table.render(option);
+ for (let j = 0; j < d.data.length; j++) {
+ //$("#HBarCodeStatus_Old" + (j+1)).val(d.data[j].鍘熺姸鎬�)
+ $("#HBarCodeStatus_New" + (j + 1)).val(d.data[j].鏂扮姸鎬�)
+ }
form.render('select');
}
})
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBillList.html"
new file mode 100644
index 0000000..51cfeb0
--- /dev/null
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBillList.html"
@@ -0,0 +1,514 @@
+锘�<!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">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+</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="date" class="layui-input" id="HDate">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="margin-left:10px">
+ <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 class="layui-colla-content">
+ <div class="layui-row">
+ <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>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></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>
+ </div>
+ </div>
+ </div>
+ </div>
+ <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/zgqCustom/zgqCustom.js"></script>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+
+ var sWhere = "";
+ var HModName = "KF_BarCodeStatusChangeBillList";
+
+ var params = getUrlVars();
+
+ //鍒ゆ柇鏄惁鏈夊弬鏁颁紶閫�
+
+
+ //鍒濆鍖栬〃鏍�
+ DisPlay_HideColumn();
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鏂板
+ case 'set_AddNew': set_AddNew();
+ break;
+ //缂栬緫
+ case 'set_Edit': set_Edit();
+ break;
+ //鍒犻櫎
+ case 'set_DeleteBill': set_DeleteBill();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ };
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+ get_FastQuery();
+ });
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_FastQuery();
+ }
+ //#endregion
+
+
+ function set_InitGrid() {
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'HMainID', title: 'HMainID', sort: true, width: 165, hide: true }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 165}
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
+ , { field: '鍗曟嵁鐘舵��', title: '鍗曟嵁鐘舵��', sort: true, width: 170 }
+ , { field: '鏉″舰鐮�', title: '鏉″舰鐮�', width: 215 }
+ , { field: '骞�', title: '骞�', sort: true, width: 170 }
+ , { field: '鏈�', title: '鏈�', sort: true, width: 170 }
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
+ , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 160 }
+ , { field: '鍏宠仈閲戦', title: '鍏宠仈閲戦', width: 160 }
+ , { field: '鍘熺姸鎬�', title: '鍘熺姸鎬�', width: 115 }
+ , { field: '鏂扮姸鎬�', title: '鏂扮姸鎬�', width: 115 }
+ , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 115 }
+ ]]
+ };
+ }
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/KF_BarCodeStatusChangeBill/list',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ 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 });
+ }
+ });
+
+ }
+ //#endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HDate = $("#HDate").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 (HDate) {
+ sWhere += " and 鏃ユ湡 <= '" + HDate + "'";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));//鏃ユ湡
+ $("#btnSearch").click();
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ form.render('select');
+ sWhere = "";
+ }
+ //#endregion
+
+ //鏂板
+ function set_AddNew() {
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '鏉＄爜鐘舵�佸彉鏇村崟鏂板'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: './KF_BarCodeStatusChangeBill.html?OperationType=1&linterid='
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ }
+
+ // 缂栬緫
+ function set_Edit() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HMainID;
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏉＄爜鐘舵�佸彉鏇村崟缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: './KF_BarCodeStatusChangeBill.html?OperationType=3&linterid=' + linterid +''
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+
+ //#region 鍒犻櫎
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hmainid = data[0].HMainID;
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/KF_BarCodeStatusChangeBill/Delete',
+ type: "GET",
+ data: { "HInterID": hmainid, "user": sessionStorage["HUserName"]},
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+
+ }
+ //#endregion
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ set_ClearQuery();
+ get_Display(sWhere);
+ }
+ //#endregion
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = ["HMainID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+
+
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+ </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsBill.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsBill.html"
new file mode 100644
index 0000000..24bad3e
--- /dev/null
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsBill.html"
@@ -0,0 +1,751 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta 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.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>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <style>
+ .main-btn { /*澶撮儴涓绘寜閽�*/
+ padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+ height: 30px;
+ line-height: 30px;
+ }
+
+ .btn-title {
+ font-size: 16px;
+ }
+ /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+ /*.layui-table-cell {
+ overflow: visible !important;
+ }*/
+ /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+ /*td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
+ }*/
+
+ .layui-form-item .layui-inline {
+ margin-top: 5px;
+ margin-bottom: 5px;
+ margin-right: 0px;
+ }
+
+ .layui-form-label {
+ width: 25%;
+ }
+ </style>
+
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div style="padding: 10px; ">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 68px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璐熻矗浜�</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HEmpName" name="HEmpName" id="HEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HEmpID" id="HEmpID" lay-verify="HEmpID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmp" id="btnHEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浣跨敤閮ㄩ棬</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璁惧涓绘。</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HEquipName" name="HEquipName" id="HEquipName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HEquipID" id="HEquipID" lay-verify="HEquipID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEquip" id="btnHEquip" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浣跨敤缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HOrgName" name="HOrgName" id="HOrgName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HOrgID" id="HOrgID" lay-verify="HOrgID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHOrg" id="btnHOrg" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label"> 澶囨敞</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HRemark" id="HRemark">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--鍒跺崟淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaker" id="HMaker" 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="HChecker" id="HChecker" 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="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HUpDater" id="HUpDater" 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="HDeleteMan " id="HDeleteMan " 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="HBacker " id="HBacker " style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" 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="HCheckDate" 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="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" 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="HDeleteDate" id="HDeleteDate" 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="HBackDate" id="HBackDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <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>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+
+ <script>
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element', 'laydate'], function () {
+
+ //#region 鍏叡鍙橀噺
+
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laydate = layui.laydate
+ var option = [];
+
+ var time = Format(new Date(), "yyyy-MM-dd")
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ var rowdata = [{
+ "HMaterID": 0, "鍣ㄥ叿": "", "HQty": 0, "HPartAddr": "", "HBeginDate": time
+ , "HEndDate": time,"HRemark":""
+ }];
+ //鍒濆鍖�
+ set_ClearBill();
+
+ var params = getUrlVars();
+ var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
+ var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+
+ if (linterid == null || linterid == 0) {
+ OperationType = 1;
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3980' },
+ success: function (d) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HInterID").val(d.data[0].HInterID);
+ }
+ });
+ }
+ else {//濡傛灉淇敼鍒欒蛋涓嬮潰
+ //绂佺敤缁勭粐閫夐」
+ $("#HPRDORGID").attr("disabled", true);
+ $("#HDate").attr("disabled", true);
+ RoadBillMain(linterid);
+ $("#HInterID").val(linterid);
+ }
+
+ $("#HMaker").val(sessionStorage["HUserName"]);
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ //鏂板琛岃〃鏍兼暟鎹�
+ var NewRow = {
+ "HMaterID": 0, "鍣ㄥ叿": "", "HQty": 0, "HPartAddr": "", "HBeginDate": time
+ , "HEndDate": time, "HRemark": ""
+ };
+ switch (obj.event) {
+ case 'btn-AddLine':
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+
+ table.render(option);
+ //鍒锋柊澶嶉�夋
+ checkRefresh();
+ break;
+ case 'btn-CopyLine':
+ var copydata = JSON.stringify(data);
+ if (data.length <= 0) {
+ layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ else {
+ var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+ var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+ table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ //鍒锋柊澶嶉�夋
+ checkRefresh();
+ }
+ break;
+ ////鍒楄缃�
+ //case 'set_HideColumn':
+ // get_HideColumn();
+ // break;
+ }
+ });
+
+ //閫夋嫨鍙樻洿浜�
+ form.on('submit(btnHEmp)', function () {
+ get_btnHEmp();
+ });
+
+ //閫夋嫨璐熻矗閮ㄩ棬
+ form.on('submit(btnHDept)', function () {
+ get_btnHDept();
+ });
+
+ //閫夋嫨璁惧涓绘。
+ form.on('submit(btnHEquip)', function () {
+ get_btnHEquip();
+ });
+
+ //閫夋嫨缁勭粐
+ form.on('submit(btnHOrg)', function () {
+ get_btnHOrg();
+ });
+
+ //閫�鍑�
+ form.on('submit(btnEdit)', function (data) {
+ if (OperationType == 1 && linterid != "") {
+ Pub_Close(2);
+ } else {
+ Pub_Close(1);
+ }
+ });
+
+ //淇濆瓨鎻愪氦
+ form.on('submit(btnSave)', function (data) {//鎻愪氦
+ set_AddNew(data);
+ });
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+ var data = obj.data;
+ if (obj.event == 'HBeginDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ }
+ });
+ }
+
+ if (obj.event == 'HEndDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ }
+ });
+ }
+ });
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ // 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栨棩鏈�
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖� 缁勭粐
+ Organ();
+
+ set_InitGrid();
+ }
+
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HPRDORGID").append(Organization);
+ $("#HPRDORGID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , limit: 500
+ , height: 500
+ , loading: false
+ , cols: [[ //琛ㄥご
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', totalRow: true }
+ , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
+ , { field: '鍣ㄥ叿', title: '鍣ㄥ叿', width: 100, edit: 'text', event: "HMaterID" }//f7
+ , { field: 'HQty', title: '鏁伴噺', edit: 'text' }
+ , { field: 'HPartAddr', title: '閮ㄤ綅', edit: 'text' }
+ , { field: 'HBeginDate', title: '寮�濮嬫椂闂�', width: 120, event: 'HBeginDate' }
+ , { field: 'HEndDate', title: '鏈夋晥鏈熻嚦', width: 120, event: 'HEndDate' }
+ , { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text' }//f7
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo',width: 80 }
+ ]]
+ }
+
+ option.data = rowdata;
+ table.render(option);
+ }
+
+ //閮ㄩ棬
+ function get_btnHDept() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '閮ㄩ棬'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ $("#HDeptName").val(checkStatus.data[0].HName);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //璐熻矗浜�
+ function get_btnHEmp() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '璐熻矗浜�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HEmpID").val(checkStatus.data[0].HItemID);
+ $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //璁惧涓绘。
+ function get_btnHEquip() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '璁惧涓绘。'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_EquipFileBillMainList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HEquipID").val(checkStatus.data[0].HInterID);
+ $("#HEquipName").val(checkStatus.data[0].HName);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //缁勭粐
+ function get_btnHOrg() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '缁勭粐'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Xt_ORGANIZATIONSList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HOrgID").val(checkStatus.data[0].HItemID);
+ $("#HOrgName").val(checkStatus.data[0].缁勭粐鍚嶇О);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //琛屽唴蹇嵎閿瓫閫�
+ function set_GridCellCheck(obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ //鍣ㄥ叿
+ if (obj.event == "HMaterID") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鍣ㄥ叿鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_MouldFileMainList.html', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "鍣ㄥ叿": checkStatus.data[0].HName
+ , "HMaterID": checkStatus.data[0].HInterID
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ obj.event = "";
+ return false;
+ }
+ })
+ }
+
+ //琛屽唴鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ obj.del();
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.reload(option);
+ layer.close(index);
+ }
+ });
+ }
+ }
+
+ //澶氶�� 鍒锋柊琛ㄦ牸
+ function checkRefresh() {
+
+ }
+
+ //淇濆瓨
+ function set_AddNew(data) {
+
+ var num = [];
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i] != "") {
+ table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+ num.push(table.cache["mainTable"][i])
+ }
+ }
+
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(num);
+ //var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
+
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Sb_EquipSparepartsBill/EquipSparepartsBillEdit",
+ async: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+ layer.close(index);
+ layer.msg("鎻愪氦鎴愬姛");
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //缂栬緫 椤甸潰璧嬪��
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+ {
+ $.ajax({
+ url: GetWEBURL() + "/Sb_EquipSparepartsBill/cx",
+ type: "GET",
+ async: false,
+ data: { "HInterID": linterid },
+ success: function (d) {
+
+ //$("#HPRDORGID").val(d.data[0].HPRDORGID);
+ //涓昏〃
+ form.val("formData", {
+ "HBillNo": d.data[0].鍗曟嵁鍙�
+ , "HInterID": d.data[0].HMainID
+ , "HDate": Format(new Date(d.data[0].鏃ユ湡), "yyyy-MM-dd")
+ , "HRemark": d.data[0].琛ㄥご澶囨敞
+ , "HEmpID": d.data[0].HEmpID
+ , "HEmpName": d.data[0].璐熻矗浜�
+ , "HDeptID": d.data[0].HDeptID
+ , "HDeptName": d.data[0].閮ㄩ棬
+ , "HEquipID": d.data[0].HEquipID
+ , "HEquipName": d.data[0].璁惧涓绘。
+ , "HOrgID": d.data[0].HOrgID
+ , "HOrgName": d.data[0].缁勭粐
+ });
+
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < d.data.length; i++) {
+ rowdata.push(
+ {
+ "HMaterID": d.data[i].HMaterID, "鍣ㄥ叿": d.data[i].鍣ㄥ叿, "HQty": d.data[i].鏁伴噺, "HPartAddr": d.data[i].閮ㄤ綅,
+ "HBeginDate": d.data[i].寮�濮嬫椂闂�, "HEndDate": d.data[i].鏈夋晥鏈熻嚦, "HRemark": d.data[i].琛ㄤ綋澶囨敞
+ }
+ )
+
+ }
+ option.data = rowdata;
+ table.render(option);
+ form.render('select');
+ }
+ })
+ }
+
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+
+ //#endregion
+
+ });
+
+
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsBillList.html"
new file mode 100644
index 0000000..9632ffb
--- /dev/null
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsBillList.html"
@@ -0,0 +1,522 @@
+锘�<!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">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+</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="date" class="layui-input" id="HDate">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="margin-left:10px">
+ <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 class="layui-colla-content">
+ <div class="layui-row">
+ <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>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></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>
+ </div>
+ </div>
+ </div>
+ </div>
+ <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/zgqCustom/zgqCustom.js"></script>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+
+ var sWhere = "";
+ var HModName = "Sb_EquipSparepartsBillList";
+
+ var params = getUrlVars();
+
+ //鍒ゆ柇鏄惁鏈夊弬鏁颁紶閫�
+
+
+ //鍒濆鍖栬〃鏍�
+ DisPlay_HideColumn();
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鏂板
+ case 'set_AddNew': set_AddNew();
+ break;
+ //缂栬緫
+ case 'set_Edit': set_Edit();
+ break;
+ //鍒犻櫎
+ case 'set_DeleteBill': set_DeleteBill();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ };
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+ get_FastQuery();
+ });
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_FastQuery();
+ }
+ //#endregion
+
+
+ function set_InitGrid() {
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'HMainID', title: 'HMainID', sort: true, width: 165, hide: true }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 165}
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
+ , { field: 'HEquipID', title: 'HEquipID', sort: true, width: 165, hide: true }
+ , { field: '璁惧涓绘。', title: '璁惧涓绘。', sort: true, width: 165 }
+ , { field: 'HOrgID', title: 'HOrgID', sort: true, width: 165, hide: true }
+ , { field: '缁勭粐', title: '缁勭粐', sort: true, width: 165 }
+ , { field: 'HDeptID', title: 'HDeptID', sort: true, width: 165, hide: true }
+ , { field: '閮ㄩ棬', title: '閮ㄩ棬', sort: true, width: 165 }
+ , { field: 'HEmpID', title: 'HEmpID', sort: true, width: 165, hide: true }
+ , { field: '璐熻矗浜�', title: '璐熻矗浜�', sort: true, width: 165 }
+ , { field: 'HMaterID', title: 'HMaterID', sort: true, width: 165, hide: true }
+ , { field: '鍣ㄥ叿', title: '鍣ㄥ叿', sort: true, width: 165 }
+ , { field: '骞�', title: '骞�', sort: true, width: 170 }
+ , { field: '鏈�', title: '鏈�', sort: true, width: 170 }
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
+ , { field: '鏁伴噺', title: '鏁伴噺', width: 160 }
+ , { field: '閮ㄤ綅', title: '閮ㄤ綅', width: 160 }
+ , { field: '寮�濮嬫椂闂�', title: '寮�濮嬫椂闂�', width: 160 }
+ , { field: '鏈夋晥鏈熻嚦', title: '鏈夋晥鏈熻嚦', width: 160 }
+ , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 115 }
+ ]]
+ };
+ }
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sb_EquipSparepartsBill/list',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ 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 });
+ }
+ });
+
+ }
+ //#endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HDate = $("#HDate").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 (HDate) {
+ sWhere += " and 鏃ユ湡 <= '" + HDate + "'";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));//鏃ユ湡
+ $("#btnSearch").click();
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ form.render('select');
+ sWhere = "";
+ }
+ //#endregion
+
+ //鏂板
+ function set_AddNew() {
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '璁惧澶囧搧澶囦欢鏂板'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: './Sb_EquipSparepartsBill.html?OperationType=1&linterid='
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ }
+
+ // 缂栬緫
+ function set_Edit() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HMainID;
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '璁惧澶囧搧澶囦欢缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: './Sb_EquipSparepartsBill.html?OperationType=3&linterid=' + linterid +''
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+
+ //#region 鍒犻櫎
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hmainid = data[0].HMainID;
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/Sb_EquipSparepartsBill/Delete',
+ type: "GET",
+ data: { "HInterID": hmainid, "user": sessionStorage["HUserName"]},
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+
+ }
+ //#endregion
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ set_ClearQuery();
+ get_Display(sWhere);
+ }
+ //#endregion
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = ["HMainID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+
+
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+ </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsChangeBill.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsChangeBill.html"
new file mode 100644
index 0000000..e62de7f
--- /dev/null
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsChangeBill.html"
@@ -0,0 +1,761 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta 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.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>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <style>
+ .main-btn { /*澶撮儴涓绘寜閽�*/
+ padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+ height: 30px;
+ line-height: 30px;
+ }
+
+ .btn-title {
+ font-size: 16px;
+ }
+ /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+ /*.layui-table-cell {
+ overflow: visible !important;
+ }*/
+ /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+ /*td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
+ }*/
+
+ .layui-form-item .layui-inline {
+ margin-top: 5px;
+ margin-bottom: 5px;
+ margin-right: 0px;
+ }
+
+ .layui-form-label {
+ width: 25%;
+ }
+ </style>
+
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div style="padding: 10px; ">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 68px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璐熻矗浜�</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HEmpName" name="HEmpName" id="HEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HEmpID" id="HEmpID" lay-verify="HEmpID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmp" id="btnHEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浣跨敤閮ㄩ棬</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璁惧涓绘。</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HEquipName" name="HEquipName" id="HEquipName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HEquipID" id="HEquipID" lay-verify="HEquipID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEquip" id="btnHEquip" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浣跨敤缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HOrgName" name="HOrgName" id="HOrgName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HOrgID" id="HOrgID" lay-verify="HOrgID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHOrg" id="btnHOrg" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label"> 澶囨敞</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HRemark" id="HRemark">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--鍒跺崟淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaker" id="HMaker" 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="HChecker" id="HChecker" 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="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HUpDater" id="HUpDater" 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="HDeleteMan " id="HDeleteMan " 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="HBacker " id="HBacker " style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" 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="HCheckDate" 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="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" 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="HDeleteDate" id="HDeleteDate" 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="HBackDate" id="HBackDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <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>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+
+ <script>
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element', 'laydate'], function () {
+
+ //#region 鍏叡鍙橀噺
+
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laydate = layui.laydate
+ var option = [];
+
+ var time = Format(new Date(), "yyyy-MM-dd")
+
+ var HMaterIDVal = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ var rowdata = [{
+ "HMaterID_New": 0, "HMaterID_Old": 0,"鍣ㄥ叿": "", "HQty": 0, "HPartAddr": "", "HBeginDate": time
+ , "HEndDate": time,"HRemark":""
+ }];
+ //鍒濆鍖�
+ set_ClearBill();
+
+ var params = getUrlVars();
+ var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
+ var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+
+ if (linterid == null || linterid == 0) {
+ OperationType = 1;
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3981' },
+ success: function (d) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HInterID").val(d.data[0].HInterID);
+ }
+ });
+ }
+ else {//濡傛灉淇敼鍒欒蛋涓嬮潰
+ //绂佺敤缁勭粐閫夐」
+ $("#HPRDORGID").attr("disabled", true);
+ $("#HDate").attr("disabled", true);
+ RoadBillMain(linterid);
+ $("#HInterID").val(linterid);
+ }
+
+ $("#HMaker").val(sessionStorage["HUserName"]);
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ //鏂板琛岃〃鏍兼暟鎹�
+ var NewRow = {
+ "HMaterID_New": 0, "HMaterID_Old": 0, "鍣ㄥ叿": "", "HQty": 0, "HPartAddr": "", "HBeginDate": time
+ , "HEndDate": time, "HRemark": ""
+ };
+ switch (obj.event) {
+ case 'btn-AddLine':
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+
+ table.render(option);
+ //鍒锋柊澶嶉�夋
+ checkRefresh();
+ break;
+ case 'btn-CopyLine':
+ var copydata = JSON.stringify(data);
+ if (data.length <= 0) {
+ layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ else {
+ var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+ var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+ table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ //鍒锋柊澶嶉�夋
+ checkRefresh();
+ }
+ break;
+ ////鍒楄缃�
+ //case 'set_HideColumn':
+ // get_HideColumn();
+ // break;
+ }
+ });
+
+ //閫夋嫨鍙樻洿浜�
+ form.on('submit(btnHEmp)', function () {
+ get_btnHEmp();
+ });
+
+ //閫夋嫨璐熻矗閮ㄩ棬
+ form.on('submit(btnHDept)', function () {
+ get_btnHDept();
+ });
+
+ //閫夋嫨璁惧涓绘。
+ form.on('submit(btnHEquip)', function () {
+ get_btnHEquip();
+ });
+
+ //閫夋嫨缁勭粐
+ form.on('submit(btnHOrg)', function () {
+ get_btnHOrg();
+ });
+
+ //閫�鍑�
+ form.on('submit(btnEdit)', function (data) {
+ if (OperationType == 1 && linterid != "") {
+ Pub_Close(2);
+ } else {
+ Pub_Close(1);
+ }
+ });
+
+ //淇濆瓨鎻愪氦
+ form.on('submit(btnSave)', function (data) {//鎻愪氦
+ set_AddNew(data);
+ });
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+ var data = obj.data;
+ if (obj.event == 'HBeginDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ }
+ });
+ }
+
+ if (obj.event == 'HEndDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ }
+ });
+ }
+ });
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ // 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栨棩鏈�
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖� 缁勭粐
+ Organ();
+
+ set_InitGrid();
+ }
+
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HPRDORGID").append(Organization);
+ $("#HPRDORGID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , limit: 500
+ , height: 500
+ , loading: false
+ , cols: [[ //琛ㄥご
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', totalRow: true }
+ , { field: 'HMaterID_Old', title: 'HMaterID_Old', width: 100, hide: true }
+ , { field: 'HMaterID_New', title: 'HMaterID_New', width: 100, hide: true }
+ , { field: '鍣ㄥ叿', title: '鍣ㄥ叿', width: 100, edit: 'text', event: "HMaterID_New" }//f7
+ , { field: 'HQty', title: '鏁伴噺', edit: 'text' }
+ , { field: 'HPartAddr', title: '閮ㄤ綅', edit: 'text' }
+ , { field: 'HBeginDate', title: '寮�濮嬫椂闂�', width: 120, event: 'HBeginDate' }
+ , { field: 'HEndDate', title: '鏈夋晥鏈熻嚦', width: 120, event: 'HEndDate' }
+ , { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text' }//f7
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo',width: 80 }
+ ]]
+ }
+
+ option.data = rowdata;
+ table.render(option);
+ }
+
+ //閮ㄩ棬
+ function get_btnHDept() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '閮ㄩ棬'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ $("#HDeptName").val(checkStatus.data[0].HName);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //璐熻矗浜�
+ function get_btnHEmp() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '璐熻矗浜�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HEmpID").val(checkStatus.data[0].HItemID);
+ $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //璁惧涓绘。
+ function get_btnHEquip() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '璁惧涓绘。'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_EquipFileBillMainList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HEquipID").val(checkStatus.data[0].HInterID);
+ $("#HEquipName").val(checkStatus.data[0].HName);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //缁勭粐
+ function get_btnHOrg() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '缁勭粐'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Xt_ORGANIZATIONSList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HOrgID").val(checkStatus.data[0].HItemID);
+ $("#HOrgName").val(checkStatus.data[0].缁勭粐鍚嶇О);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //琛屽唴蹇嵎閿瓫閫�
+ function set_GridCellCheck(obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ //鍣ㄥ叿
+ if (obj.event == "HMaterID_New") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鍣ㄥ叿鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_MouldFileMainList.html', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "鍣ㄥ叿": checkStatus.data[0].HName
+ , "HMaterID_New": checkStatus.data[0].HInterID
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ obj.event = "";
+ return false;
+ }
+ })
+ }
+
+ //琛屽唴鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ obj.del();
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.reload(option);
+ layer.close(index);
+ }
+ });
+ }
+ }
+
+ //澶氶�� 鍒锋柊琛ㄦ牸
+ function checkRefresh() {
+
+ }
+
+ //淇濆瓨
+ function set_AddNew(data) {
+
+ var num = [];
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i] != "") {
+ table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+ num.push(table.cache["mainTable"][i])
+ }
+ }
+
+ for (var j = 0; j < num.length; j++) {
+ if (num[j].HMaterID_New != HMaterIDVal[j]) {
+ num[j].HMaterID_Old = HMaterIDVal[j]
+ }
+ }
+
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(num);
+ //var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
+
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Sb_EquipSparepartsChangeBill/EquipSparepartsChangeBillEdit",
+ async: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+ layer.close(index);
+ layer.msg("鎻愪氦鎴愬姛");
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //缂栬緫 椤甸潰璧嬪��
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+ {
+ $.ajax({
+ url: GetWEBURL() + "/Sb_EquipSparepartsChangeBill/cx",
+ type: "GET",
+ async: false,
+ data: { "HInterID": linterid },
+ success: function (d) {
+
+ //$("#HPRDORGID").val(d.data[0].HPRDORGID);
+ //涓昏〃
+ form.val("formData", {
+ "HBillNo": d.data[0].鍗曟嵁鍙�
+ , "HInterID": d.data[0].HMainID
+ , "HDate": Format(new Date(d.data[0].鏃ユ湡), "yyyy-MM-dd")
+ , "HRemark": d.data[0].琛ㄥご澶囨敞
+ , "HEmpID": d.data[0].HEmpID
+ , "HEmpName": d.data[0].璐熻矗浜�
+ , "HDeptID": d.data[0].HDeptID
+ , "HDeptName": d.data[0].閮ㄩ棬
+ , "HEquipID": d.data[0].HEquipID
+ , "HEquipName": d.data[0].璁惧涓绘。
+ , "HOrgID": d.data[0].HOrgID
+ , "HOrgName": d.data[0].缁勭粐
+ });
+
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < d.data.length; i++) {
+ rowdata.push(
+ {
+ "HMaterID_New": d.data[i].HMaterID_New, "HMaterID_Old": d.data[i].HMaterID_Old, "鍣ㄥ叿": d.data[i].鍣ㄥ叿,
+ "HQty": d.data[i].鏁伴噺, "HPartAddr": d.data[i].閮ㄤ綅,
+ "HBeginDate": d.data[i].寮�濮嬫椂闂�, "HEndDate": d.data[i].鏈夋晥鏈熻嚦, "HRemark": d.data[i].琛ㄤ綋澶囨敞
+ }
+ )
+ HMaterIDVal.push(d.data[i].HMaterID_New);
+ }
+ option.data = rowdata;
+ table.render(option);
+ form.render('select');
+ }
+ })
+ }
+
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+
+ //#endregion
+
+ });
+
+
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsChangeBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsChangeBillList.html"
new file mode 100644
index 0000000..93b356e
--- /dev/null
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsChangeBillList.html"
@@ -0,0 +1,522 @@
+锘�<!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">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+</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="date" class="layui-input" id="HDate">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="margin-left:10px">
+ <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 class="layui-colla-content">
+ <div class="layui-row">
+ <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>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></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>
+ </div>
+ </div>
+ </div>
+ </div>
+ <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/zgqCustom/zgqCustom.js"></script>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+
+ var sWhere = "";
+ var HModName = "Sb_EquipSparepartsChangeBillList";
+
+ var params = getUrlVars();
+
+ //鍒ゆ柇鏄惁鏈夊弬鏁颁紶閫�
+
+
+ //鍒濆鍖栬〃鏍�
+ DisPlay_HideColumn();
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鏂板
+ case 'set_AddNew': set_AddNew();
+ break;
+ //缂栬緫
+ case 'set_Edit': set_Edit();
+ break;
+ //鍒犻櫎
+ case 'set_DeleteBill': set_DeleteBill();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ };
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+ get_FastQuery();
+ });
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_FastQuery();
+ }
+ //#endregion
+
+
+ function set_InitGrid() {
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'HMainID', title: 'HMainID', sort: true, width: 165, hide: true }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 165}
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
+ , { field: 'HEquipID', title: 'HEquipID', sort: true, width: 165, hide: true }
+ , { field: '璁惧涓绘。', title: '璁惧涓绘。', sort: true, width: 165 }
+ , { field: 'HOrgID', title: 'HOrgID', sort: true, width: 165, hide: true }
+ , { field: '缁勭粐', title: '缁勭粐', sort: true, width: 165 }
+ , { field: 'HDeptID', title: 'HDeptID', sort: true, width: 165, hide: true }
+ , { field: '閮ㄩ棬', title: '閮ㄩ棬', sort: true, width: 165 }
+ , { field: 'HEmpID', title: 'HEmpID', sort: true, width: 165, hide: true }
+ , { field: '璐熻矗浜�', title: '璐熻矗浜�', sort: true, width: 165 }
+ , { field: 'HMaterID_New', title: 'HMaterID_New', sort: true, width: 165, hide: true }
+ , { field: '鍣ㄥ叿', title: '鍣ㄥ叿', sort: true, width: 165 }
+ , { field: '骞�', title: '骞�', sort: true, width: 170 }
+ , { field: '鏈�', title: '鏈�', sort: true, width: 170 }
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
+ , { field: '鏁伴噺', title: '鏁伴噺', width: 160 }
+ , { field: '閮ㄤ綅', title: '閮ㄤ綅', width: 160 }
+ , { field: '寮�濮嬫椂闂�', title: '寮�濮嬫椂闂�', width: 160 }
+ , { field: '鏈夋晥鏈熻嚦', title: '鏈夋晥鏈熻嚦', width: 160 }
+ , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 115 }
+ ]]
+ };
+ }
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sb_EquipSparepartsChangeBill/list',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ 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 });
+ }
+ });
+
+ }
+ //#endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HDate = $("#HDate").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 (HDate) {
+ sWhere += " and 鏃ユ湡 = '" + HDate + "'";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));//鏃ユ湡
+ $("#btnSearch").click();
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ form.render('select');
+ sWhere = "";
+ }
+ //#endregion
+
+ //鏂板
+ function set_AddNew() {
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '璁惧澶囧搧澶囦欢鍙樻洿鍗曟柊澧�'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: './Sb_EquipSparepartsChangeBill.html?OperationType=1&linterid='
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ }
+
+ // 缂栬緫
+ function set_Edit() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HMainID;
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '璁惧澶囧搧澶囦欢鍙樻洿鍗曠紪杈�'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: './Sb_EquipSparepartsChangeBill.html?OperationType=3&linterid=' + linterid +''
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+
+ //#region 鍒犻櫎
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hmainid = data[0].HMainID;
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/Sb_EquipSparepartsChangeBill/Delete',
+ type: "GET",
+ data: { "HInterID": hmainid, "user": sessionStorage["HUserName"]},
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+
+ }
+ //#endregion
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ set_ClearQuery();
+ get_Display(sWhere);
+ }
+ //#endregion
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = ["HMainID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+
+
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+ </script>
+
+</body>
+</html>
\ No newline at end of file
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/Kf_QCStockInCheckBill_Fast.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/Kf_QCStockInCheckBill_Fast.html"
index b7d5670..cc56dc9 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/Kf_QCStockInCheckBill_Fast.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/Kf_QCStockInCheckBill_Fast.html"
@@ -37,15 +37,15 @@
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<!--<div class="layui-row">
- <div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁绫诲瀷</label>
- </div>
- <div class="layui-col-xs8">
- <select name="HBillType" id="HBillType">
- <option value="1103">鏀舵枡閫氱煡鍗�</option>
- </select>
- </div>
- </div>-->
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁绫诲瀷</label>
+ </div>
+ <div class="layui-col-xs8">
+ <select name="HBillType" id="HBillType">
+ <option value="1103">鏀舵枡閫氱煡鍗�</option>
+ </select>
+ </div>
+ </div>-->
<div class="layui-row">
<div class="layui-col-xs3">
<label class="layui-form-label" style="width:60px;padding-left:0px;">鐗╂枡鏉＄爜</label>
@@ -77,11 +77,17 @@
</div>
<div class="layui-col-xs6">
<input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" disabled="disabled" autocomplete="off" class="layui-input mobile">
+
</div>
<div class="layui-col-xs3">
<input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" disabled="disabled" autocomplete="off" class="layui-input mobile">
</div>
</div>
+ </div>
+ <!--<input id="upload" type="file" accept="image/*" @change="changePic" />-->
+ <input id="takepicture" type="file" accept="image/*">
+ <div>
+ <img id="blah" src="#" alt="鏄剧ず鎮ㄤ笂浼犵殑鍟嗗搧鍥剧墖" />
</div>
</div>
</div>
@@ -327,6 +333,7 @@
<div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
<button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">鎻愪氦</button>
<button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button>
+ <!-- <button id="capture">鎷嶇収</button>-->
</div>
<div id="" style="display:none;">
<audio id="cs" hidden controls>
@@ -349,7 +356,6 @@
</script>
-
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -367,6 +373,19 @@
, form = layui.form
, element = layui.element;
//娓呯┖鐣岄潰 new
+
+ function readURL(input) {
+ if (input.files && input.files[0]) {
+ var reader = new FileReader();
+ reader.onload = function (e) {
+ $('#blah').attr('src', e.target.result);
+ }
+ reader.readAsDataURL(input.files[0]);
+ }
+ }
+ $("#takepicture").change(function () {
+ readURL(this);
+ });
//琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
@@ -399,6 +418,9 @@
var params = getUrlVars();
var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+
+
+
//鍔犺浇琛ㄥご
function RoadBillMain(linterid) {
@@ -748,6 +770,7 @@
var HSLEntryID = $("#HSLEntryID").val(); //鏀舵枡閫氱煡鍗曞瓙ID
var HSLBillNo = $("#HSLBillNo").val(); //鏀舵枡閫氱煡鍗曞崟鍙�
var HSLSeQ = $("#HSLSeQ").val(); //鏀舵枡閫氱煡鍗曡鍙�
+ var HBatchNo = $("#HBatchNo").val(); //鎵瑰彿
if (HBadQty == "") {
HBadQty = 0;
@@ -763,6 +786,12 @@
}
if (HWHNumber == "") {
HWHNumber = '';
+ }
+ if (HBatchNo == "") {
+ HBatchNo = '';
+ }
+ if (HKeeperID == "") {
+ HKeeperID = 0;
}
//var sSourceType = $("#HBillType").val();
@@ -780,7 +809,7 @@
, "HBadQty": HBadQty, "HCheckResult": HCheckResult, "HSupNumber": HSupNumber, "HWHNumber": HWHNumber
, "HUseResult": HUseResult, "HSeQ": HSeQ, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HSourceBillNo": HSourceBillNo
, "user": sessionStorage["HUserName"], "HWHID": HWHID, "HSPID": HSPID, "HSupID": HSupID, "HKeeperID": HKeeperID
- , "HMaterID": HMaterID, "HSourceBillType": HSourceBillType, "HSLInterID": HSLInterID, "HSLEntryID": HSLEntryID, "HSLBillNo": HSLBillNo, "HSLSeQ": HSLSeQ
+ , "HMaterID": HMaterID, "HSourceBillType": HSourceBillType, "HSLInterID": HSLInterID, "HSLEntryID": HSLEntryID, "HSLBillNo": HSLBillNo, "HSLSeQ": HSLSeQ
},
dataType: "json",
success: function (data) {
@@ -956,7 +985,7 @@
$.ajax({
url: GetWEBURL() + '/QCStockInCheckBill/DisBillEntryList_Webs_New_Json1',
type: "GET",
- data: { HInterID: linterid, HEntryID: lentryid},
+ data: { HInterID: linterid, HEntryID: lentryid },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
listOption.data = result.data.list;
@@ -988,6 +1017,7 @@
$("#HSLEntryID").val(result.data[0].HSLEntryID);
$("#HSLBillNo").val(result.data[0].HSLBillNo);
$("#HSLSeQ").val(result.data[0].HSLSeQ);
+ $("#HCheckQty").val(result.data[0].hqty);
}
else {
layer.msg(result.Message);
@@ -1005,9 +1035,9 @@
//鎵潯鐮�
function GetMeesageByBarCode(obj) { //杩斿洖宸ヤ綔涓績
var sBarCode = $('#HBarCode').val()
-
-
+
+
//鍒ゆ柇鏉＄爜鏄惁涓虹┖ new
if (sBarCode == '') {
@@ -1044,7 +1074,7 @@
layer.closeAll("loading");
}
});
-
+
}
var listOption = {
elem: '#wl-table'
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/Kf_SCStockInCheckBill_Fast.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/Kf_SCStockInCheckBill_Fast.html"
index 729646e..65fdf17 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/Kf_SCStockInCheckBill_Fast.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/Kf_SCStockInCheckBill_Fast.html"
@@ -748,7 +748,7 @@
var HSLEntryID = $("#HSLEntryID").val(); //鏀舵枡閫氱煡鍗曞瓙ID
var HSLBillNo = $("#HSLBillNo").val(); //鏀舵枡閫氱煡鍗曞崟鍙�
var HSLSeQ = $("#HSLSeQ").val(); //鏀舵枡閫氱煡鍗曡鍙�
-
+ var HBatchNo = $("#HBatchNo").val(); //鎵瑰彿
if (HBadQty == "") {
HBadQty = 0;
}
@@ -764,7 +764,16 @@
if (HSPNumber == "") {
HSPNumber = '';
}
+ if (HWHNumber == "") {
+ HWHNumber = '';
+ }
+ if (HWHID == "") {
+ HWHID = 0;
+ }
+ if (HBatchNo == "") {
+ HBatchNo = '';
+ }
//var sSourceType = $("#HBillType").val();
if (AllowLoadData() != false)//闈炵┖楠岃瘉
{
@@ -988,6 +997,7 @@
$("#HSLEntryID").val(result.data[0].HSLEntryID);
$("#HSLBillNo").val(result.data[0].HSLBillNo);
$("#HSLSeQ").val(result.data[0].HSLSeQ);
+ $("#HCheckQty").val(result.data[0].hqty);
}
else {
layer.msg(result.Message);
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
index 3267f66..48bae3c 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
@@ -370,7 +370,7 @@
, { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ //, { field: 'HBatchNo', title: '鎵规', width: 150 }
]]
, height: 500
, done: function () {
@@ -773,7 +773,7 @@
form.on('submit(QueDin3)', function () {//
layer.open({
type: 2
- , area: ['80%', '80%']
+ , area: ['100%', '100%']
, title: '鍑哄簱鐢宠鍗曞垪琛�'
, shade: 0.6 //閬僵閫忔槑搴�
//, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -988,7 +988,7 @@
, { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100 }
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100 }
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
- , { field: 'HBatchNo', title: '鎵规', width: 100 }
+ //, { field: 'HBatchNo', title: '鎵规', width: 100 }
, { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 100 }
, { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100 }
, { field: 'HWHID', title: 'ck', width: 100 }
@@ -1128,7 +1128,7 @@
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
, { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HBatchNo', title: '鎵规', width: 150, hide: true }
+ //, { field: 'HBatchNo', title: '鎵规', width: 150, hide: true }
, { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150, hide: true }
, { field: 'HMaterID', title: 'HMaterID', width: 150, hide: true }
, { field: 'HAuxPropID', title: 'HAuxPropID', width: 150, hide: true }
@@ -1154,7 +1154,7 @@
, { field: 'HSPName', title: '浠撲綅', width: 150 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
- , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ //, { field: 'HBatchNo', title: '鎵规', width: 150 }
, { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
]]
, height: 500
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_CheckList_New.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_CheckList_New.html"
new file mode 100644
index 0000000..85105c5
--- /dev/null
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_CheckList_New.html"
@@ -0,0 +1,402 @@
+锘�<!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">
+ <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>
+</head>
+<body>
+ <div class="layui-fluid">
+ <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-tab" lay-filter="tab-Kf_EntrustOutBill_CheckList">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1">缂撳瓨鍒楄〃</li>
+ <li lay-id="2">宸蹭笂浼犳煡璇�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo" value="" >
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">婧愬崟鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HSourceBillNo" id="HSourceBillNo" value="" >
+ </div>
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdQuery">鏌ヨ</button>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <table class="layui-hide" id="Uploaded-table" lay-filter="Uploaded-table"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="margin-bottom: 20px;">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRefresh">鍒锋柊</button>
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRescind">鎾ら攢</button>
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdAdd">鏂板</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
+ //娓呯┖鐣岄潰 new
+ var HBillType = '1211'
+ var HMaker = sessionStorage["HUserName"]
+ var HStockOrgID = sessionStorage["OrganizationID"]
+ var option = [];
+ var Uploadedoption = [];
+
+ set_ClearBill();
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ element.tabChange('tab-Kf_EntrustOutBill_CheckList', '1');
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //璇诲彇鍗曟嵁鍒楄〃
+ DisBillEntryList();
+ }
+
+ //#region 鍒濆鍖栬〃鏍兼柟娉�
+ function set_InitGrid() {
+ option = {
+ elem: '#dj-table'
+ , height: 'full-50'
+ //, page: true
+ , cellMinWidth: 90
+ , limit: 50
+ //, limits: [50, 500, 5000, 20000]
+ };
+ Uploadedoption = {
+ elem: '#Uploaded-table'
+ , height: 'full-50'
+ //, page: true
+ , cellMinWidth: 90
+ , limit: 50
+ //, limits: [50, 500, 5000, 20000]
+ };
+ }
+
+ //#region 缂撳瓨鍒楄〃鐣岄潰 鎺т欢浜嬩欢
+
+ //#region 缂栬緫鍔熻兘鎺т欢
+ form.on('submit(cmdModify)', function () {
+ var checkStatus = table.checkStatus('dj-table')
+ , data = checkStatus.data;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '濮斿棰嗘枡鏍￠獙'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_Check_New.html?linterid=' + data[0].HInterID + '& lBillNo=' + data[0].HBillNo, 'yes']
+ , resize: false
+ , cancel: function () {
+ $(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+ //#endregion
+
+ //#region 鍒犻櫎鍔熻兘鎺т欢
+ form.on('submit(cmdDelete)', function () {//鍒犻櫎
+ var checkStatus = table.checkStatus('dj-table')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ //閫昏緫鍒犻櫎鏂规硶
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗灏嗕笉鍙仮澶嶏紒", { title: "鍒犻櫎纭" }, function (index) {
+ var sInterID = data[0].HInterID;
+ $.ajax(
+ {
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/DeleteBillList_Json",
+ async: true,
+ data: { "HInterID": sInterID },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�,
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼鎴愬姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ }
+ else {
+ layer.msg(data.Message, { icon: 2 });
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, {
+ icon: 5,
+ time: 20000
+ }, function () {
+ });
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�');
+ }
+ });
+ //#endregion
+
+ //#region 鍒锋柊鍔熻兘鎺т欢
+ form.on('submit(cmdRefresh)', function () {//鍒锋柊
+ DisBillEntryList();
+ });
+
+ function DisBillEntryList() {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_TempList_BillCheck_Json',
+ type: "GET",
+ data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+ success: function (data1) {
+ var col = [];
+ if (data1.count == 1) {
+ var data = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍒ゆ柇鏄惁鏄函鑻辨枃
+ var patrn = new RegExp("[\u4E00-\u9FA5]+");
+ col.push({ type: 'radio' });
+ for (var i = 0; i < data.length; i++) {
+ if (!patrn.test(data[i].name)) {
+ col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ case 'DateTime':
+ col.push({ field: data[i].name, 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: 200 });
+ break;
+ default:
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true });
+ }
+ }
+ }
+ option.cols = [col];
+ option.data = data1.data;
+ 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
+
+ //#region 閫�鍑哄姛鑳芥帶浠�
+ form.on('submit(cmdCancel)', function () {
+ parent.location.href = "../../../views/index.html"
+ })
+ //#endregion
+
+ //#region 鏂板鍔熻兘鎺т欢
+ form.on('submit(cmdAdd)', function () {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '濮斿棰嗘枡鏍￠獙'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_Check_New.html?linterid=0', 'yes']
+ , resize: false
+ , cancel: function () {
+ $(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //#endregion
+
+ //#endregion
+
+
+ //#region 宸蹭笂浼犳煡璇㈢晫闈� 鎺т欢浜嬩欢
+
+ //#region 鏌ヨ鍔熻兘鎺т欢
+ form.on('submit(cmdQuery)', function () {
+ DisUploadedList();
+ });
+
+ function DisUploadedList() {
+ var HBillNo = $("#HBillNo").val();
+ var HSourceBillNo = $("#HSourceBillNo").val();
+ if (HBillNo == '' && HSourceBillNo == '') {
+ layer.msg("鍗曟嵁鍙蜂笌婧愬崟鍙蜂笉鑳藉悓鏃朵负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_Json',
+ type: "GET",
+ data: { "HBillType": HBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
+ success: function (data1) {
+ var col = [];
+ if (data1.count == 1) {
+ var data = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍒ゆ柇鏄惁鏄函鑻辨枃
+ var patrn = new RegExp("[\u4E00-\u9FA5]+");
+ col.push({ type: 'radio' });
+ for (var i = 0; i < data.length; i++) {
+ if (!patrn.test(data[i].name)) {
+ col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ case 'DateTime':
+ col.push({ field: data[i].name, 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: 200 });
+ break;
+ default:
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true });
+ }
+ }
+ }
+ Uploadedoption.cols = [col];
+ Uploadedoption.data = data1.data;
+ table.render(Uploadedoption);
+ 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
+
+ //#region 鎾ゆ秷鍔熻兘鎺т欢
+
+ //鎾ら攢鍔熻兘
+ form.on('submit(cmdRescind)', function () {
+ var checkStatus = table.checkStatus('Uploaded-table');
+ var data = "";
+ if (checkStatus.data.length != 0) {
+ data = checkStatus.data;
+ } else {
+ return layer.msg("璇烽�夋嫨涓�琛岃褰曪紝杩涜鎾ら攢锛�");
+ }
+ var sInterID = data[0].HInterID
+ var sBillNo = data[0].HBillNo
+ $.ajax(
+ {
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/DeleteICStockBillAndWMS_Json",
+ async: true,
+ data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ }
+ else {
+ layer.msg(data.Message, { icon: 2 });
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, {
+ icon: 5,
+ time: 20000
+ }, function () {
+ //do something
+ });
+ }
+ });
+ });
+ //#endregion
+
+ //#region 閫�鍑哄姛鑳芥帶浠�
+
+ //#endregion
+
+ //#endregion
+
+ });
+
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Check_New.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Check_New.html"
new file mode 100644
index 0000000..dccd091
--- /dev/null
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Check_New.html"
@@ -0,0 +1,639 @@
+锘�<!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">
+ <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>
+ <style>
+ .layui-col-xs4 {
+ width: 12.333333%
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <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 style="background-color:#0085E8;">
+ <span style="color: white;"><i class="layui-icon layui-icon-form"></i>濮斿棰嗘枡鏍￠獙</span>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs4">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉＄爜</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs4">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab" lay-filter="tab-Kf_EntrustOutBillCheck">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1">琛ㄥご淇℃伅</li>
+ <li lay-id="2">鐗╂枡淇℃伅</li>
+ <li lay-id="3">鍚堣淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--琛ㄥご淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撳簱</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHID-BT">...</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT">...</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:45px;padding-left:0px;">鍗曟嵁鍙�</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" value="" autocomplete="off" class="layui-input mobile">
+ </div>
+ <div class="layui-col-xs3">
+ <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" value="0" disabled="disabled" autocomplete="off" class="layui-input mobile">
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--鐗╂枡淇℃伅-->
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+ </div>
+ <!--鍚堣淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鏉＄爜鏁�</label>
+ </div>
+ <div class="layui-col-xs8 layui-input-inline mobile">
+ <input type="text" name="HBarcodeQtys" id="HBarcodeQtys" lay-verify="HBarcodeQtys" value="0" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鎬绘暟閲�</label>
+ </div>
+ <div class="layui-col-xs8 layui-input-inline mobile">
+ <input type="text" name="HSumQtys" id="HSumQtys" lay-verify="HSumQtys" value="0" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="margin-bottom: 20px;">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdSaver" id="Saver">鎻愪氦</button>
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
+ var HBillType = '1211'
+ var HMaker = sessionStorage["HUserName"]
+ var HStockOrgID = sessionStorage["OrganizationID"]
+ var HInterID = $('#HInterID').val()
+ var HBillNo = $('#HBillNo').val()
+ var option = [];
+
+ set_ClearBill();
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ element.tabChange('tab-Kf_EntrustOutBillCheck', '1');
+ var pFocus = $("#HBillNo");
+ pFocus.focus(); //鑾峰彇鍏夋爣
+ pFocus.select();
+
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ }
+
+ //#region 鍒濆鍖栬〃鏍兼柟娉�
+ function set_InitGrid() {
+ option = {
+ elem: '#wl-table'
+ , height: 'full-50'
+ //, page: true
+ , cellMinWidth: 90
+ , limit: 50
+ //, limits: [50, 500, 5000, 20000]
+ };
+ }
+ //#endregion
+
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ var params = getUrlVars();
+ var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ var lBillNo = params[params[1]]; //浠庡崟鎹幏鍙� 婧愬崟鍙�
+
+ //鍒ゆ柇鏄惁鏂板
+ if (linterid == null || linterid == 0) {
+ $("#HInterID").val("0");
+ $("#HBillNo").val("");
+ }
+ //浠庣紦瀛樺垪琛ㄧ紪杈戝姛鑳借烦杞嚦鍗曟嵁妯″潡
+ else {
+ RoadBillMain(linterid);
+ }
+
+ //#region 浠庣紦瀛樺垪琛ㄧ紪杈戝姛鑳借烦杞嚦鍗曟嵁妯″潡锛岃幏鍙栧崟鎹俊鎭�
+ function RoadBillMain(linterid) {
+ $.ajax({
+ url: GetWEBURL() + "/WEBSController/GetSourceBillList_BillCheck_Json",
+ type: "GET",
+ data: { "HBillNo": lBillNo, "HBillType": HBillType },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+ $("#HWHID").val(result.data.hWhIDField);
+ $("#HWHNAME").val(result.data.hWhNameField);
+ $("#HStockPlaceName").val(result.data.hSPNameField);
+ $("#HStockPlaceID").val(result.data.hSPIDField);
+
+ if (result.data.hSPFlagField == "false") {
+ $("#HStockPlaceName").attr("readonly", "readonly");
+ $("#HSpID-BT").attr("disabled", "disabled");
+ //document.getElementById("HSpID-BT").disabled = false;
+ }
+ else {
+ $("#HStockPlaceName").removeAttr("readonly");
+ $("#HSpID-BT").removeAttr("disabled", "disabled");
+ }
+
+ $('#HInterID').val(result.data.hInterIDField)
+ $('#HBillNo').val(result.data.hBillNoField)
+ $("#HBillNo").attr("readonly", "readonly");
+ HInterID = $('#HInterID').val()
+ HBillNo = $('#HBillNo').val()
+ element.tabChange('tab-Kf_EntrustOutBillCheck', '2');
+
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ else {
+ }
+ layer.closeAll("loading");
+ }
+ });
+ }
+ //#endregion
+
+ //鐩戝惉鎻愪氦
+ form.verify({
+ numberOrEmpty: function (value, item) {
+ if (!/^\d+$/.test(value)) {
+ return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+ }
+ }
+ });
+
+ function playSound() {
+ var audio = document.getElementById("cs");
+ if (audio == null)
+ $("body").append('<audio id="cs" hidden controls> <source src = "../../video/jingbao.wav" type = "audio/ogg"> </audio >');
+ var audio = document.getElementById("cs");
+ audio.play();
+ }
+ function playSound1() {
+ var audio = document.getElementById("cs2");
+ audio.play();
+ }
+
+ //#endregion
+
+
+ //#region 鎵弿鍗曟嵁鍙锋潯鐮�
+ $('#HBillNo').on('keydown', function (event) {
+ HBillNo = $('#HBillNo').val()
+ if (event.keyCode == 13) {
+ $.ajax({
+ url: GetWEBURL() + "/WEBSController/get_BillBarCode_BillCheck_Json",
+ type: "GET",
+ data: { "HBillNo": HBillNo, "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID},
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HWHID").val(result.data.hWhIDField);
+ $("#HWHNAME").val(result.data.hWhNameField);
+ $("#HStockPlaceID").val(result.data.hSPIDField);
+ $("#HStockPlaceName").val(result.data.hSPNameField);
+
+ if (result.data.hSPFlagField == "false") {
+ $("#HStockPlaceName").attr("readonly", "readonly");
+ $("#HSpID-BT").attr("disabled", "disabled");
+ //document.getElementById("HSpID-BT").disabled = false;
+ }
+ else {
+ $("#HStockPlaceName").removeAttr("readonly");
+ $("#HSpID-BT").removeAttr("disabled", "disabled");
+ }
+
+ $('#HInterID').val(result.data.hInterIDField)
+ $('#HBillNo').val(result.data.hBillNoField)
+ $("#HBillNo").attr("readonly", "readonly");
+ HInterID = $('#HInterID').val()
+ element.tabChange('tab-Kf_EntrustOutBillCheck', '2');
+
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ else {
+ layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ layer.closeAll("loading");
+ }
+ });
+ }
+ });
+ //#endregion
+
+
+ //#region 鎵弿鐗╂枡鏉＄爜
+
+ //鎵爜鍥炶溅鏂规硶
+ $('#HBarCode').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ GetMeesageByBarCode();
+ }
+ });
+ //纭畾鎸夐挳
+ form.on('submit(QueDin)', function (data) {
+ GetMeesageByBarCode();
+ });
+
+ //鎵潯鐮�
+ function GetMeesageByBarCode(obj) {
+ var sSubStr = table.cache['wl-table'];
+ var sBarCode = $('#HBarCode').val()
+ var sQty = $("#HQty").val()
+ if (sQty == "") {
+ sQty = 0;
+ }
+ var sHWHID = $("#HWHID").val()
+ var sHSPID = $("#HStockPlaceID").val()
+ //鍒ゆ柇鏉＄爜鏄惁涓虹┖ new
+ if (sBarCode == '') {
+ playSound();
+ layer.msg("鏉＄爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (sBarCode != "") {
+ $('#HBarCode').val("");
+ }
+ if (sQty != "") {
+ $('#HQty').val("");
+ }
+ $.ajax({
+ url: GetWEBURL() + "/WEBSController/get_CheckTypeByBarCode_BillCheck_Json",
+ type: "GET",
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HStockOrgID": HStockOrgID },
+ success: function (result) {
+ if (result.count == 1) {
+ if (result.data.HBarType == '浠撳簱鏉＄爜') {
+ $("#HWHNAME").val(result.data.HWhName);
+ $("#HWHID").val(result.data.HWhID);
+ $("#HStockPlaceName").val("");
+ $("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
+ element.tabChange('tab-Kf_EntrustOutBillCheck', '2'); //璺宠浆椤电
+ }
+ else if (result.data.HBarType == '浠撲綅鏉＄爜') {
+ $("#HStockPlaceName").val(result.data.HSPName);
+ $("#HStockPlaceID").val(result.data.HSPID);
+ $("#HWHNAME").val(result.data.HWhName);
+ $("#HWHID").val(result.data.HWhID);
+ $("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
+ element.tabChange('tab-Kf_EntrustOutBillCheck', '2');//璺宠浆椤电
+ }
+ else {
+ element.tabChange('tab-Kf_EntrustOutBillCheck', '2');
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ layer.load(3)
+ }
+ else {
+ layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ layer.closeAll("loading");
+ }
+ });
+ }
+
+ //#endregion
+
+
+ //#region 鏄剧ず鐗╂枡鍒楄〃淇℃伅
+ function DisBillEntryList() {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_Temp_BillCheck_Json',
+ type: "GET",
+ data: { "HInterID": HInterID, "HBillType": HBillType, "sWhere": '' },
+ success: function (data1) {
+ var col = [];
+ if (data1.count == 1) {
+ var data = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍒ゆ柇鏄惁鏄函鑻辨枃
+ var patrn = new RegExp("[\u4E00-\u9FA5]+");
+ col.push({ type: 'radio' });
+ for (var i = 0; i < data.length; i++) {
+ if (!patrn.test(data[i].name)) {
+ col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ case 'DateTime':
+ col.push({ field: data[i].name, 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: 200 });
+ break;
+ default:
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true });
+ }
+ }
+ }
+ option.cols = [col];
+ option.data = data1.data;
+ table.render(option);
+ layer.close(ajaxLoad);
+
+ ////鍚堣姹囨��
+ //var count = 0;
+ //var count1 = 0;
+ //for (var i = 0; i < data1.data.list.length; i++) {
+ // count += data1.data.list[i].HQty;
+ // count1 += data1.data.list[i].HPieceQty;
+ //}
+ //$("#HSumQtys").val(count);
+ //$("#HBarCodeQtys").val(count1);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+
+ //#region 鍩虹璧勬枡閫夋嫨
+
+ //#region 浠撳簱璁剧疆
+
+ form.on('submit(HWHID-BT)', function () {//閫夋嫨浠撳簱
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '浠撳簱鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + HStockOrgID + '', 'yes']
+ , resize: false
+ , cancel: function () {
+ }
+ })
+ });
+
+ //#endregion
+
+ //#region 浠撲綅璁剧疆
+
+ form.on('submit(HSpID-BT)', function () {//閫夋嫨浠撲綅
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '浠撲綅鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', 'yes']
+ , resize: false
+ , cancel: function () {
+ }
+ })
+ });
+
+ //#endregion
+
+ //#endregion
+
+
+ //#region 鍔熻兘鎺т欢
+
+ //#region 涓婁紶鍔熻兘鎺т欢
+
+ //#region 鎻愪氦涓婁紶鍗曟嵁
+ form.on('submit(cmdSaver)', function (data) {
+ //鐏板害鎻愪氦鎸夐挳cmdSaver
+ document.getElementById("Saver").disabled = true;
+ data.field.HSTOCKORGID = HStockOrgID;//缁勭粐
+ var sMainStr = JSON.stringify(data.field);
+ var sMain = sMainStr;
+ var sSubStr = table.cache['wl-table'];
+ layer.load(3);
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/WEBSController/set_SaveEntrustOutBill_BillCheck_Json",
+ async: true,
+ data: { "oMain": sMain },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.confirm("濮斿棰嗘枡鍗曟楠屾垚鍔燂紒" + data.Message, {
+ icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
+ btn2: function () {
+ parent.location.href = "../../../views/index.html"
+ }//鍏抽棴
+ }, function () {
+ linterid = 0;
+ window.location.reload();
+ });//鏂板
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ //鐏板害鎻愪氦鎸夐挳cmdSaver
+ document.getElementById("Saver").disabled = false;
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ //鐏板害鎻愪氦鎸夐挳cmdSaver
+ document.getElementById("cmdSaver").disabled = false;
+ }
+ });
+ });
+ //#endregion
+
+ //#endregion
+
+ //#region 缂栬緫鍔熻兘鎺т欢
+ form.on('submit(cmdModify)', function () {//缂栬緫
+ var sSubStr = table.cache['wl-table'];
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏄庣粏鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
+ , resize: false
+ , cancel: function () {
+ }
+ })
+ });
+ //#endregion
+
+ //#region 鍒犻櫎鍔熻兘鎺т欢
+ form.on('submit(cmdDelete)', function () {//鍒犻櫎
+ var checkStatus = table.checkStatus('wl-table')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗灏嗕笉鍙仮澶嶏紒", { title: "鍒犻櫎纭" }, function (index) {
+ var sMaterID = data[0].HMaterID
+ var sAuxPropID = data[0].HAuxPropID
+ var sMTONo = ''
+ var sSourceInterID = data[0].HSourceInterID
+ var sSourceEntryID = data[0].HSourceEntryID
+ $.ajax(
+ {
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json",
+ async: true,
+ data: { "HInterID": HInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "HBillType": HBillType },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ else {
+ layer.msg(data.Message, { icon: 2 });
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, {
+ icon: 5,
+ time: 20000
+ }, function () {
+ });
+ }
+ });
+ layer.close(index)
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�');
+ }
+ });
+ //#endregion
+
+ //#region 閫�鍑哄姛鑳芥帶浠�
+ form.on('submit(cmdCancel)', function () {
+ sessionStorage["SourceFlag"] = false;
+ parent.location.href = "../../../views/index.html"
+ })
+ //#endregion
+
+ //#endregion
+
+ });
+ //浠ヤ笂涓� Layui妯″潡
+
+ function GetHWHValue(obj) //杩斿洖浠撳簱
+ {
+ $("#HWHNAME").val(obj[0].HName);
+ $("#HWHID").val(obj[0].HItemID);
+ }
+ function GetHSpValue(obj) { //杩斿洖浠撲綅
+ $("#HStockPlaceName").val(obj[0].HName);
+ $("#HStockPlaceID").val(obj[0].HItemID);
+ }
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\350\241\245\346\226\231/Kf_EntrustReplenishOutBill_CheckList_New.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\350\241\245\346\226\231/Kf_EntrustReplenishOutBill_CheckList_New.html"
new file mode 100644
index 0000000..a3b77b9
--- /dev/null
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\350\241\245\346\226\231/Kf_EntrustReplenishOutBill_CheckList_New.html"
@@ -0,0 +1,402 @@
+锘�<!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">
+ <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>
+</head>
+<body>
+ <div class="layui-fluid">
+ <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-tab" lay-filter="tab-Kf_EntrustReplenishOutBill_CheckList">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1">缂撳瓨鍒楄〃</li>
+ <li lay-id="2">宸蹭笂浼犳煡璇�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo" value="" >
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">婧愬崟鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HSourceBillNo" id="HSourceBillNo" value="" >
+ </div>
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdQuery">鏌ヨ</button>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <table class="layui-hide" id="Uploaded-table" lay-filter="Uploaded-table"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="margin-bottom: 20px;">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRefresh">鍒锋柊</button>
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRescind">鎾ら攢</button>
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdAdd">鏂板</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
+ //娓呯┖鐣岄潰 new
+ var HBillType = '1255'
+ var HMaker = sessionStorage["HUserName"]
+ var HStockOrgID = sessionStorage["OrganizationID"]
+ var option = [];
+ var Uploadedoption = [];
+
+ set_ClearBill();
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ element.tabChange('tab-Kf_EntrustReplenishOutBill_CheckList', '1');
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //璇诲彇鍗曟嵁鍒楄〃
+ DisBillEntryList();
+ }
+
+ //#region 鍒濆鍖栬〃鏍兼柟娉�
+ function set_InitGrid() {
+ option = {
+ elem: '#dj-table'
+ , height: 'full-50'
+ //, page: true
+ , cellMinWidth: 90
+ , limit: 50
+ //, limits: [50, 500, 5000, 20000]
+ };
+ Uploadedoption = {
+ elem: '#Uploaded-table'
+ , height: 'full-50'
+ //, page: true
+ , cellMinWidth: 90
+ , limit: 50
+ //, limits: [50, 500, 5000, 20000]
+ };
+ }
+
+ //#region 缂撳瓨鍒楄〃鐣岄潰 鎺т欢浜嬩欢
+
+ //#region 缂栬緫鍔熻兘鎺т欢
+ form.on('submit(cmdModify)', function () {
+ var checkStatus = table.checkStatus('dj-table')
+ , data = checkStatus.data;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '濮斿琛ユ枡鏍￠獙'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../棰嗘枡鍙戣揣/濮斿琛ユ枡/Kf_EntrustReplenishOutBill_Check_New.html?linterid=' + data[0].HInterID + '& lBillNo=' + data[0].HBillNo, 'yes']
+ , resize: false
+ , cancel: function () {
+ $(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+ //#endregion
+
+ //#region 鍒犻櫎鍔熻兘鎺т欢
+ form.on('submit(cmdDelete)', function () {//鍒犻櫎
+ var checkStatus = table.checkStatus('dj-table')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ //閫昏緫鍒犻櫎鏂规硶
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗灏嗕笉鍙仮澶嶏紒", { title: "鍒犻櫎纭" }, function (index) {
+ var sInterID = data[0].HInterID;
+ $.ajax(
+ {
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/DeleteBillList_Json",
+ async: true,
+ data: { "HInterID": sInterID },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�,
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼鎴愬姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ }
+ else {
+ layer.msg(data.Message, { icon: 2 });
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, {
+ icon: 5,
+ time: 20000
+ }, function () {
+ });
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�');
+ }
+ });
+ //#endregion
+
+ //#region 鍒锋柊鍔熻兘鎺т欢
+ form.on('submit(cmdRefresh)', function () {//鍒锋柊
+ DisBillEntryList();
+ });
+
+ function DisBillEntryList() {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_TempList_BillCheck_Json',
+ type: "GET",
+ data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+ success: function (data1) {
+ var col = [];
+ if (data1.count == 1) {
+ var data = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍒ゆ柇鏄惁鏄函鑻辨枃
+ var patrn = new RegExp("[\u4E00-\u9FA5]+");
+ col.push({ type: 'radio' });
+ for (var i = 0; i < data.length; i++) {
+ if (!patrn.test(data[i].name)) {
+ col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ case 'DateTime':
+ col.push({ field: data[i].name, 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: 200 });
+ break;
+ default:
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true });
+ }
+ }
+ }
+ option.cols = [col];
+ option.data = data1.data;
+ 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
+
+ //#region 閫�鍑哄姛鑳芥帶浠�
+ form.on('submit(cmdCancel)', function () {
+ parent.location.href = "../../../views/index.html"
+ })
+ //#endregion
+
+ //#region 鏂板鍔熻兘鎺т欢
+ form.on('submit(cmdAdd)', function () {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '濮斿琛ユ枡鏍￠獙'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../棰嗘枡鍙戣揣/濮斿琛ユ枡/Kf_EntrustReplenishOutBill_Check_New.html?linterid=0', 'yes']
+ , resize: false
+ , cancel: function () {
+ $(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //#endregion
+
+ //#endregion
+
+
+ //#region 宸蹭笂浼犳煡璇㈢晫闈� 鎺т欢浜嬩欢
+
+ //#region 鏌ヨ鍔熻兘鎺т欢
+ form.on('submit(cmdQuery)', function () {
+ DisUploadedList();
+ });
+
+ function DisUploadedList() {
+ var HBillNo = $("#HBillNo").val();
+ var HSourceBillNo = $("#HSourceBillNo").val();
+ if (HBillNo == '' && HSourceBillNo == '') {
+ layer.msg("鍗曟嵁鍙蜂笌婧愬崟鍙蜂笉鑳藉悓鏃朵负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_Json',
+ type: "GET",
+ data: { "HBillType": HBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
+ success: function (data1) {
+ var col = [];
+ if (data1.count == 1) {
+ var data = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍒ゆ柇鏄惁鏄函鑻辨枃
+ var patrn = new RegExp("[\u4E00-\u9FA5]+");
+ col.push({ type: 'radio' });
+ for (var i = 0; i < data.length; i++) {
+ if (!patrn.test(data[i].name)) {
+ col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ case 'DateTime':
+ col.push({ field: data[i].name, 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: 200 });
+ break;
+ default:
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true });
+ }
+ }
+ }
+ Uploadedoption.cols = [col];
+ Uploadedoption.data = data1.data;
+ table.render(Uploadedoption);
+ 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
+
+ //#region 鎾ゆ秷鍔熻兘鎺т欢
+
+ //鎾ら攢鍔熻兘
+ form.on('submit(cmdRescind)', function () {
+ var checkStatus = table.checkStatus('Uploaded-table');
+ var data = "";
+ if (checkStatus.data.length != 0) {
+ data = checkStatus.data;
+ } else {
+ return layer.msg("璇烽�夋嫨涓�琛岃褰曪紝杩涜鎾ら攢锛�");
+ }
+ var sInterID = data[0].HInterID
+ var sBillNo = data[0].HBillNo
+ $.ajax(
+ {
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/DeleteICStockBillAndWMS_Json",
+ async: true,
+ data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ }
+ else {
+ layer.msg(data.Message, { icon: 2 });
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, {
+ icon: 5,
+ time: 20000
+ }, function () {
+ //do something
+ });
+ }
+ });
+ });
+ //#endregion
+
+ //#region 閫�鍑哄姛鑳芥帶浠�
+
+ //#endregion
+
+ //#endregion
+
+ });
+
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\350\241\245\346\226\231/Kf_EntrustReplenishOutBill_Check_New.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\350\241\245\346\226\231/Kf_EntrustReplenishOutBill_Check_New.html"
new file mode 100644
index 0000000..491ce83
--- /dev/null
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\350\241\245\346\226\231/Kf_EntrustReplenishOutBill_Check_New.html"
@@ -0,0 +1,639 @@
+锘�<!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">
+ <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>
+ <style>
+ .layui-col-xs4 {
+ width: 12.333333%
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <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 style="background-color:#0085E8;">
+ <span style="color: white;"><i class="layui-icon layui-icon-form"></i>濮斿琛ユ枡鏍￠獙</span>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs4">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉＄爜</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs4">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab" lay-filter="tab-Kf_EntrustReplenishOutBillCheck">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1">琛ㄥご淇℃伅</li>
+ <li lay-id="2">鐗╂枡淇℃伅</li>
+ <li lay-id="3">鍚堣淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--琛ㄥご淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撳簱</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHID-BT">...</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT">...</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:45px;padding-left:0px;">鍗曟嵁鍙�</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" value="" autocomplete="off" class="layui-input mobile">
+ </div>
+ <div class="layui-col-xs3">
+ <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" value="0" disabled="disabled" autocomplete="off" class="layui-input mobile">
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--鐗╂枡淇℃伅-->
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+ </div>
+ <!--鍚堣淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鏉＄爜鏁�</label>
+ </div>
+ <div class="layui-col-xs8 layui-input-inline mobile">
+ <input type="text" name="HBarcodeQtys" id="HBarcodeQtys" lay-verify="HBarcodeQtys" value="0" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鎬绘暟閲�</label>
+ </div>
+ <div class="layui-col-xs8 layui-input-inline mobile">
+ <input type="text" name="HSumQtys" id="HSumQtys" lay-verify="HSumQtys" value="0" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="margin-bottom: 20px;">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdSaver" id="Saver">鎻愪氦</button>
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
+ var HBillType = '1255'
+ var HMaker = sessionStorage["HUserName"]
+ var HStockOrgID = sessionStorage["OrganizationID"]
+ var HInterID = $('#HInterID').val()
+ var HBillNo = $('#HBillNo').val()
+ var option = [];
+
+ set_ClearBill();
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ element.tabChange('tab-Kf_EntrustReplenishOutBillCheck', '1');
+ var pFocus = $("#HBillNo");
+ pFocus.focus(); //鑾峰彇鍏夋爣
+ pFocus.select();
+
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ }
+
+ //#region 鍒濆鍖栬〃鏍兼柟娉�
+ function set_InitGrid() {
+ option = {
+ elem: '#wl-table'
+ , height: 'full-50'
+ //, page: true
+ , cellMinWidth: 90
+ , limit: 50
+ //, limits: [50, 500, 5000, 20000]
+ };
+ }
+ //#endregion
+
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ var params = getUrlVars();
+ var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ var lBillNo = params[params[1]]; //浠庡崟鎹幏鍙� 婧愬崟鍙�
+
+ //鍒ゆ柇鏄惁鏂板
+ if (linterid == null || linterid == 0) {
+ $("#HInterID").val("0");
+ $("#HBillNo").val("");
+ }
+ //浠庣紦瀛樺垪琛ㄧ紪杈戝姛鑳借烦杞嚦鍗曟嵁妯″潡
+ else {
+ RoadBillMain(linterid);
+ }
+
+ //#region 浠庣紦瀛樺垪琛ㄧ紪杈戝姛鑳借烦杞嚦鍗曟嵁妯″潡锛岃幏鍙栧崟鎹俊鎭�
+ function RoadBillMain(linterid) {
+ $.ajax({
+ url: GetWEBURL() + "/WEBSController/GetSourceBillList_BillCheck_Json",
+ type: "GET",
+ data: { "HBillNo": lBillNo, "HBillType": HBillType },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+ $("#HWHID").val(result.data.hWhIDField);
+ $("#HWHNAME").val(result.data.hWhNameField);
+ $("#HStockPlaceName").val(result.data.hSPNameField);
+ $("#HStockPlaceID").val(result.data.hSPIDField);
+
+ if (result.data.hSPFlagField == "false") {
+ $("#HStockPlaceName").attr("readonly", "readonly");
+ $("#HSpID-BT").attr("disabled", "disabled");
+ //document.getElementById("HSpID-BT").disabled = false;
+ }
+ else {
+ $("#HStockPlaceName").removeAttr("readonly");
+ $("#HSpID-BT").removeAttr("disabled", "disabled");
+ }
+
+ $('#HInterID').val(result.data.hInterIDField)
+ $('#HBillNo').val(result.data.hBillNoField)
+ $("#HBillNo").attr("readonly", "readonly");
+ HInterID = $('#HInterID').val()
+ HBillNo = $('#HBillNo').val()
+ element.tabChange('tab-Kf_EntrustReplenishOutBillCheck', '2');
+
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ else {
+ }
+ layer.closeAll("loading");
+ }
+ });
+ }
+ //#endregion
+
+ //鐩戝惉鎻愪氦
+ form.verify({
+ numberOrEmpty: function (value, item) {
+ if (!/^\d+$/.test(value)) {
+ return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+ }
+ }
+ });
+
+ function playSound() {
+ var audio = document.getElementById("cs");
+ if (audio == null)
+ $("body").append('<audio id="cs" hidden controls> <source src = "../../video/jingbao.wav" type = "audio/ogg"> </audio >');
+ var audio = document.getElementById("cs");
+ audio.play();
+ }
+ function playSound1() {
+ var audio = document.getElementById("cs2");
+ audio.play();
+ }
+
+ //#endregion
+
+
+ //#region 鎵弿鍗曟嵁鍙锋潯鐮�
+ $('#HBillNo').on('keydown', function (event) {
+ HBillNo = $('#HBillNo').val()
+ if (event.keyCode == 13) {
+ $.ajax({
+ url: GetWEBURL() + "/WEBSController/get_BillBarCode_BillCheck_Json",
+ type: "GET",
+ data: { "HBillNo": HBillNo, "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID},
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HWHID").val(result.data.hWhIDField);
+ $("#HWHNAME").val(result.data.hWhNameField);
+ $("#HStockPlaceID").val(result.data.hSPIDField);
+ $("#HStockPlaceName").val(result.data.hSPNameField);
+
+ if (result.data.hSPFlagField == "false") {
+ $("#HStockPlaceName").attr("readonly", "readonly");
+ $("#HSpID-BT").attr("disabled", "disabled");
+ //document.getElementById("HSpID-BT").disabled = false;
+ }
+ else {
+ $("#HStockPlaceName").removeAttr("readonly");
+ $("#HSpID-BT").removeAttr("disabled", "disabled");
+ }
+
+ $('#HInterID').val(result.data.hInterIDField)
+ $('#HBillNo').val(result.data.hBillNoField)
+ $("#HBillNo").attr("readonly", "readonly");
+ HInterID = $('#HInterID').val()
+ element.tabChange('tab-Kf_EntrustReplenishOutBillCheck', '2');
+
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ else {
+ layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ layer.closeAll("loading");
+ }
+ });
+ }
+ });
+ //#endregion
+
+
+ //#region 鎵弿鐗╂枡鏉＄爜
+
+ //鎵爜鍥炶溅鏂规硶
+ $('#HBarCode').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ GetMeesageByBarCode();
+ }
+ });
+ //纭畾鎸夐挳
+ form.on('submit(QueDin)', function (data) {
+ GetMeesageByBarCode();
+ });
+
+ //鎵潯鐮�
+ function GetMeesageByBarCode(obj) {
+ var sSubStr = table.cache['wl-table'];
+ var sBarCode = $('#HBarCode').val()
+ var sQty = $("#HQty").val()
+ if (sQty == "") {
+ sQty = 0;
+ }
+ var sHWHID = $("#HWHID").val()
+ var sHSPID = $("#HStockPlaceID").val()
+ //鍒ゆ柇鏉＄爜鏄惁涓虹┖ new
+ if (sBarCode == '') {
+ playSound();
+ layer.msg("鏉＄爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (sBarCode != "") {
+ $('#HBarCode').val("");
+ }
+ if (sQty != "") {
+ $('#HQty').val("");
+ }
+ $.ajax({
+ url: GetWEBURL() + "/WEBSController/get_CheckTypeByBarCode_BillCheck_Json",
+ type: "GET",
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HStockOrgID": HStockOrgID },
+ success: function (result) {
+ if (result.count == 1) {
+ if (result.data.HBarType == '浠撳簱鏉＄爜') {
+ $("#HWHNAME").val(result.data.HWhName);
+ $("#HWHID").val(result.data.HWhID);
+ $("#HStockPlaceName").val("");
+ $("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
+ element.tabChange('tab-Kf_EntrustReplenishOutBillCheck', '2'); //璺宠浆椤电
+ }
+ else if (result.data.HBarType == '浠撲綅鏉＄爜') {
+ $("#HStockPlaceName").val(result.data.HSPName);
+ $("#HStockPlaceID").val(result.data.HSPID);
+ $("#HWHNAME").val(result.data.HWhName);
+ $("#HWHID").val(result.data.HWhID);
+ $("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
+ element.tabChange('tab-Kf_EntrustReplenishOutBillCheck', '2');//璺宠浆椤电
+ }
+ else {
+ element.tabChange('tab-Kf_EntrustReplenishOutBillCheck', '2');
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ layer.load(3)
+ }
+ else {
+ layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ layer.closeAll("loading");
+ }
+ });
+ }
+
+ //#endregion
+
+
+ //#region 鏄剧ず鐗╂枡鍒楄〃淇℃伅
+ function DisBillEntryList() {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_Temp_BillCheck_Json',
+ type: "GET",
+ data: { "HInterID": HInterID, "HBillType": HBillType, "sWhere": '' },
+ success: function (data1) {
+ var col = [];
+ if (data1.count == 1) {
+ var data = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍒ゆ柇鏄惁鏄函鑻辨枃
+ var patrn = new RegExp("[\u4E00-\u9FA5]+");
+ col.push({ type: 'radio' });
+ for (var i = 0; i < data.length; i++) {
+ if (!patrn.test(data[i].name)) {
+ col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ case 'DateTime':
+ col.push({ field: data[i].name, 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: 200 });
+ break;
+ default:
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true });
+ }
+ }
+ }
+ option.cols = [col];
+ option.data = data1.data;
+ table.render(option);
+ layer.close(ajaxLoad);
+
+ ////鍚堣姹囨��
+ //var count = 0;
+ //var count1 = 0;
+ //for (var i = 0; i < data1.data.list.length; i++) {
+ // count += data1.data.list[i].HQty;
+ // count1 += data1.data.list[i].HPieceQty;
+ //}
+ //$("#HSumQtys").val(count);
+ //$("#HBarCodeQtys").val(count1);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+
+ //#region 鍩虹璧勬枡閫夋嫨
+
+ //#region 浠撳簱璁剧疆
+
+ form.on('submit(HWHID-BT)', function () {//閫夋嫨浠撳簱
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '浠撳簱鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + HStockOrgID + '', 'yes']
+ , resize: false
+ , cancel: function () {
+ }
+ })
+ });
+
+ //#endregion
+
+ //#region 浠撲綅璁剧疆
+
+ form.on('submit(HSpID-BT)', function () {//閫夋嫨浠撲綅
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '浠撲綅鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', 'yes']
+ , resize: false
+ , cancel: function () {
+ }
+ })
+ });
+
+ //#endregion
+
+ //#endregion
+
+
+ //#region 鍔熻兘鎺т欢
+
+ //#region 涓婁紶鍔熻兘鎺т欢
+
+ //#region 鎻愪氦涓婁紶鍗曟嵁
+ form.on('submit(cmdSaver)', function (data) {
+ //鐏板害鎻愪氦鎸夐挳cmdSaver
+ document.getElementById("Saver").disabled = true;
+ data.field.HSTOCKORGID = HStockOrgID;//缁勭粐
+ var sMainStr = JSON.stringify(data.field);
+ var sMain = sMainStr;
+ var sSubStr = table.cache['wl-table'];
+ layer.load(3);
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/WEBSController/set_SaveEntrustReplenishOutBill_BillCheck_Json",
+ async: true,
+ data: { "oMain": sMain },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.confirm("濮斿琛ユ枡鍗曟楠屾垚鍔燂紒" + data.Message, {
+ icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
+ btn2: function () {
+ parent.location.href = "../../../views/index.html"
+ }//鍏抽棴
+ }, function () {
+ linterid = 0;
+ window.location.reload();
+ });//鏂板
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ //鐏板害鎻愪氦鎸夐挳cmdSaver
+ document.getElementById("Saver").disabled = false;
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ //鐏板害鎻愪氦鎸夐挳cmdSaver
+ document.getElementById("cmdSaver").disabled = false;
+ }
+ });
+ });
+ //#endregion
+
+ //#endregion
+
+ //#region 缂栬緫鍔熻兘鎺т欢
+ form.on('submit(cmdModify)', function () {//缂栬緫
+ var sSubStr = table.cache['wl-table'];
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏄庣粏鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
+ , resize: false
+ , cancel: function () {
+ }
+ })
+ });
+ //#endregion
+
+ //#region 鍒犻櫎鍔熻兘鎺т欢
+ form.on('submit(cmdDelete)', function () {//鍒犻櫎
+ var checkStatus = table.checkStatus('wl-table')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗灏嗕笉鍙仮澶嶏紒", { title: "鍒犻櫎纭" }, function (index) {
+ var sMaterID = data[0].HMaterID
+ var sAuxPropID = data[0].HAuxPropID
+ var sMTONo = ''
+ var sSourceInterID = data[0].HSourceInterID
+ var sSourceEntryID = data[0].HSourceEntryID
+ $.ajax(
+ {
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json",
+ async: true,
+ data: { "HInterID": HInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "HBillType": HBillType },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ else {
+ layer.msg(data.Message, { icon: 2 });
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, {
+ icon: 5,
+ time: 20000
+ }, function () {
+ });
+ }
+ });
+ layer.close(index)
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�');
+ }
+ });
+ //#endregion
+
+ //#region 閫�鍑哄姛鑳芥帶浠�
+ form.on('submit(cmdCancel)', function () {
+ sessionStorage["SourceFlag"] = false;
+ parent.location.href = "../../../views/index.html"
+ })
+ //#endregion
+
+ //#endregion
+
+ });
+ //浠ヤ笂涓� Layui妯″潡
+
+ function GetHWHValue(obj) //杩斿洖浠撳簱
+ {
+ $("#HWHNAME").val(obj[0].HName);
+ $("#HWHID").val(obj[0].HItemID);
+ }
+ function GetHSpValue(obj) { //杩斿洖浠撲綅
+ $("#HStockPlaceName").val(obj[0].HName);
+ $("#HStockPlaceID").val(obj[0].HItemID);
+ }
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html"
index ada87b8..47c4176 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html"
@@ -195,32 +195,37 @@
return;
}
var index = layer.load();
- $.ajax({
- url: GetWEBURL() + "/POStockInBillList/Get_ReciveBillByBarcode",
- type: "GET",
- data: { "HBarCode": HBarCode, "HInterID": HInterID },
- success: function (result) {
- if (result.code == "1") {
- var sSubStr = table.cache['mainTable'];
- for (var i = 0; i < sSubStr.length; i++) {
- if (sSubStr[i].HSourceEntryID == result.data[0]["HSourceEntryID"]) {
- sSubStr[i].HSQty += parseInt(result.data[0]["HQty"]);
- table.render(option);
- break;
- }
- }
- layer.close(index);
- }
- else {
- layer.close(index);
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- },
- error: function (err) {
- layer.close(index);
- layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- });
+ var sSubStr = table.cache['mainTable'];
+ if (sSubStr[i].HMaterID == HBarCode.split("#")[0]) {
+ sSubStr[i].HSQty += parseInt(HBarCode.split("#")[1]);
+ table.render(option);
+ break;
+ }
+ layer.close(index);
+ //$.ajax({
+ // url: GetWEBURL() + "/POStockInBillList/Get_ReciveBillByBarcode",
+ // type: "GET",
+ // data: { "HBarCode": HBarCode, "HInterID": HInterID },
+ // success: function (result) {
+ // if (result.code == "1") {
+ // var sSubStr = table.cache['mainTable'];
+ // if (sSubStr[i].HMaterID == HBarCode.split("#")[0]) {
+ // sSubStr[i].HSQty += parseInt(HBarCode.split("#")[1]);
+ // table.render(option);
+ // break;
+ // }
+ // layer.close(index);
+ // }
+ // else {
+ // layer.close(index);
+ // layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // }
+ // },
+ // error: function (err) {
+ // layer.close(index);
+ // layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // }
+ //});
$('#HBarCode').val("");
$("#HBarCode").focus();
}
@@ -278,8 +283,8 @@
, { field: 'HModel', title: '瑙勬牸鍨嬪彿' }
, { field: 'HInterID', title: '涓诲唴鐮�', sort: true, width: 200 }
, { field: 'HEntryID', title: '瀛愬唴鐮�', sort: true, width: 200 }
- , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', sort: true, width: 200 }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', sort: true, width: 200 }
+ //, { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', sort: true, width: 200 }
+ //, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', sort: true, width: 200 }
];
option = {
id: 'mainTable'
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast_AR.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast_AR.html"
new file mode 100644
index 0000000..a1d21d6
--- /dev/null
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast_AR.html"
@@ -0,0 +1,444 @@
+锘�<!DOCTYPE html>
+<html>
+<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">
+ <!--寮曠敤layui鏍峰紡鏂囦欢-->
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <!--寮曠敤layui js鏂囦欢-->
+ <script src="../../../layuiadmin/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>
+ <!--鑷畾涔夋牱寮�-->
+ <style>
+ .maintitle {
+ background-color: #1492ff;
+ color: #fff;
+ padding: 5px 10px;
+ border: none;
+ border-radius: 4px;
+ }
+
+ .title {
+ border-left: 4px solid #1492ff;
+ padding-left: 6px;
+ margin: 20px 10px 4px;
+ font-size: 16px;
+ color: #333;
+ }
+
+ .buttom_box_little {
+ width: 60px;
+ height: 36px;
+ color: #fff;
+ background-color: #1492ff;
+ border-radius: 4px;
+ border: none;
+ margin: 10px;
+ }
+
+ .layui-input {
+ width: 50%;
+ }
+
+ .layui-inline, img {
+ display: block;
+ vertical-align: middle
+ }
+
+ .layui-input, .layui-textarea {
+ display: inline-block;
+ width: 50%;
+ padding-left: 10px;
+ }
+
+ .laydate-time-list ol {
+ overflow-x: hidden !important;
+ overflow-y: auto !important;
+ }
+
+ .layui-form-label {
+ padding: 9px 5px;
+ width: 85px;
+ }
+
+ .layui-input-block {
+ margin-left: 85px;
+ min-height: 36px;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 15px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
+ <div class="maintitle">鍒拌揣纭</div>
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鏉＄爜</label>
+ <div class="layui-input-block" style="margin-left: 100px;width:46%;">
+ <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input"><!--lay-verify="required"-->
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin" name="QueDin" id="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+ <ul class="layui-tab-title">
+ <!--<li class="layui-this">琛ㄥご淇℃伅</li>
+ <li>鏄庣粏淇℃伅</li>-->
+ <li lay-id="1" style="padding:1px;" class="layui-this">琛ㄥご淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鏄庣粏淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">鍗曟嵁鍙�:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">纭畾</button>
+ <input type="hidden" class="layui-input" name="HInterID" id="HInterID" style="width:100px">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">渚涘簲鍟�:</label>
+ <div class="layui-input-block">
+ <input type="text" name="HSupName" id="HSupName" class="layui-input" disabled="disabled">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">閮ㄩ棬:</label>
+ <div class="layui-input-block">
+ <input type="text" name="HDeptName" id="HDeptName" class="layui-input" disabled="disabled">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-tab-item">
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="xuhao">
+ {{d.LAY_TABLE_INDEX+1}}
+ </script>
+ <script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ </div>
+ </div>
+ </div>
+
+ <div class="layer-footer" style="text-align: center;">
+ <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="btn_Check" id="btn_Check">瀹℃牳</button>
+ <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="btn_Cancel" id="btn_Cancel">閫�鍑�</button>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+ var option = [];
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
+
+
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+
+
+ var params = getUrlVars();
+ var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+
+
+ //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
+
+
+
+
+
+
+
+ //鍒ゆ柇鏄惁鏂板
+ if (linterid == null || linterid == 0) {
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ $("#HInterID").val("");
+ $("#HBillNo").val("");
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
+ type: "GET",
+ data: { "HBillType": '1103' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ }
+ });
+ }
+ else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+
+ }
+
+
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ });
+
+ //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
+ $("#HBarCode").focus();
+
+ //鏉″舰鐮佸洖杞︽柟娉�
+ $('#HBarCode').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ GetMeesageByBarCode();
+ }
+ });
+ //鏉″舰鐮佺‘璁�
+ form.on('submit(QueDin)', function (data) {
+ GetMeesageByBarCode();
+ });
+ //鎵弿鏉″舰鐮佹柟娉�
+ function GetMeesageByBarCode() {
+ var HBarCode = $('#HBarCode').val();
+ if (!HBarCode) {
+ layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+ return;
+ }
+ //var HInterID = $('#HInterID').val();
+ //if (!HInterID) {
+ // layer.msg("璇峰厛杈撳叆鏀舵枡閫氱煡鍗曞崟鎹彿锛�")
+ // return;
+ //}
+ var HInterID = $('#HInterID').val();
+ var HBillNo = $('#HBillNo').val();
+
+
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/POStockInBillList/Get_ReciveBillByBarcode_AR",
+ type: "GET",
+ data: { "HBarCode": HBarCode, "HOrgID": sessionStorage["OrganizationID"], HInterID: HInterID, HBillNo: HBillNo },
+ success: function (result) {
+ if (result.code == "1") {
+
+ element.tabChange('TabTest', '2'); //璺宠浆椤电
+ //var sSubStr =;
+ option.data = result.data;
+ table.render(option);
+ //for (var i = 0; i < sSubStr.length; i++) {
+ // //if (sSubStr[i].HEntryID == result.data[0]["HSourceEntryID"]) {
+ // // sSubStr[i].HSQty += parseInt(result.data[0]["HQty"]);
+
+ // // break;
+ // //}
+ //}
+ layer.close(index);
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ $('#HBarCode').val("");
+ $("#HBarCode").focus();
+ }
+ form.on('submit(btn_Cancel)', function () {
+ parent.location.href = "../../../views/index.html"
+ })
+ //瀹℃牳
+ form.on('submit(btn_Check)', function (data) {//瀹℃牳
+ var sSubStr = table.cache['mainTable'];
+ for (var i = 0; i < sSubStr.length; i++) {
+ if (parseInt(sSubStr[i].HSQty) > parseInt(sSubStr[i].HQty)) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鎵爜鏁伴噺涓嶈兘瓒呭嚭璁㈠崟鏁伴噺!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (parseInt(sSubStr[i].HSQty) == 0) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鎵爜鏁伴噺涓�0", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ }
+
+ var index = layer.load();
+ var HInterID = $('#HInterID').val();
+ var HBillNo = $('#HBillNo').val();
+ $.ajax({
+ url: GetWEBURL() + "/POStockInBillList/AuditPOInStockBillPost_AR",
+ type: "Post",
+ data: { "msg": JSON.stringify(sSubStr) },
+ success: function (result) {
+ if (result.code == "1") {
+ //layer.msg("瀹℃牳鎴愬姛", { icon: 1, btn: ['纭'], time: 1000000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.close(index);
+ layer.confirm("瀹℃牳鎴愬姛" + data.Message + $("#HBillNo").val(), {
+ icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
+ btn2: function () {
+ //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
+ //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
+ parent.location.href = "../../../views/index.html"
+ }//鍏抽棴
+ }, function () { window.location.reload(); });//鏂板
+
+ }
+ else {
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.close(index);
+ }
+ },
+ error: function (err) {
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.close(index);
+ }
+ });
+ });
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ //琛ㄥご
+ columns = [
+ //{ templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left' }
+ //, { field: 'HSQty', title: '鏁伴噺', edit: 'text', totalRow: true }
+ //, { field: 'HQty', title: '璁㈠崟鏁伴噺' }
+ //, { field: 'HMaterID', title: 'HMaterID' }
+ //, { field: 'HMaterNum', title: '鐗╂枡浠ｇ爜' }
+ //, { field: 'HMaterName', title: '鐗╂枡鍚嶇О' }
+ //, { field: 'HModel', title: '瑙勬牸鍨嬪彿' }
+ //, { field: 'HInterID', title: '涓诲唴鐮�', sort: true, width: 200 }
+ //, { field: 'HEntryID', title: '瀛愬唴鐮�', sort: true, width: 200 }
+ //, { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150 }
+ , { field: 'HQty', title: '鏁伴噺', edit: 'text', totalRow: true }
+ , { field: 'HQtyMust', title: '璁㈠崟鏁伴噺' }
+ , { field: 'HMaterID', title: 'HMaterID', sort: true, width: 200 }
+ , { field: 'HNumber', title: '鐗╂枡浠ｇ爜' }
+ , { field: 'HName', title: '鐗╂枡鍚嶇О' }
+ , { field: 'HModel', title: '瑙勬牸鍨嬪彿' }
+ , { field: 'HSourceBillNo', title: '璁㈠崟鍗曞彿', width: 150 }
+ , { field: 'HInterID', title: '涓诲唴鐮�', sort: true, width: 200 }
+ , { field: 'HEntryID', title: '瀛愬唴鐮�', sort: true, width: 200 }
+ , { field: 'HBillNo', title: '鏀舵枡閫氱煡鍗曞彿', sort: true, width: 200 }
+
+ ];
+ option = {
+ id: 'mainTable'
+ , elem: '#mainTable'
+ , page: true
+ , cellMinWidth: 120
+ , height: 500
+ , cols: [columns]
+ , done: function (res, curr, count) {
+ }
+ };
+ //option.data = [{ "鏁伴噺": 0, "鐗╂枡浠ｇ爜": 0, "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "" }];
+ table.render(option);
+ }
+ // 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var index = layer.load();
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ //obj.del();
+ layer.close(index);
+ var oldData = table.cache["mainTable"];
+ oldData.splice(obj.tr.data('index'), 1);
+ table.reload('mainTable', { data: oldData });
+ layer.close(index);
+ }
+ });
+ }
+ }
+ //婧愬崟鍥炶溅鏂规硶
+ $('#HBillNo').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ GetMeesageBySourceBillNo();
+ }
+ });
+ //婧愬崟纭
+ form.on('submit(QueDin2)', function (data) {
+ GetMeesageBySourceBillNo();
+ });
+ //鎵簮鍗�
+ function GetMeesageBySourceBillNo(obj) { //杩斿洖宸ヤ綔涓績
+ var HBarCode = $('#HBillNo').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+ if (!HBarCode) {
+ layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌猴紒")
+ return;
+ }
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/POStockInBillList/Get_ReciveBill",
+ type: "GET",
+ data: { "HBillno": HBarCode },
+ success: function (result) {
+ if (result.code == "1") {
+ var data = result.data[0];
+ $("#HSupName").val(data.HSupName);
+ $("#HDeptName").val(data.HDeptName);
+ $("#HBillNo").val(data.HBillNo);
+ $("#HInterID").val(data.HInterID);
+ option.data = result.data;
+ table.render(option);
+ layer.close(index);
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ //浠ヤ笂涓簂ayui妯″潡
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
index 3e7c6bf..9f86600 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
@@ -79,9 +79,9 @@
</div>
<div class="layui-col-xs8">
<select name="HBillType" id="HBillType">
+ <option value="3714">宸ュ簭姹囨姤鍗�</option>
<option value="3711">鐢熶骇姹囨姤鍗�</option>
<option value="3710">鐢熶骇璁㈠崟</option>
- <option value="3714">宸ュ簭姹囨姤鍗�</option>
</select>
</div>
</div>
@@ -363,7 +363,7 @@
, { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ //, { field: 'HBatchNo', title: '鎵规', width: 150 }
, { field: 'HInterID', title: '鍗曟嵁ID', width: 150, hide: true }
, { field: 'HBilltype', title: '鍗曟嵁绫诲瀷', width: 150, hide: true }
, { field: 'Hbarcode', title: '鏉＄爜缂栧彿', width: 150, hide: true }
@@ -455,7 +455,7 @@
, { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ //, { field: 'HBatchNo', title: '鎵规', width: 150 }
]]
// , data: [linterid]
// , page: true
@@ -511,6 +511,8 @@
//鑾峰彇鏈�澶у崟鎹彿 new
$("#HInterID").val("");
$("#HBillNo").val("");
+ $("#HBillType").val("3714");
+ form.render('select');
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
@@ -738,7 +740,7 @@
, { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ //, { field: 'HBatchNo', title: '鎵规', width: 150 }
, { field: 'HBarcodeQtys', title: '鏉＄爜鏁伴噺', width: 150 }
]]
// , data: [linterid]
@@ -923,7 +925,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = table.cache['wl-table'];
//var sSourceType = $("#HBillType").val();
- var sSourceType = "3711";
+ var sSourceType = "3714";
if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
{
layer.load(3);
@@ -1129,7 +1131,7 @@
, { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ //, { field: 'HBatchNo', title: '鎵规', width: 150 }
, { field: 'HBarcodeQtys', title: '鏉＄爜鏁伴噺', width: 150 }
]]
// , data: [linterid]
@@ -1245,7 +1247,7 @@
$("#HDeptName").val(result.data.hDeptNameField);
}
$("#HSourceBillNo").val(result.data.hSourceBillNoField);
- $("#HBillType").val(result.data.hSourceBillTypeField)
+ $("#HBillType").val(result.data.hSourceBillTypeField == null ? "3714" : result.data.hSourceBillTypeField);
HSourceFlag = true;
//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
if (result.data.hSourceBillTypeField == "3711") {
@@ -1378,7 +1380,7 @@
, { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ //, { field: 'HBatchNo', title: '鎵规', width: 150 }
, { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150 }
]]
, height: 500
@@ -1398,7 +1400,7 @@
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
- , { field: 'HBatchNo', title: '鎵瑰彿', width: 150 }
+ //, { field: 'HBatchNo', title: '鎵瑰彿', width: 150 }
//, { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
//, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
index 3d6954c..1052ef0 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
@@ -1070,15 +1070,15 @@
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
listOption.data = result.data.list;
table.render(listOption);
- $("#HBarCode_B").val(result.data.list2[0].HBarCode);
- $("#HMaterName_B").val(result.data.list2[0].HMaterName);
- $("#HMaterModel_B").val(result.data.list2[0].HMaterModel);
- $("#HBatchNo_B").val(result.data.list2[0].HBatchNo);
- $("#HUnitName_B").val(result.data.list2[0].HUnitName);
- $("#HQty_B").val(result.data.list2[0].HQty);
- $("#HTMQty_B").val(result.data.list2[0].HTMQty);
- $("#HWHName_B").val(result.data.list2[0].HWHName);
- $("#HSPName_B").val(result.data.list2[0].HSPName);
+ //$("#HBarCode_B").val(result.data.list2[0].HBarCode);
+ //$("#HMaterName_B").val(result.data.list2[0].HMaterName);
+ //$("#HMaterModel_B").val(result.data.list2[0].HMaterModel);
+ //$("#HBatchNo_B").val(result.data.list2[0].HBatchNo);
+ //$("#HUnitName_B").val(result.data.list2[0].HUnitName);
+ //$("#HQty_B").val(result.data.list2[0].HQty);
+ //$("#HTMQty_B").val(result.data.list2[0].HTMQty);
+ //$("#HWHName_B").val(result.data.list2[0].HWHName);
+ //$("#HSPName_B").val(result.data.list2[0].HSPName);
var count = 0;
var count1 = 0;
@@ -1120,7 +1120,7 @@
, { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ //, { field: 'HBatchNo', title: '鎵规', width: 150 }
, { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150 }
]]
, height: 500
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_FastList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_FastList.html"
index dfe4c64..e134266 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_FastList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_FastList.html"
@@ -271,7 +271,7 @@
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
// 寰楀埌frame绱㈠紩
var index = layer.getFrameIndex(window.name);
//鍏抽棴褰撳墠frame
--
Gitblit v1.9.1