From 7fab50e365d752189a25d56bce9dbaa15c098d7a Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期五, 20 三月 2026 15:38:14 +0800
Subject: [PATCH] 1

---
 WebTM/views/模治具管理/器具点检规程单/Sc_MouldDotCheckRuleBillEdit.html |    4 
 WebTM/WebTM.csproj.user                                     |    2 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapOutBill.html         |   83 ++++++
 WebTM/views/系统管理/用户管理/Xt_UserList.html                      |    5 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillEdit.html      |   82 ++++++
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillEdit.html       |   93 +++++++
 WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillSync.html         |    2 
 WebTM/views/成本管理/期初在产品表/Gy_WIPBal_Excel.html                |    3 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdBackBillEdit.html     |   83 ++++++
 WebTM/layuiadmin/Scripts/webConfig.js                       |    6 
 WebTM/views/模治具管理/模治具管理/Sc_Add_MouldDotCheckBillList.html   |    2 
 WebTM/views/生产管理/订单状态分布/Sc_OrderStateDistribution.html      |  272 ++++++++++++++++++++--
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_WorkStationList.html    |    8 
 WebTM/views/模治具管理/模治具管理/Gy_MouldFileList.html               |   21 -
 14 files changed, 600 insertions(+), 66 deletions(-)

diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 8cd2c06..48a262b 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -6,7 +6,7 @@
     <ProjectView>ShowAllFiles</ProjectView>
     <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <NameOfLastUsedPublishProfile>D:\鏅轰簯LMes\MESWMS-LayUI\WebTM\Properties\PublishProfiles\SWETM.pubxml</NameOfLastUsedPublishProfile>
-    <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>C:\Users\19858\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/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 125a924..e4e378d 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -5,15 +5,15 @@
     //var WEBURL = "http://localhost/API/";             //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/API/";        //鏉滆春鏈湴閰嶇疆
     //var WEBURL = "http://localhost:81/API/"           //缈佹稕娑涙湰鍦伴厤缃�
-    var WEBURL = "http://localhost:8082/API/";        //寮犵憺骞挎湰鍦伴厤缃�
-    //var WEBURL = "http://localhost:81/API/";          //闄堥晲鍝叉湰鍦伴厤缃�
+    // var WEBURL = "http://localhost:8082/API/";        //寮犵憺骞挎湰鍦伴厤缃�
+    // var WEBURL = "http://localhost:81/API/";          //闄堥晲鍝叉湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";   //鏉庢灄淇婃湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8080/API/";        //鐜嬩华鏈湴閰嶇疆
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";   //浣欐�濇澃鏈湴閰嶇疆
     //var WEBURL = "http://localhost:8088/ARAPI/";      //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
     //var WEBURL = "http://47.96.97.237/API/";          //鏅轰簯鏈嶅姟鍣�
    /* var WEBURL = "http://localhost:8082/LuBaoAPI/";  //浣欐�濇澃鏈湴閰嶇疆*/
-    //var WEBURL = "http://localhost:81/API/";            // 闄堥晲鍝叉湰鍦伴厤缃�*/
+    var WEBURL = "http://localhost:81/API/";            // 闄堥晲鍝叉湰鍦伴厤缃�*/
      //var WEBURL = "http://localhost:8082/LuBaoAPI/";  //鏉庢灄淇婃湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8088/ARAPI/";      //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
     //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //濂ラ偊
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkStationList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkStationList.html"
index 77d6f6c..dd810ef 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkStationList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkStationList.html"
@@ -381,8 +381,8 @@
                                     //OptionData = checkStatus.data[0];
                                     obj.update({
                                         "HMaterID": checkStatus.data[0].HItemID
-                                        , "HMaterName": checkStatus.data[0].鐗╂枡浠ｇ爜
-                                        , "HMaterNumber": checkStatus.data[0].鐗╂枡鍚嶇О
+                                        , "HMaterName": checkStatus.data[0].鐗╂枡鍚嶇О
+                                        , "HMaterNumber": checkStatus.data[0].鐗╂枡浠ｇ爜
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
@@ -390,8 +390,8 @@
                                     if (typeof (OptionData) != "undefined" && OptionData != [] && OptionData.length!=0) {
                                         obj.update({
                                             "HMaterID": OptionData.HItemID
-                                            , "HMaterName": OptionData.鐗╂枡浠ｇ爜
-                                            , "HMaterNumber": OptionData.鐗╂枡鍚嶇О
+                                            , "HMaterName": OptionData.鐗╂枡鍚嶇О
+                                            , "HMaterNumber": OptionData.鐗╂枡浠ｇ爜
                                         })
                                         OptionData = [];
                                     }
diff --git "a/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\234\237\345\210\235\345\234\250\344\272\247\345\223\201\350\241\250/Gy_WIPBal_Excel.html" "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\234\237\345\210\235\345\234\250\344\272\247\345\223\201\350\241\250/Gy_WIPBal_Excel.html"
index 0607335..7df01e7 100644
--- "a/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\234\237\345\210\235\345\234\250\344\272\247\345\223\201\350\241\250/Gy_WIPBal_Excel.html"
+++ "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\234\237\345\210\235\345\234\250\344\272\247\345\223\201\350\241\250/Gy_WIPBal_Excel.html"
@@ -225,7 +225,8 @@
                     , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜', width: 120 }
                     , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О', width: 120 }
                     , { field: '鏈熷垵閲戦', title: '鏈熷垵閲戦', width: 120}
-                    , { field: '鏈熷垵鏁伴噺', title: '鏈熷垵鏁伴噺', width: 120}
+                    , { field: '鏈熷垵鏁伴噺', title: '鏈熷垵鏁伴噺', width: 120 }
+                    , { field: '鎷兼澘鏁�', title: '鎷兼澘鏁�', width: 120 }
                     , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
                 ]]
             };
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillEdit.html"
index 068bdf3..ab09e38 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillEdit.html"
@@ -587,7 +587,7 @@
                     id: 'mainTable'
                     , elem: '#mainTable'
                     , toolbar: '#toolbarDemo'
-                    , page: false
+                    , limit: 50
                     , totalRow: true
                     , cellMinWidth: 120
                     , height: 500
@@ -893,7 +893,7 @@
                                                 HDotCheckItem: checkStatus.data[i].鐐规椤圭洰鍚嶇О,
                                                 HDotCheckItemClassID: checkStatus.data[i].HDotCheckItemClassID,
                                                 HDotCheckItemClassName: checkStatus.data[i].鐐规椤圭洰鍒嗙被鍚嶇О,
-
+                                                HStdDotCheckResult: "OK"
                                             });
                                         }
 
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillEdit.html"
index 3714f14..89e6dd7 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillEdit.html"
@@ -335,7 +335,7 @@
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index' //涓诲叆鍙ｆā鍧�
-        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        }).use(['index', 'form', 'laydate', 'table', 'element', 'tableSelect'], function () {
             //#region 鍏叡鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
@@ -343,7 +343,9 @@
                 , table = layui.table
                 , form = layui.form
                 , laydate = layui.laydate
-                , element = layui.element;
+                , element = layui.element
+                , tableSelect = layui.tableSelect;
+
             var HModName = "Sc_MouldProdBackBillEdit";
             var HBillType = "3803";
             var HInterID = $('#HInterID').val()
@@ -1695,7 +1697,84 @@
             table.on('tool(mainTable)', function (obj) {
                 set_GridDelete(obj);    //琛屽唴鍒犻櫎
                 set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+                //#region 
+                //涓嬫媺鎼滅储妗�
+                tableSelect.render({
+                    elem: 'td[data-field="HMaterNumber"] .layui-table-edit',
+                    searchKey: '妯″叿鍚嶇О,妯″叿缂栧彿',
+                    sWhere: " ",//table鎼滅储sWhere鏉′欢
+                    ajaxSelect: function (sWhere) {
+                        var data = [];
+                        var ModRightNameSelect = 'Gy_MouldFileList';
+                        $.ajax({
+                            url: GetWEBURL() + '/Gy_Mould/page',
+                            type: "GET",
+                            async: false,
+                            data: { "sWhere": sWhere, "ModRightNameSelect": ModRightNameSelect, "user": sessionStorage["HUserName"], "page": 1, "size": 5 },
+                            success: function (data1) {
+                                if (data1.count>0) {
+                                    data = data1.data
+                                }
+                            },
+                            error: function () {
+                                layer.alert('鑾峰彇鍒楄〃澶辫触锛�', { icon: 15, title: '閫氫俊閿欒' });
+                            }
+                        });
+                        return data;
+                    },//璁剧疆鍓嶇鍒嗛〉鏃跺彲浠ヨ缃殑
+                    table: {
+                        cols: [[
+                            { type: 'radio', fixed: 'left' },
+                            { field: 'hmainid', title: 'hmainid', hide: true },
+                            , { field: '妯″叿鍚嶇О', title: '妯″叿鍚嶇О' }
+                            , { field: '妯″叿缂栧彿', title: '妯″叿缂栧彿' }
+                            , { field: '妯″叿鍨嬪彿', title: '鍣ㄥ叿鍨嬪彿' }
+                            , { field: 'HWhID', title: 'HWhID', hide: true }
+                            , { field: '榛樿浠撳簱', title: '榛樿浠撳簱' }
+                            , { field: 'HSPID', title: 'HSPID', hide: true }
+                            , { field: '榛樿浠撲綅', title: '榛樿浠撲綅' }
+                            , { field: 'HUnitID', title: 'HUnitID', hide: true, sort: true }
+                            , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', sort: true }
+                            , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', sort: true }
+                        ]],
+                        page: true,
+                        limit: 5,
+                        //limits: [5]
+                    },
+                    done: function (elem, data) {
+                        $(".layui-table-edit").blur();//鍗曞厓鏍煎け鍘荤劍鐐�
+                        if (typeof (OptionData) != "undefined" && OptionData != []) {
+                            obj.update({
+                                "HMaterID": OptionData["hmainid"]
+                                , "HMaterCode": data.data[0]["妯″叿缂栧彿"]
+                                , "HMaterName": data.data[0]["妯″叿鍚嶇О"]
 
+                                , "HMaterModel": data.data[0]["妯″叿鍨嬪彿"]
+                                , "HUnitID": data.data[0]["HUnitID"]
+                                , "HUnitNumber": data.data[0]["璁￠噺鍗曚綅浠ｇ爜"]
+                                , "HUnitName": data.data[0]["璁￠噺鍗曚綅"]
+                                , "HWHID": data.data[0]["HWhID"]
+                                , "HWHName": data.data[0]["榛樿浠撳簱"]
+                                , "HWHNumber": data.data[0]["榛樿浠撳簱浠ｇ爜"]
+                                , "HSPID": data.data[0]["HSPID"]
+                                , "HSPName": data.data[0]["榛樿浠撲綅"]
+                                , "HSPNumber": data.data[0]["榛樿浠撲綅浠ｇ爜"]
+                                , "HDesignLife": 0
+                                , "HLeaveLife": 0
+                                , "HQty": 1
+                                , "HMoney": 0
+                            })
+
+                            table.render(option);
+                        }
+                        
+
+
+
+                        //setTableByHMater(obj, data);
+                    }
+                })
+                //#endregion
                 var data = obj.data;
                 if (obj.event == 'HDate') {
                     var field = $(this).data('field');
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
index bb16a2d..5c709e0 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
@@ -385,7 +385,7 @@
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index' //涓诲叆鍙ｆā鍧�
-        }).use(['index', 'form', 'laydate', 'table', 'element', 'layer'], function () {
+        }).use(['index', 'form', 'laydate', 'table', 'element', 'layer','tableSelect'], function () {
             //#region 鍏叡鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
@@ -395,6 +395,7 @@
                 , laydate = layui.laydate
                 , element = layui.element
                 , layer = layui.layer
+                , tableSelect = layui.tableSelect;
             //鏌ヨ鏉′欢
             var option = [];
             var option1 = [];
@@ -448,7 +449,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
+                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 1, "HQty": 1, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
                 console.log(NewRow);
                 switch (obj.event) {
                     //鏂板涓�琛�
@@ -1035,7 +1036,7 @@
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
                 $('#check-btn').addClass('layui-btn-disabled').attr('disabled', true);
-                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
+                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 1, "HQty": 1, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
                 table.render(option);
             }
             //鑾峰彇鏈�澶у崟鎹彿
@@ -1059,7 +1060,7 @@
             function set_EditFromGrid(linterid) {
                 set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
                 set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
-                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
+                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 1, "HQty": 1, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
                 table.render(option);
             }
             //缂栬緫鑾峰彇琛ㄥご
@@ -1254,7 +1255,7 @@
                                         var rowIndex = $(obj.tr).attr("data-index") * 1;  //attr("data-index")鐢ㄤ簬鑾峰彇璇r鍏冪礌涓奷ata-index灞炴�х殑鍊�*1杞崲绫诲瀷鐒跺悗璧嬪�肩粰rowIndex
                                         for (var i = 0; i < checkStatus.data.length; i++) {  //鍒ゆ柇閫変腑鐨勬暟鎹殑闀垮害  鐢ㄤ簬閬嶅巻checkStatus.data鏁扮粍涓殑姣忎釜鍏冪礌
                                             if (rowIndex + i >= option.data.length) {           //鍒ゆ柇rowIndex + i鐨勭储寮曡秴鍑轰簡option.data鏁扮粍鐨勯暱搴︼紝璇存槑option.data鏁扮粍闇�瑕佹墿灞曚互鍖呭惈鏇村琛�
-                                                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 1, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
+                                                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 1, "HQty": 1, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
                                                 table.cache["mainTable"].push(NewRow);    //鍒涘缓鏂扮殑鍖呭惈鏁扮粍  浼犲叆table.cache["mainTable"]鏁扮粍
                                                 option.data = table.cache["mainTable"];  //鎶婁紶鍏� table.cache["mainTable"]鏁扮粍鐨勫�艰祴鍊肩粰option.data 鐨勫睘鎬�
                                                 table.render(option);//娓叉煋鐣岄潰
@@ -1266,7 +1267,7 @@
                                             option.data[rowIndex + i].HUnitID = checkStatus.data[i].HUnitID;
                                             option.data[rowIndex + i].HUnitCode = checkStatus.data[i].璁￠噺鍗曚綅浠ｇ爜;
                                             option.data[rowIndex + i].HUnitName = checkStatus.data[i].璁￠噺鍗曚綅;
-                                            option.data[rowIndex + i].HWHID = checkStatus.data[i].HWHID;
+                                            option.data[rowIndex + i].HWHID = checkStatus.data[i].HWhID;
                                             option.data[rowIndex + i].HWHName = checkStatus.data[i].榛樿浠撳簱;
                                             option.data[rowIndex + i].HWHCode = checkStatus.data[i].榛樿浠撳簱浠ｇ爜;
                                             option.data[rowIndex + i].HSPID = checkStatus.data[i].HSPID;
@@ -1518,6 +1519,85 @@
                         return false;
                     }
                 })
+                //#region 
+                //涓嬫媺鎼滅储妗�
+                tableSelect.render({
+                    elem: 'td[data-field="HMaterCode"] .layui-table-edit',
+                    searchKey: '妯″叿鍚嶇О,妯″叿缂栧彿',
+                    sWhere: " ",//table鎼滅储sWhere鏉′欢
+                    ajaxSelect: function (sWhere) {
+                        console.log("sWhere", sWhere)
+                        var data = [];
+                        var ModRightNameSelect = 'Gy_MouldFileList';
+                        $.ajax({
+                            url: GetWEBURL() + '/Gy_Mould/page',
+                            type: "GET",
+                            async: false,
+                            data: { "sWhere": sWhere, "ModRightNameSelect": ModRightNameSelect, "user": sessionStorage["HUserName"], "page":1, "size": 5},
+                            success: function (data1) {
+                                if (data1.count  >0) {
+                                    data = data1.data
+                                }
+                            },
+                            error: function () {
+                                layer.alert('鑾峰彇鍒楄〃澶辫触锛�', { icon: 15, title: '閫氫俊閿欒' });
+                            }
+                        });
+                        return data;
+                    },//璁剧疆鍓嶇鍒嗛〉鏃跺彲浠ヨ缃殑
+                    table: {
+                        cols: [[
+                            { type: 'radio', fixed: 'left' },
+                            { field: 'hmainid', title: 'hmainid', hide: true },
+                            , { field: '妯″叿鍚嶇О', title: '妯″叿鍚嶇О' }
+                            , { field: '妯″叿缂栧彿', title: '妯″叿缂栧彿' }
+                            , { field: '妯″叿鍨嬪彿', title: '鍣ㄥ叿鍨嬪彿' }
+                            , { field: 'HWhID', title: 'HWhID', hide: true}
+                            , { field: '榛樿浠撳簱', title: '榛樿浠撳簱' }
+                            , { field: 'HSPID', title: 'HSPID', hide: true }
+                            , { field: '榛樿浠撲綅', title: '榛樿浠撲綅' }
+                            , { field: 'HUnitID', title: 'HUnitID', hide: true, sort: true }
+                            , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', sort: true }
+                            , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', sort: true }
+                        ]],
+                        page: true,
+                        limit: 5,
+                        //limits: [5]
+                    },
+                    done: function (elem, data) {
+                        $(".layui-table-edit").blur();//鍗曞厓鏍煎け鍘荤劍鐐�
+                        obj.update({
+                            "HMaterID": data.data[0]["hmainid"]
+                            , "HMaterCode": data. data[0]["妯″叿缂栧彿"]
+                            , "HMaterName": data. data[0]["妯″叿鍚嶇О"]
+
+                            , "HMaterSpec": data.data[0]["妯″叿鍨嬪彿"]
+                            , "HUnitID": data.data[0]["HUnitID"]
+                            , "HUnitCode": data.data[0]["璁￠噺鍗曚綅浠ｇ爜"]
+                            , "HUnitName": data.data[0]["璁￠噺鍗曚綅"]
+                            , "HWHID": data.data[0]["HWhID"]
+                            , "HWHName": data.data[0]["榛樿浠撳簱"]
+                            , "HWHCode": data.data[0]["榛樿浠撳簱浠ｇ爜"]
+                            , "HSPID": data.data[0]["HSPID"]
+                            , "HSPName": data.data[0]["榛樿浠撲綅"]
+                            , "HSPCode": data.data[0]["榛樿浠撲綅浠ｇ爜"]
+
+                            , "HDesignLife": 0
+                            , "HLeaveLife": 0
+                            , "HQty": 1
+                            , "HMoney": 0
+                        })
+
+                        table.render(option);
+
+
+
+                        //setTableByHMater(obj, data);
+                    }
+                })
+                //#endregion
+
+
                 //鍙屽嚮
                 $('.layui-table-box tbody td[data-field="HMaterCode"]').off('dblclick').on('dblclick', function () {
                     //椤甸潰灞�-鑷畾涔�
@@ -1589,6 +1669,7 @@
                     obj.event = "";
                 });
             }
+
             //?
             function f_alert(sMsg) {
                 layer.alert(sMsg, { icon: 5 });
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
index 404623f..edb3b74 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
@@ -335,7 +335,7 @@
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index' //涓诲叆鍙ｆā鍧�
-        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        }).use(['index', 'form', 'laydate', 'table', 'element', 'tableSelect'], function () {
             //#region 鍏叡鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
@@ -343,7 +343,9 @@
                 , table = layui.table
                 , form = layui.form
                 , laydate = layui.laydate
-                , element = layui.element;
+                , element = layui.element
+                , tableSelect = layui.tableSelect;
+
             var HModName = "Sc_MouldProdOutBillEdit";
             var HBillType = "3802";
             var HInterID = $('#HInterID').val()
@@ -1696,7 +1698,81 @@
             table.on('tool(mainTable)', function (obj) {
                 set_GridDelete(obj);    //琛屽唴鍒犻櫎
                 set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+                //#region 
+                //涓嬫媺鎼滅储妗�
+                tableSelect.render({
+                    elem: 'td[data-field="HMaterNumber"] .layui-table-edit',
+                    searchKey: '妯″叿鍚嶇О,妯″叿缂栧彿',
+                    sWhere: " ",//table鎼滅储sWhere鏉′欢
+                    ajaxSelect: function (sWhere) {
+                        var data = [];
+                        var ModRightNameSelect = 'Gy_MouldFileList';
+                        $.ajax({
+                            url: GetWEBURL() + '/Gy_Mould/page',
+                            type: "GET",
+                            async: false,
+                            data: { "sWhere": sWhere, "ModRightNameSelect": ModRightNameSelect, "user": sessionStorage["HUserName"], "page": 1, "size": 5 },
+                            success: function (data1) {
+                                if (data1.count > 0) {
+                                    data = data1.data
+                                }
+                            },
+                            error: function () {
+                                layer.alert('鑾峰彇鍒楄〃澶辫触锛�', { icon: 15, title: '閫氫俊閿欒' });
+                            }
+                        });
+                        return data;
+                    },//璁剧疆鍓嶇鍒嗛〉鏃跺彲浠ヨ缃殑
+                    table: {
+                        cols: [[
+                            { type: 'radio', fixed: 'left' },
+                            { field: 'hmainid', title: 'hmainid', hide: true },
+                            , { field: '妯″叿鍚嶇О', title: '妯″叿鍚嶇О' }
+                            , { field: '妯″叿缂栧彿', title: '妯″叿缂栧彿' }
+                            , { field: '妯″叿鍨嬪彿', title: '鍣ㄥ叿鍨嬪彿' }
+                            , { field: 'HWhID', title: 'HWhID', hide: true }
+                            , { field: '榛樿浠撳簱', title: '榛樿浠撳簱' }
+                            , { field: 'HSPID', title: 'HSPID', hide: true }
+                            , { field: '榛樿浠撲綅', title: '榛樿浠撲綅' }
+                            , { field: 'HUnitID', title: 'HUnitID', hide: true, sort: true }
+                            , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', sort: true }
+                            , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', sort: true }
+                        ]],
+                        page: true,
+                        limit: 5,
+                        //limits: [5]
+                    },
+                    done: function (elem, data) {
+                        $(".layui-table-edit").blur();//鍗曞厓鏍煎け鍘荤劍鐐�
+                        obj.update({
+                            "HMaterID": data.data[0]["hmainid"]
+                            , "HMaterNumber": data.data[0]["妯″叿缂栧彿"]
+                            , "HMaterName": data.data[0]["妯″叿鍚嶇О"]
 
+                            , "HMaterModel": data.data[0]["妯″叿鍨嬪彿"]
+                            , "HUnitID": data.data[0]["HUnitID"]
+                            , "HUnitNumber": data.data[0]["璁￠噺鍗曚綅浠ｇ爜"]
+                            , "HUnitName": data.data[0]["璁￠噺鍗曚綅"]
+                            , "HWHID": data.data[0]["褰撳墠浠撳簱ID"]
+                            , "HWHName": data.data[0]["褰撳墠浠撳簱"]
+                            , "HWHNumber": data.data[0]["褰撳墠浠撳簱浠ｇ爜"]
+                            , "HSPID": data.data[0]["褰撳墠浠撲綅ID"]
+                            , "HSPName": data.data[0]["褰撳墠浠撲綅"]
+                            , "HSPNumber": data.data[0]["褰撳墠浠撲綅浠ｇ爜"]
+                            , "HDesignLife": 0
+                            , "HLeaveLife": 0
+                            , "HQty": 1
+                            , "HMoney": 0
+                        })
+
+                        table.render(option);
+
+
+
+                        //setTableByHMater(obj, data);
+                    }
+                })
+                //#endregion
                 var data = obj.data;
                 if (obj.event == 'HDate') {
                     var field = $(this).data('field');
@@ -1910,6 +1986,8 @@
                                 }
                             })
                         }
+
+                        
                         obj.event = "";
                         return false;
                     }
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
index 6945d84..a1e97ca 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
@@ -405,7 +405,7 @@
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index' //涓诲叆鍙ｆā鍧�
-        }).use(['index', 'form', 'laydate', 'table', 'element', 'util'], function () {
+        }).use(['index', 'form', 'laydate', 'table', 'element', 'util', 'tableSelect'], function () {
 
             //#region 鍏敤鍙橀噺
             var $ = layui.$
@@ -415,7 +415,9 @@
                 , form = layui.form
                 , laydate = layui.laydate
                 , element = layui.element
-                , util = layui.util;
+                , util = layui.util
+                , tableSelect = layui.tableSelect;
+
             var option;
             var sBillType = "3832";
             var HModName = "Sc_MouldScrapOutBillEdit";
@@ -800,6 +802,81 @@
             table.on('tool(mainTable)', function (obj) {
                 set_GridDelete(obj);   //琛屽唴鍒犻櫎
                 set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+                //#region 
+                //涓嬫媺鎼滅储妗�
+                tableSelect.render({
+                    elem: 'td[data-field="HMaterCode"] .layui-table-edit',
+                    searchKey: '妯″叿鍚嶇О,妯″叿缂栧彿',
+                    sWhere: " ",//table鎼滅储sWhere鏉′欢
+                    ajaxSelect: function (sWhere) {
+                        var data = [];
+                        var ModRightNameSelect = 'Gy_MouldFileList';
+                        $.ajax({
+                            url: GetWEBURL() + '/Gy_Mould/page',
+                            type: "GET",
+                            async: false,
+                            data: { "sWhere": sWhere, "ModRightNameSelect": ModRightNameSelect, "user": sessionStorage["HUserName"], "page": 1, "size": 5 },
+                            success: function (data1) {
+                                if (data1.count > 0) {
+                                    data = data1.data
+                                }
+                            },
+                            error: function () {
+                                layer.alert('鑾峰彇鍒楄〃澶辫触锛�', { icon: 15, title: '閫氫俊閿欒' });
+                            }
+                        });
+                        return data;
+                    },//璁剧疆鍓嶇鍒嗛〉鏃跺彲浠ヨ缃殑
+                    table: {
+                        cols: [[
+                            { type: 'radio', fixed: 'left' },
+                            { field: 'hmainid', title: 'hmainid', hide: true },
+                            , { field: '妯″叿鍚嶇О', title: '妯″叿鍚嶇О' }
+                            , { field: '妯″叿缂栧彿', title: '妯″叿缂栧彿' }
+                            , { field: '妯″叿鍨嬪彿', title: '鍣ㄥ叿鍨嬪彿' }
+                            , { field: 'HWhID', title: 'HWhID', hide: true }
+                            , { field: '榛樿浠撳簱', title: '榛樿浠撳簱' }
+                            , { field: 'HSPID', title: 'HSPID', hide: true }
+                            , { field: '榛樿浠撲綅', title: '榛樿浠撲綅' }
+                            , { field: 'HUnitID', title: 'HUnitID', hide: true, sort: true }
+                            , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', sort: true }
+                            , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', sort: true }
+                        ]],
+                        page: true,
+                        limit: 5,
+                        //limits: [5]
+                    },
+                    done: function (elem, data) {
+                        $(".layui-table-edit").blur();//鍗曞厓鏍煎け鍘荤劍鐐�
+                        obj.update({
+                            "HMaterID": data.data[0]["hmainid"]
+                            , "HMaterCode": data.data[0]["妯″叿缂栧彿"]
+                            , "HMaterName": data.data[0]["妯″叿鍚嶇О"]
+
+                            , "HMaterSpec": data.data[0]["妯″叿鍨嬪彿"]
+                            , "HUnitID": data.data[0]["HUnitID"]
+                            , "HUnitCode": data.data[0]["璁￠噺鍗曚綅浠ｇ爜"]
+                            , "HUnitName": data.data[0]["璁￠噺鍗曚綅"]
+                            , "HWHID": data.data[0]["褰撳墠浠撳簱ID"]
+                            , "HWHName": data.data[0]["褰撳墠浠撳簱"]
+                            , "HWHCode": data.data[0]["褰撳墠浠撳簱浠ｇ爜"]
+                            , "HSPID": data.data[0]["褰撳墠浠撲綅ID"]
+                            , "HSPName": data.data[0]["褰撳墠浠撲綅"]
+                            , "HSPCode": data.data[0]["褰撳墠浠撲綅浠ｇ爜"]
+                            , "HDesignLife": 0
+                            , "HLeaveLife": 0
+                            , "HQty": 1
+                            , "HMoney": 0
+                        })
+
+                        //table.render(option);
+
+
+
+                        //setTableByHMater(obj, data);
+                    }
+                })
+                //#endregion
             });
 
             //琛ㄤ綋鐩戝惉鍗曞厓鏍肩紪杈�
@@ -1724,9 +1801,11 @@
                                 }
                             });
                         }
+                        
                         obj.event = "";
                         return false;
                     }
+                    
                 })
                 //鍙屽嚮
                 $('.layui-table-box tbody td[data-field="HMaterCode"]').off('dblclick').on('dblclick', function () {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
index 7f3a22d..3b90407 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
@@ -607,27 +607,16 @@
                                         case 'Int64':
                                         case 'double':
                                         case 'Decimal':
-                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
                                             break;
                                         default:
                                             col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                     }
                                 }
                             }
-                            option = {
-                                elem: '#mainTable'
-                                , toolbar: '#toolbarDemo'
-                                , totalRow: true
-                                , height: 'full-50'
-                                , page: false //寮�鍚垎椤�
-                                , limit: 50
-                                , limits: [50, 500, 2000, 5000]
-                                , cols: [col]
-                                , data: data1.data
-                                , done: function (res, curr, count) {
-                                    soulTable.render(this);
-                                }
-                            };
+                            
+                            option.cols = [col];
+                            option.data = data1.data;
                             optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
                             laypage.render(optionPage);                          
                             //鍒楄缃�
@@ -1291,7 +1280,7 @@
                 var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡  1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
                 var addSWhere = "";
                 if (typeof(openType) != "undefined") {
-                    addSWhere = " and 浣滃簾浜� = '' and 鍏抽棴浜� = '' and 瀹℃牳浜� <> '' and 绂佺敤鏍囪 !='Y'";
+                    addSWhere = " and 浣滃簾浜� = '' and 鍏抽棴浜� = '' and 瀹℃牳浜� <> ''";
                 }
                 return addSWhere;
             }
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
index 53970f0..add487c 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
@@ -969,7 +969,7 @@
                     id: 'mainTable'
                     , elem: '#mainTable'
                     , toolbar: '#toolbarDemo'
-                    , page: false
+                    , limit: 50
                     , totalRow: true
                     , cellMinWidth: 120
                     , height: 500
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_OrderStateDistribution.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_OrderStateDistribution.html"
index 2bbe018..843d4e4 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_OrderStateDistribution.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_OrderStateDistribution.html"
@@ -1,5 +1,6 @@
 锘�<!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8" />
     <title>璁惧鐘舵�佸垎甯�</title>
@@ -15,7 +16,7 @@
     <link href="../../../layuiadmin/layui/css/ReportPlatform.css" rel="stylesheet" />
     <style>
         /*鏍戠姸鍥剧偣鍑婚珮浜彉鑹�*/
-        .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
+        .layui-tree-set-active>.layui-tree-entry .layui-tree-main {
             background: #aef0f7;
         }
 
@@ -23,17 +24,22 @@
             border: 1px solid #5FB878;
             height: 50px;
             border-radius: 5px;
-            /*background: -webkit-gradient(linear, 0% 0%, 0% 50%,from(#262525), to(#262525));*/ /*璋锋瓕*/
+            /*background: -webkit-gradient(linear, 0% 0%, 0% 50%,from(#262525), to(#262525));*/
+            /*璋锋瓕*/
         }
 
         .bottomright {
-            cursor: pointer; /*榧犳爣鍙樻垚鎵嬫寚鏍峰紡*/
-            transition: all 0.1s; /*鎵�鏈夊睘鎬у彉鍖栧湪0.6绉掑唴鎵ц鍔ㄧ敾*/
+            cursor: pointer;
+            /*榧犳爣鍙樻垚鎵嬫寚鏍峰紡*/
+            transition: all 0.1s;
+            /*鎵�鏈夊睘鎬у彉鍖栧湪0.6绉掑唴鎵ц鍔ㄧ敾*/
         }
 
         .bottomright:hover {
-           transform: scale(1.3); /*榧犳爣鏀句笂涔嬪悗鍏冪礌鍙樻垚1.4鍊嶅ぇ灏�*/
-        }        
+            transform: scale(1.3);
+            /*榧犳爣鏀句笂涔嬪悗鍏冪礌鍙樻垚1.4鍊嶅ぇ灏�*/
+        }
+
         .imgtitle {
             width: 70%;
             height: 50px;
@@ -57,13 +63,14 @@
             white-space: nowrap;
             text-overflow: ellipsis;
             overflow: hidden;
-            }
+        }
 
         .check1 {
-            cursor: pointer; /*榧犳爣鍙樻垚鎵嬫寚鏍峰紡*/
-            -webkit-transition: border linear .1s,-webkit-box-shadow linear .5s;
-            border-color: rgba(0,148, 255,.75);
-            -webkit-box-shadow: 0 0 18px rgba(0,148,255);
+            cursor: pointer;
+            /*榧犳爣鍙樻垚鎵嬫寚鏍峰紡*/
+            -webkit-transition: border linear .1s, -webkit-box-shadow linear .5s;
+            border-color: rgba(0, 148, 255, .75);
+            -webkit-box-shadow: 0 0 18px rgba(0, 148, 255);
         }
 
         .prs {
@@ -80,7 +87,10 @@
             top: 6px;
         }
 
-        .tr1-1, .tr1-2, .tr1-3, .tr1-4 {
+        .tr1-1,
+        .tr1-2,
+        .tr1-3,
+        .tr1-4 {
             margin-left: 3%;
             margin-top: 4%;
             height: 310px;
@@ -99,8 +109,42 @@
         .layui-icon {
             font-size: 20px;
         }
+
+        .param-group {
+            margin-bottom: 15px;
+            border: 1px solid #e6e6e6;
+            border-radius: 4px;
+            overflow: hidden;
+        }
+
+        .group-title {
+            background-color: #007dff;
+            color: #fff;
+            padding: 8px 12px;
+            font-size: 32px;
+            font-weight: bold;
+        }
+
+        .param-list {
+            display: flex;
+            flex-wrap: wrap;
+            padding: 10px 20px;
+            background-color: #f2f2f2;
+        }
+
+        .param-item {
+            width: 24%;
+            margin-bottom: 8px;
+            font-size: 28px;
+            color: #333;
+        }
+
+        .param-item span {
+            color: #666;
+        }
     </style>
 </head>
+
 <body>
     <div class="layui-fluid">
         <div class="layui-col-md12">
@@ -109,7 +153,8 @@
                     <form class="layui-form" action="" lay-filter="component-form-group">
                         <div class="layui-row">
                             <div class="layui-col-xs2 layui-inline" style="border: solid 1.5px #e0d6d64d;">
-                                <div id="TreeTable" class="demo-tree demo-tree-box" style="height: 600px; overflow: scroll;"></div>
+                                <div id="TreeTable" class="demo-tree demo-tree-box"
+                                    style="height: 600px; overflow: scroll;"></div>
                             </div>
                             <div class="layui-col-xs9 layui-inline" style="border: solid 1.5px #e0d6d64d;">
                                 <div id="btomleft" style="height:600px;display:block;overflow-y:auto;">
@@ -117,7 +162,8 @@
                                 </div>
                             </div>
                             <div class="layui-col-xs1 layui-inline" style="border: solid 1.5px #e0d6d64d;">
-                                <fieldset style="border: 1px solid #eee; box-shadow: 0 2px 5px 0 rgb(0 0 0 / 10%); height: 585px;">
+                                <fieldset
+                                    style="border: 1px solid #eee; box-shadow: 0 2px 5px 0 rgb(0 0 0 / 10%); height: 585px;">
                                     <legend style="color: #5FB878">鎿嶄綔鍙�</legend>
                                     <div class="content4">
                                         <div class="layui-row layui-col-space10">
@@ -201,22 +247,32 @@
                                                 </div>
                                             </div>
                                         </div>
+                                        <div class="layui-row layui-col-space10">
+                                            <div class="layui-col-sm12 " onclick="showTechParam()">
+                                                <div class="cnt bottomright">
+                                                    <div class="btnM">
+                                                        <span class="layui-icon layui-icon-layer imgicon"></span>
+                                                    </div>
+                                                    <span class="imgtitle">宸ヨ壓鍙傛暟</span>
+                                                </div>
+                                            </div>
+                                        </div>
                                     </div>
                                 </fieldset>
                             </div>
                         </div>
                         <div class="layui-row">
                             <div class="layui-col-xs3 layui-inline">
-                                <div class="tr1-1" id="mychart11">   </div>
+                                <div class="tr1-1" id="mychart11"> </div>
                             </div>
                             <div class="layui-col-xs3 layui-inline">
-                                <div class="tr1-2" id="mychart22">   </div>
+                                <div class="tr1-2" id="mychart22"> </div>
                             </div>
                             <div class="layui-col-xs3 layui-inline">
-                                <div class="tr1-3" id="mychart3">   </div>
+                                <div class="tr1-3" id="mychart3"> </div>
                             </div>
                             <div class="layui-col-xs3 layui-inline">
-                                <div class="tr1-4" id="mychart4">   </div>
+                                <div class="tr1-4" id="mychart4"> </div>
                             </div>
                         </div>
                     </form>
@@ -224,7 +280,10 @@
             </div>
         </div>
     </div>
+    <!-- 鐢ㄤ簬棰勬覆鏌撳垪琛ㄦ暟鎹� 椤甸潰涓婁笉鏄剧ず -->
+    <div id="TechParamWrapper" style="padding: 10px; display: none;"></div>
 </body>
+
 </html>
 <script>
     var wktag = 0;
@@ -233,6 +292,9 @@
     var HEquipName = "";//璁惧鍚嶇О
     var HSourceID = "";//浜х嚎id
     var HDeptID = "";
+    var Timer = null; // 鏁版嵁璇诲彇瀹氭椂鍣�
+    var EquipTechParamHtml = ''; // 璁惧鍙傛暟寮圭獥娓叉煋html
+    var firstRunning = true;
     layui.config({
         base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
     }).extend({
@@ -441,6 +503,22 @@
     });
     //#endregion
 
+    //#region 鏄剧ず 宸ヨ壓鍙傛暟寮圭獥
+    function showTechParam() {
+        var TechParamPreLoading = document.getElementById("TechParamWrapper").innerHTML
+
+        layer.open({
+            skin: 'layui-layer-rim', //鍔犱笂杈规
+            title: '鏌ョ湅璁惧宸ヨ壓鍙傛暟',
+            type: 1,
+            area: ['80%', '80%'], // 瀹介珮
+            scrollbar: false,
+            content: '<div id="TechParamWrapper-Modal" style="padding: 10px;">' + TechParamPreLoading + '</div>'
+        });
+    }
+    //#endregon
+
+
     //宸ュ崟鍒楄〃閫変腑
     function CheckBtom(obj, i) {
         workcode = $("#gd" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(宸ュ崟鍙�)
@@ -456,15 +534,20 @@
         if (HEquipID != "" && HEquipID != null) {
             wktag = 1;
         }
-        sWhere = {
-            HDeptID: HDeptID
-            , HSourceID: HSourceID
+        // sWhere = {
+        //     HDeptID: HDeptID
+        //     , HSourceID: HSourceID,
+        //     HEquipID: HEquipID
+        // }
+        // FourReport(JSON.stringify(sWhere));
+        if (Timer.isRunning() == true) {
+            Timer.stop()
         }
-        FourReport(JSON.stringify(sWhere));
+        Timer.start()
     }
 
     //鏌ヨ 閮ㄩ棬+浜х嚎 4涓浘琛� 璧嬪��
-    function FourReport(sWhere) {      
+    function FourReport(sWhere) {
         $.ajax({
             url: GetWEBURL() + '/Sc_HEquipStateDistribution/Get_EquipStateDistribution_FourReport',
             type: "GET",
@@ -492,6 +575,8 @@
             }
         });
     }
+
+    window.FourReport = FourReport;
 
     //鏌辩姸鍥�
     function get_Histogram1(mychart11, chartData) {
@@ -654,7 +739,7 @@
         // 鏇存柊鍥捐〃
         mychart22.setOption(option);
     }
- 
+
     //楗煎浘
     function get_Statistics(mychart3, chartData2) {
         // 濡傛灉 chartData2 涓虹┖锛屾彁渚涗竴涓�滄棤鏁版嵁鈥濇彁绀�
@@ -1114,7 +1199,146 @@
         });
     }
 
+    // 璁㈠崟璇诲彇瀹氭椂鍣� 榛樿1鍒嗛挓璇诲彇涓�娆�
+    function TimerClock(interval = 60000, immediate = true) {
+        // 绉佹湁鍙橀噺锛氬瓨鍌ㄥ畾鏃跺櫒ID
+        let timerId = null;
+        // 绉佹湁鍙橀噺锛氳褰曟墽琛屾鏁�
+        let executeCount = 0;
+        // 绉佹湁鍙橀噺锛氭爣璁板畾鏃跺櫒鏄惁姝ｅ湪杩愯
+        let isRunning = false;
+        // 绉佹湁鍙橀噺: 鏍囪瀹氭椂鍣ㄦ槸鍚︾涓�娆″惎鍔紝褰撶涓�娆″惎鍔�(鍗抽�氳繃鐐瑰嚮鍗＄墖鐨勬柟寮忚闂暟鎹椂) 闇�瑕佹樉绀哄姞杞斤紝寮圭獥涓渶瑕侀潤榛樻洿鏂�
 
+        const task = () => {
+            var EmptyHtml = '<div style="Width: 100%; text-align: center; font-size: 46px;">璇ヨ澶囨病鏈夊伐鑹哄弬鏁�</div>'
+            if (firstRunning) {
+                var loadIndex = layui.layer.load(0, { shade: 0.3 });
+            }
+            $.ajax({
+                url: GetWEBURL() + '/Web/getSB_EquipTechParamBillListByEquipID',
+                type: "GET",
+                data: { HEquipID: HEquipID },
+                dataType: "json",
+                success: function (data) {
+                    if (data.code == 1) {
+                        EquipTechParamHtml = "";
+                        data.data.forEach(group => {
+                            EquipTechParamHtml += `<div class="param-group">`;
+                            EquipTechParamHtml += `<div class="group-title">${group['鍒嗙粍鍚嶇О']}</div>`;
+                            EquipTechParamHtml += `<div class="param-list">`;
+                            group['鍙傛暟鍒楄〃'].forEach(param => {
+                                EquipTechParamHtml += `<div class="param-item">${param.HTechParamName}:<span>${param.HResult}</span></div>`;
+                            });
+                            EquipTechParamHtml += `</div></div>`;
+                        });
+
+                        // 璧嬪�肩粰棰勬覆鏌撴ā鐗�
+                        document.getElementById("TechParamWrapper").innerHTML = EquipTechParamHtml
+                        // 璧嬪�肩粰娓叉煋妯℃澘
+                        if (document.getElementById("TechParamWrapper-Modal")) {
+                            document.getElementById("TechParamWrapper-Modal").innerHTML = EquipTechParamHtml
+                        }
+
+                        layui.layer.close(loadIndex);
+                        firstRunning = false
+                    } else {
+                        document.getElementById("TechParamWrapper").innerHTML = EmptyHtml
+                        // 璧嬪�肩粰娓叉煋妯℃澘
+                        if (document.getElementById("TechParamWrapper-Modal")) {
+                            document.getElementById("TechParamWrapper-Modal").innerHTML = EmptyHtml
+                        }
+                        if (firstRunning) {
+                            layui.layer.close(loadIndex);
+                        }
+                    }
+                },
+                error: function (err) {
+                    document.getElementById("TechParamWrapper").innerHTML = EmptyHtml
+                    // 璧嬪�肩粰娓叉煋妯℃澘
+                    if (document.getElementById("TechParamWrapper-Modal")) {
+                        document.getElementById("TechParamWrapper-Modal").innerHTML = EmptyHtml
+                    }
+                    if (firstRunning) {
+                        layui.layer.close(loadIndex);
+                    }
+                    return false;
+                }
+            });
+
+            var sWhere = {
+                HDeptID: HDeptID
+                , HSourceID: HSourceID,
+                HEquipID: HEquipID
+            }
+            window.FourReport(JSON.stringify(sWhere));
+        }
+
+        // 鍚姩瀹氭椂鍣ㄦ柟娉�
+        this.start = function () {
+            // 闃叉閲嶅鍚姩
+            if (isRunning) {
+                console.log('瀹氭椂鍣ㄥ凡鍦ㄨ繍琛屼腑');
+                return;
+            }
+
+            if (immediate) {
+                task();
+            }
+
+            // 璁剧疆瀹氭椂鍣紙interval 姣鎵ц涓�娆★級
+            timerId = setInterval(() => {
+                executeCount++;
+                task();
+                console.log(`瀹氭椂鍣ㄦ墽琛岀 ${executeCount} 娆);
+            }, interval);
+
+            // 鏇存柊鐘舵�佹爣璁�
+            isRunning = true;
+            // document.getElementById('status').textContent = '杩愯涓�';
+            console.log(`瀹氭椂鍣ㄥ凡鍚姩锛岄棿闅旓細${interval} 姣`);
+        };
+
+        // 鍋滄瀹氭椂鍣ㄦ柟娉�
+        this.stop = function () {
+            // 闃叉閲嶅鍋滄
+            if (!isRunning) {
+                console.log('瀹氭椂鍣ㄦ湭杩愯');
+                return;
+            }
+
+            firstRunning = true
+
+            // 娓呴櫎瀹氭椂鍣�
+            clearInterval(timerId);
+            // 閲嶇疆鐘舵��
+            timerId = null;
+            isRunning = false;
+            // document.getElementById('status').textContent = '宸插仠姝�';
+            console.log('瀹氭椂鍣ㄥ凡鍋滄');
+        };
+
+        // 鑾峰彇褰撳墠瀹氭椂鍣ㄧ姸鎬�
+        this.isRunning = function () {
+            return isRunning;
+        };
+    }
+
+
+    // 椤甸潰鍔犺浇瀹屾瘯鍚庤皟鐢�
+    window.addEventListener('load', function () {
+        console.log('椤甸潰鎵�鏈夎祫婧愰兘鍔犺浇瀹屾垚锛�');
+        Timer = new TimerClock()
+        console.log(Timer)
+    });
+
+    // 椤甸潰鍗歌浇鍓嶈皟鐢�
+    window.addEventListener('beforeunload', function (e) {
+        if (Timer) {
+            Timer.stop()
+        }
+
+        delete window.FourReport
+    })
     //#endregion
 
 </script>
\ No newline at end of file
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserList.html"
index 651914f..4384612 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserList.html"
@@ -771,7 +771,10 @@
                     success: function (result) {
                         if (result.count == 1) {
                             if (result.data[0].sWhere == "1") {
-                                res = " and 瀵瑰簲CLOUD缁勭粐 = '" + $("#HUSEORGID").val() + "'";
+                                if ($("#HUSEORGID").val() != "") {
+                                    res = " and 瀵瑰簲CLOUD缁勭粐 = '" + $("#HUSEORGID").val() + "'";
+                                }
+                                
                             } else {
                                 res = result.data[0].sWhere;
                             }
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillSync.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillSync.html"
index 68308a2..f12a593 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillSync.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillSync.html"
@@ -235,7 +235,7 @@
                 set_ClearQuery();
                 get_FastQuery();
                 //鍒濆鍖栬嚜鍔ㄥ悓姝ヤ竴娆�
-                get_InSync_Batch2(option.data);
+                //get_InSync_Batch2(option.data);
             }
 
 

--
Gitblit v1.9.1