From 5d0914b9dba4ad9917f26b15915ec6b9a93bb314 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 14 十二月 2023 16:28:09 +0800
Subject: [PATCH] 工资管理相关新增、列表模块修改，乔一销售出库扫码模块优化
---
WebTM/views/工资管理/工资结算单(其他)/Pay_OtherBalBillEdit.html | 80 ++++++++++++++++++--------
WebTM/views/工资管理/考勤汇报单/Pay_WorkTimesBillList.html | 3
WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBill_QiaoYi_PDA.html | 10 +-
WebTM/views/工资管理/工资结算单(集体)/Pay_GroupBalBillList.html | 3
WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBillList.html | 3
WebTM/views/工资管理/工资结算单(其他)/Pay_OtherBalBillList.html | 3
WebTM/views/工资管理/定额申请/Pay_ProcPriceRequestBillList.html | 3
WebTM/views/工资管理/考勤汇报单/Pay_WorkTimesBillEdit.html | 50 +++++++---------
WebTM/views/工资管理/工资单/Pay_PayMentBillList.html | 3
WebTM/layuiadmin/Scripts/webConfig.js | 4
10 files changed, 95 insertions(+), 67 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index ab9d836..7be662b 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,9 +3,9 @@
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
- //var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
+ var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
- var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
+ //var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
//var WEBURL = "http://localhost:81/API/"; //闄堥洴闈欐湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html"
index 487b23f..78bf790 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html"
@@ -240,7 +240,7 @@
<button type="button" lay-submit="" lay-filter="cmdAdd" class="layui-btn" id="cmdAdd">鏂板</button>
<button type="button" lay-submit="" lay-filter="cmdSaver" class="layui-btn" id="cmdSaver">鎻愪氦</button>
<!--<button type="button" lay-submit="" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>-->
- <button type="button" lay-submit="" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+ <button type="button" lay-submit="" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">娓呯┖</button>
<button type="button" lay-submit="" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
</div>
</div>
@@ -913,7 +913,7 @@
parent.location.href = "../../WMS鎵爜妯″潡/閿�鍞嚭搴�/Kf_SellOutBillList_QiaoYi_PDA.html";
}
else {
- parent.location.href = "../../../views/index_Mobile.html";
+ parent.location.href = "../../../views/index_Mobile_QiaoYi.html";
}
}//鍏抽棴
}
@@ -968,13 +968,13 @@
//#endregion
- //#region 鍒犻櫎
+ //#region 娓呯┖
form.on('submit(cmdDelete)', function () {
var checkStatus = table.checkStatus('wl-table')
, data = checkStatus.data;
if (checkStatus.data.length == 1) {
- layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+ layer.confirm("纭瑕佹竻绌洪�変腑琛屾墍鏈夋壂鐮佽褰曪紵娓呯┖鍚庡皢涓嶅彲鎭㈠锛�", { title: "娓呯┖纭" }, function (index) {
var sMaterID = data[0].HMaterID
var sAuxPropID = data[0].HAuxPropID
var sMTONo = data[0].HMTONo
@@ -1009,7 +1009,7 @@
})
}
else {
- layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�');
+ layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜娓呯┖锛�');
}
});
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\256\232\351\242\235\347\224\263\350\257\267/Pay_ProcPriceRequestBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\256\232\351\242\235\347\224\263\350\257\267/Pay_ProcPriceRequestBillList.html"
index 20db428..515be4d 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\256\232\351\242\235\347\224\263\350\257\267/Pay_ProcPriceRequestBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\256\232\351\242\235\347\224\263\350\257\267/Pay_ProcPriceRequestBillList.html"
@@ -472,6 +472,7 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var HInterID = data[0].hmainid.toString();
+ var HBillNo = data[0].鍗曟嵁鍙�.toString();
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
//閫昏緫鍒犻櫎鏂规硶
@@ -482,7 +483,7 @@
success: function (result) {
console.log('gouba' + result);
if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 }, function () {
+ layer.msg("鍗曟嵁鍙凤細" + HBillNo + " 鍒犻櫎鎴愬姛锛�", { icon: 1 }, function () {
// 寰楀埌frame绱㈠紩
var index = layer.getFrameIndex(window.name);
//鍏抽棴褰撳墠frame
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\345\215\225/Pay_PayMentBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\345\215\225/Pay_PayMentBillList.html"
index bcb4ca6..43f8231 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\345\215\225/Pay_PayMentBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\345\215\225/Pay_PayMentBillList.html"
@@ -471,6 +471,7 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var HInterID = data[0].hmainid.toString();
+ var HBillNo = data[0].鍗曟嵁鍙�.toString();
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
//閫昏緫鍒犻櫎鏂规硶
@@ -481,7 +482,7 @@
success: function (result) {
console.log('gouba' + result);
if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 }, function () {
+ layer.msg("鍗曟嵁鍙凤細" + HBillNo + " 鍒犻櫎鎴愬姛锛�", { icon: 1 }, function () {
// 寰楀埌frame绱㈠紩
var index = layer.getFrameIndex(window.name);
//鍏抽棴褰撳墠frame
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 d6b1fd6..09ef684 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"
@@ -470,6 +470,7 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var HInterID = data[0].hmainid.toString();
+ var HBillNo = data[0].鍗曟嵁鍙�.toString();
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
//閫昏緫鍒犻櫎鏂规硶
@@ -480,7 +481,7 @@
success: function (result) {
console.log('gouba' + result);
if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 }, function () {
+ layer.msg("鍗曟嵁鍙凤細" + HBillNo+" 鍒犻櫎鎴愬姛锛�", { icon: 1 }, function () {
// 寰楀埌frame绱㈠紩
var index = layer.getFrameIndex(window.name);
//鍏抽棴褰撳墠frame
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\345\205\266\344\273\226\051/Pay_OtherBalBillEdit.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\345\205\266\344\273\226\051/Pay_OtherBalBillEdit.html"
index fc97bc8..ba8e9da 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\345\205\266\344\273\226\051/Pay_OtherBalBillEdit.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\345\205\266\344\273\226\051/Pay_OtherBalBillEdit.html"
@@ -172,15 +172,15 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+ <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="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HUpdater" id="HUpdater" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
+ <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="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -192,29 +192,63 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
+ <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="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HUpdaterDate" id="HUpdaterDate" style="background-color:#efefef4d;" readonly>
</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="HCheckerDate" id="HCheckerDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+ </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="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+ </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="HBacker" id="HBacker" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
<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="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
</div>
</div>
- </div>
- <div class="layui-row">
- <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="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
- </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="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+ </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="HBackerDate" id="HBackerDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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="HBackRemark" id="HBackRemark" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -314,12 +348,6 @@
if (OperationType == 1) {
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HMaker").val(sessionStorage["HUserName"]);
- $("#HCheckDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HChecker").val(sessionStorage["HUserName"]);
- $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HUpDater").val(sessionStorage["HUserName"]);
- $("#HCloseDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HDeleteDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
option.data = [{
"HEmpID": "", "HEmpNumber": "", "HEmpName": "", "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HProcID": "", "HProcNumber": "", "HProcName": ""
@@ -649,13 +677,15 @@
, "HExplanation": data.鎽樿 //鎽樿
, "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
, "HMaker": data.鍒跺崟浜�
+ , "HUpdater": data.淇敼浜�
, "HChecker": data.瀹℃牳浜�
, "HCloseMan": data.鍏抽棴浜�
- , "HMakeDate": data.鍒跺崟鏃ユ湡
- , "HCheckDate": data.瀹℃牳鏃ユ湡
- , "HCloseDate": data.鍏抽棴鏃ユ湡
- , "HUpDateDate": data.淇敼鏃ユ湡
- , "HDeleteDate": data.浣滃簾鏃ユ湡
+ , "HDeleteMan": data.浣滃簾浜�
+ , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : Format(data.鍒跺崟鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+ , "HUpdaterDate": data.淇敼鏃ユ湡 == null ? "" : Format(data.淇敼鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+ , "HCheckerDate": data.瀹℃牳鏃ユ湡 == null ? "" : Format(data.瀹℃牳鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+ , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : Format(data.鍏抽棴鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+ , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : Format(data.浣滃簾鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
});
} else {
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\345\205\266\344\273\226\051/Pay_OtherBalBillList.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\345\205\266\344\273\226\051/Pay_OtherBalBillList.html"
index 8d898ff..50dc5dd 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\345\205\266\344\273\226\051/Pay_OtherBalBillList.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\345\205\266\344\273\226\051/Pay_OtherBalBillList.html"
@@ -328,6 +328,7 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var InterID = data[0].hmainid.toString();
+ var HBillNo = data[0].鍗曟嵁鍙�.toString();
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax({
@@ -336,7 +337,7 @@
data: { "HInterID": InterID, "user": sessionStorage["HUserName"]},
success: function (result) {
if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ layer.msg("鍗曟嵁鍙凤細" + HBillNo + " 鍒犻櫎鎴愬姛锛�", { time: 1 * 1000, icon: 1 }, function () {
// 寰楀埌frame绱㈠紩
var index = layer.getFrameIndex(window.name);
//鍏抽棴褰撳墠frame
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 01ce4e3..4dce895 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"
@@ -468,6 +468,7 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var HInterID = data[0].hmainid.toString();
+ var HBillNo = data[0].鍗曟嵁鍙�.toString();
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
//閫昏緫鍒犻櫎鏂规硶
@@ -478,7 +479,7 @@
success: function (result) {
console.log('gouba' + result);
if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 }, function () {
+ layer.msg("鍗曟嵁鍙凤細" + HBillNo + " 鍒犻櫎鎴愬姛锛�", { icon: 1 }, function () {
// 寰楀埌frame绱㈠紩
var index = layer.getFrameIndex(window.name);
//鍏抽棴褰撳墠frame
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit.html"
index 04966c0..ddbb91f 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit.html"
@@ -191,26 +191,11 @@
</div>
<div class="layui-row">
<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="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
- </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="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
- </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="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
</div>
</div>
- </div>
- <div class="layui-row">
-
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -224,7 +209,20 @@
</div>
</div>
</div>
-
+ <div class="layui-row">
+ <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="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+ </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="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
@@ -353,14 +351,6 @@
if (OperationType == 1) {
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HMaker").val(sessionStorage["HUserName"]);
- $("#HCheckDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HChecker").val(sessionStorage["HUserName"]);
- $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HUpDater").val(sessionStorage["HUserName"]);
- $("#HCloseDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HDeleteDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HDeleteMan").val(sessionStorage["HUserName"]);
- $("#HCloseMan").val(sessionStorage["HUserName"]);
//鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
option.data = [{
"HEmpID": "", "HEmpNumber": "", "HEmpName": "", "HEmpID": "", "HEmpRate": 0
@@ -764,11 +754,13 @@
, "HMaker": data.鍒跺崟浜�
, "HChecker": data.瀹℃牳浜�
, "HCloseMan": data.鍏抽棴浜�
- , "HMakeDate": data.鍒跺崟鏃ユ湡
- , "HCheckDate": data.瀹℃牳鏃ユ湡
- , "HCloseDate": data.鍏抽棴鏃ユ湡
- , "HUpDateDate": data.淇敼鏃ユ湡
- , "HDeleteDate": data.浣滃簾鏃ユ湡
+ , "HUpDater": data.淇敼浜�
+ , "HDeleteMan": data.浣滃簾浜�
+ , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : Format(data.鍒跺崟鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+ , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : Format(data.瀹℃牳鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+ , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : Format(data.鍏抽棴鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+ , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : Format(data.淇敼鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+ , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : Format(data.浣滃簾鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
});
} else {
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html"
index 7297d37..69bc05a 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html"
@@ -276,6 +276,7 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var InterID = data[0].hmainid.toString();
+ var HBillNo = data[0].鍗曟嵁鍙�.toString();
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax({
@@ -284,7 +285,7 @@
data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ layer.msg("鍗曟嵁鍙凤細" + HBillNo + " 鍒犻櫎鎴愬姛锛�", { time: 1 * 1000, icon: 1 }, function () {
// 寰楀埌frame绱㈠紩
var index = layer.getFrameIndex(window.name);
//鍏抽棴褰撳墠frame
--
Gitblit v1.9.1