From 91367df5786f779ce75b174a8de236a948c19125 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期五, 25 六月 2021 09:37:11 +0800
Subject: [PATCH] nothing
---
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapInBill_PDA.html | 139 +++++++++++++++++++++++++--------------------
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 16 +++-
WebTM/views/index_Mobile.html | 6 ++
3 files changed, 94 insertions(+), 67 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index c29eb8a..fa7d504 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-24T01:19:21.8407413Z;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>
+ <History>True|2021-06-24T07:29:05.1557976Z;True|2021-06-24T15:17:38.0559722+08:00;True|2021-06-24T15:16:03.4606543+08:00;True|2021-06-24T15:09:30.2350359+08:00;True|2021-06-24T15:08:01.2854904+08:00;True|2021-06-24T09:19:21.8407413+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>05/24/2021 09:34:03</publishTime>
</File>
<File Include="bin/WebTM.dll">
- <publishTime>06/24/2021 09:19:17</publishTime>
+ <publishTime>06/24/2021 15:17:28</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>06/24/2021 09:19:17</publishTime>
+ <publishTime>06/24/2021 15:17:28</publishTime>
</File>
<File Include="layuiadmin/config.js">
<publishTime>05/24/2021 09:34:02</publishTime>
@@ -1032,7 +1032,7 @@
<publishTime>06/22/2021 13:45:04</publishTime>
</File>
<File Include="views/index_Mobile.html">
- <publishTime>05/24/2021 09:34:03</publishTime>
+ <publishTime>06/24/2021 15:09:22</publishTime>
</File>
<File Include="views/PublicPage/CheckItemType.html">
<publishTime>06/10/2021 11:23:15</publishTime>
@@ -1388,8 +1388,14 @@
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBillList.html">
<publishTime>06/24/2021 09:18:58</publishTime>
</File>
+ <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBill_PDA.html">
+ <publishTime>06/24/2021 15:25:57</publishTime>
+ </File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapOutBillList.html">
<publishTime>06/08/2021 09:09:20</publishTime>
+ </File>
+ <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风偣妫�淇濆吇/Sc_MouldDotCheckBill_PDA.html">
+ <publishTime>06/24/2021 14:47:36</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBillList.html">
<publishTime>05/24/2021 09:34:03</publishTime>
@@ -1902,7 +1908,7 @@
<publishTime>05/24/2021 09:34:03</publishTime>
</File>
<File Include="Web.config">
- <publishTime>06/24/2021 09:19:18</publishTime>
+ <publishTime>06/24/2021 15:17:35</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index 355d424..0f417c9 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -149,6 +149,12 @@
鐐规璁板綍鍗�
</a>
</dd>
+ <dd>
+ <a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBill_PDA.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 鎶ュ簾鍏ュ簱鍗�
+ </a>
+ </dd>
</dl>
</li>
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill_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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill_PDA.html"
index 2fd489a..3cd807f 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill_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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill_PDA.html"
@@ -14,7 +14,7 @@
<style>
.layui-form-label {
font-size: 14px;
- width: 85px;
+ width: 85px;
text-align: inherit;
}
/*鍏ㄥ眬璁剧疆杈撳叆妗嗛珮搴�*/
@@ -29,10 +29,14 @@
.bz_td {
display: -webkit-box; /*璁剧疆鎸夐挳涓嶆崲琛�*/
padding: 1%; /*璁剧疆杈撳叆妗嗚竟璺�*/
- }
+ }
/*璁剧疆鏈珯淇℃伅鎸夐挳楂樺害*/
.bz_btu {
height: 30px;
+ }
+ .laydate-time-list ol {
+ overflow-x: hidden !important;
+ overflow-y: auto !important;
}
</style>
</head>
@@ -73,7 +77,7 @@
<td class="bz_td">
<input type="text" name="HGroup" class="layui-input" id="HGroup" placeholder="閫夋嫨浠撳簱" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HGroupID" id="HGroupID" value="0" autocomplete="off" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ProductionTeam-BT">...</button>
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="Gy_WarehouseList-BT">...</button>
</td>
</tr>
<tr>
@@ -93,7 +97,7 @@
<tr>
<th>鍗曟嵁鏃ユ湡</th>
<td class="t1_input">
- <input type="text" name="HDate" class="layui-input" id="HDate" style="border-radius: 50px;">
+ <input type="datetime" name="HDate" class="layui-input" id="HDate" style="border-radius: 50px;">
</td>
</tr>
<tr>
@@ -101,7 +105,7 @@
<td class="bz_td">
<input type="text" name="HDeptName" class="layui-input" id="HDeptName" placeholder="閫夋嫨閮ㄩ棬" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HDeptID" id="HDeptID" value="0" autocomplete="off" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ProductionTeam-BT">...</button>
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="Gy_DepartmentList-BT">...</button>
</td>
</tr>
<tr>
@@ -151,7 +155,7 @@
<tr>
<th>鍒涘缓鏃ユ湡</th>
<td class="t1_input">
- <input type="text" name="HMakeDate" class="layui-input" id="HMakeDate" style="border-radius: 50px;">
+ <input type="datetime" name="HMakeDate" class="layui-input" id="HMakeDate" style="border-radius: 50px;">
</td>
</tr>
<tr>
@@ -163,7 +167,7 @@
<tr>
<th>淇敼鏃ユ湡</th>
<td class="t1_input">
- <input type="text" name="HUpDateDate" class="layui-input" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+ <input type="datetime" name="HUpDateDate" class="layui-input" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
</td>
</tr>
<tr>
@@ -175,19 +179,19 @@
<tr>
<th>瀹℃牳鏃ユ湡</th>
<td class="t1_input">
- <input type="text" name="HCheckDate" class="layui-input" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ <input type="datetime" name="HCheckDate" class="layui-input" id="HCheckDate" style="background-color:#efefef4d;" readonly>
</td>
</tr>
<tr>
<th>浣滃簾浜�</th>
<td class="t1_input">
- <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" style="background-color:#efefef4d;" readonly>
</td>
</tr>
<tr>
<th>浣滃簾鏃ユ湡</th>
<td class="t1_input">
- <input type="text" name="HDeleteDate" class="layui-input" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+ <input type="datetime" name="HDeleteDate" class="layui-input" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
</td>
</tr>
</tbody>
@@ -201,21 +205,6 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script>
-
- 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 BillStatusjson = params[params[0]];
- var InterID = params[params[1]];
-
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -229,26 +218,49 @@
, laydate = layui.laydate
, form = layui.form;
- //鑾峰彇褰撳墠鏃堕棿澶勭悊
- $("#HStationInTime").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HMaker").val(sessionStorage["HUserName"]);//鍒涘缓浜�
-
- //椤甸潰鍒濆鍖栬祴鍊�
- //鑾峰彇鍗曟嵁鍙�
- $.ajax({
- url: GetWEBURL() + "/api/newBill/getNewInterBillNo",
- type: "GET",
- data: { "billType": '3790' },
- success: function (d) {
- $("#HBillNo").val(d.data.HBillNo);//杩涚珯鍗曞彿
- $("#HInterID").val(d.data.HInterID);//杩涚珯鍗曞彿ID
- }, error: function () {
- layer.alert("鑾峰彇鍗曟嵁鍙峰け璐�!", { icon: 5 });
- }
+
+ //鏃ユ湡鏃堕棿閫夋嫨鍣�
+ laydate.render({
+ elem: '#HDate'
+ , type: 'datetime'
});
+ laydate.render({
+ elem: '#HMakeDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HUpDateDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HCheckDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HDeleteDate'
+ , type: 'datetime'
+ });
+
+ //鍒濆鍩烘湰淇℃伅璧嬪��
+ $("#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"]); //鍒涘缓浜�
$("#HBarCode").focus();
$("#HBarCode").css("box-shadow", "0 0 0 1px #00ff00");
+ //椤甸潰鍒濆鍖栬祴鍊�
+ //鑾峰彇鏈�澶у崟鎹彿
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3821' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ }
+ });
+
//鎵潯褰㈢爜鏂规硶
$('#HBarCode').on('keydown', function (event) { //鎵潯褰㈢爜
var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
@@ -259,33 +271,24 @@
return;
}
$.ajax({
- url: GetWEBURL() + "api/newBill/getHbarCodeDetail",
+ url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
type: "GET",
data: {
- "sBillBarCode": HBarCode
+ "HBarCode": HBarCode
},
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data.h_v_Sc_ProcessExchangeBillList[0];
+ var data = result.data[0];
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HProcExchBillNo": $("#HBarCode").val()
- //, "HProcID": data.HProcID
- //, "HProc": data.宸ュ簭
- //, "HCenter": data.宸ヤ綔涓績
- //, "HCenterID": data.宸ヤ綔涓績浠ｇ爜
- , "HICMOInterID": data.hicmointerid
- , "HICMOBillNo": data.浠诲姟鍗曞彿
- , "HDeptID": data.HDeptID
- , "HQty": data.璁″垝鏁伴噺
- , "HMaterID": data.HMaterID
- , "HMaterName": data.浜у搧
- , "HMaterModel": data.瑙勬牸鍨嬪彿
- , "HICMOQty": data.鐢熶骇鏁伴噺
- , "HOrderProcNO":data.璁㈠崟璺熻釜鍙�
+ "HName": data.HName,
+ "HModel": data.HModel,
+ "HModel2": data.HModel2,
+ "HQty": 1,
+ "HLeaveLife": data.HLeaveLife,
});
//$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
//$("#HBarCode").css("background-color", "#efefef4d");
- $("#HBarCode").css("box-shadow", "none");
+ //$("#HBarCode").css("box-shadow", "none");
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
@@ -295,8 +298,8 @@
});
}
});
- //閫夋嫨鐢熶骇鐝粍寮圭獥
- form.on('submit(ProductionTeam-BT)', function () {//閫夋嫨鐢熶骇鐝粍
+ //閫夋嫨閮ㄩ棬
+ form.on('submit(Gy_DepartmentList-BT)', function () {//閫夋嫨鐢熶骇鐝粍
layer.open({
type: 2
, area: ['80%', '80%']
@@ -304,7 +307,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
//, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html', 'yes']
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
, resize: false
, cancel: function (index, layero) {
}
@@ -422,6 +425,18 @@
}
}
+ function GetHDeptNameValue(obj) {
+ if (obj.length == 0) {
+ layer.msg("璇峰厛閫夋嫨閮ㄩ棬", { index: 0 });
+ } else {
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ $("#HGroupID").val(obj[0].HItemID);
+ $("#HGroup").css("box-shadow", "none");
+ checkPopup();
+ layer.closeAll();
+ }
+ }
+
//杩斿洖鐢熶骇鐝粍
function GetProductionTeamValue(obj) { //杩斿洖鐢熶骇鐝粍
if (obj.length == 0) {
--
Gitblit v1.9.1