From ad60402abad86aa75b19bda1b261cd4239b02567 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 27 四月 2022 09:32:57 +0800
Subject: [PATCH] 完成状态
---
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 33 ++++++++++++----
WebTM/views/采购管理/委外订单/WW_EntrustOrderBillList.html | 56 ++++++++++++++++++---------
2 files changed, 61 insertions(+), 28 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 d1082e0..bb6ea99 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"
@@ -68,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">
@@ -96,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">
@@ -126,7 +126,7 @@
</div>
</div>
<div class="layui-inline" style="margin-left:30px">
- <label class="layui-form-label">渚涘簲鍟嗗弽棣堢姸鎬�</label>
+ <label class="layui-form-label">鍙嶉鐘舵��</label>
<div class="layui-input-block" style="width:190px;">
<select name="HFeedback" lay-filter="HFeedback">
<option value="" selected>鍏ㄩ儴</option>
@@ -137,7 +137,15 @@
</select>
</div>
</div>
-
+ <div class="layui-inline" style="margin-left:30px">
+ <label class="layui-form-label">瀹屾垚鐘舵��</label>
+ <div class="layui-input-block" style="width:190px;">
+ <select name="HFinishStatus" lay-filter="HFinishStatus">
+ <option value="鏈畬鎴�" selected>鏈畬鎴�</option>
+ <option value="瀹屾垚">瀹屾垚</option>
+ </select>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -187,12 +195,8 @@
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
- //鍒濆鍖栬〃鏍�
- set_InitGrid();
- //鍔犺浇鏁版嵁鍒扮綉鏍�
- get_Display(sWhere);
- //鍔犺浇涓氬姟鍛�
- get_HEmpName();
+ set_ClearBill();
+
//#endregion
//#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
@@ -285,11 +289,18 @@
});
//#endregion
-
//#region 姝ら〉闈㈡墍鏈夋柟娉�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery(table, option)
+ //鍔犺浇涓氬姟鍛�
+ get_HEmpName();
+ }
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HBeginDate").val("2022-03-14");
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
var columns = [
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
@@ -312,6 +323,7 @@
, { field: '鎵撳嵃鏉＄爜鏁伴噺', title: '鎵撳嵃鏉＄爜鏁伴噺', width: 120}
, { field: '鍏宠仈鏁伴噺', title: '宸插彂璐ф暟閲�', width: 120 }
, { field: '鏈叧鑱旀暟閲�', title: '鏈凡鍙戣揣鏁伴噺', width: 120 }
+ , { field: '瀹屾垚鐘舵��', title: '瀹屾垚鐘舵��', width: 100 }
, { field: 'HUnitID', title: 'HUnitID', hide: true }
, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 120 }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100 }
@@ -997,6 +1009,8 @@
var HMaterShortNumber = $("#HMaterShortNumber").val();
var HSupName = $("#HSupName").val();//渚涘簲鍟�
var HFeedback = $("select[name='HFeedback']").val(); //渚涘簲鍟嗗弽棣堢姸鎬�
+ var HFinishStatus = $("select[name='HFinishStatus']").val(); //瀹屾垚鐘舵��
+
if (HStatus) {
sWhere += " and 鍒嗛厤鐘舵�� like '%" + HStatus + "%'";
}
@@ -1040,6 +1054,10 @@
sWhere += " and 鍙嶉鐘舵�� like '%" + HFeedback + "%'";
}
+ if (HFinishStatus) {
+ sWhere += " and 瀹屾垚鐘舵�� like '%" + HFinishStatus + "%'";
+
+ }
var index = layer.load(0);
get_Display(sWhere);
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
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 c710f58..6125f3e 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"
@@ -103,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">
@@ -133,7 +133,7 @@
</div>
</div>
<div class="layui-inline" style="margin-left:30px">
- <label class="layui-form-label">渚涘簲鍟嗗弽棣堢姸鎬�</label>
+ <label class="layui-form-label">鍙嶉鐘舵��</label>
<div class="layui-input-block" style="width:190px;">
<select name="HFeedback" lay-filter="HFeedback">
<option value="" selected>鍏ㄩ儴</option>
@@ -141,6 +141,15 @@
<option value="澶囨枡">澶囨枡</option>
<option value="鐢熶骇">鐢熶骇</option>
<option value="鍙戣揣">鍙戣揣</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline" style="margin-left:30px">
+ <label class="layui-form-label">瀹屾垚鐘舵��</label>
+ <div class="layui-input-block" style="width:190px;">
+ <select name="HFinishStatus" lay-filter="HFinishStatus">
+ <option value="鏈畬鎴�" selected>鏈畬鎴�</option>
+ <option value="瀹屾垚">瀹屾垚</option>
</select>
</div>
</div>
@@ -293,14 +302,14 @@
function set_ClearBill() {
//鍒濆鍖栬〃鏍�
set_InitGrid();
- //鍔犺浇鏁版嵁鍒扮綉鏍�
- get_Display(sWhere);
+ //鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery(table, option)
//鍔犺浇涓氬姟鍛�
get_HEmpName();
}
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HBeginDate").val("2022-03-14");
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
var columns = [
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
@@ -323,6 +332,7 @@
, { field: '鎵撳嵃鏉＄爜鏁伴噺', title: '鎵撳嵃鏉＄爜鏁伴噺', width: 120 }
, { field: '鍏宠仈鏁伴噺', title: '宸插彂璐ф暟閲�', width: 120 }
, { field: '鏈叧鑱旀暟閲�', title: '鏈凡鍙戣揣鏁伴噺', width: 120 }
+ , { field: '瀹屾垚鐘舵��', title: '瀹屾垚鐘舵��', width: 100 }
, { field: 'HUnitID', title: 'HUnitID', hide: true }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
, { field: 'HUnitID', title: 'HUnitID', hide: true }
@@ -1007,6 +1017,7 @@
//var HXTFKStatus = $("#HXTFKStatus").val();
var HSupName = $("#HSupName").val();//渚涘簲鍟�
var HFeedback = $("select[name='HFeedback']").val(); //渚涘簲鍟嗗弽棣堢姸鎬�
+ var HFinishStatus = $("select[name='HFinishStatus']").val(); //瀹屾垚鐘舵��
if (HStatus) {
sWhere += " and 鍒嗛厤鐘舵�� like '%" + HStatus + "%'";
@@ -1051,6 +1062,10 @@
sWhere += " and 鍙嶉鐘舵�� like '%" + HFeedback + "%'";
}
+ if (HFinishStatus) {
+ sWhere += " and 瀹屾垚鐘舵�� like '%" + HFinishStatus + "%'";
+
+ }
var index = layer.load(0);
get_Display(sWhere);
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
--
Gitblit v1.9.1