From 3d240d150e6e1a4e2df1a9f87d00ddd03ace4ee5 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 17 一月 2025 10:06:37 +0800
Subject: [PATCH] 增加 BOM层级展开报表,修复全程追溯报表 黑白标页签导出失败,工艺路线的表头查询优化页面排序
---
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index ec3f0fc..d608faf 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -67,6 +67,7 @@
<label class="layui-form-label">宸ュ巶浠ｇ爜</label>
<div class="layui-input-inline">
<select name="HWorksNumber" id="HWorksNumber" lay-filter="HWorksNumber" class="layui-input" value="" style="float:left;width:150px">
+ <!--<option value="0">鑸滄垚</option>-->
</select>
</div>
</div>
@@ -85,13 +86,14 @@
<option value="1">鐢熶骇璁㈠崟</option>
<option value="2">鐢熶骇姹囨姤鍗�</option>
<option value="3">閲囪喘璁㈠崟</option>
- <option value="4">鏀舵枡閫氱煡鍗�</option>
+ <!--<option value="4">鏀舵枡閫氱煡鍗�</option>
<option value="5">濮斿璁㈠崟</option>
<option value="6">鐢熶骇鍏ュ簱鍗�</option>
<option value="7">閲囪喘鍏ュ簱鍗�</option>
<option value="8">閿�鍞��璐у崟</option>
<option value="9">鐢熶骇閫�鏂欏崟</option>
- <option value="10">宸ュ簭娴佽浆鍗�</option>
+ <option value="10">宸ュ簭娴佽浆鍗�</option>-->
+ <option value="11">閿�鍞嚭搴撳崟</option>
</select>
</div>
</div>
@@ -108,6 +110,7 @@
<label class="layui-form-label">鏉＄爜绫诲瀷</label>
<div class="layui-input-inline">
<select name="HBarCodeType" id="HBarCodeType" lay-filter="HBarCodeType" class="layui-input" value="" style="float:left;width:150px">
+ <!--<option value="11">鍞竴鏉＄爜</option>-->
</select>
</div>
</div>
@@ -475,6 +478,9 @@
case '10':
return "宸ュ簭娴佽浆鍗�";
break;
+ case '11':
+ return '閿�鍞嚭搴撳崟';
+ break;
}
}
@@ -599,15 +605,17 @@
$('#ToolCreate').addClass("layui-btn-disabled").attr("disabled", true);//鐢熸垚鎸夐挳绂佺敤
for (var i = 0; i < table.cache['mainTable'].length; i++) {
table.cache['mainTable'][i]["HDate"] = $("#HDate").val();
- if (table.cache["mainTable"][i].HMaterName.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterName.indexOf(";") != -1) {
+ if (table.cache["mainTable"][i].HMaterName!=null&&(table.cache["mainTable"][i].HMaterName.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterName.indexOf(";") != -1)) {
table.cache["mainTable"][i].HMaterName = table.cache["mainTable"][i].HMaterName.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
}
- if (table.cache["mainTable"][i].HMaterModel.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterModel.indexOf(";") != -1) {
+ if (table.cache["mainTable"][i].HMaterModel!=null&&(table.cache["mainTable"][i].HMaterModel.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterModel.indexOf(";") != -1)) {
table.cache["mainTable"][i].HMaterModel = table.cache["mainTable"][i].HMaterModel.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
}
- if (table.cache["mainTable"][i].HPinfan.indexOf("\"") != -1 || table.cache["mainTable"][i].HPinfan.indexOf(";") != -1) {
- table.cache["mainTable"][i].HPinfan = table.cache["mainTable"][i].HPinfan.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
- }
+ if (table.cache["mainTable"][i].HPinfan!=null&&("HPinfan" in table.cache["mainTable"][i])) {
+ if (table.cache["mainTable"][i].HPinfan.indexOf("\"") != -1 || table.cache["mainTable"][i].HPinfan.indexOf(";") != -1) {
+ table.cache["mainTable"][i].HPinfan = table.cache["mainTable"][i].HPinfan.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+ }
+ }
}
var sSubStr = JSON.stringify(table.cache['mainTable']);
HMaterInfo = table.cache['mainTable'];
--
Gitblit v1.9.1