From 5e4b414ff8099c24e43ffb1ecbf70554a086f4d6 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 20 五月 2025 20:15:06 +0800
Subject: [PATCH] 工程项目优化

---
 WebTM/WebTM.csproj.user                                 |    2 
 WebTM/views/项目管理/工程项目/PM_ProjectTaskNeedSaveQuery.html  |    2 
 WebTM/views/项目管理/工程项目/PM_ProjectTaskNeedCheckQuery.html |   53 +++++++++++++
 WebTM/views/项目管理/工程项目/PM_ProjectBill.html               |  172 ++++++++++++++++++++++++++++++++++++------
 4 files changed, 202 insertions(+), 27 deletions(-)

diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index e33a50f..980f848 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
     <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠g爜\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
-    <ProjectView>ShowAllFiles</ProjectView>
+    <ProjectView>ProjectFiles</ProjectView>
     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
index 5438af8..aa732af 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
@@ -15,6 +15,7 @@
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/PageTitle.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
     <!--<style>
         .main-btn { /*澶撮儴涓绘寜閽�*/
             padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
@@ -61,11 +62,11 @@
             transition: all 0.3s;
             color: #000 !important; /* 寮哄埗榛戣壊瀛椾綋 */
         }
-        /* 鎮仠鐘舵�� */  
-        .layui-nav-item:hover {
-            background-color: #f8f8f8 !important;
-            color: #000 !important;
-        }
+            /* 鎮仠鐘舵�� */
+            .layui-nav-item:hover {
+                background-color: #f8f8f8 !important;
+                color: #000 !important;
+            }
     </style>
 </head>
 <body>
@@ -818,9 +819,9 @@
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鏄惁缁撹处</label>
-                                            <div class="layui-input-block" style="margin-left: 120px; width: 200px;">
-                                                <input type="checkbox" class="layui-input" name="HIsAccount" lay-verify="HIsAccount" id="HIsAccount" title="鏄�" lay-skin="tag" value="true">
+                                            <label class="layui-form-label" style="width: 85px;">鎶慨寮�濮嬫椂闂�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="datetime-local" step="1" class="layui-input" name="HTaskBTime" lay-verify="HTaskBTime" id="HTaskBTime">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -864,11 +865,12 @@
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">浠诲姟寮�濮嬫椂闂�</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="datetime-local" step="1" class="layui-input" name="HTaskBTime" lay-verify="HTaskBTime" id="HTaskBTime">
+                                            <label class="layui-form-label" style="width: 85px;">鏄惁缁撹处</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 200px;">
+                                                <input type="checkbox" class="layui-input" name="HIsAccount" lay-verify="HIsAccount" id="HIsAccount" title="鏄�" lay-skin="tag" value="true">
                                             </div>
                                         </div>
+                                        
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">宸ヨ垂缁撹处鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
@@ -876,7 +878,7 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">浠诲姟璇︾粏鍐呭</label>
+                                            <label class="layui-form-label" style="width: 85px;">鎶慨璇︾粏鍐呭</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <textarea type="text" class="layui-textarea" name="HTaskNote" lay-verify="HTaskNote" id="HTaskNote"></textarea>
                                             </div>
@@ -928,7 +930,7 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">浠诲姟澶囨敞</label>
+                                            <label class="layui-form-label" style="width: 85px;">澶囨敞锛堥檮灞為」鐩級</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <textarea type="text" class="layui-textarea" name="HTaskRemark" lay-verify="HTaskRemark" id="HTaskRemark"></textarea>
                                             </div>
@@ -957,10 +959,11 @@
                         </div>
 
                     </div>
-                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                    <div class="layui-tab" lay-filter="tab-POStockInBill2" id="TableSub">
                         <ul class="layui-tab-title" lay-filter="tab-all">
                             <li lay-id="1" style="padding:1px;" class="layui-this">椤圭洰闃舵</li>
                             <li lay-id="2" style="padding:1px;">椤圭洰鎴愬憳</li>
+                            <li lay-id="3" style="padding:1px;">椤圭洰鏉愭枡娓呭崟</li>
                         </ul>
                         <div class="layui-tab-content">
                             <!--椤圭洰闃舵-->
@@ -972,7 +975,7 @@
                                         <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></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="btn_up"><i class="layui-icon layui-icon-form"></i>涓婁竴琛�</button>
-                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_under"><i class="layui-icon layui-icon-form"></i>涓嬩竴琛�</button>-->
+                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_under"><i class="layui-icon layui-icon-form"></i>涓嬩竴琛�</button>-->
                                     </div>
                                 </script>
                             </div>
@@ -985,7 +988,16 @@
                                         <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine1"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
                                         <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn1"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                                         <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_up1"><i class="layui-icon layui-icon-form"></i>涓婁竴琛�</button>
-                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_under1"><i class="layui-icon layui-icon-form"></i>涓嬩竴琛�</button>-->
+                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_under1"><i class="layui-icon layui-icon-form"></i>涓嬩竴琛�</button>-->
+                                    </div>
+                                </script>
+                            </div>
+                            <!--椤圭洰鏉愭枡娓呭崟-->
+                            <div class="layui-tab-item">
+                                <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
+                                <script type="text/html" id="toolbarDemo2">
+                                    <div class="layui-btn-container">
+                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2" id="HideColumn2"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                                     </div>
                                 </script>
                             </div>
@@ -1035,9 +1047,11 @@
 
             //妯″潡鍚�
             var HModName = "PM_ProjectBill";
+            var HModName2 = "PM_ProjectTaskNeedCheckQuery_SellOut"
             //琛ㄦ牸娓叉煋鍙傛暟
             var option = {};            //椤圭洰闃舵琛ㄦ覆鏌撳弬鏁�
             var option1 = {};           //椤圭洰鎴愬憳琛ㄦ覆鏌撳弬鏁�
+            var option2 = {};           //椤圭洰鏉愭枡娓呭崟
             //璁板綍缁勭粐鐨勫��
             var HOrgIDBar = 0;
             //鍏ㄥ眬鍙橀噺
@@ -1112,6 +1126,13 @@
                     $('#HTaskAddress, #HBreakStatus').on('input', () => {
                         $('#HProName').val($('#HTaskAddress').val() + $('#HBreakStatus').val());
                     });
+                    //闅愯棌瀛愯〃鐨勯�夐」
+                    // 闅愯棌涓嶉渶瑕佺殑tab鏍囬
+                    $('#TableSub .layui-tab-title li').not(':eq(2)').hide(); // 鍙繚鐣欑涓変釜tab锛堥」鐩潗鏂欐竻鍗曪級
+                    // 榛樿婵�娲荤涓変釜tab
+                    element.tabChange('tab-POStockInBill2', '3'); // 鍒囨崲鍒扮涓変釜tab
+                    // 闅愯棌鍏朵粬tab鍐呭
+                    $('#TableSub .layui-tab-content .layui-tab-item').not(':eq(2)').hide();
                     getCzyglByUser();
                 } else {
                     $("#project_li").hide();
@@ -1186,7 +1207,7 @@
                 //鍒濆鍖栭」鐩樁娈佃〃
                 get_InitGrid1();
                 RoadBillMain(linterid);
-
+                RoadBillSub(linterid);
             }
             //#endregion
 
@@ -1485,7 +1506,7 @@
                 $("#HDate").on('blur', function (data) {
                     HDate = $("#HDate").val();
                     $("#HDate").val(HDate); // 杩欒瀹為檯鍙互鐪佺暐锛屽洜涓哄�兼湭鏀瑰彉
-                    GetHProjectNumber();
+                    GetHProjectNumber(0);
                     console.log("澶辩劍鏃跺�硷細", HDate);
                 });
             });
@@ -1733,6 +1754,16 @@
             });
             //#endregion
 
+            //#region 椤圭洰鏉愭枡娓呭崟
+            table.on('toolbar(mainTable2)', function (obj) {
+                switch (obj.event) {
+                    //鍒楄缃�
+                    case 'set_HideColumn2': get_HideColumnNoPage(HModName2, sessionStorage["HUserName"], option2, function () { });
+                        break;
+
+                };
+            });
+            //#endregion 
             //#region 椤圭洰闃舵琛細琛屽唴浜嬩欢
             table.on('tool(mainTable)', function (obj) {
                 set_GridDelete(obj);   //琛屽唴鍒犻櫎
@@ -1980,6 +2011,88 @@
                 option1.data = rowdata1;
                 table.render(option1);
 
+                option2 = {
+                    elem: '#mainTable2'
+                    , toolbar: '#toolbarDemo2'
+                    , page: true
+                    , limit: 500
+                    , limits: [50, 500, 1000, 2000]
+                    , totalRow: true
+                    , cellMinWidth: 120
+                    , height: 600
+                    , cols: [[]]
+                    , data:[[]]
+                }
+                table.render(option2);
+            }
+            //#endregion
+
+            //#region 鑾峰彇閿�鍞嚭搴撳崟鍒楄〃
+            function RoadBillSub(linterid)//鍔犺浇琛ㄥご
+            {
+                var ajaxLoad = layer.load();//閬僵
+                //鏄庣粏鍒楄〃
+                var sql = "exec h_p_PM_GetSellOutBillListByHProjectID " + linterid;
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+                    type: "GET",
+                    async: false,
+                    data: { "sWhere": sql },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = [];//鍒楀瓧娈垫暟鎹�
+                            var col = [];
+                            var totalArray = [];
+                            var titleData = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(data1.list[key].ColmCols)) {
+                                    titleData[key] = data1.list[key].ColmCols;
+                                }
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+                            for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, titleData) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑  //璁$畻鍒�
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else if ($.inArray(data[i].name, totalArray) > -1) { //璁$畻鍒�  
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120, filter: true });
+                                } else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, filter: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, filter: true });
+                                    }
+                                }
+                            }
+                            option2.cols = [col];
+                            option2.data = data1.data;
+                            //缁熻鏉愭枡璐�
+                            //let totalAmount = data1.data.reduce((accumulator, currentValue) => {
+                            //    return accumulator + currentValue.閲戦;
+                            //}, 0);
+                            //$("#HTaskMaterMoney").val(totalAmount);
+                            //鍒楄缃�
+                            DisPlay_HideColumn(HModName2, sessionStorage["HUserName"], option2, titleData);
+                            table.render(option2);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                            layer.close(ajaxLoad);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        layer.close(ajaxLoad);
+                    }
+                });
             }
             //#endregion
 
@@ -2697,7 +2810,7 @@
                         $("#HTaskClassNumber").val(checkStatus.data[0].浠诲姟绫诲埆浠g爜);                       
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                         //鏇存柊椤圭洰浠g爜
-                        GetHProjectNumber();
+                        GetHProjectNumber(0);
                     }
                     , btn2: function (index, layero) { }
                     , end: function () {
@@ -2706,7 +2819,7 @@
                             $("#HTaskClassName").val(TaskData.浠诲姟绫诲埆鍚嶇О);
                             $("#HTaskClassNumber").val(TaskData.浠诲姟绫诲埆浠g爜);
                             //鏇存柊椤圭洰浠g爜
-                            GetHProjectNumber();
+                            GetHProjectNumber(0);
                         }
                         TaskData = [];
                     }
@@ -2739,7 +2852,7 @@
                         $("#HTaskClassEntryName").val(checkStatus.data[0].浠诲姟绫诲埆鍚嶇О);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                         //鏇存柊椤圭洰浠g爜
-                        GetHProjectNumber();
+                        GetHProjectNumber(0);
                     }
                     , btn2: function (index, layero) { }
                     , end: function () {
@@ -2747,7 +2860,7 @@
                             $("#HTaskClassEntryID").val(TaskData.HItemID);
                             $("#HTaskClassEntryName").val(TaskData.浠诲姟绫诲埆鍚嶇О);
                             //鏇存柊椤圭洰浠g爜
-                            GetHProjectNumber();
+                            GetHProjectNumber(0);
                         }
                         TaskData = [];
                     }
@@ -2802,6 +2915,8 @@
                         if (data.count == 1) {
                             $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
                             layer.close(index);
+                            //鏂板缂栫爜娴佹按鍙�
+                            GetHProjectNumber(1);
                             layer.msg("鎻愪氦鎴愬姛");
                         }
                         else {
@@ -2906,6 +3021,13 @@
                             $("#item_li").hide();
                             $("#task_li").addClass("layui-this");
                             $("#task_tab").addClass("layui-show");
+                            //闅愯棌瀛愯〃鐨勯�夐」
+                            // 闅愯棌涓嶉渶瑕佺殑tab鏍囬
+                            $('#TableSub .layui-tab-title li').not(':eq(2)').hide(); // 鍙繚鐣欑涓変釜tab锛堥」鐩潗鏂欐竻鍗曪級
+                            // 榛樿婵�娲荤涓変釜tab
+                            element.tabChange('tab-POStockInBill2', '3'); // 鍒囨崲鍒扮涓変釜tab
+                            // 闅愯棌鍏朵粬tab鍐呭
+                            $('#TableSub .layui-tab-content .layui-tab-item').not(':eq(2)').hide();
                         } else {
                             $("#project_li").hide();
                             $("#task_li").hide();
@@ -3281,14 +3403,14 @@
             //#endregion
 
             //#region 锛堜换鍔$被锛夌殑宸ョ▼椤圭洰鏂板
-            //浠诲姟澶х被 浠诲姟椤圭洰鍒嗙被 鏃ユ湡 鍙樺寲鏃讹紝鏇存柊 椤圭洰浠g爜
+            //浠诲姟澶х被 浠诲姟椤圭洰鍒嗙被 鏃ユ湡 鍙樺寲鏃讹紝鏇存柊 椤圭洰浠g爜锛圱ype涓�0鏃跺彧鑾峰彇涓嶆柊澧炴祦姘村彿锛屼负1鏃舵柊澧炰笖鑾峰彇娴佹按鍙凤級
 
-            function GetHProjectNumber() {
+            function GetHProjectNumber(HType) {
                 $.ajax({
                     url: GetWEBURL() + '/PM_ProjectBill/GetHProjectHNumber',
                     type: "GET",
                     async: false,
-                    data: { "HDeptID": $("#HDeptID").val(), "HDate": $("#HDate").val(), "HTaskClassID": $("#HTaskClassID").val(), "HTaskClassEntryID": $("#HTaskClassEntryID").val()},
+                    data: { "HDeptID": $("#HDeptID").val(), "HDate": $("#HDate").val(), "HTaskClassID": $("#HTaskClassID").val(), "HTaskClassEntryID": $("#HTaskClassEntryID").val(), "HType":HType },
                     success: function (data1) {
                         if (data1.count == 1) {
                             var data = data1.data[0];
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedCheckQuery.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedCheckQuery.html"
index 51202cd..bfe1bed 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedCheckQuery.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedCheckQuery.html"
@@ -45,6 +45,7 @@
                                             <div class="layui-btn-container">
                                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></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="btn-MoneyDeSave" id="MoneyDeSave"><i class="layui-icon layui-icon-circle"></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>
@@ -141,6 +142,7 @@
                                             <script type="text/html" id="toolbarDemo">
                                                 <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
                                                     <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                                    
                                                 </div>
                                             </script>
                                         </div>
@@ -212,6 +214,10 @@
                     //鍒楄缃�
                     case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], optionNeedCheck, get_FastQuery);
                         break;
+                    //璐圭敤鍙嶄繚瀛樻寜閽�
+                    case 'btn-MoneyDeSave':
+                        set_SaveMoneyBill();
+                        break;
                 };
             });
             table.on('toolbar(mainTable)', function (obj) {
@@ -235,6 +241,7 @@
             //#region 瀹℃牳
             form.on('submit(btnCheckSetupMoney)', function (data) {
                 set_CheckBill("SetupMoneyCheck");
+                set_CheckBill("OtherMoneyCheck");//瀹℃牳瀹夎闄勫睘璐�
                 $('#btnCheckSetupMoney').prop('disabled', true).addClass('layui-btn-disabled');
             });
             form.on('submit(btnCheckOtherMoney)', function (data) {
@@ -259,7 +266,12 @@
                 $('tr').attr({ "style": "background:" });
                 $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
                 //obj.tr.find('.layui-form-radio').addClass('layui-form-radioed');
-                
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTableNeedCheck, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
                 //鏄剧ず椤圭洰淇℃伅
                 RoadBillMain(obj.data["HInterID"]);
                 
@@ -564,6 +576,45 @@
             }
             //#endregion
 
+            //#region 璐圭敤鍙嶄繚瀛樻暟鎹�
+            function set_SaveMoneyBill() {
+                var checkStatus = table.checkStatus('mainTableNeedCheck')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HInterID.toString();
+                    var params = get_UrlVars();
+                    var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡
+                    var sql = "exec h_p_PM_ProjectBillUnSaveMoney " + HInterID + ",'" + openType+"'"
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/CommonModel/searchMethod", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck":"Pm_ProjectBill_edit" },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.data[0].message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    get_FastQuery();
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹┏鍥烇紒');
+                }
+            }
+            //#endregion
+
             //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
             function addSWhereByOpenType() {
                 //鑾峰彇鍙傛暟
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedSaveQuery.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedSaveQuery.html"
index a638680..3abafeb 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedSaveQuery.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedSaveQuery.html"
@@ -247,6 +247,7 @@
             //#region 淇濆瓨
             form.on('submit(btnSaveSetupMoney)', function (data) {
                 set_SaveBill("SetupMoneySave", $("#HTaskSetupMoney").val() == "" ? 0 : $("#HTaskSetupMoney").val());
+                set_SaveBill("OtherMoneySave", $("#HTaskOtherMoney").val() == "" ? 0 : $("#HTaskOtherMoney").val());//瀹夎瀹℃牳璐逛繚瀛�
                 $('#btnSaveSetupMoney').prop('disabled', true).addClass('layui-btn-disabled');
             });
             form.on('submit(btnSaveOtherMoney)', function (data) {
@@ -736,6 +737,7 @@
                 if (openType == "SetupMoney") {
                     $('#btnSaveSetupMoney').show();
                     $('#btnSearchHTaskSetupMoney').show();
+                    $('#btnSearchHTaskOtherMoney').show();
                     //titleData.push("浠诲姟宸ヨ垂瀹℃牳");
                     //titleData.push("浠诲姟鑰冩牳璐瑰鏍�");
                     //titleData.push("浠诲姟闄勫睘璐瑰鏍�");

--
Gitblit v1.9.1