| WebTM/views/采购管理/委外订单/WW_EntrustOrderBillList.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebTM/views/²É¹º¹ÜÀí/ίÍâ¶©µ¥/WW_EntrustOrderBillList.html
@@ -34,7 +34,7 @@ <label class="layui-form-label">ä¸å¡ç¶æ</label> <div class="layui-input-block"> <select name="HStatus" lay-filter="HStatus" style="width:190px;"> <option value="-1" selected="selected">å ¨é¨</option> <option value="-1" selected>å ¨é¨</option> <option value="1">æªåé </option> <option value="2">å·²åé </option> <option value="3">å·²åå¸</option> @@ -58,17 +58,52 @@ </button> <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button> <div class="layui-colla-content"> <div class="layui-inline"> <!--<div class="layui-inline"> <div class="layui-inline"> <span>å ¶ä»æ¡ä»¶></span> </div> </div> </div>--> <div class="layui-inline"> <label class="layui-form-label">åæ®å·</label> <div class="layui-input-block"> <input type="text" class="layui-input" name="WorkCenter" id="WorkCenter"> <input type="text" class="layui-input" name="HBillno" id="HBillno" style="width:190px;"> </div> </div> <div class="layui-inline"> <label class="layui-form-label">ä¸å¡å</label> <div class="layui-input-block"> <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="width:190px;"> </div> </div> <div class="layui-inline"> <label class="layui-form-label">ååç¶æ</label> <div class="layui-input-block"> <select name="HXTStatus" lay-filter="HXTStatus" style="width:190px;"> <option value="" selected>å ¨é¨</option> <option value="æªç¡®è®¤">æªç¡®è®¤</option> <option value="已确认">已确认</option> </select> </div> </div> <div class="layui-inline"> <label class="layui-form-label">åé¦ç¶æ</label> <div class="layui-input-block"> <input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;"> </div> </div> <div class="layui-inline"> <label class="layui-form-label">ç©æä»£ç </label> <div class="layui-input-block"> <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width:190px;"> </div> </div> <div class="layui-inline"> <label class="layui-form-label">ç©æåç§°</label> <div class="layui-input-block"> <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="width:190px;"> </div> </div> </div> </div> </div> @@ -315,13 +350,17 @@ //å è½½ç½æ ¼ function get_Display(sWhere) { var wait = layer.load();//é®ç½© var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ var HEndDate = $("#HEndDate").val();//ç»ææ¥æ if (HBeginDate) { sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HBeginDate + "'"; } if (HEndDate) { sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HEndDate + "'"; if (sWhere == "") { var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ var HEndDate = $("#HEndDate").val();//ç»ææ¥æ if (HBeginDate) { sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HBeginDate + "'"; } if (HEndDate) { sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HEndDate + "'"; } sWhere += " and ä¸å¡ç¶æ = 'æªåé ' and ä¾åºåååç¶æ ='æªç¡®è®¤' "; } $.ajax({ url: GetWEBURL() + '/WW_EntrustOrderBill/list', @@ -898,8 +937,6 @@ } }); } //å¿«éè¿æ»¤ @@ -908,7 +945,12 @@ var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ var HEndDate = $("#HEndDate").val();//ç»ææ¥æ var HBillNo = $("#HBillNo").val(); //åæ®å· var HSupID = $("#HSupID").val(); //ä¾åºåä¿¡æ¯ var HEmpID = $("#HEmpID").val(); var HMaterNumber = $("#HMaterNumber").val(); var HMaterName = $("#HMaterName").val(); var HXTStatus = $("select[name='HXTStatus']").val(); var HXTFKStatus = $("#HXTFKStatus").val(); if (HStatus) { switch (HStatus) { case '-1': //å ¨é¨ @@ -935,8 +977,22 @@ if (HBillNo) { sWhere += " and åæ®å· like '%" + HBillNo + "%'"; } if (HSupID) { sWhere += " and HSupID = '" + HSupID + "'"; if (HMaterNumber) { sWhere += " and ç©æä»£ç like '%" + HMaterNumber + "%'"; } if (HMaterName) { sWhere += " and ç©æåç§° like '%" + HMaterName + "%'"; } if (HEmpID) { sWhere += " and ä¸å¡å like '%" + HEmpID + "%'"; } if (HXTStatus) { sWhere += " and ä¾åºåååç¶æ like '%" + HXTStatus + "%'"; } if (HXTFKStatus) { sWhere += " and åé¦ç¶æ like '%" + HXTFKStatus + "%'"; } var index = layer.load(0); get_Display(sWhere); @@ -949,8 +1005,9 @@ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd")); $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); $("#HBillNo").val(""); $("#HSupName").val(""); $("#HSupID").val(""); $("#HEmpID").val(""); $("#HMaterNumber").val(""); $("#HMaterName").val(""); sWhere = ""; get_Display(sWhere); } WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillList.html
@@ -59,24 +59,43 @@ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button> <div class="layui-colla-content"> <div class="layui-inline"> <div class="layui-inline"> <span>å ¶ä»æ¡ä»¶></span> </div> </div> <div class="layui-inline"> <label class="layui-form-label">åæ®å·</label> <div class="layui-input-block"> <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;"> <input type="text" class="layui-input" name="HBillno" id="HBillno" style="width:190px;"> </div> </div> <div class="layui-inline"> <label class="layui-form-label">ä¾åºåä¿¡æ¯</label> <div class="layui-input-inline"> <input type="text" name="HSupName" id="HSupName" readonly class="layui-input" value="" style="float:left;width:150px;"> <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="" style="float:left;width:150px;"> <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> <label class="layui-form-label">ä¸å¡å</label> <div class="layui-input-block"> <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="width:190px;"> </div> </div> <div class="layui-inline"> <label class="layui-form-label">ååç¶æ</label> <div class="layui-input-block"> <select name="HXTStatus" lay-filter="HXTStatus" style="width:190px;"> <option value="" selected>å ¨é¨</option> <option value="æªç¡®è®¤">æªç¡®è®¤</option> <option value="已确认">已确认</option> </select> </div> </div> <div class="layui-inline"> <label class="layui-form-label">åé¦ç¶æ</label> <div class="layui-input-block"> <input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;"> </div> </div> <div class="layui-inline"> <label class="layui-form-label">ç©æä»£ç </label> <div class="layui-input-block"> <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width:190px;"> </div> </div> <div class="layui-inline"> <label class="layui-form-label">ç©æåç§°</label> <div class="layui-input-block"> <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="width:190px;"> </div> </div> </div> @@ -324,13 +343,16 @@ //å è½½ç½æ ¼ function get_Display(sWhere) { var wait = layer.load();//é®ç½© var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ var HEndDate = $("#HEndDate").val();//ç»ææ¥æ if (HBeginDate) { sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HBeginDate + "'"; } if (HEndDate) { sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HEndDate + "'"; if (sWhere == "") { var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ var HEndDate = $("#HEndDate").val();//ç»ææ¥æ if (HBeginDate) { sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HBeginDate + "'"; } if (HEndDate) { sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HEndDate + "'"; } sWhere += " and ä¸å¡ç¶æ = 'æªåé ' and ä¾åºåååç¶æ ='æªç¡®è®¤' "; } $.ajax({ url: GetWEBURL() + '/Cg_POOrderBill/list', @@ -917,7 +939,12 @@ var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ var HEndDate = $("#HEndDate").val();//ç»ææ¥æ var HBillNo = $("#HBillNo").val(); //åæ®å· var HSupID = $("#HSupID").val(); //ä¾åºåä¿¡æ¯ var HEmpID = $("#HEmpID").val(); var HMaterNumber = $("#HMaterNumber").val(); var HMaterName = $("#HMaterName").val(); var HXTStatus = $("select[name='HXTStatus']").val(); var HXTFKStatus = $("#HXTFKStatus").val(); if (HStatus) { switch (HStatus) { case '-1': //å ¨é¨ @@ -944,8 +971,22 @@ if (HBillNo) { sWhere += " and åæ®å· like '%" + HBillNo + "%'"; } if (HSupID) { sWhere += " and HSupID = '" + HSupID + "'"; if (HMaterNumber) { sWhere += " and ç©æä»£ç like '%" + HMaterNumber + "%'"; } if (HMaterName) { sWhere += " and ç©æåç§° like '%" + HMaterName + "%'"; } if (HEmpID) { sWhere += " and ä¸å¡å like '%" + HEmpID + "%'"; } if (HXTStatus) { sWhere += " and ä¾åºåååç¶æ like '%" + HXTStatus + "%'"; } if (HXTFKStatus) { sWhere += " and åé¦ç¶æ like '%" + HXTFKStatus + "%'"; } var index = layer.load(0); get_Display(sWhere); @@ -958,8 +999,9 @@ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd")); $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); $("#HBillNo").val(""); $("#HSupName").val(""); $("#HSupID").val(""); $("#HEmpID").val(""); $("#HMaterNumber").val(""); $("#HMaterName").val(""); sWhere = ""; get_Display(sWhere); }