From 64599c608096d2ae36886c2d49cb1d31a0fdc536 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 06 十一月 2024 18:34:39 +0800
Subject: [PATCH] 工资结算单批量审核新版
---
WebTM/WebTM.csproj.user | 2
WebTM/views/工资管理/工资结算单(集体)/Pay_GroupBalBillList.html | 73 ++++++++++++-----
WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBillList.html | 111 +++++++++++++++++++++------
WebTM/views/工资管理/工资结算单(个人)/Pay_BatchCheck.html | 3
WebTM/layuiadmin/Scripts/webConfig.js | 2
5 files changed, 140 insertions(+), 51 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index f96700a..1daf955 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -4,7 +4,7 @@
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 680af9f..cafdaee 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -8,7 +8,7 @@
/*var WEBURL = "http://localhost:8082/API/";*/ //鏉滆春鏈湴閰嶇疆
/*var WEBURL = "http://localhost/API/";*/ //娼樻禉娓告湰鍦伴厤缃�
var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- /* var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�*/
+ var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
/*var WEBURL = "http://localhost:8082/LuBaoAPI/"; */ //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_BatchCheck.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_BatchCheck.html"
index d38c644..042388e 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_BatchCheck.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_BatchCheck.html"
@@ -23,6 +23,9 @@
input.layui-input.layui-unselect {
padding-right: 0;
}
+ .layui-form-select dl {
+ max-height: 200px; /* 杩欓噷鏍规嵁瀹為檯鎯呭喌璁剧疆鐩稿簲鐨勪笅鎷夊脊鍑洪�夐」妗嗙殑鏈�澶ч珮搴� */
+ }
</style>
</head>
<body>
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
index 8e26282..f4e7308 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
@@ -749,43 +749,100 @@
}
//#endregion
+ ////#region 鎵归噺瀹℃牳锛坣um=1锛�/鍙嶅鏍革紙num=2锛�
+ //function set_CheckBillAll(num) {
+ // var checkStatus = table.checkStatus('mainTable')
+ // , data = checkStatus.data;
+ // if (checkStatus.data.length != 0) {
+ // var uniqueIds = [...new Set(data.map(obj => obj.hmainid))];//灏嗗璞℃暟缁刬d鎻愬彇鍘婚噸
+ // var queryString =uniqueIds.join(",");//灏唅ds鍙樻垚鏁扮粍
+ // $.ajax({
+ // type: "GET",
+ // url: GetWEBURL() + "/Pay_SingleBalBillController/CheckAll",
+ // async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ // data: { "ids": queryString, "Type": num, "HMaker": HMaker },
+ // 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);
+ // //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ // $("#btnSearch").trigger('click');
+ // });
+ // } else {
+ // layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // }
+ // }, error: function () {
+ // layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // }
+ // });
+ // }
+ // else {
+ // layer.msg('璇烽�夋嫨鏁版嵁瀹℃牳锛�');
+
+ // }
+ //}
+ ////#endregion
+
//#region 鎵归噺瀹℃牳锛坣um=1锛�/鍙嶅鏍革紙num=2锛�
function set_CheckBillAll(num) {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length != 0) {
- var uniqueIds = [...new Set(data.map(obj => obj.hmainid))];//灏嗗璞℃暟缁刬d鎻愬彇鍘婚噸
- var queryString =uniqueIds.join(",");//灏唅ds鍙樻垚鏁扮粍
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Pay_SingleBalBillController/CheckAll",
- async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "ids": queryString, "Type": num, "HMaker": HMaker },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
+ layer.open({
+ type: 2
+ , area: ['70%', '45%']
+ , title: '鍗曟嵁鎵归噺瀹℃牳鏉′欢'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../宸ヨ祫绠＄悊/宸ヨ祫缁撶畻鍗�(涓汉)/Pay_BatchCheck.html'
+ , resize: false
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ var body = layer.getChildFrame('body', index);
+ var HYear = $(body).find("#HYear").val();
+ var HPeriod = $(body).find("#HPeriod").val();
+ var HGroupID = $(body).find("#HGroupID").val();
+ var sWhere = "" + HYear + "," + HPeriod + "," + HGroupID + "," + num + ",'" + HMaker + "' "
+ $.ajax({
+ url: GetWEBURL() + '/Pay_SingleBalBillController/CheckAllByTimeAndGroup',
+ async: false,
+ type: "GET",
+ dataType: "json",
+ data: { "sWhere": sWhere, "HMaker": HMaker },
+ success: function (data1) {
+ if (data1.count == 1) {
//鍏抽棴褰撳墠frame
layer.close(index);
+ layer.msg("瀹℃牳鎴愬姛", { time: 3 * 1000, icon: 1 });
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
$("#btnSearch").trigger('click');
- });
- } else {
- layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ } else {
+ layer.close(index);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function (e) {
+ layer.close(index);
+ layer.alert(e.statusText, { icon: 5 });
}
- }, error: function () {
- layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- });
- }
- else {
- layer.msg('璇烽�夋嫨鏁版嵁瀹℃牳锛�');
-
- }
+ });
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ , cancel: function () {
+
+ }
+ })
}
//#endregion
+
//#region 鍏抽棴锛坣um=1锛�/鍙嶅叧闂紙num=2锛�
function set_CloseBill(num) {
var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
index cbc3aad..3470b10 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
@@ -791,28 +791,57 @@
//#region 鎵归噺瀹℃牳锛坣um=1锛�/鍙嶅鏍革紙num=2锛�
function set_CheckBillAll(num) {
- //$.ajax({
- // type: "GET",
- // url: GetWEBURL() + "/Pay_GroupBalBillController/CheckAll",
- // async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- // data: { "ids": queryString, "Type": num, "HMaker": HMaker },
- // 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);
- // //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- // $("#btnSearch").trigger('click');
- // });
- // } else {
- // layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // }
- // }, error: function () {
- // layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // }
- // });
+ layer.open({
+ type: 2
+ , area: ['70%', '45%']
+ , title: '鍗曟嵁鎵归噺瀹℃牳鏉′欢'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../宸ヨ祫绠＄悊/宸ヨ祫缁撶畻鍗�(涓汉)/Pay_BatchCheck.html'
+ , resize: false
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ var body = layer.getChildFrame('body', index);
+ var HYear = $(body).find("#HYear").val();
+ var HPeriod = $(body).find("#HPeriod").val();
+ var HGroupID = $(body).find("#HGroupID").val();
+ var sWhere = "" + HYear + "," + HPeriod + "," + HGroupID + "," + num + ",'" + HMaker + "' "
+ $.ajax({
+ url: GetWEBURL() + '/Pay_GroupBalBillController/CheckAllByTimeAndGroup',
+ async: false,
+ type: "GET",
+ dataType: "json",
+ data: { "sWhere": sWhere, "HMaker": HMaker },
+ success: function (data1) {
+ if (data1.count == 1) {
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ layer.msg("瀹℃牳鎴愬姛", { time: 3 * 1000, icon: 1 });
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ } else {
+ layer.close(index);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function (e) {
+ layer.close(index);
+ layer.alert(e.statusText, { icon: 5 });
+ }
+ });
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ , cancel: function () {
+
+ }
+ })
}
//#endregion
--
Gitblit v1.9.1