From 285da883c991b30eb8d57077e0800abbb4582eac Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期三, 31 八月 2022 08:51:46 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/验收入库/其他入库/Kf_OtherInBill_Fast.html | 6
WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html | 10
WebTM/views/领料发货/领料出库/Kf_MateOutBackBill_Fast.html | 7
WebTM/views/领料发货/销售出库/Kf_SellOutBackBill_Fast.html | 6
WebTM/views/生产管理/生产拆箱单/Sc_PackSplitBill_Fast.html | 8
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html | 6
WebTM/views/模治具管理/器具报表/Sc_MouldAvailableList.html | 404 +++++++++++++++++++++++++
WebTM/views/生产管理/生产汇报单/Sc_ICMOReportBill_FastNew.html | 14
WebTM/views/验收入库/外购入库/Kf_POStockInBackBill.html | 16
WebTM/views/领料发货/其他出库/Kf_OtherOutBill_Fast.html | 6
WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html | 6
WebTM/views/领料发货/其他出库/Kf_OtherOutBill_Check.html | 6
WebTM/views/验收入库/委外入库/Kf_EntrustInBill_Fast.html | 14
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockOutBill_Fast.html | 6
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 14
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepOutButNotStepInList.html | 284 +++++++++++++++++
WebTM/views/模治具管理/模治具管理/Sb_MouldRepairWorkBillList.html | 115 +++++++
WebTM/views/index.html | 2
WebTM/views/领料发货/委外出库/Kf_EntrustOutBill_Fast.html | 6
WebTM/views/验收入库/产品入库/Kf_ProductInBackBill.html | 6
WebTM/WebTM.csproj | 2
21 files changed, 941 insertions(+), 3 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 1956819..7c5826f 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -742,6 +742,7 @@
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\ReportInventoryAccount.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\ReportMaterialReceipt.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\ReportMouldStock.html" />
+ <Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\Sc_MouldAvailableList.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿缁翠慨娲惧伐鍗昞Sc_MouldRepairSendWorkBillEdit.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿缁翠慨娲惧伐鍗昞Sc_MouldRepairSendWorkBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿澶勭悊鍑哄簱鍗昞Sc_MouldScrapOutBill_PDA.html" />
@@ -757,6 +758,7 @@
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldMoveStockStepOutBill.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldMoveStockStepInBill.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldMoveStockStepInBillList.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldMoveStockStepOutButNotStepInList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldProdMoveBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldMoveStockStepOutBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldProdInBillEdit.html" />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 82ef184..0bd7708 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -605,6 +605,7 @@
<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherInBillList.html">鍣ㄥ叿鍏朵粬鍏ュ簱鍗曠淮鎶�</a></dd>
<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillEdit.html">鍣ㄥ叿鍏朵粬鍑哄簱鍗�</a></dd>
<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillList.html">鍣ㄥ叿鍏朵粬鍑哄簱鍗曠淮鎶�</a></dd>
+ <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepOutButNotStepInList.html">鍣ㄥ叿鍒嗘寮忚皟鍑烘湭璋冨叆鎶ヨ〃</a></dd>
</dl>
</dd>
<dd>
@@ -644,6 +645,7 @@
<a>鍣ㄥ叿鎶ヨ〃</a>
<dl class="layui-nav-child">
<dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/ReportMouldStock.html">鍣ㄥ叿搴撳瓨鏌ヨ</a></dd>
+ <dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/Sc_MouldAvailableList.html">鍣ㄥ叿鍙敤鏁版嵁琛�</a></dd>
<dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/ReportMaterialReceipt.html">鐗╂枡鏀跺彂鏄庣粏鍙婃眹鎬�</a></dd>
<dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/ReportInventoryAccount.html">搴撳瓨鍙拌处</a></dd>
<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileResume.html">鍣ㄥ叿灞ュ巻琛�</a></dd>
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 4f2003c..5b966cb 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"
@@ -1470,6 +1470,12 @@
}
function AllowLoadData(sSubStr, bnt) { //闈炵┖楠岃瘉
+ //鏁板瓧姝ｅ垯(鍖呭惈灏忔暟)
+ var reg = /^\d+(\.\d+)?$/;
+ if (reg.test($("#HQty").val()) == false || $("#HQty").val() == '') {
+ layer.msg("鏁伴噺蹇呴』涓烘暟閲忔垨灏忔暟", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
//if ($("#HSourceBillNo").val() == '') {
// layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
// return false;
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_MoveStockOutBill_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_MoveStockOutBill_Fast.html"
index d1604c5..275dd62 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_MoveStockOutBill_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_MoveStockOutBill_Fast.html"
@@ -1242,6 +1242,12 @@
}
function AllowLoadData(sSubStr, bnt) { //闈炵┖楠岃瘉
+ //鏁板瓧姝ｅ垯(鍖呭惈灏忔暟)
+ var reg = /^\d+(\.\d+)?$/;
+ if (reg.test($("#HQty").val()) == false || $("#HQty").val() == '') {
+ layer.msg("鏁伴噺蹇呴』涓烘暟閲忔垨灏忔暟", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
if ($("#HDeptName").val() == '') {
layer.msg("閮ㄩ棬娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldAvailableList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldAvailableList.html"
new file mode 100644
index 0000000..6137712
--- /dev/null
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldAvailableList.html"
@@ -0,0 +1,404 @@
+锘�<!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">
+ <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>
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</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-tab layui-tab-card" lay-filter="TabTest">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鏄庣粏淇℃伅</li>
+ <li>姹囨�讳俊鎭�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡缂栫爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HNumber" id="HNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏉″舰鐮�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBarCode" id="HBarCode" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <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>
+ </div>
+ <table class="" id="layTable" lay-filter="layTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+
+ </div>
+ </script>
+ </div>
+ <div class="layui-tab-item">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡缂栫爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HNumber1" id="HNumber1" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch1" id="btnSearch1">
+ <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="btnReSearch1" id="btnReSearch1" style="padding:0 5px">閲嶇疆</button>
+ </div>
+ </div>
+ <table class="" id="layTable1" lay-filter="layTable1"></table>
+ <script type="text/html" id="toolbarDemo1">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload1"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit1"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+
+ </div>
+ </script>
+ </div>
+ </div>
+ </div>
+
+ </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/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script>
+ var cols_arr = []; //瀛樺偍琛ㄦ牸澶寸殑鏁扮粍
+ var cols_arr1 = []; //瀛樺偍琛ㄦ牸澶寸殑鏁扮粍
+ var table = null;
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ // #region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //鏌ヨ鏉′欢
+ var HNumber = "";
+ var HBarCode = "";
+ var HSupName = "";
+ var HNumber1 = "";
+ var HSupName1 = "";
+
+ var resultTableHead = []; //鑾峰彇鍒楄〃澶村瓧娈佃嚜瀹氫箟鍒楁暟缁�
+ var resultTableHead1 = []; //鑾峰彇鍒楄〃澶村瓧娈佃嚜瀹氫箟鍒楁暟缁�
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill(HNumber, HBarCode);
+ set_ClearBill1(HNumber1);
+ //set_ClearBill1(HNumber1, HSupName1);
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ form.on('submit(btnSearch1)', function (data) {
+ get_FastQuery1();
+ });
+ //#endregion
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ form.on('submit(btnReSearch1)', function (data) {
+ set_ClearQuery1();
+ });
+ //#endregion
+
+ //#endregion
+
+
+ // #region 鍒濆鍖栫晫闈�
+ function set_ClearBill(HNumber, HBarCode) {
+ resultTableHead = []; //娓呯┖琛ㄥご鍒楋紝闃叉閲嶅娓叉煋
+ //鍒濆鏌ヨ
+ get_Display(HNumber, HBarCode);
+
+ }
+
+ function set_ClearBill1( HNumber1) {
+ resultTableHead1 = []; //娓呯┖琛ㄥご鍒楋紝闃叉閲嶅娓叉煋
+ //鍒濆鏌ヨ
+ get_Display1(HNumber1);
+ }
+
+ //#endregion
+
+ //#region 鏌ヨ
+ function get_Display(HNumber, HBarCode) {
+ var ajaxLoad = layer.load();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MESReportFrom/Get_MouldAvailableListToSub',
+ type: "GET",
+ data: { "page": 1, "limit": 50, "HNumber": HNumber, "HBarCode": HBarCode },
+ async: false,
+ dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
+ success: function (data1) {
+ for (var key in data1.list) {
+ resultTableHead.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ set_InitGrid( HNumber, HBarCode);
+ }, error: function (err) {
+ layer.alert(err.Message, { icon: 5 });
+ }
+ });
+ }
+
+ function get_Display1( HNumber1) {
+ var ajaxLoad = layer.load();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MESReportFrom/Get_MouldAvailableListToSum',
+ type: "GET",
+ data: { "page": 1, "limit": 50, "HNumber": HNumber1},
+ async: false,
+ dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
+ success: function (data1) {
+ for (var key in data1.list) {
+ resultTableHead1.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ set_InitGrid1( HNumber1);
+ }, error: function (err) {
+ layer.alert(err.Message, { icon: 5 });
+ }
+ });
+ }
+
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鏍兼柟娉�
+ function set_InitGrid(HNumber, HBarCode) {
+ //濉厖琛ㄦ牸澶存暟缁�
+ var data = resultTableHead;
+ cols_arr[0] = [];
+ cols_arr[0][0] = { checkbox: true, fixed: true, totalRowText: '鍚堣' };
+ for (var i = 0; i < data.length; i++) {
+ if (data[i].name == 'xh' || data[i].name == 'HInterID') {
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true }; //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'Int32':
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+ break;
+ //Decimal
+ case 'Decimal':
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+ break;
+ default:
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true };
+ }
+ }
+ }
+ //濉厖琛ㄦ牸鏁版嵁
+ table.render({
+ elem: '#layTable',
+ url: GetWEBURL() + '/Sc_MESReportFrom/Get_MouldAvailableListToSub',
+ toolbar: '#toolbarDemo', //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
+ title: '鍣ㄥ叿鍗虫椂搴撳瓨鏄庣粏琛�',
+ cols: cols_arr, //濉厖琛ㄦ牸澶存暟鎹�,
+ id: 'layTable', //琛ㄦ牸id
+ where: { "HNumber": HNumber, "HBarCode": HBarCode}, //鎵╁睍鍙傛暟,鍙互浼犳暟鎹埌鍚庡彴
+ page: true, //寮�鍚垎椤�
+ totalRow: true, //寮�鍚悎璁�
+ limit: 50, //涓�椤佃兘澶熸樉绀虹殑鏈�澶ф暟鐩�
+ limits: [50, 500, 5000, 20000], //鎺у埗澶氬皯琛屼竴椤碉紙榛樿浜旀潯涓�椤碉級
+ method: 'get', //鎻愪氦鏂瑰紡
+ layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+ parseData: function (res) { //res 涓鸿繑鍥炵殑鏁版嵁
+ if (res.code == "0") {
+ return {
+ "msg": res.Message
+ }
+ }
+ },
+ response: {
+ statusCode: 1 //閲嶆柊瑙勫畾鎴愬姛鐨勭姸鎬佺爜涓� 1锛宼able 缁勪欢榛樿涓� 0
+ },
+ done: function (res) { //杩斿洖鏁版嵁鎵ц鍥炶皟鍑芥暟
+ layer.close(layer.index); //杩斿洖鏁版嵁鍏抽棴loading
+ }
+ });
+ }
+
+ function set_InitGrid1(HNumber1, HSupName1) {
+ //濉厖琛ㄦ牸澶存暟缁�
+ var data = resultTableHead1;
+ cols_arr1[0] = [];
+ cols_arr1[0][0] = { checkbox: true, fixed: true, totalRowText: '鍚堣' };
+ for (var i = 0; i < data.length; i++) {
+ if (data[i].name == 'xh') {
+ cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true }; //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'Int32':
+ cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+ break;
+ //Decimal
+ case 'Decimal':
+ cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+ break;
+ default:
+ cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true };
+ }
+ }
+ }
+ //濉厖琛ㄦ牸鏁版嵁
+ table.render({
+ elem: '#layTable1',
+ url: GetWEBURL() + '/Sc_MESReportFrom/Get_MouldAvailableListToSum',
+ toolbar: '#toolbarDemo1', //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
+ title: '鍣ㄥ叿鍗虫椂搴撳瓨姹囨�昏〃',
+ cols: cols_arr1, //濉厖琛ㄦ牸澶存暟鎹�,
+ id: 'layTable1', //琛ㄦ牸id
+ where: { "HNumber": HNumber1}, //鎵╁睍鍙傛暟,鍙互浼犳暟鎹埌鍚庡彴
+ page: true, //寮�鍚垎椤�
+ totalRow: true, //寮�鍚悎璁�
+ limit: 50, //涓�椤佃兘澶熸樉绀虹殑鏈�澶ф暟鐩�
+ limits: [50, 100, 300, 500, 1000, 5000], //鎺у埗澶氬皯琛屼竴椤碉紙榛樿浜旀潯涓�椤碉級
+ method: 'get', //鎻愪氦鏂瑰紡
+ layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+ parseData: function (res) { //res 涓鸿繑鍥炵殑鏁版嵁
+ if (res.code == "0") {
+ return {
+ "msg": res.Message
+ }
+ }
+ },
+ response: {
+ statusCode: 1 //閲嶆柊瑙勫畾鎴愬姛鐨勭姸鎬佺爜涓� 1锛宼able 缁勪欢榛樿涓� 0
+ },
+ done: function (res) { //杩斿洖鏁版嵁鎵ц鍥炶皟鍑芥暟
+ layer.close(layer.index); //杩斿洖鏁版嵁鍏抽棴loading
+ }
+ });
+ }
+ //endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HNumber = $("#HNumber").val();//鐗╂枡
+ var HBarCode = $("#HBarCode").val();//鏉″舰鐮�
+ set_ClearBill(HNumber, HBarCode);
+
+ }
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery1() {
+ var HNumber1 = $("#HNumber1").val();//鐗╂枡
+ set_ClearBill1(HNumber1);
+
+ }
+
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HNumber").val("");//鐗╂枡
+ $("#HBarCode").val("");//鏉″舰鐮�
+ get_FastQuery();
+
+ }
+ function set_ClearQuery1() {
+ $("#HNumber1").val("");//鐗╂枡
+ get_FastQuery1();
+
+ }
+ //#endregion
+
+ //#endregion
+
+ //#region 閲嶆柊鍔犺浇琛ㄦ牸(澶囩敤鏂规硶)
+ function reloadByKeyword() {
+ table.reload('layTable', {
+ page: {
+ curr: 1 //閲嶆柊浠庣 1 椤靛紑濮�
+ },
+ request: {
+ pageName: 'page', //椤电爜鐨勫弬鏁板悕绉帮紝榛樿:page
+ limitName: 'limit'//姣忛〉鏁版嵁閲忕殑鍙傛暟鍚嶏紝榛樿:limit
+ },
+ where: {
+ keyword: $('#demoInput').val() //鍙紶鍙傛煡璇㈢殑鍙傛暟
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鑾峰彇琛ㄦ牸涓殑鍊�(澶囩敤鏂规硶)
+ function batchDel() {
+ var data = table.checkStatus('layTable').data;
+ var ids = "";
+ for (var i = 0; i < data.length; i++) {
+ ids += data[i].id + ",";
+ }
+ alert(ids);
+ }
+ //#endregion
+
+ //#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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutButNotStepInList.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_MouldMoveStockStepOutButNotStepInList.html"
new file mode 100644
index 0000000..ee9a22a
--- /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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutButNotStepInList.html"
@@ -0,0 +1,284 @@
+锘�<!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">
+ <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/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>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+
+ .layui-body {
+ overflow-y: scroll;
+ }
+ </style>
+</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="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
+ </div>
+ </div>
+
+
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <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-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="text" class="layui-input" name="HMaterName" id="HMaterName" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍣ㄥ叿鏉＄爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HMaterCode" id="HMaterCode" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">璋冨嚭缁勭粐</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HStockOrgName" id="HStockOrgName" style="width:190px;">
+ </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="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>
+ </div>
+ </script>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var DataList;
+ var Name = "Sc_MouldMoveStockStepOutButNotStepIn";
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_Display(sWhere);
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鍒锋柊
+ case 'get_Refresh': set_Refresh();
+ break;
+ //閫�鍑�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ };
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery(table, option);
+ });
+ //#endregion
+
+
+ //#region 姝ら〉闈㈡墍鏈夋柟娉�
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ var columns = [
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
+ , { field: 'hmainid', title: '鍗曟嵁ID', width: 200, hide: true }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 200, sort: true, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200, sort: true }
+ , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 110 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 200 }
+ , { field: '璋冨嚭缁勭粐', title: '璋冨嚭缁勭粐', width: 200 }
+ , { field: '璋冨叆缁勭粐', title: '璋冨叆缁勭粐', width: 200 }
+ , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', width: 200 }
+ , { field: '璋冨叆浠撳簱', title: '璋冨叆浠撳簱', width: 200 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 200 }
+ , { field: '鍣ㄥ叿鏉＄爜', title: '鍣ㄥ叿鏉＄爜', width: 200 }
+ , { field: '搴撳瓨鐘舵��', title: '搴撳瓨鐘舵��', width: 200 }
+ , { field: '搴撳瓨鍗曚綅', title: '搴撳瓨鍗曚綅', width: 125 }
+ , { field: '璋冨嚭鏁伴噺', title: '璋冨嚭鏁伴噺', width: 200 }
+ , { field: '璋冨叆鏁伴噺', title: '璋冨叆鏁伴噺', width: 200 }
+ , { field: '鏈叧鑱旇皟鍏ユ暟閲�', title: '鏈叧鑱旇皟鍏ユ暟閲�', width: 200 }
+ ];
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , page: true
+ , cellMinWidth: 120
+ , totalRow: true
+ , limit: 50
+ , height: 'full-50'
+ , cols: [columns]
+ , limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+
+ }
+ };
+ }
+
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ var wait = layer.load();//閬僵
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ if (HBeginDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
+ }
+ if (HEndDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
+ }
+ $.ajax({
+ url: GetWEBURL() + 'Sc_MouldMoveStockStepOutBill/GetMouldMoveStockStepOutButNotStepInList',
+ type: "GET",
+ data: { "sWhere": sWhere, "Organization": sessionStorage["Organization"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ DataList = data1.data;
+ option.data = data1.data;
+ table.render(option);
+ layer.close(wait);
+ } else {
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ function get_FastQuery(table, option) {
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+
+ var HMaterName = $("#HMaterName").val(); //鐗╂枡浠ｇ爜
+ var HMaterCode = $("#HMaterCode").val(); //鍣ㄥ叿浠ｇ爜
+ var HStockOrgName = $("#HStockOrgName").val(); //缁勭粐
+
+ if (HBeginDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
+ }
+ if (HEndDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
+ }
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (HMaterName) {
+ sWhere += " and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
+ }
+ if (HMaterCode) {
+ sWhere += " and 鍣ㄥ叿鏉＄爜 like '%" + HMaterCode + "%'";
+ }
+ if (HStockOrgName) {
+ sWhere += " and 搴撳瓨缁勭粐 like '%" + HStockOrgName + "%'";
+ }
+ var index = layer.load(0);
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBillNo").val("");
+ $("#HMaterName").val("");
+ $("#HMaterCode").val("");
+ $("#HStockOrgName").val("");
+ sWhere = "";
+ get_Display(sWhere);
+ }
+ //#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/Sb_MouldRepairWorkBillList.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/Sb_MouldRepairWorkBillList.html"
index 5faebc9..df8bb7f 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/Sb_MouldRepairWorkBillList.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/Sb_MouldRepairWorkBillList.html"
@@ -103,6 +103,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details" style="display:none;"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate" style="display:none;"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit" style="display:none;"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_HideColumn1"><i class="layui-icon layui-icon-file-b"></i>鍒楄缃�</button>
</div>
</script>
@@ -138,7 +139,7 @@
//鍒濆鍖栭〉闈㈠姞杞�
set_ClearBill();
-
+ var HModName = "Sb_MouldRepairWorkBillList";
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
//澶村伐鍏锋爮浜嬩欢
@@ -158,6 +159,9 @@
break;
//鍙嶅鏍�
case 'btn-DeAudit': set_DeAuditBill();
+ break;
+ //鍒楄缃�
+ case 'get_HideColumn1': get_HideColumn1();
break;
////閫�鍑烘寜閽�
//case 'get_Exit': Pub_Close(2);
@@ -287,6 +291,7 @@
layer.close(index);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
+
});
}
@@ -452,6 +457,114 @@
}
}
+ //闅愯棌鍒楄缃�
+ function get_HideColumn1() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "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", "HMouldID", "HEquipID", "HEmpID", "HManagerID", "HDeptID", "HSupID", "hsubid", "HRepairID","HBillType"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ 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 get_FastQuery() {
var Status = $("select[name='Status']").val();//鐘舵��
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\213\206\347\256\261\345\215\225/Sc_PackSplitBill_Fast.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\213\206\347\256\261\345\215\225/Sc_PackSplitBill_Fast.html"
index 10fdee6..2618460 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\213\206\347\256\261\345\215\225/Sc_PackSplitBill_Fast.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\213\206\347\256\261\345\215\225/Sc_PackSplitBill_Fast.html"
@@ -852,7 +852,13 @@
$("#HDeptName").val(obj[0].HName);
$("#HDeptID").val(obj[0].HItemID);
}
- function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
+ function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
+ //鏁板瓧姝ｅ垯(鍖呭惈灏忔暟)
+ var reg = /^\d+(\.\d+)?$/;
+ if (reg.test($("#HQty").val()) == false || $("#HQty").val() == '') {
+ layer.msg("鏁伴噺蹇呴』涓烘暟閲忔垨灏忔暟", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
//if ($("#HSourceBillNo").val() == '') {
// layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
// return false;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBill_FastNew.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBill_FastNew.html"
index 81e6437..83240aa 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBill_FastNew.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBill_FastNew.html"
@@ -1038,6 +1038,20 @@
// layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
// return false;
//}
+ //鏁板瓧姝ｅ垯(鍖呭惈灏忔暟)
+ var reg = /^\d+(\.\d+)?$/;
+ if (reg.test($("#HQty").val()) == false || $("#HQty").val() == '') {
+ layer.msg("鏁伴噺蹇呴』涓烘暟閲忔垨灏忔暟", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (reg.test($("#HBarcodeQtys").val()) == false || $("#HBarcodeQtys").val() == '') {
+ layer.msg("鏉＄爜鏁伴噺蹇呴』涓烘暟閲忔垨灏忔暟", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (reg.test($("#HSumQtys").val()) == false || $("#HSumQtys").val() == '') {
+ layer.msg("鎬绘暟閲忓繀椤讳负鏁伴噺鎴栧皬鏁�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
if($("#HDeptName").val()=='')
{
layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
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_Check.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_Check.html"
index c59cbd7..81ac39b 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_Check.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_Check.html"
@@ -968,6 +968,12 @@
$("#HDeptID").val(obj[0].HItemID);
}
function AllowLoadData(sSubStr, bnt) { //闈炵┖楠岃瘉
+ //鏁板瓧姝ｅ垯(鍖呭惈灏忔暟)
+ var reg = /^\d+(\.\d+)?$/;
+ if (reg.test($("#HQty").val()) == false || $("#HQty").val() == '') {
+ layer.msg("鏁伴噺蹇呴』涓烘暟閲忔垨灏忔暟", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
//if ($("#HSourceBillNo").val() == '') {
// layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
// return false;
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 4b53ccb..5af288f 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"
@@ -1121,6 +1121,12 @@
$("#HDeptID").val(obj[0].HItemID);
}
function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
+ //鏁板瓧姝ｅ垯(鍖呭惈灏忔暟)
+ var reg = /^\d+(\.\d+)?$/;
+ if (reg.test($("#HQty").val()) == false || $("#HQty").val() == '') {
+ layer.msg("鏁伴噺蹇呴』涓烘暟閲忔垨灏忔暟", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
//if ($("#HSourceBillNo").val() == '') {
// layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
// return false;
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_Fast.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_Fast.html"
index 99c85d7..11e1ca2 100644
--- "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_Fast.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_Fast.html"
@@ -1015,6 +1015,12 @@
$("#HDeptID").val(obj[0].HItemID);
}
function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
+ //鏁板瓧姝ｅ垯(鍖呭惈灏忔暟)
+ var reg = /^\d+(\.\d+)?$/;
+ if (reg.test($("#HQty").val()) == false || $("#HQty").val() == '') {
+ layer.msg("鏁伴噺蹇呴』涓烘暟閲忔垨灏忔暟", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
//if ($("#HSourceBillNo").val() == '') {
// layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
// return false;
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBackBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBackBill_Fast.html"
index a661cb6..5cd9d2e 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBackBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBackBill_Fast.html"
@@ -878,6 +878,12 @@
$("#HDeptID").val(obj[0].HItemID);
}
function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
+ //鏁板瓧姝ｅ垯(鍖呭惈灏忔暟)
+ var reg = /^\d+(\.\d+)?$/;
+ if (reg.test($("#HQty").val()) == false || $("#HQty").val() == '') {
+ layer.msg("鏁伴噺蹇呴』涓烘暟閲忔垨灏忔暟", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
//if ($("#HSourceBillNo").val() == '') {
// layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
// return false;
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
index b4d0f61..6b0d005 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
@@ -1662,6 +1662,20 @@
$("#HDeptID").val(obj[0].HItemID);
}
function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
+ //鏁板瓧姝ｅ垯(鍖呭惈灏忔暟)
+ var reg = /^\d+(\.\d+)?$/;
+ if (reg.test($("#HQty").val()) == false || $("#HQty").val() == '') {
+ layer.msg("鏁伴噺蹇呴』涓烘暟閲忔垨灏忔暟", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (reg.test($("#HBarcodeQtys").val()) == false || $("#HBarcodeQtys").val() == '') {
+ layer.msg("鏉＄爜鏁伴噺蹇呴』涓烘暟閲忔垨灏忔暟", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (reg.test($("#HSumQtys").val()) == false || $("#HSumQtys").val() == '') {
+ layer.msg("鎬绘暟閲忓繀椤讳负鏁伴噺鎴栧皬鏁�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
//if ($("#HSourceBillNo").val() == '') {
// layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
// return false;
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBill_Fast.html"
index b403895..dc238aa 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBackBill_Fast.html"
@@ -1204,6 +1204,13 @@
$("#HDeptID").val(obj[0].HItemID);
}
function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
+ //鏁板瓧姝ｅ垯(鍖呭惈灏忔暟)
+ var reg = /^\d+(\.\d+)?$/;
+ if (reg.test($("#HQty_B").val()) == false || $("#HQty").val() == '') {
+ layer.msg("鏁伴噺蹇呴』涓烘暟閲忔垨灏忔暟", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+
if ($("#HBillNo").val() == '') {
layer.msg("閿欒鐨勫崟鎹彿!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
index a0942c3..1625df3 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
@@ -1267,6 +1267,12 @@
$("#HDeptID").val(obj[0].HItemID);
}
function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
+ //鏁板瓧姝ｅ垯(鍖呭惈灏忔暟)
+ var reg = /^\d+(\.\d+)?$/;
+ if (reg.test($("#HQty").val()) == false || $("#HQty").val() == '') {
+ layer.msg("鏁伴噺蹇呴』涓烘暟閲忔垨灏忔暟", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
//if ($("#HSourceBillNo").val() == '') {
// layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
// return false;
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_ProductInBackBill.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_ProductInBackBill.html"
index 0fa014e..6dc4478 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_ProductInBackBill.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_ProductInBackBill.html"
@@ -871,6 +871,12 @@
$("#HDeptID").val(obj[0].HItemID);
}
function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
+ //鏁板瓧姝ｅ垯(鍖呭惈灏忔暟)
+ var reg = /^\d+(\.\d+)?$/;
+ if (reg.test($("#HQty").val()) == false || $("#HQty").val() == '') {
+ layer.msg("鏁伴噺蹇呴』涓烘暟閲忔垨灏忔暟", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
//if ($("#HSourceBillNo").val() == '') {
// layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
// return false;
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
index e6251f1..23fc0e7 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
@@ -1269,6 +1269,12 @@
$("#HDeptID").val(obj[0].HItemID);
}
function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
+ //鏁板瓧姝ｅ垯(鍖呭惈灏忔暟)
+ var reg = /^\d+(\.\d+)?$/;
+ if (reg.test($("#HQty").val()) == false || $("#HQty").val() == '') {
+ layer.msg("鏁伴噺蹇呴』涓烘暟閲忔垨灏忔暟", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
//if ($("#HSourceBillNo").val() == '') {
// layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
// return false;
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_POStockInBackBill.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_POStockInBackBill.html"
index 3d62a7e..42a9d36 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_POStockInBackBill.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_POStockInBackBill.html"
@@ -1045,7 +1045,21 @@
// }
// })
//}
- function AllowLoadData(sSubStr,bnt) { //闈炵┖楠岃瘉
+ function AllowLoadData(sSubStr, bnt) { //闈炵┖楠岃瘉
+ //鏁板瓧姝ｅ垯(鍖呭惈灏忔暟)
+ var reg = /^\d+(\.\d+)?$/;
+ if (reg.test($("#HQty").val()) == false || $("#HQty").val() == '') {
+ layer.msg("鏁伴噺蹇呴』涓烘暟閲忔垨灏忔暟", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (reg.test($("#HBarcodeQtys").val()) == false || $("#HBarcodeQtys").val() == '') {
+ layer.msg("鏉＄爜鏁伴噺蹇呴』涓烘暟閲忔垨灏忔暟", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (reg.test($("#HSumQtys").val()) == false || $("#HSumQtys").val() == '') {
+ layer.msg("鎬绘暟閲忓繀椤讳负鏁伴噺鎴栧皬鏁�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
//if ($("#HSourceBillNo").val() == '') {
// layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
// return false;
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 d0ecc67..9091a89 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"
@@ -1226,6 +1226,16 @@
$("#HDeptID").val(obj[0].HItemID);
}
function AllowLoadData(sSubStr, bnt) { //闈炵┖楠岃瘉
+ //鏁板瓧姝ｅ垯(鍖呭惈灏忔暟)
+ var reg = /^\d+(\.\d+)?$/;
+ if (reg.test($("#HQty").val()) == false || $("#HQty").val() == '') {
+ layer.msg("鏁伴噺蹇呴』涓烘暟閲忔垨灏忔暟", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (reg.test($("#Qty_B").val()) == false || $("#Qty_B").val() == '') {
+ layer.msg("鏁伴噺蹇呴』涓烘暟閲忔垨灏忔暟", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
//if ($("#HSourceBillNo").val() == '') {
// layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
// return false;
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
index f00ed20..57e11ae 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
@@ -1016,6 +1016,20 @@
// })
//}
function AllowLoadData(sSubStr, bnt) { //闈炵┖楠岃瘉
+ //鏁板瓧姝ｅ垯(鍖呭惈灏忔暟)
+ var reg = /^\d+(\.\d+)?$/;
+ if (reg.test($("#HQty").val()) == false || $("#HQty").val() == '') {
+ layer.msg("鏁伴噺蹇呴』涓烘暟閲忔垨灏忔暟", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (reg.test($("#HBarcodeQtys").val()) == false || $("#HBarcodeQtys").val() == '') {
+ layer.msg("鏉＄爜鏁伴噺蹇呴』涓烘暟閲忔垨灏忔暟", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (reg.test($("#HSumQtys").val()) == false || $("#HSumQtys").val() == '') {
+ layer.msg("鎬绘暟閲忓繀椤讳负鏁伴噺鎴栧皬鏁�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
//if ($("#HSourceBillNo").val() == '') {
// layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
// return false;
--
Gitblit v1.9.1