From 38e2af3452b331488e052ee470a9c662fd2b9446 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 26 三月 2026 15:02:41 +0800
Subject: [PATCH] 登录页面背景切换；添加多语言翻译功能
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html | 424 +++++++++++++++++++++++-----------------------------
1 files changed, 191 insertions(+), 233 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..ff360e3 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
@@ -21,8 +21,8 @@
<div class="layui-btn-group">
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="HBarcodeSaverBox" id="HBarcodeSaverBox">鐢熸垚鏉＄爜</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Print">鏉＄爜鎵撳嵃</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Print" id="Print">鏉＄爜鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit" id="Exit">閫�鍑�</button>
</div>
</div>
@@ -30,7 +30,7 @@
<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" id="bt_HDate">鏃ユ湡锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HDate" id="HDate" readonly="readonly" autocomplete="off" disabled>
</div>
@@ -40,14 +40,14 @@
<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" id="bt_HSupNumber"> 渚涘簲鍟嗕唬鐮侊細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HSupNumber" lay-verify="HSupNumber" id="HSupNumber" readonly="readonly" autocomplete="off">
<input id="HSupID" name="HSupID" type="hidden" />
</div>
</div>
<div class="layui-col-xs3">
- <label class="layui-form-label"> 渚� 搴� 鍟嗭細</label>
+ <label class="layui-form-label" id="bt_HSupName"> 渚� 搴� 鍟嗭細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HSupName" lay-verify="HSupName" id="HSupName" readonly="readonly" autocomplete="off">
</div>
@@ -92,9 +92,10 @@
<script src="../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
<script src="../../../../Scripts/webConfig.js"></script>
<script src="../../layuiadmin/Scripts/general.js"></script>
+ <script src="../../layuiadmin/MESLanguage.js"></script>
<!--<script src="../../../../Scripts/jquery-1.8.2.js"></script>-->
<script>
- var HModName = "Gy_BarCodeBill";
+ var HModName = "SRM_MaterialBarCodeBill";
function f_alert(sMsg) {
layer.alert(sMsg, { icon: 5 });
}
@@ -129,7 +130,7 @@
//};
////#endregion
- //#region 鍙傛暟鑾峰彇function
+ //#region 鍙傛暟鑾峰彇function
function getUrlVars() {
var vars = [], hash;
var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
@@ -166,6 +167,7 @@
, element = layui.element; //Tab鐨勫垏鎹㈠姛鑳斤紝鍒囨崲浜嬩欢鐩戝惉绛夛紝闇�瑕佷緷璧杄lement妯″潡
var option;
+ //FetchSupInfo();
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
@@ -176,24 +178,27 @@
, 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: 'HStatusMan', title: '宸ュ彿', width: 120, edit: 'text' }
, { field: 'HQty', title: '鏈鐢熸垚鏉＄爜鏁伴噺', width: 135, edit: 'text', event: "inputHQty" }
- , { field: 'HMinQty', title: '鏍囧噯鍖呰鏁帮紙鍐呯瑁呯鏁帮級', width: 100, edit: 'text', event: "inputHMinQty" }
- , { field: 'HBQty', title: '鏈�灏忓寘瑁呮暟锛堝唴绠辨暟锛�', width: 100 }
+ , { 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: 'HSourceBillType', title: '鏉＄爜绫诲瀷', width: 100, templet: '#barCodeTypeTpl', hide: true }
+ , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate", hide: true }//, event: "chooseHKFDate"
+ , { field: 'HBarCodeDate', title: '鏉＄爜鏃ユ湡', align: 'center', width: 150, data_field: 'HBarCodeDate', event: "chooseHBarCodeDate" }
+ , { 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 }
]]
@@ -213,7 +218,7 @@
}
});
//#endregion
-
+
//#region 鍒濇璧嬪��
//杩涘叆椤甸潰鏌ヨ琛ㄤ綋鐗╂枡淇℃伅
if (mergeTags != 1) {
@@ -233,18 +238,20 @@
, { field: 'HSubjoin', title: '鐗╂枡浠ｇ爜', width: 120, hide: true }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 120 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 120 }
+ , { field: 'HStatusMan', title: '宸ュ彿', width: 120, edit: 'text' }
, { 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: 'HBarCodeDate', title: '鏉＄爜鏃ユ湡', align: 'center', width: 150, data_field: 'HBarCodeDate', event: "chooseHBarCodeDate" }
+ , { field: 'HSourceBillType', title: '鏉＄爜绫诲瀷', width: 100, hide: true }
+ , { 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 +264,6 @@
else {
//鍚堝苟鏁伴噺鐢熸垚鏉＄爜
layer.load(3);
- FetchSupInfo();
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
$.ajax({
type: "GET",
@@ -270,13 +276,18 @@
var data = data.data;
var rowdata = [];
+ $("#HSupID").val(data[0].HSupID);
+ $("#HSupNumber").val(data[0].渚涘簲鍟嗕唬鐮�);
+ $("#HSupName").val(data[0].渚涘簲鍟嗗悕绉�);
+
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": "",*/
+ /* "HOldMaterNumber": "",*/
"HMaterShortNumber": "",
- /*"HSubjoin": "",*/
+ "HSubjoin": data[i].鐗╂枡绠�绉�,
"HMaterName": data[i].鐗╂枡鍚嶇О,
"HMaterModel": data[i].瑙勬牸鍨嬪彿,
"HMinQty": data[i].鏍囧噯鍖呰鏁�,
@@ -291,7 +302,8 @@
"HSupID": data[i].HSupID,
"HSupName": data[i].渚涘簲鍟嗗悕绉�,
"HEXPUNIT": data[i].淇濊川鏈熷崟浣�,
- "HQty": 1, // 榛樿鐢熸垚鏉＄爜鏁伴噺
+ "HQty": 0, // 榛樿鐢熸垚鏉＄爜鏁伴噺
+ "HBarCodeDate": data[i].鏉＄爜鏃ユ湡,
"biaoqianzhangshu": 1 // 鏍囩寮犳暟
});
}
@@ -313,7 +325,11 @@
}
});
}
- //#endregion
+ //#endregion
+
+ //璋冪敤椤甸潰鏍囬缈昏瘧鏂规硶
+ initFunction(1, HModName, sessionStorage["HTranSlate"]);
+
form.on('submit(Exit)', function (data) {//閫�鍑�
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
parent.layer.close(index); //鍐嶆墽琛屽叧闂�
@@ -393,6 +409,18 @@
}
});
}
+ else if (obj.event == 'chooseHBarCodeDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (value, date) {
+ data[field] = value;
+ obj.update(data);
+ }
+ });
+ }
else if (obj.event == 'inputHKFPeriod') {
$(obj.tr).find(".layui-table-edit").keyup(function () {
var $input = $(this), val = $input.val();
@@ -407,8 +435,8 @@
if (!val) val = "0";
$input.val(val.replace(/[^\d*\.?\d*]/g, ''));
});
-
-
+
+
}
else if (obj.event == 'inputHMinQty') {
var $input = $(this), val = $input.val();
@@ -417,7 +445,7 @@
var $input = $(this), val = $input.val();
if (!val) val = "0";
$input.val(val.replace(/[^\d*\.?\d*]/g, ''));
- });
+ });
}
//澶栫鍖呰鏁颁簨浠讹紝鏈〉闈㈡殏鏃剁敤涓嶅埌
//else if (obj.event == 'inputHWXQty') {
@@ -432,77 +460,77 @@
- table.on('edit(mainTable)', function (obj) { //娉細edit鏄浐瀹氫簨浠跺悕锛宼est鏄痶able鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
- var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
- , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
- , field = obj.field; //寰楀埌瀛楁
+ table.on('edit(mainTable)', function (obj) { //娉細edit鏄浐瀹氫簨浠跺悕锛宼est鏄痶able鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
- var HMinQty = 0;
- var HWXQty = 0;
- var HKFPeriod = 0;
- var HWBQty = 0;
- var HBQty = 0;
- var biaoqianzhangshu = 0;
- if (obj.data.HMinQty != undefined) {
- HMinQty = parseFloat(obj.data.HMinQty);
- }
- if (obj.data.biaoqianzhangshu != undefined) {
- biaoqianzhangshu = parseFloat(obj.data.biaoqianzhangshu);
- }
- if (obj.data.HWXQty != undefined) {
- HWXQty = parseFloat(obj.data.HWXQty);
- }
- if (obj.data.HKFPeriod != undefined) {
- HKFPeriod = parseFloat(obj.data.HKFPeriod);
- }
- if (obj.data.HWBQty != undefined) {
- HWBQty = parseFloat(obj.data.HWBQty);
- }
- if (obj.data.HBQty != undefined) {
- HBQty = parseFloat(obj.data.HBQty);
- }
- if (obj.data.HQty != undefined) {
- HBQty = parseFloat(obj.data.HBQty);
- }
- //HMinQty 鍐呯鍖呰鏁帮紙鏍囧噯鍖呰鏁帮級
- //HBQty 鍐呯鏁帮紙鏈�灏忓寘瑁呮暟锛�
- //HWXQty 澶栫鍖呰鏁�
- //HWBQty 澶栫鏁� HWBQty
- //biaoqianzhangshu 鏍囩shu
- //HQty 鏈鐢熸垚鏉＄爜鏁�
- switch (field) {
- case "HQty":
- if (HMinQty == 0)
- f_alert("娉ㄦ剰锛氬寘瑁呮暟涓�0!");
- else {
- obj.update({
- biaoqianzhangshu: Math.ceil(parseFloat(obj.data.HQty) / parseFloat(obj.data.HMinQty)),
- });
- }
-
- break;
- case "HMinQty": //鍖呰鏁�
- if (HMinQty < 0) {
- f_alert("鍖呰鏁颁笉鑳戒负璐熸暟!");
- }
- if (HMinQty < HBQty) {
- f_alert("鏍囧噯鍖呰鏁伴噺涓嶈兘灏忎簬鏈�灏忓寘瑁呮暟閲�!璇烽噸鏂拌緭鍏ワ紒")
- return;
- }
- else {
- obj.update({
- biaoqianzhangshu: Math.ceil(parseFloat(obj.data.HQty) / parseFloat(obj.value)),
- });
+ var HMinQty = 0;
+ var HWXQty = 0;
+ var HKFPeriod = 0;
+ var HWBQty = 0;
+ var HBQty = 0;
+ var biaoqianzhangshu = 0;
+ if (obj.data.HMinQty != undefined) {
+ HMinQty = parseFloat(obj.data.HMinQty);
+ }
+ if (obj.data.biaoqianzhangshu != undefined) {
+ biaoqianzhangshu = parseFloat(obj.data.biaoqianzhangshu);
+ }
+ if (obj.data.HWXQty != undefined) {
+ HWXQty = parseFloat(obj.data.HWXQty);
+ }
+ if (obj.data.HKFPeriod != undefined) {
+ HKFPeriod = parseFloat(obj.data.HKFPeriod);
+ }
+ if (obj.data.HWBQty != undefined) {
+ HWBQty = parseFloat(obj.data.HWBQty);
+ }
+ if (obj.data.HBQty != undefined) {
+ HBQty = parseFloat(obj.data.HBQty);
+ }
+ if (obj.data.HQty != undefined) {
+ HBQty = parseFloat(obj.data.HBQty);
+ }
+ //HMinQty 鍐呯鍖呰鏁帮紙鏍囧噯鍖呰鏁帮級
+ //HBQty 鍐呯鏁帮紙鏈�灏忓寘瑁呮暟锛�
+ //HWXQty 澶栫鍖呰鏁�
+ //HWBQty 澶栫鏁� HWBQty
+ //biaoqianzhangshu 鏍囩shu
+ //HQty 鏈鐢熸垚鏉＄爜鏁�
+ switch (field) {
+ case "HQty":
+ if (HMinQty == 0)
+ f_alert("娉ㄦ剰锛氬寘瑁呮暟涓�0!");
+ else {
+ obj.update({
+ biaoqianzhangshu: Math.ceil(parseFloat(obj.data.HQty) / parseFloat(obj.data.HMinQty)),
+ });
+ }
- }
- break;
- }
+ break;
+ case "HMinQty": //鍖呰鏁�
+ if (HMinQty < 0) {
+ f_alert("鍖呰鏁颁笉鑳戒负璐熸暟!");
+ }
+ if (HMinQty < HBQty) {
+ f_alert("鏍囧噯鍖呰鏁伴噺涓嶈兘灏忎簬鏈�灏忓寘瑁呮暟閲�!璇烽噸鏂拌緭鍏ワ紒")
+ return;
+ }
+ else {
+ obj.update({
+ biaoqianzhangshu: Math.ceil(parseFloat(obj.data.HQty) / parseFloat(obj.value)),
+ });
+
+ }
+ break;
+ }
- });
- //#endregion
+ });
+ //#endregion
- //#region 淇濆瓨
+ //#region 淇濆瓨
form.on('submit(HBarcodeSaverBox)', function (data) {//淇濆瓨
var a = 0;
var newArray = [];
@@ -520,7 +548,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainSub = sMainStr + ';' + sSubStr;
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"];
var _sSubStr = JSON.parse(sSubStr);
for (var i = 0; i < _sSubStr.length; i++) {
if (_sSubStr[i].HQty > 0 && (_sSubStr[i].HMinQty == 0 || _sSubStr[i].HWXQty == 0)) {
@@ -533,6 +561,12 @@
// layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏈鐢熸垚鏉＄爜鏁伴噺涓嶈兘瓒呭嚭鏈敓鎴愭潯鐮佹暟閲�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return Result = false;
//}
+
+ if (_sSubStr[i].HQty == 0) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢熸垚鏉＄爜鏁伴噺涓嶈兘涓�0!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+
if (_sSubStr[i].HQty > 0 && _sSubStr[i].HISKFPERIOD == 1 && (/*_sSubStr[i].HBatchNo == "" ||*/ _sSubStr[i].HKFDate == "")) {
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢熶骇鏃ユ湡涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
@@ -557,9 +591,9 @@
for (let i = 0; i < newArray.length; i++) {
//if (newArray[i].HQty > newArray[i].HNotBarcodeCount) {
- if (newArray[i].HQty ) {
+ if (newArray[i].HQty) {
//layer.msg("缂栫爜:" + newArray[i].HMaterNumber + " 瑙勬牸鍨嬪彿:" + newArray[i].HMaterModel + "<br>" + " 鏈鐢熸垚鏉＄爜鎬绘暟閲忚秴鍑哄墿浣欏彲鐢熸垚鏉＄爜鏁帮紒" + "<br>" + " 鏈鐢熸垚鎬绘暟閲�:" + newArray[i].HQty + " 鍙敓鎴愭潯鐮佹暟閲�:" + newArray[i].HNotBarcodeCount, { icon: 5, btn: ['纭'], time: 10000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- layer.msg("缂栫爜:" + newArray[i].HMaterNumber + " 瑙勬牸鍨嬪彿:" + newArray[i].HMaterModel + "<br>" + " 鏈鐢熸垚鏉＄爜鎬绘暟閲忚秴鍑哄墿浣欏彲鐢熸垚鏉＄爜鏁帮紒" + "<br>" + " 鏈鐢熸垚鎬绘暟閲�:" + newArray[i].HQty , { icon: 5, btn: ['纭'], time: 10000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("缂栫爜:" + newArray[i].HMaterNumber + " 瑙勬牸鍨嬪彿:" + newArray[i].HMaterModel + "<br>" + " 鏈鐢熸垚鏉＄爜鎬绘暟閲忚秴鍑哄墿浣欏彲鐢熸垚鏉＄爜鏁帮紒" + "<br>" + " 鏈鐢熸垚鎬绘暟閲�:" + newArray[i].HQty, { icon: 5, btn: ['纭'], time: 10000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
}
@@ -592,27 +626,31 @@
, defaultToolbar: ['filter', 'exports']
, limit: 500
, cols: [[
- { field: 'HBarCode', title: '鏉＄爜', width: 230, ellipsis: true }
+ { field: 'HLSH', title: '娴佹按鍙�', align: 'center', width: 150, data_field: 'HBarCodeDate' }
+ , { 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: 'HSubjoin', title: '鐗╂枡绠�绉�', width: 120 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 120, hide: true }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 120 }
+ , { field: 'HStatusMan', title: '宸ュ彿', width: 120 }
, { field: 'HQty', title: '鏈鐢熸垚鏉＄爜鏁伴噺', width: 135 }
, { field: 'HMinQty', title: '鏍囧噯鍖呰鏁帮紙鍐呯瑁呯鏁帮級', width: 100 }
, { field: 'HBQty', title: '鏈�灏忓寘瑁呮暟锛堝唴绠辨暟锛�', width: 100 }
, { field: 'biaoqianzhangshu', title: '鏍囩寮犳暟', width: 100 }
- , { field: 'HBatchNo', title: '鎵瑰彿', width: 100 }
+ , { field: 'HBarCodeDate', title: '鏉＄爜鏃ユ湡', align: 'center', width: 150, data_field: 'HBarCodeDate' }
+ , { field: 'HBatchNo', title: '鎵瑰彿', width: 100, hide: true }
, { field: 'HBatchManager', title: '鍚敤鎵瑰彿', width: 100, hide: true }
, { field: 'HISKFPERIOD', title: '鏄惁鍚敤淇濊川鏈�', width: 100, hide: true }
, { field: 'HEXPUNIT', title: '淇濊川鏈熷崟浣�', width: 100, hide: true }
- , { field: 'HSourceBillType', title: '鏉＄爜绫诲瀷', width: 100 }
- , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150 }//, event: "chooseHKFDate"
- , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100 }//
- , { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150 }//, event: "chooseHKFDQDate"
+ , { field: 'HSourceBillType', title: '鏉＄爜绫诲瀷', width: 100, hide: true }
+ , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, hide: true }//, event: "chooseHKFDate"
+ , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100, hide: true }//
+ , { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150, hide: true }//, event: "chooseHKFDQDate"
, { field: 'HSupID', title: '渚涘簲鍟咺D', width: 150, hide: true }
, { field: 'HSupName', title: '渚涘簲鍟嗗悕绉�', width: 150, hide: true }
@@ -634,33 +672,38 @@
var rowdata_1 = [];
for (var i = 0; i < data.length; i++) {
-
- rowdata_1.push({
- "HMaterID": data[i].HItemID,
- "HBarItemID": data[i].HBarItemID,
- "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].HSupID,
- "HSupName": data[i].渚涘簲鍟嗗悕绉�,
- "HEXPUNIT": data[i].淇濊川鏈熷崟浣�,
- "HQty":data[i].鐢熸垚鏉＄爜鏁伴噺 , // 鏈鐢熸垚鏉＄爜鏁伴噺
- "biaoqianzhangshu": 1
- });
-
-
-
+
+ rowdata_1.push({
+ "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].鏍囧噯鍖呰鏁�,
+ "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].HSupID,
+ "HSupName": data[i].渚涘簲鍟嗗悕绉�,
+ "HEXPUNIT": data[i].淇濊川鏈熷崟浣�,
+ "HQty": data[i].鐢熸垚鏉＄爜鏁伴噺, // 鏈鐢熸垚鏉＄爜鏁伴噺
+ "biaoqianzhangshu": 1,
+ "HStatusMan": data[i].宸ュ彿,
+ "HBarCodeDate": data[i].鏉＄爜鏃ユ湡,
+ "HLSH": data[i].娴佹按鍙�,
+ });
+
+
+
}
// 鏇存柊琛ㄦ牸鏁版嵁
@@ -670,106 +713,21 @@
}
});
//#endregion
-
- // #region 鎴愬姛鏉＄爜灞曠ず
- //$.ajax({
- // type: "GET",
- // url: GetWEBURL() + "/showHBarCodeBillDetail",
- // async: true,
- // data: { sMsg: lentryid, user: sessionStorage["Organization"] },
- // dataType: "json",
- // success: function (data_1) {
- // if (data_1.count != 0) {
- // var data = data_1.data;
- // var rowdata_1 = [];
- // var IDdif = data[0].HItemID;
- // for (var i = 0,k=1; i < data.length; i++,k++) {
- // var totalQty = data[i].鐢熸垚鏉＄爜鏁伴噺; // 鎬绘潯鐮佹暟
- // var standardQty = data[i].鏍囧噯鍖呰鏁�; // 鏍囧噯鍖呰鏁�
- // var labelCount = Math.ceil(totalQty / standardQty); // 璁＄畻鏍囩鏁�
- // var lastQty_sign = (totalQty % standardQty == 0) ? 0 : 1;//鍒ゆ柇鏄惁鏈変綑鏁�
-
- // if (k == labelCount && lastQty_sign==1) {
- // rowdata_1.push({
- // "HMaterID": data[i].HItemID,
- // "HBarCode": data[i].HBarCode,
- // "HMaterNumber": data[i].鐗╂枡浠ｇ爜,
- // "HMaterShortNumber": "",
- // "HMaterName": data[i].鐗╂枡鍚嶇О,
- // "HMaterModel": data[i].瑙勬牸鍨嬪彿,
- // "HMinQty": standardQty ,
- // "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": (totalQty % standardQty), // 鏈鐢熸垚鏉＄爜鏁伴噺
- // "biaoqianzhangshu": 1
- // });
- // k = 1;
- // }
- // else {
- // rowdata_1.push({
- // "HMaterID": data[i].HItemID,
- // "HBarCode": data[i].HBarCode,
- // "HMaterNumber": data[i].鐗╂枡浠ｇ爜,
- // "HMaterShortNumber": "",
- // "HMaterName": data[i].鐗╂枡鍚嶇О,
- // "HMaterModel": data[i].瑙勬牸鍨嬪彿,
- // "HMinQty": standardQty,
- // "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": standardQty, // 鏈鐢熸垚鏉＄爜鏁伴噺
- // "biaoqianzhangshu": 1
- // });
- // }
+ } else {
+ layer.msg(data.Message);
+ }
- // }
-
- // option_Success.data = rowdata_1;
- // table.render(option_Success);
-
- // }
- // else {
- // // $("#verifycode").click();
- // f_alert(data.Message);
- // }
- // layer.closeAll("loading");
- // },
- // error: function (err) {
- // f_alert("閿欒:" + err);
- // layer.closeAll("loading");
- // }
- //});
- // #endregion
- }
-
- layer.closeAll("loading");
- },
- error: function (err) {
- f_alert("閿欒:" + err);
- }
- });
- return false;
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ f_alert("閿欒:" + err);
+ }
+ });
+ return false;
});
- //#endregion
+ //#endregion
//#region 鎵撳嵃
//鍐呯鎵撳嵃
@@ -828,7 +786,7 @@
//鑾峰彇渚涘簲鍟咺D
function FetchSupInfo() {
var sWhere = "";
- //var sWhere = " and 渚涘簲鍟嗗悕绉� ='" + sessionStorage["HUserName"] + "'";
+ var sWhere = " and 渚涘簲鍟嗗悕绉� ='" + sessionStorage["HUserName"] + "'";
$.ajax({
url: GetWEBURL() + "/Gy_Supplier/list",
type: "GET",
--
Gitblit v1.9.1