From 6fd6b4d8399cd5ce53b20ba2b865e7cee0f4cc9d Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 11 八月 2021 15:04:58 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/PublicPage/PartInformation.html | 27 ++-
WebTM/views/PublicPage/UserInformation.html | 21 +-
WebTM/views/PublicPage/DeptInformation.html | 30 ++-
WebTM/views/模治具管理/模具生产领用单/Sc_MouldProdOutBill_PDA.html | 49 +++---
WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html | 35 ++++
WebTM/views/PublicPage/WareHouseInformation.html | 31 ++-
WebTM/views/PublicPage/UnitInformation.html | 30 ++-
WebTM/views/ReportHtml.html | 22 ++
WebTM/views/生产管理/产量汇报单/Sc_ProductReportBillList.html | 7
WebTM/views/PublicPage/SupplierInformation.html | 30 ++-
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 71 ++++++---
WebTM/views/PublicPage/CustomerInformation.html | 19 +-
WebTM/views/模治具管理/模具生产退库单/Sc_MouldProdBackBill_PDA.html | 9
13 files changed, 242 insertions(+), 139 deletions(-)
diff --git a/WebTM/views/PublicPage/CustomerInformation.html b/WebTM/views/PublicPage/CustomerInformation.html
index 7fa9da4..5aa9ae7 100644
--- a/WebTM/views/PublicPage/CustomerInformation.html
+++ b/WebTM/views/PublicPage/CustomerInformation.html
@@ -87,7 +87,8 @@
, laydate = layui.laydate
, util = layui.util
, tree = layui.tree
- var sWhere = " where HStopFlag=0 and HUSEORGID = " + sessionStorage["OrganizationID"]+" ";
+ var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鏍戝瀷
+ var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鍒楄〃
tree.render({
elem: '#treeCustomer',
@@ -157,7 +158,7 @@
$.ajax({
url: GetWEBURL() + '/PublicPageMethod/CustomerList',
type: "GET",
- data: { "sWhere": SeachFilter(sWhere) },
+ data: { "sWhere": SeachFilter(sWhere1) },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -179,7 +180,7 @@
$.ajax({
url: GetWEBURL() + '/PublicPageMethod/CustomerList',
type: "GET",
- data: { "sWhere": SeachFilter(sWhere) },
+ data: { "sWhere": SeachFilter(sWhere1) },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -192,7 +193,7 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
- sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere1 = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
});
//浠ヤ笂鏄痩ayui妯″潡
@@ -205,7 +206,7 @@
$.ajax({
url: GetWEBURL() + '/Gy_MaintenanceMode/CustomerLoadTree',
type: "GET",
- data: { "sWhere": SeachFilter(sWhere) },
+ data: { "sWhere": sWhere },
async: false,
success: function (result) {
var data = result.data;
@@ -236,16 +237,16 @@
return treeData;
}
- function SeachFilter(sWhere) {
+ function SeachFilter(sWhere1) {
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
if (HNumber) {
- sWhere += " and HNumber like '%" + HNumber + "%'";
+ sWhere1 += " and HNumber like '%" + HNumber + "%'";
}
if (HName) {
- sWhere += " and HName like '%" + HName + "%'";
+ sWhere1 += " and HName like '%" + HName + "%'";
}
- return sWhere;
+ return sWhere1;
}
</script>
diff --git a/WebTM/views/PublicPage/DeptInformation.html b/WebTM/views/PublicPage/DeptInformation.html
index 7e1ed80..9b49b3b 100644
--- a/WebTM/views/PublicPage/DeptInformation.html
+++ b/WebTM/views/PublicPage/DeptInformation.html
@@ -87,7 +87,8 @@
, laydate = layui.laydate
, util = layui.util
, tree = layui.tree
- var sWhere = "";
+ var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鏍戝瀷
+ var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鍒楄〃
tree.render({
elem: '#treeDepartment',
@@ -156,7 +157,7 @@
$.ajax({
url: GetWEBURL() + '/PublicPageMethod/DeptList',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": SeachFilter(sWhere1) },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -175,18 +176,11 @@
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- var HNumber = $("#HNumber").val();
- var HName = $("#HName").val();
- if (HNumber) {
- sWhere += " and HNumber like '%" + HNumber + "%'";
- }
- if (HName) {
- sWhere += " and HName like '%" + HName + "%'";
- }
+
$.ajax({
url: GetWEBURL() + '/PublicPageMethod/DeptList',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": SeachFilter(sWhere1) },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -199,7 +193,7 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
- sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere1 = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
});
//浠ヤ笂鏄痩ayui妯″潡
@@ -243,7 +237,17 @@
return treeData;
}
-
+ function SeachFilter(sWhere1) {
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+ if (HNumber) {
+ sWhere1 += " and HNumber like '%" + HNumber + "%'";
+ }
+ if (HName) {
+ sWhere1 += " and HName like '%" + HName + "%'";
+ }
+ return sWhere1;
+ }
</script>
</body>
diff --git a/WebTM/views/PublicPage/PartInformation.html b/WebTM/views/PublicPage/PartInformation.html
index b3ddf5e..84e36d3 100644
--- a/WebTM/views/PublicPage/PartInformation.html
+++ b/WebTM/views/PublicPage/PartInformation.html
@@ -87,7 +87,8 @@
, laydate = layui.laydate
, util = layui.util
, tree = layui.tree
- var sWhere = "";
+ var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鏍戝瀷
+ var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鍒楄〃
tree.render({
elem: '#treePart',
@@ -157,7 +158,7 @@
$.ajax({
url: GetWEBURL() + '/PublicPageMethod/PartList',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": SeachFilter(sWhere1) },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -176,18 +177,11 @@
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- var HNumber = $("#HNumber").val();
- var HName = $("#HName").val();
- if (HNumber) {
- sWhere += " and HNumber like '%" + HNumber + "%'";
- }
- if (HName) {
- sWhere += " and HName like '%" + HName + "%'";
- }
+
$.ajax({
url: GetWEBURL() + '/PublicPageMethod/PartList',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": SeachFilter(sWhere1) },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -244,6 +238,17 @@
return treeData;
}
+ function SeachFilter(sWhere1) {
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+ if (HNumber) {
+ sWhere += " and HNumber like '%" + HNumber + "%'";
+ }
+ if (HName) {
+ sWhere += " and HName like '%" + HName + "%'";
+ }
+ return sWhere1;
+ }
</script>
diff --git a/WebTM/views/PublicPage/SupplierInformation.html b/WebTM/views/PublicPage/SupplierInformation.html
index 3591084..e4f77e7 100644
--- a/WebTM/views/PublicPage/SupplierInformation.html
+++ b/WebTM/views/PublicPage/SupplierInformation.html
@@ -87,7 +87,8 @@
, laydate = layui.laydate
, util = layui.util
, tree = layui.tree
- var sWhere = "";
+ var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鏍戝瀷
+ var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鍒楄〃
tree.render({
elem: '#treeSupplier',
@@ -156,7 +157,7 @@
$.ajax({
url: GetWEBURL() + '/PublicPageMethod/SupplierList',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": SeachFilter(sWhere1) },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -175,18 +176,11 @@
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- var HNumber = $("#HNumber").val();
- var HName = $("#HName").val();
- if (HNumber) {
- sWhere += " and HNumber like '%" + HNumber + "%'";
- }
- if (HName) {
- sWhere += " and HName like '%" + HName + "%'";
- }
+
$.ajax({
url: GetWEBURL() + '/PublicPageMethod/SupplierList',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": SeachFilter(sWhere1) },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -199,7 +193,7 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
- sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere1 = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
});
//浠ヤ笂鏄痩ayui妯″潡
@@ -243,7 +237,17 @@
return treeData;
}
-
+ function SeachFilter(sWhere1) {
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+ if (HNumber) {
+ sWhere1 += " and HNumber like '%" + HNumber + "%'";
+ }
+ if (HName) {
+ sWhere1 += " and HName like '%" + HName + "%'";
+ }
+ return sWhere1;
+ }
</script>
</body>
diff --git a/WebTM/views/PublicPage/UnitInformation.html b/WebTM/views/PublicPage/UnitInformation.html
index e45ee86..204f90c 100644
--- a/WebTM/views/PublicPage/UnitInformation.html
+++ b/WebTM/views/PublicPage/UnitInformation.html
@@ -87,7 +87,8 @@
, laydate = layui.laydate
, util = layui.util
, tree = layui.tree
- var sWhere = "";
+ var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鏍戝瀷
+ var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鍒楄〃
tree.render({
elem: '#treeUnit',
@@ -156,7 +157,7 @@
$.ajax({
url: GetWEBURL() + '/PublicPageMethod/UnitList',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": SeachFilter(sWhere1) },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -175,18 +176,11 @@
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- var HNumber = $("#HNumber").val();
- var HName = $("#HName").val();
- if (HNumber) {
- sWhere += " and HNumber like '%" + HNumber + "%'";
- }
- if (HName) {
- sWhere += " and HName like '%" + HName + "%'";
- }
+
$.ajax({
url: GetWEBURL() + '/PublicPageMethod/UnitList',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": SeachFilter(sWhere1) },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -199,7 +193,7 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
- sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere1 = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
});
//浠ヤ笂鏄痩ayui妯″潡
@@ -243,7 +237,17 @@
return treeData;
}
-
+ function SeachFilter(sWhere1) {
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+ if (HNumber) {
+ sWhere1 += " and HNumber like '%" + HNumber + "%'";
+ }
+ if (HName) {
+ sWhere1 += " and HName like '%" + HName + "%'";
+ }
+ return sWhere1;
+ }
</script>
</body>
diff --git a/WebTM/views/PublicPage/UserInformation.html b/WebTM/views/PublicPage/UserInformation.html
index 3d7704b..afdf42c 100644
--- a/WebTM/views/PublicPage/UserInformation.html
+++ b/WebTM/views/PublicPage/UserInformation.html
@@ -33,7 +33,7 @@
<div class="layui-col-xs3 layui-inline" style="width: 23%;">
<div id="treeUser" lay-filter="treeUser" class="demo-tree demo-tree-box" style="height: 580px; overflow: scroll;"></div>
</div>
- <div class="layui-col-xs9 layui-inline">
+ <div class="layui-col-xs9 layui-inline" style="width: 74%;">
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">浠ｇ爜</label>
@@ -87,7 +87,8 @@
, laydate = layui.laydate
, util = layui.util
, tree = layui.tree
- var sWhere = " where HStopFlag=0 and HUSEORGID = " + sessionStorage["OrganizationID"] + " ";
+ var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鏍戝瀷
+ var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鍒楄〃
tree.render({
elem: '#treeUser',
@@ -156,7 +157,7 @@
$.ajax({
url: GetWEBURL() + '/PublicPageMethod/UserList',
type: "GET",
- data: { "sWhere": SeachFilter(sWhere) },
+ data: { "sWhere": SeachFilter(sWhere1) },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -179,7 +180,7 @@
$.ajax({
url: GetWEBURL() + '/PublicPageMethod/UserList',
type: "GET",
- data: { "sWhere": SeachFilter(sWhere) },
+ data: { "sWhere": SeachFilter(sWhere1) },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -192,7 +193,7 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
- sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere1 = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
});
//浠ヤ笂鏄痩ayui妯″潡
@@ -205,7 +206,7 @@
$.ajax({
url: GetWEBURL() + '/Gy_MaintenanceMode/UserLoadTree',
type: "GET",
- data: { "sWhere": SeachFilter(sWhere) },
+ data: { "sWhere": sWhere },
async: false,
success: function (result) {
var data = result.data;
@@ -236,17 +237,17 @@
return treeData;
}
- function SeachFilter(sWhere)
+ function SeachFilter(sWhere1)
{
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
if (HNumber) {
- sWhere += " and HNumber like '%" + HNumber + "%'";
+ sWhere1 += " and HNumber like '%" + HNumber + "%'";
}
if (HName) {
- sWhere += " and HName like '%" + HName + "%'";
+ sWhere1 += " and HName like '%" + HName + "%'";
}
- return sWhere;
+ return sWhere1;
}
</script>
diff --git a/WebTM/views/PublicPage/WareHouseInformation.html b/WebTM/views/PublicPage/WareHouseInformation.html
index b495457..23c194a 100644
--- a/WebTM/views/PublicPage/WareHouseInformation.html
+++ b/WebTM/views/PublicPage/WareHouseInformation.html
@@ -87,7 +87,9 @@
, laydate = layui.laydate
, util = layui.util
, tree = layui.tree
- var sWhere = "";
+
+ var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鏍戝瀷
+ var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鍒楄〃
tree.render({
elem: '#treeWareHouse',
@@ -156,7 +158,7 @@
$.ajax({
url: GetWEBURL() + '/PublicPageMethod/WareHouseList',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": SeachFilter(sWhere1) },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -175,18 +177,11 @@
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- var HNumber = $("#HNumber").val();
- var HName = $("#HName").val();
- if (HNumber) {
- sWhere += " and HNumber like '%" + HNumber + "%'";
- }
- if (HName) {
- sWhere += " and HName like '%" + HName + "%'";
- }
+
$.ajax({
url: GetWEBURL() + '/PublicPageMethod/WareHouseList',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": SeachFilter(sWhere1) },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -199,7 +194,7 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
- sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere1 = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
});
//浠ヤ笂鏄痩ayui妯″潡
@@ -243,7 +238,17 @@
return treeData;
}
-
+ function SeachFilter(sWhere1) {
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+ if (HNumber) {
+ sWhere1 += " and HNumber like '%" + HNumber + "%'";
+ }
+ if (HName) {
+ sWhere1 += " and HName like '%" + HName + "%'";
+ }
+ return sWhere1;
+ }
</script>
</body>
diff --git a/WebTM/views/ReportHtml.html b/WebTM/views/ReportHtml.html
index 08c741c..f845922 100644
--- a/WebTM/views/ReportHtml.html
+++ b/WebTM/views/ReportHtml.html
@@ -198,9 +198,10 @@
async: false,
dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
success: function (data1) {
+ console.log(data1);
for (var key in data1.list)
{
- resultTableHead.push({ "id": data1.list[key], "name": data1.list[key] });
+ resultTableHead.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
}
set_InitGrid(sWhere);
}, error: function (err) {
@@ -217,26 +218,39 @@
//濉厖琛ㄦ牸澶存暟缁�
var data = resultTableHead;
cols_arr[0] = [];
- cols_arr[0][0] = { checkbox: true, fixed: true };
+ cols_arr[0][0] = { checkbox: true, fixed: true, totalRowText: '鍚堣' };
for (var i = 0; i < data.length; i++) {
if (data[i].name == 'HItemID') {
cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true }; //闅愯棌id鍒�
}
else
{
- cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center'};
+ 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/ReportFromBillList',
- toolbar: '#toolbarDemo', //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
+ //toolbar: '#toolbarDemo', //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
title: '鐢ㄦ埛鏁版嵁琛�',
cols: cols_arr, //濉厖琛ㄦ牸澶存暟鎹�,
id: 'layTable', //琛ㄦ牸id
where: { sWhere: sWhere}, //鎵╁睍鍙傛暟,鍙互浼犳暟鎹埌鍚庡彴
page: true, //寮�鍚垎椤�
+ totalRow: true, //寮�鍚悎璁�
limit: 10, //涓�椤佃兘澶熸樉绀虹殑鏈�澶ф暟鐩�
limits: [10, 20, 40, 60,80,100], //鎺у埗澶氬皯琛屼竴椤碉紙榛樿浜旀潯涓�椤碉級
method: 'get', //鎻愪氦鏂瑰紡
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_MouldProdBackBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_MouldProdBackBill_PDA.html"
index 1e21e10..c4b3fef 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_MouldProdBackBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_MouldProdBackBill_PDA.html"
@@ -350,6 +350,9 @@
//鏉″舰鐮佸洖杞︽柟娉�
$('#HBarCode').on('keydown', function (event) {
var HBarCode = $('#HBarCode').val();
+ var HInterID = $('#HInterID').val();
+ var HWHID = $('#HWHID').val();
+ var HSPID = $('#HSPID').val();
if (event.keyCode == 13) {
if (!HBarCode) {
layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
@@ -359,16 +362,16 @@
$.ajax({
url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
type: "GET",
- data: { "HBarCode": HBarCode },
+ data: { "HBarCode": HBarCode, "HInterID": HInterID, "HWHID": HWHID, "HSPID": HSPID },
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,
+ "HBarSpec": data.HModel2,
"HBarModel": data.HModel2,
"HDesignLife": data.HDesignLife,
+ "HLastUseLife": data.HLastUseLife,
"HLeaveLife": data.HLeaveLife
});
$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA.html"
index 935cebd..db7bc6f 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA.html"
@@ -97,7 +97,7 @@
<label class="layui-form-label" style="width: 75px;">浠撳簱:</label>
<div class="layui-input-block">
<input type="text" name="HWHName" id="HWHName" class="layui-input" style="width:80%;">
- <input type="hidden" name="HWHID" id="HWHID" class="layui-input">
+ <input type="hidden" name="HWHID" id="HWHID" value="0" class="layui-input">
<button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Warehouse" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -107,7 +107,7 @@
<label class="layui-form-label" style="width: 75px;">浠撲綅:</label>
<div class="layui-input-block">
<input type="text" name="HSPName" id="HSPName" class="layui-input" style="width:80%;">
- <input type="hidden" name="HSPID" id="HSPID" class="layui-input">
+ <input type="hidden" name="HSPID" id="HSPID" value="0" class="layui-input">
<button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="StockPlace" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -314,10 +314,10 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3802' },
+ data: { "HBillType": '3796' },
success: function (d) {
- //console.log(d.data);
- $("#HInterID").val("0");
+ console.log(d.data);
+ $("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
}
});
@@ -326,6 +326,10 @@
//鏉″舰鐮佸洖杞︽柟娉�
$('#HBarCode').on('keydown', function (event) {
var HBarCode = $('#HBarCode').val();
+ var HInterID = $('#HInterID').val();
+ var HWHID = $('#HWHID').val();
+ var HSPID = $('#HSPID').val();
+
if (event.keyCode == 13) {
if (!HBarCode) {
layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
@@ -335,16 +339,16 @@
$.ajax({
url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
type: "GET",
- data: { "HBarCode": HBarCode },
+ data: { "HBarCode": HBarCode, "HInterID": HInterID, "HWHID": HWHID, "HSPID": HSPID },
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HMouldID":data.hinterid,
+ //"HMouldID": data.HMaterIDField,
"HBarName": data.HName,
- "HBarSpec": data.HModel,
+ "HBarSpec": data.HModel2,
"HBarModel": data.HModel2,
- "HLeaveLife": data.HLeaveLife
+ "HLeaveLife": data.HDesignLife
});
$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
$("#HBarCode").css("background-color", "#efefef4d");
@@ -375,20 +379,21 @@
//鎻愪氦
form.on('submit(Saver)', function (data) {
- if (!$("#HBarCode").val()) {
- layer.msg("璇锋壂鎻忔ā娌诲叿鏉＄爜!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if (!$("#HWHID").val()) {
- layer.msg("璇烽�夋嫨浠撳簱!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if (!$("#HSPID").val()) {
- layer.msg("璇烽�夋嫨浠撲綅!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
+ //if (!$("#HBarCode").val()) {
+ // layer.msg("璇锋壂鎻忔ā娌诲叿鏉＄爜!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
+ //if (!$("#HWHID").val()) {
+ // layer.msg("璇烽�夋嫨浠撳簱!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
+ //if (!$("#HSPID").val()) {
+ // layer.msg("璇烽�夋嫨浠撲綅!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
var sMainSub = JSON.stringify(data.field);
+ //var sMainSub = { "HBarCode": "X60201609060002", "HWHName": "浜屽巶浜旈噾濉戣兌浠撳簱", "HWHID": "189470", "HSPName": "A1 - 2", "HSPID": "100228", "HBillNo": "MJLY00000091", "HInterID": "147", "HDate": "2021 - 08 - 02 15: 31: 41", "HDeptName": "宸ョ▼閮�", "HDeptID": "121472", "HManagerName": "Admin", "HManagerID": "001", "HBarName": "椤舵潌", "HMouldID": "", "HBarSpec": "16156 - 8", "HBarModel": "16156 - 8", "HQty": "1", "HLeaveLife": "0", "HMaker": "Admin", "HMakeDate": "2021 - 08 - 02 15: 31: 41", "HUpDater": "", "HUpDateDate": "", "HChecker": "", "HCheckDate": "", "HDeleteMan": "", "HDeleteDate": "", "lngBillKey": "", "lngBillSubKey": "" };
var index = layer.load();
$.ajax({
type: "POST",
@@ -399,7 +404,7 @@
success: function (data) {
if (data.count == 1) {
layer.close(index);
- layer.msg("鎻愪氦鎴愬姛");
+ layer.msg(data.Message);
$('#Saver').removeClass("buttom_box_little");
$('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList.html"
index cdb9be5..73e6d93 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList.html"
@@ -285,7 +285,7 @@
{
type: "GET",
url: GetWEBURL() + "/Sc_MESBeginWorkBill/SaveGetMESProductReportBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: false,
+ async: true,
data: { "ScMaxWork": ScMaxWork(), "HSourceBillType": HSourceBillType, "workcode": workcode, "HSourceID": HSourceID, "HICMOInterID": (HICMOInterID == "null" ? 0 : HICMOInterID), "HICMOEntryID": (HICMOEntryID == "null" ? 0 : HICMOEntryID), "HMaker": HMaker, "Czybm": Czybm },
dataType: "json",
beforeSend: function () {
@@ -293,17 +293,20 @@
},
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $('#AskReport').removeClass("layui-btn-disabled").attr("disabled", false);
layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
layer.close(layer.index);
window.parent.location.reload();
});
}
else {
- layer.alert(data.Message, { icon: 5 })
+ layer.alert(data.Message, { icon: 5 })
+ $('#AskReport').removeClass("layui-btn-disabled").attr("disabled", false);
}
},
error: function (err) {
layer.alert(data.Message, { icon: 5 })
+ $('#AskReport').removeClass("layui-btn-disabled").attr("disabled", 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 6129296..9e34e8b 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"
@@ -958,6 +958,7 @@
data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ GetSellOutFindSP();
$("#HSupID").val(result.data[0].HSupID);
$("#HSupName").val(result.data[0].HSupName);
//$("#HDeptID").val(result.data[0].HDeptID);
@@ -1015,32 +1016,56 @@
});
//鎵簮鍗曟煡璐�
- $('#HSourceBillNo').on('keydown', function (event) {
+ //$('#HSourceBillNo').on('keydown', function (event) {
+ // var HSourceBillNo = $('#HSourceBillNo').val();
+ // if (event.keyCode == 13) {
+ // var index = layer.load(0);
+ // $.ajax({
+ // url: GetWEBURL() + "/LookingFor/GetSellOutFindSP",
+ // type: "GET",
+ // data: { "HbillNo": HSourceBillNo },
+ // success: function (result) {
+ // if (result.count == 1) {
+ // ZHOption.data = result.data;
+ // table.render(ZHOption);
+ // layer.close(index);
+ // element.tabChange('tab-SellOutBill', '5');
+ // }
+ // else {
+ // layer.close(index);
+ // layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // }
+ // }, error: function () {
+ // layer.close(index);
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ // });
+ // }
+ //});
+
+
+ //鎵簮鍗曟煡璐�
+ function GetSellOutFindSP() {
var HSourceBillNo = $('#HSourceBillNo').val();
- if (event.keyCode == 13) {
- var index = layer.load(0);
- $.ajax({
- url: GetWEBURL() + "/LookingFor/GetSellOutFindSP",
- type: "GET",
- data: { "HbillNo": HSourceBillNo },
- success: function (result) {
- if (result.count == 1) {
- ZHOption.data = result.data;
- table.render(ZHOption);
- layer.close(index);
- element.tabChange('tab-SellOutBill', '5');
- }
- else {
- layer.close(index);
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- }, error: function () {
+ $.ajax({
+ url: GetWEBURL() + "/LookingFor/GetSellOutFindSP",
+ type: "GET",
+ data: { "HbillNo": HSourceBillNo },
+ success: function (result) {
+ if (result.count == 1) {
+ ZHOption.data = result.data;
+ table.render(ZHOption);
layer.close(index);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ element.tabChange('tab-SellOutBill', '5');
}
- });
- }
- });
+ else {
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
//浠ヤ笂涓簂ayui妯″潡
});
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 08cc359..0534f5b 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"
@@ -470,12 +470,39 @@
});
+ //$('#HStockPlaceName').on('keydown', function (event) { //鎵粨浣�
+ // var HBarCode = $('#HStockPlaceName').val()
+ // if (event.keyCode == 13) {
+ // //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
+ // $.ajax({
+ // url: GetWEBURL() + "/Web/GetSpName_Json",
+ // type: "GET",
+ // data: { "HBarCode": HBarCode },
+ // success: function (result) {
+ // if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ // $("#HStockPlaceName").val(result.data[0].HName);
+ // $("#HStockPlaceID").val(result.data[0].HItemID);
+ // $("#HWHID").val(result.data[0].HWHID);
+ // $("#HWHNAME").val(result.data[0].HWhName);
+ // element.tabChange('tab-MateOutBill', '2');
+ // }
+ // else {
+ // layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // }
+ // layer.closeAll("loading");
+ // }
+ // });
+ // }
+ //});
+
+
+ //鎵粨浣�
$('#HStockPlaceName').on('keydown', function (event) { //鎵粨浣�
var HBarCode = $('#HStockPlaceName').val()
if (event.keyCode == 13) {
//鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
$.ajax({
- url: GetWEBURL() + "/Web/GetSpName_Json",
+ url: GetWEBURL() + "/LookingFor/getSpName_Json",
type: "GET",
data: { "HBarCode": HBarCode },
success: function (result) {
@@ -484,10 +511,12 @@
$("#HStockPlaceID").val(result.data[0].HItemID);
$("#HWHID").val(result.data[0].HWHID);
$("#HWHNAME").val(result.data[0].HWhName);
- element.tabChange('tab-MateOutBill', '2');
+ element.tabChange('tab-ProductlnBill', '2');
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // $("#verifycode").click();
+ //layer.msg(result.Message, { icon: 5 });
+ layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
layer.closeAll("loading");
}
--
Gitblit v1.9.1