From b28c9a27dfefb67600192dcd587efdf0cf64cc98 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 24 九月 2024 10:00:38 +0800
Subject: [PATCH] 不同订单类型不能合并下推送货单；设置默认打印模板；一键打印
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html | 58 +++++++
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html | 40 ++++
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html | 244 +++++++++++++++++++++++++++++
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html | 69 +++++++
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html | 13 +
WebSRM/login.html | 2
WebSRM/layuiAdmin.std-v1.2.1/src/views/Baseset/SRM_OpenTmpList.html | 33 +++
7 files changed, 439 insertions(+), 20 deletions(-)
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/Baseset/SRM_OpenTmpList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/Baseset/SRM_OpenTmpList.html
index 0ee426f..fcb1003 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/Baseset/SRM_OpenTmpList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/Baseset/SRM_OpenTmpList.html
@@ -20,6 +20,7 @@
<div class="layui-btn-group">
<!--<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Add">鏂板</button>-->
<!--<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Del">鍒犻櫎</button>-->
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Default">榛樿妯℃澘</button>
<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Reload">鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Select">閫夋嫨</button>
<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Exit">閫�鍑�</button>
@@ -267,13 +268,39 @@
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
});
+
+ form.on('submit(Default)', function (data) {//璁剧疆榛樿妯℃澘
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ var OpenTmp = data[0].妯℃澘鍚嶇О;
+ if (checkStatus.data.length == 1) {
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Open_PrintTem/DefaultOpenTmp",
+ async: true,
+ data: { "HNumber": Type, "HName": OpenTmp },
+ //data: { "Value": Value },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg('璁剧疆榛樿妯℃澘鎴愬姛!', { icon: 6, time: 2000 });
+ } else {
+ layer.msg('璁剧疆榛樿妯℃澘澶辫触!', { icon: 5, time: 2000 });
+ }
+ },
+ error: function (result) {
+ console.log(result);
+ //layer.msg('鍑虹幇寮傚父', { icon: 2, time: 2000 });
+ }
+ });
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ };
+ });
+
form.on('submit(Exit)', function (data) {//閫�鍑�
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
-
-
-
});
</script>
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 7dc1473..9f112df 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
@@ -25,7 +25,11 @@
<!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="HBarcodeSaverPZ">鐢熸垚鍝佺鐮�</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="HBarcodeSaverWY">鐢熸垚鍞竴鐮�</button>-->
<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="Print">鍐呭绠辨潯鐮佹墦鍗�</button>
+ <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Print_nx">鍐呯鏉＄爜鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Print_wx">澶栫鏉＄爜鎵撳嵃</button>-->
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_Print_NX_Convenient">鍐呯鏉＄爜鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_Print_WX_Convenient">澶栫鏉＄爜鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
@@ -458,6 +462,10 @@
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢熶骇鏃ユ湡涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if (_sSubStr[i].HBatchManager == "鏄�" && _sSubStr[i].HBatchNo == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐗╂枡鍚敤鎵规绠＄悊锛屾壒娆′负绌猴紝璇峰～鍐欐壒娆′俊鎭�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
//鑾峰彇涓嬫爣
index = findIndex(_sSubStr[i].HMaterNumber, _sSubStr[i].HMaterModel, newArray);
if (index === -1 || _sSubStr[i].HIsSplit == 0) {
@@ -579,7 +587,9 @@
});
return false;
});
- form.on('submit(Print)', function (data) {//鎵撳嵃
+
+ //鍐呭绠辨墦鍗�
+ form.on('submit(Print)', function (data) {
var data1 = layui.table.cache["subTable"]
, data2 = layui.table.cache["subTable2"];
var rows = '';
@@ -591,6 +601,58 @@
for (var i = 0; i < data1.length; i++) {
rows += data1[i].HItemID.toString() + ',';
rows2 += data1[i].HBarCode.toString() + ',';
+ }
+ for (var j = 0; j < data2.length; j++) {
+ rows += data2[j].HItemID.toString() + ',';
+ rows2 += data2[j].HBarCode.toString() + ',';
+ }
+ rows = rows.substring(rows.length - 1, 0);
+ rows2 = rows2.substring(rows2.length - 1, 0);
+ if (rows == "") {
+ layer.msg("娌℃湁闇�瑕佹墦鍗扮殑鏁版嵁锛�")
+ return;
+ }
+ else {
+ var url = "linteridSession";
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + url, //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "linterid": rows.toString(), "HUserName": sessionStorage["HUserName"] },
+ dataType: "json",
+ success: function (data) {
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err, { icon: 5 });
+ }
+ });
+ sessionStorage["linterid"] = rows.toString();
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + sessionStorage["linterid"] + '&HBarcode=&Type=SRM_POOrderBillList', 'yes']
+ , resize: false
+ //, cancel: function () {
+ // $(".layui-btn").removeClass("layui-btn-disabled");
+ //}
+ })
+ }
+ });
+
+ //鍐呯鎵撳嵃
+ form.on('submit(Print_nx)', function (data) {
+ var data2 = layui.table.cache["subTable2"];//鍐呯鏉＄爜
+
+ var rows = '';
+ var rows2 = '';
+ if (data2 == undefined) {
+ layer.msg("璇峰厛鐢熸垚鍐呯鏉＄爜锛�")
+ return;
}
for (var j = 0; j < data2.length; j++) {
rows += data2[j].HItemID.toString() + ',';
@@ -633,6 +695,176 @@
})
}
});
+
+ //澶栫鎵撳嵃
+ form.on('submit(Print_wx)', function (data) {
+ var data1 = layui.table.cache["subTable"]//澶栫鏉＄爜
+ var rows = '';
+ var rows2 = '';
+ if (data1 == undefined) {
+ layer.msg("璇峰厛鐢熸垚澶栫鏉＄爜锛�")
+ return;
+ }
+ for (var i = 0; i < data1.length; i++) {
+ rows += data1[i].HItemID.toString() + ',';
+ rows2 += data1[i].HBarCode.toString() + ',';
+ }
+
+ rows = rows.substring(rows.length - 1, 0);
+ rows2 = rows2.substring(rows2.length - 1, 0);
+ if (rows == "") {
+ layer.msg("娌℃湁闇�瑕佹墦鍗扮殑鏁版嵁锛�")
+ return;
+ }
+ else {
+ var url = "linteridSession";
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + url, //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "linterid": rows.toString(), "HUserName": sessionStorage["HUserName"] },
+ dataType: "json",
+ success: function (data) {
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err, { icon: 5 });
+ }
+ });
+ sessionStorage["linterid"] = rows.toString();
+
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + sessionStorage["linterid"] + '&HBarcode=&Type=SRM_POOrderBillList', 'yes']
+ , resize: false
+ //, cancel: function () {
+ // $(".layui-btn").removeClass("layui-btn-disabled");
+ //}
+ })
+ }
+ });
+
+ //涓�閿墦鍗板唴绠�
+ form.on('submit(set_Print_NX_Convenient)', function (data) {
+ var data2 = layui.table.cache["subTable2"];//鍐呯鏉＄爜
+
+ var rows = '';
+ var rows2 = '';
+ if (data2 == undefined) {
+ layer.msg("璇峰厛鐢熸垚鍐呯鏉＄爜锛�")
+ return;
+ }
+ for (var j = 0; j < data2.length; j++) {
+ rows += data2[j].HItemID.toString() + ',';
+ rows2 += data2[j].HBarCode.toString() + ',';
+ }
+ rows = rows.substring(rows.length - 1, 0);
+ rows2 = rows2.substring(rows2.length - 1, 0);
+ if (rows == "") {
+ layer.msg("娌℃湁闇�瑕佹墦鍗扮殑鏁版嵁锛�")
+ return;
+ }
+ else {
+ var url = "linteridSession";
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + url, //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "linterid": rows.toString(), "HUserName": sessionStorage["HUserName"] },
+ dataType: "json",
+ success: function (data) {
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err, { icon: 5 });
+ }
+ });
+ sessionStorage["linterid"] = rows.toString();
+
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Open_PrintTem/GetDefaultOpenTmp_Json",
+ async: true,
+ data: { "HNumber": 'SRM_POOrderBillList' },
+ //data: { "Value": Value },
+ success: function (result) {
+ if (result.count == 1) {
+ var OpenTmp = result.data[0].妯℃澘鍚嶇О
+ window.open("../../views/SRM/HBarPlanPrint.html?linterid=" + sessionStorage["linterid"].toString() + "&Type=SRM_POOrderBillList" + "&OpenTmp=" + OpenTmp.toString());
+ } else {
+ layer.msg(result.Message);
+ }
+ },
+ error: function (result) {
+ console.log(result);
+ }
+ });
+ }
+ });
+
+ //涓�閿墦鍗板绠�
+ form.on('submit(set_Print_WX_Convenient)', function (data) {
+ var data1 = layui.table.cache["subTable"]//澶栫鏉＄爜
+ var rows = '';
+ var rows2 = '';
+ if (data1 == undefined) {
+ layer.msg("璇峰厛鐢熸垚澶栫鏉＄爜锛�")
+ return;
+ }
+ for (var i = 0; i < data1.length; i++) {
+ rows += data1[i].HItemID.toString() + ',';
+ rows2 += data1[i].HBarCode.toString() + ',';
+ }
+
+ rows = rows.substring(rows.length - 1, 0);
+ rows2 = rows2.substring(rows2.length - 1, 0);
+ if (rows == "") {
+ layer.msg("娌℃湁闇�瑕佹墦鍗扮殑鏁版嵁锛�")
+ return;
+ }
+ else {
+ var url = "linteridSession";
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + url, //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "linterid": rows.toString(), "HUserName": sessionStorage["HUserName"] },
+ dataType: "json",
+ success: function (data) {
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err, { icon: 5 });
+ }
+ });
+ sessionStorage["linterid"] = rows.toString();
+
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Open_PrintTem/GetDefaultOpenTmp_Json",
+ async: true,
+ data: { "HNumber": 'SRM_POOrderBillList' },
+ //data: { "Value": Value },
+ success: function (result) {
+ if (result.count == 1) {
+ var OpenTmp = result.data[0].妯℃澘鍚嶇О
+ window.open("../../views/SRM/HBarPlanPrint.html?linterid=" + sessionStorage["linterid"].toString() + "&Type=SRM_POOrderBillList" + "&OpenTmp=" + OpenTmp.toString());
+ } else {
+ layer.msg(result.Message);
+ }
+ },
+ error: function (result) {
+ console.log(result);
+ }
+ });
+ }
+ });
+
form.on('submit(Exit)', function (data) {//閫�鍑�
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
parent.layer.close(index); //鍐嶆墽琛屽叧闂�
@@ -647,6 +879,7 @@
//}
}
});
+ //杩涘叆椤甸潰鏌ヨ琛ㄤ綋鐗╂枡淇℃伅
layer.load(3)
table.render({
elem: '#mainTable'
@@ -658,16 +891,16 @@
{ 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: '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, 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: '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" }
@@ -679,6 +912,7 @@
, { 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"
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html
index 0a6d86b..810ee91 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html
@@ -120,6 +120,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>-->
<button type="button" class="layui-btn layui-btn-sm" id="btn_HideColumn" lay-event="btn-HideColumn"><i class="layui-icon layui-icon-return"></i>闅愯棌鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鏉＄爜鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print-Convenient"><i class="layui-icon layui-icon-print"></i>涓�閿墦鍗�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
</div>
@@ -308,7 +309,7 @@
sessionStorage["linterid"] = rows.toString();
layer.open({
type: 2
- , area: ['50%', '50%']
+ , area: ['80%', '80%']
, title: '鎵撳嵃妯＄増閫夋嫨'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -317,6 +318,9 @@
, resize: false
})
}
+ break;
+ case 'btn-print-Convenient':
+ convenientPrint();
break;
case 'btn-Delete':
var checkStatus = table.checkStatus('mainTable')
@@ -511,6 +515,58 @@
active[type] ? active[type].call(this) : '';
});
+ //涓�閿墦鍗�
+ function convenientPrint() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ var rows = '';
+ var rows2 = '';
+ for (var i = 0; i < data.length; i++) {
+ rows += data[i].HItemID.toString() + ',';
+ rows2 += data[i].鏉＄爜缂栧彿.toString() + ',';
+ }
+ rows = rows.substring(rows.length - 1, 0);
+ rows2 = rows2.substring(rows2.length - 1, 0);
+ if (rows == "") {
+ layer.msg("鑷冲皯閫夋嫨涓�琛岃褰曪紒")
+ }
+ else {
+ var url = "linteridSession";
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + url, //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "linterid": rows.toString(), "HUserName": sessionStorage["HUserName"] },
+ dataType: "json",
+ success: function (data) {
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err, { icon: 5 });
+ }
+ });
+ sessionStorage["linterid"] = rows.toString();
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Open_PrintTem/GetDefaultOpenTmp_Json",
+ async: true,
+ data: { "HNumber": 'SRM_POOrderBillList' },
+ //data: { "Value": Value },
+ success: function (result) {
+ if (result.count == 1) {
+ var OpenTmp = result.data[0].妯℃澘鍚嶇О
+ window.open("../../views/SRM/HBarPlanPrint.html?linterid=" + sessionStorage["linterid"].toString() + "&Type=SRM_POOrderBillList" + "&OpenTmp=" + OpenTmp.toString());
+ } else {
+ layer.msg(result.Message);
+ }
+ },
+ error: function (result) {
+ console.log(result);
+ }
+ });
+ }
+ }
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
index 5f8f8a8..e0345a7 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
@@ -138,6 +138,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-changebg"><i class="layui-icon layui-icon-form"></i>鍙樻洿</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃閫佽揣鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print-Convenient"><i class="layui-icon layui-icon-print"></i>涓�閿墦鍗�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚鏉＄爜</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
@@ -690,7 +691,7 @@
//}
layer.open({
type: 2
- , area: ['50%', '50%']
+ , area: ['80%', '80%']
, title: '鎵撳嵃妯＄増閫夋嫨'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -702,6 +703,9 @@
//}
})
+ break;
+ case 'btn-print-Convenient':
+ convenientPrint();
break;
case 'btn-generate':
var checkStatus = table.checkStatus('mainTable')
@@ -752,6 +756,40 @@
}
});
});
+
+ //涓�閿墦鍗�
+ function convenientPrint() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length != 1) {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�", { icon: 5 });
+ return;
+ }
+ if (data[0].鍗曟嵁鐘舵�� != '宸插鏍�') {
+ layer.msg("璇峰鏍搁�佽揣鍗曞悗鍦ㄨ繘琛屾墦鍗�( 麓鈼旓笌 鈥糕棓锔巂)", { icon: 5 });
+ return;
+ }
+
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Open_PrintTem/GetDefaultOpenTmp_Json",
+ async: true,
+ data: { "HNumber": 'SRM_POInStockBillList' },
+ //data: { "Value": Value },
+ success: function (result) {
+ if (result.count == 1) {
+ var OpenTmp = result.data[0].妯℃澘鍚嶇О
+ window.open("../../views/SRM/HBarPlanPrint.html?linterid=" + data[0].hmainid.toString() + "&Type=SRM_POInStockBillList" + "&OpenTmp=" + OpenTmp.toString());
+ } else {
+ layer.msg(result.Message);
+ }
+ },
+ error: function (result) {
+ console.log(result);
+ }
+ });
+ }
+
});
</script>
</body>
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
index 98ab8e4..d894293 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
@@ -27,6 +27,7 @@
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" id="aduit-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Aduit">瀹℃牳</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="Print_Convenient">涓�閿墦鍗�</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="ChooseSource">閫夋簮鍗�</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
@@ -349,13 +350,15 @@
, { field: 'HRQty', title: '鍓╀綑鍙彂璐ф暟閲�', width: 100 }
, { field: 'HSQty', title: '婧愬崟鏁伴噺', width: 100 }
, { field: 'HBatchNo', title: '鎵瑰彿', width: 120, edit: 'text' }
+ , { field: 'HBatchManager', title: '鍚敤鎵规绠＄悊', width: 120, hide: true }
+ , { field: 'HOrderType', title: '璁㈠崟绫诲瀷', width: 120, hide: true }
, { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }
, { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100, hide: true }
, { field: 'HDate', title: '棰勮鍒拌揣鏃ユ湡', align: 'center', width: 150, data_field: 'HDate', event: "chooseHDate", hide: true }
, { field: 'HPrice', title: '鍗曚环', width: 100, hide: true }
, { field: 'HMoney', title: '閲戦', width: 100, hide: true }
, { field: 'HRemark', title: '澶囨敞', width: 200, edit: true }
- , { field: 'HTAXPRICE_T', title: '鍚◣閲嶉噺鍗曚环/鍚�', width: 200, edit: true, hide: true}
+ , { field: 'HTAXPRICE_T', title: '鍚◣閲嶉噺鍗曚环/鍚�', width: 200, edit: true, hide: true }
//, { field: 'HRemark', title: '澶囨敞', width: 100 }
, { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟涓诲唴鐮�', width: 150, hide: true }
, { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 150, hide: true }
@@ -741,6 +744,50 @@
});
});
+ //涓�閿墦鍗�
+ form.on('submit(Print_Convenient)', function (data) {
+ if (HIsAduit == false) {
+ layer.msg("璇峰鏍搁�佽揣鍗曞悗鍦ㄨ繘琛屾墦鍗�( 麓鈼旓笌 鈥糕棓锔巂)", { icon: 5 });
+ return;
+ }
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/GetHinterID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "HBillNo": $("#HBillNo").val() },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Open_PrintTem/GetDefaultOpenTmp_Json",
+ async: true,
+ data: { "HNumber": 'SRM_POInStockBillList' },
+ //data: { "Value": Value },
+ success: function (result) {
+ if (result.count == 1) {
+ var OpenTmp = result.data[0].妯℃澘鍚嶇О
+ window.open("../../views/SRM/HBarPlanPrint.html?linterid=" + data.data.toString() + "&Type=SRM_POInStockBillList" + "&OpenTmp=" + OpenTmp.toString());
+ } else {
+ layer.msg(result.Message);
+ }
+ },
+ error: function (result) {
+ console.log(result);
+ }
+ });
+ }
+ else {
+ f_alert(data.Message);
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ f_alert("閿欒:" + err);
+ }
+ });
+ });
+
form.on('submit(ChooseSource)', function (data) {
layer.open({
type: 2
@@ -825,10 +872,10 @@
// layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,閫佽揣鍗曟暟閲忎笉鑳借秴杩囧凡鐢熸垚鏉＄爜鏁伴噺!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return Result = false;
//}
- //if (sSubStr[i].HBatchNo == "") {
- // layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鎵规涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return Result = false;
- //}
+ if (sSubStr[i].HBatchNo == "" && sSubStr[i].HBatchManager == "鏄�") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐗╂枡鍚敤鎵规绠＄悊锛屾壒娆′负绌猴紝璇峰～鍐欐壒娆′俊鎭�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
if (sSubStr[i].HKFDate == "") {
//鍑礉
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢熶骇鏃ユ湡涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -970,11 +1017,16 @@
});
function GetPoorderValue(obj) {
- var Batchno = Format(new Date(), "yyyy-MM-dd").replaceAll('-', '').substr(2,6);//6浣嶆暟褰撳墠鏃ユ湡
-
+ var Batchno = Format(new Date(), "yyyy-MM-dd").replaceAll('-', '').substr(2, 6);//6浣嶆暟褰撳墠鏃ユ湡
+
var HSubLen = HSubData.length + 1;
var a = [];
+ var HOrderType = HSubData[0].HOrderType
+ var HError = "";
for (let i = 0; i < obj.length; i++) {
+ if (obj[i].璁㈠崟绫诲瀷 != HOrderType) {
+ HError += obj[i].璁㈠崟绫诲瀷;
+ }
var row_options = {
//"sorderid": HSubLen, "HPOOrderInterID": obj[i].hmainid, "HPOOrderEntryID": obj[i].hentryid, "HPOOrderBillNo": obj[i].鍗曟嵁鍙�, "HWWOrderInterID": 0,
//"HWWOrderEntryID": 0, "HWWOrderDetaiLID": 0., "HWWOrderBillNo": '', "HBillType": "1102", "HBatchNo": obj[i].HBatchNo, "HMaterID": obj[i].hmaterid,
@@ -1001,6 +1053,9 @@
// "HUnitID": "0", "FPrintCount": "0", "HRQty": "0", "HSQty": "", "HBatchNo": "", "HKFDate": "", "HKFPeriod": "", "HDate": "", "HPrice": "", "HMoney": "", "HRemark": "", "HPOOrderInterID": "", "HPOOrderEntryID": "", "HPOOrderBillNo": "", "HWWOrderInterID": "", "HWWOrderEntryID": "", "HWWOrderBillNo": "", "HBillType": "", "HSourceBillType": "", "HSourceBillNo": "", "HSupMaterNumber": "", "HSupBatchNo": "", "HExpressNumberSub": "", "HExpressSupplierSub": "", "HPlanArrivalDate": "", "HBoxNumber": "", "HSourceInterID": "", "HSourceEntryID": ""
//};
};
+ if (HError != "") {
+ return layer.msg('閲囪喘璁㈠崟璁㈠崟绫诲瀷涓嶅悓锛屼笉鍏佽鍚堝苟涓嬫帹鐢熸垚閫佽揣鍗曪紒')
+ }
table.reload('mainTable', {
data: HSubData
, height: 'full-10'
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
index afb1e2b..eb1ae4e 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
@@ -805,22 +805,31 @@
break;
case 'btn-generate':
var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
+ , data = checkStatus.data;
if (data.length == 0) {
layer.alert("璇烽�夋嫨鏁版嵁", { icon: 5 });
return;
}
if (data[0].瀹屾垚鐘舵�� == "宸插畬鎴�") {
return layer.msg('璁㈠崟宸插畬鎴愶紒')
- }
+ }
ajaxLabelData = data;
//鏍规嵁閫変腑鐨勯噰璐鍗曪紝閲嶆柊浠庨噾铦朵簯鍚屾閲囪喘璁㈠崟鍏宠仈鏁伴噺杩囨潵銆傝�冭檻閲囪喘璁㈠崟鍒犻櫎鍜屽叧闂姸鎬侊紝鍚屾鐘舵��
var ids = "";
var entryids = "";
+ var HBillType = data[0].璁㈠崟绫诲瀷
+ var HErr = "";
$.each(data, function (obj) {
ids += data[obj].hmainid + ",";
entryids += data[obj].hsubid + ",";
+ if (HBillType != data[obj].璁㈠崟绫诲瀷) {
+ HErr += data[obj].璁㈠崟绫诲瀷;
+ }
})
+ if (HErr != "") {
+ return layer.msg('閲囪喘璁㈠崟璁㈠崟绫诲瀷涓嶅悓锛屼笉鍏佽鍚堝苟涓嬫帹鐢熸垚閫佽揣鍗曪紒')
+ }
+
ids = ids.substring(0, ids.length - 1);
entryids = entryids.substring(0, entryids.length - 1);
var hasPrivileage = true;
diff --git a/WebSRM/login.html b/WebSRM/login.html
index 07a600a..53c0099 100644
--- a/WebSRM/login.html
+++ b/WebSRM/login.html
@@ -81,7 +81,7 @@
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data;
for (var i = 0; i < data.length; i++) {
- if (data[i].Name == "娴欐睙澶忓疂鐢靛櫒鏈夐檺鍏徃" || data[i].Name.indexOf("钃濇捣瀹炰笟闆嗗洟") >= 0 || data[i].Name.indexOf("瀹夌憺闆嗗洟") >= 0)
+ if (data[i].Name == "娴欐睙澶忓疂鐢靛櫒鏈夐檺鍏徃" || data[i].Name.indexOf("钃濇捣瀹炰笟闆嗗洟") >= 0 || data[i].Name.indexOf("瀹夌憺闆嗗洟") >= 0 || data[i].Name.indexOf("娣诲悍绉戞妧") >= 0)
Organization += '<option style="color:blue;" selected value="' + data[i].ID + '">' + data[i].Name + '</option>';
else
Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
--
Gitblit v1.9.1