From e7a42dd70ac5df2eafab9c55dd21891acccdfdae Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期一, 13 三月 2023 15:06:22 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 277 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 170 insertions(+), 107 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index 727180a..37b427a 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -102,11 +102,11 @@
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">浜у搧鍚嶇О</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HMaterName2" id="HMaterName2" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HMaterName2" id="HMaterName2" onmouseover="this.title=this.value" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
<input type="hidden" name="HMaterID2" id="HMaterID2" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater2" id="btnSearchMater2" style="width: 40px;">
+ <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater2" id="btnSearchMater2" style="width: 40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ </button>-->
</div>
</div>
<div class="layui-col-xs3 layui-inline">
@@ -214,10 +214,10 @@
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">閫夊崟鍙�</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="textBox2" id="textBox2" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" style="width: 40px;">
+ <input type="text" class="layui-input" name="textBox2" id="textBox2" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
+ <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" style="width: 40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ </button>-->
</div>
</div>
<div class="layui-col-xs3 layui-inline">
@@ -446,7 +446,7 @@
<div class="layui-col-xs6 layui-inline">
<label class="layui-form-label" style="width:12.5%">澶囨敞</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:610px;">
+ <input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width: 610px; background-color: #efefef4d;" readonly>
</div>
</div>
<div class="layui-col-xs3 layui-inline">
@@ -460,8 +460,9 @@
</div>
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">琛ユ枡鏍囪</label>
- <div class="layui-input-block">
- <input type="checkbox" name="HBLFlag" id="HBLFlag" lay-skin="primary" title="" checked="">
+ <div class="layui-input-inline">
+ <input type="checkbox" name="isHBLFlag" id="isHBLFlag" value="false" lay-skin="primary" lay-filter="isHBLFlag">
+ <input type="hidden" name="HBLFlag" id="HBLFlag" value="false" lay-skin="primary" lay-filter="HBLFlag">
</div>
</div>
</div>
@@ -481,8 +482,8 @@
<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="HSeOrderBillNo" id="HSeOrderBillNo">
- <input type="hidden" class="layui-input" name="HSeOrderEntryID" id="HSeOrderEntryID">
- <input type="hidden" class="layui-input" name="HSeOrderInterID" id="HSeOrderInterID">
+ <!--<input type="hidden" class="layui-input" name="HSeOrderEntryID" id="HSeOrderEntryID">
+ <input type="hidden" class="layui-input" name="HSeOrderInterID" id="HSeOrderInterID">-->
</div>
</div>
<div class="layui-inline">
@@ -717,8 +718,8 @@
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
<!--琛屼笅鎷夐�夋嫨(鏄惁濮斿)-->
- <script type="text/html" id="isEntrust">
- <select name="isEntrust" lay-filter="isEntrust" id="isEntrust{{d.LAY_TABLE_INDEX+1}}">
+ <script type="text/html" id="HSupFlag">
+ <select name="HSupFlag" lay-filter="HSupFlag" id="HSupFlag{{d.LAY_TABLE_INDEX+1}}">
<option value="false">鍚�</option>
<option value="true">鏄�</option>
</select>
@@ -764,6 +765,10 @@
//#region 杩涘叆椤甸潰鍗冲姞杞�
+ $("#HPlanBeginDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HPlanEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HPlanSendGoodsDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+
//鍒濆鍖栬〃鏍�
set_InitGrid();
DisPlay_HideColumn();
@@ -787,7 +792,7 @@
"HProcNo": "", "HProcID": 0, "HProcNumber": "", "HProcName": "", "HWorkRemark": "",
"HCenterID": 0, "HCenterNumber": "", "HCenterName": "",
"HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
- "HSupID": 0, "HSupNumber": "", "HSupName": "", "isEntrust": "false",
+ "HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
"HQty": 0, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
"HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
@@ -797,44 +802,59 @@
else if (OperationType == 2) {//鏈夋簮鍗曟柊澧�
$("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
$("#HEntryID").val(HEntryID);//淇敼鏃跺瓙琛↖D
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '3772' },
- success: function (d) {
- //console.log(d.data);
- $("#HInterID").val(d.data[0].HInterID);
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
- $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
- $("#HMaker").val(sessionStorage["HUserName"]);
- }
- });
+ //鍒ゆ柇鐢熶骇璁㈠崟鏄惁瀹℃牳
$.ajax({
- url: GetWEBURL() + "/Sc_WorkBillSortBill/Sc_WorkBillSortBillList",
- type: "GET",
- data: { "sWhere": " and 婧愬崟涓诲唴鐮�='" + linterid + "' and 婧愬崟瀛愬唴鐮�='" + HEntryID + "' ", "user": sessionStorage["HUserName"] },
- success: function (d) {
- if (d.data[0] != null) {
- $("#HWorkBillSortNo").val(d.data[0].鍗曟嵁鍙�);
+ type: "get",
+ url: GetWEBURL() + "/LEMS/ICMOBillCheck",
+ data: { "hmainid": linterid, "HEntryID": HEntryID, "OrganizationID": sessionStorage["OrganizationID"] },
+ async: false,
+ success: function (result) {
+ if (result.count == 0) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.alert(result.Message, { icon: 5 });
+ } else {
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3772' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ }
+ });
+
+ $.ajax({
+ url: GetWEBURL() + "/Sc_WorkBillSortBill/Sc_WorkBillSortBillList",
+ type: "GET",
+ data: { "sWhere": " and 婧愬崟涓诲唴鐮�='" + linterid + "' and 婧愬崟瀛愬唴鐮�='" + HEntryID + "' ", "user": sessionStorage["HUserName"] },
+ success: function (d) {
+ if (d.data[0] != null) {
+ $("#HWorkBillSortNo").val(d.data[0].鍗曟嵁鍙�);
+ }
+ }
+ })
+
+
+
+ GetICMOBillValue(linterid, HEntryID);
+ option.data = [{
+ "HProcNo": "", "HProcID": 0, "HProcNumber": "", "HProcName": "", "HWorkRemark": "",
+ "HCenterID": 0, "HCenterNumber": "", "HCenterName": "",
+ "HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
+ "HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
+ "HQty": 0, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
+ "HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
+ "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
+ }];
+ table.render(option);
}
+ layer.closeAll("loading");
}
})
-
-
-
- GetICMOBillValue(linterid, HEntryID);
- option.data = [{
- "HProcNo": "", "HProcID": 0, "HProcNumber": "", "HProcName": "", "HWorkRemark": "",
- "HCenterID": 0, "HCenterNumber": "", "HCenterName": "",
- "HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
- "HSupID": 0, "HSupNumber": "", "HSupName": "", "isEntrust": "false",
- "HQty": 0, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
- "HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
- "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
- }];
- table.render(option);
}
else if (OperationType == 3) {//缂栬緫
$("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
@@ -867,21 +887,21 @@
, { field: 'HSupID', title: '渚涘簲鍟咺D', hide: true }
, { field: 'HSupNumber', title: '渚涘簲鍟嗕唬鐮�', edit: 'text', event: "HSupCheck" }
, { field: 'HSupName', title: '渚涘簲鍟�' }
- , { field: 'isEntrust', title: '鏄惁濮斿', templet: '#isEntrust' }
- , { field: 'HQty', title: '娴佹按鍗℃暟閲�', edit: 'text' }
+ , { field: 'HSupFlag', title: '鏄惁濮斿', templet: '#HSupFlag' }
+ , { field: 'HQty', title: '娴佽浆鍗℃暟閲�', edit: 'text' }
, { field: 'HOutPrice', title: '鍔犲伐鍗曚环', edit: 'text' }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
- , { field: 'HRelationQty_In', title: '杩涚珯鏁伴噺', edit: 'text' }
- , { field: 'HRelationQty_Out', title: '鍑虹珯鏁伴噺', edit: 'text' }
- , { field: 'HRelationQty_WWOrder', title: '濮斿宸ュ崟鏁伴噺', edit: 'text' }
- , { field: 'HRelationQty_Bad', title: '涓嶅悎鏍兼暟閲�', edit: 'text' }
- , { field: 'HOverRate', title: '瓒呴姣斾緥', edit: 'text', event: "HOverRate" }
- , { field: 'HMaxQty', title: '鏈�楂樹笂闄�', edit: 'text', edit: 'false', }
- , { field: 'HPassRate', title: '鑹巼', edit: 'text' }
- , { field: 'HSumPassRate', title: '绱鑹巼', edit: 'text' }
- , { field: 'HPicNum', title: '鍥剧焊缂栧彿', edit: 'text' }
- , { field: 'HProcCheckNote', title: '鏈伐搴忕‘璁よ褰�', edit: 'text', width: 500 }
- , { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', edit: 'text', width: 1200 }
+ , { field: 'HRelationQty_In', title: '杩涚珯鏁伴噺', style:"background-color: #e6e6e6" }
+ , { field: 'HRelationQty_Out', title: '鍑虹珯鏁伴噺', style: "background-color: #e6e6e6"}
+ , { field: 'HRelationQty_WWOrder', title: '濮斿宸ュ崟鏁伴噺', style: "background-color: #e6e6e6" }
+ , { field: 'HRelationQty_Bad', title: '涓嶅悎鏍兼暟閲�', style: "background-color: #e6e6e6" }
+ , { field: 'HOverRate', title: '瓒呴姣斾緥', event: "HOverRate", style: "background-color: #e6e6e6"}
+ , { field: 'HMaxQty', title: '鏈�楂樹笂闄�', style: "background-color: #e6e6e6" }
+ , { field: 'HPassRate', title: '鑹巼', style: "background-color: #e6e6e6" }
+ , { field: 'HSumPassRate', title: '绱鑹巼', style: "background-color: #e6e6e6" }
+ , { field: 'HPicNum', title: '鍥剧焊缂栧彿', style: "background-color: #e6e6e6"}
+ , { field: 'HProcCheckNote', title: '鏈伐搴忕‘璁よ褰�', width: 500, style: "background-color: #e6e6e6"}
+ , { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', width: 500, style: "background-color: #e6e6e6"}
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
];
option = {
@@ -903,7 +923,7 @@
var dataIndex = $cr.attr("data-index");
$.each(option.data, function (index, value) {
if (value.LAY_TNDEX == dataIndex) {
- $cr.find('input').val(value.isEntrust);
+ $cr.find('input').val(value.HSupFlag);
}
});
});
@@ -924,7 +944,7 @@
"HProcNo": "", "HProcID": 0, "HProcNumber": "", "HProcName": "", "HWorkRemark": "",
"HCenterID": 0, "HCenterNumber": "", "HCenterName": "",
"HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
- "HSupID": 0, "HSupNumber": "", "HSupName": "", "isEntrust": "false",
+ "HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
"HQty": 0, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
"HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
@@ -935,7 +955,7 @@
option.data = table.cache["mainTable"];
table.render(option);
for (var i = 1; i <= option.data.length; i++) {
- $('#isEntrust' + i + '').find("option[value='" + option.data[i - 1].isEntrust + "']").attr("selected", true);
+ $('#HSupFlag' + i + '').find("option[value='" + option.data[i - 1].HSupFlag + "']").attr("selected", true);
}
form.render('select');
break;
@@ -954,7 +974,7 @@
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
for (var i = 1; i <= option.data.length; i++) {
- $('#isEntrust' + i + '').find("option[value='" + option.data[i - 1].isEntrust + "']").attr("selected", true);
+ $('#HSupFlag' + i + '').find("option[value='" + option.data[i - 1].HSupFlag + "']").attr("selected", true);
}
form.render('select');
}
@@ -1087,7 +1107,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+ content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -1097,9 +1117,9 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
obj.update({
- HDeptName: checkStatus.data[0].HName
+ HDeptName: checkStatus.data[0].閮ㄩ棬鍚嶇О
, HDeptID: checkStatus.data[0].HItemID
- , HDeptNumber: checkStatus.data[0].HNumber
+ , HDeptNumber: checkStatus.data[0].閮ㄩ棬浠ｇ爜
});
layer.close(layer.index);
}
@@ -1135,6 +1155,19 @@
, isEditValue: flagValue
});
}
+ });
+
+ $("#HQty").on("input", function (e) {
+ //鑾峰彇input杈撳叆鐨勫��
+ if (parseInt(e.delegateTarget.value)> parseInt($("#HPlanQty").val())) {
+ return layer.msg("鎷嗗垎鏁伴噺涓嶈兘瓒呰繃鍙媶鍒嗘暟閲�!");
+ }
+ else {
+ for (var i = 0; i < option.data.length; i++) {
+ option.data[i]["HQty"] = e.delegateTarget.value;
+ }
+ }
+ table.render(option);
});
//鐩戝惉鍗曞厓鏍肩紪杈� 鍗曞厓鏍肩紪杈戝悗 鍙樻洿
@@ -1346,6 +1379,11 @@
});
});
+ //琛ユ枡鏍囪
+ form.on('checkbox(isHBLFlag)', function (data) {
+ $("#HBLFlag").val(data.elem.checked);
+ });
+
//杞﹂棿寮圭獥
form.on('submit(HWorkShopList)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -1502,28 +1540,28 @@
data: { "sWhere": " and 鍗曟嵁鍙�='" + HBillNo + "'", "user": sessionStorage["HUserName"] },
success: function (result) {
var data = result.data;
- var Tablerow = [];
+ var Tablerow = [];
- $("#RoutingBill").val(data[0].鍗曟嵁鍙�)
- $("#HRoutingBillID").val(data[0].hmainid)
+ $("#RoutingBill").val(data[0].鍗曟嵁鍙�)
+ $("#HRoutingBillID").val(data[0].hmainid)
- for (var i = 0; i < data.length; i++) {
- Tablerow.push({
- "HProcNo": data[i].宸ュ簭鍙�, "HProcID": data[i].hprocid, "HProcNumber": data[i].宸ュ簭浠ｇ爜, "HProcName": data[i].宸ュ簭, "HWorkRemark": data[i].琛ㄤ綋澶囨敞,
- "HCenterID": data[i].HCenterID, "HCenterNumber": data[i].宸ヤ綔涓績浠ｇ爜, "HCenterName": data[i].宸ヤ綔涓績鍚嶇О,
- "HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
- "HSupID": data[i].HSupID, "HSupNumber": data[i].渚涘簲鍟嗕唬鐮�, "HSupName": data[i].渚涘簲鍟�, "isEntrust": data[i].濮斿鏍囪 == 0 ? "false" : "true",
- "HQty": HLZQty, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
- "HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
- "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": data[i].宸ヨ壓鍙傛暟, "HPicNum": data[i].鍥剧焊缂栧彿, "HProcCheckNote": data[i].鏈伐搴忕‘璁よ褰�
- });
- }
- option.data = Tablerow;
- table.render(option);
- for (var i = 1; i <= data.length; i++) {
- $('#isEntrust' + i + '').find("option[value='" + (data[i - 1].濮斿鏍囪 == "0" ? "false" : "true") + "']").attr("selected", true);
- }
- form.render('select');
+ for (var i = 0; i < data.length; i++) {
+ Tablerow.push({
+ "HProcNo": data[i].宸ュ簭鍙�, "HProcID": data[i].hprocid, "HProcNumber": data[i].宸ュ簭浠ｇ爜, "HProcName": data[i].宸ュ簭, "HWorkRemark": data[i].琛ㄤ綋澶囨敞,
+ "HCenterID": data[i].HCenterID, "HCenterNumber": data[i].宸ヤ綔涓績浠ｇ爜, "HCenterName": data[i].宸ヤ綔涓績鍚嶇О,
+ "HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
+ "HSupID": data[i].HSupID, "HSupNumber": data[i].渚涘簲鍟嗕唬鐮�, "HSupName": data[i].渚涘簲鍟�, "HSupFlag": data[i].濮斿鏍囪 == 0 ? "false" : "true",
+ "HQty": HLZQty, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
+ "HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
+ "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": data[i].宸ヨ壓鍙傛暟, "HPicNum": data[i].鍥剧焊缂栧彿, "HProcCheckNote": data[i].鏈伐搴忕‘璁よ褰�
+ });
+ }
+ option.data = Tablerow;
+ table.render(option);
+ for (var i = 1; i <= data.length; i++) {
+ $('#HSupFlag' + i + '').find("option[value='" + (data[i - 1].濮斿鏍囪 == "0" ? "false" : "true") + "']").attr("selected", true);
+ }
+ form.render('select');
},
error: function (result) {
layer.close(index);
@@ -1581,7 +1619,7 @@
layer.msg("绗�" + indexRow + "琛岋紝宸ヤ綔涓績涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- if (sSubTable[i].isEntrust == "true") {
+ if (sSubTable[i].HSupFlag == "true") {
if (!sSubTable[i].HSupID) {
var indexRow = i + 1;
layer.msg("绗�" + indexRow + "琛岋紝渚涘簲鍟嗕笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -1590,8 +1628,8 @@
}
}
data.field.HPRDORGID = sessionStorage["OrganizationID"];//缁勭粐
- var HBLFlag = document.getElementById("HBLFlag").checked;
- HBLFlag == "on" ? data.field.HBLFlag = 'true' : data.field.HBLFlag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+ //var HBLFlag = data.field.HBLFlag;
+ //HBLFlag == "on" ? data.field.HBLFlag = 'true' : data.field.HBLFlag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(sSubTable);
var flag = "xz";
@@ -1651,6 +1689,7 @@
}
})
}
+
//鏄剧ず鍒楁暟鎹�
function DisPlay_HideColumn() {
@@ -1752,7 +1791,7 @@
"HProcNo": "", "HProcID": 0, "HProcNumber": "", "HProcName": "", "HWorkRemark": "",
"HCenterID": 0, "HCenterNumber": "", "HCenterName": "",
"HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
- "HSupID": 0, "HSupNumber": "", "HSupName": "", "isEntrust": "false",
+ "HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
"HQty": 0, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
"HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
@@ -1794,12 +1833,17 @@
, "HEquipMentName": data.璁惧鍚嶇О
, "HEquipMentID": data.HEquipMentID
, "HProductNum": data.鎴愬搧缂栧彿
- , "HExplanation": data.琛ユ枡鍘熷洜
- , "HBLFlag": data.琛ユ枡鏍囪
+ , "HExplanation": data.鎽樿
+
, "HProjectNum": data.椤圭洰缂栧彿
, "HVerNum": data.鐗堟湰
, "HRemark": data.琛ㄥご澶囨敞
, "HMateOutBatchNo": data.鍘熸枡鎵规
+ , "HXTNumber": data.鑺綋鐗╂枡浠ｇ爜
+ , "HXTModel": data.鑺綋瑙勬牸鍨嬪彿
+ , "HCusNumber": data.婧愬崟瀹㈡埛浠ｇ爜
+ , "HRoutingBillID": data.HRoutingBillID
+ , "RoutingBill": data.宸ヨ壓璺嚎
, "HWorkShopName": data.鐢熶骇杞﹂棿
@@ -1818,13 +1862,15 @@
, "HprocExQty": data.鐢熶骇鏁伴噺
, "HKeyMaterID": data.鍏抽敭鏉愭枡
, "HICMOEntryID": data.HICMOEntryID
+
+
, "HProdMaterCode": data.浜у搧CODE
, "HSeOrderBillNo": data.閿�鍞鍗曞彿
- , "HSeOrderEntryID": data.HSeOrderEntryID
- , "HSeOrderInterID": data.HSeOrderInterID
+ //, "HSeOrderEntryID": data.HSeOrderEntryID
+ //, "HSeOrderInterID": data.HSeOrderInterID
, "HCusShortName": data.瀹㈡埛绠�绉�
, "HCusNeedMaterial": data.瀹㈡埛瑕佹眰鏉愭枡鎴愬垎
- , "HPlanSendGoodsDate": data.棰勮鍑鸿揣鏃ユ湡
+ , "HPlanSendGoodsDate": formatDate(data.棰勮鍑鸿揣鏃ユ湡)
, "HProdMaterName": data.浜у搧鍚嶇О2
, "HCusName": data.瀹㈡埛鍚嶇О
, "HWorkRemark": data.鐢熶骇澶囨敞
@@ -1844,17 +1890,18 @@
, "HChecker": data.瀹℃牳浜�
, "HCloseMan": data.鍏抽棴浜�
, "HMakeDate": formatDate(data.鍒跺崟鏃ユ湡)
- , "HCheckDate": formatDate(data.瀹℃牳鏃ユ湡)
- , "HCloseDate": formatDate(data.鍏抽棴鏃ユ湡)
+ , "HCheckDate": data.瀹℃牳浜� == "" ? "" : formatDate(data.瀹℃牳鏃ユ湡)
+ , "HCloseDate": data.鍏抽棴浜� == "" ? "" : formatDate(data.鍏抽棴鏃ユ湡)
, "HUpDater": data.淇敼浜�
, "HDeleteMan": data.浣滃簾浜�
- , "HUpDateDate": formatDate(data.淇敼鏃ユ湡)
- , "HDeleteDate": formatDate(data.浣滃簾鏃ユ湡)
- , "HCusNumber": data.婧愬崟瀹㈡埛缂栫爜
+ , "HUpDateDate": data.淇敼浜� == "" ? "" : formatDate(data.淇敼鏃ユ湡)
+ , "HDeleteDate": data.浣滃簾浜� == "" ? "" : formatDate(data.浣滃簾鏃ユ湡)
, "HPickLabel": data.鍖呰鏍囪瘑
, "HPickLabelNumber": data.鍖呰鏍囪瘑缂栫爜
-
});
+ $("#HBLFlag").val(data.琛ユ枡鏍囪 ? "true" : "false");
+ $("input[name='isHBLFlag']").prop("checked", data.琛ユ枡鏍囪);//true:閫変腑 false:涓嶉�変腑
+ form.render("checkbox");
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
@@ -1888,6 +1935,10 @@
if (result.count == 1) {
option.data = result.data;
table.render(option);
+ for (var i = 0; i < result.data.length; i++) {
+ $('#HSupFlag' + (i + 1)).find("option[value='" + result.data[i].HSupFlag + "']").attr("selected", true);
+ }
+ form.render('select');
} else {
layer.alert(result.code + result.Message, { icon: 5 });
@@ -2067,7 +2118,9 @@
$("#HPickLabelNumber").val(data.鍖呰鏍囪瘑缂栫爜);
$("#HXTNumber").val(data.鑺綋鐗╂枡浠ｇ爜);
$("#HXTModel").val(data.鑺綋瑙勬牸鍨嬪彿);
- $("input[name='HBLFlag']").prop("checked", result.data[0].HBLFlag == 0 ? false : true);//true:閫変腑 false:涓嶉�変腑
+ $("#HBLFlag").val(result.data[0].HBLFlag == 0 ? false : true);
+ $("input[name='isHBLFlag']").prop("checked", result.data[0].HBLFlag);//true:閫変腑 false:涓嶉�変腑
+ form.render("checkbox");
btnHMaterID = data.hmaterid;
$.ajax({
@@ -2080,8 +2133,18 @@
var hbillno = result.data[0].鍗曟嵁鍙�
HLZQty = data.娴佽浆鍗℃暟閲�;
getRoutingBill(hbillno);
+ } else {
+ option.data = [{
+ "HProcNo": "", "HProcID": 0, "HProcNumber": "", "HProcName": "", "HWorkRemark": "",
+ "HCenterID": 0, "HCenterNumber": "", "HCenterName": "",
+ "HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
+ "HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
+ "HQty": 0, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
+ "HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
+ "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
+ }];
+ table.render(option);
}
-
},
error: function (result) {
layer.close(index);
@@ -2110,7 +2173,7 @@
option.data = result.data;
table.render(option);
for (var i = 1; i <= option.data.length; i++) {
- $('#isEntrust' + i + '').find("option[value='" + option.data[i - 1].isEntrust + "']").attr("selected", true);
+ $('#HSupFlag' + i + '').find("option[value='" + option.data[i - 1].HSupFlag + "']").attr("selected", true);
}
form.render('select');
}
@@ -2122,13 +2185,13 @@
}
//琛岄�夋嫨澶勭悊锛堟槸鍚﹀澶栵級
- form.on('select(isEntrust)', function (data) {
+ form.on('select(HSupFlag)', 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.isEntrust = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ value.HSupFlag = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
}
});
});
--
Gitblit v1.9.1