From e1cb9e26b1e4413fba57e6523f9dcfdbd593e428 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 28 七月 2023 18:06:25 +0800
Subject: [PATCH] 工资计算模块
---
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 136 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 122 insertions(+), 14 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
index bc3c768..467271b 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
@@ -41,13 +41,16 @@
</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; width: 185px;">
- <select name="HProdORGID" id="HProdORGID" lay-verify="HProdORGID">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ <select name="HTLType" id="HTLType" lay-verify="HTLType">
+ <option value="缂烘枡" selected="selected">缂烘枡</option>
+ <option value="鐢熶骇鐢ㄦ枡娓呭崟">鐢熶骇鐢ㄦ枡娓呭崟</option>
+ <!--<option value="閲囪喘璁㈠崟">閲囪喘璁㈠崟</option> 鏆傛椂娌℃湁-->
</select>
</div>
</div>
+
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇杞﹂棿</label>
<div class="layui-input-block" style="margin-left: 77px;">
@@ -72,7 +75,7 @@
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡缂栫爜</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -95,15 +98,14 @@
<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="HMaterName" id="HMaterName" style="background-color:#efefef4d" readonly>
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">榻愬绫诲瀷</label>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
<select name="HOrderType" id="HOrderType" lay-verify="HOrderType">
- <option value="鍏ㄩ儴">鍏ㄩ儴</option>
- <option value="鐢熶骇鐢ㄦ枡娓呭崟">鐢熶骇鐢ㄦ枡娓呭崟</option>
+ <option value="鐢熶骇鐢ㄦ枡娓呭崟" selected="selected">鐢熶骇鐢ㄦ枡娓呭崟</option>
<option value="鏍囧噯Bom">鏍囧噯Bom</option>
</select>
</div>
@@ -119,7 +121,7 @@
<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="HMaterModel" id="HMaterModel" style="background-color:#efefef4d" readonly>
+ <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel">
</div>
</div>
<div class="layui-inline">
@@ -129,14 +131,57 @@
</div>
</div>
</div>
+ <div class="layui-row" style="margin-top:10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HProdORGID" id="HProdORGID" lay-verify="HProdORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </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="date" class="layui-input" lay-verify="HMastersDate" name="HMastersDate" id="HMastersDate" style="padding-left: 75px;">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
</div>
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_BatchFill"><i class="layui-icon layui-icon-file-b"></i>鎵归噺濉厖</button>
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_BatchFill"><i class="layui-icon layui-icon-file-b"></i>鎵归噺濉厖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -154,9 +199,7 @@
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
<script>
- var treeCkData = { id: 0 };
- var TagId = "";
- var TagParentId = "";
+ var OptionData = [];
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -176,6 +219,7 @@
var sWhere = "";
var option = [];
var HModName = "JIT_DayPlanPlatForm";
+
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -344,6 +388,7 @@
//鍒濆鍖栨椂闂�
$("#HPlanBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMastersDate").val("");
//缁勭粐
Organ();
//鍒濆鍖栬〃鏍�
@@ -580,6 +625,11 @@
get_Display_1(HinterID_S);
get_Display_2(HinterID_S)
}
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
} else {
layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -806,9 +856,36 @@
}
var HPlanBeginDate = $("#HPlanBeginDate").val();//寮�宸ヨ捣濮嬫棩鏈�
var HPlanEndDate = $("#HPlanEndDate").val();//寮�宸ユ埅姝㈡棩鏈�
+ var HMastersDate = $("#HMastersDate").val();//鎺掍骇鏃ユ湡
var HSeOrderBillNo = $("#HSeOrderBillNo").val();//閿�鍞鍗曞彿
var HMaterID = $("#HMaterID").val();//鐗╂枡缂栫爜id
var HICMOBillNo = $("#HICMOBillNo").val();//鐢熶骇璁㈠崟鍙�
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+ var sWheres = "";
+
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like''%" + ColContent + "%''";
+ break;
+ case "8":
+ com = "like''%" + ColContent + "''";
+ break;
+ case "9":
+ com = "like''" + ColContent + "%''";
+ break;
+ case "10":
+ com = "not like''%" + ColContent + "%''";
+ break;
+ default:
+ com = "" + Comparator + "''" + ColContent + "''";
+ break;
+ }
+ sWheres += " and [" + ColName + "] " + com;
+ }
sWhere = {
HPlanBeginDate: HPlanBeginDate
@@ -818,6 +895,8 @@
, HMaterID: HMaterID
, HICMOBillNo: HICMOBillNo
, HWorkShopID: HWorkShopID
+ , HMastersDate: HMastersDate
+ , sWheres: sWheres
}
get_Display(JSON.stringify(sWhere));
sWhere = ""//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -837,6 +916,7 @@
layer.open({
type: 2 //绫诲瀷
, skin: 'layui-layer-rim'//鍔犱笂杈规
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
, area: ['90%', '90%']//澶у皬
, title: '榻愬鍒嗘瀽鏄庣粏琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
@@ -849,6 +929,7 @@
$("#HPlanBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�宸ヨ捣濮嬫棩鏈�
$("#HSeOrderBillNo").val("");//閿�鍞鍗曞彿
$("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));//寮�宸ユ埅姝㈡棩鏈�
+ $("#HMastersDate").val("");//鎺掍骇鏃ユ湡
$("#HMaterID").val("0");//鐗╂枡缂栫爜id
$("#HMaterNumber").val("");//鐗╂枡缂栫爜
$("#HMaterName").val("");//鐗╂枡鍚嶇О
@@ -857,6 +938,9 @@
$("#HWorkShopID").val("0");//鐢熶骇杞﹂棿id
$("#HWorkShopIDName").val("");//鐢熶骇杞﹂棿
$("#HProdORGID").val(sessionStorage["OrganizationID"])//鐢熶骇璁㈠崟缁勭粐
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
form.render('select');
sWhere = "";
}
@@ -901,12 +985,13 @@
HProdORGID: $("#HProdORGID").val()
, HWorkShopID: $("#HWorkShopID").val()
}
+ var HTLType = $("#HTLType").val();
sWhere = JSON.stringify(sWhere);
var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_TLYS',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["Czybm"] },
+ data: { "sWhere": sWhere, "user": sessionStorage["Czybm"], "HTLType": HTLType },
success: function (data1) {
if (data1.count == 1) {
get_FastQuery(2);
@@ -1138,6 +1223,12 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
+ , end: function () {
+ obj.update({
+ "HSourceID": OptionData.HItemID
+ , "鐢熶骇璧勬簮": OptionData.鐢熶骇璧勬簮鍚嶇О
+ })
+ }
})
}
obj.event = "";
@@ -1322,7 +1413,24 @@
})
}
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
+
+ //鍙屽嚮杩斿洖鐢熶骇璧勬簮
+ function GetGySource(data) {
+ OptionData = data
+ }
</script>
\ No newline at end of file
--
Gitblit v1.9.1