From 6ac1d0e9607ee9b30b9d5ac90046769e30268b37 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期五, 07 六月 2024 16:56:00 +0800
Subject: [PATCH] 1
---
HTML_09/js/hiprint/hiprint.bundle.js | 3
HTML_09/views/SystemSettings/PrintModule.html | 5
HTML_09/views/SystemSettings/PrintTemplateFrom.html | 153 +++-
HTML_09/js/hiprint/css/hiprint.css | 4
HTML_09/views/SystemSettings/PrintSetting.html | 60 +
HTML_09/js/hiprint/plugins/config-etype-provider.js | 4
HTML_09/js/hiprint/plugins/print-data-list.js | 1376 +++++++++++++++++++++++++++++++++++++++++++++++++
HTML_09/views/SystemSettings/Dictionary.html | 25
8 files changed, 1,548 insertions(+), 82 deletions(-)
diff --git a/HTML_09/js/hiprint/css/hiprint.css b/HTML_09/js/hiprint/css/hiprint.css
index 4aa1482..90ae245 100644
--- a/HTML_09/js/hiprint/css/hiprint.css
+++ b/HTML_09/js/hiprint/css/hiprint.css
@@ -125,10 +125,10 @@
}
.small-printElement-types .hiprint-printElement-type > li > ul > li > a {
- height: 22px;
+ height: 30px;
/* padding: 12px 6px; */
/* margin-left: -1px; */
- line-height: 20px;
+ line-height: 30px;
text-decoration: none;
background-color: #009688;
border: 1px solid #fff;
diff --git a/HTML_09/js/hiprint/hiprint.bundle.js b/HTML_09/js/hiprint/hiprint.bundle.js
index 01f624c..b6c30b4 100644
--- a/HTML_09/js/hiprint/hiprint.bundle.js
+++ b/HTML_09/js/hiprint/hiprint.bundle.js
@@ -7372,12 +7372,11 @@
for (var p = "", l = 0; l < r.length; l++) {
p += o[l + ""];
}
-
n.sentToClient(p, t, e);
}
}, s.send();
});
- } else alert("杩炴帴瀹㈡埛绔け璐�");
+ } else { t || (t = {}), this.getHtml(t, e).hiwprint(); };
}, t.prototype.imageToBase64 = function (t) {
var e = $(t).attr("src");
if (-1 == e.indexOf("base64")) try {
diff --git a/HTML_09/js/hiprint/plugins/config-etype-provider.js b/HTML_09/js/hiprint/plugins/config-etype-provider.js
index 17eb26d..aeede8c 100644
--- a/HTML_09/js/hiprint/plugins/config-etype-provider.js
+++ b/HTML_09/js/hiprint/plugins/config-etype-provider.js
@@ -2,7 +2,7 @@
//涓氬姟鏂规硶------------------------Start-------------------------------------
//鎵撳嵃娓叉煋js configElementTypeProvider鏂规硶
//閰嶇疆瀛楁
-var datalist = [
+datalist = [
{
"type": "text",
"title": "鍏ュ簱鍗曞彿",
@@ -138,6 +138,8 @@
return function (options) {
//鍐呭娓叉煋
var addElementTypes = function (context) {
+ context.testModule = [];
+ context.allElementTypes = [];
context.addPrintElementTypes(
"testModule",
[
diff --git a/HTML_09/js/hiprint/plugins/print-data-list.js b/HTML_09/js/hiprint/plugins/print-data-list.js
new file mode 100644
index 0000000..0fb0aea
--- /dev/null
+++ b/HTML_09/js/hiprint/plugins/print-data-list.js
@@ -0,0 +1,1376 @@
+function getPrintDataList() {
+ var datalist = [];
+ var printDataList = function (type) {
+ //鍏ュ簱鍗曟嵁
+ if (type == 'ArrivalNotice') {
+ datalist = [
+ {
+ "type": "text",
+ "title": "鍏ュ簱鍗曞彿",
+ "field": "ASNNo",
+ "tid": "configModule.ASNNo",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鐗╂枡缂栫爜",
+ "field": "SkuNo",
+ "tid": "configModule.SkuNo",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鐗╂枡鍚嶇О",
+ "field": "SkuName",
+ "tid": "configModule.SkuName",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "瑙勬牸",
+ "field": "Standard",
+ "tid": "configModule.Standard",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鎵规鍙�",
+ "field": "LotNo",
+ "tid": "configModule.LotNo",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鎵规鎻忚堪",
+ "field": "LotText",
+ "tid": "configModule.LotText",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鏁伴噺",
+ "field": "Qty",
+ "tid": "configModule.Qty",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鍗曚环",
+ "field": "Price",
+ "tid": "configModule.Price",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鎬婚噾棰�",
+ "field": "Money",
+ "tid": "configModule.Money",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "渚涜揣鎵规",
+ "field": "SupplierLot",
+ "tid": "configModule.SupplierLot",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鍒涘缓浜�",
+ "field": "CreateUserName",
+ "tid": "configModule.CreateUserName",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鍒涘缓鏃堕棿",
+ "field": "SupplierLot",
+ "tid": "configModule.CreateTime",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "tid": 'configModule.ArrivalNoticeDetail',
+ "field": 'ArrivalNoticeDetail',
+ "title": '鍏ュ簱鍗曡鎯�',
+ "type": 'table',
+ "editable": true,
+ "columnDisplayEditable": true,//鍒楁樉绀烘槸鍚﹁兘缂栬緫
+ "columnDisplayIndexEditable": true,//鍒楅『搴忔樉绀烘槸鍚﹁兘缂栬緫
+ "columnTitleEditable": true,//鍒楁爣棰樻槸鍚﹁兘缂栬緫
+ "columnResizable": true, //鍒楀鏄惁鑳借皟鏁�
+ "columnAlignEditable": true,//鍒楀榻愭槸鍚﹁皟鏁�
+ "columns": [[
+ { title: '鍏ュ簱鍗曞彿', align: 'center', field: 'ASNNo', width: 100 },
+ { title: '鐗╂枡缂栫爜', align: 'center', field: 'SkuNo', width: 100 },
+ { title: '鐗╂枡鍚嶇О', align: 'center', field: 'SkuName', width: 100 },
+ { title: '瑙勬牸', align: 'center', field: 'Standard', width: 100 },
+ { title: '渚涜揣鎵规', align: 'center', field: 'SupplierLot', width: 100 },
+ { title: '鎵规鍙�', align: 'center', field: 'LotNo', width: 100 },
+ { title: '鏁伴噺', align: 'center', field: 'Qty', width: 100 },
+ { title: '鍒涘缓浜�', align: 'center', field: 'CreateUserName', width: 100 },
+ { title: '鍒涘缓鏃堕棿', align: 'center', field: 'CreateTime', width: 100 },
+ ]]
+ }
+ ]
+ }
+ //鍑哄簱鍗曟嵁
+ else if (type == 'ExportNotice') {
+ datalist = [
+ {
+ "type": "text",
+ "title": "鍑哄簱鍗曞彿",
+ "field": "SONo",
+ "tid": "configModule.SONo",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鐗╂枡缂栫爜",
+ "field": "SkuNo",
+ "tid": "configModule.SkuNo",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鐗╂枡鍚嶇О",
+ "field": "SkuName",
+ "tid": "configModule.SkuName",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "瑙勬牸",
+ "field": "Standard",
+ "tid": "configModule.Standard",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鎵规鍙�",
+ "field": "LotNo",
+ "tid": "configModule.LotNo",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鎵规鎻忚堪",
+ "field": "LotText",
+ "tid": "configModule.LotText",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鏁伴噺",
+ "field": "Qty",
+ "tid": "configModule.Qty",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鍗曚环",
+ "field": "Price",
+ "tid": "configModule.Price",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鎬婚噾棰�",
+ "field": "Money",
+ "tid": "configModule.Money",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "棰嗘枡浜�",
+ "field": "SupplierLot",
+ "tid": "configModule.MaterialUserName",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鍒涘缓浜�",
+ "field": "CreateUserName",
+ "tid": "configModule.CreateUserName",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鍒涘缓鏃堕棿",
+ "field": "SupplierLot",
+ "tid": "configModule.CreateTime",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "tid": 'configModule.ExportNoticeDetail',
+ "field": 'ExportNoticeDetail',
+ "title": '鍑哄簱鍗曡鎯�',
+ "type": 'table',
+ "editable": true,
+ "columnDisplayEditable": true,//鍒楁樉绀烘槸鍚﹁兘缂栬緫
+ "columnDisplayIndexEditable": true,//鍒楅『搴忔樉绀烘槸鍚﹁兘缂栬緫
+ "columnTitleEditable": true,//鍒楁爣棰樻槸鍚﹁兘缂栬緫
+ "columnResizable": true, //鍒楀鏄惁鑳借皟鏁�
+ "columnAlignEditable": true,//鍒楀榻愭槸鍚﹁皟鏁�
+ "columns": [[
+ { title: '鍑哄簱鍗曞彿', align: 'center', field: 'SONo', width: 100 },
+ { title: '鐗╂枡缂栫爜', align: 'center', field: 'SkuNo', width: 100 },
+ { title: '鐗╂枡鍚嶇О', align: 'center', field: 'SkuName', width: 100 },
+ { title: '瑙勬牸', align: 'center', field: 'Standard', width: 100 },
+ { title: '鎵规鍙�', align: 'center', field: 'LotNo', width: 100 },
+ { title: '鏁伴噺', align: 'center', field: 'Qty', width: 100 },
+ { title: '棰嗘枡浜�', align: 'center', field: 'MaterialUserName', width: 100 },
+ { title: '鍒涘缓浜�', align: 'center', field: 'CreateUserName', width: 100 },
+ { title: '鍒涘缓鏃堕棿', align: 'center', field: 'CreateTime', width: 100 },
+ ]]
+ }
+ ]
+ }
+ //璇烽獙鍗�
+ else if (type == 'QTBill') {
+ datalist = [
+ {
+ "type": "text",
+ "title": "鐗╂枡缂栫爜",
+ "field": "SkuNo",
+ "tid": "configModule.SkuNo",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鐗╂枡鍚嶇О",
+ "field": "SkuName",
+ "tid": "configModule.SkuName",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "瑙勬牸",
+ "field": "Standard",
+ "tid": "configModule.Standard",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鎵规鍙�",
+ "field": "LotNo",
+ "tid": "configModule.LotNo",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鎵规鎻忚堪",
+ "field": "LotText",
+ "tid": "configModule.LotText",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鏁伴噺",
+ "field": "Qty",
+ "tid": "configModule.Qty",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鍗曚环",
+ "field": "Price",
+ "tid": "configModule.Price",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鎬婚噾棰�",
+ "field": "Money",
+ "tid": "configModule.Money",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "渚涜揣鎵规",
+ "field": "SupplierLot",
+ "tid": "configModule.SupplierLot",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鍒涘缓浜�",
+ "field": "CreateUserName",
+ "tid": "configModule.CreateUserName",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鍒涘缓鏃堕棿",
+ "field": "CreateTime",
+ "tid": "configModule.CreateTime",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鏈夋晥鏈熻嚦",
+ "field": "ValidityPeriod",
+ "tid": "configModule.ValidityPeriod",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "璐瓨鏈熻嚦",
+ "field": "StoragePeriod",
+ "tid": "configModule.StoragePeriod",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "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": "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",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "姣忎欢鏁伴噺",
+ "field": "Index",
+ "tid": "configModule.Index",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鏁翠欢鏁�",
+ "field": "ZeroCount",
+ "tid": "configModule.ZeroCount",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鏁翠欢鏁�",
+ "field": "Total",
+ "tid": "configModule.Total",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鏀惰揣鏁伴噺",
+ "field": "ReceivedCount",
+ "tid": "configModule.ReceivedCount",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鍖呰鍗曚綅",
+ "field": "PackUnit",
+ "tid": "configModule.PackUnit",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "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,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "璇烽獙閮ㄩ棬",
+ "field": "QTDepartment",
+ "tid": "configModule.QTDepartment",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鐢熶骇鍟�",
+ "field": "Producer",
+ "tid": "configModule.Producer",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "渚涜揣鍟�",
+ "field": "Supplier",
+ "tid": "configModule.Supplier",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鍖呰瀹瑰櫒",
+ "field": "PackContainer",
+ "tid": "configModule.PackContainer",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "瀛樻斁鍦扮偣",
+ "field": "StorageLocation",
+ "tid": "configModule.StorageLocation",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+
+ ]
+ }
+ //鐗╂枡鏍囩
+ else if (type == 'MaterialLabel') {
+ datalist = [
+ {
+ "type": "text",
+ "title": "鐗╂枡缂栫爜",
+ "field": "SkuNo",
+ "tid": "configModule.SkuNo",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鐗╂枡鍚嶇О",
+ "field": "SkuName",
+ "tid": "configModule.SkuName",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "瑙勬牸",
+ "field": "Standard",
+ "tid": "configModule.Standard",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鎵规鍙�",
+ "field": "LotNo",
+ "tid": "configModule.LotNo",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鎵规鎻忚堪",
+ "field": "LotText",
+ "tid": "configModule.LotText",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鏁伴噺",
+ "field": "Qty",
+ "tid": "configModule.Qty",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鍗曚环",
+ "field": "Price",
+ "tid": "configModule.Price",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鎬婚噾棰�",
+ "field": "Money",
+ "tid": "configModule.Money",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "渚涜揣鎵规",
+ "field": "SupplierLot",
+ "tid": "configModule.SupplierLot",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鐢熶骇鏃ユ湡",
+ "field": "SupplierLot",
+ "tid": "configModule.ProductionDate",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鐢熶骇鍘傚",
+ "field": "SupplierLot",
+ "tid": "configModule.Manufacturer",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "澶嶉獙鏈熻嚦",
+ "field": "SupplierLot",
+ "tid": "configModule.RetestPeriod",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鏈夋晥鏈�",
+ "field": "SupplierLot",
+ "tid": "configModule.ValidityPeriod",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "璐瓨鏈熻嚦",
+ "field": "SupplierLot",
+ "tid": "configModule.StoragePeriod",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鎬讳欢鏁�",
+ "field": "SupplierLot",
+ "tid": "configModule.Count",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "绗嚑浠�",
+ "field": "SupplierLot",
+ "tid": "configModule.Index",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "璐瓨鏉′欢",
+ "field": "SupplierLot",
+ "tid": "configModule.StorageConditions",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ ]
+ }
+ //鍙栨牱鏍囩
+ else if (type == 'SamplingLabel') {
+ datalist = [
+ {
+ "type": "text",
+ "title": "鐗╂枡缂栫爜",
+ "field": "SkuNo",
+ "tid": "configModule.SkuNo",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鐗╂枡鍚嶇О",
+ "field": "SkuName",
+ "tid": "configModule.SkuName",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "瑙勬牸",
+ "field": "Standard",
+ "tid": "configModule.Standard",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鎵规鍙�",
+ "field": "LotNo",
+ "tid": "configModule.LotNo",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鎵规鎻忚堪",
+ "field": "LotText",
+ "tid": "configModule.LotText",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鏁伴噺",
+ "field": "Qty",
+ "tid": "configModule.Qty",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鍗曚环",
+ "field": "Price",
+ "tid": "configModule.Price",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鎬婚噾棰�",
+ "field": "Money",
+ "tid": "configModule.Money",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "渚涜揣鎵规",
+ "field": "SupplierLot",
+ "tid": "configModule.SupplierLot",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鐢熶骇鍘傚",
+ "field": "SupplierLot",
+ "tid": "configModule.Manufacturer",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鍙栨牱浠跺彿",
+ "field": "SupplierLot",
+ "tid": "configModule.SampleIndex",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鏍峰搧缂栫爜",
+ "field": "SupplierLot",
+ "tid": "configModule.SampleCode",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "瀹瑰櫒缂栧彿",
+ "field": "SupplierLot",
+ "tid": "configModule.ContainerCode",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "璐瓨鏉′欢",
+ "field": "SupplierLot",
+ "tid": "configModule.StorageConditions",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+
+ {
+ "type": "text",
+ "title": "鍙栨牱浜�",
+ "field": "SupplierLot",
+ "tid": "configModule.Sampler",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "澶嶆牳浜�",
+ "field": "SupplierLot",
+ "tid": "configModule.Reviewer",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鍙栨牱鏃ユ湡",
+ "field": "SupplierLot",
+ "tid": "configModule.SamplingDate",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ ]
+ }
+ //鍘熸枡鏃ユ姤
+ else if (type == 'MaterialDaily') {
+ datalist = [
+ {
+ "type": "text",
+ "title": "鐗╂枡缂栫爜",
+ "field": "SkuNo",
+ "tid": "configModule.SkuNo",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鐗╂枡鍚嶇О",
+ "field": "SkuName",
+ "tid": "configModule.SkuName",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "瑙勬牸",
+ "field": "Standard",
+ "tid": "configModule.Standard",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鎵规鍙�",
+ "field": "LotNo",
+ "tid": "configModule.LotNo",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ tid: 'configModule.MaterialDaily', field: 'MaterialDaily', title: '鍘熸枡鏃ユ姤',
+ type: 'table',
+ editable: true,
+ columnDisplayEditable: true,//鍒楁樉绀烘槸鍚﹁兘缂栬緫
+ columnDisplayIndexEditable: true,//鍒楅『搴忔樉绀烘槸鍚﹁兘缂栬緫
+ columnTitleEditable: true,//鍒楁爣棰樻槸鍚﹁兘缂栬緫
+ columnResizable: true, //鍒楀鏄惁鑳借皟鏁�
+ columnAlignEditable: true,//鍒楀榻愭槸鍚﹁皟鏁�
+ columns: [
+ [
+ { title: '鐗╂枡缂栫爜', align: 'center', field: 'SkuNo', width: 100, rowspan: 2 },
+ { title: '鐗╂枡鍚嶇О', align: 'center', field: 'SkuName', width: 100, rowspan: 2 },
+ { title: '瑙勬牸', align: 'center', field: 'Standard', width: 100, rowspan: 2 },
+ { title: '鍗曚綅', align: 'center', field: 'UnitName', width: 100, rowspan: 2 },
+ { title: '涓婃湡缁撳瓨鏁伴噺', align: 'center', field: 'BeforeBalanceQuantity', width: 100, rowspan: 2 },
+ { title: '鍏ュ簱鏁伴噺', align: 'center', field: 'ArrivalCount', width: 100, colspan: 3 },
+ { title: '鍑哄簱鏁伴噺', align: 'center', field: 'ExportCount', width: 100, colspan: 3 },
+ { title: '浠婃棩缁撳瓨鏁伴噺', align: 'center', field: 'TodayBalanceQuantity', width: 100, rowspan: 2 },
+ { title: '妫�楠屼腑鏁伴噺', align: 'center', field: 'QuantityInInspection', width: 100, rowspan: 2 },
+ { title: '鏈埌鏁伴噺', align: 'center', field: 'NotArrivedCount', width: 100, rowspan: 2 },
+ ],
+ [
+ { title: '浠婃棩鍏ュ簱', align: 'center', field: 'TodayArrival', width: 100 },
+ { title: '鏈湀鍏ュ簱', align: 'center', field: 'MonthArrival', width: 100 },
+ { title: '鏈勾鍏ュ簱', align: 'center', field: 'YearArrival', width: 100 },
+ { title: '浠婃棩鍑哄簱', align: 'center', field: 'TodayExport', width: 100 },
+ { title: '鏈湀鍑哄簱', align: 'center', field: 'MonthExport', width: 100 },
+ { title: '鏈勾鍑哄簱', align: 'center', field: 'YearExport', width: 100 }
+ ]
+ ]
+ }
+ ];
+ }
+ //鎴愬搧鏃ユ姤
+ else if (type == 'ProductDaily') {
+ datalist = [
+ {
+ "type": "text",
+ "title": "鐗╂枡缂栫爜",
+ "field": "SkuNo",
+ "tid": "configModule.SkuNo",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鐗╂枡鍚嶇О",
+ "field": "SkuName",
+ "tid": "configModule.SkuName",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "瑙勬牸",
+ "field": "Standard",
+ "tid": "configModule.Standard",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ "type": "text",
+ "title": "鎵规鍙�",
+ "field": "LotNo",
+ "tid": "configModule.LotNo",
+ "editable": true,
+ "columndisplayeditable": true,
+ "columndisplayindexeditable": true,
+ "columntitleeditable": true,
+ "columnresizable": true,
+ "columnaligneditable": true,
+ "columns": null
+ },
+ {
+ tid: 'configModule.MaterialDaily', field: 'MaterialDaily', title: '鎴愬搧鏃ユ姤',
+ type: 'table',
+ editable: true,
+ columnDisplayEditable: true,//鍒楁樉绀烘槸鍚﹁兘缂栬緫
+ columnDisplayIndexEditable: true,//鍒楅『搴忔樉绀烘槸鍚﹁兘缂栬緫
+ columnTitleEditable: true,//鍒楁爣棰樻槸鍚﹁兘缂栬緫
+ columnResizable: true, //鍒楀鏄惁鑳借皟鏁�
+ columnAlignEditable: true,//鍒楀榻愭槸鍚﹁皟鏁�
+ columns: [
+ [
+ { title: '鐗╂枡缂栫爜', align: 'center', field: 'SkuNo', width: 100, rowspan: 2 },
+ { title: '鐗╂枡鍚嶇О', align: 'center', field: 'SkuName', width: 100, rowspan: 2 },
+ { title: '瑙勬牸', align: 'center', field: 'Standard', width: 100, rowspan: 2 },
+ { title: '鍗曚綅', align: 'center', field: 'UnitName', width: 100, rowspan: 2 },
+ { title: '涓婃湀鏁伴噺', align: 'center', field: 'LastMonthCount', width: 100, rowspan: 2 },
+ { title: '涓婃湀鎶樹欢', align: 'center', field: 'LastMonthDiscount', width: 100, rowspan: 2 },
+
+ { title: '鍏ュ簱绱鏁伴噺', align: 'center', field: 'ArrivalCount', width: 100, colspan: 3 },
+ { title: '鍑哄簱绱鏁伴噺', align: 'center', field: 'ExportCount', width: 100, colspan: 3 },
+ { title: '褰撴湀缁撳瓨鏁�', align: 'center', field: 'MonthBalanceQuantity', width: 100, rowspan: 2 },
+ ],
+ [
+ { title: '浠婃棩鍏ュ簱', align: 'center', field: 'TodayArrival', width: 100 },
+ { title: '鏈湀鍏ュ簱', align: 'center', field: 'MonthArrival', width: 100 },
+ { title: '鏈勾鍏ュ簱', align: 'center', field: 'YearArrival', width: 100 },
+ { title: '浠婃棩鍑哄簱', align: 'center', field: 'TodayExport', width: 100 },
+ { title: '鏈湀鍑哄簱', align: 'center', field: 'MonthExport', width: 100 },
+ { title: '鏈勾鍑哄簱', align: 'center', field: 'YearExport', width: 100 }
+ ]
+ ]
+ }
+ ];
+ }
+ return datalist;
+ }
+ return printDataList;
+}
\ No newline at end of file
diff --git a/HTML_09/views/SystemSettings/Dictionary.html b/HTML_09/views/SystemSettings/Dictionary.html
index 1b4c80d..7af85bf 100644
--- a/HTML_09/views/SystemSettings/Dictionary.html
+++ b/HTML_09/views/SystemSettings/Dictionary.html
@@ -377,6 +377,31 @@
}
}
}
+ else if(field.Level == '0'){
+ if(doing){
+ doing = false;
+ sendData(IP + "/sys/AddDic", param, 'post',function(res) {
+ console.log(res);
+ if (res.code == 0) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {
+ layer.close(index); //鍏抽棴寮瑰眰
+ refreshTable($("#DictName").val(),$("#ParentNo").val(),$("#Level").val(), $("#IsEdit").val(), $("#IsAdd").val());
+ doing = true;
+ });
+ }
+ else
+ { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {doing = true;});
+ }
+ });
+ }
+ }
});
submit.trigger('click');
diff --git a/HTML_09/views/SystemSettings/PrintModule.html b/HTML_09/views/SystemSettings/PrintModule.html
index 28394cc..642a3b8 100644
--- a/HTML_09/views/SystemSettings/PrintModule.html
+++ b/HTML_09/views/SystemSettings/PrintModule.html
@@ -80,6 +80,7 @@
<script src="../../js/HiPrint/plugins/JsBarcode.all.min.js"></script>
<script src="../../js/HiPrint/plugins/qrcode.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/config-etype-provider.js"></script>
<script src="../../layuiadmin/layui/layui.js"></script>
<script src="../../js/public.js"></script>
@@ -117,7 +118,7 @@
//杩欓噷鑾峰彇涓婄骇椤甸潰鐨刾rintData鏁版嵁鎵撳嵃
// var printData = deepClone(parent.printData);
var printData = JSON.parse($("#printData").val());
- hiprintTemplate.print(printData);
+ hiprintTemplate.print(printData,'鎵撳嵃');
parent.layer.closeAll();
}, 100);
}
@@ -135,7 +136,7 @@
$('#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 34857ec..da15895 100644
--- a/HTML_09/views/SystemSettings/PrintSetting.html
+++ b/HTML_09/views/SystemSettings/PrintSetting.html
@@ -33,6 +33,14 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">绫诲瀷</label>
+ <div class="layui-input-block" style="width: 184.44px;">
+ <select id="Type" name="Type" id="Type" lay-verify="" lay-search>
+ <option value=""></option>
+ </select>
+ </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>鎼滅储
@@ -135,6 +143,17 @@
}
}
}
+ var TypeList = [];
+ synData(IP + "/Sys/GetDictionaryByParentNo?parentNo=" + "PrintType", {}, 'get', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#Type").append('<option value =' + res.data[i].DictNo + '>' +
+ res.data[i].DictName + '</option>');
+ }
+ form.render('select');
+ TypeList = res.data;
+ }
+ });
sendData(IP + "/basis/GetRoleRightList", {}, 'get', function (res) {
$(function () {
$("#approvalBtn").hide();
@@ -208,11 +227,12 @@
},
{
field: 'Type', title: '妯℃澘绫诲瀷', align: 'center', fixed: 'left', width: 100, templet: function (d) {
- switch (d.Type) {
- case "1":
- return "鍏ュ簱璐у搧";
- default:
- return "";
+ var mod = TypeList.filter(s => s.DictNo == d.Type)[0];
+ if (mod) {
+ return mod.DictName;
+ }
+ else {
+ return '';
}
}
},
@@ -343,21 +363,21 @@
}
});
- //娴嬭瘯鎵撳嵃
- printData = [{
- SkuNo: '000001',
- SkuName: '娴嬭瘯鐗╂枡1',
- Standard: 'xxxxxx',
- LotNo: '20230801',
- Qty: 100
- }, {
- SkuNo: '000002',
- SkuName: '娴嬭瘯鐗╂枡2',
- Standard: 'xxxxxx',
- LotNo: '20230801',
- Qty: 100
- }];
- openPrintDialog(printData)
+ // //娴嬭瘯鎵撳嵃
+ // printData = [{
+ // SkuNo: '000001',
+ // SkuName: '娴嬭瘯鐗╂枡1',
+ // Standard: 'xxxxxx',
+ // LotNo: '20230801',
+ // Qty: 100
+ // }, {
+ // SkuNo: '000002',
+ // SkuName: '娴嬭瘯鐗╂枡2',
+ // Standard: 'xxxxxx',
+ // LotNo: '20230801',
+ // Qty: 100
+ // }];
+ // openPrintDialog(printData)
});
</script>
</body>
diff --git a/HTML_09/views/SystemSettings/PrintTemplateFrom.html b/HTML_09/views/SystemSettings/PrintTemplateFrom.html
index cc0aa87..f52cedf 100644
--- a/HTML_09/views/SystemSettings/PrintTemplateFrom.html
+++ b/HTML_09/views/SystemSettings/PrintTemplateFrom.html
@@ -12,15 +12,6 @@
<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" type="text/css" href="../../js/HiPrint/css/bootstrap.min.css" > -->
- <script src="../../js/jquery-3.5.1.min.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/plugins/jquery.hiwprint.js"></script>
- <script src="../../js/HiPrint/plugins/config-etype-provider.js"></script>
<style>
.layui-form-label {
padding: 5px 1px;
@@ -50,8 +41,9 @@
<div class="layui-inline">
<label class="layui-form-label">绫诲瀷</label>
<div class="layui-input-block" style="width: 184.44px;">
- <select id="Type" name="Type" id="Type" lay-verify="" lay-search>
- <option value="1">鍏ュ簱璐у搧</option>
+ <select id="Type" name="Type" id="Type" lay-verify="" lay-filter="Type" lay-search>
+ <!-- <option value="1">鍏ュ簱璐у搧</option> -->
+ <option value=""></option>
</select>
</div>
</div>
@@ -72,62 +64,80 @@
</form>
</div>
<div class="row">
-
- <!--宸︿晶div-->
- <div class="layui-col-xs2" style="padding-right:0px;max-height:250mm;">
- <div class="small-printElement-types hiprintEpContainer">
+ <content style="border-left:1px solid #e8e8e8; ">
+ <!--宸︿晶div-->
+ <div class="layui-col-xs2" style="padding-right:0px;max-height:250mm;">
+ <div class="small-printElement-types hiprintEpContainer">
+ </div>
</div>
- </div>
- <!--鎵撳嵃閮ㄥ垎-->
- <div class="layui-col-xs6" style="margin-right: 50px;margin-left: 30px;">
- <!--鎵撳嵃澶撮儴鍒�-->
- <div class="hiprint-toolbar" style="margin-top:15px;">
- <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>
- <li><a class="hiprint-tizee-btn" onclick="setPaper('A5')">A5</a></li>
- <!-- <li><a class="hiprint-tizee-btn" onclick="setPaper('B3')">B3</a></li> -->
- <li><a class="hiprint-tizee-btn" onclick="setPaper('B4')">B4</a></li>
- <li><a class="hiprint-tizee-btn" onclick="setPaper('B5')">B5</a></li>
- <li><a class="hiprint-toolbar-item"><input type="number" id="customWidth"
- style="width: 50px;height: 19px;border: 0px;" placeholder="瀹�/mm" /></a></li>
- <li><a class="hiprint-toolbar-item"><input type="number" id="customHeight"
- style="width: 50px;height: 19px;border: 0px;" placeholder="楂�/mm" /></a></li>
- <li><a class="hiprint-tizee-btn"
- onclick="setPaper($('#customWidth').val(),$('#customHeight').val())">鑷畾涔�</a>
- </li>
- <li><a class="hiprint-tizee-btn" onclick="clearTemplate()">娓呯┖</a></li>
- <!-- <li> <a class="btn hiprint-toolbar-item "
+ <!--鎵撳嵃閮ㄥ垎-->
+ <div class="layui-col-xs8" style="overflow: hidden;outline: none;">
+ <!--鎵撳嵃澶撮儴鍒�-->
+ <div class="hiprint-toolbar" style="margin-top:15px;">
+ <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>
+ <li><a class="hiprint-tizee-btn" onclick="setPaper('A5')">A5</a></li>
+ <!-- <li><a class="hiprint-tizee-btn" onclick="setPaper('B3')">B3</a></li> -->
+ <li><a class="hiprint-tizee-btn" onclick="setPaper('B4')">B4</a></li>
+ <li><a class="hiprint-tizee-btn" onclick="setPaper('B5')">B5</a></li>
+ <li><a class="hiprint-toolbar-item"><input type="number" id="customWidth"
+ style="width: 50px;height: 19px;border: 0px;" placeholder="瀹�/mm" /></a></li>
+ <li><a class="hiprint-toolbar-item"><input type="number" id="customHeight"
+ style="width: 50px;height: 19px;border: 0px;" placeholder="楂�/mm" /></a></li>
+ <li><a class="hiprint-tizee-btn"
+ onclick="setPaper($('#customWidth').val(),$('#customHeight').val())">鑷畾涔�</a>
+ </li>
+ <li><a class="hiprint-toolbar-item" onclick="rotatePaper()">鏃嬭浆</a></li>
+ <li><a class="hiprint-tizee-btn" onclick="clearTemplate()">娓呯┖</a></li>
+ <!-- <li> <a class="btn hiprint-toolbar-item "
style="color: #fff;background-color: #d9534f;border-color: #d43f3a;"
id="preview">蹇�熼瑙�</a> </li> -->
- <li> <a id="directPrint" class="btn hiprint-toolbar-item "
- style="color: #fff;background-color: #d9534f; border-color: #d43f3a;">鎵撳嵃</a>
- </li>
- <!-- <li>
+ <li>
+ <a id="directPrint" class="btn hiprint-toolbar-item "
+ style="color: #fff;background-color: #d9534f; border-color: #d43f3a;">鎵撳嵃</a>
+ </li>
+ <!-- <li> <a id="directPrint2" class="btn hiprint-toolbar-item "
+ style="color: #fff;background-color: #d9534f; border-color: #d43f3a;">鐩存帴鎵撳嵃</a>
+ </li> -->
+ <!-- <li>
<a class="btn hiprint-toolbar-item"
style="color: #fff;background-color: #d9534f; border-color: #d43f3a;"
id="A4_getJson_toTextarea" onclick="BtnSubmit_Click()">淇濆瓨</a>
</li> -->
- </ul>
- <div style="clear:both;"></div>
+ </ul>
+ <div style="clear:both;"></div>
+ </div>
+ <!--鎵撳嵃涓讳綋閮ㄥ垎-->
+ <div id="hiprint-printTemplate" class="hiprint-printTemplate"
+ style="margin-top:20px; overflow-x: scroll; overflow-y: hidden;">
+ </div>
+ <textarea class="form-control" rows="10" id="A4_textarea_json" style="display: none;"></textarea>
</div>
- <!--鎵撳嵃涓讳綋閮ㄥ垎-->
- <div id="hiprint-printTemplate" class="hiprint-printTemplate" style="margin-top:20px;">
-
+ <div class="layui-col-xs2" style="max-height:260mm; overflow-y: scroll;">
+ <div id="PrintElementOptionSetting" style="margin-top: 10px;"></div>
</div>
- <textarea class="form-control" rows="10" id="A4_textarea_json" style="display: none;"></textarea>
- </div>
+ </content>
<!--鍙充晶div-->
- <div class="layui-col-xs2" style="margin-left: 6%;max-height:260mm; overflow-y: scroll;">
- <div id="PrintElementOptionSetting" style="margin-top: 10px;"></div>
- </div>
</div>
</div>
+ <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/plugins/jquery.hiwprint.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/print-data-list.js"></script>
<script src="../../layuiadmin/layui/layui.js"></script>
<script src="../../js/public.js"></script>
- <script src="../../js/jquery.cookie.js"></script>
<script>
+ var datalist = [];
var printData = {
SkuNo: '000001',
SkuName: '娴嬭瘯鐗╂枡1'
@@ -147,7 +157,6 @@
var field = data.field; // 鑾峰彇琛ㄥ崟瀛楁鍊�
var jsondata = JSON.stringify(hiprintTemplate.getJsonTid())
var url = "/sys/AddPrintTemplate";
- debugger;
var param = {
Name: data.field.Name,
Type: data.field.Type,
@@ -181,20 +190,46 @@
});
return false; // 闃绘榛樿 form 璺宠浆
});
+ form.on('select(Type)', function (data) {
+ datalist = getPrintDataList()(data.value);
+ $(".hiprintEpContainer").html(""); //娓呴櫎div鍐呭
+ hiprint.init({
+ providers: [new configElementTypeProvider()]
+ });
+ hiprint.PrintElementTypeManager.build('.hiprintEpContainer',
+ 'testModule');
+ })
+
//淇敼
+ GetPrintType();
var id = getQueryString('id');
if (!id) {
$('#Id').val('');
id = 0;
}
else {
- debugger
$('#Id').val(id);
$('#Name').val(parent.objRowsData.Name);
$('#Type').val(parent.objRowsData.Type);
$('#Status').val(parent.objRowsData.Status);
-
form.render();
+ }
+ function GetPrintType() {
+ sendData(IP + "/Sys/GetDictionaryByParentNo?parentNo=" + "PrintType", {}, 'get', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#Type").append('<option value =' + res.data[i].DictNo + '>' +
+ res.data[i].DictName + '</option>');
+ }
+ $("#Type").val(parent.objRowsData.Type);
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
}
})
@@ -240,13 +275,21 @@
//棰勮
$('#preview').click(function () {
- debugger
$('#myModal .modal-body .prevViewDiv').html(hiprintTemplate.getHtml(printData))
$('#myModal').modal('show')
});
$('#directPrint').click(function () {
hiprintTemplate.print(printData);
});
+ $('#directPrint2').click(function () {
+ hiprintTemplate.print2(printData, '鎵撳嵃');
+ });
+ //鏃嬭浆
+ var rotatePaper = function () {
+ hiprintTemplate.rotatePaper();
+ }
+
+
</script>
</body>
--
Gitblit v1.8.0