From 2811fd392ac8f5463fd6c5ce78df2a7949474ef1 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 09 五月 2024 17:06:51 +0800
Subject: [PATCH] 网页版 和 PDA版 设备点检表和器具点检表 增加 字段，新增器具点检PDA模块
---
WebTM/views/设备管理/Sb_EquipDotCheckBillEdit.html | 343 ++++++-
WebTM/views/模治具管理/模治具管理/Sc_MouldDotCheckPlanBillList.html | 19
WebTM/views/模治具管理/模治具点检保养/Sc_MouldDotCheckBill_PDA_OLD.html | 555 ++++++++++++
WebTM/views/index_Mobile.html | 6
WebTM/views/模治具管理/模治具点检保养/Sc_MouldDotCheckBill_PDA.html | 1188 +++++++++++++++++++--------
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldDotCheckBillList.html | 270 +++++
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldDotCheckPlanBillList.html | 2
WebTM/views/设备管理/Sb_EquipDotCheckBill_PDA.html | 180 +++
WebTM/Properties/PublishProfiles/JFTM.pubxml | 2
WebTM/WebTM.csproj | 3
10 files changed, 2,118 insertions(+), 450 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml b/WebTM/Properties/PublishProfiles/JFTM.pubxml
index 79d8489..70a8712 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml
@@ -10,7 +10,7 @@
<LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
- <PublishUrl>G:\issWeb\缃戠珯鍙戝竷\LAYUI</PublishUrl>
+ <PublishUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\LAYUI</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod>
<SiteUrlToLaunchAfterPublish />
</PropertyGroup>
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 8aa5aea..b323a7e 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -326,6 +326,7 @@
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClassEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemMethodList.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClassList.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldDotCheckBill_PDA.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackSignBill_BrushCard.html" />
<Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Add_Edit_Gy_TaskClass.html" />
<Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Add_Edit_Gy_ProjectClass.html" />
@@ -1424,7 +1425,7 @@
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldScrapRequestBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldStatusChangeBill.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldStatusChangeBillList.html" />
- <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldDotCheckBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldDotCheckBill_PDA_OLD.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldMaintainBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱BatchGen_MouldFile.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_BarCodeBill_Out.html" />
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index 585050a..e03e0cb 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -275,6 +275,12 @@
涓嬫ā鍗曟煡璇�
</a>
</dd>
+ <dd>
+ <a href="妯℃不鍏风鐞�/妯℃不鍏风偣妫�淇濆吇/Sc_MouldDotCheckBill_PDA.html" target="main_self_frame" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 鍣ㄥ叿鐐规璁板綍鍗�
+ </a>
+ </dd>
</dl>
</li>
<!-- 妯℃不鍏风鐞� -->
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\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldDotCheckBill_PDA.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\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldDotCheckBill_PDA.html"
index a07128d..d1171e0 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\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldDotCheckBill_PDA.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\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldDotCheckBill_PDA.html"
@@ -14,257 +14,312 @@
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<!--鑷畾涔夋牱寮�-->
<style>
- .maintitle {
- background-color: #1492ff;
- color: #fff;
- padding: 5px 10px;
- border: none;
- border-radius: 4px;
- }
-
- .title {
- border-left: 4px solid #1492ff;
- padding-left: 6px;
- margin: 20px 10px 4px;
- font-size: 16px;
- color: #333;
- }
-
- .buttom_box_little {
- width: 60px;
- height: 36px;
- color: #fff;
- background-color: #1492ff;
- border-radius: 4px;
- border: none;
- margin: 10px;
- }
-
- .layui-input {
- width: 93%;
- }
- .layui-inline, img {
- display: block;
- vertical-align: middle
- }
- .layui-input, .layui-textarea {
- display: inline-block;
- width: 100%;
- padding-left: 10px;
- }
-
- .laydate-time-list ol {
- overflow-x: hidden !important;
- overflow-y: auto !important;
- }
.layui-form-label {
- padding: 9px 5px;
+ font-size: 14px;
+ width: 85px;
+ text-align: inherit;
}
- .layui-input-block {
- margin-left: 85px;
- min-height: 36px;
+ /*鍏ㄥ眬璁剧疆杈撳叆妗嗛珮搴�*/
+ .LineHeight {
+ height: 30px;
+ }
+ /*璁剧疆琛ㄥご杈撳叆妗�*/
+ .t1_input {
+ padding: 1%;
+ }
+ /*鏈珯淇℃伅td*/
+ .bz_td {
+ display: -webkit-box; /*璁剧疆鎸夐挳涓嶆崲琛�*/
+ padding: 1%; /*璁剧疆杈撳叆妗嗚竟璺�*/
+ }
+ /*璁剧疆鏈珯淇℃伅鎸夐挳楂樺害*/
+ .bz_btu {
+ height: 30px;
+ width: 60px;
+ line-height: 30px;
+ }
+
+ th {
+ width: 70px;
+ text-align: center;
+ }
+
+ /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+ .layui-table-cell {
+ overflow: visible !important;
+ }
+ /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+ td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
+ }
+
+ .layui-form-item .layui-inline {
+ margin-top: 0px;
+ margin-bottom: 5px;
+ margin-right: 0px;
+ }
+
+ .layui-form-label {
+ width: 25%;
+ }
+ /*鏄庣粏琛屽閫夋灞呬腑*/
+ .layui-table-cell .layui-form-checkbox[lay-skin="primary"] {
+ margin-left: 15%;
}
</style>
</head>
<body>
<div class="layui-fluid" style="padding: 0;">
- <div class="layui-card" style="padding: 15px;background-color: #efefef;">
+ <div class="layui-card">
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
- <div class="maintitle">鍣ㄥ叿鐐规璁板綍鍗�</div>
- <div class="layui-form-item" style="padding-top: 10px;">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍣ㄥ叿鏉＄爜</label>
- <div class="layui-input-block" style="margin-left: 100px;width:46%;">
- <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
- </div>
- </div>
+ <div style="background-color:#0085E8;">
+ <span style="color: white;"><i class="layui-icon layui-icon-form"></i>鍣ㄥ叿鐐规璁板綍鍗�</span>
</div>
- <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
- <ul class="layui-tab-title">
- <li class="layui-this">鍩烘湰淇℃伅</li>
- <li>鍏朵粬淇℃伅</li>
- </ul>
+ <div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
+ <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius">鏂板</button>
+ <button type="button" lay-submit="" lay-filter="Saver" id="Saver" class="layui-btn layui-btn-radius">淇濆瓨</button>
+ <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
+ </div>
+ <div class="layui-tab layui-tab-card" lay-filter="TabTest">
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
- <div class="layui-form-item" style="padding-top: 10px;">
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鐐规寮�濮�:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="datetime" class="layui-input" name="HBeginDate" id="HBeginDate" placeholder="璇烽�夋嫨鏃ユ湡">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鐐规缁撴潫:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="datetime" class="layui-input" name="HEndDate" id="HEndDate" placeholder="璇烽�夋嫨鏃ユ湡">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鐐规瑕佹眰:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <textarea name="HClaim" id="HClaim" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍗曟嵁鍙�:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HInterID" id="HInterID">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍗曟嵁鏃ユ湡:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="datetime" class="layui-input" name="HDate" id="HDate" placeholder="璇烽�夋嫨鏃ユ湡" readonly disabled>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">閮ㄩ棬:</label>
- <div class="layui-input-block">
- <input type="text" name="HDeptName" id="HDeptName" class="layui-input" style="width:80%;">
- <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Department" 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-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">璐熻矗浜�:</label>
- <div class="layui-input-block">
- <input type="text" name="HManagerName" id="HManagerName" class="layui-input" style="width:80%;">
- <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HManager" 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" style="width: 75px;padding: 9px 5px;">鐐规椤圭洰:</label>
- <div class="layui-input-block">
- <input type="text" name="HDotCheckItem" id="HDotCheckItem" class="layui-input" style="width:80%;">
- <input type="hidden" name="HDotCheckItemID" id="HDotCheckItemID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HDotCheckItemList" 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" style="width: 75px;">鐐规閮ㄤ綅:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" class="layui-input" name="HDotCheckPart" id="HDotCheckPart" >
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍚嶇О:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿瑙勬牸:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HBarSpec" id="HBarSpec" class="layui-input" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍨嬪彿:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HBarModel" id="HBarModel" class="layui-input" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- </div>
- </div>
+ <table style="width:80%;">
+ <tbody>
+ <tr>
+ <th>鍣ㄥ叿鏉＄爜</th>
+ <td class="bz_td">
+ <input type="text" name="HBarCode" class="layui-input LineHeight" id="HBarCode" placeholder="璇疯緭鍏ュ櫒鍏锋潯鐮佸悗鍥炶溅" style="border-radius: 50px;">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin" style="line-height: 30px;">纭畾</button>
+ </td>
+ </tr>
+ <tr>
+ <th>鐐规寮�濮�</th>
+ <td class="bz_td">
+ <input type="datetime" name="HBeginDate" class="layui-input LineHeight" id="HBeginDate" placeholder="璇烽�夋嫨鏃ユ湡" style="border-radius: 50px;">
+ </td>
+ </tr>
+ <tr>
+ <th>鐐规缁撴潫</th>
+ <td class="bz_td">
+ <input type="datetime" name="HEndDate" class="layui-input LineHeight" id="HEndDate" placeholder="璇烽�夋嫨鏃ユ湡" style="border-radius: 50px;">
+ </td>
+ </tr>
+ <tr>
+ <th>鐐规瑕佹眰</th>
+ <td class="bz_td">
+ <input type="text" name="HClaim" class="layui-input LineHeight" id="HClaim" placeholder="璇疯緭鍏ョ偣妫�瑕佹眰" style="border-radius: 50px;">
+ </td>
+ </tr>
+ <tr>
+ <th>鏈�缁堢粨璁�</th>
+ <td class="bz_td">
+ <input type="radio" name="HLastResult" value="OK" title="OK" checked="">
+ <input type="radio" name="HLastResult" value="NG" title="NG">
+ </td>
+ </tr>
+ <tr>
+ <th>寮傚父鎯呭喌<br />璁板綍</th>
+ <td class="bz_td" style="margin-top:10px;">
+ <input type="text" name="HErrNote" class="layui-input LineHeight" id="HErrNote" placeholder="璇疯緭鍏ュ紓甯告儏鍐佃褰�" style="border-radius: 50px;">
+ </td>
+ </tr>
+ <tr>
+ <th>閲嶅ぇ瀹夊叏<br />闅愭偅璁板綍</th>
+ <td class="bz_td" style="margin-top:10px;">
+ <input type="text" name="HBigSafeNote" class="layui-input LineHeight" id="HBigSafeNote" placeholder="璇疯緭鍏ラ噸澶у畨鍏ㄩ殣鎮ｈ褰�" style="border-radius: 50px;">
+ </td>
+ </tr>
+ <tr>
+ <th>鐐规鏁版嵁</th>
+ <td class="bz_td">
+ <input type="text" name="HDotCheckNote" class="layui-input LineHeight" id="HDotCheckNote" placeholder="璇疯緭鍏ョ偣妫�鏁版嵁" style="border-radius: 50px;">
+ </td>
+ </tr>
+ <tr>
+ <th>鐢熶骇鐝</th>
+ <td class="bz_td">
+ <input type="text" name="HShiftsName" class="layui-input LineHeight" id="HShiftsName" placeholder="閫夋嫨鐢熶骇鐝" style="background-color:#efefef4d;">
+ <input type="hidden" name="HShiftsID" id="HShiftsID" value="0" autocomplete="off" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="btnShifts" id="btnShifts" style="font-weight:bolder">...</button>
+ </td>
+ </tr>
+ <tr>
+ <th>鍗� 鎹� 鍙�</th>
+ <td class="bz_td">
+ <input type="text" name="HBillNo" class="layui-input LineHeight" id="HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID" value="0" autocomplete="off" class="layui-input">
+ </td>
+ </tr>
+ <tr>
+ <th>鍗曟嵁鏃ユ湡</th>
+ <td class="bz_td">
+ <input type="datetime" name="HDate" class="layui-input LineHeight" id="HDate" placeholder="璇烽�夋嫨鏃ユ湡" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>閮�    闂�</th>
+ <td class="bz_td">
+ <input type="text" name="HDeptName" class="layui-input LineHeight" id="HDeptName" placeholder="閫夋嫨閮ㄩ棬" style="background-color:#efefef4d;">
+ <input type="hidden" name="HDeptID" id="HDeptID" value="0" autocomplete="off" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="Department" id="Department" style="font-weight:bolder">...</button>
+ </td>
+ </tr>
+ <tr>
+ <th>澶�    娉�</th>
+ <td class="bz_td">
+ <input type="text" name="HRemark" class="layui-input LineHeight" id="HRemark" placeholder="璇疯緭鍏ュ娉�" style="border-radius: 50px;">
+ </td>
+ </tr>
+ <tr>
+ <th>鍣ㄥ叿鍚嶇О</th>
+ <td class="bz_td">
+ <input type="text" name="HBarName" class="layui-input LineHeight" id="HBarName" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+ <input type="hidden" name="HMouldID" id="HMouldID" value="0" autocomplete="off" class="layui-input">
+ </td>
+ </tr>
+ <tr>
+ <th>鍣ㄥ叿瑙勬牸</th>
+ <td class="bz_td">
+ <input type="text" name="HBarSpec" class="layui-input LineHeight" id="HBarSpec" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>鍣ㄥ叿鍨嬪彿</th>
+ <td class="bz_td">
+ <input type="text" name="HBarModel" class="layui-input LineHeight" id="HBarModel" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>鐐规璁″垝</th>
+ <td class="bz_td">
+ <input type="text" name="HPlanNo" class="layui-input LineHeight" id="HPlanNo" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+ <input type="hidden" name="HPlanInterID" class="layui-input LineHeight" id="HPlanInterID" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+ <input type="hidden" name="HPlanEntryID" class="layui-input LineHeight" id="HPlanEntryID" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="btnMouldDotCheckPlan" id="btnMouldDotCheckPlan" style="font-weight:bolder">...</button>
+ </td>
+ </tr>
+ </tbody>
+ </table>
</div>
<div class="layui-tab-item">
- <div class="layui-form-item" style="padding-top: 10px;">
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍒涘缓浜�:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍒涘缓鏃ユ湡:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly disabled>
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">淇敼浜�:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly disabled>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">淇敼鏃ユ湡:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly disabled>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">瀹℃牳浜�:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">瀹℃牳鏃ユ湡:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly disabled>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">浣滃簾浜�:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">浣滃簾鏃ユ湡:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly disabled>
- </div>
- </div>
+ <div class="layui-inline" style="margin-bottom:5px;">
+ <label class="layui-form-label" style="width:100px;">鍣ㄥ叿鐐规瑙勭▼</label>
+ <div class="layui-input-inline">
+ <input type="hidden" name="HMouldDotCheckRuleID" id="HMouldDotCheckRuleID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="text" name="HMouldDotCheckRuleNo" id="HMouldDotCheckRuleNo" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEquipDotCheckRuleInterist" style="width:40px;display:none;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炶</button>
+ </div>
+ </script>
+ <script type="text/html" id="xuhao">
+ {{d.LAY_TABLE_INDEX+1}}
+ </script>
+ <script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ </div>
+ <div class="layui-tab-item">
+ <table style="width:80%;">
+ <tbody>
+ <tr>
+ <th>鍒涘缓浜�</th>
+ <td class="bz_td">
+ <input type="text" name="HMaker" class="layui-input" id="HMaker" style="border-radius: 50px;">
+ </td>
+ </tr>
+ <tr>
+ <th>鍒涘缓鏃ユ湡</th>
+ <td class="bz_td">
+ <input type="text" name="HMakeDate" class="layui-input" id="HMakeDate" style="border-radius: 50px;">
+ </td>
+ </tr>
+ <tr>
+ <th>淇敼浜�</th>
+ <td class="bz_td">
+ <input type="text" name="HUpDater" class="layui-input" id="HUpDater" style="border-radius: 50px;">
+ </td>
+ </tr>
+ <tr>
+ <th>淇敼鏃ユ湡</th>
+ <td class="bz_td">
+ <input type="text" name="HUpDateDate" class="layui-input" id="HUpDateDate" style="border-radius: 50px;">
+ </td>
+ </tr>
+ <tr>
+ <th>瀹℃牳浜�</th>
+ <td class="bz_td">
+ <input type="text" name="HChecker" class="layui-input" id="HChecker" style="border-radius: 50px;">
+ </td>
+ </tr>
+ <tr>
+ <th>瀹℃牳鏃ユ湡</th>
+ <td class="bz_td">
+ <input type="text" name="HCheckDate" class="layui-input" id="HCheckDate" style="border-radius: 50px;">
+ </td>
+ </tr>
+ <tr>
+ <th>浣滃簾浜�</th>
+ <td class="bz_td">
+ <input type="text" name="HDeleteMan" class="layui-input" id="HDeleteMan" style="border-radius: 50px;">
+ </td>
+ </tr>
+ <tr>
+ <th>浣滃簾鏃ユ湡</th>
+ <td class="bz_td">
+ <input type="text" name="HDeleteDate" class="layui-input" id="HDeleteDate" style="border-radius: 50px;">
+ </td>
+ </tr>
+ </tbody>
+ </table>
</div>
</div>
- </div>
-
-
- <div class="layer-footer" style="text-align: center;">
- <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Saver" id="Saver">鎻愪氦</button>
- <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Add">鏂板</button>
- <button type="button" class="layui-btn buttom_box_little" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+ <ul class="layui-tab-title">
+ <li class="layui-this">鍩烘湰淇℃伅</li>
+ <li>鏄庣粏淇℃伅</li>
+ <li>鍏朵粬淇℃伅</li>
+ </ul>
</div>
<!--闅愯棌瀛楁-->
<input type="hidden" name="lngBillKey" id="lngBillKey">
<input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
-
</form>
</div>
</div>
</div>
-
+ <!--琛屼笅鎷夐�夋嫨(鐐规缁撴灉)-->
+ <!--<script type="text/html" id="HDotCheckResult">
+ <select name="HDotCheckResult" lay-filter="HDotCheckResult" id="HDotCheckResult{{d.LAY_TABLE_INDEX+1}}" style="height:30px;">
+ <option value="OK">OK</option>
+ <option value="NG">NG</option>
+ </select>
+ </script>-->
+ <!--澶嶉�夋锛堢偣妫�缁撴灉锛�-->
+ <script type="text/html" id="HDotCheckResult">
+ <input type="checkbox" value="{{d.HDotCheckResult}}" lay-skin="primary" id="HDotCheckResult{{d.LAY_TABLE_INDEX+1}}" lay-filter="HDotCheckResult" {{ d.HDotCheckResult == 1 ? 'checked' : '' }}>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(鐐规缁撴灉)-->
+ <!--<script type="text/html" id="HDotCheckResult">
+ <select name="HDotCheckResult" lay-filter="HDotCheckResult" id="HDotCheckResult{{d.LAY_TABLE_INDEX+1}}">-->
+ <!--<option value="">璇烽�夋嫨</option>-->
+ <!--<option value="Y" selected>Y</option>
+ <option value="X">X</option>
+ </select>
+ </script>-->
<script>
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -278,8 +333,9 @@
, form = layui.form
, laydate = layui.laydate
, element = layui.element;
+ var option = [];
- //鏃ユ湡鏃堕棿閫夋嫨鍣�
+ //#region 鍒濆鍖栭〉闈�
laydate.render({
elem: '#HBeginDate'
, type: 'datetime'
@@ -308,6 +364,50 @@
elem: '#HDeleteDate'
, type: 'datetime'
});
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鑾峰彇鏈�澶у崟鎹彿
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3821' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HInterID").val("0");
+ $("#HBillNo").val(d.data[0].HBillNo);
+ }
+ });
+
+ //褰撳墠鎵�鍦ㄩ〉绛�
+ var cur_title = "鍩烘湰淇℃伅";
+ var HCheckNum = 0;
+ //鐩戝惉褰撳墠澶勪簬鍝竴涓〉绛撅紝浼� HModName 鍊�
+ element.on('tab(TabTest)', function (data) {
+ cur_title = data.elem.context.innerText;
+ if (cur_title == "鏄庣粏淇℃伅") {
+ HCheckNum++;
+ }
+ })
+
+ //#endregion
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ var NewRow = { "HDotCheckResult": false,"HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" };
+
+ switch (obj.event) {
+ //鏂板涓�琛�
+ case 'btn-AddLine': btnAddLine(NewRow);
+ break;
+ }
+ });
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+ });
//杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
$("#HBarCode").focus();
@@ -316,28 +416,16 @@
$("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规寮�濮嬫椂闂�
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规缁撴潫鏃堕棿
$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
-
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
+
$("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
$("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
$("#HManagerID").val(sessionStorage["HBillerID"]); //璐熻矗浜篒D
$("#HManagerName").val(sessionStorage["HUserName"]); //璐熻矗浜�
$("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
+
//妯℃不鍏锋潯鐮佹槸鍚︽壂鎻忔爣璁�
var HProcExchBillNoFlag = false;
-
- //鑾峰彇鏈�澶у崟鎹彿
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '3903' },
- success: function (d) {
- //console.log(d.data);
- $("#HInterID").val("0");
- $("#HBillNo").val(d.data[0].HBillNo);
- }
- });
-
//鏉″舰鐮佸洖杞︽柟娉�
$('#HBarCode').on('keydown', function (event) {
@@ -345,71 +433,91 @@
GetMeesageByBarCode();
}
});
-
- //閫�鍑�-鍏抽棴椤甸潰鏂规硶
- $('#Cancel').on('click', function () {
- layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- parent.layui.admin.events.closeThisTabs(); //鍏抽棴椤电
+ //琛岄�夋嫨澶勭悊锛堟楠岀粨鏋滐級
+ //form.on('select(HDotCheckResult)', function (data) {
+ // //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ // var elem = data.othis.parents('tr');
+ // var dataindex = elem.attr("data-index");
+ // $.each(option.data, function (index, value) {
+ // if (value.LAY_TABLE_INDEX == dataindex) {
+ // value.HDotCheckResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ // }
+ // });
+ //});
+
+ //鏄惁鍚堟牸
+ form.on('checkbox(HDotCheckResult)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HDotCheckResult = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
});
- })
-
+ });
//纭畾
form.on('submit(QueDin)', function (data) {
GetMeesageByBarCode();
});
+
+ //閫�鍑�-鍏抽棴椤甸潰鏂规硶
+ $('#Cancel').on('click', function () {
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ parent.location.href = "../../../views/index_Mobile.html";
+ });
+ })
+
//鎻愪氦
form.on('submit(Saver)', function (data) {//鎻愪氦
- //var tableData = data.field;
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
var oMain = JSON.stringify(data.field);
- //var oMain = data.field;
- var index = layer.load();
- $.ajax({
- type: "POST",
- url: GetWEBURL() + "/Sb_EquipDotCheckBill/savebill",//Mj_PDA_MoudlCheckBill/SaveGetMoudlCheckBillList
- //url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",
- async: true,
- data: { "msg": oMain },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) {
- //layer.confirm(data.Message, {
- // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- // btn2: function () {
- // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- // parent.location.href = "../../../views/index.html"
- // }//鍏抽棴
- //}, function () { window.location.reload(); });//鏂板
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
+ var sMainSub = oMain + ';' + sSubStr + ";" + sessionStorage["HUserName"];
+
+ if (AllowLoadData(sSubStr)) {
+ $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳绂佺敤
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Sc_MouldDotCheckBill/SaveGetMouldDotCheckBillList",
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.msg("鎻愪氦鎴愬姛");
+ $('#Saver').removeClass("buttom_box_little");
+ $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
+ }
+ else {
+ $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);//淇濆瓨鎸夐挳鍚敤
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
layer.close(index);
- layer.msg("鎻愪氦鎴愬姛");
- $('#Saver').removeClass("buttom_box_little");
- $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
- else {
- layer.close(index);
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- },
- error: function (err) {
- layer.close(index);
- layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- });
+ });
+ }
+
});
+
//鏂板
form.on('submit(Add)', function (data) {
$('#Saver').addClass("buttom_box_little");
$('#Saver').addClass("layui-btn-disabled").attr("disabled", false);
$("#HBarCode").removeAttr("readonly");//鏉″舰鐮佹竻闄ゅ彧璇�
$("#HBarCode").removeAttr("background-color");//鏉″舰鐮佹竻闄よ儗鏅壊
-
+
// 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
$("#formData")[0].reset();
layui.form.render();
-
+ option.data = [{ "HDotCheckResult": false,"HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
+ table.render(option);
$("#HBarCode").focus();
//鑾峰彇鏈�澶у崟鎹彿
@@ -426,9 +534,18 @@
$("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规寮�濮嬫椂闂�
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规缁撴潫鏃堕棿
$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
$("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
})
+
+ //#region 閫�鍑烘寜閽�
+ form.on('submit(Cancel)', function () {
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ parent.location.href = "../../../views/index_Mobile.html";
+ });
+ })
+ //#endregion
+
//閮ㄩ棬寮圭獥
form.on('submit(Department)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -440,24 +557,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
- cancel: function (index, layero) {
- }
- });
- });
-
- //璐熻矗浜哄脊绐�
- //椤甸潰灞�-鑷畾涔�
- form.on('submit(HManager)', function () {
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '浜哄憳鍒楄〃',
- closeBtn: 1,
- shift: 2,
- area: ['80%', '80%'],
- maxmin: true,
- content: ['../../PublicPage/UserInformation.html?TreeFlag=false', 'yes'],
+ content: ['../../../views/PublicPage/DeptInformation_PDA.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -466,8 +566,8 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HManagerName").val(checkStatus.data[0].HName);
- $("#HManagerID").val(checkStatus.data[0].HItemID);
+ $("#HDeptName").val(checkStatus.data[0].HName);
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -483,73 +583,455 @@
});
});
- //鐐规椤圭洰寮圭獥
- form.on('submit(HDotCheckItemList)', function () {
+ //鍣ㄥ叿鐐规璁″垝寮圭獥
+ form.on('submit(btnMouldDotCheckPlan)', function () {
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鐐规椤圭洰鍒楄〃',
+ title: '鍣ㄥ叿鐐规璁″垝鍒楄〃',
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../Baseset/鍩虹璧勬枡/Gy_CheckItemList.html', 'yes'],
- cancel: function (index, layero) {
+ content: ['../../../views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldDotCheckPlanBillList.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('璇烽�夋嫨鏁版嵁');
+ }
+
+ $("#HPlanNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+ $("#HPlanInterID").val(checkStatus.data[0].hmainid);
+ $("#HPlanEntryID").val(checkStatus.data[0].hsubid);
+
+ get_DocCheckItemByPlan(checkStatus.data[0].hmainid);
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
}
});
});
-
+ //琛ㄥご淇℃伅鐢熶骇鐝寮圭獥
+ form.on('submit(btnShifts)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐢熶骇鐝鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HShiftsID").val(checkStatus.data[0].HItemID);
+ $("#HShiftsName").val(checkStatus.data[0].鐝鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ },
+ success: function (layero, index) {
+ }
+ });
+ });
+
+ //琛ㄥご淇℃伅璁惧淇濆吇瑙勭▼
+ form.on('submit(HEquipDotCheckRuleInterist)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璁惧鐐规瑙勭▼鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../../璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleList_PDA.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HMouldDotCheckRuleNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+ $("#HMouldDotCheckRuleID").val(checkStatus.data[0].hmainid);
+ get_DocCheckItem2();
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ },
+ success: function (layero, index) {
+ }
+ });
+ });
+
+ function get_DocCheckItemByPlan(HPlanID) {
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetItemByMouldDotCheckPlan",
+ type: "GET",
+ data: { "HInterID": HPlanID },
+ success: function (result) {
+ if (result.code == 1) {
+ var data = result.data;
+ $("#HMouldDotCheckRuleID").val(data[0].鐐规瑙勭▼ID);
+ $("#HMouldDotCheckRuleNo").val(data[0].鐐规瑙勭▼鍗曞彿);
+ $("#HPlanNo").val(data[0].鐐规璁″垝鍗�);
+ $("#HPlanInterID").val(data[0].鐐规璁″垝ID);
+ $("#HPlanEntryID").val(data[0].鐐规璁″垝瀛怚D);
+ var rowdata = [];
+ for (let i = 0; i < data.length; i++) {
+ rowdata.push(
+ {
+ "HDotCheckResult": data[i].榛樿缁撹, "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckCode": data[i].鐐规椤圭洰浠ｇ爜, "HDotCheckItem": data[i].鐐规椤圭洰鍚嶇О,
+ "HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerCode": data[i].璐熻矗浜轰唬鐮�,
+ "HManagerName": data[i].璐熻矗浜哄悕绉�, "HSourceInterID": data[i].鐐规璁″垝ID, "HSourceEntryID": data[i].鐐规璁″垝瀛怚D, "HSourceBillNo": data[i].鐐规璁″垝鍗�, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""
+ }
+ );
+ }
+ option.data = rowdata;
+ table.render(option);
+ }
+ }
+ })
+ }
+
+ function get_DocCheckItem2() {
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetDotCheckRuleItemByDotCheckRuleID",
+ type: "GET",
+ data: { "HDotCheckRuleInterID": $("#HMouldDotCheckRuleID").val() },
+ success: function (result) {
+ if (result != null) {
+ if (result.count == 1) {
+ var BYData = result;//
+ var rowdate1 = layui.table.cache["mainTable"];
+ var data = result.data;
+ option.data = [{ "HDotCheckResult": false,"HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
+ table.render(option);
+
+ if (BYData.data.length != 0) //琛ㄤ綋鏁版嵁涓虹┖鏃�
+ {
+ buttonArr = [];//娓呯┖鏁扮粍
+
+ for (var i = 0; i < BYData.data.length; i++) {
+ var checkrow = {
+ "HDotCheckItemID": data[i].HDotCheckItemID, "HDotCheckCode": data[i].HDotCheckCode, "HDotCheckItem": data[i].HDotCheckItem,
+ "HDotCheckPart": data[i].HDotCheckPart, "HClaim": rowdate1[i].HClaim, "HManagerID": data[i].HManagerID, "HManagerCode": data[i].HManagerCode,
+ "HManagerName": data[i].HManagerName, "HSourceInterID": data[i].鐐规璁″垝ID, "HSourceEntryID": data[i].鐐规璁″垝瀛怚D, "HSourceBillNo": data[i].鐐规璁″垝鍗�, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": false
+ };
+ buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+ }
+ table.reload("mainTable", {
+ data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ })
+ }
+ }
+ else {
+ option.data = [{ "HDotCheckResult": false,"HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
+ table.render(option);
+ layer.alert("璇ヨ澶囨殏鏃犻粯璁ょ偣妫�璁板綍", { icon: 5 });
+ }
+ }
+ }
+ })
+ }
+
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ //琛ㄥご
+ columns = [
+ //{ type: 'checkbox' }
+ { templet: '#xuhao', title: '搴忓彿', event: "qwe", width: 45 }
+ , { field: 'HDotCheckResult', title: '缁撴灉', templet: '#HDotCheckResult', width: 55 }
+ , { field: 'HDotCheckItemID', title: '鐐规椤圭洰ID', edit: 'text', hide: true }
+ , { field: 'HDotCheckCode', title: '鐐规椤圭洰浠ｇ爜', edit: 'text', event: "HDotCheckCode", width: 115, hide: true }
+ , { field: 'HDotCheckItem', title: '鐐规椤圭洰', edit: 'text', event: "" }
+ , { field: 'HDotCheckItemClassID', title: '鐐规椤圭洰鍒嗙被ID', edit: 'text', hide: true }
+ , { field: 'HDotCheckItemClassName', title: '鐐规椤圭洰鍒嗙被', edit: 'text', event: 'HDotCheckItemClassName' }
+ , { field: 'HDotCheckItemMethodID', title: '鐐规鏂规硶ID', edit: 'text', hide: true }
+ , { field: 'HDotCheckItemMethodName', title: '鐐规鏂规硶', edit: 'text', event: 'HDotCheckItemMethodName' }
+ //, { field: 'HDotCheckResult', title: '鐐规缁撴灉', templet: '#HDotCheckResult', event: 'HDotCheckResult' }
+ , { field: 'HDotCheckPart', title: '鐐规閮ㄤ綅', edit: 'text', event: "" }
+ , { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
+ , { field: 'HManagerID', title: '璐熻矗浜轰唬鐮�', edit: 'text', hide: true }
+ , { field: 'HManagerCode', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: 'HManagerCode', width: 150, hide: true }
+ , { field: 'HManagerName', title: '璐熻矗浜哄悕绉�', edit: 'text' }
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+ , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', edit: 'text', hide: true }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', edit: 'text', hide: true }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', edit: 'text', hide: true }
+ , { title: '鎿嶄綔', toolbar: '#barDemo', width: 80 }
+ ];
+ option = {
+ id: 'mainTable'
+ , elem: '#mainTable'
+ //, toolbar: '#toolbarDemo'
+ , page: false
+ , cellMinWidth: 100
+ , limit: 100
+ , height: 'full-205'
+ , cols: [columns]
+ , done: function (res, curr, count) {
+
+ }
+ };
+
+ option.data = [{ "HDotCheckResult": false, "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
+ table.render(option);
+ }
+ //澧炲姞涓�琛�
+ function btnAddLine(NewRow) {
+ var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+ buttonArr = [];//娓呯┖鏁扮粍
+ for (var i = 0; i < tableBak.length; i++) {
+ buttonArr.push(tableBak[i]); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+ }
+ buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
+ table.reload("mainTable", {
+ data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ })
+ }
+
+ // 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ //obj.del();
+ //layer.close(index);
+ var oldData = table.cache["mainTable"];
+ oldData.splice(obj.tr.data('index'), 1);
+ table.reload('mainTable', { data: oldData });
+ layer.close(index);
+ }
+ });
+ }
+ }
+ //鏁版嵁楠岃瘉
+ function AllowLoadData(sSubStr) {
+ if (HCheckNum < 1) {
+ layer.msg("璇峰埌 鏄庣粏淇℃伅 椤电涓牳瀵硅繃涓�娆′俊鎭悗鍐嶇偣鍑讳繚瀛樻寜閽�", { icon: 5, btn: ['纭'], time: 10000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+
+ if ($("#HBarName").val() == '') {
+ layer.msg("璁惧娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+
+ if ($("#HMouldDotCheckRuleID").val() == 0 || $("#HMouldDotCheckRuleNo").val() == '') {
+ layer.msg("鐐规瑙勭▼涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ //鍒ゆ柇鏄庣粏椤�
+ if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
+ layer.msg("娌℃湁鐐规椤圭洰鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+ sSubStr = JSON.parse(sSubStr);
+ for (var i = 0; i < sSubStr.length; i++) {
+ if (sSubStr[i].HDotCheckCode == "" || sSubStr[i].HDotCheckItemID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐐规椤圭洰浠ｇ爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (sSubStr[i].HManagerCode == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璐熻矗浜轰唬鐮佷俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ else {
+ return true;
+ }
+ }
+ }
+ else {
+ return true;
+ }
+ }
+ //鎵潯鐮�
+ function GetMeesageByBarCode(obj) { //杩斿洖宸ヤ綔涓績
+ var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+ if (!HBarCode) {
+ layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+ return;
+ }
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/QJ_PDA_MouldDotCheckBill/txtHBarCode_KeyDown",
+ type: "GET",
+ data: { "HBarCode": HBarCode },
+ success: function (result) {
+ if (result.data.length == 1) {
+ var data = result.data[0];
+ $("#HMouldID").val(data.HInterID);
+ $("#HBarName").val(data.HName);
+ $("#HBarSpec").val(data.HModel);
+ $("#HBarModel").val(data.HModel2);
+ $("#HQty").val(1);
+ $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+ $("#HBarCode").css("background-color", "#efefef4d");
+ HProcExchBillNoFlag = true;
+ //get_DocCheckItem();
+ layer.close(index);
+ }
+ else {
+ layer.close(index);
+ layer.msg("鏈煡鎵惧埌鏁版嵁", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ function get_DocCheckItem() {
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetItemByEquipFile",
+ type: "GET",
+ data: { "MouldProjectID": $("#HMouldID").val(), "Type": "DJ", "HDate": $("#HBeginDate").val() },
+ success: function (result) {
+ if (result.code == 1) {
+ var data = result.data;
+ $("#HMouldDotCheckRuleID").val(data[0].鐐规瑙勭▼ID);
+ $("#HMouldDotCheckRuleNo").val(data[0].鐐规瑙勭▼鍗曞彿);
+ $("#HPlanNo").val(data[0].鐐规璁″垝鍗�);
+ $("#HPlanInterID").val(data[0].鐐规璁″垝ID);
+ $("#HPlanEntryID").val(data[0].鐐规璁″垝瀛怚D);
+ var rowdata = [];
+ for (let i = 0; i < data.length; i++) {
+ rowdata.push(
+ {
+ "HDotCheckResult": data[i].榛樿缁撹, "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckCode": data[i].鐐规椤圭洰浠ｇ爜, "HDotCheckItem": data[i].鐐规椤圭洰鍚嶇О,
+ "HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerCode": data[i].璐熻矗浜轰唬鐮�,
+ "HManagerName": data[i].璐熻矗浜哄悕绉�, "HSourceInterID": data[i].鐐规璁″垝ID, "HSourceEntryID": data[i].鐐规璁″垝瀛怚D, "HSourceBillNo": data[i].鐐规璁″垝鍗�, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""
+ }
+ );
+ }
+ option.data = rowdata;
+ table.render(option);
+ }
+ }
+ })
+ }
+
+ //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
+ function set_GridCellCheck(obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ if (obj.event === 'HDotCheckItemClassName') //鐐规椤圭洰鍒嗙被
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐐规椤圭洰鍒嗙被鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true
+ , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemClassList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HDotCheckItemClassID: checkStatus.data[0].HItemID,
+ HDotCheckItemClassName: checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ }
+ });
+ }
+ if (obj.event === 'HDotCheckItemMethodName') //鐐规鏂规硶
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐐规鏂规硶鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true
+ , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemMethodList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HDotCheckItemMethodID: checkStatus.data[0].HItemID,
+ HDotCheckItemMethodName: checkStatus.data[0].鐐规鏂规硶鍚嶇О
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ }
+ });
+ }
+
+ obj.event = "";
+ return false;
+
+ }
+
+ })
+ }
//浠ヤ笂涓簂ayui妯″潡
});
-
- //杩斿洖閮ㄩ棬
- function GetHDeptNameValue(obj) {
- $("#HDeptName").val(obj[0].HName);
- $("#HDeptID").val(obj[0].HItemID);
- }
- //杩斿洖鐐规椤圭洰
- function GetHCheckNameValue(obj) {
- $("#HDotCheckItem").val(obj[0].HName);
- $("#HDotCheckItemID").val(obj[0].HItemID);
- }
- //鎵潯鐮�
- function GetMeesageByBarCode(obj) { //杩斿洖宸ヤ綔涓績
- var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
- if (!HBarCode) {
- layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
- return;
- }
- var index = layer.load();
- $.ajax({
- url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
- type: "GET",
- data: { "HBarCode": HBarCode },
- success: function (result) {
- if (result.data.length == 1) {
- var data = result.data[0];
- $("#HMouldID").val(data.hinterid);
- $("#HBarName").val(data.HName);
- $("#HBarSpec").val(data.HModel);
- $("#HBarModel").val(data.HModel2);
- $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
- $("#HBarCode").css("background-color", "#efefef4d");
-
- HProcExchBillNoFlag = true;
- layer.close(index);
- }
- else {
- layer.close(index);
- layer.msg("鏈煡鎵惧埌鏁版嵁", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- },
- error: function (err) {
- layer.close(index);
- layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- });
- }
</script>
</body>
</html>
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\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldDotCheckBill_PDA_OLD.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\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldDotCheckBill_PDA_OLD.html"
new file mode 100644
index 0000000..a07128d
--- /dev/null
+++ "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\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldDotCheckBill_PDA_OLD.html"
@@ -0,0 +1,555 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>鍣ㄥ叿鐐规璁板綍鍗�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <!--寮曠敤layui鏍峰紡鏂囦欢-->
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <!--寮曠敤layui js鏂囦欢-->
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <!--鑷畾涔夋牱寮�-->
+ <style>
+ .maintitle {
+ background-color: #1492ff;
+ color: #fff;
+ padding: 5px 10px;
+ border: none;
+ border-radius: 4px;
+ }
+
+ .title {
+ border-left: 4px solid #1492ff;
+ padding-left: 6px;
+ margin: 20px 10px 4px;
+ font-size: 16px;
+ color: #333;
+ }
+
+ .buttom_box_little {
+ width: 60px;
+ height: 36px;
+ color: #fff;
+ background-color: #1492ff;
+ border-radius: 4px;
+ border: none;
+ margin: 10px;
+ }
+
+ .layui-input {
+ width: 93%;
+ }
+ .layui-inline, img {
+ display: block;
+ vertical-align: middle
+ }
+ .layui-input, .layui-textarea {
+ display: inline-block;
+ width: 100%;
+ padding-left: 10px;
+ }
+
+ .laydate-time-list ol {
+ overflow-x: hidden !important;
+ overflow-y: auto !important;
+ }
+ .layui-form-label {
+ padding: 9px 5px;
+ }
+ .layui-input-block {
+ margin-left: 85px;
+ min-height: 36px;
+ }
+ </style>
+</head>
+
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 15px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
+ <div class="maintitle">鍣ㄥ叿鐐规璁板綍鍗�</div>
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍣ㄥ叿鏉＄爜</label>
+ <div class="layui-input-block" style="margin-left: 100px;width:46%;">
+ <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鍩烘湰淇℃伅</li>
+ <li>鍏朵粬淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">鐐规寮�濮�:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="datetime" class="layui-input" name="HBeginDate" id="HBeginDate" placeholder="璇烽�夋嫨鏃ユ湡">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">鐐规缁撴潫:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="datetime" class="layui-input" name="HEndDate" id="HEndDate" placeholder="璇烽�夋嫨鏃ユ湡">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">鐐规瑕佹眰:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <textarea name="HClaim" id="HClaim" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">鍗曟嵁鍙�:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">鍗曟嵁鏃ユ湡:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="datetime" class="layui-input" name="HDate" id="HDate" placeholder="璇烽�夋嫨鏃ユ湡" readonly disabled>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">閮ㄩ棬:</label>
+ <div class="layui-input-block">
+ <input type="text" name="HDeptName" id="HDeptName" class="layui-input" style="width:80%;">
+ <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Department" 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-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">璐熻矗浜�:</label>
+ <div class="layui-input-block">
+ <input type="text" name="HManagerName" id="HManagerName" class="layui-input" style="width:80%;">
+ <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HManager" 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" style="width: 75px;padding: 9px 5px;">鐐规椤圭洰:</label>
+ <div class="layui-input-block">
+ <input type="text" name="HDotCheckItem" id="HDotCheckItem" class="layui-input" style="width:80%;">
+ <input type="hidden" name="HDotCheckItemID" id="HDotCheckItemID" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HDotCheckItemList" 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" style="width: 75px;">鐐规閮ㄤ綅:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="text" class="layui-input" name="HDotCheckPart" id="HDotCheckPart" >
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍚嶇О:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿瑙勬牸:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="text" name="HBarSpec" id="HBarSpec" class="layui-input" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍨嬪彿:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="text" name="HBarModel" id="HBarModel" class="layui-input" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">鍒涘缓浜�:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">鍒涘缓鏃ユ湡:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly disabled>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">淇敼浜�:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly disabled>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">淇敼鏃ユ湡:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly disabled>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">瀹℃牳浜�:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">瀹℃牳鏃ユ湡:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly disabled>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">浣滃簾浜�:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">浣滃簾鏃ユ湡:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly disabled>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="layer-footer" style="text-align: center;">
+ <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Saver" id="Saver">鎻愪氦</button>
+ <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Add">鏂板</button>
+ <button type="button" class="layui-btn buttom_box_little" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+ </div>
+ <!--闅愯棌瀛楁-->
+ <input type="hidden" name="lngBillKey" id="lngBillKey">
+ <input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
+
+ </form>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+
+ //鏃ユ湡鏃堕棿閫夋嫨鍣�
+ laydate.render({
+ elem: '#HBeginDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HEndDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HMakeDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HUpDateDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HCheckDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HDeleteDate'
+ , type: 'datetime'
+ });
+
+ //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
+ $("#HBarCode").focus();
+
+ //鍒濆鍩烘湰淇℃伅璧嬪��
+ $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规寮�濮嬫椂闂�
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规缁撴潫鏃堕棿
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
+
+ $("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
+ $("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
+ $("#HManagerID").val(sessionStorage["HBillerID"]); //璐熻矗浜篒D
+ $("#HManagerName").val(sessionStorage["HUserName"]); //璐熻矗浜�
+ $("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
+ //妯℃不鍏锋潯鐮佹槸鍚︽壂鎻忔爣璁�
+ var HProcExchBillNoFlag = false;
+
+ //鑾峰彇鏈�澶у崟鎹彿
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3903' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HInterID").val("0");
+ $("#HBillNo").val(d.data[0].HBillNo);
+ }
+ });
+
+
+ //鏉″舰鐮佸洖杞︽柟娉�
+ $('#HBarCode').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ GetMeesageByBarCode();
+ }
+ });
+
+
+ //閫�鍑�-鍏抽棴椤甸潰鏂规硶
+ $('#Cancel').on('click', function () {
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ parent.layui.admin.events.closeThisTabs(); //鍏抽棴椤电
+ });
+ })
+
+
+ //纭畾
+ form.on('submit(QueDin)', function (data) {
+ GetMeesageByBarCode();
+ });
+ //鎻愪氦
+ form.on('submit(Saver)', function (data) {//鎻愪氦
+ //var tableData = data.field;
+ data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
+ var oMain = JSON.stringify(data.field);
+ //var oMain = data.field;
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Sb_EquipDotCheckBill/savebill",//Mj_PDA_MoudlCheckBill/SaveGetMoudlCheckBillList
+ //url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",
+ async: true,
+ data: { "msg": oMain },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ //layer.confirm(data.Message, {
+ // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
+ // btn2: function () {
+ // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
+ // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
+ // parent.location.href = "../../../views/index.html"
+ // }//鍏抽棴
+ //}, function () { window.location.reload(); });//鏂板
+ layer.close(index);
+ layer.msg("鎻愪氦鎴愬姛");
+ $('#Saver').removeClass("buttom_box_little");
+ $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ });
+ //鏂板
+ form.on('submit(Add)', function (data) {
+ $('#Saver').addClass("buttom_box_little");
+ $('#Saver').addClass("layui-btn-disabled").attr("disabled", false);
+ $("#HBarCode").removeAttr("readonly");//鏉″舰鐮佹竻闄ゅ彧璇�
+ $("#HBarCode").removeAttr("background-color");//鏉″舰鐮佹竻闄よ儗鏅壊
+
+ // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
+ $("#formData")[0].reset();
+ layui.form.render();
+
+
+ $("#HBarCode").focus();
+ //鑾峰彇鏈�澶у崟鎹彿
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3903' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HInterID").val("0");
+ $("#HBillNo").val(d.data[0].HBillNo);
+ }
+ });
+ $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规寮�濮嬫椂闂�
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规缁撴潫鏃堕棿
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
+ $("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
+ })
+ //閮ㄩ棬寮圭獥
+ form.on('submit(Department)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '閮ㄩ棬鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+ cancel: function (index, layero) {
+ }
+ });
+ });
+
+ //璐熻矗浜哄脊绐�
+ //椤甸潰灞�-鑷畾涔�
+ form.on('submit(HManager)', function () {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浜哄憳鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/UserInformation.html?TreeFlag=false', '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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HManagerName").val(checkStatus.data[0].HName);
+ $("#HManagerID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //鐐规椤圭洰寮圭獥
+ form.on('submit(HDotCheckItemList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐐规椤圭洰鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_CheckItemList.html', 'yes'],
+ cancel: function (index, layero) {
+ }
+ });
+ });
+
+
+ //浠ヤ笂涓簂ayui妯″潡
+ });
+
+ //杩斿洖閮ㄩ棬
+ function GetHDeptNameValue(obj) {
+ $("#HDeptName").val(obj[0].HName);
+ $("#HDeptID").val(obj[0].HItemID);
+ }
+ //杩斿洖鐐规椤圭洰
+ function GetHCheckNameValue(obj) {
+ $("#HDotCheckItem").val(obj[0].HName);
+ $("#HDotCheckItemID").val(obj[0].HItemID);
+ }
+ //鎵潯鐮�
+ function GetMeesageByBarCode(obj) { //杩斿洖宸ヤ綔涓績
+ var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+ if (!HBarCode) {
+ layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+ return;
+ }
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
+ type: "GET",
+ data: { "HBarCode": HBarCode },
+ success: function (result) {
+ if (result.data.length == 1) {
+ var data = result.data[0];
+ $("#HMouldID").val(data.hinterid);
+ $("#HBarName").val(data.HName);
+ $("#HBarSpec").val(data.HModel);
+ $("#HBarModel").val(data.HModel2);
+ $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+ $("#HBarCode").css("background-color", "#efefef4d");
+
+ HProcExchBillNoFlag = true;
+ layer.close(index);
+ }
+ else {
+ layer.close(index);
+ layer.msg("鏈煡鎵惧埌鏁版嵁", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ </script>
+</body>
+</html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
index 8d5fb35..c686dfa 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
@@ -12,10 +12,19 @@
.layui-form-label {
width: 85px;
}
+ /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+ .layui-table-cell {
+ overflow: visible !important;
+ }
+ /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+ td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
+ }
</style>
</head>
<body>
-
<div id="layout1" class="layui-fluid">
<div class="layui-row layui-col-space15">
<div class="layui-col-md12">
@@ -107,6 +116,36 @@
</div>
</div>
<div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">寮傚父鎯呭喌璁板綍</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HErrNote" id="HErrNote" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閲嶅ぇ瀹夊叏<br />闅愭偅璁板綍</label>
+ <div class="layui-input-inline" style="margin-top:10px;">
+ <input type="text" name="HBigSafeNote" id="HBigSafeNote" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐐规鏁版嵁</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HDotCheckNote" id="HDotCheckNote" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇鐝</label>
+ <div class="layui-input-inline">
+ <input type="hidden" name="HShiftsID" id="HShiftsID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="text" name="HShiftsName" id="HShiftsName" class="layui-input" value="" style="float:left;width:150px;background-color:#efefef4d;" readonly="readonly">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHShifts" 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>
@@ -118,6 +157,13 @@
<label class="layui-form-label">澶囨敞</label>
<div class="layui-input-inline">
<textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏈�缁堢粨璁�</label>
+ <div class="layui-input-inline">
+ <input type="radio" name="HLastResult" id="HLastResult" value="OK" title="OK" checked>
+ <input type="radio" name="HLastResult" id="HLastResult" value="NG" title="NG">
</div>
</div>
</div>
@@ -162,6 +208,14 @@
<script type="text/html" id="barDemo1">
<!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del1">鍒犻櫎</a>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(鐐规缁撴灉)-->
+ <script type="text/html" id="HDotCheckResult">
+ <select name="HDotCheckResult" lay-filter="HDotCheckResult" id="HDotCheckResult{{d.LAY_TABLE_INDEX+1}}">
+ <!--<option value="">璇烽�夋嫨</option>-->
+ <option value="Y" selected>Y</option>
+ <option value="X">X</option>
+ </select>
</script>
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
@@ -209,7 +263,7 @@
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
$("h1").html('<b>' + HPageTitle + '</b>');
- //#endregion
+ //#endregion
//鍒濆鍖栬〃鍗曟彃浠�
set_InitFrom();
@@ -238,7 +292,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "" };
+ var NewRow = { "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" };
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
@@ -301,6 +355,41 @@
}
});
+ });
+
+ //琛ㄥご淇℃伅鐢熶骇鐝寮圭獥
+ form.on('submit(btnHShifts)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐢熶骇鐝鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HShiftsID").val(checkStatus.data[0].HItemID);
+ $("#HShiftsName").val(checkStatus.data[0].鐝鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ },
+ success: function (layero, index) {
+ }
+ });
});
//琛ㄥご浜у搧妯″叿淇℃伅
@@ -370,7 +459,32 @@
});
});
+ //琛岄�夋嫨澶勭悊锛堢偣妫�缁撴灉锛�
+ form.on('select(HDotCheckResult)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HDotCheckResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ var HQty = 0;//琛ㄤ綋琛屼笉鍚堟牸鏁伴噺
+ for (let i = 0; i < table.cache['mainTable'].length; i++) {
+ if (table.cache['mainTable'][i].HDotCheckResult == "X") {
+ HQty++;
+ }
+ }
+ if (HQty > 0) {
+ document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+ $("input:radio[name=HLastResult][value=" + "NG" + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ } else {
+ document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+ $("input:radio[name=HLastResult][value=" + "OK" + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ }
+ form.render('radio');
+ });
//琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
@@ -449,6 +563,73 @@
}
});
}
+ if (obj.event === 'HDotCheckItemClassName') //鐐规椤圭洰鍒嗙被
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐐规椤圭洰鍒嗙被鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true
+ , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemClassList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HDotCheckItemClassID: checkStatus.data[0].HItemID,
+ HDotCheckItemClassName: checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ }
+ });
+ }
+ if (obj.event === 'HDotCheckItemMethodName') //鐐规鏂规硶
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐐规鏂规硶鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true
+ , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemMethodList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HDotCheckItemMethodID: checkStatus.data[0].HItemID,
+ HDotCheckItemMethodName: checkStatus.data[0].鐐规鏂规硶鍚嶇О
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ }
+ });
+ }
+
obj.event = "";
return false;
@@ -547,6 +728,11 @@
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
, { field: 'HDotCheckItemID', title: '鐐规ID', edit: 'text', hide: true }
, { field: 'HDotCheckItem', title: '鐐规椤圭洰', edit: 'text', event: 'HDotCheckItem' }
+ , { field: 'HDotCheckItemClassID', title: '鐐规椤圭洰鍒嗙被ID', edit: 'text', hide: true }
+ , { field: 'HDotCheckItemClassName', title: '鐐规椤圭洰鍒嗙被', edit: 'text', event: 'HDotCheckItemClassName' }
+ , { field: 'HDotCheckItemMethodID', title: '鐐规鏂规硶ID', edit: 'text', hide: true }
+ , { field: 'HDotCheckItemMethodName', title: '鐐规鏂规硶', edit: 'text', event: 'HDotCheckItemMethodName' }
+ , { field: 'HDotCheckResult', title: '鐐规缁撴灉', templet: '#HDotCheckResult', event: 'HDotCheckResult' }
, { field: 'HDotCheckPart', title: '鐐规閮ㄤ綅', edit: 'text' }
, { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
, { field: 'HManagerID', title: '璐熻矗浜篒D', edit: 'text', hide: true }
@@ -577,7 +763,7 @@
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "" }];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
table.render(option);
}
@@ -585,7 +771,7 @@
function set_EditFromGrid() {
set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "" }];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
table.render(option);
}
@@ -610,7 +796,7 @@
}
// 鐐规璁″垝 鐐规淇℃伅 閰嶄欢淇℃伅
- window.get_DocCheckItem = function(data) {
+ window.get_DocCheckItem = function (data) {
$.ajax({
url: GetWEBURL() + "/Sc_MouldDotCheckPlanBill/Sc_MouldDotCheckPlanBillListProjectDetai",
type: "GET",
@@ -622,7 +808,7 @@
var BYData = result.list[0];//鐐规
var PJData = result.list[1];//閰嶄欢
var rowdate1 = layui.table.cache["mainTable"];
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "" }];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
table.render(option);
if (BYData.length != 0) //琛ㄤ綋鏁版嵁涓嶄负绌烘椂
@@ -632,16 +818,14 @@
var checkrow = {
"HDotCheckItemID": BYData[i].HDotCheckItemID, "HDotCheckItem": BYData[i].HDotCheckItem, "HDotCheckPart": BYData[i].HDotCheckPart,
"HClaim": BYData[i].HClaim, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerCode,
- "HManagerName": BYData[i].HManagerName, "HRemark": BYData[i].HRemark
+ "HManagerName": BYData[i].HManagerName, "HRemark": BYData[i].HRemark, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
- table.reload("mainTable", {
- data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
- })
+
+ option.data = buttonArr;
+ table.render(option);
}
-
-
} else {
layer.alert(result.code + result.Message, { icon: 5 });
}
@@ -651,7 +835,7 @@
}
//鐐规瑙勭▼ 鐐规淇℃伅 閰嶄欢淇℃伅
- window.get_DocCheckItem2 = function(data) {
+ window.get_DocCheckItem2 = function (data) {
$.ajax({
url: GetWEBURL() + "/Sc_MouldDotCheckRuleBill/Sc_MouldDotCheckRuleBillSubAndSubItem",
type: "GET",
@@ -663,7 +847,7 @@
var BYData = result.list[0];//鐐规
var PJData = result.list[1];//閰嶄欢
var rowdate1 = layui.table.cache["mainTable"];
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "" }];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
table.render(option);
if (BYData.length != 0) //琛ㄤ綋鏁版嵁涓嶄负绌烘椂
@@ -673,13 +857,12 @@
var checkrow = {
"HDotCheckItemID": BYData[i].HDotCheckItemID, "HDotCheckItem": BYData[i].HDotCheckItem, "HDotCheckPart": BYData[i].HDotCheckPart,
"HClaim": BYData[i].HClaim, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerNumber,
- "HManagerName": BYData[i].HManagerName, "HRemark": BYData[i].HRemark
+ "HManagerName": BYData[i].HManagerName, "HRemark": BYData[i].HRemark, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
- table.reload("mainTable", {
- data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
- })
+ option.data = buttonArr;
+ table.render(option);
}
} else {
@@ -719,7 +902,20 @@
, "HMouldID": data.HMouldID
, "HMouldDotCheckRuleName": data.鍣ㄥ叿鐐规瑙勭▼鍗曟嵁鍙�
, "HMouldDotCheckRuleID": data.HMouldDotCheckRuleID
+ , "HErrNote": data.寮傚父鎯呭喌璁板綍 //寮傚父鎯呭喌璁板綍
+ , "HBigSafeNote": data.閲嶅ぇ瀹夊叏闅愭偅璁板綍 //閲嶅ぇ瀹夊叏闅愭偅璁板綍
+ , "HDotCheckNote": data.鐐规鏁版嵁 //鐐规鏁版嵁
+ , "HShiftsID": data.HShiftsID //
+ , "HShiftsName": data.鐝鍚嶇О //鐝鍚嶇О
});
+ if (data.鏈�缁堢粨璁� == "涓嶅悎鏍�") {
+ document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+ $("input:radio[name=HLastResult][value=" + "NG" + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ } else {
+ document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+ $("input:radio[name=HLastResult][value=" + "OK" + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ }
+ form.render('radio');
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
@@ -753,10 +949,18 @@
data: { "sqlWhere": "and HInterID=" + linterid },
success: function (result) {
if (result.count == 1) {
- option.data = result.list[0];
+ var data = result.data;
+ var subarr = [];
+ for (var i = 0; i < data.length; i++) {
+ subarr.push({ "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckItem": data[i].鐐规椤圭洰, "HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerNumber": data[i].璐熻矗浜轰唬鐮�, "HManagerName": data[i].璐熻矗浜哄悕绉�, "HRemark": data[i].瀛愬娉�2, "HDotCheckItemClassID": data[i].HDotCheckItemClassID, "HDotCheckItemClassName": data[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": data[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": data[i].鐐规鏂规硶鍚嶇О, "HDotCheckResult": data[i].鐐规缁撴灉 == "鍚堟牸" ? 'Y' : 'X' });
+ }
+
+ option.data = subarr;
table.render(option);
- option1.data = result.list[1];
- table.render(option1);
+ for (let j = 0; j < data.length; j++) {
+ $("#HDotCheckResult" + (j + 1)).val(data[j].鐐规缁撴灉 == "鍚堟牸" ? 'Y' : 'X')
+ }
+ form.render('select');
} else {
layer.alert(result.code + result.Message, { icon: 5 });
@@ -771,15 +975,14 @@
//澧炲姞涓�琛�
function btnAddLine(NewRow) {
- var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
- buttonArr = [];//娓呯┖鏁扮粍
- for (var i = 0; i < tableBak.length; i++) {
- buttonArr.push(tableBak[i]); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+ table.render(option);
+
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HDotCheckResult' + i + '').find("option[value='" + option.data[i - 1].HDotCheckResult + "']").attr("selected", true);
}
- buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
- table.reload("mainTable", {
- data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
- })
+ form.render('select');
}
//澶嶅埗涓�琛�
@@ -797,6 +1000,11 @@
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++) {
+ $('#HDotCheckResult' + i + '').find("option[value='" + option.data[i - 1].HDotCheckResult + "']").attr("selected", true);
+ }
+ form.render('select');
}
}
@@ -861,7 +1069,7 @@
function GetMouldDotCheckPlanValue(obj) { //鍣ㄥ叿鐐规璁″垝
$("#HPlanNo").val(obj[0].鍗曟嵁鍙�);
- $("#HPlanInterID").val(obj[0].hmainid);
+ $("#HPlanInterID").val(obj[0].hmainid);
get_DocCheckItem(obj[0].hmainid);
}
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_MouldDotCheckPlanBillList.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_MouldDotCheckPlanBillList.html"
index f4131e8..a8488e9 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_MouldDotCheckPlanBillList.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_MouldDotCheckPlanBillList.html"
@@ -102,7 +102,7 @@
<label class="layui-form-label" style="width:95px;">鍣ㄥ叿鐐规瑙勭▼<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HMouldDotCheckRuleName" id="HMouldDotCheckRuleName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HMouldDotCheckRuleID" id="HMouldDotCheckRuleID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HMouldDotCheckRuleID" id="HMouldDotCheckRuleID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="btnHMouldDotCheckRule" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
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_MouldDotCheckPlanBillList.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_MouldDotCheckPlanBillList.html"
index a5bb8da..96882fa 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_MouldDotCheckPlanBillList.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_MouldDotCheckPlanBillList.html"
@@ -205,6 +205,25 @@
});
//#endregion
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+
//蹇�熻繃婊�
function get_FastQuery(table, option) {
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
index 2cafb20..204f376 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
@@ -18,10 +18,19 @@
.layui-form-label {
width: 95px;
}
+ /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+ .layui-table-cell {
+ overflow: visible !important;
+ }
+ /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+ td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
+ }
</style>
</head>
<body>
-
<div id="layout1" class="layui-fluid">
<div class="layui-row layui-col-space15">
<div class="layui-col-md12">
@@ -29,13 +38,9 @@
<form id="form0" class="layui-form" lay-filter="component-form-group" action="">
<div class="layui-card-header">
<div class="layui-btn-group">
-
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
-
-
</div>
-
</div>
<div class="layui-card-body">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
@@ -50,7 +55,7 @@
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+ <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
<input id="HInterID" name="HInterID" type="hidden" />
<input id="HMaker" name="HMaker" type="hidden" /><!--鍒跺崟浜�-->
</div>
@@ -71,7 +76,7 @@
<label class="layui-form-label">璁惧<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="" style="float:left;width:150px;">
- <input type="text" name="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;background-color:#efefef4d;"readonly="readonly">
+ <input type="text" name="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;background-color:#efefef4d;" readonly="readonly">
<button type="button" lay-submit="" class="layui-btn" lay-filter="ProductModulList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -117,6 +122,36 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label">寮傚父鎯呭喌璁板綍</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HErrNote" id="HErrNote" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閲嶅ぇ瀹夊叏<br />闅愭偅璁板綍</label>
+ <div class="layui-input-inline" style="margin-top:10px;">
+ <input type="text" name="HBigSafeNote" id="HBigSafeNote" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐐规鏁版嵁</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HDotCheckNote" id="HDotCheckNote" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇鐝</label>
+ <div class="layui-input-inline">
+ <input type="hidden" name="HShiftsID" id="HShiftsID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="text" name="HShiftsName" id="HShiftsName" class="layui-input" value="" style="float:left;width:150px;background-color:#efefef4d;" readonly="readonly">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHShifts" 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>
<div class="layui-input-inline">
<textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
@@ -126,6 +161,13 @@
<label class="layui-form-label">澶囨敞</label>
<div class="layui-input-inline">
<textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏈�缁堢粨璁�</label>
+ <div class="layui-input-inline">
+ <input type="radio" name="HLastResult" id="HLastResult" value="OK" title="OK" checked>
+ <input type="radio" name="HLastResult" id="HLastResult" value="NG" title="NG">
</div>
</div>
</div>
@@ -154,6 +196,14 @@
<script type="text/html" id="barDemo">
<!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(鐐规缁撴灉)-->
+ <script type="text/html" id="HDotCheckResult">
+ <select name="HDotCheckResult" lay-filter="HDotCheckResult" id="HDotCheckResult{{d.LAY_TABLE_INDEX+1}}">
+ <!--<option value="">璇烽�夋嫨</option>-->
+ <option value="Y" selected>Y</option>
+ <option value="X">X</option>
+ </select>
</script>
<script>
var OptionData = [];
@@ -221,7 +271,7 @@
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" };
+ var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "","HDotCheckResult":"Y"};
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
@@ -272,6 +322,42 @@
}
});
});
+
+ //琛ㄥご淇℃伅鐢熶骇鐝寮圭獥
+ form.on('submit(btnHShifts)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐢熶骇鐝鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true
+ , content: ['../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HShiftsID").val(checkStatus.data[0].HItemID);
+ $("#HShiftsName").val(checkStatus.data[0].鐝鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ },
+ success: function (layero, index) {
+ }
+ });
+ });
+
//鑾峰彇璁惧鐐规瑙勭▼
function get_DocCheckItem() {
$.ajax({
@@ -283,7 +369,7 @@
if (result.count == 1) {
var DJData = result;//
var rowdate1 = layui.table.cache["mainTable"];
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": 0, "HManagerCode": " ", "HManagerName": " ", "HRemark": " " }];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": 0, "HManagerCode": " ", "HManagerName": " ", "HRemark": " ", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"}];
table.render(option);
$("#HEquipDotCheckRuleInterID").val(DJData.data[0].HInterID);
$("#HEquipDotCheckRuleInterNo").val(DJData.data[0].HBillNo);
@@ -294,17 +380,20 @@
var checkrow = {
"HDotCheckItemID": DJData.data[i].HDotCheckItemID, "HDotCheckCode": DJData.data[i].HDotCheckCode, "HDotCheckItem": DJData.data[i].HDotCheckItem,
"HDotCheckPart": DJData.data[i].HDotCheckPart, "HManagerID": DJData.data[i].HManagerID, "HManagerCode": DJData.data[i].HManagerCode,
- "HManagerName": DJData.data[i].HManagerName
+ "HManagerName": DJData.data[i].HManagerName, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
- table.reload("mainTable", {
- data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
- })
+
+ option.data = buttonArr;
+ table.render(option);
+ //table.reload("mainTable", {
+ // data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ //})
}
}
else {
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
table.render(option);
//layer.alert("璇ヨ澶囨殏鏃犻粯璁ょ偣妫�璁板綍", { icon: 5 });
}
@@ -348,6 +437,39 @@
}
});
});
+ //琛岄�夋嫨澶勭悊锛堢偣妫�缁撴灉锛�
+ form.on('select(HDotCheckResult)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HDotCheckResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+
+ //for (var i = 1; i <= option.data.length; i++) {
+ // $('#HDotCheckResult' + i + '').find("option[value='" + option.data[i - 1].HDotCheckResult + "']").attr("selected", true);
+ //}
+ //form.render('select');
+ console.log(table.cache['mainTable']);
+
+ var HQty = 0;//琛ㄤ綋琛屼笉鍚堟牸鏁伴噺
+ for (let i = 0; i < table.cache['mainTable'].length; i++) {
+ if (table.cache['mainTable'][i].HDotCheckResult == "X") {
+ HQty++;
+ }
+ }
+ if (HQty > 0) {
+ document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+ $("input:radio[name=HLastResult][value=" + "NG" + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ } else {
+ document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+ $("input:radio[name=HLastResult][value=" + "OK" + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ }
+ form.render('radio');
+ });
+
window.get_DocCheckItem2 = function () {
$.ajax({
url: GetWEBURL() + "/Web/GetDotCheckRuleItemByDotCheckRuleID",
@@ -358,7 +480,7 @@
if (result.count == 1) {
var DJData = result;//
var rowdate1 = layui.table.cache["mainTable"];
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": 0, "HManagerCode": " ", "HManagerName": " ", "HRemark": " " }];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": 0, "HManagerCode": " ", "HManagerName": " ", "HRemark": " ", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"}];
table.render(option);
if (DJData.data.length != 0) //琛ㄤ綋鏁版嵁涓虹┖鏃�
@@ -368,17 +490,19 @@
var checkrow = {
"HDotCheckItemID": DJData.data[i].HDotCheckItemID, "HDotCheckCode": DJData.data[i].HDotCheckCode, "HDotCheckItem": DJData.data[i].HDotCheckItem,
"HDotCheckPart": DJData.data[i].HDotCheckPart, "HManagerID": DJData.data[i].HManagerID, "HManagerCode": DJData.data[i].HManagerCode,
- "HManagerName": DJData.data[i].HManagerName
+ "HManagerName": DJData.data[i].HManagerName, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
- table.reload("mainTable", {
- data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
- })
+ option.data = buttonArr;
+ table.render(option);
+ //table.reload("mainTable", {
+ // data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ //})
}
}
else {
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"}];
table.render(option);
//layer.alert("璇ヨ澶囨殏鏃犻粯璁ょ偣妫�璁板綍", { icon: 5 });
}
@@ -409,7 +533,7 @@
}
$("#HPlanName").val(checkStatus.data[0].鍗曟嵁鍙�);
$("#HPlanNo").val(checkStatus.data[0].hmainid);
- $("#HEquipDotCheckPlanInterID").val(checkStatus.data[0].hmainid);
+ $("#HEquipDotCheckPlanInterID").val(checkStatus.data[0].hmainid);
//$("#HEquipName").val(checkStatus.data[0].璁惧鍚嶇О);
//$("#HEquipID").val(checkStatus.data[0].璁惧ID);
$("#HEquipDotCheckRuleInterID").val(checkStatus.data[0].HMouldDotCheckRuleID);
@@ -433,7 +557,7 @@
if (result.count == 1) {
var DJData = result.data;//
var rowdate1 = layui.table.cache["mainTable"];
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": 0, "HManagerCode": " ", "HManagerName": " ", "HRemark": " " }];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": 0, "HManagerCode": " ", "HManagerName": " ", "HRemark": " ", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
table.render(option);
if (DJData.length != 0) //琛ㄤ綋鏁版嵁涓虹┖鏃�
@@ -444,19 +568,22 @@
var checkrow = {
"HDotCheckItemID": DJData[i].HDotCheckID, "HDotCheckCode": DJData[i].鐐规椤圭洰浠ｇ爜, "HDotCheckItem": DJData[i].鐐规椤圭洰,
"HDotCheckPart": DJData[i].鐐规閮ㄤ綅, "HClaim": DJData[i].鍏蜂綋瑕佹眰, "HManagerID": DJData[i].HEmployeeID,
- "HManagerCode": DJData[i].璐熻矗浜轰唬鐮�, "HManagerName": DJData[i].璐熻矗浜哄悕绉�, "HRemark": DJData[i].HRemark
+ "HManagerCode": DJData[i].璐熻矗浜轰唬鐮�, "HManagerName": DJData[i].璐熻矗浜哄悕绉�, "HRemark": DJData[i].HRemark,
+ "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
- table.reload("mainTable", {
- data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
- })
+ option.data = buttonArr;
+ table.render(option);
+ //table.reload("mainTable", {
+ // data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ //})
} else {
layer.alert("鐐瑰墠鏃堕棿娈垫殏鏃犻渶瑕佺偣妫�鐨勮鍒�", { icon: 5 });
}
}
else {
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"}];
table.render(option);
//layer.alert("璇ヨ澶囨殏鏃犻粯璁ょ偣妫�璁板綍", { icon: 5 });
}
@@ -472,6 +599,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
+ console.log(sSubStr);
if (AllowLoadData(sSubStr)) {
$.ajax(
{
@@ -489,9 +617,7 @@
});
}
else {
-
f_alert(data.Message);
- console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
}
layer.closeAll("loading");
},
@@ -536,11 +662,16 @@
function set_InitGrid() {
//琛ㄥご
columns = [
- { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�'}
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
, { field: 'HDotCheckItemID', title: '鐐规椤圭洰ID', edit: 'text', hide: true }
, { field: 'HDotCheckCode', title: '鐐规椤圭洰浠ｇ爜', edit: 'text', event: "HDotCheckCode" }
, { field: 'HDotCheckItem', title: '鐐规椤圭洰', edit: 'text', event: "" }
+ , { field: 'HDotCheckItemClassID', title: '鐐规椤圭洰鍒嗙被ID', edit: 'text', hide: true }
+ , { field: 'HDotCheckItemClassName', title: '鐐规椤圭洰鍒嗙被', edit: 'text', event: 'HDotCheckItemClassName' }
+ , { field: 'HDotCheckItemMethodID', title: '鐐规鏂规硶ID', edit: 'text', hide: true }
+ , { field: 'HDotCheckItemMethodName', title: '鐐规鏂规硶', edit: 'text', event: 'HDotCheckItemMethodName' }
+ , { field: 'HDotCheckResult', title: '鐐规缁撴灉', templet: '#HDotCheckResult', event: 'HDotCheckResult' }
, { field: 'HDotCheckPart', title: '鐐规閮ㄤ綅', edit: 'text', event: "" }
, { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
, { field: 'HManagerID', title: '璐熻矗浜轰唬鐮�', edit: 'text', hide: true }
@@ -567,15 +698,15 @@
//澧炲姞涓�琛屼簨浠�
function btnAddLine(NewRow) {
- var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
- buttonArr = [];//娓呯┖鏁扮粍
- for (var i = 0; i < tableBak.length; i++) {
- buttonArr.push(tableBak[i]); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+ table.render(option);
+
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HDotCheckResult' + i + '').find("option[value='" + option.data[i - 1].HDotCheckResult + "']").attr("selected", true);
}
- buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
- table.reload("mainTable", {
- data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
- })
+ form.render('select');
}
//琛ㄦ牸澶嶅埗涓�琛屼簨浠�
function btnCopyLine(data) {
@@ -592,6 +723,11 @@
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++) {
+ $('#HDotCheckResult' + i + '').find("option[value='" + option.data[i - 1].HDotCheckResult + "']").attr("selected", true);
+ }
+ form.render('select');
}
}
// 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
@@ -638,13 +774,15 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
-
+
if (checkStatus.data.length === 1) {
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HDotCheckItemID: checkStatus.data[0].HItemID,
HDotCheckCode: checkStatus.data[0].鐐规椤圭洰浠ｇ爜,
- HDotCheckItem: checkStatus.data[0].鐐规椤圭洰鍚嶇О
+ HDotCheckItem: checkStatus.data[0].鐐规椤圭洰鍚嶇О,
+ HDotCheckItemClassID: checkStatus.data[0].HDotCheckItemClassID,
+ HDotCheckItemClassName: checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О,
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
} else {
@@ -659,15 +797,16 @@
}
//灏嗘壒閲忛�夋嫨鐨勬暟鎹啓鍏ユ暟缁勶紙澶氶�夎锛�
for (var i = 0; i < checkStatus.data.length; i++) {
- buttonArr.push({ "HDotCheckItemID": checkStatus.data[i].HItemID, "HDotCheckCode": checkStatus.data[i].鐐规椤圭洰浠ｇ爜, "HDotCheckItem": checkStatus.data[i].鐐规椤圭洰鍚嶇О, "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" });
+ buttonArr.push({ "HDotCheckItemID": checkStatus.data[i].HItemID, "HDotCheckCode": checkStatus.data[i].鐐规椤圭洰浠ｇ爜, "HDotCheckItem": checkStatus.data[i].鐐规椤圭洰鍚嶇О, "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" });
}
-
- table.reload("mainTable", {
- data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
- })
+ option.data = buttonArr;
+ table.render(option);
+ //table.reload("mainTable", {
+ // data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ //})
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- }
+ }
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -679,7 +818,9 @@
obj.update({
HDotCheckItemID: OptionData[0].HItemID,
HDotCheckCode: OptionData[0].鐐规椤圭洰浠ｇ爜,
- HDotCheckItem: OptionData[0].鐐规椤圭洰鍚嶇О
+ HDotCheckItem: OptionData[0].鐐规椤圭洰鍚嶇О,
+ HDotCheckItemClassID: OptionData[0].HDotCheckItemClassID,
+ HDotCheckItemClassName: OptionData[0].鐐规椤圭洰鍒嗙被鍚嶇О,
});
OptionData = [];
}
@@ -731,6 +872,73 @@
}
});
}
+ if (obj.event === 'HDotCheckItemClassName') //鐐规椤圭洰鍒嗙被
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐐规椤圭洰鍒嗙被鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true
+ , content: ['../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemClassList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HDotCheckItemClassID: checkStatus.data[0].HItemID,
+ HDotCheckItemClassName: checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ }
+ });
+ }
+ if (obj.event === 'HDotCheckItemMethodName') //鐐规鏂规硶
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐐规鏂规硶鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true
+ , content: ['../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemMethodList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HDotCheckItemMethodID: checkStatus.data[0].HItemID,
+ HDotCheckItemMethodName: checkStatus.data[0].鐐规鏂规硶鍚嶇О
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ }
+ });
+ }
+
obj.event = "";
return false;
@@ -761,7 +969,7 @@
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" }];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
table.render(option);
}
@@ -769,7 +977,7 @@
function set_EditFromGrid(linterid) {
set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
table.render(option);
}
//缂栬緫鑾峰彇琛ㄥご
@@ -797,7 +1005,22 @@
, "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
, "HEquipDotCheckRuleInterID": data.璁惧鐐规瑙勭▼ID // 璁惧鐐规瑙勭▼ID
, "HEquipDotCheckRuleInterNo": data.璁惧鐐规瑙勭▼ // 璁惧鐐规瑙勭▼
+ , "HErrNote": data.寮傚父鎯呭喌璁板綍 //寮傚父鎯呭喌璁板綍
+ , "HBigSafeNote": data.閲嶅ぇ瀹夊叏闅愭偅璁板綍 //閲嶅ぇ瀹夊叏闅愭偅璁板綍
+ , "HDotCheckNote": data.鐐规鏁版嵁 //鐐规鏁版嵁
+ , "HShiftsID": data.HShiftsID //
+ , "HShiftsName": data.鐝鍚嶇О //鐝鍚嶇О
+ //, "HLastResult": data.鏈�缁堢粨璁� == "鍚堟牸" ? "OK" : "NG" //鏈�缁堢粨璁�
});
+
+ if (data.鏈�缁堢粨璁� == "涓嶅悎鏍�") {
+ document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+ $("input:radio[name=HLastResult][value=" + "NG" + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ } else {
+ document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+ $("input:radio[name=HLastResult][value=" + "OK" + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ }
+ form.render('radio');
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
@@ -815,12 +1038,21 @@
url: GetWEBURL() + 'Sb_EquipDotCheckBill/Sb_EquipDotCheckBillListProjectDetai',
type: "GET",
data: { "sqlWhere": "and hmainid=" + linterid },
- success: function (result) {
- console.log(result);
+ success: function (result) {
if (result.count == 1) {
- option.data = result.data;
- table.render(option);
+ var data = result.data;
+ var subarr = [];
+ for (var i = 0; i < data.length; i++) {
+ subarr.push({ "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckCode": data[i].鐐规椤圭洰浠ｇ爜, "HDotCheckItem": data[i].鐐规椤圭洰, "HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerCode": data[i].璐熻矗浜虹紪鐮�, "HManagerName": data[i].璐熻矗浜�, "HRemark": data[i].琛ㄤ綋澶囨敞, "HDotCheckItemClassID": data[i].HDotCheckItemClassID, "HDotCheckItemClassName": data[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": data[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": data[i].鐐规鏂规硶鍚嶇О, "HDotCheckResult": data[i].鐐规缁撴灉 == "鍚堟牸" ? 'Y' : 'X' });
+ }
+
+ option.data = subarr;
+ table.render(option);
+ for (let j = 0; j < data.length; j++) {
+ $("#HDotCheckResult" + (j + 1)).val(data[j].鐐规缁撴灉 == "鍚堟牸" ? 'Y' : 'X')
+ }
+ form.render('select');
} else {
layer.alert(result.code + result.Message, { icon: 5 });
}
@@ -883,6 +1115,11 @@
return true;
}
}
+ //閿欒淇℃伅
+ function f_alert(sMsg) {
+ layer.alert(sMsg, { icon: 5 });
+
+ }
//#endregion
});
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
index 0c86873..a786870 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
@@ -120,6 +120,39 @@
</td>
</tr>
<tr>
+ <th>鏈�缁堢粨璁�</th>
+ <td class="bz_td">
+ <input type="radio" name="HLastResult" value="OK" title="OK" checked="">
+ <input type="radio" name="HLastResult" value="NG" title="NG">
+ </td>
+ </tr>
+ <tr>
+ <th>寮傚父鎯呭喌<br />璁板綍</th>
+ <td class="bz_td" style="margin-top:10px;">
+ <input type="text" name="HErrNote" class="layui-input LineHeight" id="HErrNote" placeholder="璇疯緭鍏ュ紓甯告儏鍐佃褰�" style="border-radius: 50px;">
+ </td>
+ </tr>
+ <tr>
+ <th>閲嶅ぇ瀹夊叏<br />闅愭偅璁板綍</th>
+ <td class="bz_td" style="margin-top:10px;">
+ <input type="text" name="HBigSafeNote" class="layui-input LineHeight" id="HBigSafeNote" placeholder="璇疯緭鍏ラ噸澶у畨鍏ㄩ殣鎮ｈ褰�" style="border-radius: 50px;">
+ </td>
+ </tr>
+ <tr>
+ <th>鐐规鏁版嵁</th>
+ <td class="bz_td">
+ <input type="text" name="HDotCheckNote" class="layui-input LineHeight" id="HDotCheckNote" placeholder="璇疯緭鍏ョ偣妫�鏁版嵁" style="border-radius: 50px;">
+ </td>
+ </tr>
+ <tr>
+ <th>鐢熶骇鐝</th>
+ <td class="bz_td">
+ <input type="text" name="HShiftsName" class="layui-input LineHeight" id="HShiftsName" placeholder="閫夋嫨鐢熶骇鐝" style="background-color:#efefef4d;">
+ <input type="hidden" name="HShiftsID" id="HShiftsID" value="0" autocomplete="off" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="btnShifts" id="btnShifts" style="font-weight:bolder">...</button>
+ </td>
+ </tr>
+ <tr>
<th>鍗� 鎹� 鍙�</th>
<td class="bz_td">
<input type="text" name="HBillNo" class="layui-input LineHeight" id="HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" style="border-radius: 50px;background-color:#EDEDED;" readonly>
@@ -279,6 +312,14 @@
<script type="text/html" id="HDotCheckResult">
<input type="checkbox" value="{{d.HDotCheckResult}}" lay-skin="primary" id="HDotCheckResult{{d.LAY_TABLE_INDEX+1}}" lay-filter="HDotCheckResult" {{ d.HDotCheckResult == 1 ? 'checked' : '' }}>
</script>
+ <!--琛屼笅鎷夐�夋嫨(鐐规缁撴灉)-->
+ <!--<script type="text/html" id="HDotCheckResult">
+ <select name="HDotCheckResult" lay-filter="HDotCheckResult" id="HDotCheckResult{{d.LAY_TABLE_INDEX+1}}">-->
+ <!--<option value="">璇烽�夋嫨</option>-->
+ <!--<option value="Y" selected>Y</option>
+ <option value="X">X</option>
+ </select>
+ </script>-->
<script>
layui.config({
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -354,8 +395,8 @@
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" };
-
+ var NewRow = { "HDotCheckResult": false,"HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""};
+
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
@@ -475,7 +516,7 @@
// 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
$("#formData")[0].reset();
layui.form.render();
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": ""}];
+ option.data = [{ "HDotCheckResult": false,"HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""}];
table.render(option);
$("#HBarCode").focus();
@@ -541,6 +582,41 @@
}
});
});
+
+ //琛ㄥご淇℃伅鐢熶骇鐝寮圭獥
+ form.on('submit(btnShifts)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐢熶骇鐝鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true
+ , content: ['../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HShiftsID").val(checkStatus.data[0].HItemID);
+ $("#HShiftsName").val(checkStatus.data[0].鐝鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ },
+ success: function (layero, index) {
+ }
+ });
+ });
//琛ㄥご淇℃伅璁惧淇濆吇瑙勭▼
form.on('submit(HEquipDotCheckRuleInterist)', function () {
@@ -588,7 +664,7 @@
var BYData = result;//
var rowdate1 = layui.table.cache["mainTable"];
var data = result.data;
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
+ option.data = [{ "HDotCheckResult": false,"HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""}];
table.render(option);
if (BYData.data.length != 0) //琛ㄤ綋鏁版嵁涓虹┖鏃�
@@ -599,7 +675,7 @@
var checkrow = {
"HDotCheckItemID": data[i].HDotCheckItemID, "HDotCheckCode": data[i].HDotCheckCode, "HDotCheckItem": data[i].HDotCheckItem,
"HDotCheckPart": data[i].HDotCheckPart, "HClaim": rowdate1[i].HClaim, "HManagerID": data[i].HManagerID, "HManagerCode": data[i].HManagerCode,
- "HManagerName": data[i].HManagerName, "HSourceInterID": data[i].鐐规璁″垝ID, "HSourceEntryID": data[i].鐐规璁″垝瀛怚D, "HSourceBillNo": data[i].鐐规璁″垝鍗�
+ "HManagerName": data[i].HManagerName, "HSourceInterID": data[i].鐐规璁″垝ID, "HSourceEntryID": data[i].鐐规璁″垝瀛怚D, "HSourceBillNo": data[i].鐐规璁″垝鍗�, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": false
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
@@ -609,7 +685,7 @@
}
}
else {
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
+ option.data = [{ "HDotCheckResult": false,"HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""}];
table.render(option);
layer.alert("璇ヨ澶囨殏鏃犻粯璁ょ偣妫�璁板綍", { icon: 5 });
}
@@ -629,6 +705,11 @@
, { field: 'HDotCheckItemID', title: '鐐规椤圭洰ID', edit: 'text', hide: true }
, { field: 'HDotCheckCode', title: '鐐规椤圭洰浠ｇ爜', edit: 'text', event: "HDotCheckCode", width: 115, hide: true }
, { field: 'HDotCheckItem', title: '鐐规椤圭洰', edit: 'text', event: "" }
+ , { field: 'HDotCheckItemClassID', title: '鐐规椤圭洰鍒嗙被ID', edit: 'text', hide: true }
+ , { field: 'HDotCheckItemClassName', title: '鐐规椤圭洰鍒嗙被', edit: 'text', event: 'HDotCheckItemClassName' }
+ , { field: 'HDotCheckItemMethodID', title: '鐐规鏂规硶ID', edit: 'text', hide: true }
+ , { field: 'HDotCheckItemMethodName', title: '鐐规鏂规硶', edit: 'text', event: 'HDotCheckItemMethodName' }
+ //, { field: 'HDotCheckResult', title: '鐐规缁撴灉', templet: '#HDotCheckResult', event: 'HDotCheckResult' }
, { field: 'HDotCheckPart', title: '鐐规閮ㄤ綅', edit: 'text', event: "" }
, { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
, { field: 'HManagerID', title: '璐熻矗浜轰唬鐮�', edit: 'text', hide: true }
@@ -636,8 +717,8 @@
, { field: 'HManagerName', title: '璐熻矗浜哄悕绉�', edit: 'text' }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
, { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', edit: 'text', hide: true }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', edit: 'text', hide: true}
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', edit: 'text', hide: true}
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', edit: 'text', hide: true }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', edit: 'text', hide: true }
, { title: '鎿嶄綔', toolbar: '#barDemo', width: 80 }
];
option = {
@@ -654,7 +735,7 @@
}
};
- option.data = [{ "HDotCheckResult": false, "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
+ option.data = [{ "HDotCheckResult": false, "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""}];
table.render(option);
}
//澧炲姞涓�琛�
@@ -787,7 +868,7 @@
{
"HDotCheckResult": data[i].榛樿缁撹, "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckCode": data[i].鐐规椤圭洰浠ｇ爜, "HDotCheckItem": data[i].鐐规椤圭洰鍚嶇О,
"HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerCode": data[i].璐熻矗浜轰唬鐮�,
- "HManagerName": data[i].璐熻矗浜哄悕绉�, "HSourceInterID": data[i].鐐规璁″垝ID, "HSourceEntryID": data[i].鐐规璁″垝瀛怚D, "HSourceBillNo": data[i].鐐规璁″垝鍗�
+ "HManagerName": data[i].璐熻矗浜哄悕绉�, "HSourceInterID": data[i].鐐规璁″垝ID, "HSourceEntryID": data[i].鐐规璁″垝瀛怚D, "HSourceBillNo": data[i].鐐规璁″垝鍗�, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""
}
);
}
@@ -797,6 +878,85 @@
}
})
}
+
+ //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
+ function set_GridCellCheck(obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ if (obj.event === 'HDotCheckItemClassName') //鐐规椤圭洰鍒嗙被
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐐规椤圭洰鍒嗙被鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true
+ , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemClassList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HDotCheckItemClassID: checkStatus.data[0].HItemID,
+ HDotCheckItemClassName: checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ }
+ });
+ }
+ if (obj.event === 'HDotCheckItemMethodName') //鐐规鏂规硶
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐐规鏂规硶鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true
+ , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemMethodList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HDotCheckItemMethodID: checkStatus.data[0].HItemID,
+ HDotCheckItemMethodName: checkStatus.data[0].鐐规鏂规硶鍚嶇О
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ }
+ });
+ }
+
+ obj.event = "";
+ return false;
+
+ }
+
+ })
+ }
//浠ヤ笂涓簂ayui妯″潡
});
</script>
--
Gitblit v1.9.1