From b1016f79650b98e321a2acc3dad9446132518c82 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 22 四月 2025 09:29:01 +0800
Subject: [PATCH] 工艺路线添加导入
---
WebTM/layuiadmin/Scripts/webConfig.js | 2 +-
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 22 +++++++++++++++++++++-
WebTM/WebTM.csproj | 5 +----
3 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 74b160b..ce19f89 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -581,13 +581,13 @@
<Content Include="views\鐢熶骇绠＄悊\涓夊崌鎺掍骇\JIT_DayPlanPlatFormImport_SS.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\Cg_PODemandPlanConfigBillReportForLack.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\Gy_RoutingBillReportForLack.html" />
+ <Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\JIT_NeedMaterPlanConfigBillReportForLack.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\JIT_PickUpCalculate_BaoGong.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\JIT_UnLockRequestBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\JIT_UnLockRequestBill.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\JIT_LockRequestBill.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\JIT_DayPlanPlatForm.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\JIT_LockRequestBillList.html" />
- <Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\JIT_NeedMaterPlanConfigBillReportForLack.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackSignBill_BrushCard.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_MESExecptFeedBackBillResumeList.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_MESExecptFeedBackBillType.html" />
@@ -603,7 +603,6 @@
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐骞冲彴_PDA\璐ㄩ噺姹囨姤\Sc_QualityReportBill_PDA.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐骞冲彴鍔熻兘椤礬Gy_ButtonList.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐骞冲彴鍔熻兘椤礬LineBind_Button.html" />
- <Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掑熀纭�璧勬枡\JIT_NeedMaterPlanConfigBill_Excel.html" />
<Content Include="views\鐢熶骇绠＄悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysis.html" />
<Content Include="views\鐢熶骇绠＄悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysisDetailReport.html" />
<Content Include="views\鐢熶骇绠＄悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysisReport.html" />
@@ -622,7 +621,6 @@
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鐗╂枡娓呭崟\sc_Gy_ICBomBillEdit.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\JIT_DayPlanPlatForm_TK.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\JIT_DayPlanPlatForm_BCP.html" />
- <Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\Sc_ShopCalendar_Excel.html" />
<Content Include="views\鐢熶骇绠＄悊\璁㈠崟鐘舵�佸垎甯僜Sc_EquipmentProcessList.html" />
<Content Include="views\鐢熶骇绠＄悊\璁㈠崟鐘舵�佸垎甯僜Sc_OEEStatusReport.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\Sc_BulkEditWorkTime.html" />
@@ -643,7 +641,6 @@
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillCloseList.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillToInvalidatedList.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillWorkQty.html" />
- <Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillimport_WorkQty.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Pay_ProcPriceTypeChangeReport.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_MaterialTechParamBill_Excel.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎澶х被\Gy_RoutingGroupEdit.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 966482a..7d9b88b 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -7,7 +7,7 @@
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+ var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index 474656e..9f5b8c6 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -107,7 +107,7 @@
<button class="layui-btn layuiadmin-btn-order" style="" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px; display: none;">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px;">閲嶇疆</button>
</div>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<div class="layui-inline" style="margin-left:5px;">
@@ -205,6 +205,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container" id="toolbarDemo_ButtonSet">
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Excel"><i class="layui-icon layui-icon-delete"></i>Excel瀵煎叆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNewSub" id="set_AddNewSub"><i class="layui-icon layui-icon-file-b"></i>鏂板瀛愯矾绾�</button>
@@ -389,6 +390,9 @@
//瀵煎嚭excel
case 'get_export':
get_Export();
+ break;
+ //瀵煎叆
+ case 'set_Excel': set_Excel();
break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
@@ -1637,6 +1641,22 @@
}
//#endregion
+ //瀵煎叆
+ function set_Excel() {
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '宸ヨ壓璺嚎鍒楄〃-瀵煎叆'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBillimport.html'
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ get_FastQuery();
+ }
+ })
+ }
+
//#region 鑾峰彇瀵煎嚭鏁版嵁
function getExportData() {
var data;//瀵煎嚭鐨勬暟鎹�
--
Gitblit v1.9.1