From 706dda96b7d6b5bf6b39764238b152654c5fb6c8 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 12 三月 2026 09:14:37 +0800
Subject: [PATCH] 模具，投产验收单优化
---
WebTM/views/生产管理/投料防错单/Sc_FeedingErrorProofingBillList.html | 10 +++++-----
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html | 5 +++--
WebTM/views/模治具管理/模具投产验收单/Sc_MouldBatchWorkCheckBillEdit.html | 26 ++++++++++++++------------
3 files changed, 22 insertions(+), 19 deletions(-)
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\212\225\344\272\247\351\252\214\346\224\266\345\215\225/Sc_MouldBatchWorkCheckBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\212\225\344\272\247\351\252\214\346\224\266\345\215\225/Sc_MouldBatchWorkCheckBillEdit.html"
index 32d4b5f..05a1e8d 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\212\225\344\272\247\351\252\214\346\224\266\345\215\225/Sc_MouldBatchWorkCheckBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\212\225\344\272\247\351\252\214\346\224\266\345\215\225/Sc_MouldBatchWorkCheckBillEdit.html"
@@ -403,6 +403,8 @@
//鍒跺崟浜�
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HEmpID").val(sessionStorage["HEmpID"]);
+ $("#HEmpName").val(sessionStorage["HEmpName"]);
//鍒濆鍖栧垪琛�
set_InitGrid();
}
@@ -837,18 +839,18 @@
return false;
}
- if ($("#HDeptID").val() == "0") {
- layer.msg("鐢熶骇閮ㄩ棬涓嶈兘涓虹┖!");
- return false;
- }
+ //if ($("#HDeptID").val() == "0") {
+ // layer.msg("鐢熶骇閮ㄩ棬涓嶈兘涓虹┖!");
+ // return false;
+ //}
if ($("#HEmpID").val() == "0") {
layer.msg("鎿嶄綔鍛樻病鏈夐�夋嫨!");
return false;
}
- if ($("#HMangerID").val() == "0") {
- layer.msg("涓荤娌℃湁閫夋嫨!");
- return false;
- }
+ //if ($("#HMangerID").val() == "0") {
+ // layer.msg("涓荤娌℃湁閫夋嫨!");
+ // return false;
+ //}
for (var i = 0; i < option.data.length; i++) {
if (option.data[i] != "") {
@@ -857,10 +859,10 @@
layer.msg("绗�" + (i + 1) + "琛�:妯″叿涓嶈兘涓虹┖!");
return false;
}
- if (option.data[i]["HMouldNum"] == "") {
- layer.msg("绗�" + (i + 1) + "琛�:妯＄┐涓嶈兘涓虹┖!");
- return false;
- }
+ //if (option.data[i]["HMouldNum"] == "") {
+ // layer.msg("绗�" + (i + 1) + "琛�:妯＄┐涓嶈兘涓虹┖!");
+ // return false;
+ //}
}
}
return true;
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
index ccb8b79..80bb837 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
@@ -281,6 +281,7 @@
<option value="寮傚父">寮傚父</option>
<option value="淇濆吇">淇濆吇</option>
<option value="缁翠慨">缁翠慨</option>
+ <option value="宸蹭粯娆�">宸蹭粯娆�</option>
</select>
</div>
</div>
@@ -2876,8 +2877,8 @@
}
}
- //鍑礉浠ヤ笅瀛楁涓嶆牎楠�
- if (sessionStorage["OrganizationID"] != "100007" && sessionStorage["OrganizationID"] != "100038") {
+ //鍑礉娴疯瘹浠ヤ笅瀛楁涓嶆牎楠�
+ if ((sessionStorage["OrganizationID"] != "100007" && sessionStorage["OrganizationID"] != "100038") && sessionStorage["OrganizationID"] !="100071") {
if ($("#HModel").val() == '' || $("#HModel").val() == null) {
layer.msg("鍣ㄥ叿瑙勬牸涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\225\346\226\231\351\230\262\351\224\231\345\215\225/Sc_FeedingErrorProofingBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\225\346\226\231\351\230\262\351\224\231\345\215\225/Sc_FeedingErrorProofingBillList.html"
index 2bfffcb..c1832fe 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\225\346\226\231\351\230\262\351\224\231\345\215\225/Sc_FeedingErrorProofingBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\225\346\226\231\351\230\262\351\224\231\345\215\225/Sc_FeedingErrorProofingBillList.html"
@@ -96,7 +96,7 @@
<!--鏌ヨ銆侀噸缃�佽繃婊ゆ柟妗�-->
<div class="layui-inline">
<!--鎼滅储鎸夐挳-->
- <button type="button" id="btnSearch" name="btnSearch" lay-filter="btnSearch" class="layui-btn layuiadmin-btn-order">
+ <button type="button" id="btnSearch" name="btnSearch" lay-filter="btnSearch" lay-submit="" class="layui-btn layuiadmin-btn-order">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<!--閲嶇疆鎸夐挳-->
@@ -813,7 +813,7 @@
else {
switch (data[i].Type) {
case 'DateTime': //datetime鏁版嵁绫诲瀷鐨勫瓧娈碉紝闇�瑕佸鐞嗕负yyyy-MM-dd hh:mm:ss 鏍峰紡
- col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 120, sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd hh:mm:ss')}}</div>" });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 120, sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>" });
break;
default:
col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 200, sort: true });
@@ -838,14 +838,14 @@
//option.cols = [col_setShowValue];
//#endregion
- DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option); //鍒楄缃�
+ DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option,[]); //鍒楄缃�
laypage.render(optionPage);
- ins = table.render(option); //璁剧疆瀵煎嚭鐨勬暟鎹�
+ //璁剧疆瀵煎嚭鐨勬暟鎹�
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]); //鍒锋柊鎸夐挳鏄剧ず
-
+ ins = table.render(option);
if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
ColFilter();
}
--
Gitblit v1.9.1