From fe1e71d624f43a4b79e6712b7d3c242fcd0b19a1 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 23 六月 2025 09:38:19 +0800
Subject: [PATCH] 1

---
 WebTM/WebTM.csproj.user                                  |    7 
 WebTM/views/质量管理/PNL检验信息/QC_CheckNote_PNL_TempEdit.html  |    5 
 WebTM/views/领料发货/销售出库/Kf_SellOutBill.html                |   13 
 WebTM/views/基础资料/公用基础资料/Gy_PNLInfoEdit.html              |    5 
 WebTM/views/基础资料/隐藏列设置/Gy_GridView_Hide_New.html         |   52 +++
 WebTM/views/项目管理/工程项目/PM_ProjectTaskNeedSaveQuery.html   |   37 +-
 WebTM/Vlog/webapi20250619.txt                            |    5 
 WebTM/views/项目管理/工程项目/PM_ProjectTaskNeedCheckQuery.html  |   14 
 WebTM/views/基础资料/公用基础资料/Gy_BarCodeBill_PNL_TempList.html |    2 
 WebTM/views/质量管理/PNL检验信息/QC_CheckNote_PNL_TempList.html  |    2 
 WebTM/views/项目管理/工程项目/PM_ProjectBill.html                |  499 ++++++++++++++++++++++-------------------
 WebTM/views/基础资料/公用基础资料/Gy_BarCodeBill_Set_TempList.html |   38 ++
 12 files changed, 391 insertions(+), 288 deletions(-)

diff --git a/WebTM/Vlog/webapi20250619.txt b/WebTM/Vlog/webapi20250619.txt
new file mode 100644
index 0000000..2139ba5
--- /dev/null
+++ b/WebTM/Vlog/webapi20250619.txt
@@ -0,0 +1,5 @@
+2025/6/19 15:34:35 鎵撳嵃sql:select * from h_v_IF_BarCodeBillList where hmainid in(99366,99367) order by hmainid desc
+
+2025/6/19 15:35:10 鎵撳嵃sql:select * from h_v_IF_BarCodeBillList where hmainid in(99366,99367) order by hmainid desc
+
+2025/6/19 15:37:11 鎵撳嵃sql:select * from h_v_IF_BarCodeBillList where hmainid in(99366,99367) order by hmainid desc
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 6fa6388..cbf1153 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,9 +1,10 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
-    <ProjectView>ProjectFiles</ProjectView>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+    <ProjectView>ShowAllFiles</ProjectView>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BarCodeBill_PNL_TempList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BarCodeBill_PNL_TempList.html"
index b0fb3d4..98c7f27 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BarCodeBill_PNL_TempList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BarCodeBill_PNL_TempList.html"
@@ -617,7 +617,7 @@
                 sWhere += " and 鏉$爜缂栧彿 like '%" + HBarCode + "%'";
             }
             if (HBeginDate != "" && HEndDate != "") {
-                sWhere += "and 鍒涘缓鏃堕棿 between '" + HBeginDate + "' and '" + HEndDate + "'";
+                sWhere += "and 鍒涘缓鏃堕棿 between '" + HBeginDate + " 00:00:00' and '" + HEndDate + " 23:59:59'";
             }
             if (GetDataCols != "") {
                 sWhere += GetDataCols;
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BarCodeBill_Set_TempList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BarCodeBill_Set_TempList.html"
index 428303c..6f9b2f9 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BarCodeBill_Set_TempList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BarCodeBill_Set_TempList.html"
@@ -65,6 +65,14 @@
 
                                     </div>
                                 </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">PNL鏉$爜鍙�:</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input ForFilteringSchemes" name="HBarCode_PNL"
+                                               lay-verify="HBarCode_PNL" id="HBarCode_PNL" autocomplete="off">
+
+                                    </div>
+                                </div>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
                                         lay-filter="btnSearch" id="btnSearch">
                                     鏌ヨ
@@ -96,9 +104,11 @@
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
                                                 <option value="<=">
-                                                    <= </option>
+                                                    <=
+                                                </option>
                                                 <option value="<">
-                                                    <   </option>
+                                                    <
+                                                </option>
                                                 <option value="<>">
                                                     <>
                                                 </option>
@@ -130,9 +140,11 @@
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
                                                 <option value="<=">
-                                                    <= </option>
+                                                    <=
+                                                </option>
                                                 <option value="<">
-                                                    < </option>
+                                                    <
+                                                </option>
                                                 <option value="<>">
                                                     <>
                                                 </option>
@@ -164,9 +176,11 @@
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
                                                 <option value="<=">
-                                                    <= </option>
+                                                    <=
+                                                </option>
                                                 <option value="<">
-                                                    < </option>
+                                                    <
+                                                </option>
                                                 <option value="<>">
                                                     <>
                                                 </option>
@@ -190,8 +204,8 @@
                             <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
                                 <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_AddNew" lay-event="set_AddNew"><i class="layui-icon layui-icon-form"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_ShowBill" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Copy" id="btn-Copy"><i class="layui-icon layui-icon-transfer"></i>澶嶅埗</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_DeleteBill" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Copy" id="btn-Copy"><i class="layui-icon layui-icon-transfer"></i>澶嶅埗</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_DeleteBill" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Export" id="btn-Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
@@ -537,6 +551,7 @@
             var HBeginDate = $("#HBeginDate").val();//璧峰鏃ユ湡
             var HEndDate = $("#HEndDate").val();//鎴鏃ユ湡
             var HBarCode = $("#HBarCode").val();//鍗曟嵁鍙�
+            var HBarCode_PNL = $("#HBarCode_PNL").val()
             var ColName = $("#ColName").val();//澶嶉�夋
             var Comparator = $("#Comparator").val()
             var ColContent = $("#ColContent").val();
@@ -616,10 +631,14 @@
                 sWhere += " and 鏉$爜缂栧彿 like '%" + HBarCode + "%'";
             }
             if (HBeginDate != "" && HEndDate != "") {
-                sWhere += "and 鍒涘缓鏃堕棿 between '" + HBeginDate + "' and '" + HEndDate + "'";
+                sWhere += " and 鍒涘缓鏃堕棿 between '" + HBeginDate + " 00:00:00' and '" + HEndDate + " 23:59:59'";
             }
             if (GetDataCols != "") {
                 sWhere += GetDataCols;
+            }
+
+            if (HBarCode_PNL != "") {
+                sWhere += " and PNL鏉$爜鍙� like '%" + HBarCode_PNL +"%'"
             }
 
             //get_Display(sWhere);
@@ -825,6 +844,7 @@
             $("#ColContent1").val("");
             $("#ColName1").val("0");
             $("#Comparator1").val("0");
+            $("#HBarCode_PNL").val("");
             form.render('select');
             sWhere = "";
             get_FastQuery();
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PNLInfoEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PNLInfoEdit.html"
index da4a8c1..1303f84 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PNLInfoEdit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PNLInfoEdit.html"
@@ -424,6 +424,7 @@
                 $("#HPNLPosition_y").val(0)
                 $("#HIcon").val("/img/鏅鸿兘鑺墖.png")
                 $("#HInterID").val(0)
+
             }
             function set_CopyBill() {
 
@@ -494,11 +495,9 @@
             }
 
             function get_AddLine() {
-
-
                 let data = table.cache['mainTable']
                 data.push({
-                    HInterID: linterid,
+                    HInterID: $("#HInterID").val(),
                     HLayOutName: $("#HLayOutName").val(),
                     HEntryID: 0,
                     HSetPosition_x: 0,
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html"
index 5fe9ac1..9d0eba0 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html"
@@ -12,6 +12,7 @@
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/zy_DragObserver.js"></script>
     <style>
         /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
         /*.layui-table-cell {
@@ -377,6 +378,8 @@
                         }
                         form.render('checkbox');
                         form.render('select');
+
+                        registerDragObserver()
                         layer.close(ajaxLoad);
                     } else {
                         var colTitleNames = colTitleName.split(',');
@@ -427,15 +430,16 @@
                     done: function (obj) {
                         // 瀹屾垚鏃讹紙鏉惧紑鏃讹級瑙﹀彂
                         // 濡傛灉鎷栧姩鍓嶅拰鎷栧姩鍚庢棤鍙樺寲锛屽垯涓嶄細瑙﹀彂姝ゆ柟娉�
-                        console.log(obj.row) // 褰撳墠琛屾暟鎹�
-                        console.log(obj.cache) // 鏀瑰姩鍚庡叏琛ㄦ暟鎹�
-                        console.log(obj.oldIndex) // 鍘熸潵鐨勬暟鎹储寮�
-                        console.log(obj.newIndex) // 鏀瑰姩鍚庢暟鎹储寮�
+                        //console.log(obj.row) // 褰撳墠琛屾暟鎹�
+                        //console.log(obj.cache) // 鏀瑰姩鍚庡叏琛ㄦ暟鎹�
+                        //console.log(obj.oldIndex) // 鍘熸潵鐨勬暟鎹储寮�
+                        //console.log(obj.newIndex) // 鏀瑰姩鍚庢暟鎹储寮�
 
-                        console.log(table.cache["mainTable"]) // 鏀瑰姩鍚庢暟鎹储寮�
+                        //console.log(table.cache["mainTable"]) // 鏀瑰姩鍚庢暟鎹储寮�
                     }
                 }
-                , done: function () {
+                , done: function (res, curr, count) {
+
                     soulTable.render(this)
                 }
             };
@@ -530,10 +534,42 @@
             })
         }
 
+        //// 娉ㄥ唽鎷栨嫿瑙傚療鑰咃紝鐩戝惉琛ㄦ牸鎷栨嫿鍙樺寲
+        function registerDragObserver() {
+            // 濡傛灉涓嶆敮鎸侊紝鍒欎粈涔堥兘涓嶆墽琛�
+            if (typeof window.MutationObserver === 'undefined'
+                && typeof window.WebKitMutationObserver === 'undefined') {
+                console.warn('observer not supported')
+                return
+            }
+            let targetEl = $(".layui-table-box")[0];
+            let config = {
+                attributes: true,
+                attributesOldValue: true,
+                attributeFilter: ['class'],
+                childList: false,
+                subtree: false,
+                characterData: false,
+                characterDataOldValue: false
+            };
+            let observer = new MutationObserver(mutations => {
+                mutations.forEach(function (mutation) {
+                    if (mutation.attributeName === 'class') {
+                        // 鐩戝惉class涓唴瀹圭殑鍙樺寲
+                        if ($(targetEl).hasClass('noselect')) {
+                            document.documentElement.style.userSelect = 'none';
+                            document.documentElement.style.webkitUserSelect = 'none';
+                        } else {
+                            document.documentElement.style.userSelect = '';
+                            document.documentElement.style.webkitUserSelect = '';
+                        }
+                    }
+                })
+            })
+            observer.observe(targetEl, config);
+        }
 
         //#endregion
 
     });
-
-
 </script>
\ No newline at end of file
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/PNL\346\243\200\351\252\214\344\277\241\346\201\257/QC_CheckNote_PNL_TempEdit.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/PNL\346\243\200\351\252\214\344\277\241\346\201\257/QC_CheckNote_PNL_TempEdit.html"
index a661a9e..264b53c 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/PNL\346\243\200\351\252\214\344\277\241\346\201\257/QC_CheckNote_PNL_TempEdit.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/PNL\346\243\200\351\252\214\344\277\241\346\201\257/QC_CheckNote_PNL_TempEdit.html"
@@ -92,8 +92,9 @@
                                                         <label class="layui-form-label">妫�楠屽伐搴�:</label>
                                                         <div class="layui-input-inline">
                                                             <select name="HCheckProc" lay-filter="HCheckProc" id="HCheckProc">
-                                                                <option value="鍐呭眰" selected="selected">鍐呭眰</option>
-                                                                <option value="澶栧眰">澶栧眰</option>
+                                                                <option value="鐐.VRS鍐呭眰" selected="selected">鐐.VRS鍐呭眰</option>
+                                                                <option value="鐐.VRS澶栧眰">鐐.VRS澶栧眰</option>
+                                                                <option value="AVI">AVI</option>
                                                                 <option value="鐢垫祴">鐢垫祴</option>
                                                             </select>
                                                         </div>
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/PNL\346\243\200\351\252\214\344\277\241\346\201\257/QC_CheckNote_PNL_TempList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/PNL\346\243\200\351\252\214\344\277\241\346\201\257/QC_CheckNote_PNL_TempList.html"
index 462b4be..c5c1d5e 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/PNL\346\243\200\351\252\214\344\277\241\346\201\257/QC_CheckNote_PNL_TempList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/PNL\346\243\200\351\252\214\344\277\241\346\201\257/QC_CheckNote_PNL_TempList.html"
@@ -623,7 +623,7 @@
                 sWhere += " and PNL鏉$爜缂栧彿 like '%" + HBarCode + "%'";
             }
             if (HBeginDate != "" && HEndDate != "") {
-                sWhere += "and 鍒涘缓鏃堕棿 between '" + HBeginDate + "' and '" + HEndDate + "'";
+                sWhere += "and 鍒涘缓鏃堕棿 between '" + HBeginDate + " 00:00:00' and '" + HEndDate + " 23:59:59'";
             }
             if (GetDataCols != "") {
                 sWhere += GetDataCols;
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 9cf4228..e8bca31 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"
@@ -660,99 +660,100 @@
                             <!--浠诲姟淇℃伅-->
                             <div class="layui-tab-item" id="task_tab">
                                 <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="HTaskClassNumber" id="HTaskClassNumber" lay-verify="HTaskClassNumber" value="">
-                                                <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 class="layui-card layui-bg-gray">
+                                        <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="HTaskClassNumber" id="HTaskClassNumber" lay-verify="HTaskClassNumber" value="">
+                                                    <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>
-                                        <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="HWaterLeakage" lay-verify="HWaterLeakage" id="HWaterLeakage">
-                                            </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" name="HPipeDiameter" id="HPipeDiameter" class="layui-input" value="" style="float: left; width: 150px;">
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHPipeDiameter" id="btnSearchHPipeDiameter" 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: 85px;">绠¢亾鏉愯川</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" name="HPipeMaterial" id="HPipeMaterial" class="layui-input" value="" style="float: left; width: 150px; ">
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHPipeMaterial" id="btnSearchHPipeMaterial" 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: 85px;">鎹熷潖鎯呭喌</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <!-- 杈撳叆妗� -->
-                                                <input type="text" class="layui-input" name="HBreakStatus" lay-verify="HBreakStatus" id="HBreakStatus" placeholder="璇疯緭鍏ユ垨閫夋嫨" autocomplete="off">
+                                        <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="HBreakStatus" lay-verify="HBreakStatus" id="HBreakStatus" placeholder="璇疯緭鍏ユ垨閫夋嫨" autocomplete="off">
 
-                                                <!-- 涓嬫媺瀹瑰櫒 -->
-                                                <div id="dropdownMenu1" class="layui-anim layui-anim-upbit"
-                                                     style="display: none;position: absolute;width: 100%;max-height: 200px;overflow-y: auto;border: 1px solid #e6e6e6;background: #f8f8f8;z-index: 999;top: 40px;left: 0;">
-                                                    <ul id="optionList1" class="layui-nav layui-nav-tree" style="width: 100%; background:white"></ul>
+                                                    <!-- 涓嬫媺瀹瑰櫒 -->
+                                                    <div id="dropdownMenu1" class="layui-anim layui-anim-upbit"
+                                                         style="display: none;position: absolute;width: 100%;max-height: 200px;overflow-y: auto;border: 1px solid #e6e6e6;background: #f8f8f8;z-index: 999;top: 40px;left: 0;">
+                                                        <ul id="optionList1" class="layui-nav layui-nav-tree" style="width: 100%; background:white"></ul>
+                                                    </div>
+                                                </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="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" name="HPipeDiameter" id="HPipeDiameter" class="layui-input" value="" style="float: left; width: 150px;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHPipeDiameter" id="btnSearchHPipeDiameter" 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: 85px;">绠¢亾鏉愯川</label>
+                                                <div class="layui-input-block" style="margin-left: 120px;">
+                                                    <input type="text" name="HPipeMaterial" id="HPipeMaterial" class="layui-input" value="" style="float: left; width: 150px; ">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHPipeMaterial" id="btnSearchHPipeMaterial" 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: 85px;">鎶ユ紡浜�</label>
+                                                <div class="layui-input-block" style="margin-left: 120px;">
+                                                    <!-- 杈撳叆妗� -->
+                                                    <input type="text" class="layui-input" name="HAlarmEmp" lay-verify="HAlarmEmp" id="HAlarmEmp" placeholder="璇疯緭鍏ユ垨閫夋嫨" autocomplete="off">
+
+                                                    <!-- 涓嬫媺瀹瑰櫒 -->
+                                                    <div id="dropdownMenu" class="layui-anim layui-anim-upbit"
+                                                         style="display: none;position: absolute;width: 100%;max-height: 200px;overflow-y: auto;border: 1px solid #e6e6e6;background: #f8f8f8;z-index: 999;top: 40px;left: 0;">
+                                                        <ul id="optionList" class="layui-nav layui-nav-tree" style="width: 100%; background:white"></ul>
+                                                    </div>
+                                                </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="HAlarmLink" lay-verify="HAlarmLink" id="HAlarmLink">
                                                 </div>
                                             </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" placeholder="璇疯緭鍏ユ垨閫夋嫨" autocomplete="off">
-
-                                                <!-- 涓嬫媺瀹瑰櫒 -->
-                                                <div id="dropdownMenu" class="layui-anim layui-anim-upbit"
-                                                     style="display: none;position: absolute;width: 100%;max-height: 200px;overflow-y: auto;border: 1px solid #e6e6e6;background: #f8f8f8;z-index: 999;top: 40px;left: 0;">
-                                                    <ul id="optionList" class="layui-nav layui-nav-tree" style="width: 100%; background:white"></ul>
-                                                </div>
-                                            </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;">                               
+                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="text" class="layui-input" name="HReceEmp" lay-verify="HReceEmp" id="HReceEmp" value="" style="float: left; width: 150px; ">
                                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHReceEmp" id="btnSearchHReceEmp" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -767,162 +768,89 @@
                                             </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" style="float: left; width: 150px; ">
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskSetupMoney" id="btnSearchHTaskSetupMoney" 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: 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" style="float: left; width: 150px; ">
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskOtherMoney" id="btnSearchHTaskOtherMoney" 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: 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" style="float: left; width: 150px; ">
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskExamMoney" id="btnSearchHTaskExamMoney" 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: 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" style="float: left; width: 150px; ">
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskWorkMoney" id="btnSearchHTaskWorkMoney" 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: 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;">
-                                                <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" 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" 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;">
                                                 <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>
-                                            <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">
+                                    <div class="layui-card layui-bg-gray">
+                                        <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>
                                         
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">缁撶畻缁撹处鏃ユ湡</label>
+                                            <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">
+                                                <textarea type="text" class="layui-textarea" name="HTaskWorkEmp" lay-verify="HTaskWorkEmp" id="HTaskWorkEmp" style="width: 485px; display: inline-block;"></textarea>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHTaskWorkEmp" id="btnSearchHTaskWorkEmp" style="padding: 0 10px;float: right;margin-top: 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;">
-                                                <textarea type="text" class="layui-textarea" name="HTaskNote" lay-verify="HTaskNote" id="HTaskNote"></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 class="layui-card layui-bg-gray">
+                                        <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>
-                                        <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 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="HBeginOpenValveTime" lay-verify="HBeginOpenValveTime" id="HBeginOpenValveTime">
+                                                </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="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>
-                                        <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;">
@@ -936,23 +864,128 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-row">
+                                    <div class="layui-card layui-bg-gray">
+                                        <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="HTaskMaterMoney" lay-verify="HTaskMaterMoney" id="HTaskMaterMoney" 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="HTaskSetupMoney" lay-verify="HTaskSetupMoney" id="HTaskSetupMoney" value="0" style="float: left; width: 150px; ">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskSetupMoney" id="btnSearchHTaskSetupMoney" 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: 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" style="float: left; width: 150px; ">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskOtherMoney" id="btnSearchHTaskOtherMoney" 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: 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" style="float: left; width: 150px; ">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskExamMoney" id="btnSearchHTaskExamMoney" 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: 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">
+                                                </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" style="float: left; width: 150px; ">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskWorkMoney" id="btnSearchHTaskWorkMoney" 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: 85px;">缁撶畻缁撹处鏃ユ湡</label>
+                                                <div class="layui-input-block" style="margin-left: 120px;">
+                                                    <input type="date" 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="date" 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" 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" 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>
+                                        
                                         <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" style="width:485px"></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" style="width: 485px; display: inline-block;"></textarea>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHTaskWorkEmp" id="btnSearchHTaskWorkEmp" style="padding: 0 10px;float: right;margin-top: 3px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
-                                            </div>
-
-                                        </div>
+                                    </div>
+                                    <div class="layui-card layui-bg-gray">
+                                        
+                                        
+                                    </div>
+                                    <div class="layui-row">
+                                        
+                                        
+                                        
+                                        
+                                    </div>
+                                    <div class="layui-row">
+                                        
+                                    </div>
+                                    <div class="layui-row">
+                                        
+                                    </div>
+                                    <div class="layui-row">
+                                        
+                                        
                                     </div>
                                 </div>
                             </div>
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_ProjectTaskNeedCheckQuery.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_ProjectTaskNeedCheckQuery.html"
index b5d1671..bee23be 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_ProjectTaskNeedCheckQuery.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_ProjectTaskNeedCheckQuery.html"
@@ -48,10 +48,10 @@
                                 </button>
                             </div>
                         </div>
-                        <div>
-                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
-                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
-                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
+                        <div class="layui-inline">
+                            <button class="layui-btn layui-btn-normal" style="margin-left: 40px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
+                            <button class="layui-btn layui-btn-normal" style="margin-left: 5px" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
+                            <button class="layui-btn layui-btn-normal" style="margin-left: 5px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
                         </div>
 
                         <div class="layui-col-xs6">
@@ -181,13 +181,13 @@
                                                 <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" style="width:150px" disabled>
+                                                        <input type="date" step="1" class="layui-input" name="HAccountWorkMoneyDate" lay-verify="HAccountWorkMoneyDate" id="HAccountWorkMoneyDate" style="width:150px" disabled>
                                                     </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" style="width:150px" disabled>
+                                                        <input type="date" step="1" class="layui-input" name="HAccountDate" lay-verify="HAccountDate" id="HAccountDate" style="width:150px" disabled>
                                                     </div>
                                                 </div>
                                                 <div class="layui-inline">
@@ -524,7 +524,7 @@
                     }
                     , btn2: function (index, layero) { }
                     , end: function () {
-                        get_DisplaySource();
+                        get_FastQuery();
                     }
                 })
             }
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_ProjectTaskNeedSaveQuery.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_ProjectTaskNeedSaveQuery.html"
index ef5bffd..5c3e2e2 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_ProjectTaskNeedSaveQuery.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_ProjectTaskNeedSaveQuery.html"
@@ -39,21 +39,26 @@
             <div class="layui-card" style="">
                 <div class="layui-card-body" style="padding:1px">
                     <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇杞﹂棿</label>
-                            <div class="layui-input-block" style="margin-left: 77px;">
-                                <input type="hidden" class="layui-input" lay-filter="HDeptID" name="HDeptID" id="HDeptID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" disabled>
-                                <input type="text" class="layui-input" lay-filter="HDeptName" name="HDeptName" id="HDeptName" value="" style="width: 60%;display: inline-block;">
-                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptID" id="btnHDeptID" style="padding: 0 10px;float: right;margin-right: 3px;">
-                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                </button>
+                        <div class="layui-row">
+                            <div class="layui-inline">
+                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇杞﹂棿</label>
+                                <div class="layui-input-block" style="margin-left: 77px;">
+                                    <input type="hidden" class="layui-input" lay-filter="HDeptID" name="HDeptID" id="HDeptID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" disabled>
+                                    <input type="text" class="layui-input" lay-filter="HDeptName" name="HDeptName" id="HDeptName" value="" style="width: 60%;display: inline-block;">
+                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptID" id="btnHDeptID" 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">
+                                <button class="layui-btn layui-btn-normal" style="margin-left: 40px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
+                                <button class="layui-btn layui-btn-normal" style="margin-left: 5px" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
+                                <button class="layui-btn layui-btn-normal" style="margin-left: 5px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
                             </div>
                         </div>
-                        <div>
-                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
-                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
-                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
-                        </div>
+                        
 
                         <div class="layui-col-xs6">
                             <div class="layui-tab layui-tab-card" lay-filter="table">
@@ -193,13 +198,13 @@
                                                 <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" style="width:150px" disabled>
+                                                        <input type="date" step="1" class="layui-input" name="HAccountWorkMoneyDate" lay-verify="HAccountWorkMoneyDate" id="HAccountWorkMoneyDate" style="width:150px" disabled>
                                                     </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" style="width:150px" disabled>
+                                                        <input type="date" step="1" class="layui-input" name="HAccountDate" lay-verify="HAccountDate" id="HAccountDate" style="width:150px" disabled>
                                                     </div>
                                                 </div>
                                                 <div class="layui-inline">
@@ -555,7 +560,7 @@
                     }
                     , btn2: function (index, layero) { }
                     , end: function () {
-                        get_DisplaySource();
+                        get_FastQuery();
                     }
                 })
             }
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
index 7e11a0c..c9f8596 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
@@ -3270,7 +3270,7 @@
                                                 option.data = table.cache["mainTable"];
                                                 table.render(option);
                                             }
-                                            var HQty = option.data[rowIndex + i].HQty * 1;                           //鏁伴噺
+                                            var HQty = 1;                           //鏁伴噺
                                             var HPrice = checkStatus.data[i].缁撶畻浠�;               //鍗曚环
                                             var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
                                             var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4));         //绋庨=閲戦*绋庣巼
@@ -3283,6 +3283,7 @@
                                             option.data[rowIndex + i].HUnitID = checkStatus.data[i].HUnitID;
                                             option.data[rowIndex + i].璁¢噺鍗曚綅 = checkStatus.data[i].璁¢噺鍗曚綅鍚嶇О;
                                             option.data[rowIndex + i].HPrice = HPrice;
+                                            option.data[rowIndex + i].HQty = HQty;
                                             option.data[rowIndex + i].HTaxMoney = HTaxMoney;
                                             option.data[rowIndex + i].HlineTotal = HlineTotal;
                                             option.data[rowIndex + i].HTaxPrice = HTaxPrice;
@@ -3318,7 +3319,7 @@
                                             });
                                         }
                                         //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
-                                        var HQty = obj.data.HQty * 1;                           //鏁伴噺
+                                        var HQty = 1;                           //鏁伴噺
                                         var HPrice = HDataTemp.缁撶畻浠�;               //鍗曚环
                                         var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
                                         var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4));         //绋庨=閲戦*绋庣巼
@@ -3475,7 +3476,8 @@
                     element.focus();
 
                     var HOrgID = $("#HOrgID").val();
-
+                    var HWHID = $("#HWHID").val();
+                    var HWHName = $("#HWHName").val();
                     layer.open({
                         type: 2
                         , skin: "layui-layer-rim" //鍔犱笂杈规
@@ -3575,7 +3577,7 @@
                                         option.data = table.cache["mainTable"];
                                         table.render(option);
                                     }
-                                    var HQty = option.data[rowIndex + i].HQty * 1;                           //鏁伴噺
+                                    var HQty = 1;                           //鏁伴噺
                                     var HPrice = checkStatus.data[i].缁撶畻浠�;               //鍗曚环
                                     var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
                                     var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4));         //绋庨=閲戦*绋庣巼
@@ -3587,6 +3589,7 @@
                                     option.data[rowIndex + i].瑙勬牸鍨嬪彿 = checkStatus.data[i].瑙勬牸鍨嬪彿;
                                     option.data[rowIndex + i].HUnitID = checkStatus.data[i].HUnitID;
                                     option.data[rowIndex + i].璁¢噺鍗曚綅 = checkStatus.data[i].璁¢噺鍗曚綅鍚嶇О;
+                                    option.data[rowIndex + i].HQty = HQty;
                                     option.data[rowIndex + i].HPrice = HPrice;
                                     option.data[rowIndex + i].HTaxMoney = HTaxMoney;
                                     option.data[rowIndex + i].HlineTotal = HlineTotal;
@@ -3622,7 +3625,7 @@
                                     });
                                 }
                                 //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
-                                var HQty = obj.data.HQty * 1;                           //鏁伴噺
+                                var HQty = 1;                           //鏁伴噺
                                 var HPrice = HDataTemp.缁撶畻浠�;               //鍗曚环
                                 var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
                                 var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4));         //绋庨=閲戦*绋庣巼

--
Gitblit v1.9.1