From 3d240d150e6e1a4e2df1a9f87d00ddd03ace4ee5 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 17 一月 2025 10:06:37 +0800
Subject: [PATCH] 增加 BOM层级展开报表,修复全程追溯报表 黑白标页签导出失败,工艺路线的表头查询优化页面排序

---
 WebTM/views/项目管理/工程项目/PM_ProjectBill.html |  500 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 453 insertions(+), 47 deletions(-)

diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
index f835ff8..7cf58a8 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
@@ -71,7 +71,8 @@
                             <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
                             <li lay-id="2" style="padding:1px;">宸ョ▼淇℃伅</li>
                             <li lay-id="3" style="padding:1px;">椤圭洰淇℃伅</li>
-                            <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+                            <li lay-id="4" style="padding:1px;">浠诲姟淇℃伅</li>
+                            <li lay-id="5" style="padding:1px;">鍏朵粬淇℃伅</li>
                         </ul>
                         <div class="layui-tab-content">
                             <!--鍩烘湰淇℃伅-->
@@ -83,6 +84,7 @@
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo">
                                                 <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+                                                <input type="hidden" name="HBillSubType" id="HBillSubType" value="">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -140,22 +142,29 @@
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">缁撶畻鏂�<!--<label style="color:red"> * </label>--></label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" lay-verify="HPayCusName" name="HPayCusName" id="HPayCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" name="HPayCusID" id="HPayCusID" lay-verify="HPayCusID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHPayCus" id="btnSearchHPayCus" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">缁撶畻閲戦</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HLastMoney" name="HLastMoney" id="HLastMoney" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
                                             <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
                                                 <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">缁勭粐<label style="color:red"> * </label></label>
-                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
-                                                <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
-                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
-                                                </select>
-                                            </div>
-                                        </div>
-                                    </div>
+
                                 </div>
                             </div>
                             <!--宸ョ▼淇℃伅-->
@@ -172,12 +181,7 @@
                                                 </button>
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">寤鸿鍗曚綅</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" lay-verify="HBuildComp" name="HBuildComp" id="HBuildComp">
-                                            </div>
-                                        </div>
+
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鍦扮偣</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
@@ -468,24 +472,6 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">缁撶畻鏂�<!--<label style="color:red"> * </label>--></label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" lay-verify="HPayCusName" name="HPayCusName" id="HPayCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <input type="hidden" name="HPayCusID" id="HPayCusID" lay-verify="HPayCusID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHPayCus" id="btnSearchHPayCus" style="padding: 0 10px;float: right;margin-right: 3px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">缁撶畻閲戦</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" lay-verify="HLastMoney" name="HLastMoney" id="HLastMoney" value="0">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鍚堝悓鎬婚噾棰�</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="text" class="layui-input" lay-verify="HSumMoney" name="HSumMoney" id="HSumMoney" value="0">
@@ -497,6 +483,9 @@
                                                 <input type="text" class="layui-input" lay-verify="HProMoney" name="HProMoney" id="HProMoney" value="0">
                                             </div>
                                         </div>
+                                    </div>
+                                    <div class="layui-row">
+
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">瀹炴柦璐�</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
@@ -509,8 +498,6 @@
                                                 <input type="text" class="layui-input" lay-verify="HOtherMoney" name="HOtherMoney" id="HOtherMoney" value="0">
                                             </div>
                                         </div>
-                                    </div>
-                                    <div class="layui-row">
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鍚堝悓瀹炴柦浜哄ぉ</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
@@ -524,6 +511,272 @@
                                             </div>
                                         </div>
                                     </div>
+                                    <div class="layui-row">
+                                        
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">寤鸿鍗曚綅</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HBuildComp" name="HBuildComp" id="HBuildComp">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">缁勭粐<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+                                                <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--浠诲姟淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浠诲姟澶х被<!--<label style="color:red"> * </label>--></label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" lay-verify="HTaskClassName" name="HTaskClassName" id="HTaskClassName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" name="HTaskClassID" id="HTaskClassID" lay-verify="HTaskClassID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHTaskClass" id="btnSearchHTaskClass" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浠诲姟椤圭洰鍒嗙被<!--<label style="color:red"> * </label>--></label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" lay-verify="HTaskClassEntryName" name="HTaskClassEntryName" id="HTaskClassEntryName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" name="HTaskClassEntryID" id="HTaskClassEntryID" lay-verify="HTaskClassEntryID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHTaskClassEntry" id="btnSearchHTaskClassEntry" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浠诲姟鍦扮偣</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HTaskAddress" lay-verify="HTaskAddress" id="HTaskAddress">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鎹熷潖鎯呭喌</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HBreakStatus" lay-verify="HBreakStatus" id="HBreakStatus"  >
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">婕忔按閲�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HWaterLeakage" lay-verify="HWaterLeakage" id="HWaterLeakage"  >
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">绠″緞</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HPipeDiameter" lay-verify="HPipeDiameter" id="HPipeDiameter"  >
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">绠¢亾鏉愯川</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HPipeMaterial" lay-verify="HPipeMaterial" id="HPipeMaterial"  >
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鎶ユ紡浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HAlarmEmp" lay-verify="HAlarmEmp" id="HAlarmEmp"  >
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鎶ユ紡浜鸿仈绯荤數璇�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HAlarmLink" lay-verify="HAlarmLink" id="HAlarmLink"  >
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍙楃悊浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HReceEmp" lay-verify="HReceEmp" id="HReceEmp"  >
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍙楃悊鏃堕棿</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="datetime-local" step="1" class="layui-input" name="HReceTime" lay-verify="HReceTime" id="HReceTime"  >
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浠诲姟鏉愭枡璐�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="number" class="layui-input" name="HTaskMaterMoney" lay-verify="HTaskMaterMoney" id="HTaskMaterMoney" value="0" >
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浠诲姟瀹夎璐�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="number" class="layui-input" name="HTaskSetupMoney" lay-verify="HTaskSetupMoney" id="HTaskSetupMoney" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浠诲姟闄勫睘璐�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="number" class="layui-input" name="HTaskOtherMoney" lay-verify="HTaskOtherMoney" id="HTaskOtherMoney" value="0" >
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浠诲姟鑰冩牳璐�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="number" class="layui-input" name="HTaskExamMoney" lay-verify="HTaskExamMoney" id="HTaskExamMoney" value="0" >
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浠诲姟宸ヨ垂</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="number" class="layui-input" name="HTaskWorkMoney" lay-verify="HTaskWorkMoney" id="HTaskWorkMoney" value="0" >
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鏄惁缁撹处</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 200px;">
+                                                <input type="checkbox" class="layui-input" name="HIsAccount" lay-verify="HIsAccount" id="HIsAccount" title="鏄�" lay-skin="tag" value="true"  checked  >
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">缁撶畻缁撹处鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="datetime-local" step="1" class="layui-input" name="HAccountDate" lay-verify="HAccountDate" id="HAccountDate"  >
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">宸ヨ垂缁撹处鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="datetime-local" step="1" class="layui-input" name="HAccountWorkMoneyDate" lay-verify="HAccountWorkMoneyDate" id="HAccountWorkMoneyDate"  >
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鏄惁瀹℃牳鑰冩牳璐�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 200px;">
+                                                <input type="checkbox" class="layui-input" name="HIsCheckExam" lay-verify="HIsCheckExam" id="HIsCheckExam" title="鏄�" lay-skin="tag" checked value="true">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鏄惁瀹℃牳宸ヨ垂</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 200px;">
+                                                <input type="checkbox" class="layui-input" name="HIsCheckWorkMoney" lay-verify="HIsCheckWorkMoney" id="HIsCheckWorkMoney" title="鏄�" lay-skin="tag" checked value="true">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍥炲鏃堕棿</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="datetime-local" step="1" class="layui-input" name="HInfoBackTime" lay-verify="HInfoBackTime" id="HInfoBackTime">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍥炲浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HInfoBackMan" lay-verify="HInfoBackMan" id="HInfoBackMan"  >
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍥炲鍐呭</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <textarea type="text" class="layui-textarea" name="HInfoNote" lay-verify="HInfoNote" id="HInfoNote"  ></textarea>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浠诲姟寮�濮嬫椂闂�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="datetime-local" step="1" class="layui-input" name="HTaskBTime" lay-verify="HTaskBTime" id="HTaskBTime">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">宸ヨ垂缁撹处鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="datetime-local" step="1" class="layui-input" name="HTaskETime" lay-verify="HTaskETime" id="HTaskETime">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浠诲姟璇︾粏鍐呭</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <textarea type="text" class="layui-textarea" name="HTaskNote" lay-verify="HTaskNote" id="HTaskNote"  ></textarea>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">宸ヤ綔浜哄憳</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <textarea type="text" class="layui-textarea" name="HTaskWorkEmp" lay-verify="HTaskWorkEmp" id="HTaskWorkEmp"  ></textarea>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">寮�濮嬪叧闃�鏃堕棿</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="datetime-local" step="1" class="layui-input" name="HBeginCloseValveTime" lay-verify="HBeginCloseValveTime" id="HBeginCloseValveTime">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">缁撴潫鍏抽榾鏃堕棿</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="datetime-local" step="1" class="layui-input" name="HEndCloseValveTime" lay-verify="HEndCloseValveTime" id="HEndCloseValveTime">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽榾鍙暟</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="number" class="layui-input" name="HCloseValveQty" lay-verify="HCloseValveQty" id="HCloseValveQty" value="0" >
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">寮�濮嬪紑闃�鏃堕棿</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="datetime-local" step="1" class="layui-input" name="HBeginOpenValveTime" lay-verify="HBeginOpenValveTime" id="HBeginOpenValveTime">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">缁撴潫寮�闃�鏃堕棿</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="datetime-local" step="1" class="layui-input" name="HEndOpenValveTime" lay-verify="HEndOpenValveTime" id="HEndOpenValveTime">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">寮�闃�鍙暟</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="number" class="layui-input" name="HOpenValveQty" lay-verify="HOpenValveQty" id="HOpenValveQty" value="0"  >
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鎿嶄綔浜哄憳</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HValveWorkEmp" lay-verify="HValveWorkEmp" id="HValveWorkEmp"  >
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浠诲姟澶囨敞</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <textarea type="text" class="layui-textarea" name="HTaskRemark" lay-verify="HTaskRemark" id="HTaskRemark"  ></textarea>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                             <!--鍏朵粬淇℃伅-->
@@ -533,7 +786,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;"  readonly>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -720,11 +973,23 @@
             var params = getUrlVars();
             var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫
             var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-
+            var HBillSubType = (decodeURI(params[params[3]]) != "宸ョ▼绫�" && decodeURI(params[params[3]]) != "浠诲姟绫�") ? "椤圭洰绫�" : decodeURI(params[params[3]]);
+            $("#HBillSubType").val(HBillSubType);
             //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
-
+            //鏍规嵁瀛愮被鍨嬮殣钘忛〉绛�
+            $('li').show();
+            if (HBillSubType == "宸ョ▼绫�") {
+                $('li[lay-id="3"]').hide();
+                $('li[lay-id="4"]').hide();
+            } else if (HBillSubType == "浠诲姟绫�") {
+                $('li[lay-id="2"]').first().hide();
+                $('li[lay-id="3"]').hide();
+            } else {
+                $('li[lay-id="2"]').first().hide();
+                $('li[lay-id="4"]').hide();
+            }
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "4750";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
@@ -766,8 +1031,18 @@
                 $("#HTestDate").val(Format(new Date(), "yyyy-MM-dd"));
                 $("#HSewageDate").val(Format(new Date(), "yyyy-MM-dd"));
                 $("#HWaterSupplyDate").val(Format(new Date(), "yyyy-MM-dd"));
-                
 
+                //$('input[type="datetime-local"]').val(new Date().toDateString());
+                $('input[type="datetime-local"]').each(function () {
+                    // 鑾峰彇褰撳墠鏃ユ湡鍜屾椂闂�
+                    const now = new Date();
+                    // 娉ㄦ剰锛氫笂闈㈢殑浠g爜浼氱敓鎴愪竴涓舰濡�"2023-04-01 12:34:56"鐨勫瓧绗︿覆锛屼絾datetime-local瀹為檯涓婃湡鏈涚殑鏄�"YYYY-MM-DDTHH:mm:ss"锛堟棤绌烘牸锛�
+                    // 鍥犳鎴戜滑搴旇浣跨敤涓嬮潰鐨勪唬鐮佹潵姝g‘鏍煎紡鍖�
+                    const formattedDateTimeLocal = now.toISOString().slice(0, 10) + 'T' + now.toTimeString().slice(0, 8).replace(/:\d{2}\.\d{3}/, ':00'); // 鍘婚櫎姣骞惰缃负00绉掞紙鍥犱负datetime-local涓嶆敮鎸佹绉掞級
+
+                    // 璁剧疆input鍏冪礌鐨勫��
+                    $(this).val(formattedDateTimeLocal);
+                });
                 //鍒濆鍖栭」鐩樁娈佃〃
                 get_InitGrid1();
             }
@@ -822,6 +1097,18 @@
             //#region 閫夋嫨椤圭洰缁忕悊鎸夐挳
             form.on('submit(btnSearchHPMEmp)', function () {
                 get_checkSearchHPMEmp();
+            });
+            //#endregion
+
+            //#region 閫夋嫨浠诲姟椤圭洰鍒嗙被
+            form.on('submit(btnSearchHTaskClassEntry)', function () {
+                get_checkSearchHTaskClassEntry();
+            });
+            //#endregion
+
+            //#region 閫夋嫨浠诲姟澶х被
+            form.on('submit(btnSearchHTaskClass)', function () {
+                get_checkSearchHTaskClass();
             });
             //#endregion
 
@@ -1798,6 +2085,71 @@
             }
             //#endregion
 
+            //#region 浠诲姟澶х被閫夋嫨椤甸潰
+            function get_checkSearchHTaskClass() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鍛樺伐琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../椤圭洰绠$悊/鍩虹寤烘ā/Gy_TaskClass.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HTaskClassID").val(checkStatus.data[0].HItemID);
+                        $("#HTaskClassName").val(checkStatus.data[0].浠诲姟绫诲埆鍚嶇О);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                    , end: function () {
+                        if (typeof (TaskData.HItemID) != undefined) {
+                            $("#HTaskClassID").val(TaskData.HItemID);
+                            $("#HTaskClassName").val(TaskData.浠诲姟绫诲埆鍚嶇О);
+                        }
+                        TaskData = [];
+                    }
+                })
+            }
+            //#endregion
+            //#region 椤圭洰绫诲埆閫夋嫨椤甸潰
+            function get_checkSearchHTaskClassEntry() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鍛樺伐琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../椤圭洰绠$悊/鍩虹寤烘ā/Gy_TaskClass.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HTaskClassEntryID").val(checkStatus.data[0].HItemID);
+                        $("#HTaskClassEntryName").val(checkStatus.data[0].浠诲姟绫诲埆鍚嶇О);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                    , end: function () {
+                        if (typeof (TaskData.HItemID) != undefined) {
+                            $("#HTaskClassEntryID").val(TaskData.HItemID);
+                            $("#HTaskClassEntryName").val(TaskData.浠诲姟绫诲埆鍚嶇О);
+                        }
+                        TaskData = [];
+                    }
+                })
+            }
+            //#endregion
+
             //#region 淇濆瓨HMaker
             function set_AddNew(data) {
                 //鑾峰彇椤圭洰闃舵琛ㄦ暟鎹�
@@ -1872,7 +2224,19 @@
                         var tableMain = result.data[0];
                         var tableSub = result.data[1];
                         var tableSub_Emp = result.data[2];
-
+                        HBillSubType = tableMain[0]["HBillSubType"];
+                        //鏍规嵁瀛愮被鍨嬮殣钘忛〉绛�
+                        $('li').show();
+                        if (HBillSubType == "宸ョ▼绫�") {
+                            $('li[lay-id="3"]').hide();
+                            $('li[lay-id="4"]').hide();
+                        } else if (HBillSubType == "浠诲姟绫�") {
+                            $('li[lay-id="2"]').first().hide();
+                            $('li[lay-id="3"]').hide();
+                        } else {
+                            $('li[lay-id="2"]').first().hide();
+                            $('li[lay-id="4"]').hide();
+                        }
                         //涓昏〃 璧嬪��
                         form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                             "HInterID": tableMain[0]["HInterID"]
@@ -1956,7 +2320,45 @@
                             , "HBanZuMoney": tableMain[0]["HBanZuMoney"]
                             , "HYuShouKuanMoney": tableMain[0]["HYuShouKuanMoney"]
                             , "HGongFeiMoney": tableMain[0]["HGongFeiMoney"]
-                            , "HJieZhangMoney": tableMain[0]["HJieZhangMoney"]
+                            , "HJieZhangMoney": tableMain[0]["HJieZhangMoney"],
+                            "HTaskClassID": tableMain[0]["HTaskClassID"],
+                            "HTaskClassName": tableMain[0]["HTaskClassName"],
+                            "HTaskClassEntryID": tableMain[0]["HTaskClassEntryID"],
+                            "HTaskClassEntryName": tableMain[0]["HTaskClassEntryName"],
+                            "HTaskAddress": tableMain[0]["HTaskAddress"],
+                            "HBreakStatus": tableMain[0]["HBreakStatus"],
+                            "HWaterLeakage": tableMain[0]["HWaterLeakage"],
+                            "HPipeDiameter": tableMain[0]["HPipeDiameter"],
+                            "HPipeMaterial": tableMain[0]["HPipeMaterial"],
+                            "HAlarmEm": tableMain[0]["HAlarmEm"],
+                            "HAlarmLink": tableMain[0]["HAlarmLink"],
+                            "HReceEmp": tableMain[0]["HReceEmp"],
+                            "HReceTime": tableMain[0]["HReceTime"],
+                            "HTaskMaterMoney": tableMain[0]["HTaskMaterMoney"],
+                            "HTaskSetupMoney": tableMain[0]["HTaskSetupMoney"],
+                            "HTaskOtherMoney": tableMain[0]["HTaskOtherMoney"],
+                            "HTaskExamMoney": tableMain[0]["HTaskExamMoney"],
+                            "HTaskWorkMoney": tableMain[0]["HTaskWorkMoney"],
+                            "HIsAccount": tableMain[0]["HIsAccount"],
+                            "HAccountDate": tableMain[0]["HAccountDate"],
+                            "HAccountWorkMoneyDate": tableMain[0]["HAccountWorkMoneyDate"],
+                            "HIsCheckExam": tableMain[0]["HIsCheckExam"],
+                            "HIsCheckWorkMoney": tableMain[0]["HIsCheckWorkMoney"],
+                            "HInfoBackTime": tableMain[0]["HInfoBackTime"],
+                            "HInfoBackMan": tableMain[0]["HInfoBackMan"],
+                            "HInfoNote": tableMain[0]["HInfoNote"],
+                            "HTaskBTime": tableMain[0]["HTaskBTime"],
+                            "HTaskETime": tableMain[0]["HTaskETime"],
+                            "HTaskNote": tableMain[0]["HTaskNote"],
+                            "HTaskWorkEmp": tableMain[0]["HTaskWorkEmp"],
+                            "HBeginCloseValveTime": tableMain[0]["HBeginCloseValveTime"],
+                            "HEndCloseValveTime": tableMain[0]["HEndCloseValveTime"],
+                            "HCloseValveQty": tableMain[0]["HCloseValveQty"],
+                            "HBeginOpenValveTime": tableMain[0]["HBeginOpenValveTime"],
+                            "HEndOpenValveTime": tableMain[0]["HEndOpenValveTime"],
+                            "HOpenValveQty": tableMain[0]["HOpenValveQty"],
+                            "HValveWorkEmp": tableMain[0]["HValveWorkEmp"],
+                            "HTaskRemark": tableMain[0]["HTaskRemark"]
 
                         });
                         //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
@@ -2027,10 +2429,10 @@
                 //    layer.msg("瀹㈡埛鏈�夋嫨!");
                 //    return false;
                 //}
-                if ($("#HPMEmpID").val() == "0") {
-                    layer.msg("椤圭洰缁忕悊鏈�夋嫨!");
-                    return false;
-                }
+                //if ($("#HPMEmpID").val() == "0") {
+                //    layer.msg("椤圭洰缁忕悊鏈�夋嫨!");
+                //    return false;
+                //}
                 //if ($("#HWorkEmpID").val() == "0") {
                 //    layer.msg("瀹炴柦鎷呭綋鏈�夋嫨");
                 //    return false;
@@ -2933,6 +3335,10 @@
                 $("#HPayCusName").val(obj[0].瀹㈡埛鍚嶇О);//瀹㈡埛鍚嶇О
             }
         }
+        //浠诲姟绫诲埆
+        function GetTaskClassValue(obj) {
+            TaskData = obj[0];
+        }
         //椤圭洰缁忕悊
         function GetHPMValue(obj) {
             $("#HPMEmpID").val(obj[0].HItemID);//瀹㈡埛id

--
Gitblit v1.9.1