From 8a36bbee40f5e1069b15a98b1e64ac9719ee8a46 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 23 四月 2024 17:17:13 +0800
Subject: [PATCH] 1.销售出库单 增加 反写源单 销售订单和发货通知单   超出 关联数量  关闭源单 2.应收单 增加  反写源单 销售出库单 和 销售订单  超出关联数量  关闭源单 3.动态获取源单增加参数 Num 0蓝单   1红单  2全部 4.销售流程的测试并完善功能; 销售订单-》发货通知单-》销售出库单-》应收单 (注意: 源单类型的下拉框 需要 根据数据库 表动态加载, 关联数量 要准确 , 审核 且 未关闭 未行关闭的行 才能下推 ,关联数量超额后,要 反写 关闭 源单 )

---
 WebTM/views/基础资料/生产基础资料/Gy_Source.html |   71 ++++++++++++++++++++++++++++++-----
 1 files changed, 61 insertions(+), 10 deletions(-)

diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
index 2eafb93..c564966 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
@@ -98,6 +98,7 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></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_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                             </div>
                         </script>
@@ -129,7 +130,9 @@
             var option = [];
             var HModName = "Gy_Source";
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-            var titleData = ["HItemID","Hprocid","HUSEORGID"];
+            var titleData = ["HItemID", "Hprocid", "HUSEORGID"];
+
+            var ins;                        //鐢ㄤ簬瀵煎嚭excel
         //#endregion
 
 
@@ -194,6 +197,10 @@
                     //閫�鍑烘寜閽�
                     case 'get_Exit': Pub_Close(2);
                         break;
+                    //瀵煎嚭excel
+                    case 'get_export':
+                        get_Export();
+                        break;
                     //鍒楄缃�
                     case 'set_HideColumn': get_HideColumn();
                         break;
@@ -223,8 +230,24 @@
             //#region 鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
                 get_FastQuery(2);
+                //瀛樺偍鏉′欢
+                get_WriteConfigFile();
             });
             //#endregion
+
+            //浠g爜鍥炶溅鏂规硶
+            $('#HNumber').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    get_FastQuery(2);
+                }
+            });
+
+            //鍚嶇О鍥炶溅鏂规硶
+            $('#HName').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    get_FastQuery(2);
+                }
+            });
 
             //#region 閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
@@ -247,11 +270,9 @@
                 Organ();
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
-                //鍒濆鍖� 閰嶇疆
-                get_ReadConfigFile();
                 //鏌ヨ
                 get_FastQuery(1);
-              
+             
             }
             //#endregion
 
@@ -260,6 +281,7 @@
                 //鑾峰彇鐧诲綍椤电粍缁囧垪
                 $.ajax({
                     type: "get",
+                    async: false,
                     url: GetWEBURL() + "/Web/GetOrganizations",
                     success: function (result) {
                         var Organization = "";
@@ -335,6 +357,13 @@
                                         case 'DateTime':
                                             col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                             break;
+                                        case 'long':
+                                        case 'Int32':
+                                        case 'Int64':
+                                        case 'double':
+                                        case 'Decimal':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+                                            break;
                                         default:
                                             col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                     }
@@ -352,14 +381,12 @@
                                 , limits: [50, 500, 5000, 50000]
                                 , limit: 50
                                 , cellMinWidth: 90
+                                , totalRow: true
                                 , done: function (res, curr, count) {
                                     soulTable.render(this);
                                 }
                             }
-                            table.render(option);
-
-                            //瀛樺偍鏉′欢
-                            get_WriteConfigFile();
+                            ins = table.render(option);
 
                             //鍒锋柊琛ㄦ牸鏁版嵁
                             DisPlay_HideColumn();
@@ -368,6 +395,8 @@
                             if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                 ColFilter();
                             }
+                            //鍒濆鍖� 閰嶇疆
+                            get_ReadConfigFile();
                             //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
                             layer.close(ajaxLoad);
@@ -382,6 +411,27 @@
             }
             //#endregion
 
+            //#region 瀵煎嚭Execel
+            function get_Export() {
+                var ModRightNameCheck = "Gy_Source_ExportExcel";
+
+                //閫昏緫瀹℃牳鏂规硶
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            table.exportFile(ins.config.id, option.data, "xls");
+                        } else {
+                            layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
 
             //瀛樺偍閰嶇疆鏂囦欢
             function get_WriteConfigFile() {
@@ -531,10 +581,11 @@
             }
 
             function btnrowDouble(obj) {
-                var index = parent.layer.getFrameIndex(window.name);
-                var data = obj.data;
+                var data = [];
+                data.push(obj.data);
                //杩斿洖鏂规硶
                 parent.GetGySource(data);
+                var index = parent.layer.getFrameIndex(window.name);
                 parent.layer.close(index);
             }
 

--
Gitblit v1.9.1