From cba0ef063a24b5b965bfa943cf1c8d2c8acba84a Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 03 八月 2023 10:16:43 +0800
Subject: [PATCH] 排产 工艺路线的加工数量排产需要 生产入库 单据号改成流转卡号

---
 WebTM/views/设备管理/Sb_EquipDotCheckPlanBillList.html |   40 +++++++++++++++++++++-------------------
 1 files changed, 21 insertions(+), 19 deletions(-)

diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
index b1c0fde..7bbfbe4 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
@@ -29,15 +29,15 @@
                                     </div>
                                 </div>
                                 <!--<div class="layui-inline">
-        <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
-        <div class="layui-input-block">
-            <select name="HBillType" id="HBillType">
-                <option value="">鎵�鏈�</option>
-                <option value="ZHXJ">涓嬫灦鎵捐揣鍗�</option>
-                <option value="ZHSJ">涓婃灦褰掕繕鍗�</option>
-            </select>
-        </div>
-    </div>-->
+                                    <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
+                                    <div class="layui-input-block">
+                                        <select name="HBillType" id="HBillType">
+                                            <option value="">鎵�鏈�</option>
+                                            <option value="ZHXJ">涓嬫灦鎵捐揣鍗�</option>
+                                            <option value="ZHSJ">涓婃灦褰掕繕鍗�</option>
+                                        </select>
+                                    </div>
+                                </div>-->
                                 <div class="layui-inline">
                                     <label class="layui-form-label">鍗曟嵁鍙�</label>
                                     <div class="layui-input-block">
@@ -80,8 +80,8 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
 
                             </div>
                         </script>
@@ -94,6 +94,8 @@
     <script src="../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../layuiadmin/PubCustom.js"></script>
+    <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script>
         layui.config({
             base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -118,7 +120,7 @@
 
             //鍒濆鍖栭〉闈㈠姞杞�
             set_ClearBill();
-           
+
 
             //#region 澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
@@ -149,8 +151,7 @@
                         get_PrintReport();
                         break;
                     //閫�鍑烘寜閽�
-                    case 'btn-Close':
-                        parent.layui.admin.events.closeThisTabs();
+                    case 'btn-exit': Pub_Close(2);
                         break;
                 };
             });
@@ -167,7 +168,8 @@
             //#region 褰撳墠椤甸潰鎵�鏈夋柟娉�
             //鍒濆鍖栭〉闈�
             function set_ClearBill() {
-
+                $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+                $("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
                 //鏌ヨ
@@ -257,8 +259,8 @@
                 $("#HBillNo").val("");//鍗曟嵁鍙�
                 $("#HSourceBillNo").val("");//婧愬崟鍙�
                 $("#HCreateBy").val("");//鍒跺崟浜�
-                $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-                $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
+                $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+                $("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
                 sWhere = "";
                 $("#btnSearch").click();
             }
@@ -279,7 +281,7 @@
                     sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + BenginHCreateDate + "'";
                 }
                 if (EndHCreateDate) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + EndHCreateDate + "'";
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + EndHCreateDate + "'";
                 }
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -370,7 +372,7 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
                 }
             }
-            
+
 
             //#endregion
         });

--
Gitblit v1.9.1