From 3dfe7dfe993869c8a44e9ccf177849abe98ca8d0 Mon Sep 17 00:00:00 2001
From: wangbin <lan@DESKTOP-MG88OFJ>
Date: 星期一, 08 七月 2024 10:12:25 +0800
Subject: [PATCH] 1
---
WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html | 266 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 241 insertions(+), 25 deletions(-)
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
index 9bd9e23..57f38b1 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
@@ -159,7 +159,7 @@
</div>
</div>
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;display:none;">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
@@ -186,6 +186,16 @@
<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
</div>
</div>
+
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">瀹℃壒娴�</label>
+ <div class="layui-input-block">
+ <select name="HCheckFlowList" id="HCheckFlowList" class="ForFilteringSchemes" lay-filter="HCheckFlowList" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -206,6 +216,10 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_LookDown" id="get_LookDown"><i class="layui-icon layui-icon-refresh-3"></i>涓嬫煡</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_needClose" id="get_needClose"><i class="layui-icon layui-icon-refresh-3"></i>寰呭叧闂」</button>
<!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-print" id="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_startCheckBill" id="set_startCheckBill"><i class="layui-icon layui-icon-form"></i>鍙戣捣瀹℃壒</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_CheckFlowInfo" id="get_CheckFlowInfo"><i class="layui-icon layui-icon-form"></i>鏌ョ湅瀹℃壒杩涘害</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill_Flow" id="CheckBill_Flow"><i class="layui-icon layui-icon-form"></i>澶氱骇瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck_Flow" id="AbandonCheck_Flow"><i class="layui-icon layui-icon-form"></i>澶氱骇鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
@@ -215,6 +229,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Drop" id="set_Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeDrop" id="set_DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-form"></i>鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print_StockIn" lay-event="btn-print_StockIn"><i class="layui-icon layui-icon-form"></i>鎵撳嵃(鍏ュ簱鐮佸崟)</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="HideColumn" id="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>
@@ -271,7 +286,7 @@
var titleData = ["hmainid", "HBillType", "HCusID", "HSSID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID", "HUnitID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
//#region 銆愯繃婊ゆ柟妗堛��
- //杩囨护鏉′欢鐨刢lass绫�
+ //杩囨护鏉′欢鐨刢lass绫�
var HClassTag = "ForFilteringSchemes";
//妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
window.HModuleName = "閿�鍞鍗曠淮鎶�";
@@ -284,6 +299,10 @@
//#endregion
//#region 鍔犺浇椤甸潰
+ //#region 鍔犺浇瀹℃壒娴�
+ HCheckFlowList_Filter();
+ //#endregion
+
//#region 鍒濆鍖栫晫闈�
set_ClearBill();
//#endregion
@@ -366,6 +385,18 @@
//鍒锋柊
case 'get_Refresh': get_Refresh();
break;
+ //鍙戣捣瀹℃壒
+ case 'set_startCheckBill': set_startCheckBill();
+ break;
+ //鏌ョ湅瀹℃壒杩涘害
+ case 'get_CheckFlowInfo': get_CheckFlowInfo();
+ break;
+ //澶氱骇瀹℃牳
+ case 'set_CheckBill_Flow': set_CheckBill_Flow(0);
+ break;
+ //澶氱骇鍙嶅鏍�
+ case 'set_AbandonCheck_Flow': set_CheckBill_Flow(1);
+ break;
//瀹℃牳
case 'set_CheckBill': set_CheckBill(0);
break;
@@ -384,7 +415,7 @@
//琛屽弽鍏抽棴
case 'set_CancelCloseRow': set_CloseRow(1);
break;
- //浣滃簾鎸夐挳
+ //浣滃簾鎸夐挳
case 'set_Drop': set_DropBill(0);
break;
//鍙嶄綔搴熸寜閽�
@@ -395,6 +426,9 @@
break;
//鎵撳嵃
case 'btn-print': get_PrintReport();
+ break;
+ //鎵撳嵃锛堝叆搴撶爜鍗曪級
+ case 'btn-print_StockIn': btn_print_StockIn();
break;
//瀵煎嚭excel
case 'get_export':
@@ -448,7 +482,7 @@
table.render(option);
layer.close(ajaxLoad);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
ColFilter();
}
} else {
@@ -526,8 +560,8 @@
var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
//鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
if (HInitTimeCycle != -1) {
- $('#HBeginDate').prop('disabled', true);
- $('#HEndDate').prop('disabled', true);
+ //$('#HBeginDate').prop('disabled', true);
+ //$('#HEndDate').prop('disabled', true);
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
@@ -539,8 +573,8 @@
//鎵ц鏌ヨ鏂规硶
get_FastQuery();
} else {
- $('#HBeginDate').prop('disabled', false);
- $('#HEndDate').prop('disabled', false);
+ //$('#HBeginDate').prop('disabled', false);
+ //$('#HEndDate').prop('disabled', false);
}
});
//#endregion
@@ -548,7 +582,7 @@
//#region 椤甸潰鍏跺畠鏂规硶
-
+
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
//鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
@@ -556,11 +590,11 @@
//鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
if (HInitTimeCycle != -1) {
- $('#HBeginDate').prop('disabled', true);
- $('#HEndDate').prop('disabled', true);
+ //$('#HBeginDate').prop('disabled', true);
+ //$('#HEndDate').prop('disabled', true);
} else {
- $('#HBeginDate').prop('disabled', false);
- $('#HEndDate').prop('disabled', false);
+ //$('#HBeginDate').prop('disabled', false);
+ //$('#HEndDate').prop('disabled', false);
}
//鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
@@ -569,12 +603,12 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_FastQuery();
+ //get_FastQuery();
//get_Display(sWhere);
- DisPlay_HideColumn();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
+ DisPlay_HideColumn();
}
//#endregion
@@ -598,6 +632,7 @@
, { field: '鐘舵��', title: '鐘舵��', width: 125, sort: true }
, { field: '琛岀姸鎬�', title: '琛岀姸鎬�', width: 125, sort: true }
, { field: '鏄惁涓嬫帹鐢熶骇璁㈠崟', title: '鏄惁涓嬫帹鐢熶骇璁㈠崟', width: 125, sort: true }
+ , { field: '瀹氶噾姣斾緥', title: '瀹氶噾姣斾緥%', sort: true }
, { field: '鏄惁鍙栧簱瀛�', title: '鏄惁鍙栧簱瀛�', width: 125, sort: true }
, { field: 'HMaterID', title: 'HMaterID', hide: true, sort: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', sort: true }
@@ -622,6 +657,7 @@
, { field: '鍚◣鍗曚环', title: '鍚◣鍗曚环', sort: true }
, { field: '閲戦', title: '閲戦', sort: true, totalRow: true }
, { field: '浠风◣鍚堣', title: '浠风◣鍚堣', sort: true, totalRow: true }
+ , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', sort: true }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', sort: true }
, { field: '鎶曟枡', title: '鎶曟枡', sort: true }
, { field: '娣卞姞宸�', title: '娣卞姞宸�', sort: true }
@@ -642,6 +678,7 @@
, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
, { field: 'HWhID', title: 'HWhID', hide: true, sort: true }
, { field: '瀛愪粨搴�', title: '瀛愪粨搴�', hide: true, sort: true }
+ , { field: '鐗╂枡鍒嗙被', title: '鐗╂枡鍒嗙被', sort: true }
//, { field: 'HBillType', title: 'HBillType', hide: true, sort: true }
//, { field: '浜よ揣鍦板潃', title: '浜よ揣鍦板潃', width: 125, sort: true }
@@ -667,7 +704,7 @@
//, { field: '绋庨', title: '绋庨', sort: true }
//, { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', sort: true }
//, { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', sort: true }
- //, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', sort: true }
+
]]
, done: function (res, curr, count) {
soulTable.render(this);
@@ -808,7 +845,7 @@
Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
ColFilter();
}
} else {
@@ -1087,7 +1124,7 @@
}
}
, cancel: function () {
-
+
}
})
@@ -1506,7 +1543,7 @@
get_needClose_Bar = 1;
//涓鸿繃婊ゆ潯浠跺鍔犳帓搴�
- sWhere_Bak += " and 鍓╀綑璁㈤噾>0 and 鍓╀綑璁㈤噾<=1000 and 鍏抽棴浜�='' and 琛屽叧闂汉='' and 鐘舵�� = '宸插鏍�' order by 鍗曟嵁鍙� desc";
+ sWhere_Bak += " and 鍓╀綑璁㈤噾>0 and 鍓╀綑璁㈤噾<=1000 and 鍏抽棴浜�='' and 琛屽叧闂汉='' and 鐘舵�� = '宸插鏍�' and HCusID <> 166351 order by 鍗曟嵁鍙� desc";
//鑾峰彇鎺掑簭鍚庣殑鏁版嵁骞堕噸鏂版覆鏌�
var ajaxLoad = layer.load();
@@ -1545,7 +1582,7 @@
table.render(option);
layer.close(ajaxLoad);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
ColFilter();
}
} else {
@@ -1565,6 +1602,125 @@
//#region 鍒锋柊
function get_Refresh() {
$("#btnSearch").trigger('click');
+ }
+ //#endregion
+
+ //#region 鍙戣捣瀹℃壒
+ function set_startCheckBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ var HCheckFlowID = $("#HCheckFlowList").val();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Xs_SeOrderBill/StartCheckFlow_SeOrderBIll", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "HCheckFlowID_select": HCheckFlowID, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+
+
+
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ if (get_needClose_Bar == 0) {
+ $("#btnSearch").trigger('click');
+ } else if (get_needClose_Bar == 1) {
+ $("#get_needClose").trigger('click');
+ }
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 鏌ョ湅瀹℃壒杩涘害
+ function get_CheckFlowInfo() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].hmainid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鍗曟嵁瀹℃壒杩涘害'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../绯荤粺绠＄悊/澶氱骇瀹℃壒/瀹℃壒杩涘害/Xt_CheckFlowProgressList.html?linterid=' + hID + '&HSouceBillType=' + HBillType
+ , resize: false,
+ end: function () {
+ ////淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ //if (get_needClose_Bar == 0) {
+ // $("#btnSearch").trigger('click');
+ //} else if (get_needClose_Bar == 1) {
+ // $("#get_needClose").trigger('click');
+ //}
+ }
+ , cancel: function () {
+
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡鐪嬶紒');
+ }
+ }
+ //#endregion
+
+ //#region 澶氱骇 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill_Flow(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Xs_SeOrderBill/AuditXs_SeOrderBill_Flow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ if (get_needClose_Bar == 0) {
+ $("#btnSearch").trigger('click');
+ } else if (get_needClose_Bar == 1) {
+ $("#get_needClose").trigger('click');
+ }
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
}
//#endregion
@@ -1757,6 +1913,34 @@
}
//#endregion
+ //#region 鎵撳嵃锛堝叆搴撶爜鍗曪級
+ function btn_print_StockIn() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+
+ if (data[0].鐘舵�� != "宸插鏍�") {
+ layer.alert("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!", { icon: 5 });
+ return;
+ }
+
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Xs_SeOrderBill_StockInCodeNote', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
+ //#endregion
+
//#region 瀵煎嚭Execel
function get_Export() {
var ModRightNameCheck = "Xs_SeOrderBillList_ExportExcel";
@@ -1919,6 +2103,11 @@
data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
success: function (data1) {
if (data1.count == 1) {
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
+ ColFilter();
+ }
+
+
//褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规
var data = data1.data;
//褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗�
@@ -1944,8 +2133,8 @@
var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
//鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
if (HInitTimeCycle != -1) {
- $('#HBeginDate').prop('disabled', true);
- $('#HEndDate').prop('disabled', true);
+ //$('#HBeginDate').prop('disabled', true);
+ //$('#HEndDate').prop('disabled', true);
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
@@ -1957,8 +2146,8 @@
//鎵ц鏌ヨ鏂规硶
get_FastQuery();
} else {
- $('#HBeginDate').prop('disabled', false);
- $('#HEndDate').prop('disabled', false);
+ //$('#HBeginDate').prop('disabled', false);
+ //$('#HEndDate').prop('disabled', false);
}
//鎵ц鏌ヨ鏂规硶
@@ -1994,7 +2183,7 @@
for (var i = 0; i < Filter.length; i++) {
HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
- HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
}
@@ -2195,6 +2384,33 @@
})
}
+ //#region 瀹℃壒娴佹樉绀轰笅鎷夋
+ function HCheckFlowList_Filter() {
+ sWhere_CheckFlowList = " and a.HBillTypeID='" + HBillType + "' and c.HUserID = '" + sessionStorage["Czybm"] + "' ";
+ $.ajax({
+ url: GetWEBURL() + '/Xt_CheckFlowProgressBill/getList_CheckFlowList',
+ async: false,
+ type: "GET",
+ data: { "sWhere": sWhere_CheckFlowList, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ var data = data1.data;
+ if (data1.count == 1) {
+ var Organization = '<option value="' + data[0]["HInterID"] + '" selected="selected" >' + data[0]["瀹℃壒娴�"] + '</option>';
+ for (var i = 1; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i]["HInterID"] + '">' + data[i]["瀹℃壒娴�"] + '</option>';
+ }
+ $("#HCheckFlowList").empty();
+ $("#HCheckFlowList").append(Organization);
+ form.render('select');
+ } else {
+
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
//#region 鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
--
Gitblit v1.9.1