From c6576d875f3f55813b2812d6dc37d87a045f8a6b Mon Sep 17 00:00:00 2001
From: pzy <2829717936@qq.com>
Date: 星期一, 30 九月 2024 10:35:58 +0800
Subject: [PATCH] 1
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html | 239 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 177 insertions(+), 62 deletions(-)
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
index 9554a58..1ac3614 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
@@ -291,6 +291,7 @@
var linterid = params[params[0]];
var lentryid = params[params[1]];
var type = params[params[2]];
+ var mergeTags = params[params[3]];
//鍘熺敓鎴愭潯鐮佹柟娉�(閫佽揣鍗曢粯璁�)
var mainUrl = "GetHBarCodeShowBillMain"; //琛ㄥご鏁版嵁鍔犺浇ajax
var subUrl = "GetHBarCodeShowBillSub";//琛ㄤ綋鏁版嵁鍔犺浇ajax h_v_SRM_POInStockBillSub_ForWeb2
@@ -346,6 +347,68 @@
, layer = layui.layer
, laydate = layui.laydate
, element = layui.element; //Tab鐨勫垏鎹㈠姛鑳斤紝鍒囨崲浜嬩欢鐩戝惉绛夛紝闇�瑕佷緷璧杄lement妯″潡
+
+ var option;
+
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , limit: 500
+ , height: 500
+ , loading: false
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+ , { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', width: 120 }
+ , { field: 'HOldMaterNumber', title: '鏃х墿鏂欑紪鐮�', width: 120, hide: true }
+ , { field: 'HMaterShortNumber', title: '鐗╂枡浠ｇ爜', width: 120, hide: true }
+ , { field: 'HSubjoin', title: '鐗╂枡浠ｇ爜', width: 120, hide: true }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 120 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 120 }
+ , { field: 'HUnitName', title: '璁￠噺鍗曚綅', width: 100 }
+ , { field: 'HUnitNumber', title: '璁￠噺鍗曚綅浠ｇ爜', width: 100, hide: true }
+ , { field: 'HUnitID', title: '璁￠噺鍗曚綅ID', width: 100, hide: true }
+ , { field: 'HDDQty', title: '璁㈠崟鏁伴噺', width: 100 }
+ , { field: 'HMrbQty', title: '閫�鏂欐暟閲�', width: 100, hide: true }
+ , { field: 'HBarcodeCount', title: '宸茬敓鎴愭潯鐮佹暟閲�', width: 135 }
+ , { field: 'HNotBarcodeCount', title: '鍙敓鎴愭潯鐮佹暟閲�', width: 135 }
+ , { field: 'HQty', title: '鏈鐢熸垚鏉＄爜鏁伴噺', width: 135, edit: 'text', event: "inputHQty" }
+ , { field: 'HMinQty', title: '鍐呯鍖呰鏁�', width: 100, edit: 'text', event: "inputHMinQty" }
+ , { field: 'HBQty', title: '鍐呯鏁�', width: 100 }
+ , { field: 'HWXQty', title: '澶栫鍖呰鏁�', width: 100, edit: 'text', event: "inputHWXQty" }
+ , { field: 'HWBQty', title: '澶栫鏁�', width: 100 }
+ , { field: 'HPrice', title: '鍗曚环', width: 100, hide: true }
+ , { field: 'HMoney', title: '閲戦', width: 100, hide: true }
+ , { field: 'HMTONO', title: '璁″垝璺熻釜鍗曞彿', width: 100, hide: true }
+ , { field: 'HBatchNo', title: '鎵瑰彿', width: 100, edit: 'text' }
+ , { field: 'HBatchManager', title: '鍚敤鎵瑰彿', width: 100, hide: true }
+ , { field: 'HISKFPERIOD', title: '鏄惁鍚敤淇濊川鏈�', width: 100, edit: 'text', hide: true }
+ , { field: 'HEXPUNIT', title: '淇濊川鏈熷崟浣�', width: 100, edit: 'text', hide: true }
+ , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }//, event: "chooseHKFDate"
+ , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100 }//
+ , { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDQDate' }//, event: "chooseHKFDQDate"
+ , { field: 'HSupMaterNumber', title: '渚涘簲鍟嗘枡鍙�', width: 100, edit: 'text' }
+ , { field: 'HSupBatchNo', title: '渚涘簲鍟嗘壒娆�', width: 100, edit: 'text' }
+ //, { field: 'HBeginDate', title: '鐢熶骇鏃ユ湡', width: 120, data_field: 'HBeginDate', event: "chooseHBeginDate" }
+ //, { field: 'HEndDate', title: '澶辨晥鏃ユ湡', width: 120, data_field: 'HEndDate', event: "chooseHEndDate" }
+ //, { field: 'HDate', title: '瑕佹眰浜よ揣鏃ユ湡', width: 150 }
+ , { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟涓诲唴鐮�', width: 150, hide: true }
+ , { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 150, hide: true }
+ , { field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', width: 200 }
+ , { field: 'HWWOrderInterID', title: '濮斿璁㈠崟涓诲唴鐮�', width: 150, hide: true }
+ , { field: 'HWWOrderEntryID', title: '濮斿璁㈠崟瀛愬唴鐮�', width: 150, hide: true }
+ , { field: 'HWWOrderDetaiLID ', title: '濮斿璁㈠崟鏄庣粏鍐呯爜', width: 150, hide: true }
+ , { field: 'HWWOrderBillNo', title: '濮斿璁㈠崟鍗曞彿', width: 200, hide: true }
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200 }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150, hide: true }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150, hide: true }
+ , { field: 'HSupID', title: '渚涘簲鍟咺D', width: 150, hide: true }
+ , { field: 'HSupName', title: '渚涘簲鍟嗗悕绉�', width: 150, hide: true }
+ , { field: 'HIsSplit', title: '鏄惁鎷嗗垎', width: 150, hide: true } //0鍚︼紝1鏄�
+
+ ]]
+ }
//鐢熸垚鍝佺鐮�
form.on('submit(HBarcodeSaverPZ)', function (data) {//淇濆瓨
@@ -938,69 +1001,121 @@
});
//杩涘叆椤甸潰鏌ヨ琛ㄤ綋鐗╂枡淇℃伅
- layer.load(3)
- table.render({
- elem: '#mainTable'
- , url: GetWEBURL() + subUrl
- , toolbar: '#toolbarDemo' //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
- , defaultToolbar: ['filter', 'exports']
- , where: { sMsg: linterid, sMsg2: lentryid }
- , cols: [[
- { type: 'checkbox', fixed: 'left' }
- , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
- , { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', width: 120 }
- , { field: 'HOldMaterNumber', title: '鏃х墿鏂欑紪鐮�', width: 120, hide: true }
- , { field: 'HMaterShortNumber', title: '鐗╂枡浠ｇ爜', width: 120, hide: true }
- , { field: 'HSubjoin', title: '鐗╂枡浠ｇ爜', width: 120, hide: true }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 120 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 120 }
- , { field: 'HUnitName', title: '璁￠噺鍗曚綅', width: 100 }
- , { field: 'HUnitNumber', title: '璁￠噺鍗曚綅浠ｇ爜', width: 100, hide: true }
- , { field: 'HUnitID', title: '璁￠噺鍗曚綅ID', width: 100, hide: true }
- , { field: 'HDDQty', title: '璁㈠崟鏁伴噺', width: 100 }
- , { field: 'HMrbQty', title: '閫�鏂欐暟閲�', width: 100, hide: true }
- , { field: 'HBarcodeCount', title: '宸茬敓鎴愭潯鐮佹暟閲�', width: 135 }
- , { field: 'HNotBarcodeCount', title: '鍙敓鎴愭潯鐮佹暟閲�', width: 135 }
- , { field: 'HQty', title: '鏈鐢熸垚鏉＄爜鏁伴噺', width: 135, edit: 'text', event: "inputHQty" }
- , { field: 'HMinQty', title: '鍐呯瑁呯鏁�', width: 100, edit: 'text', event: "inputHMinQty" }
- , { field: 'HBQty', title: '鍐呯鏁�', width: 100 }
- , { field: 'HWXQty', title: '澶栫瑁呯鏁�', width: 100, edit: 'text', event: "inputHWXQty" }
- , { field: 'HWBQty', title: '澶栫鏁�', width: 100 }
- , { field: 'HPrice', title: '鍗曚环', width: 100, hide: true }
- , { field: 'HMoney', title: '閲戦', width: 100, hide: true }
- , { field: 'HMTONO', title: '璁″垝璺熻釜鍗曞彿', width: 100, hide: true }
- , { field: 'HBatchNo', title: '鎵瑰彿', width: 100, edit: 'text' }
- , { field: 'HBatchManager', title: '鍚敤鎵瑰彿', width: 100, hide: true }
- , { field: 'HISKFPERIOD', title: '鏄惁鍚敤淇濊川鏈�', width: 100, edit: 'text', hide: true }
- , { field: 'HEXPUNIT', title: '淇濊川鏈熷崟浣�', width: 100, edit: 'text', hide: true }
- , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }//, event: "chooseHKFDate"
- , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100 }//
- , { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDQDate' }//, event: "chooseHKFDQDate"
- , { field: 'HSupMaterNumber', title: '渚涘簲鍟嗘枡鍙�', width: 100, edit: 'text' }
- , { field: 'HSupBatchNo', title: '渚涘簲鍟嗘壒娆�', width: 100, edit: 'text' }
- //, { field: 'HBeginDate', title: '鐢熶骇鏃ユ湡', width: 120, data_field: 'HBeginDate', event: "chooseHBeginDate" }
- //, { field: 'HEndDate', title: '澶辨晥鏃ユ湡', width: 120, data_field: 'HEndDate', event: "chooseHEndDate" }
- //, { field: 'HDate', title: '瑕佹眰浜よ揣鏃ユ湡', width: 150 }
- , { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟涓诲唴鐮�', width: 150, hide: true }
- , { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 150, hide: true }
- , { field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', width: 200 }
- , { field: 'HWWOrderInterID', title: '濮斿璁㈠崟涓诲唴鐮�', width: 150, hide: true }
- , { field: 'HWWOrderEntryID', title: '濮斿璁㈠崟瀛愬唴鐮�', width: 150, hide: true }
- , { field: 'HWWOrderDetaiLID ', title: '濮斿璁㈠崟鏄庣粏鍐呯爜', width: 150, hide: true }
- , { field: 'HWWOrderBillNo', title: '濮斿璁㈠崟鍗曞彿', width: 200, hide: true }
- , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200 }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150, hide: true }
- , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150, hide: true }
- , { field: 'HSupID', title: '渚涘簲鍟咺D', width: 150, hide: true }
- , { field: 'HSupName', title: '渚涘簲鍟嗗悕绉�', width: 150, hide: true }
- , { field: 'HIsSplit', title: '鏄惁鎷嗗垎', width: 150, hide: true } //0鍚︼紝1鏄�
- ]]
- , done: function (res, curr, count) {
- layer.closeAll("loading");
- },
- });
+ if (mergeTags != 1) {
+ layer.load(3)
+ table.render({
+ elem: '#mainTable'
+ , url: GetWEBURL() + subUrl
+ , toolbar: '#toolbarDemo' //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
+ , defaultToolbar: ['filter', 'exports']
+ , where: { sMsg: linterid, sMsg2: lentryid }
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+ , { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', width: 120 }
+ , { field: 'HOldMaterNumber', title: '鏃х墿鏂欑紪鐮�', width: 120, hide: true }
+ , { field: 'HMaterShortNumber', title: '鐗╂枡浠ｇ爜', width: 120, hide: true }
+ , { field: 'HSubjoin', title: '鐗╂枡浠ｇ爜', width: 120, hide: true }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 120 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 120 }
+ , { field: 'HUnitName', title: '璁￠噺鍗曚綅', width: 100 }
+ , { field: 'HUnitNumber', title: '璁￠噺鍗曚綅浠ｇ爜', width: 100, hide: true }
+ , { field: 'HUnitID', title: '璁￠噺鍗曚綅ID', width: 100, hide: true }
+ , { field: 'HDDQty', title: '璁㈠崟鏁伴噺', width: 100 }
+ , { field: 'HMrbQty', title: '閫�鏂欐暟閲�', width: 100, hide: true }
+ , { field: 'HBarcodeCount', title: '宸茬敓鎴愭潯鐮佹暟閲�', width: 135 }
+ , { field: 'HNotBarcodeCount', title: '鍙敓鎴愭潯鐮佹暟閲�', width: 135 }
+ , { field: 'HQty', title: '鏈鐢熸垚鏉＄爜鏁伴噺', width: 135, edit: 'text', event: "inputHQty" }
+ , { field: 'HMinQty', title: '鍐呯鍖呰鏁�', width: 100, edit: 'text', event: "inputHMinQty" }
+ , { field: 'HBQty', title: '鍐呯鏁�', width: 100 }
+ , { field: 'HWXQty', title: '澶栫鍖呰鏁�', width: 100, edit: 'text', event: "inputHWXQty" }
+ , { field: 'HWBQty', title: '澶栫鏁�', width: 100 }
+ , { field: 'HPrice', title: '鍗曚环', width: 100, hide: true }
+ , { field: 'HMoney', title: '閲戦', width: 100, hide: true }
+ , { field: 'HMTONO', title: '璁″垝璺熻釜鍗曞彿', width: 100, hide: true }
+ , { field: 'HBatchNo', title: '鎵瑰彿', width: 100, edit: 'text' }
+ , { field: 'HBatchManager', title: '鍚敤鎵瑰彿', width: 100, hide: true }
+ , { field: 'HISKFPERIOD', title: '鏄惁鍚敤淇濊川鏈�', width: 100, edit: 'text', hide: true }
+ , { field: 'HEXPUNIT', title: '淇濊川鏈熷崟浣�', width: 100, edit: 'text', hide: true }
+ , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }//, event: "chooseHKFDate"
+ , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100 }//
+ , { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDQDate' }//, event: "chooseHKFDQDate"
+ , { field: 'HSupMaterNumber', title: '渚涘簲鍟嗘枡鍙�', width: 100, edit: 'text' }
+ , { field: 'HSupBatchNo', title: '渚涘簲鍟嗘壒娆�', width: 100, edit: 'text' }
+ //, { field: 'HBeginDate', title: '鐢熶骇鏃ユ湡', width: 120, data_field: 'HBeginDate', event: "chooseHBeginDate" }
+ //, { field: 'HEndDate', title: '澶辨晥鏃ユ湡', width: 120, data_field: 'HEndDate', event: "chooseHEndDate" }
+ //, { field: 'HDate', title: '瑕佹眰浜よ揣鏃ユ湡', width: 150 }
+ , { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟涓诲唴鐮�', width: 150, hide: true }
+ , { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 150, hide: true }
+ , { field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', width: 200 }
+ , { field: 'HWWOrderInterID', title: '濮斿璁㈠崟涓诲唴鐮�', width: 150, hide: true }
+ , { field: 'HWWOrderEntryID', title: '濮斿璁㈠崟瀛愬唴鐮�', width: 150, hide: true }
+ , { field: 'HWWOrderDetaiLID ', title: '濮斿璁㈠崟鏄庣粏鍐呯爜', width: 150, hide: true }
+ , { field: 'HWWOrderBillNo', title: '濮斿璁㈠崟鍗曞彿', width: 200, hide: true }
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200 }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150, hide: true }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150, hide: true }
+ , { field: 'HSupID', title: '渚涘簲鍟咺D', width: 150, hide: true }
+ , { field: 'HSupName', title: '渚涘簲鍟嗗悕绉�', width: 150, hide: true }
+ , { field: 'HIsSplit', title: '鏄惁鎷嗗垎', width: 150, hide: true } //0鍚︼紝1鏄�
+ ]]
+ , done: function (res, curr, count) {
+ layer.closeAll("loading");
+ }
+ });
+ }
+ else
+ {
+ layer.load(3)
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/GetHBarCodeShowBillSub_Merge",
+ async: true,
+ data: { HInterID: linterid },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 10000) {
+ var data = data.data;
+ var rowdata = [];
+
+ for (var i = 0; i < data.length; i++) {
+ rowdata.push({
+ "HMaterID": data[i].HMaterID, "HMaterNumber": data[i].HMaterNumber, "HOldMaterNumber": ""
+ , "HMaterShortNumber": "", "HSubjoin": "", "HMaterName": data[i].HMaterName
+ , "HMaterModel": data[i].HMaterModel, "HUnitName": data[i].HUnitName, "HUnitNumber": data[i].HUnitNumber
+ , "HUnitID": data[i].HUnitID, "HDDQty": data[i].HDDQty, "HMrbQty": 0, "HBarcodeCount": data[i].HBarcodeCount
+ , "HNotBarcodeCount": data[i].HNotBarcodeCount, "HQty": data[i].HQty, "HMinQty": data[i].HMinQty, "HBQty": data[i].HBQty
+ , "HWXQty": data[i].HWXQty, "HWBQty": data[i].HWBQty, "HPrice": data[i].HPrice, "HMoney": data[i].HMoney, "HMTONO": ""
+ , "HBatchNo": data[i].HBatchNo, "HBatchManager": data[i].HBatchManager, "HISKFPERIOD": data[i].HISKFPERIOD
+ , "HEXPUNIT": data[i].HEXPUNIT, "HKFDate": data[i].HKFDate, "HKFPeriod": data[i].HKFPeriod, "HKFDQDate": data[i].HKFDQDate
+ , "HSupMaterNumber": data[i].HSupMaterNumber, "HSupBatchNo": data[i].HSupBatchNo, "HPOOrderInterID": data[i].HPOOrderInterID
+ , "HPOOrderEntryID": data[i].HPOOrderEntryID, "HPOOrderBillNo": data[i].HPOOrderBillNo, "HWWOrderInterID": data[i].HWWOrderInterID
+ , "HWWOrderEntryID": data[i].HWWOrderEntryID, "HWWOrderDetaiLID": data[i].HWWOrderDetaiLID, "HWWOrderBillNo": data[i].HWWOrderBillNo
+ , "HSourceBillType": data[i].HSourceBillType, "HSourceBillNo": data[i].HSourceBillNo, "HSourceEntryID": data[i].HSourceEntryID
+ , "HSourceInterID": data[i].HSourceInterID, "HSupID": data[i].HSupID, "HSupName": "", "HIsSplit": data[i].HIsSplit
+ });
+ }
+
+ option.data = rowdata;
+
+ table.render(option);
+
+ }
+ else {
+ // $("#verifycode").click();
+ f_alert(data.Message);
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ f_alert("閿欒:" + err);
+ layer.closeAll("loading");
+ }
+ });
+ }
+
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
--
Gitblit v1.9.1