From 7ea538657bce243cabec2a5278ff14fbfe23ae1a Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期三, 29 六月 2022 16:38:31 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/工资管理/核算方式/Gy_ClassTimePrjGroupBillList.html | 4 +-
WebTM/views/Baseset/基础资料/Gy_ClassTimePrjGroupEdit.html | 33 +++-------------
WebTM/views/工资管理/核算方式/Gy_ClassTimePrjSubBillList.html | 8 ++++
WebTM/views/工资管理/核算方式/Gy_ClassTimePrjSubBillEdit.html | 59 +++++++++++++----------------
WebTM/views/基础资料/公用基础资料/Gy_EmployeeList.html | 3 -
WebTM/views/工资管理/工资运算/Pay_SingleBalBillOperation.html | 6 ++-
6 files changed, 48 insertions(+), 65 deletions(-)
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjGroupEdit.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjGroupEdit.html"
index c77d8fc..b0879c7 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjGroupEdit.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjGroupEdit.html"
@@ -77,14 +77,11 @@
var OperationType = 1;//鎿嶄綔绫诲瀷
var closeType = 2; //鍏抽棴绫诲瀷
} else {
- debugger;
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
var closeType = params[params[3]]; //鍏抽棴绫诲瀷
}
-
-
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -212,36 +209,20 @@
//缂栬緫鑾峰彇琛ㄥご
function set_EditForm(linterid) {
$.ajax({
- url: GetWEBURL() + "Sc_MouldProdInBill/Sc_MouldProdInHouseBillListCheckDetai",
+ url: GetWEBURL() + "Web/GetClassTimePrjGroupBillEdit_Json",
type: "GET",
data: {
- "HID": linterid
+ "sWhere": linterid
},
success: function (result) {
-
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data.h_v_Sc_MouldProdInHouseBillList[0];
+ var data = result.data[0];
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HBillNo": data.鍗曟嵁鍙�
- , "HDate": formatDate(data.鏃ユ湡)
- , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- , "HWHID": data.HWHID //浠撳簱ID
- , "HWHName": data.浠撳簱 //浠撳簱鍚嶇О
- , "HSecManagerID": data.hsecmanagerid //楠屾敹鍛業D
- , "HSecManagerName": data.楠屾敹鍛� //楠屾敹鍛樺悕绉�
- , "HKeeperID": data.hkeeperid //淇濈鍛業D
- , "HKeeperName": data.淇濈鍛� //淇濈鍛樺悕绉�
- , "HDeptID": data.HDeptID //閮ㄩ棬ID
- , "HDeptName": data.閮ㄩ棬 //閮ㄩ棬鍚嶇О
- , "HSourceBillType": data.婧愬崟绫诲瀷 //婧愬崟绫诲瀷
- , "XDH": "" //閫夊崟鍙�
- , "HExplanation": data.鎽樿 //鎽樿
- , "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
- , "HSupTypeID": data.寰�鏉ョ被鍨� //閫夊崟鍙�
- , "HSupName": data.寰�鏉ュ崟浣� //鎽樿
- , "HSupID": data.HSupID //澶囨敞
+ "HNumber": data.HNumber
+ , "HName": data.HName
+ , "HDeptID": data.HDeptID
+ , "HDeptName": data.浠撳簱鍚嶇О
});
-
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
index d7a299d..6158018 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
@@ -212,7 +212,6 @@
table.render(option);
layer.close(wait);
} else {
- layer.close(index);
layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
@@ -221,9 +220,7 @@
}
});
}
-
//#endregion
-
//#region 鏂板
function set_AddNew() {
layer.open({
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\350\277\220\347\256\227/Pay_SingleBalBillOperation.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\350\277\220\347\256\227/Pay_SingleBalBillOperation.html"
index 60a0842..0e70367 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\350\277\220\347\256\227/Pay_SingleBalBillOperation.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\350\277\220\347\256\227/Pay_SingleBalBillOperation.html"
@@ -125,14 +125,17 @@
});
//#endregion
+ function f_alert(sMsg) {
+ layer.alert(sMsg, { icon: 5 });
+ }
//#region 姝ら〉闈㈡墍鏈夋柟娉�
function set_Generate() {
var HBeginDate = $("#HBeginDate").val();
var HEndDate = $("#HEndDate").val();
var HDeptID = $("#HDeptID").val();
if (HBeginDate ==""|| HEndDate=="" || HDeptID=="") {
- layer.msg("璇峰皢淇℃伅濉啓瀹屾暣", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("璇烽�夋嫨鏃ユ湡鍜岄儴闂ㄤ俊鎭�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
$.ajax({
@@ -146,7 +149,6 @@
layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
}
else {
-
f_alert(data.Message);
console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
}
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjGroupBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjGroupBillList.html"
index 261756a..0737ef7 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjGroupBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjGroupBillList.html"
@@ -40,7 +40,7 @@
<div style="padding: 10px;">
<button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
- <!--<button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnModify"><i class="layui-icon layui-icon-edit"></i>淇敼</button>-->
+ <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnModify"><i class="layui-icon layui-icon-edit"></i>淇敼</button>
<button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
</div>
@@ -259,7 +259,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../Baseset/鍩虹璧勬枡/Gy_ClassTimePrjGroupEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1']
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_ClassTimePrjGroupEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1']
, resize: false,
end: function () {
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjSubBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjSubBillEdit.html"
index ce0f237..838e7f0 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjSubBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjSubBillEdit.html"
@@ -194,39 +194,34 @@
var HEntryID = $("#HEntryID").val();
var HYear = $("#HYear").val();
var HPeriod = $("#HPeriod").val();
- if (HEntryID == 0) {
- layer.alert("璇烽�夋嫨鎵�灞炴牳绠楁柟寮忕粍锛�", { icon: 5 });
- return;
- }
- if (0 <= HPeriod <= 12) {
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "Gy_ClassTimePrjSub/Calc", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "HEntryID": HEntryID, "HYear": HYear, "HPeriod": HPeriod },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { icon: 1 });
- $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂�
- }
- else {
- layer.alert(data.Message, { icon: 5 });
- }
- layer.closeAll("loading");
- },
- error: function (err) {
- layer.alert("閿欒:" + err, { icon: 5 });
- //console.log("Reason" + sMainStr);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Gy_ClassTimePrjSub/Calc", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "HEntryID": HEntryID, "HYear": HYear, "HPeriod": HPeriod },
+ dataType: "json",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+ //layer.msg(data.Message, { icon: 1 });
+ //$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HSumMoney": data.HsumAcount
+ , "HSumWorkTimes": data.HSumCoefficient
+ , "HOldRate": data.HAvgAcount
+ });
}
- });
- }
- else {
- layer.alert("璇疯緭鍏ユ纭勾鏈堬紒", { icon: 5 });
- return;
- }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ }
+ //layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err, { icon: 5 });
+ //console.log("Reason" + sMainStr);
+ }
+ });
+
}
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjSubBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjSubBillList.html"
index 5769cdd..7fb2e90 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjSubBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjSubBillList.html"
@@ -232,6 +232,10 @@
, title: '鏍哥畻璁板綍-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../鏍哥畻鏂瑰紡/Gy_ClassTimePrjSubBillEdit.html?OperationType=1&linterid=&HSouceBillType='
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
})
}
//#endregion
@@ -251,6 +255,10 @@
, title: '鏍哥畻璁板綍-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../鏍哥畻鏂瑰紡/Gy_ClassTimePrjSubBillEdit.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType='
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
})
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
--
Gitblit v1.9.1