From a89271cdf1ba3aabf48727c83b213f2f2a8f266b Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 26 六月 2024 16:33:22 +0800
Subject: [PATCH] 返工申请需要在新增界面增加一个打印按钮，实现把返工后对应的工序流转卡打印出来。
---
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 41 ++++++++-----
WebTM/views/车间管理/工序流转卡/Sc_ProcExchWorkBackBillEdit.html | 86 ++++++++++++++++++++++++++++
2 files changed, 111 insertions(+), 16 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 3482783..12f64a3 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -18,10 +18,10 @@
<publishTime>01/28/2016 14:22:24</publishTime>
</File>
<File Include="bin/WebTM.dll">
- <publishTime>06/24/2024 18:09:04</publishTime>
+ <publishTime>06/26/2024 16:04:34</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>06/24/2024 18:09:04</publishTime>
+ <publishTime>06/26/2024 16:04:34</publishTime>
</File>
<File Include="HtmlPage1.html">
<publishTime>04/11/2023 16:34:42</publishTime>
@@ -1569,7 +1569,7 @@
<publishTime>06/13/2024 08:36:46</publishTime>
</File>
<File Include="views/index_Mobile.html">
- <publishTime>06/07/2024 15:42:08</publishTime>
+ <publishTime>06/25/2024 13:27:35</publishTime>
</File>
<File Include="views/index_Mobile_KaiBeiNaiTe.html">
<publishTime>07/18/2023 08:40:58</publishTime>
@@ -3728,6 +3728,9 @@
<File Include="views/妯℃不鍏风鐞�/鍣ㄥ叿鐐规瑙勭▼鍗�/Sc_MouldDotCheckRuleBillList.html">
<publishTime>06/07/2024 15:42:08</publishTime>
</File>
+ <File Include="views/妯℃不鍏风鐞�/鍣ㄥ叿鐐规瑙勭▼鍗�/Sc_MouldDotCheckRuleBillList_PDA.html">
+ <publishTime>06/25/2024 13:27:35</publishTime>
+ </File>
<File Include="views/妯℃不鍏风鐞�/鍣ㄥ叿缁翠慨娲惧伐鍗�/Sc_MouldRepairSendWorkBillEdit.html">
<publishTime>06/07/2024 15:42:08</publishTime>
</File>
@@ -3945,13 +3948,16 @@
<publishTime>06/07/2024 15:42:08</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风偣妫�淇濆吇/Sc_MouldDotCheckBill_PDA.html">
- <publishTime>06/07/2024 15:42:08</publishTime>
+ <publishTime>06/25/2024 13:27:35</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风偣妫�淇濆吇/Sc_MouldDotCheckBill_PDA_OLD.html">
<publishTime>05/11/2024 13:29:32</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风偣妫�淇濆吇/Sc_MouldMaintainBill_PDA.html">
- <publishTime>04/11/2023 16:34:43</publishTime>
+ <publishTime>06/25/2024 13:27:35</publishTime>
+ </File>
+ <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风偣妫�淇濆吇/Sc_MouldMaintainBill_PDA_OLD.html">
+ <publishTime>06/25/2024 13:27:35</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/BatchGen_MouldFile.html">
<publishTime>04/11/2023 16:34:43</publishTime>
@@ -4159,6 +4165,9 @@
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainRuleBillList.html">
<publishTime>06/07/2024 15:42:08</publishTime>
+ </File>
+ <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainRuleBillList_PDA.html">
+ <publishTime>06/25/2024 13:27:35</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherInBill.html">
<publishTime>03/28/2024 10:03:22</publishTime>
@@ -4590,7 +4599,7 @@
<publishTime>03/28/2024 10:03:22</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇鎶ヨ〃/Sc_QualityReportBillDay.html">
- <publishTime>06/24/2024 17:18:42</publishTime>
+ <publishTime>06/25/2024 13:27:35</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇鎷嗙鍗�/Sc_PackSplitBill_Fast.html">
<publishTime>11/03/2023 21:45:51</publishTime>
@@ -4848,7 +4857,7 @@
<publishTime>05/11/2024 13:29:32</publishTime>
</File>
<File Include="views/绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Xt_UserRightQuery.html">
- <publishTime>06/24/2024 17:18:42</publishTime>
+ <publishTime>06/25/2024 13:27:35</publishTime>
</File>
<File Include="views/绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Xt_UserSuplies.html">
<publishTime>01/22/2024 12:41:19</publishTime>
@@ -4989,7 +4998,7 @@
<publishTime>11/08/2023 09:01:07</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckBill_PDA.html">
- <publishTime>06/20/2024 16:28:32</publishTime>
+ <publishTime>06/25/2024 13:27:35</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckPlanBillEdit.html">
<publishTime>06/07/2024 15:42:08</publishTime>
@@ -4998,7 +5007,7 @@
<publishTime>06/07/2024 15:42:08</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainBillEdit.html">
- <publishTime>06/07/2024 15:42:08</publishTime>
+ <publishTime>06/25/2024 13:27:35</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainBillList.html">
<publishTime>06/07/2024 15:42:08</publishTime>
@@ -5016,7 +5025,7 @@
<publishTime>11/08/2023 09:01:07</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainBill_PDA.html">
- <publishTime>06/20/2024 16:28:32</publishTime>
+ <publishTime>06/25/2024 13:27:35</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainPlanBillEdit.html">
<publishTime>06/07/2024 15:42:08</publishTime>
@@ -5229,7 +5238,7 @@
<publishTime>06/07/2024 15:42:08</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipMaintainRuleList_PDA.html">
- <publishTime>06/07/2024 15:42:08</publishTime>
+ <publishTime>06/25/2024 13:27:35</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/浜у搧鍏ュ簱妫�楠屽崟/Kf_ProductInCheckBill_Fast.html">
<publishTime>04/11/2023 16:34:43</publishTime>
@@ -5274,7 +5283,7 @@
<publishTime>05/11/2024 13:29:33</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckOtherill.html">
- <publishTime>06/07/2024 15:42:08</publishTime>
+ <publishTime>06/25/2024 13:27:35</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/QC_PatrolProcCheckBillList.html">
<publishTime>06/07/2024 15:42:08</publishTime>
@@ -5301,7 +5310,7 @@
<publishTime>04/22/2024 12:19:16</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html">
- <publishTime>06/24/2024 17:18:42</publishTime>
+ <publishTime>06/25/2024 13:27:35</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBillList.html">
<publishTime>04/09/2024 10:58:17</publishTime>
@@ -5460,7 +5469,7 @@
<publishTime>06/07/2024 15:42:08</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainBillEdit.html">
- <publishTime>06/07/2024 15:42:08</publishTime>
+ <publishTime>06/25/2024 13:27:35</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainBillList.html">
<publishTime>06/07/2024 15:42:08</publishTime>
@@ -5490,7 +5499,7 @@
<publishTime>06/07/2024 15:42:08</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html">
- <publishTime>06/24/2024 17:18:42</publishTime>
+ <publishTime>06/25/2024 13:27:35</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBillList.html">
<publishTime>04/09/2024 10:58:17</publishTime>
@@ -5835,7 +5844,7 @@
<publishTime>03/28/2024 15:39:13</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillEdit.html">
- <publishTime>03/05/2024 12:29:40</publishTime>
+ <publishTime>06/26/2024 16:30:59</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillList.html">
<publishTime>05/22/2024 13:51:33</publishTime>
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_ProcExchWorkBackBillEdit.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_ProcExchWorkBackBillEdit.html"
index ef98f65..6bfb373 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_ProcExchWorkBackBillEdit.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_ProcExchWorkBackBillEdit.html"
@@ -54,6 +54,7 @@
<button type="button" id="btnSave" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSave">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" id="set_CheckBill" lay-filter="set_CheckBill">瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btn-print">鎵撳嵃</button>
<!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btn_print">鎵撳嵃</button>-->
<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">闅愯棌鍒楄缃�</button>-->
</div>
@@ -701,6 +702,12 @@
});
+ //#region 鎵撳嵃鎸夐挳
+ form.on('submit(btn-print)', function (data) {
+ get_PrintReport();
+ });
+ //#endregion
+
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -875,6 +882,62 @@
});
})
}
+
+ //#region 鎵撳嵃
+ function get_PrintReport() {
+ //#region 鍒ゆ柇鍗曟嵁鐘舵��
+ var HBillData = "";
+ var HBillData = getBillStatus_ProcExchWorkBackBill(); //鑾峰彇鍗曟嵁鏁版嵁
+ if (HBillData != "none") {
+ if (HBillData.length == 0) {
+ layer.alert("鎵撳嵃澶辫触!鏈煡璇㈠埌鍗曟嵁淇℃伅!", { icon: 5 });
+ return;
+ } else if (HBillData[0]["鐘舵��"] != "宸插鏍�") {
+ layer.alert("鎵撳嵃澶辫触!鍗曟嵁鐘舵�佹湭涓�'宸插鏍�'鐘舵��!", { icon: 5 });
+ return;
+ }
+ } else {
+ return;
+ }
+ //#endregion
+
+
+ //鎵撳嵃婧愬崟-宸ュ簭娴佽浆鍗�
+ var HSourceInterID = $("#HProcExchInterID").val(); //婧愬崟-宸ュ簭娴佽浆鍗� 涓诲唴鐮�
+ //鍒ゆ柇鍣ㄥ叿娓呭崟鏌ヨ鍒楄〃鏄惁鏈夋暟鎹� 0娌℃湁 1鏈�
+ var QJQD = 0;
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ProcessExchangeBillList/QJQD',
+ type: "GET",
+ data: { "HProcExchHinteID": HSourceInterID},
+ success: function (data1) {
+ if (data1.count == 1) {
+ if (data1.data.length == 0) {
+ QJQD = 0;
+ } else {
+ QJQD = 1;
+ }
+ } else {
+ //layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ //layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ var HSourceInterID = $("#HProcExchInterID").val();
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + HSourceInterID + "|" + QJQD + '&MyMsg=' + HSourceInterID + '&Type=HProcessExchange', 'yes']
+ , resize: false
+ })
+ }
+ //#endregion
//闈炵┖楠岃瘉
function AllowLoadData(data) {
@@ -1167,6 +1230,29 @@
return vars;
}
+
+ //#region 鑾峰彇鍗曟嵁鐘舵��
+ function getBillStatus_ProcExchWorkBackBill() {
+ var HBillData = "none";
+ var sWhere = " and hmainid = " + $("#HInterID").val();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ProcExchWorkBackBill/Sc_ProcExchWorkBackBillList',
+ async: false,
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ HBillData = data1.data;
+ } else {
+ layer.alert(data1.code + "鍗曟嵁鐘舵�佸垽鏂け璐ワ紒", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ return HBillData;
+ }
+ //#endregion
//#endregion
})
</script>
\ No newline at end of file
--
Gitblit v1.9.1