From 6e54db0de1b41ca840e42e11b39a300dba7ceaba Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 17 十一月 2023 12:51:47 +0800
Subject: [PATCH] ../../销售管理/收款单/YS_ReceiveBill.html：增加 结算方式返回方法
---
WebTM/views/项目管理/工作任务/PM_WorkTaskReportBillList.html | 236 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 223 insertions(+), 13 deletions(-)
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskReportBillList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskReportBillList.html"
index 3d313ec..b4a7b1f 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskReportBillList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskReportBillList.html"
@@ -18,6 +18,8 @@
<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/soulTable.slim.js"></script>
+
</head>
<body>
@@ -40,6 +42,18 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">姹囨姤浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HReportEmp" id="HReportEmp">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鐘舵��</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillStatus" id="HBillStatus">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">缁勭粐</label>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
@@ -53,6 +67,18 @@
<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" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">椤圭洰鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProjectName" id="HProjectName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浠诲姟鎻忚堪</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HTaskNote" id="HTaskNote">
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
@@ -92,6 +118,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-BatchAudit"><i class="layui-icon layui-icon-radio"></i>鎵归噺瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-BatchDeAudit"><i class="layui-icon layui-icon-radio"></i>鎵归噺鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
@@ -107,12 +135,19 @@
</div>
</div>
</div>
+
+ <!--鎵归噺瀹℃牳/鍙嶅鏍歌繘搴︽潯-->
+ <div class="layui-progress layui-progress-big" lay-filter="BatchAuditProgress" id="BatchAuditProgress" style="width:20%;position:fixed;left:40%;top:55%;display:none;">
+ <div class="layui-progress-bar" style="width:200px;" lay-percent="0%"></div>
+ </div>
+
+
<script>
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
//#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -122,6 +157,8 @@
, element = layui.element
, laypage = layui.laypage
, laydate = layui.laydate
+ , soulTable = layui.soulTable
+
var option = [];
var sWhere = "";
var HModName = "PM_WorkTaskReportBillList";
@@ -165,6 +202,14 @@
//鍙嶅鏍告寜閽�
case 'btn-DeAudit':
set_CheckBill(2);
+ break;
+ //鎵归噺瀹℃牳鎸夐挳
+ case 'btn-BatchAudit':
+ set_BatchCheckBill(1);
+ break;
+ //鎵归噺鍙嶅鏍告寜閽�
+ case 'btn-BatchDeAudit':
+ set_BatchCheckBill(2);
break;
//鍏抽棴鎸夐挳 锛�1:鍏抽棴銆�2:鍙嶅叧闂級
case 'btn-Close':
@@ -241,9 +286,14 @@
function set_ClearBill() {
//鍒濆鍖栬〃鏍�
set_InitGrid();
- //鏌ヨ
- get_FastQuery(1);
+ //鍒濆鍖栫粍缁�
Organ();
+ //鏌ヨ
+ if (addSWhereByOpenType()) { //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
+ get_FastQuery(2);
+ } else {
+ get_FastQuery(1);
+ }
}
//#endregion
@@ -254,9 +304,13 @@
, toolbar: '#toolbarDemo'
, height: 'full-50'
, page: true
+ , totalRow: true
//, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 50000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
};
}
//#endregion
@@ -266,6 +320,7 @@
//鑾峰彇鐧诲綍椤电粍缁囧垪
$.ajax({
type: "get",
+ async: false,
url: GetWEBURL() + "/Web/GetOrganizations",
success: function (result) {
var Organization = "";
@@ -293,6 +348,7 @@
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
+ var totalArray = ["璇勪及宸ユ椂","鑷瘎宸ユ椂","鑰楃敤宸ユ椂"];
var data = [];
var col = [];
//缁欑┖鐨勬暟缁勮祴鍊�
@@ -306,7 +362,9 @@
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
- else {
+ else if ($.inArray(data[i].name, totalArray)>-1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ }else {
switch (data[i].Type) {
//int
case 'DateTime':
@@ -347,12 +405,25 @@
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
+ ////鑾峰彇鐧诲綍璐︽埛瀵瑰簲鑱屽憳鍚嶇О
+ var HUserName = getHEmpByHUserName();
+ if (HUserName != "" && HUserName != null) {
+ sWhere = " and 姹囨姤浜� = '" + HUserName + "' ";
+ }
+
var HOrgID = "";
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ var HReportEmp = $("#HReportEmp").val();//姹囨姤浜�
+ var HBillStatus = $("#HBillStatus").val();//鍗曟嵁鐘舵��
+ var HProjectName = $("#HProjectName").val();//椤圭洰鍚嶇О
+ var HTaskNote = $("#HTaskNote").val();//浠诲姟鎻忚堪
//浠绘剰瀛楁杩囨护
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
+
+
+
if (ColName != 0 && Comparator != 0) {
var com = "";
@@ -388,6 +459,19 @@
if (HOrgID) {
sWhere += " and HOrgID = '" + HOrgID + "'";
}
+ if (HBillStatus) {
+ sWhere += " and 鍗曟嵁鐘舵�� like '%" + HBillStatus + "%'";
+ }
+ if (HProjectName) {
+ sWhere += " and 椤圭洰鍚嶇О like '%" + HProjectName + "%'";
+ }
+ if (HTaskNote) {
+ sWhere += " and 浠诲姟鎻忚堪 like '%" + HTaskNote + "%'";
+ }
+ if (HReportEmp) {
+ sWhere += " and 姹囨姤浜� like '%" + HReportEmp + "%'";
+ }
+
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -396,6 +480,10 @@
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
$("#HBillNo").val("");
+ $("#HReportEmp").val("");
+ $("#HBillStatus").val("");
+ $("#HProjectName").val("");
+ $("#HTaskNote").val("");
$("#HOrgID").val(sessionStorage["OrganizationID"]);
$("#ColContent").val("");
$("#ColName").val("0");
@@ -417,9 +505,9 @@
, content: '../../椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskReportBill.html?OperationType=1&linterid=0&HSouceBillType='
,btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
- btn1: function (index, layero, that) {
+ end: function (index, layero, that) {
//鍒锋柊椤甸潰
- window.location.reload();
+ $("#btnSearch").trigger('click');
}
})
}
@@ -440,9 +528,9 @@
, content: '../../椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskReportBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
, btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
- btn1: function (index, layero, that) {
+ end: function (index, layero, that) {
//鍒锋柊椤甸潰
- window.location.reload();
+ $("#btnSearch").trigger('click');
}
})
} else {
@@ -466,9 +554,9 @@
, content: '../../椤圭洰绠＄悊/椤圭洰闃舵/Add_Edit_Gy_ProjectStage.html?OperationType=4&linterid=' + linterid + '&HSouceBillType='
, btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
- btn1: function (index, layero, that) {
+ end: function (index, layero, that) {
//鍒锋柊椤甸潰
- //window.location.reload();
+ $("#btnSearch").trigger('click');
}
})
} else {
@@ -499,7 +587,7 @@
//鍏抽棴褰撳墠frame
layer.close(wait);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
layer.alert(result.code + result.Message, { icon: 5 });
@@ -521,8 +609,7 @@
//#region 鍒锋柊
function get_Refresh() {
- set_ClearQuery();
- get_FastQuery(1);
+ $("#btnSearch").trigger('click');
}
//#endregion
@@ -558,6 +645,74 @@
}
else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 鎵归噺鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_BatchCheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (checkStatus.data.length != 0) {
+ var errMsg = ""; //璁板綍瀹℃牳澶辫触淇℃伅
+ var successMsg = ""; //璁板綍瀹℃牳鎴愬姛淇℃伅
+ var div = document.getElementById("BatchAuditProgress"); //鑾峰彇杩涘害鏉�
+ var progressPercent = 0;
+ //鑾峰彇闇�瑕佸鏍哥殑鍗曟嵁闆嗗悎瀵瑰簲鐨勫崟鎹唴鐮侀泦鍚�
+ var HInterIDArray = [];
+ var HBillNoArray = [];
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i]["HInterID"], HInterIDArray) == -1) {
+ HInterIDArray.push(data[i]["HInterID"]);
+ HBillNoArray.push(data[i]["鍗曟嵁鍙�"]);
+ }
+ }
+ //璁剧疆鍔犺浇鍥炬爣
+ var ajaxLoad = layer.load();
+ //杩涘害鏉℃樉绀哄苟杩涘害褰�0
+ element.progress('BatchAuditProgress', '0%');
+ div.style.display = "block";
+ //閬嶅巻闇�瑕佸鏍哥殑鍗曟嵁鍐呯爜闆嗗悎锛屽苟瀹℃牳瀵瑰簲鍗曟嵁鍐呯爜鐨勫崟鎹�
+ for (var i = 0; i < HInterIDArray.length; i++) {
+ var HInterID = HInterIDArray[i];
+ var HBillNo = HBillNoArray[i];
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ async: false,
+ url: GetWEBURL() + "/PM_WorkTaskBill/AuditPM_WorkTaskBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ successMsg += "[" + HInterID + "],[" + HBillNo + "]锛氭搷浣滄墽琛屾垚鍔熴�俓n";
+ } else {
+ errMsg += "[" + HInterID + "],[" + HBillNo + "]锛氭搷浣滄墽琛屽け璐ャ�傚け璐ュ師鍥狅細" + result.Message + "\n";
+ }
+ }, error: function () {
+ errMsg += "[" + HInterID + "],[" + HBillNo + "]锛氭搷浣滄墽琛屽け璐ャ�傚け璐ュ師鍥狅細鎺ュ彛璇锋眰澶辫触锛乗n";
+ }
+ });
+ //澧炲姞杩涘害鏉¤繘搴�
+ progressPercent = (i + 1) / HInterIDArray.length * 100;
+ element.progress('BatchAuditProgress', progressPercent + "%");
+ }
+
+ //闅愯棌杩涘害鏉�
+ div.style.display = "none";
+
+ //鎷兼帴瀹℃牳鎴愬姛淇℃伅涓庡鏍稿け璐ヤ俊鎭�
+ var resultMessage = successMsg + errMsg;
+ //瀹℃牳缁撴灉鎻愮ず寮圭獥
+ layer.alert(resultMessage, { icon: 5 });
+
+ //鍏抽棴鍔犺浇鍥炬爣
+ layer.close(ajaxLoad);
+ //鍒锋柊鐣岄潰
+ $("#btnSearch").trigger('click');
+ }
+ else {
+ layer.msg('璇烽�夋嫨鏁版嵁瀹℃牳锛�');
}
}
//#endregion
@@ -802,6 +957,61 @@
}
//#endregion
+ //#region 鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HOrgID = params[params[1]];
+ if (openType == 2) {
+ sWhere += " and ISNULL(鍏抽棴浜�,'') = '' and ISNULL(浣滃簾浜�,'') = '' ";
+ $("#HOrgID").val(HOrgID);
+ form.render("select");
+ return true;
+ }
+ return false;
+ }
+ //#endregion
+
+ //#region 鏍规嵁鐧诲綍璐︽埛鑾峰彇鐩稿簲鑱屽憳
+ function getHEmpByHUserName() {
+ var Czybm = sessionStorage["Czybm"];
+ var HUserName = "";
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/PM_WorkTaskReportBill/getHEmpByHUserName',
+ type: "GET",
+ async: false,
+ data: { "Czybm": Czybm, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ HUserName = result.data[0]["HEmpName"];
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ return HUserName;
+ }
+ //#endregion
+
});
//#endregion
--
Gitblit v1.9.1