From 56b15c48939c9be8ed4fb1315d0cdbde963d3ea6 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 01 十二月 2023 13:11:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/车间管理/单品过站/Cj_ProcessItemBGA.html | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html"
index b7df8e6..a39144b 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html"
@@ -1,7 +1,10 @@
锘�<!DOCTYPE html>
<html>
<head>
- <meta charset="utf-8" />
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <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">
<title>宸ュ簭鍗曞搧杩斾慨鍙�</title>
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
@@ -10,11 +13,12 @@
<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>
+ <!--<script src="../../../layuiadmin/PubCustom.js"></script>-->
<script type="text/javascript" src="../../../layuiadmin/lib/extend/echarts.min.js"></script>
+ <script src="../../CreateControl.js"></script>
<style>
- .tr1-1{
- /* margin-left: 3%;
+ .tr1-1 {
+ /* margin-left: 3%;
margin-top: 4%;*/
height: 360px;
/*background-color: #99f6a733;*/
@@ -165,7 +169,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏉″舰鐮�</label>
<div class="layui-input-block" style="margin-left: 120px; width: 501px;">
- <input type="text" class="layui-input" lay-verify="HBarCodeSN" name="HBarCodeSN" id="HBarCodeSN">
+ <input type="text" class="layui-input" lay-verify="HBarCodeSN" autocomplete="off" name="HBarCodeSN" id="HBarCodeSN">
</div>
</div>
</div>
@@ -219,7 +223,7 @@
</button>
</div>
</div>
- <div class="layui-inline" style="width:300px;">
+ <!--<div class="layui-inline" style="width:300px;">
<label class="layui-form-label" style="width: 85px;">缁翠慨缁撴灉</label>
<div class="layui-input-block" style="margin-left: 120px; width: 180px;">
<select name="HRepairResult" id="HRepairResult" lay-filter="HRepairResult" style="width: 180px;">
@@ -227,7 +231,7 @@
<option style="color:blue;" value="NG">NG</option>
</select>
</div>
- </div>
+ </div>-->
</div>
<div class="layui-row">
<div class="layui-inline">
@@ -348,6 +352,16 @@
if (!HBarCode) {
layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
return;
+ } else {
+ if (HBarCode.length != 29) {
+ layer.alert("瀛愪欢鏉＄爜闀垮害涓嶄负29浣�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+
+ if (HBarCode.match(/[^\x00-\xff]/g) != null) {
+ layer.alert("蹇呴』鏄崐瑙掑瓧绗�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
}
txtHBarCode_KeyDown(HBarCode);
@@ -568,10 +582,10 @@
var option = {
elem: '#mainTable'
//, toolbar: '#toolbarDemo'
- , async: true
, page: false
//, totalRow: true
, cellMinWidth: 120
+ , limit: 50
, height: 300
}
@@ -643,12 +657,20 @@
success: function (data1) {
if (data1.count == 1) {
layer.close(index);
+ var numHProcess = 0;
+ for (var i = 0; i < data1.data.length; i++) {
+ if (data1.data[i]["HProcID"] == $("#HProcess").val()) {
+ numHProcess = data1.data[i]["HProcExchEntryID"];
+ break;
+ }
+ }
+
$("#HICMOBillNo").val(data1.data[0]["鐢熶骇璁㈠崟"]);
$("#HICMOInterID").val(data1.data[0]["HICMOInterID"]);
$("#HICMOEntryID").val(data1.data[0]["HICMOEntryID"]);
$("#HProcExchBillNo").val(data1.data[0]["宸ュ簭娴佽浆鍗�"]);
$("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]);
- $("#HProcExchEntryID").val(data1.data[0]["HProcExchEntryID"]);
+ $("#HProcExchEntryID").val(numHProcess);
$("#HUnitID").val(data1.data[0]["HUnitID"]);
$("#HUnitName").val(data1.data[0]["鍗曚綅"]);
$("#HOrgName").val(data1.data[0]["缁勭粐"]);
--
Gitblit v1.9.1