From 84db7d3a910d452c518e75ba55d43581c349613b Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期六, 13 九月 2025 11:03:58 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/SRM-LAYUI-HK
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html
index d1233e6..9736ad5 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html
@@ -166,6 +166,7 @@
, element = layui.element; //Tab鐨勫垏鎹㈠姛鑳斤紝鍒囨崲浜嬩欢鐩戝惉绛夛紝闇�瑕佷緷璧杄lement妯″潡
var option;
+ FetchSupInfo();
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
@@ -176,24 +177,25 @@
, cols: [[
{ type: 'checkbox', fixed: 'left' }
, { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+ , { field: 'HItemID', title: 'ID', width: 100, hide: true }
, { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', width: 120 }
-/* , { field: 'HOldMaterNumber', title: '鏃х墿鏂欑紪鐮�', width: 120, hide: true }*/
+/* , { field: 'HOldMaterNumber', title: '鏃х墿鏂欑紪鐮�', width: 120, hide: true }*/
, { field: 'HMaterShortNumber', title: '鐗╂枡浠ｇ爜', width: 120, hide: true }
- /* , { field: 'HSubjoin', title: '鐗╂枡浠ｇ爜', width: 120, hide: true }*/
+ , { field: 'HSubjoin', title: '鐗╂枡绠�绉�', width: 120, }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 120 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 120 }
, { field: 'HQty', title: '鏈鐢熸垚鏉＄爜鏁伴噺', width: 135, edit: 'text', event: "inputHQty" }
- , { field: 'HMinQty', title: '鏍囧噯鍖呰鏁帮紙鍐呯瑁呯鏁帮級', width: 100, edit: 'text', event: "inputHMinQty" }
+ , { field: 'HMinQty', title: '鏍囧噯鍖呰鏁帮紙鍐呯瑁呯鏁帮級', width: 100, event: "inputHMinQty" }
, { field: 'HBQty', title: '鏈�灏忓寘瑁呮暟锛堝唴绠辨暟锛�', width: 100 }
, { field: 'biaoqianzhangshu', title: '鏍囩寮犳暟', width: 100 }
- , { field: 'HBatchNo', title: '鎵瑰彿', width: 100, edit: 'text' }
+ , { field: 'HBatchNo', title: '鎵瑰彿', width: 100, edit: 'text', hide: true }
, { 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: 'HSourceBillType', title: '鏉＄爜绫诲瀷', width: 100, templet: '#barCodeTypeTpl' }
, { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }//, event: "chooseHKFDate"
- , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100,event:"inputHKFPeriod" }//
- , { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDQDate' }//, event: "chooseHKFDQDate"
+ , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100, event: "inputHKFPeriod", hide: true }//
+ , { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDQDate', hide: true }//, event: "chooseHKFDQDate"
, { field: 'HSupID', title: '渚涘簲鍟咺D', width: 150, hide: true }
, { field: 'HSupName', title: '渚涘簲鍟嗗悕绉�', width: 150, hide: true }
]]
@@ -234,17 +236,17 @@
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 120 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 120 }
, { field: 'HQty', title: '鏈鐢熸垚鏉＄爜鏁伴噺', width: 135, edit: 'text', event: "inputHQty" }
- , { field: 'HMinQty', title: '鏍囧噯鍖呰鏁帮紙鍐呯瑁呯鏁帮級', width: 100, edit: 'text', event: "inputHMinQty" }
+ , { field: 'HMinQty', title: '鏍囧噯鍖呰鏁帮紙鍐呯瑁呯鏁帮級', width: 100, event: "inputHMinQty" }
, { field: 'HBQty', title: '鏈�灏忓寘瑁呮暟锛堝唴绠辨暟锛�', width: 100 }
, { field: 'biaoqianzhangshu', title: '鏍囩寮犳暟', width: 100 }
- , { field: 'HBatchNo', title: '鎵瑰彿', width: 100, edit: 'text' }
+ , { field: 'HBatchNo', title: '鎵瑰彿', width: 100, edit: 'text', hide: true }
, { 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: 'HSourceBillType', title: '鏉＄爜绫诲瀷', width: 100 }
- , { 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: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate", hide: true }//, event: "chooseHKFDate"
+ , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100, hide: true }//
+ , { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDQDate', hide: true}//, event: "chooseHKFDQDate"
, { field: 'HSupID', title: '渚涘簲鍟咺D', width: 150, hide: true }
, { field: 'HSupName', title: '渚涘簲鍟嗗悕绉�', width: 150, hide: true }
@@ -257,7 +259,6 @@
else {
//鍚堝苟鏁伴噺鐢熸垚鏉＄爜
layer.load(3);
- FetchSupInfo();
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
$.ajax({
type: "GET",
@@ -272,11 +273,12 @@
for (var i = 0; i < data.length; i++) {
rowdata.push({
- "HMaterID": data[i].HItemID,
+ "HMaterID": data[i].MaterID,
+ "HItemID": data[i].HItemID,
"HMaterNumber": data[i].鐗╂枡浠ｇ爜,
/* "HOldMaterNumber": "",*/
"HMaterShortNumber": "",
- /*"HSubjoin": "",*/
+ "HSubjoin": data[i].鐗╂枡绠�绉�,
"HMaterName": data[i].鐗╂枡鍚嶇О,
"HMaterModel": data[i].瑙勬牸鍨嬪彿,
"HMinQty": data[i].鏍囧噯鍖呰鏁�,
@@ -596,10 +598,11 @@
, { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
, { field: 'HBarItemID', title: '鏉＄爜ID', width: 100, hide: true }
, { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', width: 120 }
+/* , { field: 'LSH', 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: 'HMaterShortNumber', title: '鐗╂枡浠ｇ爜', width: 120 }
+ , { field: 'HSubjoin', title: '鐗╂枡绠�绉�', width: 120, hide: true }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 120, hide: true }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 120 }
, { field: 'HQty', title: '鏈鐢熸垚鏉＄爜鏁伴噺', width: 135 }
, { field: 'HMinQty', title: '鏍囧噯鍖呰鏁帮紙鍐呯瑁呯鏁帮級', width: 100 }
@@ -636,11 +639,13 @@
for (var i = 0; i < data.length; i++) {
rowdata_1.push({
- "HMaterID": data[i].HItemID,
+ "HMaterID": data[i].HMaterID,
"HBarItemID": data[i].HBarItemID,
+/* "LSH": data[i].HBarItemID,*/
"HBarCode": data[i].HBarCode,
"HMaterNumber": data[i].鐗╂枡浠ｇ爜,
"HMaterShortNumber": "",
+ "HSubjoin": data[i].鐗╂枡绠�绉�,
"HMaterName": data[i].鐗╂枡鍚嶇О,
"HMaterModel": data[i].瑙勬牸鍨嬪彿,
"HMinQty": data[i].鏍囧噯鍖呰鏁�,
--
Gitblit v1.9.1