From 53d26b500500022cdb12b240446792837f016a4e Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 26 一月 2026 16:14:49 +0800
Subject: [PATCH] 修改备份
---
WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainRuleBillEdit.html | 66 ++++++++++++++++++++++++++++-----
WebTM/layuiadmin/Scripts/webConfig.js | 4 +-
2 files changed, 58 insertions(+), 12 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 773eb71..720f544 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -5,12 +5,12 @@
/*var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
/* var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
- var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ // var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
//var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
/* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆*/
- //var WEBURL = "http://localhost:81/API/"; // 闄堥晲鍝叉湰鍦伴厤缃�*/
+ var WEBURL = "http://localhost:81/API/"; // 闄堥晲鍝叉湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉庢灄淇婃湰鍦伴厤缃�
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //濂ラ偊
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html"
index 9d60a3c..288867f 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html"
@@ -21,6 +21,18 @@
margin-left: 123px;
min-height: 36px;
}
+
+ /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+ .layui-table-cell {
+ overflow: visible !important;
+ }
+
+ /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+ td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
+ }
</style>
</head>
@@ -181,6 +193,13 @@
</div>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">榛樿瑙勭▼</label>
+ <div class="layui-input-inline">
+ <input type="checkbox" name="HStandard" id="HStandard"
+ lay-skin="primary" value="1" title="" checked="false" >
+ </div>
+ </div>
</div>
<!--鍏朵粬淇℃伅-->
<div class="layui-tab-item">
@@ -305,11 +324,19 @@
<script type="text/html" id="xuhao1">
{{d.LAY_TABLE_INDEX+1}}
</script>
+
</form>
</div>
</div>
</div>
</div>
+ <script type="text/html" id="HStdMaintainResult">
+ <select name="HStdMaintainResult" lay-filter="HStdMaintainResult" id="HStdMaintainResult{{d.LAY_TABLE_INDEX+1}}" data-index="{{d.LAY_TABLE_INDEX+1}}">
+ <!--<option value="">璇烽�夋嫨</option>-->
+ <option value="OK" selected>OK</option>
+ <option value="NG">NG</option>
+ </select>
+ </script>
<script type="text/html" id="barDemo">
<!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
@@ -333,7 +360,7 @@
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
}
-
+
layui.config({
@@ -353,8 +380,8 @@
var option = [];//淇濆吇
var option1 = [];//閰嶄欢
var sBillType = "3833";
- HModName="Sc_MouldMaintainRuleBill_Sub1"
- HModName1="Sc_MouldMaintainRuleBill_Sub2"
+ HModName = "Sc_MouldMaintainRuleBill_Sub1"
+ HModName1 = "Sc_MouldMaintainRuleBill_Sub2"
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -400,7 +427,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " };
+ var NewRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HStdMaintainResult": "OK"};
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
@@ -448,8 +475,9 @@
});
//淇濆瓨
form.on('submit(Saver)', function (data) {
-
+
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
+ data.field["HStandard"] = data.field["HStandard"]?1:0
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
@@ -586,7 +614,21 @@
});
});
+
+ //琛岄�夋嫨澶勭悊锛堥粯璁や繚鍏荤粨鏋滐級
+ form.on('select(HStdMaintainResultHandler)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option2.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HStdMaintainResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
//#endregion
+
//#region 姝ら〉闈㈡墍鏈夋柟娉�
@@ -614,6 +656,7 @@
, { field: 'HMaintainItemNumber', title: '淇濆吇椤圭洰浠ｇ爜', edit: 'text', event: 'HMaintainItemNumber' }
, { field: 'HMaintainItem', title: '淇濆吇椤圭洰', edit: 'text' }
, { field: 'HMaintainPart', title: '淇濆吇閮ㄤ綅', edit: 'text' }
+ , { field: 'HStdMaintainResult', title: "淇濆吇缁撴灉", templet: '#HStdMaintainResult', event: 'HStdMaintainResultHandler' }
, { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
, { field: 'HManagerID', title: '璐熻矗浜篒D', edit: 'text', hide: true }
, { field: 'HManagerNumber', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: 'HManagerNumber' }
@@ -675,7 +718,7 @@
$("#check-btn").addClass('layui-btn-disabled').attr('disabled', true)
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName":sessionStorage["HEmpName"], "HRemark": " " }];
+ option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": " ", "HStdMaintainResult": "OK" }];
option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HQty": "0", "HRemark": "" }];
table.render(option);
table.render(option1);
@@ -743,7 +786,7 @@
, "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : Format(new Date(data.浣滃簾鏃ユ湡), "yyyy-MM-dd")
});
let type = OperationType
-
+
if (OperationType == 3 && data['瀹℃牳浜�'] != '' && data['瀹℃牳浜�'] != null) {
$('#check-btn').addClass('layui-btn-disabled').attr('disabled', true)
$('#add-btn').addClass('layui-btn-disabled').attr('disabled', true)
@@ -773,6 +816,9 @@
//console.log('gouba' + result);
if (result.count == 1) {
option.data = result.list[0];
+ console.log(option.data)
+ console.log(result.list[0][0]["榛樿瑙勭▼"])
+ $("#HStandard").prop("checked",result.list[0][0]["榛樿瑙勭▼"])
table.render(option);
option1.data = result.list[1];
table.render(option1);
@@ -956,7 +1002,7 @@
} else {
let tableBak = table.cache["mainTable"];
let tempArr = []; //涓存椂鏁扮粍
-
+
for (var i = 0; i < tableBak.length; i++) { // 缂撳瓨宸茬紪杈戠殑鏁版嵁
if (tableBak[i]["HMaintainItemID"] != 0 && tableBak[i]["HMaintainItemID"] != "" && tableBak[i]["HMaintainItemID"] != undefined && tableBak[i]["HMaintainItemID"] != null) {
tempArr.push(tableBak[i]); //濡傛灉鍏抽敭瀛楁涓嶄负绌猴紝鍒欏皢涔嬪墠鐨勬暟鎹瓨鍌�
@@ -973,7 +1019,7 @@
HClaim: " ",
HManagerID: sessionStorage["HEmpID"],
HManagerNumber: sessionStorage["HEmpNumber"],
- HManagerName:sessionStorage["HEmpName"],
+ HManagerName: sessionStorage["HEmpName"],
HRemark: " "
});
}
@@ -1340,7 +1386,7 @@
//#endregion
- //#region 闅愯棌鍒楄缃�
+ //#region 闅愯棌鍒楄缃�
function get_HideColumn1() {
var colName = "";
var contentUrl = "";
--
Gitblit v1.9.1