From a2ef5def12fecf799bc7288f5cd6d58c34149b22 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 21 四月 2022 21:05:36 +0800
Subject: [PATCH] 日计划工单  编辑

---
 WebTM/views/生产管理/提料计划/JIT_LiftMaterPlaBillnList.html |    2 
 WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillList.html    |    8 
 WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillEdit.html    |  356 +++++++++++++++++++++++++++++++++++++++-----------
 WebTM/views/生产管理/提料计划/JIT_LiftMaterPlanBillEdit.html |    7 
 4 files changed, 282 insertions(+), 91 deletions(-)

diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
index f6528a4..03b27a2 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
@@ -415,7 +415,7 @@
                 , area: ['100%', '100%']
                 , title: '鎻愭枡璁″垝鍗曞垪琛�-鏂板'
                 , shift: 0//寮瑰嚭鍔ㄧ敾
-                , content: '../鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
+                , content: '../鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html?OperationType=1&linterid=-1&HSouceBillType=&linteridSub=-1'
                 , end: function () {
                     //鍒锋柊椤甸潰,
                     location.reload();
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
index 15c0441..04d5552 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
@@ -263,7 +263,7 @@
             var linteridSub = params[params[3]];  //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
 
             //鍒ゆ柇鏄惁鏂板
-            if (linterid == null || linterid == 0) {
+            if (linterid == null || linterid == -1) {
                 linteridSub = -1;
                 OperationType = 1;
                 $.ajax({
@@ -310,7 +310,8 @@
                     //缂哄皯鏃ヨ鍒掑伐鍗昮id 瀛恑d  鐢熶骇璁㈠崟鍙�  婧愬崟绫诲瀷
                     , { field: 'HWorkShopID', title: 'HWorkShopID', hide: true }
                     , { field: 'HWorkShopIDName', title: '鐢熶骇杞﹂棿', edit: 'text', event: "HPURCHASEORGID" }
-                    , { field: 'HDayPlanDate', title: '宸ュ崟鐢熶骇鏃ユ湡', width: 200, templet: '#HDayPlanDate'}//date
+                    , { field: 'HDayPlanDate', title: '宸ュ崟鐢熶骇鏃ユ湡', width: 200, templet: '#HDayPlanDate' }//date
+                    , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }
                     , { field: 'HRelationQty1 ', title: '鍙敤閲囪喘鏁伴噺', edit: 'text' }
                     , { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟鍐呯爜', edit: 'text' }
                     , { field: 'HPOOrderEntryID ', title: '閲囪喘璁㈠崟瀛愬唴鐮�', edit: 'text' }
@@ -444,7 +445,7 @@
 
             //閫�鍑�
             form.on('submit(Cancel)', function () {
-                if ((OperationType == 1 && linteridSub == -1) || OperationType == 3) {
+                if ((OperationType == 1 && linterid == -1) || OperationType == 3) {
                     Pub_Close(1);
                 } else {
                     Pub_Close(2);
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
index 79cfd0b..78b7281 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
@@ -73,7 +73,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鎵撳嵃娆℃暟</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" lay-verify="HPrintQty " name="HPrintQty " id="HPrintQty ">
+                                                <input type="text" class="layui-input" lay-verify="HPrintQty" name="HPrintQty" id="HPrintQty">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -119,7 +119,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" lay-verify="HMaterIDName" name="HMaterIDName" id="HMaterIDName" readonly style="background-color:#efefef4d;">
+                                                <input type="text" class="layui-input" lay-verify="HMaterName" name="HMaterName" id="HMaterName" readonly style="background-color:#efefef4d;">
                                             </div>
                                         </div>
                                     </div>
@@ -127,7 +127,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" lay-verify="HMaterIDModel" name="HMaterIDModel" id="HMaterIDModel" readonly style="background-color:#efefef4d;">
+                                                <input type="text" class="layui-input" lay-verify="HMaterModel" name="HMaterModel" id="HMaterModel" readonly style="background-color:#efefef4d;">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -153,7 +153,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鍏宠仈鏁伴噺</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" lay-verify="HRelationQty " name="HRelationQty " id="HRelationQty ">
+                                                <input type="text" class="layui-input" lay-verify="HRelationQty" name="HRelationQty" id="HRelationQty">
                                             </div>
                                         </div>
                                     </div>
@@ -231,19 +231,19 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" lay-verify="HRemark " name="HRemark " id="HRemark ">
+                                                <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">灏忔椂浜ц兘</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" lay-verify="HWorkQty " name="HWorkQty " id="HWorkQty ">
+                                                <input type="text" class="layui-input" lay-verify="HWorkQty" name="HWorkQty" id="HWorkQty">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鏃ヨ鍒掓暟閲�</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" lay-verify="HSplitPlanQty " name="HSplitPlanQty " id="HSplitPlanQty ">
+                                                <input type="text" class="layui-input" lay-verify="HSplitPlanQty" name="HSplitPlanQty" id="HSplitPlanQty">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -271,7 +271,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟鍙�</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" lay-verify="HICMOBillNo " name="HICMOBillNo " id="HICMOBillNo ">
+                                                <input type="text" class="layui-input" lay-verify="HICMOBillNo" name="HICMOBillNo" id="HICMOBillNo">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -287,19 +287,19 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鎵规</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" lay-verify="HBatchNo " name="HBatchNo " id="HBatchNo ">
+                                                <input type="text" class="layui-input" lay-verify="HBatchNo" name="HBatchNo" id="HBatchNo">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">浼樺厛绾�</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" lay-verify="HYX " name="HYX " id="HYX ">
+                                                <input type="text" class="layui-input" lay-verify="HYX" name="HYX" id="HYX">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鐢熶骇鍛ㄦ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" lay-verify="HProdTimes " name="HProdTimes " id="HProdTimes ">
+                                                <input type="text" class="layui-input" lay-verify="HProdTimes" name="HProdTimes" id="HProdTimes">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -315,7 +315,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">璁″垝鏁伴噺</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" lay-verify="HPlanQty " name="HPlanQty " id="HPlanQty ">
+                                                <input type="text" class="layui-input" lay-verify="HPlanQty" name="HPlanQty" id="HPlanQty">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -409,7 +409,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鏈帓鏁伴噺</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" lay-verify="HLeftPlanQty " name="HLeftPlanQty " id="HLeftPlanQty ">
+                                                <input type="text" class="layui-input" lay-verify="HLeftPlanQty" name="HLeftPlanQty" id="HLeftPlanQty">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -473,18 +473,24 @@
                                                 <input type="text" class="layui-input" lay-verify="HSourceStockInQty" name="HSourceStockInQty" id="HSourceStockInQty">
                                             </div>
                                         </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浼樺厛绾�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HPriority" name="HPriority" id="HPriority">
+                                            </div>
+                                        </div>
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-inline">
                                             <div class="layui-input-block" style="margin-left: 70px;">
-                                                <input type="checkbox" name="checkboxHLockedSub" id="checkboxHLockedSub" lay-skin="primary" lay-filter="checkboxHLockedSub" title="閿佸畾鏍囪">
-                                                <input type="hidden" value="true" name="HLockedSub" id="HLockedSub" lay-verify="HLockedSub">
+                                                <input type="checkbox" name="checkboxHLocked" id="checkboxHLocked" lay-skin="primary" lay-filter="checkboxHLocked" title="閿佸畾鏍囪">
+                                                <input type="hidden" value="false" name="HLocked" id="HLocked" lay-verify="HLocked">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <div class="layui-input-block" style="margin-left: 70px;">
                                                 <input type="checkbox" name="checkboxHHangUp" id="checkboxHHangUp" lay-skin="primary" lay-filter="checkboxHHangUp" title="鎸傝捣鏍囪">
-                                                <input type="hidden" value="true" name="HHangUp" id="HHangUp" lay-verify="HHangUp">
+                                                <input type="hidden" value="false" name="HHangUp" id="HHangUp" lay-verify="HHangUp">
                                             </div>
                                         </div>
                                     </div>
@@ -555,6 +561,7 @@
                 , layer = layui.layer
                 , table = layui.table
                 , form = layui.form
+                , laydate = layui.laydate
                 , element = layui.element;
 
             //#endregion
@@ -578,7 +585,7 @@
             var linteridSub = params[params[3]];  //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
 
             //鍒ゆ柇鏄惁鏂板
-            if (linterid == null || linterid == 0) {
+            if (linterid == null || linterid == -1) {
                 linteridSub = -1;
                 OperationType = 1;
                 $.ajax({
@@ -600,8 +607,8 @@
 
             var rowdata = [{
                 "HMasterDate": "", "HQty": "", "HRptFinishQty": "", "HTimes": "", "HUseTimes": "", "HBTimes": "", "HETimes": "",
-                "HRemark": "", "HDateSub": "", "HCloseMan": "", "HEntryCloseDate": "", "HCloseTypeSub": "", "HColumn": "", "HLockedSub": "", "HComplete": "",
-                "HStatusTag": "", "HIsHandModify": ""
+                "HRemark": "", "HDateSub": "", "HCloseMan": "", "HEntryCloseDate": "", "HCloseTypeSub": false, "HColumn": "", "HLockedSub": false, "HComplete": "",
+                "HStatusTag": false, "HIsHandModify": false
             }];
 
             var option = {
@@ -613,18 +620,18 @@
                 , cols: [[ //琛ㄥご
                     { type: 'checkbox', totalRowText: '鍚堣琛�' }
                     , { type: 'numbers', title: '搴忓彿', totalRow: true }
-                    , { field: 'HMasterDate', title: '鏃ヨ鍒掔敓浜ф棩鏈�' }//datetime
+                    , { field: 'HMasterDate', title: '鏃ヨ鍒掔敓浜ф棩鏈�', event: "HMasterDate"  }//datetime
                     , { field: 'HQty', title: '鏃ヨ鍒掓暟閲�', edit: 'text' }
                     , { field: 'HRptFinishQty', title: '姹囨姤瀹屾垚鏁伴噺', edit: 'text' }
                     //棰勭暀鏁伴噺
                     , { field: 'HTimes', title: ' 鍓╀綑宸ユ椂', edit: 'text' }
                     , { field: 'HUseTimes', title: '鍗犵敤宸ユ椂', edit: 'text' }
-                    , { field: 'HBTimes', title: '寮�濮嬫椂闂�' }//datetime
-                    , { field: 'HETimes', title: '缁撴潫鏃堕棿' }//datetime
+                    , { field: 'HBTimes', title: '寮�濮嬫椂闂�', event: "HBTimes"  }//datetime
+                    , { field: 'HETimes', title: '缁撴潫鏃堕棿', event: "HETimes"}//datetime
                     , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
                     , { field: 'HDateSub', title: '鎺掍骇鏃ユ湡' }//datetime
                     , { field: 'HCloseMan', title: '琛屽叧闂�', edit: 'text' }
-                    , { field: 'HEntryCloseDate', title: '琛屽叧闂棩鏈�' }//datetime
+                    , { field: 'HEntryCloseDate', title: '琛屽叧闂棩鏈�', event: "HEntryCloseDate" }//datetime
                     , { field: 'HCloseTypeSub', title: '鏄惁鎵嬪伐鍏抽棴', templet: '#HCloseTypeSub' }//check
                     , { field: 'HColumn', title: 'Excel鍒楀ご', edit: 'text' }
                     , { field: 'HLockedSub', title: '閿佸畾鏍囪', templet: '#HLockedSu' }//check
@@ -685,6 +692,16 @@
                 get_btnHSourceID();
             });
 
+            //閿佸畾鏍囪
+            form.on('checkbox(checkboxHLocked)', function (data) {
+                $("#HLocked").val(data.elem.checked);
+            });
+
+            //鎸傝捣鏍囪
+            form.on('checkbox(checkboxHHangUp)', function (data) {
+                $("#HHangUp").val(data.elem.checked);
+            });
+
             //#endregion
 
             //#region 瀛�
@@ -693,42 +710,20 @@
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
+
                 //鏂板琛岃〃鏍兼暟鎹�
                 var NewRow = {
                     "HMasterDate": "", "HQty": "", "HRptFinishQty": "", "HTimes": "", "HUseTimes": "", "HBTimes": "", "HETimes": "",
-                    "HRemark": "", "HDateSub": "", "HCloseMan": "", "HEntryCloseDate": "", "HCloseTypeSub": "", "HColumn": "", "HLockedSub": "", "HComplete": "",
-                    "HStatusTag": "", "HIsHandModify": ""
+                    "HRemark": "", "HDateSub": "", "HCloseMan": "", "HEntryCloseDate": "", "HCloseTypeSub": false, "HColumn": "", "HLockedSub": false, "HComplete": "",
+                    "HStatusTag": false, "HIsHandModify": false
                 };
                 switch (obj.event) {
                     case 'btn-AddLine':
                         table.cache["mainTable"].push(NewRow);
                         option.data = table.cache["mainTable"];
-
                         table.render(option);
-
-                        for (var i = 1; i <= option.data.length; i++) {
-                            //$('#HProcType' + i + '').find("option[value='" + option.data[i - 1].HProcType + "']").attr("selected", true);
-
-                            //閿佸畾鏍囪
-                            if (option.data[i - 1].HLockedSu) {
-                                $('#HLockedSu' + i + '').attr("checked", true);
-                            }
-                            //鐘舵�佹爣璁�
-                            if (option.data[i - 1].HStatusTag) {
-                                $('#HStatusTag' + i + '').attr("checked", true);
-                            }
-                            //鎵嬪伐淇敼鏍囪
-                            if (option.data[i - 1].HIsHandModify) {
-                                $('#HIsHandModify' + i + '').attr("checked", true);
-                            }
-
-                            //鏄惁鎵嬪伐鍏抽棴
-                            if (option.data[i - 1].HCloseTypeSub) {
-                                $('#HCloseTypeSub' + i + '').attr("checked", true);
-                            }
-                        }
-                        form.render('select');
-                        form.render('checkbox');
+                          //鍒锋柊澶嶉�夋
+                        checkRefresh();
                         break;
                     case 'btn-CopyLine':
                         var copydata = JSON.stringify(data);
@@ -744,29 +739,8 @@
                             table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
                             option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
                             table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
-                            for (var i = 1; i <= option.data.length; i++) {
-                                //$('#HProcType' + i + '').find("option[value='" + option.data[i - 1].HProcType + "']").attr("selected", true);
-
-                                //閿佸畾鏍囪
-                                if (option.data[i - 1].HLockedSu) {
-                                    $('#HLockedSu' + i + '').attr("checked", true);
-                                }
-                                //鐘舵�佹爣璁�
-                                if (option.data[i - 1].HStatusTag) {
-                                    $('#HStatusTag' + i + '').attr("checked", true);
-                                }
-                                //鎵嬪伐淇敼鏍囪
-                                if (option.data[i - 1].HIsHandModify) {
-                                    $('#HIsHandModify' + i + '').attr("checked", true);
-                                }
-
-                                //鏄惁鎵嬪伐鍏抽棴
-                                if (option.data[i - 1].HCloseTypeSub) {
-                                    $('#HCloseTypeSub' + i + '').attr("checked", true);
-                                }
-                            }
-                            form.render('select');
-                            form.render('checkbox');
+                            //鍒锋柊澶嶉�夋
+                            checkRefresh();
                         }
                         break;
                 }
@@ -775,7 +749,79 @@
             //琛屽唴浜嬩欢
             table.on('tool(mainTable)', function (obj) {
                 set_GridDelete(obj);   //琛屽唴鍒犻櫎
-                //set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+                //#region 淇敼琛� 鏃堕棿
+
+                var data = obj.data;
+                //鏃ヨ鍒掔敓浜ф棩鏈�
+                if (obj.event == 'HMasterDate') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず  
+                        , closeStop: this
+                        , done: function (nowDate) {
+                            //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                            data[field] = nowDate;
+                            obj.update(data);
+                            //鍒锋柊澶嶉�夋
+                            checkRefresh();
+                        }
+                    });
+                }
+
+                //寮�濮嬫椂闂�
+                if (obj.event == 'HBTimes') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず  
+                        , closeStop: this
+                        , done: function (nowDate) {
+                            //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                            data[field] = nowDate;
+                            obj.update(data);
+                            //鍒锋柊澶嶉�夋
+                            checkRefresh();
+                        }
+                    });
+                }
+
+                //缁撴潫鏃堕棿
+                if (obj.event == 'HETimes') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず  
+                        , closeStop: this
+                        , done: function (nowDate) {
+                            //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                            data[field] = nowDate;
+                            obj.update(data);
+                            //鍒锋柊澶嶉�夋
+                            checkRefresh();
+                        }
+                    });
+                }
+
+                //琛屽叧闂棩鏈�
+                if (obj.event == 'HEntryCloseDate') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず  
+                        , closeStop: this
+                        , done: function (nowDate) {
+                            //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                            data[field] = nowDate;
+                            obj.update(data);
+                            //鍒锋柊澶嶉�夋
+                            checkRefresh();
+                        }
+                    });
+                }
+
+                //#endregion
 
             });
 
@@ -834,7 +880,7 @@
 
             //閫�鍑�
             form.on('submit(Cancel)', function () {
-                if ((OperationType == 1 && linteridSub == -1) || OperationType == 3) {
+                if ((OperationType == 1 && linterid == -1) || OperationType == 3) {
                     Pub_Close(1);
                 } else {
                     Pub_Close(2);
@@ -871,7 +917,7 @@
             //鑾峰彇缁勭粐
             function Organ() {
                 //鑾峰彇鐧诲綍椤电粍缁囧垪
-                var Organization = '';
+                var Organization = '<option  style="color:blue;" value="0">缁勭粐</option>';
                 $.ajax({
                     type: "get",
                     url: GetWEBURL() + "/Web/GetOrganizations",
@@ -947,9 +993,9 @@
                         }
                         //鑾峰彇鏁版嵁
                         $("#HMaterID").val(checkStatus.data[0].HItemID);
-                        $("#HMaterIDName").val(checkStatus.data[0].HName);
+                        $("#HMaterName").val(checkStatus.data[0].HName);
                         $("#HMaterIDNumber").val(checkStatus.data[0].HNumber);
-                        $("#HMaterIDModel").val(checkStatus.data[0].HModel);
+                        $("#HMaterModel").val(checkStatus.data[0].HModel);
 
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -1074,6 +1120,33 @@
 
             //#endregion
 
+            //澶氶��  鍒锋柊琛ㄦ牸
+            function checkRefresh() {
+                for (var i = 1; i <= option.data.length; i++) {
+                    //$('#HProcType' + i + '').find("option[value='" + option.data[i - 1].HProcType + "']").attr("selected", true);
+
+                    //閿佸畾鏍囪
+                    if (option.data[i - 1].HLockedSu) {
+                        $('#HLockedSu' + i + '').attr("checked", true);
+                    }
+                    //鐘舵�佹爣璁�
+                    if (option.data[i - 1].HStatusTag) {
+                        $('#HStatusTag' + i + '').attr("checked", true);
+                    }
+                    //鎵嬪伐淇敼鏍囪
+                    if (option.data[i - 1].HIsHandModify) {
+                        $('#HIsHandModify' + i + '').attr("checked", true);
+                    }
+
+                    //鏄惁鎵嬪伐鍏抽棴
+                    if (option.data[i - 1].HCloseTypeSub) {
+                        $('#HCloseTypeSub' + i + '').attr("checked", true);
+                    }
+                }
+                form.render('select');
+                form.render('checkbox');
+            }
+
             //琛屽唴鍒犻櫎
             function set_GridDelete(obj) {
                 var data = obj.data;
@@ -1096,10 +1169,15 @@
             //淇濆瓨
             function set_AddNew(data) {
 
-                //鍒犻櫎瀛愯〃鏁版嵁 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴�
+                //鍒犻櫎瀛愯〃鏁版嵁鏃� 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴�
                 var num = [];
                 for (var i = 0; i < table.cache["mainTable"].length; i++) {
                     if (table.cache["mainTable"][i] != "") {
+                        //鍒濆鍖栧叧闂椂闂�(绌哄�肩姸鎬佷笅 璧嬪��)
+                        if (table.cache["mainTable"][i].HEntryCloseDate == "") {
+                            table.cache["mainTable"][i].HEntryCloseDate ="1900-01-01 00:00:00.000"
+                        }
+
                         table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
                         num.push(table.cache["mainTable"][i])
                     }
@@ -1109,7 +1187,7 @@
                 var sSubStr = JSON.stringify(num);
                 var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
                 var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
-
+                
                 var index = layer.load();
                 $.ajax({
                     type: "POST",
@@ -1134,12 +1212,124 @@
                 });
             }
 
-            //闈炵┖楠岃瘉
-            function AllowLoadData() {
+            //缂栬緫 椤甸潰璧嬪��
+            function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+            {
+                var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+                $.ajax({
+                    url: GetWEBURL() + "/Sc_WorkBillSortBill/Sc_WorkBillSortBillList",
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (d) {
 
-                return true;
+                        //涓昏〃
+                        form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                            "HBillNo": d.data[0].鍗曟嵁鍙�
+                            , "HInterID": d.data[0].hmainid
+                            , "HPrintQty": d.data[0].鎵撳嵃娆℃暟
+                            , "HDeptID": d.data[0].HDeptID
+                            , "HDeptIDName": d.data[0].閮ㄩ棬鍚嶇О
+                            , "HSeOrderBillNo": d.data[0].閿�鍞鍗曞彿
+                            , "HSourceQty": d.data[0].璁惧鏁伴噺
+                            , "HInStockQty": d.data[0].鍏ュ簱鏁伴噺
+                            , "HMaterID": d.data[0].HMaterID
+                            , "HMaterIDNumber": d.data[0].鐗╂枡浠g爜
+                            , "HMaterName": d.data[0].鐗╂枡鍚嶇О
+                            , "HMaterModel": d.data[0].瑙勬牸鍨嬪彿
+                            , "HGroupID": d.data[0].HGroupID
+                            , "HGroupIDName": d.data[0].鐝粍
+                            , "HWorkShopID": d.data[0].HWorkShopID
+                            , "HWorkShopIDName": d.data[0].鐢熶骇杞﹂棿
+                            , "HRelationQty": d.data[0].鍏宠仈鏁伴噺
+                            , "HUnitID": d.data[0].HUnitID
+                            , "HUnitIDName": d.data[0].璁¢噺鍗曚綅
+                            , "HWorkerID": d.data[0].HWorkerID
+                            , "HWorkerIDName": d.data[0].鎿嶄綔宸�
+                            , "HSourceID": d.data[0].HSourceID
+                            , "HSourceIDName": d.data[0].鐢熶骇璧勬簮
+                            , "HDate": Format(new Date(d.data[0].鏃ユ湡), "yyyy-MM-dd")
+                            , "HBeginWorkTimes": d.data[0].寮�宸ュ伐鏃�
+                            , "HInStockOwnerTypeID": d.data[0].鍏ュ簱璐т富绫诲瀷
+                            , "HSplitRelationQty": d.data[0].鏃ユ眹鎶ユ暟閲�
+                            , "HOrderLev": d.data[0].璁㈠崟绛夌骇
+                            , "HRemark": d.data[0].琛ㄥご澶囨敞
+                            , "HWorkQty": d.data[0].灏忔椂浜ц兘
+                            , "HSplitPlanQty": d.data[0].涓绘棩璁″垝鏁伴噺
+                            , "HOwnerTypeID": d.data[0].璐т富绫诲瀷
+                            , "HPlanBeginDate": Format(new Date(d.data[0].璁″垝寮�濮嬫棩鏈�), "yyyy-MM-dd")
+                            , "HPlanEndDate":Format(new Date(d.data[0].璁″垝缁撴潫鏃ユ湡), "yyyy-MM-dd")
+                            , "HICMOBillNo": d.data[0].鐢熶骇璁㈠崟鍙�
+                            , "HOwnerID": d.data[0].璐т富缂栫爜
+                            , "HBatchNo": d.data[0].鎵规
+                            , "HYX": d.data[0].浼樺厛绾�
+                            , "HProdTimes": d.data[0].鐢熶骇鍛ㄦ湡
+                            , "HEntrustORGID": d.data[0].濮旀墭缁勭粐
+                            , "HPlanQty": d.data[0].璁″垝鏁伴噺
+                            , "HPreparatDate":Format(new Date(d.data[0].缂栧埗鏃ユ湡), "yyyy-MM-dd")
+                            , "HOrderNeedQty": d.data[0].璁㈠崟闇�姹傛暟閲�
+                            , "HOrderCommitDate": Format(new Date(d.data[0].璁㈠崟浜よ揣鏈�), "yyyy-MM-dd")
+                            , "HCompleteQty": d.data[0].榻愬鏁伴噺
+                            , "HSeOrderBillQty": d.data[0].閿�鍞鍗曟暟閲�
+                            , "HICMOInterID": d.data[0].鐢熶骇璁㈠崟鍐呯爜
+                            , "HKTQ": d.data[0].鎻愬墠鏈�
+                            , "HStockInORGID": d.data[0].鍏ュ簱缁勭粐
+                            , "HDayPlanSumQty": d.data[0].鏃ヨ鍒掓暟閲忔�婚噺
+                            , "HSourceBillNo": d.data[0].婧愬崟缂栧彿
+                            , "HICMOEntryID": d.data[0].鐢熶骇璁㈠崟鏄庣粏鍐呯爜
+                            , "HMainInterID": d.data[0].瀵煎叆鎺掍骇ID
+                            , "HProdORGID": d.data[0].鐢熶骇缁勭粐
+                            , "HLeftPlanQty": d.data[0].鏈帓鏁伴噺
+                            , "HEmpID": d.data[0].HEmpID
+                            , "HEmpIDName": d.data[0].鑱屽憳
+                            , "HInStockOwnerID": d.data[0].鍏ュ簱璐т富缂栫爜
+                            , "HICMOEntrySEQ": d.data[0].鐢熶骇璁㈠崟鏄庣粏琛屽彿
+                            , "HICMOBillType": d.data[0].鐢熶骇璁㈠崟鍗曟嵁绫诲瀷
+                            , "HCloseCount": d.data[0].鍏抽棴鏁伴噺
+                            , "HOrderType": d.data[0].璁㈠崟绫诲瀷
+                            , "HSplitQty": d.data[0].鎷嗗崟鏁伴噺
+                            , "HSourceStockInQty": d.data[0].浜х嚎鍏ュ簱鏁伴噺
+                            , "HPriority": d.data[0].HPriority
+                            , "HLocked": d.data[0].涓婚攣瀹氭爣璁� == "0" ? false : true
+                            , "HHangUp": d.data[0].鎸傝捣鏍囪 == "0" ? false : true
+                        });
+
+                        //瀛愯〃  璧嬪��
+                        var rowdata = [{
+                            "HMasterDate": d.data[0].鏃ヨ鍒掔敓浜ф棩鏈�, "HQty": d.data[0].瀛愭棩璁″垝鏁伴噺, "HRptFinishQty": d.data[0].姹囨姤瀹屾垚鏁伴噺
+                            ,"HTimes": d.data[0].鍓╀綑宸ユ椂, "HUseTimes": d.data[0].鍗犵敤宸ユ椂, "HBTimes": d.data[0].寮�濮嬫椂闂�, "HETimes": d.data[0].缁撴潫鏃堕棿,
+                            "HRemark": d.data[0].琛ㄤ綋澶囨敞, "HDateSub": d.data[0].鎺掍骇鏃ユ湡, "HCloseMan": d.data[0].瀛愬叧闂汉, "HEntryCloseDate": d.data[0].瀛愬叧闂椂闂�
+                            , "HCloseTypeSub": false, "HColumn": d.data[0].Excel鍒楀ご, "HLockedSub": false, "HComplete": d.data[0].鏄惁榻愬
+                            ,"HStatusTag": false, "HIsHandModify": false
+                        }];
+                        option.data = rowdata;
+                        table.render(option);
+                        form.render('select');
+                    }
+                })
             }
 
+            //闈炵┖楠岃瘉
+            function AllowLoadData() {
+               
+                //鐢熶骇杞﹂棿
+                if ($("#HWorkShopID").val() == "0") {
+                    layer.msg("鐢熶骇杞﹂棿娌℃湁閫夋嫨");
+                    return false;
+                }
+
+                //鐢熶骇璧勬簮
+                if ($("#HSourceID").val() == "0") {
+                    layer.msg("鐢熶骇璧勬簮娌℃湁閫夋嫨");
+                    return false;
+                }
+
+                //鐢熶骇缁勭粐
+                if ($("#HProdORGID").val() == "0") {
+                    layer.msg("鐢熶骇缁勭粐娌℃湁閫夋嫨");
+                    return false;
+                }
+                return true;
+            }
 
             //鑾峰彇鍙傛暟
             function getUrlVars() {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
index d5c57ef..c03ba5e 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
@@ -399,9 +399,9 @@
                 type: 2
                 , skin: 'layui-layer-rim' //鍔犱笂杈规
                 , area: ['100%', '100%']
-                , title: '鎻愭枡璁″垝鍗曞垪琛�-鏂板'
+                , title: '鏃ヨ鍒掑伐鍗曞垪琛�-鏂板'
                 , shift: 0//寮瑰嚭鍔ㄧ敾
-                , content: '../鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
+                , content: '../鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html?OperationType=1&linterid=-1&HSouceBillType=&linteridSub=-1'
                 , end: function () {
                     //鍒锋柊椤甸潰,
                     location.reload();
@@ -422,9 +422,9 @@
                     type: 2
                     , skin: 'layui-layer-rim' //鍔犱笂杈规
                     , area: ['100%', '100%']
-                    , title: '鎻愭枡璁″垝鍗曞垪琛�-缂栬緫'
+                    , title: '鏃ヨ鍒掑伐鍗曞垪琛�-缂栬緫'
                     , shift: 0//寮瑰嚭鍔ㄧ敾
-                    , content: '../鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+                    , content: '../鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
                     , end: function () {
                         //鍒锋柊椤甸潰,
                         location.reload();

--
Gitblit v1.9.1