From 7ba5a10a2d9533007b3b7fc181f8533d6d22ca27 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 21 十一月 2022 10:32:41 +0800
Subject: [PATCH] 工作日设置
---
WebTM/views/基础资料/工资基础资料/Gy_WorkDay.html | 36 +++-----
WebTM/views/基础资料/工资基础资料/Add_Edit_Gy_WorkDay.html | 181 ++++++++++++++++++--------------------------
2 files changed, 89 insertions(+), 128 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkDay.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkDay.html"
index f3382d2..16779c6 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkDay.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkDay.html"
@@ -27,7 +27,7 @@
</style>
</head>
<body>
-
+
<div class="layui-fluid" style="padding: 0;">
<div class="layui-card" style="padding: 15px;">
<div class="layui-card-body" style="padding: 1px;">
@@ -43,54 +43,54 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鏃ユ湡</label>
<div class="layui-input-inline">
- <input type="text" name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" placeholder="" class="layui-input">
- <input type="hidden" name="HUSEORGID" id="HUSEORGID" value="">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">涓婄彮鏃堕棿</label>
- <div class="layui-input-inline">
- <input type="text" name="HName" id="HName" lay-verify="HName" autocomplete="off" placeholder="" class="layui-input">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">涓嬬彮鏃堕棿锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+ <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鍒涘缓浜�</label>
+ <label class="layui-form-label">涓婄彮鏃堕棿</label>
<div class="layui-input-inline">
- <input type="text" name="HMakeEmp" id="HMakeEmp" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HMakeEmpID" id="HMakeEmpID" value="0">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmp-BT" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <input class="layui-input" name="HWorkBegin" id="HWorkBegin" autocomplete="off" model="datetime">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鍖呰鏉愯川</label>
+ <label class="layui-form-label">涓嬬彮鏃堕棿锛�</label>
<div class="layui-input-inline">
- <input type="text" name="HPackMaterial" id="HPackMaterial" lay-verify="HPackMaterial" autocomplete="off" placeholder="" class="layui-input">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+ <input class="layui-input" name="HWorkEnd" id="HWorkEnd" autocomplete="off" model="datetime">
</div>
</div>
</div>
-
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍗堜紤寮�濮�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HNoonbreakBegin" id="HNoonbreakBegin" autocomplete="off" model="datetime">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍗堜紤缁撴潫锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HNoonbreakEnd" id="HNoonbreakEnd" autocomplete="off" model="datetime">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏅氫紤寮�濮�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HNightbreakBegin" id="HNightbreakBegin" autocomplete="off" model="datetime">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏅氫紤缁撴潫锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HNightbreakEnd" id="HNightbreakEnd" autocomplete="off" model="datetime">
+ </div>
+ </div>
+ </div>
</div>
<input id="HItemID" name="HItemID" type="hidden" value="0" />
- <input id="HBarCode" name="HBarCode" type="hidden" value="0" />
- <input id="HParentID" name="HParentID" type="hidden" value="0" />
- <input id="HUpDater" name="HUpDater" type="hidden" value="0" />
- <input id="HShortNumber" name="HShortNumber" type="hidden" />
</form>
</div>
</div>
@@ -111,7 +111,8 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
- , element = layui.element;
+ , element = layui.element
+ , laydate = layui.laydate;
var sWhere = "";
var date = new Date();
var day = date.getDate();
@@ -120,10 +121,37 @@
var shijian = year + "-" + month + "-" + day;
//#endregion
-
+ laydate.render({
+ elem: '#HDate'
+ //, type:'year'
+ });
+ laydate.render({
+ elem: '#HWorkBegin'
+ , type: 'time'
+ });
+ laydate.render({
+ elem: '#HWorkEnd'
+ , type: 'time'
+ });
+ laydate.render({
+ elem: '#HNoonbreakBegin'
+ , type: 'time'
+ });
+ laydate.render({
+ elem: '#HNoonbreakEnd'
+ , type: 'time'
+ });
+ laydate.render({
+ elem: '#HNightbreakBegin'
+ , type: 'time'
+ });
+ laydate.render({
+ elem: '#HNightbreakEnd'
+ , type: 'time'
+ });
//#region 杩涘叆椤甸潰鍗冲姞杞�
- $('#HMakeTime').val(Format(new Date(), "yyyy-MM-dd"))
+ $('#HDate').val(Format(new Date(), "yyyy-MM-dd"))
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
get_LoginIs();
@@ -175,7 +203,7 @@
form.on('submit(HEmp-BT)', function () {
get_checkEmp();
});
-
+
//淇濆瓨鎸夐挳
form.on('submit(set_SaveBill)', function (data) {
set_SaveBill(data);
@@ -201,7 +229,7 @@
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + "Gy_PackType/cx",
+ url: GetWEBURL() + "Gy_WorkDay/cx",
type: "GET",
data: {
"HInterID": linterid
@@ -221,21 +249,13 @@
}
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HItemID": data.HItemID
- ,"HNumber": data.鍖呰鏂瑰紡浠ｇ爜
- , "HName": data.鍖呰鏂瑰紡鍚嶇О
- , "HParentID": data.HParentID
- , "HShortNumber": data.鐭唬鐮�
- , "HHelpCode": data.鍔╄鐮�
- //, "HMakeEmp": data.鍒涘缓浜�
- , "HPackMaterial": data.鍖呰鏉愯川
- , "HLevel": data.绛夌骇
- , "HLenhth": data.闀�
- , "HWidth": data.瀹�
- , "HHeight": data.楂�
- //, "HStopflag": data.绂佺敤鏍囪
- , "HRemark": data.澶囨敞
- , "HUseFlag": data.浣跨敤鏍囪
- , "HMakeTime": Format(data.鍒涘缓鏃堕棿, "yyyy-MM-dd")
+ , "HDate": data.HDate
+ , "HWorkBegin": data.HWorkBegin
+ , "HWorkEnd": data.HWorkEnd
+ , "HNoonbreakBegin": data.HNoonbreakBegin
+ , "HNoonbreakEnd": data.HNoonbreakEnd
+ , "HNightbreakBegin": data.HNightbreakBegin
+ , "HNightbreakEnd": data.HNightbreakEnd
});
layer.close(ajaxLoad);
} else {
@@ -253,33 +273,9 @@
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
var sMainStr = JSON.stringify(data.field);
- if (!$("#HNumber").val()) {
- layer.msg("璇疯緭鍏ュ寘瑁呮柟寮忎唬鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if (!$("#HName").val()) {
- layer.msg("璇疯緭鍏ュ寘瑁呮柟寮忓悕绉帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if ($("#HMakeEmpID").val() == 0) {
- layer.msg("璇烽�夋嫨鍒涘缓浜猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if (!$("#HLenhth").val()) {
- layer.msg("璇疯緭鍏ラ暱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if (!$("#HWidth").val()) {
- layer.msg("璇疯緭鍏ュ锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if (!$("#HHeight").val()) {
- layer.msg("璇疯緭鍏ラ珮锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
$.ajax({
type: "POST",
- url: GetWEBURL() + "Gy_PackType/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "Gy_WorkDay/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] },
dataType: "json",
@@ -302,33 +298,6 @@
});
}
//#endregion
-
- //#region 閫夋嫨鑱屽憳鏂规硶
- function get_checkEmp() {
- layer.open({
- type: 2//寮圭獥绫诲瀷
- , skin: 'layui-layer-rim' //鍔犱笂杈规
- , area: ['90%', '90%']//澶у皬
- , title: '鑱屽憳鍒楄〃'//鏍囬
- , shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
- , btn: ['纭畾', '鍙栨秷']
- , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
- if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁');
- }
- $("#HMakeEmp").val(checkStatus.data[0].HName);
- $("#HMakeEmpID").val(checkStatus.data[0].HItemID);
- layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- }
- , btn2: function (index, layero) { }
- })
- }
- //#endregion
-
-
//#region 淇濆瓨鍚庢祻瑙堟柟娉�
function ReRoadBillMain() {
location.replace('Add_Edit_Gy_Warehouse.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkDay.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkDay.html"
index 022d3cd..a4277e7 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkDay.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkDay.html"
@@ -25,15 +25,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍖呰浠ｇ爜</label>
+ <label class="layui-form-label">鏃ユ湡</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HNumber" id="HNumber">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍖呰鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HName" id="HName">
+ <input type="text" class="layui-input" name="HDate" id="HDate">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -110,11 +104,14 @@
var sWhere = "";
var option = [];
var Organization = sessionStorage["Organization"]
- var HModName = "Gy_PackType";
+ var HModName = "Gy_WorkDay";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["HItemID","HParentID",];
//#endregion
-
+ laydate.render({
+ elem: '#HDate'
+ //, type:'year'
+ });
//#region 杩涘叆椤甸潰鍗冲姞杞�
//鍒濆鍖栫晫闈�
@@ -218,7 +215,7 @@
var ajaxLoad = layer.load();
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL() + '/Gy_PackType/list',
+ url: GetWEBURL() + '/Gy_WorkDay/list',
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
@@ -286,12 +283,10 @@
//#region 蹇�熻繃婊�
function get_FastQuery() {
- var HNumber = $("#HNumber").val();
- var HName = $("#HName").val();
+ var HDate = $("#HDate").val();
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
-
if (ColName != 0 && Comparator != 0) {
var com = "";
switch (Comparator) {
@@ -313,11 +308,8 @@
}
sWhere += " and " + ColName + " " + com;
}
- if (HNumber) {
- sWhere += " and 鍖呰鏂瑰紡浠ｇ爜 like '%" + HNumber + "%'";
- }
- if (HName) {
- sWhere += " and 鍖呰鏂瑰紡鍚嶇О like '%" + HName + "%'";
+ if (HDate) {
+ sWhere += " and DATEDIFF(D,鏃ユ湡,'" + HDate +"')=0";
}
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -341,7 +333,7 @@
type: 2
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['100%', '100%']
- , title: '鍖呰鏂瑰紡鍒楄〃-鏂板'
+ , title: '宸ヤ綔鏃�-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../宸ヨ祫鍩虹璧勬枡/Add_Edit_Gy_WorkDay.html?OperationType=1&linterid=&HSouceBillType='
})
@@ -358,7 +350,7 @@
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '鍖呰鏂瑰紡鍒楄〃-缂栬緫'
+ , title: '宸ヤ綔鏃�-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../宸ヨ祫鍩虹璧勬枡/Add_Edit_Gy_WorkDay.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
})
@@ -378,7 +370,7 @@
var wait = layer.load();
//閫昏緫鍒犻櫎鏂规硶
$.ajax({
- url: GetWEBURL() + 'DeltetGy_PackType',
+ url: GetWEBURL() + 'DeltetGy_WorkDay',
type: "GET",
data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
success: function (result) {
--
Gitblit v1.9.1