From fc98ef7296017bcd15f32b16ffc81f915513ad89 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期六, 13 九月 2025 14:50:11 +0800
Subject: [PATCH] 1
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html | 100 +++++++++++++++++++++-----------------------------
1 files changed, 42 insertions(+), 58 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 bb14d24..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
@@ -40,9 +40,9 @@
<div class="layui-form-item">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label"> 渚� 搴� 鍟嗭細</label>
+ <label class="layui-form-label"> 渚涘簲鍟嗕唬鐮侊細</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HSupName" lay-verify="HSupName" id="HSupName" readonly="readonly" autocomplete="off">
+ <input class="layui-input" name="HSupNumber" lay-verify="HSupNumber" id="HSupNumber" readonly="readonly" autocomplete="off">
<input id="HSupID" name="HSupID" type="hidden" />
</div>
</div>
@@ -50,9 +50,9 @@
<label class="layui-form-label"> 渚� 搴� 鍟嗭細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HSupName" lay-verify="HSupName" id="HSupName" readonly="readonly" autocomplete="off">
- <input id="HSupName" name="HSupName" type="hidden" />
</div>
</div>
+ </div>
</div>
</div>
@@ -64,11 +64,11 @@
<div class="layui-tab-item layui-show">
<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
+ <!--<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-add"><i class="layui-icon layui-icon-addition"></i>鎷嗗垎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn"><i class="layui-icon layui-icon-addition"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-del"><i class="layui-icon layui-icon-subtraction"></i>鍒犺</button>
- </div>
+ </div>-->
</script>
<!-- 鏉＄爜绫诲瀷涓嬫媺妗嗘ā鏉� -->
<script type="text/html" id="barCodeTypeTpl">
@@ -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].鏍囧噯鍖呰鏁�,
@@ -288,7 +290,7 @@
"HKFDQDate": data[i].鏈夋晥鏈�,
"HKFDate": data[i].鐢熶骇鏃ユ湡,
"HBatchManager": data[i].鏄惁鍚敤鎵瑰彿,
- "HSupID": data[i].渚涘簲鍟嗕唬鐮�,
+ "HSupID": data[i].HSupID,
"HSupName": data[i].渚涘簲鍟嗗悕绉�,
"HEXPUNIT": data[i].淇濊川鏈熷崟浣�,
"HQty": 1, // 榛樿鐢熸垚鏉＄爜鏁伴噺
@@ -592,13 +594,15 @@
, defaultToolbar: ['filter', 'exports']
, limit: 500
, cols: [[
- , { field: 'HBarCode', title: '鏉＄爜', width: 100 }
+ { field: 'HBarCode', title: '鏉＄爜', width: 230, ellipsis: true }
, { 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 }
@@ -621,11 +625,11 @@
var barcodes = data.data;
// 灏嗘潯鐮佸垪琛ㄨ浆鎹负閫楀彿鍒嗛殧鐨勫瓧绗︿覆
- var barcodeStr = barcodes.join(',');
+ //var barcodeStr = barcodes.join('~');
$.ajax({
type: "GET",
url: GetWEBURL() + "/GetBarcodeDetails",
- data: { barcodes: barcodeStr },
+ data: { barcodes: barcodes },
dataType: "json",
success: function (data_1) {
if (data_1.count != 0) {
@@ -633,13 +637,15 @@
var rowdata_1 = [];
for (var i = 0; i < data.length; i++) {
- if (i == data.length - 1)//鏈�鍚庝竴鏉�
- {
+
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].鏍囧噯鍖呰鏁�,
@@ -651,37 +657,14 @@
"HKFDQDate": data[i].鏈夋晥鏈�,
"HKFDate": data[i].鐢熶骇鏃ユ湡,
"HBatchManager": data[i].鏄惁鍚敤鎵瑰彿,
- "HSupID": data[i].渚涘簲鍟嗕唬鐮�,
+ "HSupID": data[i].HSupID,
"HSupName": data[i].渚涘簲鍟嗗悕绉�,
"HEXPUNIT": data[i].淇濊川鏈熷崟浣�,
- "HQty": (data[i].鐢熸垚鏉＄爜鏁伴噺 % data[i].鏍囧噯鍖呰鏁� == 0 ? data[i].鏍囧噯鍖呰鏁�: (data[i].鐢熸垚鏉＄爜鏁伴噺 % data[i].鏍囧噯鍖呰鏁�)), // 鏈鐢熸垚鏉＄爜鏁伴噺
+ "HQty":data[i].鐢熸垚鏉＄爜鏁伴噺 , // 鏈鐢熸垚鏉＄爜鏁伴噺
"biaoqianzhangshu": 1
});
- }
- else {
- rowdata_1.push({
- "HMaterID": data[i].HItemID,
- "HBarCode": data[i].HBarCode,
- "HMaterNumber": data[i].鐗╂枡浠ｇ爜,
- "HMaterShortNumber": "",
- "HMaterName": data[i].鐗╂枡鍚嶇О,
- "HMaterModel": data[i].瑙勬牸鍨嬪彿,
- "HMinQty": data[i].鏍囧噯鍖呰鏁�,
- "HBQty": data[i].鏈�灏忓寘瑁呮暟,
- "HSourceBillType": data[i].鏉＄爜绫诲瀷,
- "HBatchNo": data[i].鎵瑰彿,
- "HISKFPERIOD": data[i].鏄惁鍚敤淇濊川鏈� == null ? 0 : data[i].鏄惁鍚敤淇濊川鏈�,
- "HKFPeriod": data[i].淇濊川鏈� == null ? 0 : data[i].淇濊川鏈�,
- "HKFDQDate": data[i].鏈夋晥鏈�,
- "HKFDate": data[i].鐢熶骇鏃ユ湡,
- "HBatchManager": data[i].鏄惁鍚敤鎵瑰彿,
- "HSupID": data[i].渚涘簲鍟嗕唬鐮�,
- "HSupName": data[i].渚涘簲鍟嗗悕绉�,
- "HEXPUNIT": data[i].淇濊川鏈熷崟浣�,
- "HQty": data[i].鏍囧噯鍖呰鏁�, // 鏈鐢熸垚鏉＄爜鏁伴噺
- "biaoqianzhangshu": 1
- });
- }
+
+
}
@@ -805,7 +788,7 @@
return;
}
for (var j = 0; j < data2.length; j++) {
- rows += data2[j].HMaterID.toString() + ',';
+ rows += data2[j].HBarItemID.toString() + ',';
rows2 += data2[j].HBarCode.toString() + ',';
}
rows = rows.substring(rows.length - 1, 0);
@@ -857,8 +840,9 @@
data: { "sWhere": sWhere, "user": '', "Organization": sessionStorage["Organization"] },
success: function (result) {
if (result.data.length > 0) {
+ $("#HSupID").val(result.data[0].HItemID);
+ $("#HSupNumber").val(result.data[0].渚涘簲鍟嗕唬鐮�);
$("#HSupName").val(result.data[0].渚涘簲鍟嗗悕绉�);
- $("#HSupID").val(result.data[0].渚涘簲鍟嗕唬鐮�);
} else {
layer.msg("渚涘簲鍟嗕俊鎭湭缁存姢", { time: 5000 });
}
--
Gitblit v1.9.1