From cae008d8286b7ee846eb91e79350a9c57166882d Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期三, 12 六月 2024 15:41:28 +0800
Subject: [PATCH] 打印
---
HTML_09/views/ASNSetting/ArrivalNotice.html | 384 ++++++++++++++++++++-----------------
HTML_09/views/SystemSettings/PrintModule.html | 78 ++++---
HTML_09/views/SystemSettings/PrintTemplateFrom.html | 16 +
HTML_09/views/SOSetting/ExportNotice.html | 21 ++
HTML_09/views/SystemSettings/PrintSetting.html | 27 +-
HTML_09/js/hiprint/plugins/print-data-list.js | 28 --
HTML_09/js/public.js | 4
7 files changed, 298 insertions(+), 260 deletions(-)
diff --git a/HTML_09/js/hiprint/plugins/print-data-list.js b/HTML_09/js/hiprint/plugins/print-data-list.js
index 0fb0aea..7636899 100644
--- a/HTML_09/js/hiprint/plugins/print-data-list.js
+++ b/HTML_09/js/hiprint/plugins/print-data-list.js
@@ -556,19 +556,6 @@
},
{
"type": "text",
- "title": "鐢熶骇鏃ユ湡",
- "field": "ProductionDate",
- "tid": "configModule.ProductionDate",
- "editable": true,
- "columndisplayeditable": true,
- "columndisplayindexeditable": true,
- "columntitleeditable": true,
- "columnresizable": true,
- "columnaligneditable": true,
- "columns": null
- },
- {
- "type": "text",
"title": "鎬讳欢鏁�",
"field": "Count",
"tid": "configModule.Count",
@@ -595,7 +582,7 @@
},
{
"type": "text",
- "title": "鏁翠欢鏁�",
+ "title": "闆跺ご鏁伴噺",
"field": "ZeroCount",
"tid": "configModule.ZeroCount",
"editable": true,
@@ -650,19 +637,6 @@
"title": "璇烽獙鏃堕棿",
"field": "QTTime",
"tid": "configModule.QTTime",
- "editable": true,
- "columndisplayeditable": true,
- "columndisplayindexeditable": true,
- "columntitleeditable": true,
- "columnresizable": true,
- "columnaligneditable": true,
- "columns": null
- },
- {
- "type": "text",
- "title": "璇烽獙閮ㄩ棬",
- "field": "QTDepartment",
- "tid": "configModule.QTDepartment",
"editable": true,
"columndisplayeditable": true,
"columndisplayindexeditable": true,
diff --git a/HTML_09/js/public.js b/HTML_09/js/public.js
index 65df63c..f3aef70 100644
--- a/HTML_09/js/public.js
+++ b/HTML_09/js/public.js
@@ -284,10 +284,11 @@
}
//璋冪敤鎵撳嵃
-function openPrintDialog(printData){
+function openPrintDialog(printData, printType){
layer.open({
type: 2,
title: '鎵撳嵃',
+ // content: '../../js/hiprint/custom.html',
content: '/views/SystemSettings/PrintModule.html',
maxmin: true,
area: ['100%', '100%'],
@@ -295,6 +296,7 @@
success: function (layero, index) {
var body = layer.getChildFrame('body',index);
body.find('#printData').val(JSON.stringify(printData));
+ body.find('#printType').val(printType);
}
});
}
\ No newline at end of file
diff --git a/HTML_09/views/ASNSetting/ArrivalNotice.html b/HTML_09/views/ASNSetting/ArrivalNotice.html
index 690df4d..2cbd454 100644
--- a/HTML_09/views/ASNSetting/ArrivalNotice.html
+++ b/HTML_09/views/ASNSetting/ArrivalNotice.html
@@ -17,13 +17,16 @@
height: auto;
line-height: 23px;
}
- .layui-table-tool-panel{
+
+ .layui-table-tool-panel {
top: auto;
bottom: 29px;
}
- .layui-table-tool{
+
+ .layui-table-tool {
padding-left: 5px;
}
+
/* 琛ㄦ牸涓嬫媺灏忕澶撮殣钘� */
.layui-table-grid-down {
display: none;
@@ -31,14 +34,14 @@
</style>
<script>
// 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
- document.addEventListener("DOMContentLoaded", function() {
+ document.addEventListener("DOMContentLoaded", function () {
//鑾峰彇table榛樿鏄剧ず鏁�
pageCntFirst();
console.log(pageCnt)
//鍒ゆ柇鏄惁寮�鍚痶able鍒楄〃鍒楀璋冩暣鍔熻兘銆�
GetIsSetColW();
});
- </script>
+ </script>
</head>
<body id="body">
@@ -49,8 +52,8 @@
<div class="layui-inline">
<label class="layui-form-label">鍏ュ簱鍗曞彿</label>
<div class="layui-input-inline">
- <input type="text" id="ASNNo" name="ASNNo" placeholder="鍏ュ簱鍗曞彿"
- autocomplete="off" class="layui-input">
+ <input type="text" id="ASNNo" name="ASNNo" placeholder="鍏ュ簱鍗曞彿" autocomplete="off"
+ class="layui-input">
</div>
</div>
<div class="layui-inline">
@@ -104,8 +107,8 @@
<div class="layui-inline">
<label class="layui-form-label">瀹㈡埛鍚嶇О</label>
<div class="layui-input-inline">
- <input type="text" id="CustomerName" name="CustomerName" placeholder="瀹㈡埛鍚嶇О" autocomplete="off"
- class="layui-input">
+ <input type="text" id="CustomerName" name="CustomerName" placeholder="瀹㈡埛鍚嶇О"
+ autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
@@ -126,27 +129,28 @@
<label class="layui-form-label">鎾ら攢鍘熷洜</label>
<div class="layui-input-inline">
<textarea id="Reason" name="Reason" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
-
+
</div>
- </div>
+ </div>
<div class="layui-inline">
<button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
lay-filter="LAY-app-contlist-search">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储
</button>
</div>
-
+
<!-- 缁存姢澶囨敞寮规 -->
<div class="layui-inline" id="divEditDemo" style="display: none; padding-top: 10px;">
<label class="layui-form-label">澶囨敞</label>
<div class="layui-input-inline" style="width: 300px;height: 100%;">
- <textarea placeholder="璇疯緭鍏ュ唴瀹�" id="NoticeDemo" name="NoticeDemo" class="layui-textarea"></textarea>
+ <textarea placeholder="璇疯緭鍏ュ唴瀹�" id="NoticeDemo" name="NoticeDemo"
+ class="layui-textarea"></textarea>
</div>
</div>
</div>
</div>
- <div id="center">
+ <div id="center">
</div>
<div class="layui-card-body">
@@ -183,6 +187,8 @@
default :
break;
}
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="Print">
+ <i class="layui-icon layui-icon-print"></i>鎵撳嵃</a>`;
html += `<a class="layui-btn layui-btn-normal layui-btn-xs editDemoClass" lay-event="editDemo">
<i class="layui-icon layui-icon-edit"></i>澶囨敞</a>`;
return html;
@@ -268,7 +274,7 @@
<i class="layui-icon"></i>娣诲姞
</button>
</script>
-
+
<script type="text/html" id="toolbarDemoList">
{{# function GetBtn2(d){
var html = ``;
@@ -276,6 +282,8 @@
html = `<a class="layui-btn layui-btn-danger layui-btn-xs delClass" lay-event="del">
<i class="layui-icon layui-icon-delete"></i>鍒犻櫎</a>`;
}
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="Print">
+ <i class="layui-icon layui-icon-print"></i>鎵撳嵃</a>`;
return html;
}
}}
@@ -341,14 +349,14 @@
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'table', 'laypage', 'layer', 'laydate'], function () {
-
+
var doing = true;
-
+
var table = layui.table,
form = layui.form,
laypage = layui.laypage,
layer = layui.layer;
-
+
laydate = layui.laydate;
laydate.render({
@@ -363,27 +371,27 @@
var h1 = GetTableTopHeight();
var h2 = GetTableBottomHeight();
-
+
refreshTable();
- refreshTablemx("鍗曞彿");
+ refreshTablemx("鍗曞彿");
//娓叉煋鎬诲崟
//#region 鑷畾涔夎〃澶�
var TotalColsArr = [[
- {field: '',title: '搴忓彿',type:'numbers',width: 50,align: 'center',fixed: 'left', "disabled": true},
- {field: 'ASNNo',title: '鍏ュ簱鍗曞彿',align: 'center',fixed: 'left',sort: true,width: 180, "disabled": true},
- {field: 'Status',title: '鎵ц鐘舵��',align: 'center',templet: '#buttonTpl'},
- {field: 'Origin',title: '鏉ユ簮',align: 'center',width: 80},
- {field: 'CustomerName',title: '瀹㈡埛鍚嶇О',align: 'center'},
- {field: 'Type',title: '鍗曟嵁绫诲瀷',align: 'center',templet: '#templetType'},
- {field: 'CompleteTime',title: '瀹屾垚鏃堕棿',align: 'center',templet: '#templetCompleteTime'},
- {field: 'Demo',title: '澶囨敞',align: 'center',width: 180},
- {field: 'CreateUserName',title: '鍒涘缓浜�',align: 'center',width: 110},
- {field: 'CreateTime',title: '鍒涘缓鏃堕棿',align: 'center',templet: '#templetCreateTime'},
- {field: 'UpdateUserName',title: '淇敼浜�',align: 'center',width: 110},
- {field: 'UpdateTime',title: '淇敼鏃堕棿',align: 'center',templet: '#templetUpdateTime'},
- {field: 'caozuo',title: '鎿嶄綔',fixed: 'right',width: 280,align: 'center',toolbar: '#toolbarDemo1', "disabled": true}
- ]];
- var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
+ { field: '', title: '搴忓彿', type: 'numbers', width: 50, align: 'center', fixed: 'left', "disabled": true },
+ { field: 'ASNNo', title: '鍏ュ簱鍗曞彿', align: 'center', fixed: 'left', sort: true, width: 180, "disabled": true },
+ { field: 'Status', title: '鎵ц鐘舵��', align: 'center', templet: '#buttonTpl' },
+ { field: 'Origin', title: '鏉ユ簮', align: 'center', width: 80 },
+ { field: 'CustomerName', title: '瀹㈡埛鍚嶇О', align: 'center' },
+ { field: 'Type', title: '鍗曟嵁绫诲瀷', align: 'center', templet: '#templetType' },
+ { field: 'CompleteTime', title: '瀹屾垚鏃堕棿', align: 'center', templet: '#templetCompleteTime' },
+ { field: 'Demo', title: '澶囨敞', align: 'center', width: 180 },
+ { field: 'CreateUserName', title: '鍒涘缓浜�', align: 'center', width: 110 },
+ { field: 'CreateTime', title: '鍒涘缓鏃堕棿', align: 'center', templet: '#templetCreateTime' },
+ { field: 'UpdateUserName', title: '淇敼浜�', align: 'center', width: 110 },
+ { field: 'UpdateTime', title: '淇敼鏃堕棿', align: 'center', templet: '#templetUpdateTime' },
+ { field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 280, align: 'center', toolbar: '#toolbarDemo1', "disabled": true }
+ ]];
+ var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
function refreshTable() {
//#region 鍘熷闈炶嚜瀹氫箟鍒�
@@ -414,7 +422,7 @@
// cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
// done: function(res) {
// setRight();
-
+
// //aaa = $('#LAY-app-content-list').next().find('.layui-table-main').find('tr[data-index="0"]').find('td[data-field="ASNNo"]');
// // refreshTablemx(res.data[0].ASNNo);
// },
@@ -530,18 +538,18 @@
//#region 鑷畾涔夎〃澶�
var colsJson
- var param1={
- Href:'BllAsn/GetArrivalNoticeList'
+ var param1 = {
+ Href: 'BllAsn/GetArrivalNoticeList'
};
- sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function(res) {
- if (res.code == 0){
- if(res.data=='' || res.data==undefined || res.data==null){
- colsJson=TotalColsArr
- }else{
- colsJson= eval(res.data);
+ sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function (res) {
+ if (res.code == 0) {
+ if (res.data == '' || res.data == undefined || res.data == null) {
+ colsJson = TotalColsArr
+ } else {
+ colsJson = eval(res.data);
}
- }else{
- colsJson=TotalColsArr
+ } else {
+ colsJson = TotalColsArr
}
var param = {
ASNNo: $("#ASNNo").val(),
@@ -551,7 +559,7 @@
LotNo: $("#LotNo").val(),
SkuNo: $("#SkuNo").val(),
SkuName: $("#SkuName").val(),
- StartTime:$("#StartTime").val(),
+ StartTime: $("#StartTime").val(),
EndTime: $("#EndTime").val()
};
table.render({
@@ -562,16 +570,16 @@
id: 'LAY-app-content-list',
where: param,
contentType: 'application/json',
- headers:{ToKen:$.cookie('token')},
+ headers: { ToKen: $.cookie('token') },
page: true,
even: true,
limit: pageCnt,
limits: pageLimits,
cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- done: function(res) {
- setRight();
+ done: function (res) {
+ setRight();
//鑷畾涔夊垪瀹�
- SetTableColW('LAY-app-content-list','BllAsn/GetArrivalNoticeList',TotalColsSysArr);
+ SetTableColW('LAY-app-content-list', 'BllAsn/GetArrivalNoticeList', TotalColsSysArr);
},
cols: colsJson
});
@@ -579,42 +587,42 @@
//#endregion
}
// 鍏ュ簱鍗晅able鍗曟満浜嬩欢
- table.on('row(LAY-app-content-list)', function(obj) {
+ table.on('row(LAY-app-content-list)', function (obj) {
refreshTablemx(obj.data.ASNNo);
});
- //娓叉煋鏄庣粏
+ //娓叉煋鏄庣粏
//#region 鑷畾涔夎〃澶�
var DetailColsArr = [[
- {field: '',title: '搴忓彿',type:'numbers',width: 50,align: 'center',fixed: 'left', "disabled": true},
- {field: 'ASNNo',title: '鍏ュ簱鍗曞彿',align: 'center',fixed: 'left',sort: true,width: 180, "disabled": true},
- {field: 'SkuNo',title: '鐗╂枡缂栫爜',align: 'center',width: 100},
- {field: 'SkuName',title: '鐗╂枡鍚嶇О',align: 'center',width: 200},
- {field: 'Standard',title: '鐗╂枡瑙勬牸',align: 'center',width: 130},
- {field: 'LotNo',title: '鎵规鍙�',align: 'center',width: 100},
- {field: 'SupplierLot',title: '渚涜揣鎵规',align: 'center',width: 100},
- {field: 'Qty',title: '鏁伴噺',align: 'center',width: 70},
- {field: 'FactQty',title: '宸茬粍鏁伴噺',align: 'center',width: 90},
- {field: 'CompleteQty',title: '瀹屾垚鏁伴噺',align: 'center',width: 90},
- {field: 'CompleteTime',title: '瀹屾垚鏃堕棿',align: 'center', width: 160,templet: '#templetCompleteTime2'},
- {field: 'UnitName',title: '璁￠噺鍗曚綅',align: 'center',width: 90},
- {field: 'Price',title: '鍗曚环',align: 'center',width: 65},
- {field: 'Money',title: '閲戦',align: 'center',width: 65},
- {field: 'LotText',title: '鎵规鎻忚堪',align: 'center',width: 120},
- {field: 'PackagName',title: '鍖呰鍚嶇О',align: 'center',width: 110,},
- {field: 'IsBale',title: '鏄惁瑁瑰寘',align: 'center',width: 150},
- {field: 'IsBelt',title: '鏄惁鎵撳甫',align: 'center',width: 150},
- {field: 'UDF1',title: '鑷畾涔夊垪1',align: 'center',width: 140},
- {field: 'UDF2',title: '鑷畾涔夊垪2',align: 'center',width: 140},
- {field: 'UDF3',title: '鑷畾涔夊垪3',align: 'center',width: 140},
- {field: 'UDF4',title: '鑷畾涔夊垪4',align: 'center',width: 140},
- {field: 'UDF5',title: '鑷畾涔夊垪5',align: 'center',width: 140,templet:'#templetUDF5'},
- {field: 'CreateUserName',title: '鍒涘缓浜�',align: 'center',width: 100},
- {field: 'CreateTime',title: '鍒涘缓鏃堕棿',align: 'center',width: 160,templet: '#templetCreateTime2'},
- {field: 'UpdateUserName',title: '淇敼浜�',align: 'center',width: 150,},
- {field: 'UpdateTime',title: '淇敼鏃堕棿',align: 'center',width: 150,templet: '#templetUpdateTime3'},
- {field: 'caozuo',title: '鎿嶄綔',fixed: 'right',width: 100,align: 'left',toolbar: '#toolbarDemoList', "disabled": true}
- ]];
- var DetailColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
+ { field: '', title: '搴忓彿', type: 'numbers', width: 50, align: 'center', fixed: 'left', "disabled": true },
+ { field: 'ASNNo', title: '鍏ュ簱鍗曞彿', align: 'center', fixed: 'left', sort: true, width: 180, "disabled": true },
+ { field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', width: 100 },
+ { field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center', width: 200 },
+ { field: 'Standard', title: '鐗╂枡瑙勬牸', align: 'center', width: 130 },
+ { field: 'LotNo', title: '鎵规鍙�', align: 'center', width: 100 },
+ { field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center', width: 100 },
+ { field: 'Qty', title: '鏁伴噺', align: 'center', width: 70 },
+ { field: 'FactQty', title: '宸茬粍鏁伴噺', align: 'center', width: 90 },
+ { field: 'CompleteQty', title: '瀹屾垚鏁伴噺', align: 'center', width: 90 },
+ { field: 'CompleteTime', title: '瀹屾垚鏃堕棿', align: 'center', width: 160, templet: '#templetCompleteTime2' },
+ { field: 'UnitName', title: '璁￠噺鍗曚綅', align: 'center', width: 90 },
+ { field: 'Price', title: '鍗曚环', align: 'center', width: 65 },
+ { field: 'Money', title: '閲戦', align: 'center', width: 65 },
+ { field: 'LotText', title: '鎵规鎻忚堪', align: 'center', width: 120 },
+ { field: 'PackagName', title: '鍖呰鍚嶇О', align: 'center', width: 110, },
+ { field: 'IsBale', title: '鏄惁瑁瑰寘', align: 'center', width: 150 },
+ { field: 'IsBelt', title: '鏄惁鎵撳甫', align: 'center', width: 150 },
+ { field: 'UDF1', title: '鑷畾涔夊垪1', align: 'center', width: 140 },
+ { field: 'UDF2', title: '鑷畾涔夊垪2', align: 'center', width: 140 },
+ { field: 'UDF3', title: '鑷畾涔夊垪3', align: 'center', width: 140 },
+ { field: 'UDF4', title: '鑷畾涔夊垪4', align: 'center', width: 140 },
+ { field: 'UDF5', title: '鑷畾涔夊垪5', align: 'center', width: 140, templet: '#templetUDF5' },
+ { field: 'CreateUserName', title: '鍒涘缓浜�', align: 'center', width: 100 },
+ { field: 'CreateTime', title: '鍒涘缓鏃堕棿', align: 'center', width: 160, templet: '#templetCreateTime2' },
+ { field: 'UpdateUserName', title: '淇敼浜�', align: 'center', width: 150, },
+ { field: 'UpdateTime', title: '淇敼鏃堕棿', align: 'center', width: 150, templet: '#templetUpdateTime3' },
+ { field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 100, align: 'left', toolbar: '#toolbarDemoList', "disabled": true }
+ ]];
+ var DetailColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
function refreshTablemx(asnNo) {
//#region 鍘熷闈炶嚜瀹氫箟鍒�
@@ -800,23 +808,23 @@
//#region 鑷畾涔夎〃澶�
var colsJson2
- var param1={
- Href:'BllAsn/GetArrivalNoticeDetailList'
+ var param1 = {
+ Href: 'BllAsn/GetArrivalNoticeDetailList'
};
- sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function(res) {
- if (res.code == 0){
- if(res.data=='' || res.data==undefined || res.data==null){
- colsJson2=DetailColsArr
- }else{
- colsJson2= eval(res.data);
+ sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function (res) {
+ if (res.code == 0) {
+ if (res.data == '' || res.data == undefined || res.data == null) {
+ colsJson2 = DetailColsArr
+ } else {
+ colsJson2 = eval(res.data);
+ }
+ } else {
+ colsJson2 = DetailColsArr
}
- }else{
- colsJson2=DetailColsArr
- }
- var param = {
- ASNNo:asnNo
- };
- table.render({
+ var param = {
+ ASNNo: asnNo
+ };
+ table.render({
elem: '#LAY-app-content-list2',
url: IP + "/BllAsn/GetArrivalNoticeDetailList",
method: 'POST',
@@ -824,65 +832,64 @@
id: 'LAY-app-content-list2',
where: param,
contentType: 'application/json',
- toolbar:'#toolbarDemo',
- defaultToolbar: [], //'filter','print', 'exports'
- headers:{ToKen:$.cookie('token')},
+ toolbar: '#toolbarDemo',
+ defaultToolbar: [], //'filter','print', 'exports'
+ headers: { ToKen: $.cookie('token') },
page: true,
limit: pageCnt,
limits: pageLimits,
cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- done: function() {
+ done: function () {
setRight()
//鑷畾涔夊垪瀹�
- SetTableColW('LAY-app-content-list2','BllAsn/GetArrivalNoticeDetailList',DetailColsSysArr);
- },
+ SetTableColW('LAY-app-content-list2', 'BllAsn/GetArrivalNoticeDetailList', DetailColsSysArr);
+ },
cols: colsJson2
});
});
//#endregion
}
- function setRight()
- {
- $(function() {
+ function setRight() {
+ $(function () {
$(".addClass").hide();
$(".editClass").hide();
- $(".delClass").hide();
- $(".cheXiaoClass").hide();
- $(".clossClass").hide();
+ $(".delClass").hide();
+ $(".cheXiaoClass").hide();
+ $(".clossClass").hide();
$(".editDemoClass").hide();//澶囨敞
});
- sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
+ sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞鍏ュ簱鍗�") {
- $(function() {
+ $(function () {
$(".addClass").show();
});
}
if (res.data[k].MenuName == "缂栬緫鍏ュ簱鍗�") {
- $(function() {
+ $(function () {
$(".editClass").show();
});
}
if (res.data[k].MenuName == "鍒犻櫎鍏ュ簱鍗�") {
- $(function() {
- $(".delClass").show();
+ $(function () {
+ $(".delClass").show();
});
}
if (res.data[k].MenuName == "鎾ら攢鍏ュ簱鍗�") {
- $(function() {
- $(".cheXiaoClass").show();
+ $(function () {
+ $(".cheXiaoClass").show();
});
}
if (res.data[k].MenuName == "鍏抽棴鍏ュ簱鍗�") {
- $(function() {
- $(".clossClass").show();
+ $(function () {
+ $(".clossClass").show();
});
}
if (res.data[k].MenuName == "缁存姢鍏ュ簱鍗曞娉�") {
- $(function() {
- $(".editDemoClass").show();
+ $(function () {
+ $(".editDemoClass").show();
});
}
}
@@ -890,7 +897,7 @@
layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {});
+ }, function () { });
}
});
}
@@ -898,11 +905,11 @@
// 椤甸潰鐩戞帶锛岀偣鍑绘煡璇㈠姞杞藉叆搴撴�诲崟
form.on('submit(LAY-app-contlist-search)', function (data) {
refreshTable();
- refreshTablemx("鍗曞彿");
+ refreshTablemx("鍗曞彿");
});
-
- table.on('toolbar(LAY-app-content-list2)', function(obj){
- if (obj.event == "add") {
+
+ table.on('toolbar(LAY-app-content-list2)', function (obj) {
+ if (obj.event == "add") {
layer.open({
type: 2,
title: '娣诲姞鍏ュ簱鍗曟嵁',
@@ -912,14 +919,13 @@
});
}
});
-
+
var ImportId = 0;
table.on('tool(LAY-app-content-list)', function (obj) {
var data = obj.data;
- switch(obj.event)
- {
- case "edit" :
+ switch (obj.event) {
+ case "edit":
// 浠ｇ爜鍖哄煙
var id = data.ASNNo;
layer.open({
@@ -930,11 +936,11 @@
area: ['70%', '90%']
});
break;
- case "del" :
- layer.confirm('纭畾鍒犻櫎姝ゅ崟鎹悧锛�', function(index) {
+ case "del":
+ layer.confirm('纭畾鍒犻櫎姝ゅ崟鎹悧锛�', function (index) {
// 浠ｇ爜鍖哄煙
var param = {
- ASNNo:data.ASNNo,
+ ASNNo: data.ASNNo,
};
sendData(IP + "/BllAsn/DelArrivalNotice", param, 'post', function (res) {
if (res.code == 0) { //鎴愬姛
@@ -943,7 +949,7 @@
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}, function () {
refreshTable();
- refreshTablemx("鍗曞彿");
+ refreshTablemx("鍗曞彿");
doing = true
});
} else { //涓嶆垚鍔�
@@ -953,14 +959,14 @@
}, function () { doing = true });
}
});
- });
+ });
break;
- case "closs" :
+ case "closs":
// 浠ｇ爜鍖哄煙
- layer.confirm('纭畾鍏抽棴姝ゅ崟鎹悧锛�', function(index) {
+ layer.confirm('纭畾鍏抽棴姝ゅ崟鎹悧锛�', function (index) {
// 浠ｇ爜鍖哄煙
var param = {
- Id:data.Id,
+ Id: data.Id,
};
sendData(IP + "/UpApi/FinishAsn", param, 'post', function (res) {
if (res.code == 0) { //鎴愬姛
@@ -978,111 +984,129 @@
}, function () { doing = true });
}
});
- });
-
+ });
+
break;
- case "chexiao" :
+ case "chexiao":
layer.open({
type: 1,
title: '鎾ら攢鐢宠',
content: $('#divReason'),
maxmin: true,
- area: ['300px','265px'],
+ area: ['300px', '265px'],
btn: ['纭畾', '鍙栨秷'],
- yes: function(index, layero) {
+ yes: function (index, layero) {
var pa = $('#Reason').val();
- if (doing== true) {
- doing= false;
-
+ if (doing == true) {
+ doing = false;
+
var param = {
- Id: data.Id,
+ Id: data.Id,
Reason: pa,
};
console.log(param);
- sendData(IP + "/BllAsn/CancelOrder", param, 'get', function(res) {
+ sendData(IP + "/BllAsn/CancelOrder", param, 'get', function (res) {
console.log(res);
if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 3000 //1绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
+ }, function () {
refreshTable();
- doing= true;
+ doing = true;
});
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
icon: 2,
time: 3000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
+ }, function () {
refreshTable();
- doing= true;
+ doing = true;
});
}
layer.close(index);
});
- }else{
+ } else {
layer.msg("璇峰嬁閲嶅鐐瑰嚮", {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
});
}
-
+
}
- });
-
+ });
+
break;
- case "editDemo" :
+ case "editDemo":
$('#NoticeDemo').val(data.Demo);
layer.open({
type: 1,
title: '缁存姢澶囨敞',
content: $('#divEditDemo'),
maxmin: false,
- area: ['420px','260px'],
+ area: ['420px', '260px'],
btn: ['纭畾', '鍙栨秷'],
- yes: function(index, layero) {
+ yes: function (index, layero) {
var demo = $('#NoticeDemo').val();
var param = {
id: data.Id,
demo: demo,
};
- sendData(IP + "/BllAsn/EditNoticeDemo", param, 'get', function(res) {
+ sendData(IP + "/BllAsn/EditNoticeDemo", param, 'get', function (res) {
if (res.code == 0) { //鎴愬姛
refreshTable();
layer.msg(res.msg, {
icon: 1,
time: 1500 //1绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
-
+ }, function () {
+
});
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
icon: 2,
time: 3000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
+ }, function () {
refreshTable();
});
}
layer.close(index);
});
}
- });
+ });
break;
- default:break;
+ case "Print":
+ console.log(data);
+ var param = {
+ limit: 1000,
+ page: 1,
+ ASNNo: data.ASNNo
+ };
+ sendData(IP + "/BllAsn/GetArrivalNoticeDetailList", param, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ data.ArrivalNoticeDetail = res.data;
+ openPrintDialog(data, 'ArrivalNotice');
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { doing = true });
+ }
+ });
+ break;
+ default: break;
}
});
//鏄庣粏琛ㄦ搷浣滄爮浜嬩欢
table.on('tool(LAY-app-content-list2)', function (obj) {
var data = obj.data;
- switch(obj.event)
- {
- case "del" :
- layer.confirm('纭畾鍒犻櫎鍏ュ簱鍗曟槑缁嗗悧锛�', function(index) {
+ switch (obj.event) {
+ case "del":
+ layer.confirm('纭畾鍒犻櫎鍏ュ簱鍗曟槑缁嗗悧锛�', function (index) {
// 浠ｇ爜鍖哄煙
var param = {
- ASNNo:data.ASNNo,
- Id:data.Id,
- };
+ ASNNo: data.ASNNo,
+ Id: data.Id,
+ };
sendData(IP + "/BllAsn/DelArrivalNoticeDetail", param, 'post', function (res) {
if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
@@ -1100,31 +1124,35 @@
}, function () { doing = true });
}
});
- });
+ });
break;
- default:break;
+ case "Print":
+ console.log(data);
+ openPrintDialog(data, 'MaterialLabel');
+ break;
+ default: break;
}
});
//#region 鑷畾涔夎〃澶�
//鑷畾涔夎〃澶�
active = {
- customCols: function(){
+ customCols: function () {
layer.open({
type: 2,
title: '鑷畾涔夊垪',
- content: '../SystemSettings/HeaderSetting.html?Href=BllAsn/GetArrivalNoticeList&ColsSysArr='+TotalColsSysArr,
+ content: '../SystemSettings/HeaderSetting.html?Href=BllAsn/GetArrivalNoticeList&ColsSysArr=' + TotalColsSysArr,
maxmin: false,
resize: false,
area: ['970px', '650px']
});
},
- customCols2: function(){
+ customCols2: function () {
layer.open({
type: 2,
title: '鑷畾涔夊垪',
- content: '../SystemSettings/HeaderSetting.html?Href=BllAsn/GetArrivalNoticeDetailList&ColsSysArr='+DetailColsSysArr,
+ content: '../SystemSettings/HeaderSetting.html?Href=BllAsn/GetArrivalNoticeDetailList&ColsSysArr=' + DetailColsSysArr,
maxmin: false,
resize: false,
area: ['970px', '650px']
@@ -1132,7 +1160,7 @@
}
};
- $('.layui-btn').on('click', function() {
+ $('.layui-btn').on('click', function () {
var type = $(this).data('type');
active[type] ? active[type].call(this) : '';
});
diff --git a/HTML_09/views/SOSetting/ExportNotice.html b/HTML_09/views/SOSetting/ExportNotice.html
index 8d5e6d6..eab2b5d 100644
--- a/HTML_09/views/SOSetting/ExportNotice.html
+++ b/HTML_09/views/SOSetting/ExportNotice.html
@@ -313,6 +313,8 @@
html += `<a class="layui-btn layui-btn-normal layui-btn-xs shangClass" lay-event="xml">
<i class="layui-icon layui-icon-ok"></i>XML
</a>`;
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="Print">
+ <i class="layui-icon layui-icon-print"></i>鎵撳嵃</a>`;
html += `<a class="layui-btn layui-btn-normal layui-btn-xs editDemoClass" lay-event="editDemo">
<i class="layui-icon layui-icon-edit"></i>澶囨敞</a>`;
return html;
@@ -1283,6 +1285,25 @@
}
});
}
+ else if(obj.event === 'Print'){
+ console.log(data);
+ var param = {
+ limit: 1000,
+ page: 1,
+ SONo: data.SONo
+ };
+ sendData(IP + "/BllSo/GetExportNoticeDetailList", param, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ data.ExportNoticeDetail = res.data;
+ openPrintDialog(data, 'ExportNotice');
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { doing = true });
+ }
+ });
+ }
});
table.on('tool(LAY-app-content-list2)', function(obj) {
diff --git a/HTML_09/views/SystemSettings/PrintModule.html b/HTML_09/views/SystemSettings/PrintModule.html
index 642a3b8..5298460 100644
--- a/HTML_09/views/SystemSettings/PrintModule.html
+++ b/HTML_09/views/SystemSettings/PrintModule.html
@@ -11,6 +11,7 @@
<link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" type="text/css" href="../../js/HiPrint/css/hiprint.css?t=' + Math.random() + '" />
<link rel="stylesheet" type="text/css" href="../../js/HiPrint/css/print-lock.css" />
+ <link rel="stylesheet" media="print" href="../../js/HiPrint/css/print-lock.css" />
<!-- <link rel="stylesheet" type="text/css" href="../../js/HiPrint/css/bootstrap.min.css" > -->
<style>
.layui-form-label {
@@ -27,6 +28,7 @@
<body>
<div class="layui-card">
<input type="hidden" id="printData" name="printData">
+ <input type="hidden" id="printType" name="printType">
<div class="row">
<!--宸︿晶div-->
@@ -74,69 +76,77 @@
<script src="../../js/jquery-3.5.1.min.js"></script>
<script src="../../js/jquery.cookie.js"></script>
<script src="../../js/hiprint/content/bootstrap.min.js"></script>
- <script src="../../js/HiPrint/hiprint.bundle.js?t=' + Math.random() + '"></script>
<script src="../../js/HiPrint/polyfill.min.js"></script>
<script src="../../js/HiPrint/plugins/jquery.minicolors.min.js"></script>
<script src="../../js/HiPrint/plugins/JsBarcode.all.min.js"></script>
<script src="../../js/HiPrint/plugins/qrcode.js"></script>
+ <script src="../../js/HiPrint/hiprint.bundle.js"></script>
<script src="../../js/HiPrint/plugins/jquery.hiwprint.js"></script>
- <script src="../../js/HiPrint/plugins/socket.io.js"></script>
+ <!-- <script src="../../js/HiPrint/plugins/socket.io.js"></script> -->
<script src="../../js/HiPrint/plugins/config-etype-provider.js"></script>
+ <script src="../../js/HiPrint/plugins/jspdf/canvas2image.js"></script>
+ <script src="../../js/HiPrint/plugins/jspdf/canvg.min.js"></script>
+ <script src="../../js/HiPrint/plugins/jspdf/html2canvas.min.js"></script>
+ <script src="../../js/HiPrint/plugins/jspdf/jspdf.min.js"></script>
+ <script src="../../js/HiPrint/plugins/print-data-list.js"></script>
+ <script src="../../js/HiPrint/hiprint.config.js"></script>
<script src="../../layuiadmin/layui/layui.js"></script>
<script src="../../js/public.js"></script>
<script>
var configPrintJson;
-
+ var datalist = [];
//鍒濆鍖栨墦鍗版彃浠舵覆鏌�
$(".hiprintEpContainer").html(""); //娓呴櫎div鍐呭
- hiprint.init({
- providers: [new configElementTypeProvider()]
- });
- //璁剧疆宸︿晶鎷栨嫿浜嬩欢
- hiprint.PrintElementTypeManager.build('.hiprintEpContainer', 'testModule');
+
var hiprintTemplate;
// var JsonData = JSON.parse('{"panels":[{"index":0,"height":50,"width":50,"paperHeader":0,"paperFooter":141.73228346456693,"printElements":[{"tid":"configModule.SkuName","options":{"left":9,"top":12,"height":9.75,"width":120}},{"tid":"configModule.SkuNo","options":{"left":9,"top":37.5,"height":78,"width":120,"textType":"qrcode"}}],"paperNumberLeft":178.5,"paperNumberTop":123}]}')
var JsonData = {};
- synData(IP + "/sys/GetDefaultPrintTemplate", {}, 'get', function (res) {
- if (res.code == 0) { //鎴愬姛
- JsonData = JSON.parse(res.data.PositionJson);
- $("#customWidth").val(JsonData.panels[0].width);
- $("#customHeight").val(JsonData.panels[0].height);
- hiprintTemplate = new hiprint.PrintTemplate({
- template: JsonData,//妯℃澘JSON
- settingContainer: '#PrintElementOptionSetting',
- paginationContainer: '.hiprint-printPagination'
- });
+ setTimeout(function () {
+ var printType = $("#printType").val();
+ datalist = getPrintDataList()(printType);
+ synData(IP + "/sys/GetDefaultPrintTemplate?Type=" + printType, {}, 'get', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ hiprint.init({
+ providers: [new configElementTypeProvider()]
+ });
+ //璁剧疆宸︿晶鎷栨嫿浜嬩欢
+ hiprint.PrintElementTypeManager.build('.hiprintEpContainer', 'testModule');
+ JsonData = JSON.parse(res.data.PositionJson);
+ $("#customWidth").val(JsonData.panels[0].width);
+ $("#customHeight").val(JsonData.panels[0].height);
+ hiprintTemplate = new hiprint.PrintTemplate({
+ template: JsonData,//妯℃澘JSON
+ settingContainer: '#PrintElementOptionSetting',
+ paginationContainer: '.hiprint-printPagination'
+ });
- //鎵撳嵃璁捐
- hiprintTemplate.design('#hiprint-printTemplate');
+ //鎵撳嵃璁捐
+ hiprintTemplate.design('#hiprint-printTemplate');
- //鎵撳嵃
- setTimeout(function () {
+ //鎵撳嵃
//杩欓噷鑾峰彇涓婄骇椤甸潰鐨刾rintData鏁版嵁鎵撳嵃
// var printData = deepClone(parent.printData);
var printData = JSON.parse($("#printData").val());
- hiprintTemplate.print(printData,'鎵撳嵃');
+ hiprintTemplate.print(printData, '鎵撳嵃');
parent.layer.closeAll();
- }, 100);
- }
- else //涓嶆垚鍔�
- {
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { parent.layer.closeAll(); });
- }
- });
+ }
+ else //涓嶆垚鍔�
+ {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { parent.layer.closeAll(); });
+ }
+ });
+ }, 100);
$('#directPrint').click(function () {
hiprintTemplate.print(printData);
});
- var datalist = [];
</script>
</body>
diff --git a/HTML_09/views/SystemSettings/PrintSetting.html b/HTML_09/views/SystemSettings/PrintSetting.html
index da15895..8b93275 100644
--- a/HTML_09/views/SystemSettings/PrintSetting.html
+++ b/HTML_09/views/SystemSettings/PrintSetting.html
@@ -364,20 +364,19 @@
});
// //娴嬭瘯鎵撳嵃
- // printData = [{
- // SkuNo: '000001',
- // SkuName: '娴嬭瘯鐗╂枡1',
- // Standard: 'xxxxxx',
- // LotNo: '20230801',
- // Qty: 100
- // }, {
- // SkuNo: '000002',
- // SkuName: '娴嬭瘯鐗╂枡2',
- // Standard: 'xxxxxx',
- // LotNo: '20230801',
- // Qty: 100
- // }];
- // openPrintDialog(printData)
+ // printData = {
+ // Id: 4052,
+ // ASNNo: "ASN2024052800005",
+ // ArrivalNoticeDetail: [
+ // { SkuNo: '000001' }
+ // ],
+ // // workExperience: [
+ // // { position: '鏁版嵁鍒嗘瀽甯�', company: '鏌愬疂', address: '鍖椾含', date: '鍥涙湀-2010-鍏湀-2011', work: '涓撻鍒嗘瀽/妯″瀷锛屾牴鎹笟鍔″垎鏋愬垎鏋愬悇绫讳笓棰橈紝渚嬪锛氬晢鍝佺瓑绾э紝浼氬憳娑堣垂琛屼负钀ラ攢娲诲姩锛岄噸瑕佷骇鍝佹暟鎹瓑銆�' },
+ // // { position: '鏁版嵁鍒嗘瀽甯�', company: '鏌愪笢', address: '鍖椾含', date: '涔濇湀-2011-涓夋湀-2016', work: '鏁版嵁鎸囨爣鐩戞帶锛屾牴鎹骇鍝侊紝杩愯惀浠ュ強绠＄悊鐨勯渶姹傦紝閽堝浜у搧鏁版嵁锛岃繍钀ワ紝涓氬姟杩涘睍鍙奒PI鎸囨爣鐨勭洃鎺э紝缁忚惀鍒嗘瀽锛屽鍙U鐨勭粡钀ユ姤鍛婏紝鍒嗘瀽KPI杩涘害锛屼氦鏄撲骇鍝佸紓鍔ㄥ師鍥狅紝鍒嗘瀽甯傚満鍔ㄦ�侊紝姹囨姤瀵硅薄涓築U缁忕悊銆�' },
+ // // { position: '鏁版嵁浜у搧缁忕悊', company: '澶х背', address: '鍖椾含', date: '鍥涙湀-2016-鑷充粖', work: '璐熻矗鍏蜂綋鍒嗘瀽椤圭洰锛屼緥濡傚疄鏃剁洃鎺э紝鏁版嵁鍚庡彴绠＄悊锛屽崗璋冨紑鍙戣祫婧愶紝鎺у埗椤圭洰杩涘害銆�' }
+ // // ],
+ // };
+ // openPrintDialog(printData, 'ArrivalNotice');
});
</script>
</body>
diff --git a/HTML_09/views/SystemSettings/PrintTemplateFrom.html b/HTML_09/views/SystemSettings/PrintTemplateFrom.html
index f52cedf..b4f94dd 100644
--- a/HTML_09/views/SystemSettings/PrintTemplateFrom.html
+++ b/HTML_09/views/SystemSettings/PrintTemplateFrom.html
@@ -73,7 +73,7 @@
<!--鎵撳嵃閮ㄥ垎-->
<div class="layui-col-xs8" style="overflow: hidden;outline: none;">
<!--鎵撳嵃澶撮儴鍒�-->
- <div class="hiprint-toolbar" style="margin-top:15px;">
+ <div class="hiprint-toolbar" style="margin-top:15px;margin-left:10px;">
<ul>
<!-- <li><a class="hiprint-tizee-btn" onclick="setPaper('A3')">A3</a></li> -->
<li><a class="hiprint-tizee-btn" onclick="setPaper('A4')">A4</a></li>
@@ -109,8 +109,10 @@
<div style="clear:both;"></div>
</div>
<!--鎵撳嵃涓讳綋閮ㄥ垎-->
- <div id="hiprint-printTemplate" class="hiprint-printTemplate"
- style="margin-top:20px; overflow-x: scroll; overflow-y: hidden;">
+ <div style="overflow-x: scroll; overflow-y: hidden;">
+ <div id="hiprint-printTemplate" class="hiprint-printTemplate"
+ style="margin-top:20px;margin-left:20px;">
+ </div>
</div>
<textarea class="form-control" rows="10" id="A4_textarea_json" style="display: none;"></textarea>
</div>
@@ -242,7 +244,9 @@
//鍒濆鍖栨墦鍗版彃浠舵覆鏌�
// $(".hiprintEpContainer").html(""); //娓呴櫎div鍐呭
-
+ if (parent.objRowsData.Type) {
+ datalist = getPrintDataList()(parent.objRowsData.Type);
+ }
hiprint.init({
providers: [new configElementTypeProvider()]
});
@@ -251,8 +255,8 @@
'testModule');
let hiprintTemplate;
- if (window.parent.objRowsData.PositionJson)
- var JsonData = JSON.parse(window.parent.objRowsData.PositionJson)
+ if (parent.objRowsData.PositionJson)
+ var JsonData = JSON.parse(parent.objRowsData.PositionJson)
if (JsonData) {
$("#customWidth").val(JsonData.panels[0].width);
$("#customHeight").val(JsonData.panels[0].height);
--
Gitblit v1.8.0