From 45012c55d231a88bd17d3e6bc8c19a9940266d4e Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 21 五月 2025 09:09:01 +0800
Subject: [PATCH] fix: 修正 客户分类复制页面 供应商分类复制页面 审核按钮禁用异常
---
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 63 +++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 17 deletions(-)
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index ab09f35..f432171 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -432,7 +432,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-block" style="margin-left: 185px;">
- <input type="checkbox" name="checkboxIsProNo" id="checkboxIsProNo" lay-skin="primary" lay-filter="checkboxIsProNo" title="杞伐搴�">
+ <input type="checkbox" name="checkboxIsProNo" id="checkboxIsProNo" lay-skin="primary" lay-filter="checkboxIsProNo" title="杞伐搴�" disabled="disabled">
<input type="hidden" value="1" name="IsProNo" id="IsProNo" lay-verify="IsProNo">
</div>
</div>
@@ -589,7 +589,7 @@
, "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
, "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
, "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false
- ,"HSubStdEmpAvg_S": 0
+ , "HSubStdEmpAvg_S": 0, "鏍囧噯宸ヤ环": 0,"HYDCoefficient": 0
}];
var HModName = "Gy_RoutingBill";
//#endregion
@@ -617,8 +617,10 @@
, { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }//f7
, { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', edit: 'text' }
, { field: 'HProcPrice', title: '宸ヤ环', edit: 'text' }
+ , { field: '鏍囧噯宸ヤ环', title: '鏍囧噯宸ヤ环' }
+ , { field: 'HYDCoefficient', title: '绾﹀綋绯绘暟', edit: 'text' }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
- , { field: 'HSupID', title: '渚涘簲鍟咺D', hide: true }
+ , { field: 'HSupID', title: '渚涘簲鍟咺D', hide: true }
, { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', edit: 'text', width: 110, event: "CheckHSupID" }
, { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }//f7
, { field: 'HSupFlag', title: '澶栧崗鏍囪', templet: "#HSupFlag" }//checkbox
@@ -1209,7 +1211,7 @@
, "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
, "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
, "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false
- , "HSubStdEmpAvg_S": 0
+ , "HSubStdEmpAvg_S": 0, "鏍囧噯宸ヤ环": 0, "HYDCoefficient": 0
};
switch (obj.event) {
case 'btn-AddLine':
@@ -1398,6 +1400,14 @@
//table.render(option)
}
break;
+ case 'HWorkQty': //绾﹀綋绯绘暟
+ if (localStorage["HBenchmarkValue"] != undefined && localStorage["HBenchmarkValue"] != null && data.HWorkQty > 0) {
+ obj.update({
+ HYDCoefficient: (localStorage["HBenchmarkValue"] / data.HWorkQty).toFixed(6)
+ });
+ }
+ break;
+
}
})
@@ -1832,9 +1842,9 @@
var wait = layer.load();
var HInterID = $("#HInterID").val();
$.ajax({
- url: GetWEBURL() + '/Gy_RoutingBill/AuditGy_RoutingBill',
+ url: GetWEBURL() + '/Gy_RoutingBill/CheckGy_RoutingBill',
type: "GET",
- data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": HInterID, "Type": 1, "user": sessionStorage["HUserName"], "HBillSubType": "3301"},
success: function (result) {
if (result.count == 1) {
//妫�鏌ユ槸鍚﹀叿澶囧惎鐢ㄩ粯璁ゅ伐鑹鸿矾绾跨殑鏉冮檺锛屽瓨鍦紝鍒欏脊绐楁彁闂�
@@ -1888,11 +1898,12 @@
//鍙嶅鏍�
function set_AbandonCheck() {
layer.confirm("纭瑕佸弽瀹℃牳鍚�?", function (index) {
+ var HInterID = $("#HInterID").val();
var wait = layer.load();
$.ajax({
- url: GetWEBURL() + '/Gy_RoutingBill/AuditGy_RoutingBill',
+ url: GetWEBURL() + '/Gy_RoutingBill/CheckGy_RoutingBill',
type: "GET",
- data: { "HInterID": $("#HInterID").val(), "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": HInterID, "Type": 2, "user": sessionStorage["HUserName"], "HBillSubType": "3301" },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -1912,11 +1923,12 @@
//鍏抽棴
function set_CloseBill() {
layer.confirm("纭瑕佸叧闂悧?", function (index) {
+ var HInterID = $("#HInterID").val();
var wait = layer.load();
$.ajax({
- url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill',
+ url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill_1',
type: "GET",
- data: { "HInterID": $("#HInterID").val(), "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": HInterID, "Type": 1, "user": sessionStorage["HUserName"], "HBillSubType": "" },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -1936,11 +1948,12 @@
//鍙嶅叧闂�
function set_CancelCloseBill() {
layer.confirm("纭瑕佸弽鍏抽棴鍚�?", function (index) {
+ var HInterID = $("#HInterID").val();
var wait = layer.load();
$.ajax({
- url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill',
+ url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill_1',
type: "GET",
- data: { "HInterID": $("#HInterID").val(), "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": HInterID, "Type": 1, "user": sessionStorage["HUserName"], "HBillSubType": "" },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -2059,6 +2072,7 @@
//#region 澶嶅埗
function set_Copy() {
+ $('#btnSave').removeClass("layui-btn-disabled").attr("disabled", false);
//鍒跺崟浜�
$("#HMaker").val(sessionStorage["HUserName"]);
$("#hmakers").val(sessionStorage["HUserName"]);
@@ -2220,6 +2234,9 @@
option.data[i]["宸ヤ綔涓績浠ｇ爜"] = WorkCente[j]["宸ヤ綔涓績浠ｇ爜"];
option.data[i]["HProcID_S"] = checkStatus.data[j]["HProcMulID"];
option.data[i]["宸ユ"] = checkStatus.data[j]["宸ユ鍚嶇О"];
+ option.data[i]["鏍囧噯宸ヤ环"] = checkStatus.data[j]["鏍囧噯宸ヤ环"];
+
+
j++;
}
@@ -2242,7 +2259,7 @@
, "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
, "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
, "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false
- , "HSubStdEmpAvg_S": 0
+ , "HSubStdEmpAvg_S": 0, "鏍囧噯宸ヤ环": 0, "HYDCoefficient": 0
})
j++;
}
@@ -2258,6 +2275,9 @@
option.data[i]["宸ヤ綔涓績浠ｇ爜"] = WorkCente[j]["宸ヤ綔涓績浠ｇ爜"];
option.data[i]["HProcID_S"] = checkStatus.data[j]["HProcMulID"];
option.data[i]["宸ユ"] = checkStatus.data[j]["宸ユ鍚嶇О"];
+ option.data[i]["鏍囧噯宸ヤ环"] = checkStatus.data[j]["鏍囧噯宸ヤ环"];
+ option.data[i]["HWorkQty"] = option.data[i]["HProcPrice"] != 0 ? (checkStatus.data[j]["鏍囧噯宸ヤ环"] / option.data[i]["HProcPrice"]).toFixed(2) : option.data[i]["HWorkQty"];
+ option.data[i]["HYDCoefficient"] = (localStorage["HBenchmarkValue"] / (option.data[i]["HProcPrice"] != 0 ? (checkStatus.data[j]["鏍囧噯宸ヤ环"] / option.data[i]["HProcPrice"]).toFixed(2) : option.data[i]["HWorkQty"])).toFixed(6)//绾﹀綋绯绘暟=鍩哄噯鍊�/灏忔椂浜ц兘
j++;
}
}
@@ -2290,6 +2310,10 @@
, "宸ヤ綔涓績浠ｇ爜": OptionData[0].宸ヤ綔涓績浠ｇ爜
, "HProcID_S": OptionData[0].HProcMulID
, "宸ユ": OptionData[0].宸ユ鍚嶇О
+ , "鏍囧噯宸ヤ环": OptionData[0].鏍囧噯宸ヤ环
+ , "HWorkQty": obj.data.HProcPrice != 0 ? (OptionData[0].鏍囧噯宸ヤ环 / obj.data.HProcPrice).toFixed(2) : obj.data.HWorkQty
+ , "HYDCoefficient": (localStorage["HBenchmarkValue"] / (obj.data.HProcPrice != 0 ? (OptionData[0].鏍囧噯宸ヤ环 / obj.data.HProcPrice).toFixed(2) : obj.data.HWorkQty)).toFixed(6)
+
})
OptionData = [];
}
@@ -2608,7 +2632,7 @@
$.ajax({
url: GetWEBURL() + '/Gy_Process/list',
type: "GET",
- data: { "sWhere": sWhere, "user": '缈佹稕娑�'},
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
async: false,
success: function (data1) {
if (data1.count == 1) {
@@ -2652,7 +2676,7 @@
//鏌ヨ宸ヤ綔涓績鐨勬暟鎹�
var WorkCente = [];
- var sWhere = "select isnull(a.HItemID,'') HCenterID, isnull(a.HNumber,'') 宸ヤ綔涓績浠ｇ爜, isnull(a.HName,'') 宸ヤ綔涓績鍚嶇О ,p.HItemID HProcID,p.HName 宸ュ簭鍚嶇О from Gy_Process p left join Gy_WorkCenter a on p.HWorkCenterID=a.HItemID where p.HNumber in (" + ProcessNumber.toString() + ") order by p.HNumber ";
+ var sWhere = "select isnull(a.HItemID,'') HCenterID, isnull(a.HNumber,'') 宸ヤ綔涓績浠ｇ爜, isnull(a.HName,'') 宸ヤ綔涓績鍚嶇О ,p.HItemID HProcID,p.HName 宸ュ簭鍚嶇О,p.HStandardWages 鏍囧噯宸ヤ环 from Gy_Process p left join Gy_WorkCenter a on p.HWorkCenterID=a.HItemID where p.HNumber in (" + ProcessNumber.toString() + ") order by p.HNumber ";
$.ajax({
type: "GET",
url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
@@ -2687,6 +2711,9 @@
option.data[i]["宸ヤ綔涓績浠ｇ爜"] = WorkCente[j]["宸ヤ綔涓績浠ｇ爜"];
option.data[i]["HProcID_S"] = data.data[j]["HProcMulID"];
option.data[i]["宸ユ"] = data.data[j]["宸ユ鍚嶇О"];
+ option.data[i]["鏍囧噯宸ヤ环"] = WorkCente[j]["鏍囧噯宸ヤ环"];
+ option.data[i]["HYDCoefficient"] = (localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6);
+
j++;
}
@@ -2709,7 +2736,7 @@
, "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
, "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
, "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false
- , "HSubStdEmpAvg_S": 0
+ , "HSubStdEmpAvg_S": 0, "鏍囧噯宸ヤ环": 0, "HYDCoefficient": 0
})
j++;
}
@@ -2725,6 +2752,8 @@
option.data[i]["宸ヤ綔涓績浠ｇ爜"] = WorkCente[j]["宸ヤ綔涓績浠ｇ爜"];
option.data[i]["HProcID_S"] = data.data[j]["HProcMulID"];
option.data[i]["宸ユ"] = data.data[j]["宸ユ鍚嶇О"];
+ option.data[i]["鏍囧噯宸ヤ环"] = WorkCente[j]["鏍囧噯宸ヤ环"];
+ option.data[i]["HYDCoefficient"] = (localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6);
j++;
}
}
@@ -2829,7 +2858,7 @@
, "HQCSchemeID_Proc": d.data[i].HQCSchemeID_Proc, "HQCSchemeNumber_Proc": d.data[i].杞簭妫�楠屾柟妗堜唬鐮�, "HQCSchemeName_Proc": d.data[i].杞簭妫�楠屾柟妗�
, "HQCSchemeID_Patrol": d.data[i].HQCSchemeID_Patrol, "HQCSchemeNumber_Patrol": d.data[i].宸℃妫�楠屾柟妗堜唬鐮�, "HQCSchemeName_Patrol": d.data[i].宸℃妫�楠屾柟妗�
, "HQCFst": d.data[i].HQCFst == 1 ? true : false, "HQCProc": d.data[i].HQCProc == 1 ? true : false, "HQCPatrol": d.data[i].HQCPatrol == 1 ? true : false, "HMaterToSourceCtrl": d.data[i].HMaterToSourceCtrl == 1 ? true : false
- , "HSubStdEmpAvg_S": d.data[i].浜哄潎浜ц兘
+ , "HSubStdEmpAvg_S": d.data[i].浜哄潎浜ц兘, "鏍囧噯宸ヤ环": d.data[i].鏍囧噯宸ヤ环, "HYDCoefficient": d.data[i].绾﹀綋绯绘暟
}
)
}
--
Gitblit v1.9.1