From fe28475919c685fbc9969c37286622eed986afa4 Mon Sep 17 00:00:00 2001
From: black-goat-me <226547893@qq.com>
Date: 星期六, 20 五月 2023 20:20:24 +0800
Subject: [PATCH] 1
---
WebTM/views/生产管理/生产任务单/Sc_ICMOBillEdit_NoTable.html | 2
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 2
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 16 ++++----
WebTM/views/index.html | 8 ++--
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 55 ++++++++++++++-------------
5 files changed, 42 insertions(+), 41 deletions(-)
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 85d4cb3..fb6d20b 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -504,10 +504,10 @@
<dl class="layui-nav-child append" id="append">
<!--<dd><a lay-href="">杞﹂棿鍦ㄥ埗鍝佸垎鏋恘</a></dd>-->
<!--<dd><a lay-href="">娴佽浆鍗″叏绋嬭窡韪猲</a></dd>-->
- <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_StationInBillList.html">鏍囧噯宸ユ椂鎶ヨ〃</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_StationInBillList.html">杞﹂棿宸ユ椂缁熻琛�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/ProductionPlanReportList.html">鎶曚骇璁″垝鎶ヨ〃</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Mes_OrderProcFlowAllReport.html">杞﹂棿宸ュ簭鍏ㄧ▼璺熻釜鎶ヨ〃</a></dd>
- <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Mes_WIPProcReport.html">宸ュ簭鍦ㄥ埗鍝佹姤琛�(绾靛悜)</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Mes_WIPProcReport.html">宸ュ簭鍦ㄥ埗鍝佹姤琛紙绾靛悜锛�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/DefectiveDetailedYieldReport.html">涓嶈壇鏄庣粏鑹巼鎶ヨ〃</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_StationOutSumReport.html">杞﹂棿鐢熶骇姹囨姤缁熻琛�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_WorkShopProcessWIPReport.html">鐢熶骇杞﹂棿宸ュ簭鎶ヨ〃</a></dd>
@@ -515,8 +515,8 @@
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_EmployeePieceWorkReport.html">宸ュ簭姹囨姤鏃ユ姤琛�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_EmployeePiecePayReport.html">璁′欢宸ヨ祫鎶ヨ〃</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_EmployeePiecePaySumReport.html">璁′欢宸ヨ祫姹囨�绘姤琛�</a></dd>
- <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Kf_MaterOutSumReport_Cloth.html">鐧藉澂鍙戝竷姹囨�绘姤琛�</a></dd>
- <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Kf_MaterOutEntryReport_Cloth.html">鐧藉澂鍙戝竷鏄庣粏鎶ヨ〃</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Kf_MaterOutSumReport_Cloth.html">璁㈠崟鍙戞枡姹囨�绘姤琛�</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Kf_MaterOutEntryReport_Cloth.html">璁㈠崟鍙戞枡鏄庣粏鎶ヨ〃</a></dd>
</dl>
</dd>
<dd>
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 022b004..b55bb6a 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"
@@ -87,10 +87,10 @@
<option value="3">閲囪喘璁㈠崟</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="6">鐢熶骇鍏ュ簱鍗�</option>
+ <option value="7">閲囪喘鍏ュ簱鍗�</option>
+ <option value="8">閿�鍞��璐у崟</option>
+ <option value="9">鐢熶骇閫�鏂欏崟</option>
</select>
</div>
</div>
@@ -442,16 +442,16 @@
return "濮斿璁㈠崟";
break;
case '6':
- return "鐢熶骇鍏ュ簱";
+ return "鐢熶骇鍏ュ簱鍗�";
break;
case '7':
- return "閲囪喘鍏ュ簱";
+ return "閲囪喘鍏ュ簱鍗�";
break;
case '8':
- return "閿�鍞��璐�";
+ return "閿�鍞��璐у崟";
break;
case '9':
- return "鐢熶骇閫�鏂�";
+ return "鐢熶骇閫�鏂欏崟";
break;
}
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
index bbb19c8..8076540 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
@@ -258,7 +258,7 @@
</div>
<div class="layui-row">
<div class="layui-inline" style="width: 56%;">
- <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
+ <label class="layui-form-label" style="width: 85px;">鐧藉澂瑕佹眰</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
</div>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index d3770c9..91e1efb 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -161,7 +161,7 @@
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
+ <!--<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>涓嬫帹</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -177,30 +177,32 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Xc"><i class="layui-icon layui-icon-form"></i>涓嬫煡</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Xc"><i class="layui-icon layui-icon-form"></i>涓嬫煡</button>-->
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Excel"><i class="layui-icon layui-icon-file-b"></i>Excel瀵煎叆</button>-->
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
- <div class="layui-btn-container" id="HideButtonList">
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill" id="ShowBill"><i class="layui-icon layui-icon-form"></i>涓嬫帹</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="Exits"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill_pl" id="ShowBill_pl"><i class="layui-icon layui-icon-form"></i>鎵归噺涓嬫帹</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AddNew" id="AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Edit" id="Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_copy" id="copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AddNew_NT" id="AddNew_NT"><i class="layui-icon layui-icon-file-b"></i>鏂板(鏃犲垪琛�)</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Edit_NT" id="Edit_NT"><i class="layui-icon layui-icon-form"></i>缂栬緫(鏃犲垪琛�)</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_copy_NT" id="copy_NT"><i class="layui-icon layui-icon-form"></i>澶嶅埗(鏃犲垪琛�)</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeleteBill" id="DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Excel" id="Excel"><i class="layui-icon layui-icon-file-b"></i>Excel瀵煎叆</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get-view" id="view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get-print" id="print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
- </div>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>-->
+ <div class="layui-btn-container" id="HideButtonList">
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill" id="ShowBill"><i class="layui-icon layui-icon-form"></i>涓嬫帹</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="Exits"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill_pl" id="ShowBill_pl"><i class="layui-icon layui-icon-form"></i>鎵归噺涓嬫帹</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill_dh"><i class="layui-icon layui-icon-form"></i>澶氳涓嬫帹</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AddNew" id="AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Edit" id="Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_copy" id="copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AddNew_NT" id="AddNew_NT"><i class="layui-icon layui-icon-file-b"></i>鏂板(鏃犲垪琛�)</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Edit_NT" id="Edit_NT"><i class="layui-icon layui-icon-form"></i>缂栬緫(鏃犲垪琛�)</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_copy_NT" id="copy_NT"><i class="layui-icon layui-icon-form"></i>澶嶅埗(鏃犲垪琛�)</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeleteBill" id="DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Xc"><i class="layui-icon layui-icon-form"></i>涓嬫煡</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Excel" id="Excel"><i class="layui-icon layui-icon-file-b"></i>Excel瀵煎叆</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get-view" id="view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get-print" id="print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+ </div>
</script>
</form>
</div>
@@ -697,10 +699,9 @@
$("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));;//缁撴潫鏃ユ湡
$("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙�
$("#WorkCenter").val("");//鍗曟嵁鍙�
- $("#HDeptName").val("");//鍗曟嵁鍙�
+ $("#HDeptName").val("0");//鍗曟嵁鍙�
$("#HMaterName").val("");//鍗曟嵁鍙�
- $("#HDeptName").val("");//鍗曟嵁鍙�
- $("#HStatus").val("");//鍗曟嵁鍙�
+ $("#HStatus").val("寮�宸�");//鍗曟嵁鍙�
$("#HModel").val("");//瑙勬牸鍨嬪彿
$("#btnSearch").click();
$("#ColContent").val("");
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index 2ad61f0..04a0ebd 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -2448,7 +2448,7 @@
$("#HCusID").val(data.HCusID);
$("#HCusNames").val(data.瀹㈡埛);
$("#HColorRemark").val(data.鏌撹壊瑕佹眰);
- //$("#HRemark3").val(data.搴曢儴澶囨敞);
+ $("#HRemark3").val(data.搴曢儴澶囨敞);
$("#HBLFlag").val(result.data[0].HBLFlag == 0 ? false : true);
$("input[name='isHBLFlag']").prop("checked", result.data[0].HBLFlag);//true:閫変腑 false:涓嶉�変腑
form.render("checkbox");
--
Gitblit v1.9.1