From 5a1a0ad815137a94cd3a682f757630f6b6b51d09 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 22 七月 2025 11:34:38 +0800
Subject: [PATCH] 添加app安装包下载地址，提料计划日计划调整
---
WebTM/WebTM.csproj.user | 2 +-
WebTM/views/生产管理/提料计划/JIT_LiftMaterPlaBillnList.html | 18 +++++++++++++++++-
WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBill.html | 4 ++--
WebTM/Download/WMS软件安装包.apk | 0
WebTM/views/生产管理/日计划报表/ReportPODemandPlanBillList.html | 1 +
WebTM/WebTM.csproj | 1 +
6 files changed, 22 insertions(+), 4 deletions(-)
diff --git "a/WebTM/Download/WMS\350\275\257\344\273\266\345\256\211\350\243\205\345\214\205.apk" "b/WebTM/Download/WMS\350\275\257\344\273\266\345\256\211\350\243\205\345\214\205.apk"
new file mode 100644
index 0000000..2833cb6
--- /dev/null
+++ "b/WebTM/Download/WMS\350\275\257\344\273\266\345\256\211\350\243\205\345\214\205.apk"
Binary files differ
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index fd55ac4..b14205c 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -138,6 +138,7 @@
<Content Include="layuiadmin\layui\font\iconfont.woff" />
<Content Include="layuiadmin\layui\font\iconfont.woff2" />
<Content Include="layuiadmin\json\Test.json" />
+ <Content Include="Download\WMS杞欢瀹夎鍖�.apk" />
<None Include="Properties\PublishProfiles\JFTM.pubxml" />
<Content Include="layuiadmin\layui\images\device.png" />
<Content Include="layuiadmin\layui\images\erro.png" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 3c987b4..e3d209c 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -2,7 +2,7 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
index b351851..c65a7ad 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
@@ -168,6 +168,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="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_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <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_CloseBill"><i class="layui-icon layui-icon-logout"></i>鍏抽棴</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill"><i class="layui-icon layui-icon-logout"></i>鍙嶅叧闂�</button>
</div>
@@ -244,6 +245,10 @@
break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+ break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
break;
};
});
@@ -345,6 +350,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 'full-50'
+ , title: "鎻愭枡璁″垝鍗�"
, page: true
, cellMinWidth: 90
, totalRow: true
@@ -765,7 +771,17 @@
})
}
}
-
+ function get_Export() {
+ var data = option.data
+ data.forEach((item) => {
+ // 濡傛灉鏌愪釜瀛楁鐨勫�煎お闀匡紝闇�瑕佸幓闄ゆ崲琛岀
+ if (item.瑙勬牸鍨嬪彿.length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item.瑙勬牸鍨嬪彿 = item.瑙勬牸鍨嬪彿.replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ item.瑙勬牸鍨嬪彿 = item.瑙勬牸鍨嬪彿.replace(/[,]+/g, '锛�'); // 灏嗘崲鍒嗗彿鏇挎崲涓虹┖瀛楃涓�
+ }
+ });
+ table.exportFile('mainTable', data, "xls");
+ }
//#region 鏂板
function set_AddNew() {
layer.open({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
index 0362d9d..a625e67 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
@@ -457,6 +457,7 @@
}
if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ item[itemobj] = item[itemobj].toString().replace(/[,]+/g, '锛�'); // 灏嗘崲鍒嗗彿鏇挎崲涓虹┖瀛楃涓�
}
}
});
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
index e3e1fc5..8735bc4 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
@@ -383,8 +383,8 @@
<input type="hidden" name="eventType" id="eventType" value="Add">
<input type="hidden" name="HPrice_BHS" id="HPrice_BHS" value="0"><!--涓嶅惈绋庡崟浠�-->
<input type="hidden" name="HMoney_BHS" id="HMoney_BHS" value="0"><!--涓嶅惈绋庨噾棰�-->
- <input type="hidden" name="HGroup" id="HGroup"><!--鐢熶骇鐝粍-->
- <input type="hidden" name="HGroupID" id="HGroupID" value="0"><!--鐢熶骇鐝粍-->
+ <!--<input type="hidden" name="HGroup" id="HGroup">--><!--鐢熶骇鐝粍-->
+ <!--<input type="hidden" name="HGroupID" id="HGroupID" value="0">--><!--鐢熶骇鐝粍-->
<input type="hidden" name="HInnerBillNo" id="HInnerBillNo"><!--閫佽揣鍗曞彿-->
<input type="hidden" name="HPlanPieceQty" id="HPlanPieceQty" value="0"><!--鍙戝嚭浠舵暟-->
<input type="hidden" name="HBadPNL" id="HBadPNL" value="0"><!--鎶ュ簾浠舵暟-->
--
Gitblit v1.9.1