From c0249f1eca0b1546e8d4be374e9c6e316a80e43a Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期五, 25 六月 2021 09:44:39 +0800
Subject: [PATCH] LAYUI版PDA：增加 模治具 点检记录单新增保存模块
---
WebTM/views/Baseset/基础资料/Gy_CheckItemList.html | 103 ++++++++++++
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 18 +
WebTM/views/模治具管理/模治具点检保养/Sc_MouldDotCheckBill_PDA.html | 332 ++++++++++++++++++----------------------
WebTM/WebTM.csproj | 1
4 files changed, 266 insertions(+), 188 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index f228950..4833e83 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\LAYUI</_PublishTargetUrl>
- <History>True|2021-06-23T08:01:06.9752733Z;True|2021-06-23T15:40:48.0600942+08:00;True|2021-06-23T15:35:53.3971163+08:00;True|2021-06-23T15:25:06.7153552+08:00;True|2021-06-23T15:17:30.6635532+08:00;True|2021-06-23T15:14:29.9392004+08:00;True|2021-06-23T14:17:00.7593883+08:00;True|2021-06-23T14:15:36.2129408+08:00;True|2021-06-23T14:13:56.0674385+08:00;True|2021-06-23T14:12:39.1152380+08:00;True|2021-06-23T14:11:30.7305862+08:00;True|2021-06-23T14:09:32.9068156+08:00;True|2021-06-23T14:07:14.7921581+08:00;True|2021-06-23T14:04:58.6716794+08:00;True|2021-06-23T14:02:42.0128025+08:00;True|2021-06-23T13:55:52.9751544+08:00;True|2021-06-23T13:53:26.8169698+08:00;True|2021-06-22T16:31:58.5748348+08:00;True|2021-06-22T16:07:48.5148267+08:00;True|2021-06-22T16:04:36.2503739+08:00;True|2021-06-22T16:00:43.0264206+08:00;True|2021-06-22T15:55:42.9093385+08:00;True|2021-06-22T15:51:18.0421904+08:00;True|2021-06-22T15:35:01.7574201+08:00;True|2021-06-22T15:24:15.7962812+08:00;True|2021-06-22T14:56:52.6270438+08:00;True|2021-06-22T14:10:54.9406106+08:00;True|2021-06-22T14:08:15.2618916+08:00;True|2021-06-22T14:05:33.6975571+08:00;True|2021-06-22T13:55:28.6215051+08:00;True|2021-06-22T11:25:10.9245123+08:00;True|2021-06-22T08:50:34.2405585+08:00;True|2021-06-21T16:59:10.6036312+08:00;True|2021-06-21T16:50:55.4709721+08:00;True|2021-06-21T16:40:58.8244269+08:00;True|2021-06-21T16:31:18.9628094+08:00;True|2021-06-21T15:51:17.3693666+08:00;True|2021-06-21T13:24:17.0235835+08:00;True|2021-06-21T13:22:25.7262124+08:00;True|2021-06-21T10:47:52.4425428+08:00;True|2021-06-21T08:45:43.5963620+08:00;True|2021-06-21T08:45:04.0743894+08:00;True|2021-06-21T08:43:41.0159366+08:00;True|2021-06-19T15:09:31.9416629+08:00;True|2021-06-18T15:55:47.3043005+08:00;True|2021-06-18T15:54:51.9110069+08:00;True|2021-06-18T15:53:36.5475712+08:00;True|2021-06-18T15:46:27.7565979+08:00;True|2021-06-18T15:43:05.4125819+08:00;True|2021-06-18T15:37:01.5738408+08:00;</History>
+ <History>True|2021-06-24T12:55:10.3268425Z;True|2021-06-24T20:48:08.4756477+08:00;True|2021-06-24T19:38:49.1271300+08:00;True|2021-06-24T18:26:55.2282637+08:00;True|2021-06-24T18:09:33.9734139+08:00;True|2021-06-24T17:55:20.7100941+08:00;True|2021-06-24T17:45:25.1400729+08:00;True|2021-06-24T15:06:23.7684612+08:00;True|2021-06-23T16:01:06.9752733+08:00;True|2021-06-23T15:40:48.0600942+08:00;True|2021-06-23T15:35:53.3971163+08:00;True|2021-06-23T15:25:06.7153552+08:00;True|2021-06-23T15:17:30.6635532+08:00;True|2021-06-23T15:14:29.9392004+08:00;True|2021-06-23T14:17:00.7593883+08:00;True|2021-06-23T14:15:36.2129408+08:00;True|2021-06-23T14:13:56.0674385+08:00;True|2021-06-23T14:12:39.1152380+08:00;True|2021-06-23T14:11:30.7305862+08:00;True|2021-06-23T14:09:32.9068156+08:00;True|2021-06-23T14:07:14.7921581+08:00;True|2021-06-23T14:04:58.6716794+08:00;True|2021-06-23T14:02:42.0128025+08:00;True|2021-06-23T13:55:52.9751544+08:00;True|2021-06-23T13:53:26.8169698+08:00;True|2021-06-22T16:31:58.5748348+08:00;True|2021-06-22T16:07:48.5148267+08:00;True|2021-06-22T16:04:36.2503739+08:00;True|2021-06-22T16:00:43.0264206+08:00;True|2021-06-22T15:55:42.9093385+08:00;True|2021-06-22T15:51:18.0421904+08:00;True|2021-06-22T15:35:01.7574201+08:00;True|2021-06-22T15:24:15.7962812+08:00;True|2021-06-22T14:56:52.6270438+08:00;True|2021-06-22T14:10:54.9406106+08:00;True|2021-06-22T14:08:15.2618916+08:00;True|2021-06-22T14:05:33.6975571+08:00;True|2021-06-22T13:55:28.6215051+08:00;True|2021-06-22T11:25:10.9245123+08:00;True|2021-06-22T08:50:34.2405585+08:00;True|2021-06-21T16:59:10.6036312+08:00;True|2021-06-21T16:50:55.4709721+08:00;True|2021-06-21T16:40:58.8244269+08:00;True|2021-06-21T16:31:18.9628094+08:00;True|2021-06-21T15:51:17.3693666+08:00;True|2021-06-21T13:24:17.0235835+08:00;True|2021-06-21T13:22:25.7262124+08:00;True|2021-06-21T10:47:52.4425428+08:00;True|2021-06-21T08:45:43.5963620+08:00;True|2021-06-21T08:45:04.0743894+08:00;True|2021-06-21T08:43:41.0159366+08:00;True|2021-06-19T15:09:31.9416629+08:00;True|2021-06-18T15:55:47.3043005+08:00;True|2021-06-18T15:54:51.9110069+08:00;True|2021-06-18T15:53:36.5475712+08:00;True|2021-06-18T15:46:27.7565979+08:00;True|2021-06-18T15:43:05.4125819+08:00;True|2021-06-18T15:37:01.5738408+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="bin/layuiadmin/style/admin.css">
@@ -15,10 +15,10 @@
<publishTime>06/10/2021 11:10:38</publishTime>
</File>
<File Include="bin/WebTM.dll">
- <publishTime>06/23/2021 16:00:57</publishTime>
+ <publishTime>06/24/2021 20:55:01</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>06/23/2021 16:00:57</publishTime>
+ <publishTime>06/24/2021 20:55:01</publishTime>
</File>
<File Include="layuiadmin/config.js">
<publishTime>06/10/2021 11:10:38</publishTime>
@@ -740,6 +740,9 @@
<File Include="views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html">
<publishTime>06/10/2021 11:10:38</publishTime>
</File>
+ <File Include="views/Baseset/鍩虹璧勬枡/Gy_CheckItemList.html">
+ <publishTime>06/24/2021 17:55:01</publishTime>
+ </File>
<File Include="views/Baseset/鍩虹璧勬枡/Gy_ClassTimePrjGroupList.html">
<publishTime>06/10/2021 11:10:38</publishTime>
</File>
@@ -747,7 +750,7 @@
<publishTime>06/10/2021 11:10:38</publishTime>
</File>
<File Include="views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html">
- <publishTime>06/10/2021 11:10:38</publishTime>
+ <publishTime>06/24/2021 17:54:32</publishTime>
</File>
<File Include="views/Baseset/鍩虹璧勬枡/Gy_DormList.html">
<publishTime>06/10/2021 11:10:38</publishTime>
@@ -1032,7 +1035,7 @@
<publishTime>06/18/2021 14:44:17</publishTime>
</File>
<File Include="views/index_Mobile.html">
- <publishTime>06/10/2021 11:10:38</publishTime>
+ <publishTime>06/24/2021 09:37:04</publishTime>
</File>
<File Include="views/PublicPage/CheckItemType.html">
<publishTime>06/10/2021 11:10:38</publishTime>
@@ -1390,6 +1393,9 @@
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapOutBillList.html">
<publishTime>06/10/2021 11:10:39</publishTime>
+ </File>
+ <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风偣妫�淇濆吇/Sc_MouldDotCheckBill_PDA.html">
+ <publishTime>06/24/2021 20:54:50</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBillList.html">
<publishTime>06/10/2021 11:10:39</publishTime>
@@ -1902,7 +1908,7 @@
<publishTime>06/10/2021 11:10:39</publishTime>
</File>
<File Include="Web.config">
- <publishTime>06/23/2021 16:01:05</publishTime>
+ <publishTime>06/24/2021 20:55:07</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 32d73c6..9738059 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -77,6 +77,7 @@
<Content Include="layuiadmin\myicon\杞﹂棿绠＄悊.svg" />
<Content Include="layuiadmin\treeTable.js" />
<Content Include="views\Baseset\HBarPlanPrint.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_CheckItemList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ClassTimePrjGroupList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_DormList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_DutyList.html" />
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CheckItemList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CheckItemList.html"
new file mode 100644
index 0000000..c196bdd
--- /dev/null
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CheckItemList.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.GetHCheckNameValue(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/GetCheckItemList_Json",
+ async: true,
+ data: { "CheckItem": 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/\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\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldDotCheckBill_PDA.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\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldDotCheckBill_PDA.html"
index 102b47d..a81dec2 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\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldDotCheckBill_PDA.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\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldDotCheckBill_PDA.html"
@@ -55,9 +55,17 @@
width: 100%;
padding-left: 10px;
}
+
.laydate-time-list ol {
overflow-x: hidden !important;
overflow-y: auto !important;
+ }
+ .layui-form-label {
+ padding: 9px 5px;
+ }
+ .layui-input-block {
+ margin-left: 85px;
+ min-height: 36px;
}
</style>
</head>
@@ -66,12 +74,12 @@
<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" style="background-color:white;">
+ <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: 120px;width:46%;">
+ <div class="layui-input-block" style="margin-left: 100px;width:46%;">
<input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
</div>
</div>
@@ -86,42 +94,42 @@
<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;">
+ <label class="layui-form-label" style="width: 75px;">鐐规寮�濮�:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
<input type="datetime" class="layui-input" name="HBeginDate" id="HBeginDate" placeholder="璇烽�夋嫨鏃ユ湡">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐐规缁撴潫:</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <label class="layui-form-label" style="width: 75px;">鐐规缁撴潫:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
<input type="datetime" class="layui-input" name="HEndDate" id="HEndDate" placeholder="璇烽�夋嫨鏃ユ湡">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐐规瑕佹眰:</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <label class="layui-form-label" style="width: 75px;">鐐规瑕佹眰:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
<textarea name="HClaim" id="HClaim" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
</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;">
+ <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" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HInterID" id="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="datetime" class="layui-input" name="HDate" id="HDate" placeholder="璇烽�夋嫨鏃ユ湡">
+ <label class="layui-form-label" style="width: 75px;">鍗曟嵁鏃ユ湡:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="datetime" class="layui-input" name="HDate" id="HDate" placeholder="璇烽�夋嫨鏃ユ湡" readonly disabled>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">閮ㄩ棬:</label>
+ <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" style="width:70%;">
+ <input type="text" name="HDeptName" id="HDeptName" class="layui-input" style="width:80%;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input">
<button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Department" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -131,9 +139,9 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璐熻矗浜�:</label>
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">璐熻矗浜�:</label>
<div class="layui-input-block">
- <input type="text" name="HManagerName" id="HManagerName" class="layui-input" style="width:70%;">
+ <input type="text" name="HManagerName" id="HManagerName" class="layui-input" style="width:80%;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input">
<button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HManager" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -141,9 +149,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐐规椤圭洰:</label>
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">鐐规椤圭洰:</label>
<div class="layui-input-block">
- <input type="text" name="HDotCheckItem" id="HDotCheckItem" class="layui-input" style="width:70%;">
+ <input type="text" name="HDotCheckItem" id="HDotCheckItem" class="layui-input" style="width:80%;">
<input type="hidden" name="HDotCheckItemID" id="HDotCheckItemID" class="layui-input">
<button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HDotCheckItemList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -151,40 +159,32 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐐规閮ㄤ綅:</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <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="HDotCheckPart" id="HDotCheckPart" >
</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;">
+ <label class="layui-form-label" style="width: 75px;">妯℃不鍏峰悕绉�:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
<input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">妯℃不鍏疯鏍�:</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <label class="layui-form-label" style="width: 75px;">妯℃不鍏疯鏍�:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
<input type="text" name="HBarSpec" id="HBarSpec" class="layui-input" 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;">
+ <label class="layui-form-label" style="width: 75px;">妯℃不鍏峰瀷鍙�:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
<input type="text" name="HBarModel" id="HBarModel" class="layui-input" 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="HQty" id="HQty" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
-
</div>
</div>
</div>
@@ -192,55 +192,55 @@
<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;">
+ <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="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="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ <label class="layui-form-label" style="width: 75px;">鍒涘缓鏃ユ湡:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly disabled>
</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;">
+ <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="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly disabled>
</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="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+ <label class="layui-form-label" style="width: 75px;">淇敼鏃ユ湡:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly disabled>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�:</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <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="HChecker" id="HChecker" 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="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ <label class="layui-form-label" style="width: 75px;">瀹℃牳鏃ユ湡:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly disabled>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">浣滃簾浜�:</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <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="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="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+ <label class="layui-form-label" style="width: 75px;">浣滃簾鏃ユ湡:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly disabled>
</div>
</div>
</div>
@@ -251,9 +251,9 @@
<div class="layer-footer" style="text-align: center;">
- <button type="button" lay-submit="" class="buttom_box_little" lay-filter="Saver">鎻愪氦</button>
- <button type="button" lay-submit="" class="buttom_box_little" lay-filter="Add">鏂板</button>
- <button type="button" class="buttom_box_little" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+ <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Saver" id="Saver">鎻愪氦</button>
+ <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Add">鏂板</button>
+ <button type="button" class="layui-btn buttom_box_little" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
</div>
<!--闅愯棌瀛楁-->
<input type="hidden" name="lngBillKey" id="lngBillKey">
@@ -327,10 +327,11 @@
data: { "HBillType": '3821' },
success: function (d) {
//console.log(d.data);
- $("#HInterID").val(d.data[0].HInterID);
+ $("#HInterID").val("0");
$("#HBillNo").val(d.data[0].HBillNo);
}
});
+
//鏉″舰鐮佸洖杞︽柟娉�
$('#HBarCode').on('keydown', function (event) {
@@ -342,44 +343,21 @@
}
var index = layer.load();
$.ajax({
- url: GetWEBURL() + "/Cj_StationEntrustInBill/txtHBarCode_KeyDown",
+ url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
type: "GET",
data: { "HBarCode": HBarCode },
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HMouldID":data.hinterid,
"HBarName": data.HName,
"HBarSpec": data.HModel,
- "HBarModel": data.HModel2,
-
- "HMaterName": data.浜у搧,
- "HMaterNumber": data.浜у搧浠ｇ爜,
- "HMaterModel": data.瑙勬牸鍨嬪彿,
- "HQty": 0,
- "HPieceQty": data.鐢熶骇鏁伴噺,
- "HPlanQty": data.鐢熶骇鏁伴噺,
- "lngBillSubKey": data.HSubID,
- "lngBillKey": data.HMainID,
- "HProcExchBillNo": data.鍗曟嵁鍙�,
- "HICMOQty": data.浠诲姟鍗曟暟閲�,
- "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
- "HStationInTime": Format(new Date(), "yyyy-MM-dd hh:mm:ss"),
- "HMoney": 0,
- //"HProcID": data.HProcID,
- //"HProcNo": data.宸ュ簭鍙�,
- //"HProcName": data.宸ュ簭,
- "HSupID": data.HSupID,
- "HSup": data.渚涘簲鍟�,
- "HSourceID": data.HSourceID,
- "HSource": data.鐢熶骇璧勬簮,
- "HGroupID": data.HGroupID,
- "HGroup": data.鐝粍,
- "HDeptID": sessionStorage["HDeptID"],
- "HDept": sessionStorage["HDept"]
+ "HBarModel": data.HModel2
});
$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
$("#HBarCode").css("background-color", "#efefef4d");
+
HProcExchBillNoFlag = true;
layer.close(index);
}
@@ -395,47 +373,7 @@
});
}
});
-
- //娴佹按鍙凤紙宸ュ簭鍙凤級鍥炶溅鏂规硶
- $('#HProcNo').on('keydown', function (event) {
- var sProcNo = $('#HProcNo').val();
- var sBillNo = $('#HBarCode').val();
- if (event.keyCode == 13) {
- if (!HProcExchBillNoFlag) {
- layer.msg("娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栬�呭湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒");
- return;
- }
- var index = layer.load();
- $.ajax({
- url: GetWEBURL() + "/Cj_StationInBill/txtHProcNo_KeyDown",
- type: "GET",
- data: { "sBillNo": sBillNo, "sProcNo": sProcNo },
- success: function (result) {
- if (result.count == 1) {
- var data = result.data[0];
- form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "lngBillSubKey": data.hsubid,
- "HProcName": data.宸ュ簭,
- "HProcID": data.HProcID,
- "HCenterName": data.宸ヤ綔涓績,
- "HCenterID": data.HCenterID
- });
- $("#HProcNo").attr("readonly", "readonly");
- $("#HProcNo").css("background-color", "#efefef4d");
- 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: "娓╅Θ鎻愮ず" });
- }
- });
- }
- });
+
//閫�鍑�-鍏抽棴椤甸潰鏂规硶
$('#Cancel').on('click', function () {
@@ -447,14 +385,16 @@
//鎻愪氦
form.on('submit(Saver)', function (data) {//鎻愪氦
//var tableData = data.field;
- var oMain = data.field;
+ data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
+ var oMain = JSON.stringify(data.field);
+ //var oMain = data.field;
var index = layer.load();
$.ajax({
type: "POST",
- url: GetWEBURL() + "/Cj_StationEntrustOutBill/AddBill",
+ url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/SaveGetMoudlCheckBillList",
//url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",
async: true,
- data: { "oMain": oMain },
+ data: { "msg": oMain },
dataType: "json",
success: function (data) {
if (data.count == 1) {
@@ -468,6 +408,8 @@
//}, function () { window.location.reload(); });//鏂板
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
+ $('#Saver').removeClass("buttom_box_little");
+ $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
}
else {
layer.close(index);
@@ -480,8 +422,37 @@
}
});
});
+ //鏂板
+ form.on('submit(Add)', function (data) {
+ $('#Saver').addClass("buttom_box_little");
+ $('#Saver').addClass("layui-btn-disabled").attr("disabled", false);
+ $("#HBarCode").removeAttr("readonly");//鏉″舰鐮佹竻闄ゅ彧璇�
+ $("#HBarCode").removeAttr("background-color");//鏉″舰鐮佹竻闄よ儗鏅壊
+
+ // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
+ $("#formData")[0].reset();
+ layui.form.render();
- //琛ㄥご淇℃伅閮ㄩ棬寮圭獥
+
+ $("#HBarCode").focus();
+ //鑾峰彇鏈�澶у崟鎹彿
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3821' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HInterID").val("0");
+ $("#HBillNo").val(d.data[0].HBillNo);
+ }
+ });
+ $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规寮�濮嬫椂闂�
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规缁撴潫鏃堕棿
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
+ $("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
+ })
+ //閮ㄩ棬寮圭獥
form.on('submit(Department)', function () {
//椤甸潰灞�-鑷畾涔�
layer.open({
@@ -492,67 +463,64 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../PublicPage/DeptInformation.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('璇烽�夋嫨鏁版嵁');
- }
- $("#HDeptName").val(checkStatus.data[0].HName);
- $("#HDeptID").val(checkStatus.data[0].HItemID);
- layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- }
- , btn2: function (index, layero) {
- //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
- //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
- },
- end: function () {
-
- },
- success: function (layero, index) {
-
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+ cancel: function (index, layero) {
}
});
});
- //閫夋嫨宸ュ簭
- form.on('submit(btnSearchProc)', function () {
- layer.msg('绂佹閫夋嫨');
- //layer.open({
- // type: 2
- // , area: ['100%', '100%']
- // , title: '浠撳簱鍒楄〃'
- // , shade: 0.6 //閬僵閫忔槑搴�
- // , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- // , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- // , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HWHID']
- // , resize: false
- // , cancel: function () {
- // }
- //})
+ //璐熻矗浜哄脊绐�
+ form.on('submit(HManager)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璐熻矗浜哄垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes'],
+ cancel: function (index, layero) {
+ }
+ });
});
- //閫夋嫨渚涘簲鍟�
- form.on('submit(btnSearchSup)', function () {
- layer.msg('绂佹閫夋嫨');
+ //鐐规椤圭洰寮圭獥
+ form.on('submit(HDotCheckItemList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐐规椤圭洰鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_CheckItemList.html', 'yes'],
+ cancel: function (index, layero) {
+ }
+ });
});
-
- //閫夋嫨浜у搧
- form.on('submit(btnSearchMater)', function () {
- layer.msg('绂佹閫夋嫨');
- });
+
//浠ヤ笂涓簂ayui妯″潡
});
- //杩斿洖宸ュ簭
- function GetHProcValue(obj) {
- $("#HProcName").val(obj[0].HName);
- $("#HProcID").val(obj[0].HItemID);
+ //杩斿洖閮ㄩ棬
+ function GetHDeptNameValue(obj) {
+ $("#HDeptName").val(obj[0].HName);
+ $("#HDeptID").val(obj[0].HItemID);
+ }
+ //杩斿洖璐熻矗浜�
+ function GetHWorkerValue(obj) {
+ $("#HManagerName").val(obj[0].HName);
+ $("#HManagerID").val(obj[0].HItemID);
+ }
+ //杩斿洖鐐规椤圭洰
+ function GetHCheckNameValue(obj) {
+ $("#HDotCheckItem").val(obj[0].HName);
+ $("#HDotCheckItemID").val(obj[0].HItemID);
}
</script>
--
Gitblit v1.9.1