From fe50d723e5d050113c4ecc493220e264f39d8e5f Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 02 七月 2025 17:00:29 +0800
Subject: [PATCH] 1

---
 WebTM/views/生产管理/宝工排产/Gy_RoutingBillReportForLack.html |   48 +++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 45 insertions(+), 3 deletions(-)

diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/Gy_RoutingBillReportForLack.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/Gy_RoutingBillReportForLack.html"
index b401992..dec49ac 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/Gy_RoutingBillReportForLack.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/Gy_RoutingBillReportForLack.html"
@@ -134,6 +134,7 @@
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
                                 <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="get_Copy" id="get_Copy"><i class="layui-icon layui-icon-refresh-3"></i>澶嶅埗</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="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" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -183,6 +184,10 @@
                     //瀵煎嚭excel
                     case 'get_export':
                         get_Export();
+                        break;
+                    //瀵煎嚭excel
+                    case 'get_Copy':
+                        get_Copy();
                         break;
                     //鍒锋柊
                     case 'get_Refresh': get_Refresh();
@@ -314,7 +319,7 @@
                             Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
 
                             //鍒锋柊琛ㄦ牸鏁版嵁
-                            //DisPlay_HideColumn();
+                            DisPlay_HideColumn();
 
                             layer.close(ajaxLoad);
 
@@ -453,7 +458,7 @@
 
             //#region 瀵煎嚭Execel
             function get_Export() {
-                var ModRightNameCheck = "Gy_RoutingBillReportForLack";
+                var ModRightNameCheck = "Gy_RoutingBillReportForLack_ExportExcel";
 
                 //閫昏緫瀹℃牳鏂规硶
                 $.ajax({
@@ -462,7 +467,19 @@
                     data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
                     success: function (result) {
                         if (result.count == 1) {
-                            table.exportFile(ins.config.id, option.data, "xls");
+                            var data = option.data;
+                            data.forEach((item) => {
+                                for (let itemobj in item) {
+                                    if (item[itemobj] == null) {
+                                        item[itemobj] = "";
+                                    }
+                                    if (item[itemobj].length > 0) {  // 鍋囪瀛楁鍚嶄负field
+                                        item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                                        item[itemobj] = item[itemobj].toString().replaceAll(/[,]+/g, '锛�');  // 灏嗘崲鍒嗗彿鏇挎崲涓虹┖瀛楃涓�
+                                    }
+                                }
+                            });
+                            table.exportFile(ins.config.id,data, "xls");
                         } else {
                             layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
                         }
@@ -473,6 +490,31 @@
             }
             //#endregion
 
+            //澶嶅埗
+            function get_Copy() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HMaterID = data[0].HMaterID;
+                    var HMaterNumber = data[0].鐗╂枡浠g爜;
+                    var HMaterName = data[0].鐗╂枡鍚嶇О;
+                    var HMaterModel = data[0].瑙勬牸鍨嬪彿;
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '宸ヨ壓璺嚎-缂栬緫'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=1&linterid=' + 0 + '&HSouceBillType=4610&HMaterID=' + HMaterID + '&HMaterNumber=' + HMaterNumber + '&HMaterName=' + HMaterName + '&HMaterModel=' + HMaterModel
+                        , end: function () {
+                            //鍒锋柊椤甸潰,
+                            //location.reload();
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
             //#region 鍒锋柊
             function get_Refresh() {
                 $("#btnSearch").trigger('click');

--
Gitblit v1.9.1