From 904a7c349b4d6dbdcbd2a95d0a66582ee43e81fa Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 07 七月 2022 15:44:21 +0800
Subject: [PATCH] 所有扫码模决单据内码获取方式用最新的
---
WebTM/views/验收入库/其他入库/Kf_OtherInBill_Fast.html | 65 ++++------
WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html | 2
WebTM/views/领料发货/领料出库/Kf_MateOutBackBill_Fast.html | 2
WebTM/views/验收入库/其他入库/Kf_OtherInBill_FastList.html | 230 ++++++++++++++++++-------------------
WebTM/views/领料发货/销售出库/Kf_SellOutBackBill_Fast.html | 2
WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html | 2
WebTM/views/生产管理/生产拆箱单/Sc_PackSplitBill_Fast.html | 2
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html | 4
WebTM/views/生产管理/生产汇报单/Sc_ICMOReportBill_FastNew.html | 2
WebTM/views/验收入库/外购入库/Kf_POStockInBackBill.html | 2
WebTM/views/领料发货/其他出库/Kf_OtherOutBill_Fast.html | 4
WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html | 2
WebTM/views/领料发货/其他出库/Kf_OtherOutBill_Check.html | 2
WebTM/views/验收入库/委外入库/Kf_EntrustInBill_Fast.html | 2
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockOutBill_Fast.html | 2
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html | 1
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 4
WebTM/views/验收入库/其他入库/Kf_RedOtherInBill_Fast.html | 2
WebTM/views/领料发货/委外出库/Kf_EntrustOutBill_Fast.html | 2
WebTM/views/验收入库/产品入库/Kf_ProductInBackBill.html | 2
20 files changed, 161 insertions(+), 175 deletions(-)
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 16bde89..4c15c84 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"
@@ -495,7 +495,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '1207' },
success: function (d) {
@@ -870,7 +870,7 @@
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
- layer.confirm("鐢熸垚璋冩嫧鍗�" + data.Message + $("#HBillNo").val(), {
+ layer.confirm(data.Message , {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
btn2: function () {
//parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
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 49211f7..e488bc7 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"
@@ -446,7 +446,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '1250' },
success: function (d) {
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/Gy_MouldFile.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/Gy_MouldFile.html"
index 201799d..3695598 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/Gy_MouldFile.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/Gy_MouldFile.html"
@@ -1168,6 +1168,7 @@
//$("#HSPGroupID").val(d.data[0].HSPGroupID);
$("#HSPID").val(d.data[0].HSPID);
$("#HSPName").val(d.data[0].榛樿浠撲綅);
+ $("#HBarCode").var(d.data[0].鏉$爜缂栧彿);
//$("#HInitDesignLife").val(d.data[0].HInitDesignLife);
//$("#HInitModel").val(d.data[0].HInitModel);
$("#HDesignLife").val(d.data[0].鍒濆璁捐瀵垮懡);
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 cb94778..12f8b79 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"
@@ -305,7 +305,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '3784' },
success: function (d) {
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 f8f7dc4..4be4822 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"
@@ -366,7 +366,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '3711' },
success: function (d) {
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 8e52e76..a3527f3 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"
@@ -290,7 +290,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
//url: GetWEBURL() + "/Web/UpdatePOInStockBillPrintQty", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
type: "GET",
data: { "HBillType": '1201' },
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 d9a0380..730e327 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"
@@ -318,7 +318,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '1206' },
success: function (d) {
@@ -608,7 +608,7 @@
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message + $("#HBillNo").val(), { icon: 1 });
+ layer.msg(data.Message, { icon: 1 });
}
else {
layer.msg(data.Message, { icon: 5 });
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 75de0b1..79f97ca 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"
@@ -467,7 +467,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '1211' },
success: function (d) {
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 8540a2c..45fe1f9 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"
@@ -380,7 +380,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '1247' },
success: function (d) {
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 3fac444..0562655 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"
@@ -538,7 +538,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '1205' },
success: function (d) {
@@ -897,7 +897,7 @@
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
- layer.confirm(data.Message + $("#HBillNo").val(), {
+ layer.confirm(data.Message , {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
btn2: function () {
//parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
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 53e1394..1643552 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"
@@ -502,7 +502,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '1244' },
success: function (d) {
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 7016906..fb30e13 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"
@@ -503,7 +503,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '1204' },
success: function (d) {
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 c441a71..807283e 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"
@@ -323,7 +323,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '1245' },
success: function (d) {
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_ProductInBill_Fast.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_ProductInBill_Fast.html"
index 8cc3818..be596dd 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_ProductInBill_Fast.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_ProductInBill_Fast.html"
@@ -517,7 +517,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '1202' },
success: function (d) {
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 fda988d..edf8ef6 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"
@@ -337,7 +337,7 @@
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '1203' },
success: function (d) {
@@ -757,45 +757,36 @@
var sMain = sMainStr;
var sSubStr = table.cache['wl-table'];
var sSourceType = $("#HBillType").val();
- if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
- {
- layer.load(3);
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/OtherInStockBill/set_SaveOtherInStockBill_Json",
- //url: "http://localhost:12761/OtherInStockBill/set_SaveOtherInStockBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "oMain": sMain },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message + $("#HBillNo").val(), { icon: 1 });
- //
- //Sub_ClearBill();
- //
- //鐏板害鎻愪氦鎸夐挳Saver
- document.getElementById("Saver").disabled = false;
- }
- else {
- layer.msg(data.Message, { icon: 5 });
- //鐏板害鎻愪氦鎸夐挳Saver
- document.getElementById("Saver").disabled = false;
- }
- layer.closeAll("loading");
- },
- error: function (err) {
- layer.msg("閿欒:" + err, { icon: 5 });
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/OtherInStockBill/set_SaveOtherInStockBill_Json",
+ //url: "http://localhost:12761/OtherInStockBill/set_SaveOtherInStockBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "oMain": sMain },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message , { icon: 1 });
+ //
+ //Sub_ClearBill();
+ //
//鐏板害鎻愪氦鎸夐挳Saver
document.getElementById("Saver").disabled = false;
}
- });
- }
- else {
- layer.msg("鏁版嵁涓嶅畬鏁达紝涓嶅厑璁告彁浜�:", { icon: 5 });
- //鐏板害鎻愪氦鎸夐挳Saver
- document.getElementById("Saver").disabled = false;
- }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ //鐏板害鎻愪氦鎸夐挳Saver
+ document.getElementById("Saver").disabled = false;
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ //鐏板害鎻愪氦鎸夐挳Saver
+ document.getElementById("Saver").disabled = 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_FastList.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_FastList.html"
index e6a9def..2c59f83 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_FastList.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_FastList.html"
@@ -123,19 +123,69 @@
, element = layui.element;
//娓呯┖鐣岄潰 new
- var sBillType = '1203'
+ var sBillType = '1203';
+ var col = [];
//鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
//鍔犺浇婧愬崟绫诲瀷
+ set_ClearBill();
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ get_Display();
+ //宸蹭笂浼犲垪琛�
+ table.render({
+ elem: '#yd-table'
+ , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
+ , toolbar: '#toolbarDemo'
+ , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+ , page: true // 寮�鍚垎椤�
+ , limits: [20, 40, 80, 100]
+ , limit: 20
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
+ , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
+ , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
+ , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HQty', title: '鏁伴噺', width: 100 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ , { field: 'HOrgID', title: '缁勭粐', width: 120 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ })
+ //宸蹭笂浼犳煡璇�
+ table.render({
+ elem: '#sy-table'
+ , toolbar: '#toolbarDemo'
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
+ , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
+ , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
+ , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HQty', title: '鏁伴噺', width: 100 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ , { field: 'HOrgID', title: '缁勭粐', width: 120 }
+ ]]
+ , height: 500
+ })
+ }
- //璇诲彇鍗曟嵁鍒楄〃
- //
-
+ //閫�鍑�
form.on('submit(Cancel)', function () {
parent.location.href = "../../../views/index.html"
//window.close();//鍏抽棴褰撳墠椤�
})
-
+ //缂栬緫
form.on('submit(cmdModify)', function () {
var checkStatus = table.checkStatus('dj-table')
, data = checkStatus.data;
@@ -156,30 +206,10 @@
})
});
-
- form.on('submit(cmdRefresh)', function () {//鍒锋柊
+ //鍒锋柊
+ form.on('submit(cmdRefresh)', function () {
+ get_Display();
table.render({
- elem: '#dj-table'
- , url: GetWEBURL() + '/Web/chanpinruk'
- , toolbar: '#toolbarDemo'
- , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
- , cols: [[
- { type: 'radio' }
- , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
- , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
- , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
- , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
- , { field: 'HQty', title: '鏁伴噺', width: 100 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 120 }
- , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
- ]]
- , height: 500
- , done: function () {
- layer.closeAll("loading");
- }
- }),
- table.render({
elem: '#yd-table'
, url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
, toolbar: '#toolbarDemo'
@@ -206,8 +236,7 @@
}
})
});
-
-
+
//鎾ら攢鍔熻兘
form.on('submit(cmdRescind)', function () {
var checkStatus = table.checkStatus('yd-table')
@@ -267,26 +296,7 @@
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- //layer.msg(data.Message, { icon: 1 });
- table.render({
- elem: '#dj-table'
- , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
- , cellMinWidth: 80
- , toolbar: '#toolbarDemo'
- , where: { HBillType: '1203', sWhere: '' }
- , cols: [[
- { type: 'radio' }
- , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
- , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
- , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
- , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
- , { field: 'HQty', title: '鏁伴噺', width: 100 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
- , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 100 }
- , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
- ]]
- , height: 500
- })
+ get_Display();
}
else {
layer.msg(data.Message, { icon: 2 });
@@ -333,77 +343,61 @@
});
-
- table.render({
- elem: '#dj-table'
- , url: GetWEBURL() + '/Web/chanpinruk'
- , toolbar: '#toolbarDemo'
- , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
- , cols: [[
- { type: 'radio' }
- , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
- , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
- , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
- , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
- , { field: 'HQty', title: '鏁伴噺', width: 100 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 120 }
- , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
- ]]
- , height: 500
- , done: function () {
- layer.closeAll("loading");
- }
- })
+ //鍔犺浇缂撳瓨鍒楄〃鏁版嵁
+ function get_Display() {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Web/GetOtherInBillMain_TempList_New',
+ type: "GET",
+ data: { "HBillType": sBillType, "sHMaker": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"]},
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ for (var i = 0; i < data.length; i++) {
+ if (data[i].name == '鍗曟嵁鍐呯爜' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
- //宸蹭笂浼犲垪琛�
- table.render({
- elem: '#yd-table'
- , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
- , toolbar: '#toolbarDemo'
- , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
- , page: true // 寮�鍚垎椤�
- , limits: [20, 40, 80, 100]
- , limit: 20
- , cols: [[
- { type: 'radio' }
- , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
- , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
- , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
- , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
- , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
- , { field: 'HQty', title: '鏁伴噺', width: 100 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HOrgID', title: '缁勭粐', width: 120 }
- ]]
- , height: 500
- , done: function () {
- layer.closeAll("loading");
- }
- })
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ table.render({
+ elem: '#dj-table'
+ , cols: [col]
+ , data: data1.data
+ , height: 550
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ });
- //宸蹭笂浼犳煡璇�
- table.render({
- elem: '#sy-table'
- , toolbar: '#toolbarDemo'
- , cols: [[
- { type: 'radio' }
- , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
- , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
- , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
- , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
- , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
- , { field: 'HQty', title: '鏁伴噺', width: 100 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HOrgID', title: '缁勭粐', width: 120 }
- ]]
- , height: 500
- })
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
//鍒锋柊鏄庣粏椤电
table.render({
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_RedOtherInBill_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_RedOtherInBill_Fast.html"
index 57cd04e..6697d8e 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_RedOtherInBill_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_RedOtherInBill_Fast.html"
@@ -256,7 +256,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '1203' },
success: function (d) {
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 56244d4..2f56366 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"
@@ -413,7 +413,7 @@
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '1239' },
success: function (d) {
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 181e252..6514610 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"
@@ -514,7 +514,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
//url: GetWEBURL() + "/Web/UpdatePOInStockBillPrintQty", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
type: "GET",
data: { "HBillType": '1201' },
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 1d84e34..89c38f4 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"
@@ -384,7 +384,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '1210' },
success: function (d) {
--
Gitblit v1.9.1