From a4bce725e22e5c521ad229f70678f7248e2c8b98 Mon Sep 17 00:00:00 2001
From: WYB <908761037@qq.com>
Date: 星期三, 31 三月 2021 17:47:49 +0800
Subject: [PATCH] 计划单下推页面绑定完成
---
WebTM/views/Baseset/基础资料/Gy_MaterialList.html | 103 ++++++++++
WebTM/views/生产工序管理/工序派工单/Sc_Add_ProcessSendWork.html | 325 ++++++++++++++++++++++++--------
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user | 18 +
WebTM/views/生产工序管理/工序计划单/Sc_ProcessPlanList.html | 20 +
WebTM/views/Baseset/基础资料/Gy_UnitList.html | 103 ++++++++++
WebTM/WebTM.csproj | 2
6 files changed, 475 insertions(+), 96 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
index d886bcf..b49e6ae 100644
--- a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
@@ -17,10 +17,10 @@
<publishTime>03/23/2021 16:57:43</publishTime>
</File>
<File Include="bin/WebTM.dll">
- <publishTime>03/29/2021 20:23:17</publishTime>
+ <publishTime>03/31/2021 16:14:35</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>03/29/2021 20:23:17</publishTime>
+ <publishTime>03/31/2021 16:14:35</publishTime>
</File>
<File Include="layuiadmin/config.js">
<publishTime>03/23/2021 16:57:43</publishTime>
@@ -718,11 +718,17 @@
<File Include="views/Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html">
<publishTime>03/23/2021 16:57:43</publishTime>
</File>
+ <File Include="views/Baseset/鍩虹璧勬枡/Gy_MaterialList.html">
+ <publishTime>03/31/2021 16:14:26</publishTime>
+ </File>
<File Include="views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html">
<publishTime>03/23/2021 16:57:43</publishTime>
</File>
<File Include="views/Baseset/鍩虹璧勬枡/Gy_SupplierList.html">
<publishTime>03/23/2021 16:57:43</publishTime>
+ </File>
+ <File Include="views/Baseset/鍩虹璧勬枡/Gy_UnitList.html">
+ <publishTime>03/31/2021 16:31:20</publishTime>
</File>
<File Include="views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html">
<publishTime>03/23/2021 16:57:43</publishTime>
@@ -1067,7 +1073,7 @@
<publishTime>03/29/2021 20:16:17</publishTime>
</File>
<File Include="views/浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html">
- <publishTime>03/29/2021 20:16:17</publishTime>
+ <publishTime>03/30/2021 17:38:16</publishTime>
</File>
<File Include="views/浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockBill_FastList.html">
<publishTime>03/29/2021 20:16:17</publishTime>
@@ -1124,7 +1130,7 @@
<publishTime>03/29/2021 19:54:57</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭娲惧伐鍗�/Sc_Add_ProcessSendWork.html">
- <publishTime>03/29/2021 19:54:05</publishTime>
+ <publishTime>03/31/2021 17:46:45</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
<publishTime>03/23/2021 16:57:43</publishTime>
@@ -1148,7 +1154,7 @@
<publishTime>03/29/2021 19:53:52</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭璁″垝鍗�/Sc_ProcessPlanList.html">
- <publishTime>03/29/2021 21:42:36</publishTime>
+ <publishTime>03/31/2021 17:19:09</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
<publishTime>03/23/2021 16:57:43</publishTime>
@@ -1181,7 +1187,7 @@
<publishTime>03/29/2021 20:16:17</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA.html">
- <publishTime>03/23/2021 17:01:31</publishTime>
+ <publishTime>03/30/2021 17:48:56</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html">
<publishTime>03/23/2021 16:57:43</publishTime>
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 91eb355..e332272 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -304,6 +304,8 @@
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_DepartmentList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_EmployeeList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_GetProductionResourcesList.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_MaterialList.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_UnitList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_WorkCenterList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_GetProductionTeamList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_StockPlaceList.html" />
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList.html"
new file mode 100644
index 0000000..4d5428a
--- /dev/null
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList.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="ck-table"></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['ck-table']);
+ RoadQuery($('#Value').val());
+ });
+ form.on('submit(FH)', function () {//閫夋嫨鐗╂枡
+ //var sMainStr = JSON.stringify(table.cache['ck-table']);
+ var checkStatus = table.checkStatus('ck-table')
+ , data = checkStatus.data;
+ parent.GetHMaterNameValue(data);
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+ RoadQuery($('#Value').val());
+ table.render({
+ elem: '#ck-table'
+ // , url: '/demo/table/user/'
+ , data: []
+ , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HItemID', width: 150, title: '鐗╂枡ID', hide: true }
+ , { field: 'HNumber', width: 150, title: '鐗╂枡浠ｇ爜' }
+ , { field: 'HName', width: 150, 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/GetMaterialList_Json",
+ async: true,
+ data: { "Material": Value },
+ //data: { "Value": Value },
+ success: function (result) {
+ ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+ table.reload('ck-table', {
+ 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_UnitList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitList.html"
new file mode 100644
index 0000000..417f51a
--- /dev/null
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitList.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="ck-table"></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['ck-table']);
+ RoadQuery($('#Value').val());
+ });
+ form.on('submit(FH)', function () {//閫夋嫨鍗曚綅
+ //var sMainStr = JSON.stringify(table.cache['ck-table']);
+ var checkStatus = table.checkStatus('ck-table')
+ , data = checkStatus.data;
+ parent.GetHUnitNameValue(data);
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+ RoadQuery($('#Value').val());
+ table.render({
+ elem: '#ck-table'
+ // , url: '/demo/table/user/'
+ , data: []
+ , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HItemID', width: 150, title: '鍗曚綅ID', hide: true }
+ , { field: 'HNumber', width: 150, title: '璁￠噺鍗曚綅浠ｇ爜' }
+ , { field: 'HName', width: 150, 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/GetUnitList_Json",
+ async: true,
+ data: { "Unit": Value },
+ //data: { "Value": Value },
+ success: function (result) {
+ ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+ table.reload('ck-table', {
+ 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/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/Sc_Add_ProcessSendWork.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/Sc_Add_ProcessSendWork.html"
index 63fc7d9..8615cb2 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/Sc_Add_ProcessSendWork.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/Sc_Add_ProcessSendWork.html"
@@ -58,7 +58,7 @@
<div class="layui-col-xs3">
<label class="layui-form-label">杞﹂棿浠ｇ爜锛�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HEmpName" id="HEmpName" readonly="readonly" autocomplete="off">
+ <input type="text" name="HDeptID" id="HDeptID" lay-verify="HDeptID" readonly="readonly" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -69,9 +69,20 @@
<div class="layui-col-xs3">
<label class="layui-form-label">杞﹂棿锛�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HStatus" id="HStatus" autocomplete="off">
+ <input type="text" name="HDeptName" id="HDeptName" lay-verify="HDeptName" autocomplete="off" class="layui-input">
+
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptID-BT">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+
+
</div>
</div>
+ <!--<div class="layui-col-xs1">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptID-BT">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>-->
<div class="layui-col-xs3">
<label class="layui-form-label"> 鍐呴儴鍗曟嵁鍙凤細</label>
<div class="layui-input-inline">
@@ -79,39 +90,46 @@
<input id="HSupID" name="HSupID" type="hidden" />
</div>
</div>
- <div class="layui-col-xs3">
+ <!--<div class="layui-col-xs3">
<label class="layui-form-label"> 浜у搧浠ｇ爜锛�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HDeptName" lay-verify="HDeptName" id="HDeptName" readonly="readonly" autocomplete="off">
- <input id="HDeptID" name="HDeptID" type="hidden" />
+ <input class="layui-input" name="HMateriaNumber" lay-verify="HMateriaNumber" id="HMateriaNumber" readonly="readonly" autocomplete="off">
+
</div>
</div>
<div class="layui-col-xs3">
<label class="layui-form-label"> 浜у搧锛�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HDHDate" lay-verify="HDHDate" id="HDHDate">
+ <input class="layui-input" name="HMateriaName" lay-verify="HMateriaName" id="HMateriaName" readonly="readonly" autocomplete="off">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HMateriaID-BT">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
- </div>
+ </div>-->
-
+
</div>
</div>
<div class="layui-form-item">
<div class="layui-row">
- <div class="layui-col-xs3">
+ <!--<div class="layui-col-xs3">
<label class="layui-form-label"> 鍗曚綅浠ｇ爜锛�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HDHDate" lay-verify="HDHDate" id="HDHDate">
+ <input class="layui-input" name="HDHNumber" lay-verify="HDHNumber" id="HDHNumber">
</div>
</div>
<div class="layui-col-xs3">
<label class="layui-form-label"> 鍗曚綅锛�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HDHDate" lay-verify="HDHDate" id="HDHDate">
+ <input class="layui-input" name="HDHName" lay-verify="HDHName" id="HDHName">
+
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HUnitID-BT">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
- </div>
+ </div>-->
<div class="layui-col-xs3">
<label class="layui-form-label"> 瑙勬牸鍨嬪彿锛�</label>
@@ -125,24 +143,24 @@
<div class="layui-form-item">
<div class="layui-row">
- <div class="layui-col-xs3">
+ <!--<div class="layui-col-xs3">
<label class="layui-form-label">宸ュ簭璁″垝鍗曞彿锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HStatus" id="HStatus" autocomplete="off">
</div>
- </div>
+ </div>-->
<div class="layui-col-xs3">
<label class="layui-form-label"> 璁″垝寮�宸ユ棩鏈燂細</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HSupName" lay-verify="HSupName" id="HSupName" readonly="readonly" autocomplete="off">
- <input id="HSupID" name="HSupID" type="hidden" />
+ <input class="layui-input" name="HPlanBeginDate" lay-verify="HPlanBeginDate" id="HPlanBeginDate" autocomplete="off">
+
</div>
</div>
<div class="layui-col-xs3">
<label class="layui-form-label"> 璁″垝瀹屽伐鏃ユ湡锛�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HDeptName" lay-verify="HDeptName" id="HDeptName" readonly="readonly" autocomplete="off">
- <input id="HDeptID" name="HDeptID" type="hidden" />
+ <input class="layui-input" name="HPlanEndDate" lay-verify="HPlanEndDate" id="HPlanEndDate" autocomplete="off">
+
</div>
</div>
@@ -255,8 +273,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script>
-
- function getUrlVars() {
+ 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++) {
@@ -268,15 +285,29 @@
}
var params = getUrlVars();
var HInterID = params[params[0]];
-
- $.ajax({
- url: GetWEBURL()+"/Sc_ProcessMangement/MES_Sc_ProcessSendWorkMain_Json",
+ var lentryid = params[params[1]];
+ var PlanBeginDate = params[params[2]];
+ var PlanEndDate = params[params[3]];
+ //alert(HInterID + '绗簩涓細' + lentryid);
+ var date = new Date();
+ var day = date.getDate();
+ var month = date.getMonth() + 1;
+ var year = date.getFullYear();
+ var shijian = year + "/" + month + "/" + day;
+ //鑾峰彇鍗曟嵁鍙�
+ $.ajax({
+ url: GetWEBURL() + "/api/newBill/getNewInterBillNo",
type: "GET",
- data: {"sWhere": "and HInterID="+HInterID },
+ data: { "billType": '3712' },
success: function (d) {
//console.log(d.data);
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HDate").val(d.data[0].HDate);
+ $("#HBillNo").val(d.data.HBillNo);//
+ $("#HDate").val(shijian);
+ $('#HPlanBeginDate').val(shijian);
+ //HPlanEndDate
+ $('#HPlanEndDate').val(shijian);
+ }, error: function () {
+ layer.alert("鑾峰彇鍗曟嵁鍙峰け璐�!", { icon: 5 });
}
});
@@ -295,64 +326,121 @@
, laydate = layui.laydate
- //
+ //鎵ц涓�涓猯aydate瀹炰緥
+ laydate.render({
+ elem: '#HPlanBeginDate,#HPlanEndDate' //鎸囧畾鍏冪礌
+ });
+
+
+ //鍔犺浇璁″垝鍗曚笅鎺ㄧ殑鏁版嵁
RoadHBillSub();
table.render({
elem: '#mainTable'
- //, url: GetWEBURL()+'GetNewPOInStockShowBillSub'
- , toolbar: '#toolbarDemo'
- //, where: { sMsg: linterid, sMsg2: lentryid, sMsg3: lSourceBillType }
- // , where: { sMsg: '28', sMsg2: '28,5;' }
- , cols: [[
- { type: 'checkbox', fixed: 'left' }
- , { field: 'HInterID', title: 'HInterID', sort: true, fixed: true, hide: true }
- ,{ field: 'HDate', title: '鏃ユ湡', sort: true, width: 120 }
- , { field: 'HBillNo', title: '鍗曟嵁鍙�', sort: true, width: 170 }
+ //, url: GetWEBURL()+'GetNewPOInStockShowBillSub'
+ , toolbar: '#toolbarDemo'
+ //, where: { sMsg: linterid, sMsg2: lentryid, sMsg3: lSourceBillType }
+ // , where: { sMsg: '28', sMsg2: '28,5;' }
+ , cols: [[
+ { type: 'checkbox' }
+ //{ field: 'hmainid', title: 'hmainid', sort: true, width: 165 }
+ , { field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
//, { field: 'HBillStatus ', title: '鍗曟嵁鐘舵��', width: 105 }
- , { field: 'HICMOBillNo', title: '浠诲姟鍗曞彿' }
+ , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺', width: 100, edit: 'text', event: "inputHPlanQty" }
+ , { field: 'HMaterID', title: 'HMaterID' }
////, { field: 'hunitid', title: 'hunitid' }
- , { field: 'HMaterID ', title: '浜у搧ID ', width: 115 }
- , { field: 'HMaterNumber', title: '浜у搧浠ｇ爜' }
+ , { field: '鐗╂枡浠ｇ爜 ', title: '鐗╂枡浠ｇ爜 ', width: 115 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
////, { field: 'hempid', title: 'hempid' }
- , { field: 'HUnitID', title: '鍗曚綅ID', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
, { field: 'HUnitNumber', title: '鍗曚綅浠ｇ爜' }
- , { field: 'HPlanQty', title: '璁″垝鏁伴噺',width:100,edit: 'text', event: "inputHPlanQty" }
- , { field: 'HPlanBeginDate', title: '璁″垝寮�宸ユ棩鏈�' }
- , { field: 'HPlanEndDate', title: '璁″垝瀹屽伐鏃ユ湡' }
+ , { field: '鍗曚綅', title: '鍗曚綅' }
+ , { field: 'hunitid', title: 'hunitid' }
+ , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜' }
////, { field: 'HCenterID', title: 'HCenterID' }
- , { field: 'HExplanation', title: '鎽樿' }
- , { field: 'HRemark ', title: '澶囨敞' }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅' }
+ , { field: '鐢熶骇鏁伴噺 ', title: '鐢熶骇鏁伴噺' }
////, { field: 'hbomid', title: 'hbomid' }
- , { field: 'HInnerBillNo', title: '鍐呴儴鍗曟嵁鍙�' }
- , { field: 'HSupID', title: '濮斿鍔犲伐鍗曚綅' }
- , { field: 'HMarker', title: '妫�楠屼汉' }
- , { field: 'HBacker', title: '閫�鍥炰汉' }
- , { field: 'HBackDate', title: '閫�鍥炴棩鏈�' }
- , { field: 'HChecker', title: '瀹℃牳浜�' }
- , { field: 'HCheckDate', title: '瀹℃牳鏃ユ湡' }
- , { field: 'HMaker', title: '鍒跺崟浜�' }
- , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡' }
- , { field: 'HUpDater', title: '淇敼浜�' }
- , { field: 'HUpDateDate', title: '淇敼鏃ユ湡' }
- , { field: 'HCloseMan', title: '鍏抽棴浜�' }
- , { field: 'HCloseDate', title: '鍏抽棴鏃ユ湡' }
- , { field: 'HCloseType', title: '鍏抽棴绫诲瀷' }
+ , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�' }
+ , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡' }
+ , { field: '鎽樿', title: '鎽樿' }
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
+ , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�' }
+ , { field: 'hicmointerid', title: 'hicmointerid' }
+ , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿' }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
+ , { field: '淇敼浜�', title: '淇敼浜�' }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
+ , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
////, { field: 'hsubid', title: 'hsubid' }
- , { field: 'HDeleteMan', title: '浣滃簾浜�' }
- , { field: 'HDeleteDate', title: '浣滃簾鏃ユ湡' }
- ]]
- // , data: [linterid]
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
+ , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷' }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
+ , { field: 'hsubid', title: 'hsubid', fixed: true, hide: true }
+ , { field: '宸ュ簭璁″垝鍗曞彿', title: '宸ュ簭璁″垝鍗曞彿' }
+ , { field: '宸ュ簭鍙�', title: '宸ュ簭鍙�' }
+ , { field: 'hprocid', title: 'hprocid' }
+ , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜' }
+ , { field: '宸ュ簭', title: '宸ュ簭' }
+ , { field: '鍔犲伐璇存槑', title: '鍔犲伐璇存槑' }
+ , { field: '寮�宸ュ浐澶�', title: '寮�宸ュ浐澶�' }
+ , { field: '寮�宸ュ浐鏁�', title: '寮�宸ュ浐鏁�' }
+ , { field: 'HCenterID', title: 'HCenterID' }
+ , { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜' }
+ , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
+ , { field: 'HDeptID', title: 'HDeptID' }
+ , { field: '鍔犲伐杞﹂棿浠ｇ爜', title: '鍔犲伐杞﹂棿浠ｇ爜' }
+ , { field: '鍔犲伐杞﹂棿', title: '鍔犲伐杞﹂棿' }
+ , { field: 'HGroupID', title: 'HGroupID' }
+ , { field: '鐝粍浠ｇ爜', title: '鐝粍浠ｇ爜' }
+ , { field: '鐝粍鍚嶇О', title: '鐝粍鍚嶇О' }
+ , { field: 'HWorkerID', title: 'HWorkerID' }
+ , { field: '鎿嶄綔鍛樹唬鐮�', title: '鎿嶄綔鍛樹唬鐮�' }
+ , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�' }
+ , { field: 'HSourceID', title: 'HSourceID' }
+ , { field: '璧勬簮浠ｇ爜', title: '璧勬簮浠ｇ爜' }
+ , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮' }
+ , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺' }
+ , { field: '鏃堕棿鍗曚綅', title: '鏃堕棿鍗曚綅' }
+ , { field: '璁″垝鍔犲伐鏃堕棿', title: '璁″垝鍔犲伐鏃堕棿' }
+ , { field: '宸ュ簭璁″垝寮�宸ユ棩鏈�', title: '宸ュ簭璁″垝寮�宸ユ棩鏈�' }
+ , { field: '宸ュ簭璁″垝瀹屽伐鏃ユ湡', title: '宸ュ簭璁″垝瀹屽伐鏃ユ湡' }
+ , { field: '鍑嗗鏃堕棿', title: '鍑嗗鏃堕棿' }
+ , { field: '鎺掗槦鏃堕棿', title: '鎺掗槦鏃堕棿' }
+ , { field: '杞Щ鏃堕棿', title: '杞Щ鏃堕棿' }
+ , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
+ , { field: '鎵规', title: '鎵规' }
+ , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�' }
+ , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�' }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿' }
+ , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷' }
+ , { field: '閿�鍞鍗曚富ID', title: '閿�鍞鍗曚富ID' }
+ , { field: '閿�鍞鍗曞瓙ID', title: '閿�鍞鍗曞瓙ID' }
+ , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿' }
+ , { field: 'HBillType', title: 'HBillType' }
+ , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
+ , { field: 'HBillSubType', title: 'HBillSubType' }
+ , { field: 'HQtyDecimal', title: 'HQtyDecimal' }
+ , { field: 'HPriceDecimal', title: 'HPriceDecimal' }
+
+ ]]
+ // , data: [linterid]
// , page: true
- , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
- //, height: 500
- , done: function () {
- layer.closeAll("loading");
- }
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ //, height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
});
table.on('tool(mainTable)', function (obj) {
var data = obj.data;
- if (obj.event==='inputHPlanQty') {
- $(obj.tr).find(".layui-table-edit").keyup(function () {
+ if (obj.event === 'inputHPlanQty') {
+ $(obj.tr).find(".layui-table-edit").keyup(function () {
var $input = $(this), val = $input.val();
if (!val) val = "1";
$input.val(val.replace(/[^\d]/g, ''));
@@ -360,15 +448,15 @@
}
});
- ///鍔犺浇鏄剧ず鏁版嵁
+ ///鍔犺浇鏄剧ず鏁版嵁
function RoadHBillSub() {
- $.ajax({
- url: GetWEBURL()+'/Sc_ProcessMangement/MES_Sc_ProcessPlanMain_Json',
- type: "GET",
- data: { "sWhere": "and HInterID="+HInterID},
- success: function (result) {
- console.log(result);
- //$("#HBillNo").val(result.data[0].HInterID);
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ProcessMangement/MES_Sc_ProcessPlanMain_Json',
+ type: "GET",
+ data: { "sWhere": "and hmainid in(" + lentryid + ")" },
+ success: function (result) {
+ console.log(result);
+ //$("#HBillNo").val(result.data[0].HInterID);
ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
table.reload('mainTable', {
@@ -379,18 +467,18 @@
layer.closeAll("loading");
}
});
-
- },
- error: function (result) {
+
+ },
+ error: function (result) {
console.log(result);
}
- });
+ });
};
// form.on('submit(Saver)', function (data) {//淇濆瓨
// //debugger;
// var sMainStr = JSON.stringify(data.field);
// var sSubStr = JSON.stringify(table.cache['mainTable']);
- // var sMainSub = sMainStr + ';' + sSubStr;
+ // var sMainSub = sMainStr + ';' + sSubStr;
// $.ajax(
// {
// type: "POST",
@@ -414,14 +502,81 @@
//});
- form.on('submit(Exit)', function (data) {//淇濆瓨
+ form.on('submit(Exit)', function (data) {//淇濆瓨
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
-
+
+ //閫夋嫨閮ㄩ棬
+ form.on('submit(HDeptID-BT)', function () {//閫夋嫨閮ㄩ棬
+ layer.open({
+ type: 2
+ , area: ['666px', '666px']
+ , title: '閮ㄩ棬鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //閫夋嫨浜у搧
+ form.on('submit(HMateriaID-BT)', function () {//閫夋嫨浜у搧
+ layer.open({
+ type: 2
+ , area: ['666px', '666px']
+ , title: '浜у搧鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+ //HUnitID-BT
+ //閫夋嫨鍗曚綅
+ form.on('submit(HUnitID-BT)', function () {//閫夋嫨鍗曚綅
+ layer.open({
+ type: 2
+ , area: ['666px', '666px']
+ , title: '鍗曚綅鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
});
+ function GetHDeptNameValue(obj) { //杩斿洖閮ㄩ棬
+ $("#HDeptName").val(obj[0].HName);
+ $("#HDeptID").val(obj[0].HNumber);
+
+ }
+
+ function GetHMaterNameValue(obj) { //杩斿洖浜у搧
+ $("#HMateriaName").val(obj[0].HName);
+ $("#HMateriaNumber").val(obj[0].HNumber);
+
+ }
+
+ function GetHUnitNameValue(obj) { //杩斿洖鍗曚綅
+ $("#HDHName").val(obj[0].HName);
+ $("#HDHNumber").val(obj[0].HNumber);
+
+ }
</script>
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanList.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanList.html"
index ad39f19..a086c9d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanList.html"
@@ -112,8 +112,8 @@
, cols: [[
{ type: 'checkbox' }
//{ field: 'hmainid', title: 'hmainid', sort: true, width: 165 }
- , { field: 'hmainid', title: 'hmainid', sort: true, fixed: true }
- ,{ field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 100 }
+ , { field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
+ ,{ field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120 }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
//, { field: 'HBillStatus ', title: '鍗曟嵁鐘舵��', width: 105 }
, { field: 'HMaterID', title: 'HMaterID' }
@@ -149,7 +149,7 @@
, { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷' }
, { field: '浣滃簾浜�', title: '浣滃簾浜�' }
, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
- , { field: 'hsubid', title: 'hsubid' , fixed: true}
+ , { field: 'hsubid', title: 'hsubid' , fixed: true, hide: true}
, { field: '宸ュ簭璁″垝鍗曞彿', title: '宸ュ簭璁″垝鍗曞彿' }
, { field: '宸ュ簭鍙�', title: '宸ュ簭鍙�' }
, { field: 'hprocid', title: 'hprocid' }
@@ -234,6 +234,11 @@
ajaxLabelData = data;
var rows = '';
var HEntry = '';
+ for (var i = 0; i < data.length; i++) {
+ rows += data[i].hmainid.toString() + ',' ;
+
+ }
+
if (checkStatus.data.length < 1)
{
layer.msg('璇烽�夋嫨涓�琛屾暟鎹笅鎺�');
@@ -248,7 +253,7 @@
,shade: 0.6 //閬僵閫忔槑搴�
,maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../宸ュ簭娲惧伐鍗�/Sc_Add_ProcessSendWork.html?HInterID=' + data[0].HInterID.toString(),'yes']
+ , content: ['../宸ュ簭娲惧伐鍗�/Sc_Add_ProcessSendWork.html?HInterID=' + data[0].hmainid.toString() + '&lentryid=' + rows.toString().substring(0, rows.length - 1), '&PlanBeginDate=' + data[0].璁″垝寮�宸ユ棩鏈�.toString(), '&PlanEndDate=' + data[0].璁″垝瀹屽伐鏃ユ湡.toString(), 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -259,7 +264,12 @@
}
break;
case 'add':
- layer.msg('娣诲姞');
+ var date = new Date();
+ var day = date.getDate();
+ var month = date.getMonth() + 1;
+ var year = date.getFullYear();
+ var shijian = year + "/" + month + "/" + day;
+ layer.msg(shijian);
break;
case '':
layer.msg('');
--
Gitblit v1.9.1