From 157293d1295f286231dc8e1f26d2b77bd98500be Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 13 四月 2022 15:16:48 +0800
Subject: [PATCH] 采购委外 状态查询
---
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 64 +++++++++++----------
WebTM/views/采购管理/委外订单/WW_EntrustOrderBillList.html | 64 ++++++++++----------
2 files changed, 65 insertions(+), 63 deletions(-)
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
index 9f5df41..d1082e0 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
@@ -31,13 +31,22 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">涓氬姟鐘舵��</label>
+ <label class="layui-form-label">鍒嗛厤鐘舵��</label>
<div class="layui-input-block">
<select name="HStatus" lay-filter="HStatus" style="width:190px;">
- <option value="-1" selected>鍏ㄩ儴</option>
- <option value="1">鏈垎閰�</option>
- <option value="2">宸插垎閰�</option>
- <option value="3">宸插彂甯�</option>
+ <option value="" selected="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">
+ <select name="HStatus2" lay-filter="HStatus2" style="width:190px;">
+ <option value="" selected="selected">鍏ㄩ儴</option>
+ <option value="鏈彂甯�">鏈彂甯�</option>
+ <option value="宸插彂甯�">宸插彂甯�</option>
</select>
</div>
</div>
@@ -59,10 +68,10 @@
<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">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
@@ -87,11 +96,11 @@
</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>-->
+ <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">
@@ -291,7 +300,9 @@
, { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 100 }
, { field: 'HBillType', title: 'HBillType', hide: true }
, { field: 'HSupID', title: 'HSupID', hide: true }
- , { field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', width: 100 }
+ , { field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', width: 100 , hide: true }
+ , { field: '鍒嗛厤鐘舵��', title: '鍒嗛厤鐘舵��', width: 100 }
+ , { field: '鍙戝竷鐘舵��', title: '鍙戝竷鐘舵��', width: 100 }
, { field: '渚涘簲鍟嗗崗鍚岀姸鎬�', title: '渚涘簲鍟嗗崗鍚岀姸鎬�', width: 135 }/*鐗╂枡浠ｇ爜锛岀墿鏂欏悕绉帮紝瑙勬牸鍨嬪彿锛屾壒鍙凤紝鏁伴噺锛屽崟浣嶏紝婧愬崟鍗曞彿*/
, { field: '鍙嶉鐘舵��', title: '渚涘簲鍟嗗弽棣堢姸鎬�', width: 135 }
, { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 130 }
@@ -973,7 +984,8 @@
//蹇�熻繃婊�
function get_FastQuery(table, option) {
- var HStatus = $("select[name='HStatus']").val();//鐘舵��
+ var HStatus = $("select[name='HStatus']").val();//
+ var HStatus2 = $("select[name='HStatus2']").val();//
var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
@@ -985,23 +997,11 @@
var HMaterShortNumber = $("#HMaterShortNumber").val();
var HSupName = $("#HSupName").val();//渚涘簲鍟�
var HFeedback = $("select[name='HFeedback']").val(); //渚涘簲鍟嗗弽棣堢姸鎬�
-
if (HStatus) {
- switch (HStatus) {
- case '-1': //鍏ㄩ儴
- sWhere += "";
- break;
- case '1': //鏈垎閰�
- sWhere += " and 涓氬姟鐘舵��='鏈垎閰�'";
- break;
- case '2': //宸插鏍�
- sWhere += " and 涓氬姟鐘舵��='宸插垎閰�'";
- break;
- case '3': //宸插叧闂�
- sWhere += " and 涓氬姟鐘舵��='宸插彂甯�'";
- default:
-
- }
+ sWhere += " and 鍒嗛厤鐘舵�� like '%" + HStatus + "%'";
+ }
+ if (HStatus2) {
+ sWhere += " and 鍙戝竷鐘舵�� like '%" + HStatus2 + "%'";
}
if (HBeginDate) {
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index b10827c..da4e123 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -30,13 +30,22 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">涓氬姟鐘舵��</label>
+ <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">鏈垎閰�</option>
- <option value="2">宸插垎閰�</option>
- <option value="3">宸插彂甯�</option>
+ <option value="" selected="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">
+ <select name="HStatus2" lay-filter="HStatus2" style="width:190px;">
+ <option value="" selected="selected">鍏ㄩ儴</option>
+ <option value="鏈彂甯�">鏈彂甯�</option>
+ <option value="宸插彂甯�">宸插彂甯�</option>
</select>
</div>
</div>
@@ -58,13 +67,15 @@
</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-inline">
+
+
+ <!--<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HBillno2" id="HBillno2" style="width:190px;">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>-->
<div class="layui-colla-content">
@@ -78,7 +89,6 @@
<label class="layui-form-label">涓氬姟鍛�</label>
<div class="layui-input-block" style="width:190px;">
<select name="HEmpName" lay-filter="HEmpName" id="HEmpName">
-
</select>
</div>
</div>
@@ -93,11 +103,11 @@
</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>-->
+ <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">
@@ -301,7 +311,9 @@
, { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 100 }
, { field: 'HBillType', title: 'HBillType', hide: true }
, { field: 'HSupID', title: 'HSupID', hide: true }
- , { field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', width: 100 }
+ , { field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', width: 100, hide: true }
+ , { field: '鍒嗛厤鐘舵��', title: '鍒嗛厤鐘舵��', width: 100 }
+ , { field: '鍙戝竷鐘舵��', title: '鍙戝竷鐘舵��', width: 100 }
, { field: '渚涘簲鍟嗗崗鍚岀姸鎬�', title: '渚涘簲鍟嗗崗鍚岀姸鎬�', width: 135 }/*鐗╂枡浠ｇ爜锛岀墿鏂欏悕绉帮紝瑙勬牸鍨嬪彿锛屾壒鍙凤紝鏁伴噺锛屽崟浣嶏紝婧愬崟鍗曞彿*/
, { field: '鍙嶉鐘舵��', title: '渚涘簲鍟嗗弽棣堢姸鎬�', width: 135 }
, { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 120 }
@@ -982,7 +994,8 @@
//蹇�熻繃婊�
function get_FastQuery(table, option) {
- var HStatus = $("select[name='HStatus']").val();//鐘舵��
+ var HStatus = $("select[name='HStatus']").val();//
+ var HStatus2 = $("select[name='HStatus2']").val();//
var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
@@ -994,23 +1007,12 @@
//var HXTFKStatus = $("#HXTFKStatus").val();
var HSupName = $("#HSupName").val();//渚涘簲鍟�
var HFeedback = $("select[name='HFeedback']").val(); //渚涘簲鍟嗗弽棣堢姸鎬�
-
- if (HStatus) {
- switch (HStatus) {
- case '-1': //鍏ㄩ儴
- sWhere += "";
- break;
- case '1': //鏈垎閰�
- sWhere += " and 涓氬姟鐘舵��='鏈垎閰�'";
- break;
- case '2': //宸插鏍�
- sWhere += " and 涓氬姟鐘舵��='宸插垎閰�'";
- break;
- case '3': //宸插叧闂�
- sWhere += " and 涓氬姟鐘舵��='宸插彂甯�'";
- default:
- }
+ if (HStatus) {
+ sWhere += " and 鍒嗛厤鐘舵�� like '%" + HStatus + "%'";
+ }
+ if (HStatus2) {
+ sWhere += " and 鍙戝竷鐘舵�� like '%" + HStatus2 + "%'";
}
if (HBeginDate) {
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
--
Gitblit v1.9.1