From 95ec1b95e97ab255af611d628ce3c6af026dbdc8 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 17 七月 2023 10:00:20 +0800
Subject: [PATCH] 项目管理:数据关联、 项目工程:下推(阶段汇报)、下推(任务汇报)

---
 WebTM/views/项目管理/项目阶段/PM_ProjectStageBill.html   |   26 ++
 WebTM/views/项目管理/工程项目/PM_ProjectBillList.html    |   69 +++++++
 WebTM/views/项目管理/工程项目/PM_ProjectBill.html        |  165 +++++++++++++++++
 WebTM/views/项目管理/项目阶段/PM_ProjectReportBill.html  |  159 ++++++++++++++++
 WebTM/views/项目管理/工作任务/PM_WorkTaskBill.html       |   19 +
 WebTM/views/项目管理/工作任务/PM_WorkTaskReportBill.html |   90 ++++++++-
 6 files changed, 498 insertions(+), 30 deletions(-)

diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html"
index e3c38b5..90cee70 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html"
@@ -591,8 +591,18 @@
                             return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
                         }
 
-                        $("#HProNumber").val(checkStatus.data[0].HProNumber);//宸ョ▼椤圭洰浠g爜
-                        $("#HProName").val(checkStatus.data[0].HProName);//宸ョ▼椤圭洰浠g爜
+                        //鍒ゆ柇椤圭洰鏄惁鍏抽棴
+                        if (checkStatus.data[0].鍏抽棴浜� == null || checkStatus.data[0].鍏抽棴浜� == "") {
+                            $("#HProNumber").val(checkStatus.data[0].椤圭洰浠g爜);//宸ョ▼椤圭洰浠g爜
+                            $("#HProName").val(checkStatus.data[0].椤圭洰鍚嶇О);//宸ョ▼椤圭洰浠g爜
+                            $("#HProjectStageID").val(checkStatus.data[0].HProjectStageID);//宸ョ▼椤圭洰浠g爜
+                            $("#HProjectStageName").val(checkStatus.data[0].椤圭洰闃舵);//宸ョ▼椤圭洰浠g爜
+                        } else {
+                            layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
+                        }
+
+
+                        
                         layer.close(index);//鍏抽棴寮圭獥
                     }
                     , btn2: function (index, layero) { }
@@ -623,10 +633,7 @@
                         }
 
                         $("#HProjectStageID").val(checkStatus.data[0].HItemID);//椤圭洰闃舵id
-                        $("#HProjectStageName").val(checkStatus.data[0].HName);//椤圭洰闃舵鍚嶇О
-                        if ($("#HProjectStageName").val() == "") {
-                            $("#HProjectStageName").val(checkStatus.data[0].HNumber);
-                        }
+                        $("#HProjectStageName").val(checkStatus.data[0].闃舵鍚嶇О);//椤圭洰闃舵鍚嶇О
                         layer.close(index);//鍏抽棴寮圭獥
                     }
                     , btn2: function (index, layero) { }
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskReportBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskReportBill.html"
index ab3f37c..9efdef5 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskReportBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskReportBill.html"
@@ -116,6 +116,16 @@
                                             </div>
                                         </div>
                                     </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+                                                <input type="hidden" name="HProID" id="HProID" lay-verify="HProID" value="0">
+                                                <input type="hidden" name="HProjectStageID" id="HProjectStageID" lay-verify="HProjectStageID" value="0">
+                                                <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" lay-verify="HMainSourceBillType" value="0">
+                                                <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" lay-verify="HMainSourceBillNo" value="0">
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                             <!--鍏朵粬淇℃伅-->
@@ -269,6 +279,7 @@
             var params = getUrlVars();
             var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫
             var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            var HProjectStageID = params[params[3]]; //闃舵鍐呯爜
 
             //#endregion
 
@@ -328,6 +339,20 @@
                 //鍒濆鍖栭」鐩樁娈佃〃
                 get_InitGrid();
                 RoadBillMain(linterid);
+            } else if (OperationType == 4 && HProjectStageID != null) {
+                //绂佺敤缁勭粐閫夐」
+                $("#HOrgID").attr("disabled", true);
+                //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
+                createBillNo();
+                //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栨棩鏈�
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栭」鐩樁娈佃〃
+                get_InitGrid();
+                //涓嬫帹-椤甸潰璁剧疆
+                set_WorkTaskReport();
             }
             //#endregion
 
@@ -576,9 +601,9 @@
                         { type: 'checkbox', totalRowText: '鍚堣琛�' }
                         , { type: 'numbers', title: '搴忓彿', totalRow: true }
                         , { field: 'RowID', title: '琛屽彿', hide: true }                                                   //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
-                        , { field: 'HProNumber', title: '椤圭洰浠g爜', edit: 'text', event: "HProNumber" }
+                        , { field: 'HProNumber', title: '椤圭洰浠g爜'}
                         , { field: 'HProjectStageID', title: '椤圭洰闃舵ID', hide: true }
-                        , { field: 'HProjectStageName', title: '椤圭洰闃舵', edit: 'text', event: "HProjectStageName" }     //f7
+                        , { field: 'HProjectStageName', title: '椤圭洰闃舵' }     //f7
                         , { field: 'HName', title: '浠诲姟鍚嶇О', edit: 'text', event: "HName" }
                         , { field: 'HTaskNote', title: '浠诲姟鎻忚堪' }
                         , { field: 'HType', title: '浠诲姟绫诲瀷'}
@@ -733,6 +758,43 @@
                         HOrgIDBar = tableMain[0]["HOrgID"];
 
                         //瀛愯〃  璧嬪��
+                        for (var i = 0; i < tableSub.length; i++) {
+                            tableSub[i].RowID = (i + 1) * 10;
+                        }
+                        option.data = tableSub;
+                        table.render(option);
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 涓嬫帹-椤甸潰璧嬪��
+            function set_WorkTaskReport() {
+                $.ajax({
+                    url: GetWEBURL() + "/PM_ProjectBill/set_WorkTaskReport",
+                    type: "GET",
+                    async: false,
+                    data: { "HInterID": linterid, "HProjectStageID": HProjectStageID, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        var tableMain = result.data[0];
+                        var tableSub = result.data[1];
+
+                        //涓昏〃 璧嬪��
+                        form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                            "HOrgID": tableMain[0]["HOrgID"]
+                            , "HProID": tableMain[0]["HInterID"]
+                            , "HProjectStageID": tableMain[0]["HProjectStageID"]
+                            , "HMainSourceBillNo": tableMain[0]["鍗曟嵁鍙�"]
+                            , "HMainSourceBillType": tableMain[0]["鍗曟嵁绫诲瀷"]
+                        });
+
+                        //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
+                        HOrgIDBar = tableMain[0]["HOrgID"];
+
+                        //瀛愯〃  璧嬪��
+                        for (var i = 0; i < tableSub.length; i++) {
+                            tableSub[i].RowID = (i + 1) * 10;
+                        }
                         option.data = tableSub;
                         table.render(option);
                     }
@@ -983,7 +1045,7 @@
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
                                         "HProjectStageID": checkStatus.data[0].HItemID
-                                        , "HProjectStageName": checkStatus.data[0].HName
+                                        , "HProjectStageName": checkStatus.data[0].闃舵鍚嶇О
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
@@ -1012,7 +1074,7 @@
                                     }
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
-                                        "HProNumber": checkStatus.data[0].HProNumber
+                                        "HProNumber": checkStatus.data[0].椤圭洰浠g爜
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
@@ -1040,12 +1102,20 @@
                                     if (checkStatus.data.length != 1) {
                                         return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
                                     }
-                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
-                                    obj.update({
-                                        "HName": checkStatus.data[0].HName
-                                        , "HTaskNote": checkStatus.data[0].HTaskNote
-                                        , "HType": checkStatus.data[0].HType
-                                    })
+
+                                    if (checkStatus.data[0].鍏抽棴浜� == null || checkStatus.data[0].鍏抽棴浜� == "") {
+                                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                        obj.update({
+                                            "HName": checkStatus.data[0].浠诲姟鍚嶇О
+                                            , "HTaskNote": checkStatus.data[0].浠诲姟鎻忚堪
+                                            , "HType": checkStatus.data[0].浠诲姟绫诲瀷
+                                            , "HProNumber": checkStatus.data[0].椤圭洰浠g爜
+                                            , "HProjectStageID": checkStatus.data[0].HProjectStageID
+                                            , "HProjectStageName": checkStatus.data[0].椤圭洰闃舵
+                                        })
+                                    } else {
+                                        layer.msg("璇ヤ换鍔″凡鍏抽棴锛岃閲嶆柊閫夋嫨!");
+                                    }
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
                                 , btn2: function (index, layero) { }
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 f183d6c..693b357 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"
@@ -174,9 +174,13 @@
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">澶囨敞<label style="color:red"> * </label></label>
-                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
-                                                <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">椤圭洰闃舵娓呭崟</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" lay-verify="HProjectStageBillNumber" name="HProjectStageBillNumber" id="HProjectStageBillNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" name="HProjectStageBillInterID" id="HProjectStageBillInterID" lay-verify="HProjectStageBillInterID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProjectStageBill" id="btnSearchHProjectStageBill" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -194,6 +198,14 @@
                                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHPayCus" id="btnSearchHPayCus" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">澶囨敞<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+                                                <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
                                             </div>
                                         </div>
                                     </div>
@@ -552,6 +564,12 @@
             });
             //#endregion
 
+            //#region 閫夋嫨椤圭洰闃舵娓呭崟鎸夐挳
+            form.on('submit(btnSearchHProjectStageBill)', function () {
+                get_checkSearchHProjectStageBill();
+            });
+            //#endregion
+
             //#endregion
 
             //#region 澶嶉�夋 閫変腑/鍙栨秷 瑙﹀彂浜嬩欢
@@ -656,6 +674,7 @@
                         table.cache["mainTable"].push(NewRow);
                         option.data = table.cache["mainTable"];
                         table.render(option);
+                        CheckedSet_tableSub();
                         break;
                     case 'btn-CopyLine':
                         var copydata = JSON.stringify(data);
@@ -671,6 +690,7 @@
                             table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
                             option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
                             table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            CheckedSet_tableSub();
                         }
                         break;
                     //鍒楄缃�
@@ -680,10 +700,12 @@
                     //涓婁竴琛�
                     case 'btn_up':
                         btn_up(data);
+                        CheckedSet_tableSub();
                         break;
                     //涓嬩竴琛�
                     case 'btn_under':
                         btn_under(data);
+                        CheckedSet_tableSub();
                         break;
                 }
             });
@@ -711,6 +733,7 @@
                         table.cache["mainTable1"].push(NewRow);
                         option1.data = table.cache["mainTable1"];
                         table.render(option1);
+                        CheckedSet_tableSub_Emp();
                         break;
                     case 'btn-CopyLine1':
                         var copydata = JSON.stringify(data);
@@ -726,6 +749,7 @@
                             table.cache["mainTable1"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
                             option1.data = table.cache["mainTable1"];//灏嗘暟鎹粦瀹氬埌data涓�
                             table.render(option1);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            CheckedSet_tableSub_Emp();
                         }
                         break;
                     //鍒楄缃�
@@ -735,10 +759,12 @@
                     //涓婁竴琛�
                     case 'btn_up1':
                         btn_up1(data);
+                        CheckedSet_tableSub_Emp();
                         break;
                     //涓嬩竴琛�
                     case 'btn_under1':
                         btn_under1(data);
+                        CheckedSet_tableSub_Emp();
                         break;
                 }
             });
@@ -760,6 +786,7 @@
                             data[field] = nowDate;
                             obj.update(data);
                             checkRefresh();
+                            CheckedSet_tableSub();
                         }
                     });
                 }
@@ -1163,6 +1190,91 @@
             }
             //#endregion
 
+            //#region 椤圭洰闃舵娓呭崟閫夋嫨椤甸潰
+            function get_checkSearchHProjectStageBill() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '椤圭洰闃舵娓呭崟鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../椤圭洰绠$悊/椤圭洰闃舵/PM_ProjectStageBillList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        //椤圭洰闃舵娓呭崟璁剧疆
+                        $("#HProjectStageBillInterID").val(checkStatus.data[0].HInterID);//瀹㈡埛id
+                        $("#HProjectStageBillNumber").val(checkStatus.data[0].鍗曟嵁鍙�);//瀹㈡埛鍚嶇О
+
+
+                        //鑾峰彇鏁版嵁
+                        var HBillInterID = checkStatus.data[0].HInterID;
+                        //鑾峰彇椤圭洰闃舵娓呭崟涓殑椤圭洰闃舵鍒楄〃
+                        $.ajax({
+                            url: GetWEBURL() + "/PM_ProjectStageBill/editInit",
+                            type: "GET",
+                            async: false,
+                            data: { "HInterID": HBillInterID, "user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                var tableMain = result.data[0];
+                                var tableSub = result.data[1];
+                                //鍚堝苟鐜版湁瀛愯〃鏁版嵁鍜岄」鐩樁娈垫竻鍗曠殑鏁版嵁
+                                var num = [];
+                                var len = 0;        //璁板綍num闀垮害锛岀敤浜庝綔涓篟owID鐨勭郴鏁帮紝涓篟owID鐨勮祴鍊�
+                                for (var i = 0; i < tableSub.length; i++) {
+                                    var NewRow =
+                                    {
+                                        "RowID": (i + 1) * 10
+                                        , 'HProjectStageID': tableSub[i]["HProjectStageID"]
+                                        , 'HProjectStageName': tableSub[i]["HProjectStageName"]
+                                        , 'HStageNote': tableSub[i]["HStageNote"]
+                                        , 'HPMGoodsID': (tableSub[i]["HPMGoodsID"] != null) ? tableSub[i]["HPMGoodsID"] : '0'
+                                        , 'HPMGoodsName': tableSub[i]["HPMGoodsName"]
+                                        , 'HIsKey': tableSub[i]["HIsKey"]
+                                        , 'HRate': tableSub[i]["HRate"]
+                                        , 'HEmpID': '0'
+                                        , 'HEmpName': ''
+                                        , 'HCheckEmpID': '0'
+                                        , 'HCheckEmpName': ''
+                                        , 'HFinishDate': ''
+                                        , 'HWorkDays': '0'
+                                        , 'HRemarkSub': tableSub[i]["HRemarkSub"]
+                                    };
+                                    num.push(NewRow);
+                                }
+                                len = num.length;
+                                for (var i = 0; i < option.data.length; i++) {
+                                    option.data[i].RowID = (len + i + 1) * 10;
+                                    num.push(option.data[i]);
+                                }
+                                
+                                
+                                //瀛愯〃  璧嬪��
+                                option.data = num;
+                                table.render(option);
+
+                                //瀵瑰瓙琛ㄤ腑鐨勫閫夋杩涜閫変腑
+                                for (var i = 0; i < num.length; i++) {
+                                    if (num[i].HIsKey) {
+                                        $('#HIsKey' + (i + 1)).attr("checked", true);
+                                    }
+                                }
+                                form.render('checkbox');
+                            }
+                        })
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+
             //#region 淇濆瓨HMaker
             function set_AddNew(data) {
                 //鑾峰彇椤圭洰闃舵琛ㄦ暟鎹�
@@ -1286,9 +1398,12 @@
                         });
                         //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
                         HOrgIDBar = tableMain[0]["HOrgID"];
+
+                        //娓叉煋椤圭洰闃舵琛�
                         //璁剧疆椤圭洰闃舵琛ㄥ畬鎴愭棩鏈熺殑鏍煎紡
                         for (var i = 0; i < tableSub.length; i++) {
                             tableSub[i]["HFinishDate"] = Format(new Date(tableSub[i]["HFinishDate"]), "yyyy-MM-dd");
+                            tableSub[i].RowID = (i + 1) * 10;
                         }
                         option.data = tableSub;
                         table.render(option);
@@ -1299,6 +1414,11 @@
                             }
                         }
                         form.render('checkbox');
+
+                        //娓叉煋椤圭洰鎴愬憳琛�
+                        for (var i = 0; i < tableSub_Emp.length; i++) {
+                            tableSub_Emp[i].RowID = (i + 1) * 10;
+                        }
                         option1.data = tableSub_Emp;
                         table.render(option1);
                         //瀵瑰瓙琛ㄤ腑鐨勯」鐩粡鐞嗗閫夋杩涜閫変腑
@@ -1602,6 +1722,7 @@
                             option.data[i - 1] = data[0];
                             option.data[i] = tables[0];
                             table.render(option);
+                            CheckedSet_tableSub();
                             break;
                         }
                     }
@@ -1624,6 +1745,7 @@
                             option1.data[i - 1] = data[0];
                             option1.data[i] = tables[0];
                             table.render(option1);
+                            CheckedSet_tableSub_Emp
                             break;
                         }
                     }
@@ -1646,6 +1768,7 @@
                             option.data[i + 1] = data[0];
                             option.data[i] = tables[0];
                             table.render(option);
+                            CheckedSet_tableSub();
                             break;
                         }
                     }
@@ -1668,6 +1791,7 @@
                             option1.data[i + 1] = data[0];
                             option1.data[i] = tables[0];
                             table.render(option1);
+                            CheckedSet_tableSub_Emp
                             break;
                         }
                     }
@@ -1689,6 +1813,7 @@
                             oldData.splice(obj.tr.data('index'), 1)
                             option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
                             table.render(option);
+                            CheckedSet_tableSub();
                             layer.close(index);
                         }
                     });
@@ -1710,6 +1835,7 @@
                             oldData.splice(obj.tr.data('index'), 1)
                             option1.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
                             table.render(option1);
+                            CheckedSet_tableSub_Emp();
                             layer.close(index);
                         }
                     });
@@ -1745,8 +1871,8 @@
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
                                         "HProjectStageID": checkStatus.data[0].HItemID
-                                        , "HProjectStageName": checkStatus.data[0].HName
-                                        , "HStageNote": checkStatus.data[0].HStageNote
+                                        , "HProjectStageName": checkStatus.data[0].闃舵鍚嶇О
+                                        , "HStageNote": checkStatus.data[0].椤圭洰闃舵璇︾粏鍐呭
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
@@ -1980,8 +2106,10 @@
                                 }
                             }
                             table.render(option);
+                            CheckedSet_tableSub();
                         } else {
                             table.render(option);
+                            CheckedSet_tableSub();
                         }
                     }, error: function () {
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
@@ -2102,8 +2230,10 @@
                                 }
                             }
                             table.render(option1);
+                            CheckedSet_tableSub_Emp();
                         } else {
                             table.render(option1);
+                            CheckedSet_tableSub_Emp();
                         }
                     }, error: function () {
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
@@ -2112,6 +2242,31 @@
             }
             //#endregion
 
+            //#region 椤圭洰闃舵琛�-鍒锋柊璁剧疆澶嶉�夋鐘舵��
+            function CheckedSet_tableSub() {
+                var tableSub = option.data;
+                //瀵瑰瓙琛ㄤ腑鐨勫閫夋杩涜閫変腑
+                for (var i = 0; i < tableSub.length; i++) {
+                    if (tableSub[i].HIsKey) {
+                        $('#HIsKey' + (i + 1)).attr("checked", true);
+                    }
+                }
+                form.render('checkbox');
+            }
+            //#endregion
+            //#region 椤圭洰鎴愬憳琛�-鍒锋柊璁剧疆澶嶉�夋鐘舵��
+            function CheckedSet_tableSub_Emp() {
+                var tableSub_Emp = option1.data;
+                //瀵瑰瓙琛ㄤ腑鐨勯」鐩粡鐞嗗閫夋杩涜閫変腑
+                for (var i = 0; i < tableSub_Emp.length; i++) {
+                    if (tableSub_Emp[i].HIsPM) {
+                        $('#HIsPM' + (i + 1)).attr("checked", true);
+                    }
+                }
+                form.render('checkbox');
+            }
+            //#endregion
+
             //#region 椤圭洰闅炬槗绫诲瀷涓嬫媺妗�
             function ColFilter() {
                 var Organization = "";
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_ProjectBillList.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_ProjectBillList.html"
index c509938..72deb83 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_ProjectBillList.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_ProjectBillList.html"
@@ -108,6 +108,8 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ProjectReport"><i class="layui-icon layui-icon-radio"></i>涓嬫帹(闃舵姹囨姤)</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_WorkTaskReport"><i class="layui-icon layui-icon-radio"></i>涓嬫帹(浠诲姟姹囨姤)</button>
                                 <!--<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>
@@ -193,6 +195,14 @@
                     //鍙嶄綔搴熸寜閽�
                     case 'btn-DeDrop':
                         set_DropBill(2);
+                        break;
+                    //涓嬫帹(闃舵姹囨姤)
+                    case 'set_ProjectReport':
+                        set_ProjectReport();
+                        break;
+                    //涓嬫帹(浠诲姟姹囨姤)
+                    case 'set_WorkTaskReport':
+                        set_WorkTaskReport();
                         break;
                     ////绂佺敤鎸夐挳
                     //case 'btn-Stop':
@@ -692,6 +702,65 @@
             }
             //#endregion
 
+            //#region 涓嬫帹(闃舵姹囨姤)
+            function set_ProjectReport() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HInterID.toString();
+                    var HProjectStageID = data[0].HProjectStageID;
+                    layer.open({
+                        type: 2
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['100%', '100%']
+                        , title: '椤圭洰闃舵姹囨姤-涓嬫帹'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../椤圭洰绠$悊/椤圭洰闃舵/PM_ProjectReportBill.html?OperationType=4&linterid=' + InterID + '&HSouceBillType=' + '&HProjectStageID=' + HProjectStageID
+                        , btn: ['纭畾'],
+                        // 鎸夐挳1 鐨勫洖璋�
+                        btn1: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            window.location.reload();
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 涓嬫帹(浠诲姟姹囨姤)
+            function set_WorkTaskReport() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                var InterID = data[0].HInterID.toString();
+                var HProjectStageID = data[0].HProjectStageID;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HInterID.toString();
+                    layer.open({
+                        type: 2
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['100%', '100%']
+                        , title: '浠诲姟姹囨姤-涓嬫帹'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../椤圭洰绠$悊/宸ヤ綔浠诲姟/PM_WorkTaskReportBill.html?OperationType=4&linterid=' + InterID + '&HSouceBillType=' + '&HProjectStageID=' + HProjectStageID
+                        , btn: ['纭畾'],
+                        // 鎸夐挳1 鐨勫洖璋�
+                        btn1: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            window.location.reload();
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+                
+            }
+            //#endregion
+
+
             //#region 闅愯棌鍒楄缃�
             function get_HideColumn() {
                 var colName = "";
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectReportBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectReportBill.html"
index 3bce5da..2a04d0f 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectReportBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectReportBill.html"
@@ -97,7 +97,9 @@
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">椤圭洰浠g爜*</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" lay-verify="HProNumber" name="HProNumber" id="HProNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <!--<input type="hidden" name="HProjectStageID" id="HProjectStageID" lay-verify="HProjectStageID" value="0">-->
+                                                <input type="hidden" name="HProID" id="HProID" lay-verify="HProID" value="0">
+                                                <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" lay-verify="HMainSourceBillType" value="0">
+                                                <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" lay-verify="HMainSourceBillNo" value="0">
                                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProNumber" id="btnSearchHProNumber" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
@@ -365,6 +367,7 @@
             var params = getUrlVars();
             var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫
             var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            var HProjectStageID = params[params[3]];
 
             //#endregion
 
@@ -424,6 +427,24 @@
                 //鍒濆鍖栭」鐩樁娈佃〃
                 get_InitGrid1();
                 RoadBillMain(linterid);
+            } else if (OperationType == 4 && HProjectStageID != null) {
+                //绂佺敤缁勭粐閫夐」
+                $("#HOrgID").attr("disabled", true);
+                OperationType = 4;
+                //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
+                createBillNo();
+
+                //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+                //鍒濆鍖栨棩鏈�
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栭」鐩樁娈佃〃
+                get_InitGrid1();
+                //涓嬫帹-椤甸潰璁剧疆
+                set_ProjectReport_Display();
+
             }
             //#endregion
 
@@ -555,6 +576,7 @@
                         table.cache["mainTable"].push(NewRow);
                         option.data = table.cache["mainTable"];
                         table.render(option);
+                        CheckedSet_tableSub_Emp();
                         break;
                     case 'btn-CopyLine':
                         var copydata = JSON.stringify(data);
@@ -570,6 +592,7 @@
                             table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
                             option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
                             table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            CheckedSet_tableSub_Emp();
                         }
                         break;
                     //鍒楄缃�
@@ -579,10 +602,12 @@
                     //涓婁竴琛�
                     case 'btn_up':
                         btn_up(data);
+                        CheckedSet_tableSub_Emp();
                         break;
                     //涓嬩竴琛�
                     case 'btn_under':
                         btn_under(data);
+                        CheckedSet_tableSub_Emp();
                         break;
                 }
             });
@@ -761,8 +786,63 @@
                         if (checkStatus.data.length != 1) {
                             return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
                         }
+                        //璁剧疆琛ㄥご鏁版嵁
+                        //璁剧疆鏂囨湰妗嗗��
+                        $("#HProNumber").val(checkStatus.data[0].椤圭洰浠g爜);//宸ョ▼椤圭洰浠g爜
+                        $("#HProjectStageID").val(checkStatus.data[0].HProjectStageID);//宸ョ▼椤圭洰浠g爜
+                        $("#HProjectStageName").val(checkStatus.data[0].椤圭洰闃舵);//宸ョ▼椤圭洰浠g爜
+                        $("#HStageNote").val(checkStatus.data[0].椤圭洰闃舵璇︾粏鍐呭);//宸ョ▼椤圭洰浠g爜
+                        $("#HPMGoodsID").val(checkStatus.data[0].HPMGoodsID);//宸ョ▼椤圭洰浠g爜
+                        $("#HRelationGoods").val(checkStatus.data[0].闃舵鐩稿叧浜や粯鐗�);//宸ョ▼椤圭洰浠g爜
+                        $("#HIsKey").val((checkStatus.data[0].閲岀▼纰�=='Y'?true:false));//宸ョ▼椤圭洰浠g爜
+                        $("#HRate").val(checkStatus.data[0].闃舵涓氱哗鍗犳瘮);//宸ョ▼椤圭洰浠g爜
 
-                        $("#HProNumber").val(checkStatus.data[0].HProNumber);//宸ョ▼椤圭洰浠g爜
+                        //璁剧疆澶嶉�夋閫変腑鐘舵��
+                        if ($("#HIsKey").val() == "true") {
+                            $("#checkboxHIsKey").attr("checked", true);
+                            form.render("checkbox");
+                        } else {
+                            $("#checkboxHIsKey").attr("checked", false);
+                            form.render("checkbox");
+                        }
+                        //璁剧疆琛ㄤ綋鏁版嵁
+                        var HBillInterID = checkStatus.data[0].HInterID;
+                        $.ajax({
+                            url: GetWEBURL() + "/PM_ProjectBill/editInit",
+                            type: "GET",
+                            async: false,
+                            data: { "HInterID": HBillInterID, "user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                //鑾峰彇鏁版嵁搴撲腑璇ラ」鐩殑椤圭洰鎴愬憳鏁版嵁
+                                var tableSub_Emp = result.data[2];
+                                //鏍规嵁琛ㄤ綋鍒楋紝濉厖琛ㄤ綋鏁版嵁
+                                var num = [];
+                                for (var i = 0; i < tableSub_Emp.length; i++) {
+                                    var rowdata = 
+                                        {
+                                            "RowID": (i + 1) * 10
+                                            , 'HEmpID': tableSub_Emp[i]["HEmployeeID"]
+                                            , 'HEmpName': tableSub_Emp[i]["HEmployeeName"]
+                                            , 'HIsPM': tableSub_Emp[i]["HIsPM"]
+                                            , 'HRate': '0'
+                                            , 'HAvgMoney': '0'
+                                            , 'HCountMoney': '0'
+                                            , 'HRemarkSub': ''
+                                        }
+                                        ;
+                                    num.push(rowdata);
+                                }
+                                option.data = num;
+                                table.render(option);
+                                //璁剧疆澶嶉�夋閫変腑鐘舵��
+                                for (var i = 0; i < tableSub_Emp.length; i++) {
+                                    if (tableSub_Emp[i].HIsPM) {
+                                        $('#HIsPM' + (i + 1)).attr("checked", true);
+                                    }
+                                }
+                                form.render('checkbox');
+                            }
+                        })
                         layer.close(index);//鍏抽棴寮圭獥
                     }
                     , btn2: function (index, layero) { }
@@ -793,11 +873,8 @@
                         }
 
                         $("#HProjectStageID").val(checkStatus.data[0].HItemID);//椤圭洰闃舵id
-                        $("#HProjectStageName").val(checkStatus.data[0].HName);//椤圭洰闃舵鍚嶇О
-                        if ($("#HProjectStageName").val() == "") {
-                            $("#HProjectStageName").val(checkStatus.data[0].HNumber);
-                        }
-                        $("#HStageNote").val(checkStatus.data[0].HStageNote);//椤圭洰闃舵璇︾粏鍐呭
+                        $("#HProjectStageName").val(checkStatus.data[0].闃舵鍚嶇О);//椤圭洰闃舵鍚嶇О
+                        $("#HStageNote").val(checkStatus.data[0].椤圭洰闃舵璇︾粏鍐呭);//椤圭洰闃舵璇︾粏鍐呭
                         layer.close(index);//鍏抽棴寮圭獥
                     }
                     , btn2: function (index, layero) { }
@@ -1020,6 +1097,56 @@
             }
             //#endregion
 
+            //#region 涓嬫帹-椤甸潰璧嬪��
+            function set_ProjectReport_Display() {
+                $.ajax({
+                    url: GetWEBURL() + "/PM_ProjectBill/set_ProjectReport",
+                    type: "GET",
+                    async: false,
+                    data: { "HInterID": linterid, "HProjectStageID": HProjectStageID, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        var tableMain = result.data[0];
+                        var tableSub = result.data[1];
+
+                        //涓昏〃 璧嬪��
+                        form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                            "HProID": tableMain[0]["HInterID"]
+                            , "HProNumber": tableMain[0]["椤圭洰浠g爜"]
+                            , "HMainSourceBillNo": tableMain[0]["鍗曟嵁鍙�"]
+                            , "HMainSourceBillType": tableMain[0]["鍗曟嵁绫诲瀷"]
+                            , "HProjectStageID": tableMain[0]["HProjectStageID"]
+                            , "HProjectStageName": tableMain[0]["椤圭洰闃舵"]
+                            , "HStageNote": tableMain[0]["椤圭洰闃舵璇︾粏鍐呭"]
+                            , "HRelationGoods": tableMain[0]["闃舵鐩稿叧浜や粯鐗�"]
+                            , "HIsKey": tableMain[0]["閲岀▼纰�"]=="Y"?true:false
+                            , "HRate": tableMain[0]["闃舵涓氱哗鍗犳瘮"]
+                            , "HOrgID": tableMain[0]["HOrgID"]
+                        });
+                        //鑻ヨ闃舵涓洪噷绋嬬锛屽垯璁剧疆閲岀▼纰戝閫夋涓洪�変腑
+                        if (tableMain[0]["閲岀▼纰�"]=="Y") {
+                            $("#checkboxHIsKey").attr("checked", true);
+                            form.render("checkbox");
+                        }
+                        //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
+                        HOrgIDBar = tableMain[0]["HOrgID"];
+
+                        //瀛愯〃        
+                        option.data = tableSub;
+                        table.render(option);
+                        //瀵瑰瓙琛ㄤ腑鐨勯」鐩粡鐞嗗閫夋杩涜閫変腑
+                        for (var i = 0; i < tableSub.length; i++) {
+                            if (tableSub[i].HIsPM) {
+                                $('#HIsPM' + (i + 1)).attr("checked", true);
+                            }
+                        }
+                        form.render('checkbox');
+
+                    }
+                })
+            }
+
+            //#endregion
+
             //#region 瀹℃牳
             function set_CheckBill() {
                 layer.confirm("纭瑕佸鏍稿悧?", function (index) {
@@ -1239,6 +1366,7 @@
                             option.data[i - 1] = data[0];
                             option.data[i] = tables[0];
                             table.render(option);
+                            CheckedSet_tableSub_Emp();
                             break;
                         }
                     }
@@ -1261,6 +1389,7 @@
                             option.data[i + 1] = data[0];
                             option.data[i] = tables[0];
                             table.render(option);
+                            CheckedSet_tableSub_Emp();
                             break;
                         }
                     }
@@ -1282,6 +1411,7 @@
                             oldData.splice(obj.tr.data('index'), 1)
                             option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
                             table.render(option);
+                            CheckedSet_tableSub_Emp();
                             layer.close(index);
                         }
                     });
@@ -1327,6 +1457,19 @@
                         return false;
                     }
                 })
+            }
+            //#endregion
+
+            //#region 椤圭洰鎴愬憳琛�-鍒锋柊璁剧疆澶嶉�夋鐘舵��
+            function CheckedSet_tableSub_Emp() {
+                var tableSub_Emp = option.data;
+                //瀵瑰瓙琛ㄤ腑鐨勯」鐩粡鐞嗗閫夋杩涜閫変腑
+                for (var i = 0; i < tableSub_Emp.length; i++) {
+                    if (tableSub_Emp[i].HIsPM) {
+                        $('#HIsPM' + (i + 1)).attr("checked", true);
+                    }
+                }
+                form.render('checkbox');
             }
             //#endregion
 
@@ -1438,8 +1581,10 @@
                                 }
                             }
                             table.render(option);
+                            CheckedSet_tableSub_Emp();
                         } else {
                             table.render(option);
+                            CheckedSet_tableSub_Emp();
                         }
                     }, error: function () {
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectStageBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectStageBill.html"
index c4d66d4..f6e9089 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectStageBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectStageBill.html"
@@ -401,6 +401,7 @@
                         table.cache["mainTable"].push(NewRow);
                         option.data = table.cache["mainTable"];
                         table.render(option);
+                        CheckedSet_tableSub();
                         break;
                     case 'btn-CopyLine':
                         var copydata = JSON.stringify(data);
@@ -416,6 +417,7 @@
                             table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
                             option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
                             table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            CheckedSet_tableSub();
                         }
                         break;
                     //鍒楄缃�
@@ -425,10 +427,12 @@
                     //涓婁竴琛�
                     case 'btn_up':
                         btn_up(data);
+                        CheckedSet_tableSub();
                         break;
                     //涓嬩竴琛�
                     case 'btn_under':
                         btn_under(data);
+                        CheckedSet_tableSub();
                         break;
                 }
             });
@@ -866,6 +870,7 @@
                             option.data[i - 1] = data[0];
                             option.data[i] = tables[0];
                             table.render(option);
+                            CheckedSet_tableSub();
                             break;
                         }
                     }
@@ -888,6 +893,7 @@
                             option.data[i + 1] = data[0];
                             option.data[i] = tables[0];
                             table.render(option);
+                            CheckedSet_tableSub();
                             break;
                         }
                     }
@@ -909,6 +915,7 @@
                             oldData.splice(obj.tr.data('index'), 1)
                             option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
                             table.render(option);
+                            CheckedSet_tableSub();
                             layer.close(index);
                         }
                     });
@@ -944,8 +951,8 @@
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
                                         "HProjectStageID": checkStatus.data[0].HItemID
-                                        , "HProjectStageName": checkStatus.data[0].HName
-                                        , "HStageNote": checkStatus.data[0].HStageNote
+                                        , "HProjectStageName": checkStatus.data[0].闃舵鍚嶇О
+                                        , "HStageNote": checkStatus.data[0].椤圭洰闃舵璇︾粏鍐呭
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
@@ -956,6 +963,19 @@
                     }
 
                 })
+            }
+            //#endregion
+
+            //#region 椤圭洰闃舵琛�-鍒锋柊璁剧疆澶嶉�夋鐘舵��
+            function CheckedSet_tableSub() {
+                var tableSub = option.data;
+                //瀵瑰瓙琛ㄤ腑鐨勫閫夋杩涜閫変腑
+                for (var i = 0; i < tableSub.length; i++) {
+                    if (tableSub[i].HIsKey) {
+                        $('#HIsKey' + (i + 1)).attr("checked", true);
+                    }
+                }
+                form.render('checkbox');
             }
             //#endregion
 
@@ -1067,8 +1087,10 @@
                                 }
                             }
                             table.render(option);
+                            CheckedSet_tableSub();
                         } else {
                             table.render(option);
+                            CheckedSet_tableSub();
                         }
                     }, error: function () {
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });

--
Gitblit v1.9.1