From 5496663c2c1d5833d91bc4c3d3b654788dc4f352 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 10 十二月 2025 18:58:14 +0800
Subject: [PATCH] 制造周期报表添加英文字段隐藏；首件检验单内容调整；香囊标签打印
---
WebTM/views/车间管理/单品过站_小卫/Cj_SachetBarCodePrint.html | 14 +
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 282 +++++++++++++++++++--------------------
WebTM/views/grf/香囊模板JSON.grf | 87 ++++++++++++
WebTM/WebTM.csproj | 1
WebTM/views/生产管理/制造周期报表/Sc_ProductionCycleBillList.html | 4
5 files changed, 238 insertions(+), 150 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 6bdf05c..f0ab5f1 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -1575,6 +1575,7 @@
<Content Include="views\grf\绠辨潯鐮乢杩﹀崡1.grf" />
<Content Include="views\grf\鐗╂枡鏉＄爜_鍏磋揪.grf" />
<Content Include="views\grf\宸ュ簭娴佽浆鍗″皬鏍囩.grf" />
+ <Content Include="views\grf\棣欏泭妯℃澘JSON.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
diff --git "a/WebTM/views/grf/\351\246\231\345\233\212\346\250\241\346\235\277JSON.grf" "b/WebTM/views/grf/\351\246\231\345\233\212\346\250\241\346\235\277JSON.grf"
new file mode 100644
index 0000000..4676ca3
--- /dev/null
+++ "b/WebTM/views/grf/\351\246\231\345\233\212\346\250\241\346\235\277JSON.grf"
@@ -0,0 +1,87 @@
+锘縶
+ "Version":"6.8.2.5",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Weight":400,
+ "Charset":134
+ },
+ "Printer":{
+ "Size":256,
+ "Width":4.7,
+ "Height":2.8,
+ "LeftMargin":0,
+ "TopMargin":0,
+ "RightMargin":0,
+ "BottomMargin":0
+ },
+ "DetailGrid":{
+ "CenterView":true,
+ "Recordset":{
+ "Field":[
+ {
+ "Name":"鏂欏彿"
+ },
+ {
+ "Name":"鐗╂枡浠ｇ爜"
+ },
+ {
+ "Name":"鐗╂枡鍚嶇О"
+ },
+ {
+ "Name":"鎵瑰彿"
+ },
+ {
+ "Name":"鏁伴噺"
+ },
+ {
+ "Name":"渚涘簲鍟�"
+ },
+ {
+ "Name":"婧愬崟鍙�"
+ },
+ {
+ "Name":"鏉＄爜缂栧彿"
+ }
+ ]
+ },
+ "Column":[
+ {
+ "Name":"Column1",
+ "Width":4.70958
+ }
+ ],
+ "ColumnContent":{
+ "Height":2.59292,
+ "ColumnContentCell":[
+ {
+ "Column":"Column1",
+ "FreeCell":true,
+ "Control":[
+ {
+ "Type":"Barcode",
+ "Name":"Barcode1",
+ "Left":0.608542,
+ "Top":0.79375,
+ "Width":3.20146,
+ "Height":1.00542,
+ "BarcodeType":"Code128Auto",
+ "Text":"[#鏉＄爜缂栧彿#]"
+ }
+ ]
+ }
+ ]
+ },
+ "ColumnTitle":{
+ "Height":0,
+ "ColumnTitleCell":[
+ {
+ "GroupTitle":false,
+ "Column":"Column1",
+ "TextAlign":"MiddleCenter",
+ "Text":"Column1"
+ }
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\266\351\200\240\345\221\250\346\234\237\346\212\245\350\241\250/Sc_ProductionCycleBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\266\351\200\240\345\221\250\346\234\237\346\212\245\350\241\250/Sc_ProductionCycleBillList.html"
index 906b85a..2887155 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\266\351\200\240\345\221\250\346\234\237\346\212\245\350\241\250/Sc_ProductionCycleBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\266\351\200\240\345\221\250\346\234\237\346\212\245\350\241\250/Sc_ProductionCycleBillList.html"
@@ -644,6 +644,10 @@
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {
data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
+ }
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left' });
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index fa77dd9..b39d48a 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -1712,23 +1712,12 @@
//#endregion
//淇濆瓨
- async function set_SaveBill(data) {
+ function set_SaveBill(data) {
//璧嬪�兼渶鍚庝竴涓�変腑琛岀殑鏁版嵁缁檕ption.data
//Assignment(LastIndex, LastIndex);
//淇濆瓨鏈�鍚庝竴娆＄偣鍑昏鐨勬楠屽��
+ set_SaveValue($("#HEntryID").val());
- try {
- var rownum = $("#HEntryID").val();
-
- rowFun = table.cache["mainTable"][rownum].HAnalysisMethod;
- if (rowFun == "")
- throw error
- await set_SaveValue($("#HEntryID").val(), rowFun);
- } catch (error) {
-
- layer.msg('鐢ㄦ埛鍙栨秷浜嗘楠屽�间繚瀛�');
- return;
- }
if ($("#HICMOQty").val() == "" || $("#HICMOQty").val() <= 0) {
layer.msg("浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
@@ -1835,6 +1824,7 @@
}
});
}
+
//缂栬緫鏃跺姞杞借〃澶�
function RoadBillMain(linterid) {
@@ -3171,9 +3161,9 @@
var table_value = table.cache['ValueTable'];
if (OperationType == 3) {
- set_SaveValue(Number(nowindex) + Number(1), rowFun);
+ set_SaveValue(Number(nowindex) + Number(1));
} else {
- set_SaveValue(dataindex + 1, rowFun);
+ set_SaveValue(dataindex + 1);
}
//璧嬪�间笌鍥炴樉
if ($("#HSampleSchemeID").val() != "0") {
@@ -4246,144 +4236,144 @@
set_SaveBill(data);
});
//妫�楠屽�间繚瀛� - 杩斿洖Promise
- function set_SaveValue(dataindex, rowFun) {
- return new Promise((resolve, reject) => {
- var hasEmptyRow = false;
- var emptyRowNumbers = [];
+ //function set_SaveValue(dataindex, rowFun) {
+ // return new Promise((resolve, reject) => {
+ // var hasEmptyRow = false;
+ // var emptyRowNumbers = [];
- for (let i = 0; i < table.cache['ValueTable'].length; i++) {
- var row = table.cache['ValueTable'][i];
- if (rowFun == 2) {
- if (
- (!row.HInSpectValue || row.HInSpectValue === "")) {
- hasEmptyRow = true;
- emptyRowNumbers.push(i + 1);
- }
- }
- }
-
-
- if (hasEmptyRow) {
- var confirmMsg = "妫�楠屽�艰〃鏍间腑瀛樺湪绌鸿锛堢 " + emptyRowNumbers.join(", ") + " 琛岋級锛屾槸鍚︾户缁繚瀛橈紵";
- layer.confirm(confirmMsg, {
- icon: 3,
- title: '鎻愮ず',
- btn: ['纭淇濆瓨', '鍙栨秷淇濆瓨']
- }, function (index) {
-
- layer.close(index);
- proceedWithSave(dataindex).then(resolve).catch(reject);
- }, function (index) {
- ////鑾峰彇涓婃鎵�鍦ㄨ涓嬫爣
- //var dataindex = $("#HEntryID").val() - 1;
- layer.close(index);
- //EchoValue();
- layer.msg('宸插彇娑堜繚瀛橈紝璇峰畬鍠勬暟鎹悗閲嶆柊鎿嶄綔', { icon: 2 });
- //reject(new Error('鐢ㄦ埛鍙栨秷浜嗕繚瀛�'));
- });
- } else {
-
- proceedWithSave(dataindex).then(resolve).catch(reject);
- }
- });
- }
-
-
- function proceedWithSave(dataindex) {
- return new Promise((resolve, reject) => {
- if (OperationType == 3) {
- EchoValue();
- }
-
-
- for (let i = 0; i < table.cache['ValueTable'].length; i++) {
- if (table.cache['ValueTable'][i].HInSpectValueB == "" || table.cache['ValueTable'][i].HInSpectValueB == null) {
- table.cache['ValueTable'][i].HInSpectValueB = 0
- }
- if (table.cache['ValueTable'][i].HInSpectValueT == "" || table.cache['ValueTable'][i].HInSpectValueT == null) {
- table.cache['ValueTable'][i].HInSpectValueT = 0
- }
- if (table.cache['ValueTable'][i].HInSpectValue == "" || table.cache['ValueTable'][i].HInSpectValue == null) {
- table.cache['ValueTable'][i].HInSpectValue = 0
- }
- }
-
- var sValueTable = JSON.stringify(table.cache['ValueTable']);
- var HInterID = $("#HInterID").val();
- var HEntryID = dataindex;
- var msg = sValueTable + ";" + HInterID + ";" + HEntryID
-
- var index = layer.load();
- $.ajax({
- type: "POST",
- url: GetWEBURL() + "/QC_FirstPieceCheckBill/set_SaveValue",
- async: true,
- data: { "msg": msg },
- dataType: "json",
- success: function (data) {
- layer.close(index);
- if (data.count == 1) {
- layer.msg('妫�楠屽�间繚瀛樻垚鍔�', { icon: 1 });
- resolve(); // 鎴愬姛鏃秗esolve
- } else {
- layer.msg("妫�楠屽�间繚瀛橀敊璇紒" + data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- reject(new Error("妫�楠屽�间繚瀛橀敊璇細" + data.Message));
- }
- },
- error: function (err) {
- layer.close(index);
- layer.msg("妫�楠屽�间繚瀛橀敊璇�:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- reject(new Error("妫�楠屽�间繚瀛橀敊璇細" + err));
- }
- });
- });
- }
- //妫�楠屽�间繚瀛�
- //function set_SaveValue(dataindex) {
- // if (OperationType == 3) {
- // EchoValue();
- // }
- // for (let i = 0; i < table.cache['ValueTable'].length; i++) {
- // if (table.cache['ValueTable'][i].HInSpectValueB == "" || table.cache['ValueTable'][i].HInSpectValueB == null) {
- // table.cache['ValueTable'][i].HInSpectValueB = 0
- // }
- // if (table.cache['ValueTable'][i].HInSpectValueT == "" || table.cache['ValueTable'][i].HInSpectValueT == null) {
- // table.cache['ValueTable'][i].HInSpectValueT = 0
- // }
- // if (table.cache['ValueTable'][i].HInSpectValue == "" || table.cache['ValueTable'][i].HInSpectValue == null) {
- // table.cache['ValueTable'][i].HInSpectValue = 0
- // }
- // }
-
- // var sValueTable = JSON.stringify(table.cache['ValueTable']);
- // var HInterID = $("#HInterID").val();
- // var HEntryID = dataindex;
- // var msg = sValueTable + ";" + HInterID + ";" + HEntryID
-
- // var index = layer.load();
- // $.ajax({
- // type: "POST",
- // url: GetWEBURL() + "/QC_FirstPieceCheckBill/set_SaveValue",
- // async: false,
- // data: { "msg": msg },
- // dataType: "json",
- // success: function (data) {
- // if (data.count == 1) {
- // layer.close(index);
- // //$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳
+ // for (let i = 0; i < table.cache['ValueTable'].length; i++) {
+ // var row = table.cache['ValueTable'][i];
+ // if (rowFun == 2) {
+ // if (
+ // (!row.HInSpectValue || row.HInSpectValue === "")) {
+ // hasEmptyRow = true;
+ // emptyRowNumbers.push(i + 1);
+ // }
// }
- // else {
+ // }
+
+
+ // if (hasEmptyRow) {
+ // var confirmMsg = "妫�楠屽�艰〃鏍间腑瀛樺湪绌鸿锛堢 " + emptyRowNumbers.join(", ") + " 琛岋級锛屾槸鍚︾户缁繚瀛橈紵";
+ // layer.confirm(confirmMsg, {
+ // icon: 3,
+ // title: '鎻愮ず',
+ // btn: ['纭淇濆瓨', '鍙栨秷淇濆瓨']
+ // }, function (index) {
+
// layer.close(index);
- // layer.msg("妫�楠屽�间繚瀛橀敊璇紒" + data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // }
- // },
- // error: function (err) {
- // layer.close(index);
- // layer.msg("妫�楠屽�间繚瀛橀敊璇�:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // proceedWithSave(dataindex).then(resolve).catch(reject);
+ // }, function (index) {
+ // ////鑾峰彇涓婃鎵�鍦ㄨ涓嬫爣
+ // //var dataindex = $("#HEntryID").val() - 1;
+ // layer.close(index);
+ // //EchoValue();
+ // layer.msg('宸插彇娑堜繚瀛橈紝璇峰畬鍠勬暟鎹悗閲嶆柊鎿嶄綔', { icon: 2 });
+ // //reject(new Error('鐢ㄦ埛鍙栨秷浜嗕繚瀛�'));
+ // });
+ // } else {
+
+ // proceedWithSave(dataindex).then(resolve).catch(reject);
// }
// });
//}
+
+ //function proceedWithSave(dataindex) {
+ // return new Promise((resolve, reject) => {
+ // if (OperationType == 3) {
+ // EchoValue();
+ // }
+
+
+ // for (let i = 0; i < table.cache['ValueTable'].length; i++) {
+ // if (table.cache['ValueTable'][i].HInSpectValueB == "" || table.cache['ValueTable'][i].HInSpectValueB == null) {
+ // table.cache['ValueTable'][i].HInSpectValueB = 0
+ // }
+ // if (table.cache['ValueTable'][i].HInSpectValueT == "" || table.cache['ValueTable'][i].HInSpectValueT == null) {
+ // table.cache['ValueTable'][i].HInSpectValueT = 0
+ // }
+ // if (table.cache['ValueTable'][i].HInSpectValue == "" || table.cache['ValueTable'][i].HInSpectValue == null) {
+ // table.cache['ValueTable'][i].HInSpectValue = 0
+ // }
+ // }
+
+ // var sValueTable = JSON.stringify(table.cache['ValueTable']);
+ // var HInterID = $("#HInterID").val();
+ // var HEntryID = dataindex;
+ // var msg = sValueTable + ";" + HInterID + ";" + HEntryID
+
+ // var index = layer.load();
+ // $.ajax({
+ // type: "POST",
+ // url: GetWEBURL() + "/QC_FirstPieceCheckBill/set_SaveValue",
+ // async: true,
+ // data: { "msg": msg },
+ // dataType: "json",
+ // success: function (data) {
+ // layer.close(index);
+ // if (data.count == 1) {
+ // layer.msg('妫�楠屽�间繚瀛樻垚鍔�', { icon: 1 });
+ // resolve(); // 鎴愬姛鏃秗esolve
+ // } else {
+ // layer.msg("妫�楠屽�间繚瀛橀敊璇紒" + data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // reject(new Error("妫�楠屽�间繚瀛橀敊璇細" + data.Message));
+ // }
+ // },
+ // error: function (err) {
+ // layer.close(index);
+ // layer.msg("妫�楠屽�间繚瀛橀敊璇�:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // reject(new Error("妫�楠屽�间繚瀛橀敊璇細" + err));
+ // }
+ // });
+ // });
+ //}
+ //妫�楠屽�间繚瀛�
+ function set_SaveValue(dataindex) {
+ if (OperationType == 3) {
+ EchoValue();
+ }
+ for (let i = 0; i < table.cache['ValueTable'].length; i++) {
+ if (table.cache['ValueTable'][i].HInSpectValueB == "" || table.cache['ValueTable'][i].HInSpectValueB == null) {
+ table.cache['ValueTable'][i].HInSpectValueB = 0
+ }
+ if (table.cache['ValueTable'][i].HInSpectValueT == "" || table.cache['ValueTable'][i].HInSpectValueT == null) {
+ table.cache['ValueTable'][i].HInSpectValueT = 0
+ }
+ if (table.cache['ValueTable'][i].HInSpectValue == "" || table.cache['ValueTable'][i].HInSpectValue == null) {
+ table.cache['ValueTable'][i].HInSpectValue = 0
+ }
+ }
+
+ var sValueTable = JSON.stringify(table.cache['ValueTable']);
+ var HInterID = $("#HInterID").val();
+ var HEntryID = dataindex;
+ var msg = sValueTable + ";" + HInterID + ";" + HEntryID
+
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/QC_FirstPieceCheckBill/set_SaveValue",
+ async: false,
+ data: { "msg": msg },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ //$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳
+ }
+ else {
+ layer.close(index);
+ layer.msg("妫�楠屽�间繚瀛橀敊璇紒" + data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("妫�楠屽�间繚瀛橀敊璇�:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
//鏍规嵁鐢熶骇璧勬簮鎴栬�� 宸ュ簭 鏌ヨ鐢熶骇宸ュ崟淇℃伅
function get_ICMOBillStatusList() {
var sWhere = "";
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_SachetBarCodePrint.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_SachetBarCodePrint.html"
index 756a870..05f91da 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_SachetBarCodePrint.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_SachetBarCodePrint.html"
@@ -14,6 +14,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/grwebapp.js"></script>
<style type="text/css">
/*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
@@ -378,8 +379,8 @@
}
function dy_PL(rest) {
- var HInterID = rest[num].HBarCodeID.toString();
- var sWhere = "select cast( b.娴佹按鍙� as float) 娴佹按鍙�,鐢熶骇璁㈠崟鍙�,a.閿�鍞鍗曞彿,a.鐢熶骇鏁伴噺,a.娴佽浆鍗℃暟閲�,a.浜у搧浠ｇ爜,a.鍗曟嵁鍙�,case when ISNULL(a.鐢熶骇瑙勬牸,'')='' then a.浜у搧瑙勬牸 else a.鐢熶骇瑙勬牸 end 浜у搧瑙勬牸,a.浜у搧鍚嶇О,a.鏃ユ湡,a.鍗曟嵁鍙�,b.宸ュ簭浠ｇ爜,b.宸ュ簭鍚嶇О,a.鎵瑰彿,b.宸ヨ壓宸ヤ綔涓績,b.宸ヨ壓宸ヨ壓鍙傛暟,a.鐢熶骇杞﹂棿,b.宸ユ鍚嶇О,b.鐢熶骇璁㈠崟鏁伴噺 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid in(" + HInterID + ") and b.宸ュ簭浠ｇ爜 != '9999' order by cast(b.娴佹按鍙� as int)"
+ var HItemID = rest[num].HBarCodeID.toString();
+ var sWhere = "select top 1 HBarCode 鏉＄爜缂栧彿,isnull(ms.HCusRelationNumber,'') SKU from Gy_BarCodeBill a with(nolock) left join Gy_Material m with(nolock) on a.HMaterID = m.HItemID left join Gy_MateNumRelation_Sec ms with(nolock) on m.HMASTERID = ms.HMaterID where a.HItemID = " + HItemID
$.ajax({
type: "GET",
@@ -390,6 +391,11 @@
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
if (data.data.length != 0) {
+ if (data.data[0].SKU == "") {
+ layer.msg("鐗╂枡SKU鏈淮鎶わ紝璇疯仈绯荤鐞嗗憳纭锛�");
+ return;
+ }
+
var dataPrint = [];
for (var i = 0; i < data.data.length; i++) {
dataPrint.push(data.data[i])
@@ -403,11 +409,11 @@
type: "print",//鎵撳嵃妯″紡
//type: "preview",//棰勮妯″紡
showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
- report: urlAddRandomNo("../../grf/娴佽浆鍗SON.grf"),
+ report: urlAddRandomNo("../../grf/棣欏泭妯℃澘JSON.grf"),
data: Customer
};
- console.log(data.data[0].鍗曟嵁鍙�);
+ console.log("鎵撳嵃棣欏泭鏉＄爜锛�" + data.data[0].鏉＄爜缂栧彿);
//var args = {
// report: urlAddRandomNo("../../grf/cs10.grf"),
// data: Customer
--
Gitblit v1.9.1