From 78e05856cadeb0fc14923c236c3bc7ab80b3a98e Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 09 七月 2024 13:05:27 +0800
Subject: [PATCH] 工艺路线添加字段
---
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 169 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 147 insertions(+), 22 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 7748ea5..eb45a02 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"
@@ -133,6 +133,15 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹氶绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="HProcPriceType" id="HProcPriceType" lay-filter="HProcPriceType" style="width:200px;">
+ <option value="涓存椂瀹氶" selected="selected">涓存椂瀹氶</option>
+ <option value="姘镐箙瀹氶">姘镐箙瀹氶</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
<div class="layui-input-block" style="margin-left: 96px;">
<input type="checkbox" name="checkboxHStandard" id="checkboxHStandard" lay-skin="primary" lay-filter="checkboxHStandard" checked title="鏄惁榛樿宸ヨ壓">
<input type="hidden" value="true" name="HStandard" id="HStandard" lay-verify="HStandard">
@@ -433,7 +442,30 @@
<input type="checkbox" name="HSNCtrl" lay-filter="HSNCtrl" id="HSNCtrl{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
</div>
</script>
-
+ <!--澶嶉�夋 鏄惁棣栦欢-->
+ <script type="text/html" id="HQCFst">
+ <div class="layui-input-block" style="margin-left: 20px;">
+ <input type="checkbox" name="HQCFst" lay-filter="HQCFst" id="HQCFst{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+ </div>
+ </script>
+ <!--澶嶉�夋 鏄惁鏈-->
+ <script type="text/html" id="HQCProc">
+ <div class="layui-input-block" style="margin-left: 20px;">
+ <input type="checkbox" name="HQCProc" lay-filter="HQCProc" id="HQCProc{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+ </div>
+ </script>
+ <!--澶嶉�夋 鏄惁宸℃-->
+ <script type="text/html" id="HQCPatrol">
+ <div class="layui-input-block" style="margin-left: 20px;">
+ <input type="checkbox" name="HQCPatrol" lay-filter="HQCPatrol" id="HQCPatrol{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+ </div>
+ </script>
+ <!--澶嶉�夋 涓婃枡闃查敊鎺у埗-->
+ <script type="text/html" id="HMaterToSourceCtrl">
+ <div class="layui-input-block" style="margin-left: 20px;">
+ <input type="checkbox" name="HMaterToSourceCtrl" lay-filter="HMaterToSourceCtrl" id="HMaterToSourceCtrl{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+ </div>
+ </script>
<!--澶嶉�夋 鎺掍骇宸ュ簭鏍囪-->
<script type="text/html" id="HSortProcFlag">
<div class="layui-input-block" style="margin-left: 20px;">
@@ -507,6 +539,7 @@
, "HQCSchemeID_Fst": 0, "HQCSchemeNumber_Fst": "", "HQCSchemeName_Fst": ""
, "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
, "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
+ , "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false
}];
var HModName = "Gy_RoutingBill";
//#endregion
@@ -535,7 +568,7 @@
, { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', edit: 'text', width: 110, event: "CheckHSupID" }
, { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }//f7
, { field: 'HSupFlag', title: '澶栧崗鏍囪', templet: "#HSupFlag" }//checkbox
- , { field: 'HSortProcFlag', title: '鎺掍骇宸ュ簭鏍囪', templet: "#HSortProcFlag" }//checkbox
+ , { field: 'HSortProcFlag', title: '鎺掍骇宸ュ簭鏍囪', templet: "#HSortProcFlag", width: 120 }//checkbox
//, { field: 'HProcType', title: '宸ュ簭绫诲瀷', templet: '#HProcType' }//閫夋嫨
////, { field: 'HBadWHID', title: 'HBadWHID', hide: true }//, hide: true
@@ -548,18 +581,22 @@
//, { field: 'HPicNum', title: '鍥剧焊缂栧彿', edit: 'text' }
//, { field: 'HTimeUnit', title: '鏃堕棿鍗曚綅', edit: 'text' }
//, { field: 'HUnitTime', title: '杩愯鏃堕棿', edit: 'text' }
- , { field: 'HWorkQty', title: '鍔犲伐鏁伴噺', edit: 'text', totalRow: true }//榛樿
- , { field: 'HSNCtrl', title: 'SN杩囩珯鎺у埗', templet: "#HSNCtrl" }
+ , { field: 'HWorkQty', title: '鍔犲伐鏁伴噺', edit: 'text', totalRow: true, width: 120 }//榛樿
+ , { field: 'HSNCtrl', title: 'SN杩囩珯鎺у埗', templet: "#HSNCtrl", width: 120 }
+ , { field: 'HMaterToSourceCtrl', title: '涓婃枡闃查敊鎺у埗', templet: "#HMaterToSourceCtrl", width:120 }
+ , { field: 'HQCFst', title: '鏄惁棣栦欢', templet: "#HQCFst", width: 120 }
+ , { field: 'HQCProc', title: '鏄惁鏈', templet: "#HQCProc", width: 120 }
+ , { field: 'HQCPatrol', title: '鏄惁宸℃', templet: "#HQCPatrol", width: 120 }
- //, { field: 'HQCSchemeID_Fst', title: '棣栦欢妫�楠屾柟妗圛D', hide: true }//f7
- //, { field: 'HQCSchemeNumber_Fst', title: '棣栦欢妫�楠屾柟妗堜唬鐮�', edit: 'text', event: "HQCSchemeNumber_Fst",width:125 }
- //, { field: 'HQCSchemeName_Fst', title: '棣栦欢妫�楠屾柟妗堝悕绉�', width: 125 }//f7
- //, { field: 'HQCSchemeID_Proc', title: '杞簭妫�楠屾柟妗圛D', hide: true }//f7
- //, { field: 'HQCSchemeNumber_Proc', title: '杞簭妫�楠屾柟妗堜唬鐮�', edit: 'text', event: "HQCSchemeNumber_Proc", width: 125}
- //, { field: 'HQCSchemeName_Proc', title: '杞簭妫�楠屾柟妗堝悕绉�', width: 125}//f7
- //, { field: 'HQCSchemeID_Patrol', title: '宸℃妫�楠屾柟妗圛D', hide: true }//f7
- //, { field: 'HQCSchemeNumber_Patrol', title: '宸℃妫�楠屾柟妗堜唬鐮�', edit: 'text', event: "HQCSchemeNumber_Patrol", width: 125}
- //, { field: 'HQCSchemeName_Patrol', title: '宸℃妫�楠屾柟妗堝悕绉�', width: 125}//f7
+ , { field: 'HQCSchemeID_Fst', title: '棣栦欢妫�楠屾柟妗圛D', hide: true }//f7
+ , { field: 'HQCSchemeNumber_Fst', title: '棣栦欢妫�楠屾柟妗堜唬鐮�', edit: 'text', event: "HQCSchemeNumber_Fst", width: 125 }
+ , { field: 'HQCSchemeName_Fst', title: '棣栦欢妫�楠屾柟妗堝悕绉�', width: 125 }//f7
+ , { field: 'HQCSchemeID_Proc', title: '杞簭妫�楠屾柟妗圛D', hide: true }//f7
+ , { field: 'HQCSchemeNumber_Proc', title: '杞簭妫�楠屾柟妗堜唬鐮�', edit: 'text', event: "HQCSchemeNumber_Proc", width: 125 }
+ , { field: 'HQCSchemeName_Proc', title: '杞簭妫�楠屾柟妗堝悕绉�', width: 125 }//f7
+ , { field: 'HQCSchemeID_Patrol', title: '宸℃妫�楠屾柟妗圛D', hide: true }//f7
+ , { field: 'HQCSchemeNumber_Patrol', title: '宸℃妫�楠屾柟妗堜唬鐮�', edit: 'text', event: "HQCSchemeNumber_Patrol", width: 125 }
+ , { field: 'HQCSchemeName_Patrol', title: '宸℃妫�楠屾柟妗堝悕绉�', width: 125 }//f7
//, { field: 'HPassRate', title: '鑹巼', edit: 'text' }//榛樿
//, { field: 'HProcID_S', title: '宸ユ', edit: 'text' }
@@ -582,7 +619,7 @@
//, { field: 'HSubStdEmpQty', title: '鏍囧噯浜烘暟', edit: 'text' }
//, { field: 'HSubCanUseSourceQty', title: '鍙搷浣滆澶囨暟', edit: 'text' }
//, { field: 'HFixPrice', title: '鐝骇瀹氶', edit: 'text' }//榛樿
- //, { field: 'HProcPrice', title: '宸ュ簭宸ヤ环', edit: 'text' }//榛樿
+ , { field: 'HProcPrice', title: '宸ュ簭宸ヤ环', edit: 'text' }//榛樿
//, { field: 'HBadPrice', title: '涓嶅悎鏍煎崟浠�', edit: 'text' }//榛樿
//, { field: 'HWasterPrice', title: '鎶ュ簾鍗曚环', edit: 'text' }//榛樿
//, { field: 'HStdFlag', title: '鏍囧噯瀹氶', templet: "#HStdFlag" }//chenbox
@@ -814,7 +851,50 @@
}
});
});
-
+ //涓婃枡闃查敊鎺у埗
+ form.on('checkbox(HMaterToSourceCtrl)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HMaterToSourceCtrl = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //鏄惁棣栦欢
+ form.on('checkbox(HQCFst)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HQCFst = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //鏄惁鏈
+ form.on('checkbox(HQCProc)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HQCProc = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ ///鏄惁宸℃
+ form.on('checkbox(HQCPatrol)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HQCPatrol = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
//鎺掍骇宸ュ簭鏍囪
form.on('checkbox(HSortProcFlag)', function (data) {
//鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
@@ -911,6 +991,7 @@
, "HQCSchemeID_Fst": 0, "HQCSchemeNumber_Fst": "", "HQCSchemeName_Fst": ""
, "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
, "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
+ , "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false
};
switch (obj.event) {
case 'btn-AddLine':
@@ -927,6 +1008,22 @@
//SN杩囩珯鎺у埗
if (option.data[i - 1].HSNCtrl) {
$('#HSNCtrl' + i + '').attr("checked", true);
+ }
+ //涓婃枡闃查敊鎺у埗
+ if (option.data[i - 1].HMaterToSourceCtrl) {
+ $('#HMaterToSourceCtrl' + i + '').attr("checked", true);
+ }
+ //鏄惁棣栦欢
+ if (option.data[i - 1].HQCFst) {
+ $('#HQCFst' + i + '').attr("checked", true);
+ }
+ //鏄惁鏈
+ if (option.data[i - 1].HQCProc) {
+ $('#HQCProc' + i + '').attr("checked", true);
+ }
+ //鏄惁宸℃
+ if (option.data[i - 1].HQCPatrol) {
+ $('#HQCPatrol' + i + '').attr("checked", true);
}
//鎺掍骇宸ュ簭鏍囪
if (option.data[i - 1].HSortProcFlag) {
@@ -975,6 +1072,22 @@
//SN杩囩珯鎺у埗
if (option.data[i - 1].HSNCtrl) {
$('#HSNCtrl' + i + '').attr("checked", true);
+ }
+ //涓婃枡闃查敊鎺у埗
+ if (option.data[i - 1].HMaterToSourceCtrl) {
+ $('#HMaterToSourceCtrl' + i + '').attr("checked", true);
+ }
+ //鏄惁棣栦欢
+ if (option.data[i - 1].HQCFst) {
+ $('#HQCFst' + i + '').attr("checked", true);
+ }
+ //鏄惁鏈
+ if (option.data[i - 1].HQCProc) {
+ $('#HQCProc' + i + '').attr("checked", true);
+ }
+ //鏄惁宸℃
+ if (option.data[i - 1].HQCPatrol) {
+ $('#HQCPatrol' + i + '').attr("checked", true);
}
//鎺掍骇宸ュ簭鏍囪
if (option.data[i - 1].HSortProcFlag) {
@@ -1545,6 +1658,7 @@
, "HQCSchemeID_Fst": 0, "HQCSchemeNumber_Fst": "", "HQCSchemeName_Fst": ""
, "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
, "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
+ , "HQCFst": false, "HQCProc": false, "HQCPatrol": false,"HMaterToSourceCtrl":false
})
j++;
}
@@ -1858,17 +1972,15 @@
//缂栬緫 椤甸潰璧嬪��
function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
- var sWhere = " and hmainid='" + linterid + "'";
+
$.ajax({
- url: GetWEBURL() + "/LEMS/MES_Gy_RoutingBillList_Json",
+ url: GetWEBURL() + "/Gy_RoutingBill/cx",
type: "GET",
async: false,
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": HBillSubType },
+ data: { "HInterID": linterid },
success: function (d) {
-
//alert(JSON.stringify(d.data[0]))
//return false;
-
var IsHStopflag = d.data[0].榛樿宸ヨ壓;
if (IsHStopflag == 1) {
$("input[name='checkboxHStandard']").prop("checked", true);
@@ -1876,8 +1988,6 @@
else {
$("input[name='checkboxHStandard']").prop("checked", false);
}
-
-
//涓昏〃
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HBillNo": OperationType == 2 ? "" : d.data[0].鍗曟嵁鍙�
@@ -1911,6 +2021,7 @@
, "HProductNum": d.data[0].鎴愬搧缂栧彿
, "HVerNum": d.data[0].鐗堟湰
, "HOrgID": d.data[0].HOrgID
+ , "HProcPriceType": d.data[0].HProcPriceType == null ? "涓存椂瀹氶" : d.data[0].HProcPriceType
//鍏朵粬淇℃伅
, "hmakers": d.data[0].鍒跺崟浜�
, "hmakedate": d.data[0].鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍒跺崟鏃ユ湡), "yyyy-MM-dd")
@@ -1924,6 +2035,7 @@
//瀛愯〃 璧嬪��
var rowdata = [];
+ console.log(d.data)
for (var i = 0; i < d.data.length; i++) {
rowdata.push(
{
@@ -1942,6 +2054,7 @@
, "HQCSchemeID_Fst": d.data[i].HQCSchemeID_Fst, "HQCSchemeNumber_Fst": d.data[i].棣栦欢妫�楠屾柟妗堜唬鐮�, "HQCSchemeName_Fst": d.data[i].棣栦欢妫�楠屾柟妗�
, "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
}
)
}
@@ -1955,6 +2068,18 @@
if (d.data[i].SN杩囩珯鎺у埗) {
$('#HSNCtrl' + (i + 1)).attr("checked", true);
}
+ if (d.data[i].HQCFst) {
+ $('#HQCFst' + (i + 1)).attr("checked", true);
+ }
+ if (d.data[i].HQCProc) {
+ $('#HQCProc' + (i + 1)).attr("checked", true);
+ }
+ if (d.data[i].HQCPatrol) {
+ $('#HQCPatrol' + (i + 1)).attr("checked", true);
+ }
+ if (d.data[i].HMaterToSourceCtrl) {
+ $('#HMaterToSourceCtrl' + (i + 1)).attr("checked", true);
+ }
if (d.data[i].鎺掍骇宸ュ簭鏍囪) {
$('#HSortProcFlag' + (i + 1)).attr("checked", true);
}
--
Gitblit v1.9.1