From b7923cc03402e74f2496ab4e13ffaa7eb49ad3bd Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 23 九月 2024 09:36:53 +0800
Subject: [PATCH] 1.模具保养规程表头 增加 HErrWarQtys int --预警次数 2,模具保养计划单 主表 增加 HErrWarQtys int --预警次数 3.模具保养计划单 计划子表 增加 HSendFlag bit //是否发送信息 (发送钉钉) HErrBeginQty int --预警开始次数 HUseNowQty ?int --当前使用次数 HUseEndQty ?int --结束使用次数 4.模具计划单,点击审核 生成模具保养计划 5.模具保养记录 点击审核 根据钉钉同步的累加模次 进行计算下次点检记录 6.异常反馈增加工作中心字段

---
 WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainPlanBillList.html |   71 +++++++++++++++++++++--------------
 1 files changed, 42 insertions(+), 29 deletions(-)

diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html"
index 3758c31..ad76b61 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html"
@@ -81,6 +81,7 @@
                                                 <label class="layui-form-label">鍛ㄦ湡鍗曚綅</label>
                                                 <div class="layui-input-inline">
                                                     <select name="HCycleUnit" lay-filter="aihao" id="HCycleUnit">
+                                                        <option value="娆�">娆�</option>
                                                         <option value="澶�">澶�</option>
                                                         <option value="鏈�">鏈�</option>
                                                         <option value="骞�">骞�</option>
@@ -94,6 +95,24 @@
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
+                                                <label class="layui-form-label">淇濆吇棰勮娆℃暟</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HErrWarQtys" id="HErrWarQtys" class="layui-input" value="0">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">浜у搧鍣ㄥ叿<label style="color:red"> * </label></label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HMouldName" id="HMouldName" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HMouldList" style="width:40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                    </button>
+                                                </div>
+                                            </div>                                           
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label">璁″垝寮�濮嬫棩鏈�<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input class="layui-input" name="HBeginDate" id="HBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
@@ -105,35 +124,9 @@
                                                     <input class="layui-input" name="HEndDate" id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                 </div>
                                             </div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">鎽樿</label>
-                                                <div class="layui-input-inline">
-                                                    <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation" style="width:530px;"></textarea>
-                                                </div>
-                                            </div>
-                                            <div class="layui-inline" style="margin-left:340px;">
-                                                <label class="layui-form-label">澶囨敞</label>
-                                                <div class="layui-input-inline">
-                                                    <textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark" id="HRemark" style="width:530px;"></textarea>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">浜у搧鍣ㄥ叿<label style="color:red"> * </label></label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HMouldName" id="HMouldName" class="layui-input" value="" style="float:left;width:150px;">
-                                                    <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;">
-                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HMouldList" style="width:40px;">
-                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                    </button>
-                                                </div>
-                                            </div>
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">閮ㄩ棬</label>
-                                                <div class="layui-input-inline" >
+                                                <div class="layui-input-inline">
                                                     <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;float:left;width:150px;" readonly>
                                                     <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
                                                     <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" style="width: 40px;">
@@ -148,6 +141,20 @@
                                                     <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
                                                         <!--鍔ㄦ�佹覆鏌撶粍缁�-->
                                                     </select>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鎽樿</label>
+                                                <div class="layui-input-inline">
+                                                    <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation" style="width:530px;"></textarea>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline" style="margin-left:340px;">
+                                                <label class="layui-form-label">澶囨敞</label>
+                                                <div class="layui-input-inline">
+                                                    <textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark" id="HRemark" style="width:530px;"></textarea>
                                                 </div>
                                             </div>
                                         </div>
@@ -358,6 +365,7 @@
                         $("#HMaintainLevID").val(checkStatus.data[0].HMaintainLevID);
                         $("#HCycleUnit").val(checkStatus.data[0].鍛ㄦ湡鍗曚綅);
                         $("#HCheckCycle").val(checkStatus.data[0].淇濆吇鍛ㄦ湡);
+                        $("#HErrWarQtys").val(checkStatus.data[0].淇濆吇棰勮娆℃暟);
                         form.render('select');
 
                         get_DocCheckItem2(checkStatus.data[0].hmainid);
@@ -637,6 +645,10 @@
                     , { field: 'HErrBeginTime', title: '棰勮寮�濮嬫椂闂寸偣' }
                     , { field: 'HRelationFlag', title: '鍏宠仈鏍囪' }
                     , { field: 'DiffDate', title: '鐩稿樊闂撮殧' }
+                    , { field: 'HSendFlag', title: '鍙戦�佹爣璁�' }
+                    , { field: 'HErrBeginQty', title: '棰勮寮�濮嬫鏁�' }
+                    , { field: 'HUseNowQty', title: '褰撳墠浣跨敤娆℃暟' }
+                    , { field: 'HUseEndQty', title: '缁撴潫浣跨敤娆℃暟' }
                 ];
                 option_plan = {
                     id: 'mainTable_plan'
@@ -675,7 +687,7 @@
                 table.render(option1);
 
                 set_EditGrid_Plan(linterid);  //缂栬緫鑾峰彇琛ㄤ綋--鐐规璁″垝
-                option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HSafeEndTime": "", "HErrBeginTime": "", "HRelationFlag": "鏈偣妫�", "DiffDate": 0 }];
+                option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HSafeEndTime": "", "HErrBeginTime": "", "HRelationFlag": "鏈偣妫�", "DiffDate": 0, "HSendFlag": "0", "HErrBeginQty": "", "HUseNowQty": "", "HUseEndQty": "" }];
                 table.render(option_plan);
             }
 
@@ -754,6 +766,7 @@
                                 , "HUSEORGID": data.HUSEORGID
                                 , "HDeptID": data.HDeptID
                                 , "HDeptName": data.閮ㄩ棬鍚嶇О
+                                , "HErrWarQtys": data.淇濆吇棰勮娆℃暟
                             });
                             if ($("#HUSEORGID").val() == null || $("#HUSEORGID").val() == "" || $("#HUSEORGID").val() == undefined) {
                                 $("#HUSEORGID").val(sessionStorage["OrganizationID"])
@@ -821,7 +834,7 @@
                                 rowdata.push(
                                     {
                                         "HPlanDate": Pub_Format(data[i].璁″垝鏃ユ湡, "yyyy-MM-dd"), "HPlanBeginTime": Pub_Format(data[i].璁″垝寮�濮嬫椂闂寸偣, "yyyy-MM-dd hh:mm:ss"), "HPlanEndTime": Pub_Format(data[i].璁″垝缁撴潫鏃堕棿鐐�, "yyyy-MM-dd hh:mm:ss"), "HSafeEndTime": Pub_Format(data[i].瀹夊叏缁撴潫鏃堕棿鐐�, "yyyy-MM-dd hh:mm:ss")
-                                        ,"HErrBeginTime": Pub_Format(data[i].棰勮寮�濮嬫椂闂寸偣, "yyyy-MM-dd hh:mm:ss"), "HRelationFlag": data[i].鍏宠仈鏍囪, "DiffDate": data[i].鐩稿樊闂撮殧
+                                        , "HErrBeginTime": Pub_Format(data[i].棰勮寮�濮嬫椂闂寸偣, "yyyy-MM-dd hh:mm:ss"), "HRelationFlag": data[i].鍏宠仈鏍囪, "DiffDate": data[i].鐩稿樊闂撮殧, "HSendFlag": data[i].淇℃伅鏍囪, "HErrBeginQty": data[i].棰勮寮�濮嬫鏁�, "HUseNowQty": data[i].褰撳墠浣跨敤娆℃暟, "HUseEndQty": data[i].缁撴潫浣跨敤娆℃暟
                                     }
                                 )
                             }

--
Gitblit v1.9.1