From 8a36bbee40f5e1069b15a98b1e64ac9719ee8a46 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 23 四月 2024 17:17:13 +0800
Subject: [PATCH] 1.销售出库单 增加 反写源单 销售订单和发货通知单 超出 关联数量 关闭源单 2.应收单 增加 反写源单 销售出库单 和 销售订单 超出关联数量 关闭源单 3.动态获取源单增加参数 Num 0蓝单 1红单 2全部 4.销售流程的测试并完善功能； 销售订单-》发货通知单-》销售出库单-》应收单 （注意： 源单类型的下拉框 需要 根据数据库 表动态加载， 关联数量 要准确 ， 审核 且 未关闭 未行关闭的行 才能下推 ，关联数量超额后，要 反写 关闭 源单 ）
---
WebTM/views/工资管理/核算方式/Gy_ClassTimePrjSubBillEdit.html | 86 ++++++++++++++++++++++++++++++------------
1 files changed, 61 insertions(+), 25 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 8ca9337..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"
@@ -34,6 +34,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+ <button type="button" id="set_Calc" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_Calc">璁＄畻</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
</div>
</div>
@@ -41,10 +42,11 @@
<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="hparentName" id="hparentName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="hparentid" id="hparentid" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HEntryName" id="HEntryName" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HEntryID" id="HEntryID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HInterID" id="HInterID" value="0">
<button type="button" lay-submit="" class="layui-btn" lay-filter="hparent-BT" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -67,19 +69,19 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鎬婚噾棰�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HSumMoney" lay-verify="HSumMoney" id="HSumMoney" style="background-color:#efefef4d;" readonly>
+ <input class="layui-input" name="HSumMoney" lay-verify="HSumMoney" id="HSumMoney" value="0" style="background-color:#efefef4d;" readonly>
</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="HSumWorkTimes" lay-verify="HSumWorkTimes" id="HSumWorkTimes" style="background-color:#efefef4d;" readonly>
+ <input class="layui-input" name="HSumWorkTimes" lay-verify="HSumWorkTimes" id="HSumWorkTimes" value="0" style="background-color:#efefef4d;" readonly>
</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="HOldRate" lay-verify="HOldRate" id="HOldRate" style="background-color:#efefef4d;" readonly>
+ <input class="layui-input" name="HOldRate" lay-verify="HOldRate" id="HOldRate" value="0" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -87,16 +89,16 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鏃ュ钩鍧囧伐璧�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HDayRate" lay-verify="HDayRate" id="HDayRate" style="background-color:#efefef4d;" readonly>
+ <input class="layui-input" name="HDayRate" lay-verify="HDayRate" id="HDayRate" value="0" style="background-color:#efefef4d;" readonly>
</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="HRate" lay-verify="HRate" id="HRate" >
+ <input class="layui-input" name="HRate" lay-verify="HRate" value="0" id="HRate">
</div>
</div>
-
+
</div>
</div>
@@ -146,15 +148,15 @@
}
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
- $("#HItemID").val(0);
+ $("#HInterID").val(0);
}
else if (OperationType == 3) {//缂栬緫
- $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+ $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
//缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
RoadBillMain(linterid);
}
else if (OperationType == 4) {//娴忚
- $("#HItemID").val(linterid);//
+ $("#HInterID").val(linterid);//
//缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
RoadBillMain(linterid);
$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
@@ -173,7 +175,7 @@
Pub_Close(1);
})
-
+
//閫夋嫨鎵�灞炵粍鎸夐挳
form.on('submit(hparent-BT)', function () {
get_checkparent();
@@ -182,9 +184,45 @@
form.on('submit(set_SaveBill)', function (data) {
set_SaveBill(data);
});
+ //淇濆瓨鎸夐挳
+ form.on('submit(set_Calc)', function (data) {
+ set_Calc();
+ });
//#endregion
+ function set_Calc() {
+ var HEntryID = $("#HEntryID").val();
+ var HYear = $("#HYear").val();
+ var HPeriod = $("#HPeriod").val();
+ $.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(data.Message, { icon: 5 });
+ }
+ //layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err, { icon: 5 });
+ //console.log("Reason" + sMainStr);
+ }
+ });
+ }
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
@@ -217,13 +255,11 @@
// $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
//}
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HItemID": data.HItemID
- , "HName": data.HName
- , "HNumber": data.鏈堝害鏍哥畻璁板綍浠ｇ爜
+ "HInterID": data.HInterID
+ , "HEntryID": data.HEntryID
+ , "HEntryName": data.鏈堝害鏍哥畻璁板綍鍚嶇О
, "HYear": data.浼氳骞翠唤
, "HPeriod": data.浼氳鏈堜唤
- , "hparentName": data.缁勫悕绉�
- , "hparentid": data.缁勪唬鐮�
, "HSumMoney": data.鎬婚噾棰�
, "HSumWorkTimes": data.鎬诲熀鏁�
, "HOldRate": data.骞冲潎宸ヨ祫
@@ -246,8 +282,8 @@
//#region 淇濆瓨鏂规硶
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", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
@@ -258,8 +294,8 @@
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
- //淇濆瓨鍚庢祻瑙�
- //ReRoadBillMain();
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
}
else {
layer.alert(data.Message, { icon: 5 });
@@ -275,7 +311,7 @@
//#endregion
-
+
//#region 閫夋嫨鎵�灞炵粍鏂规硶
function get_checkparent() {
layer.open({
@@ -292,8 +328,8 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#hparentName").val(checkStatus.data[0].HName);
- $("#hparentid").val(checkStatus.data[0].HItemID);
+ $("#HEntryName").val(checkStatus.data[0].HName);
+ $("#HEntryID").val(checkStatus.data[0].HItemID);
//$("#HDeptNumber").val(checkStatus.data[0].HNumber);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
--
Gitblit v1.9.1