From bbc4e956d3bd91796567eafd0dffc82e9fb902c3 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 08 二月 2023 11:32:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/工资管理/核算方式/Gy_ClassTimePrjSubBillEdit.html | 61 ++++++++++++++----------------
1 files changed, 28 insertions(+), 33 deletions(-)
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 9802106..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 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
@@ -288,7 +283,7 @@
function set_SaveBill(data) {
//var sMainStr = JSON.stringify(data.field);
- var sMainStr = JSON.stringify(data.field);
+ var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
$.ajax({
type: "POST",
url: GetWEBURL() + "Gy_ClassTimePrjSub/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
--
Gitblit v1.9.1