From 86804db116fa7266c14add985bb3047d9e598447 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期一, 22 八月 2022 11:13:43 +0800
Subject: [PATCH] 模治具，设备测试(2)修复
---
WebTM/views/设备管理/Sb_EquipMaintainBillEdit.html | 122 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 114 insertions(+), 8 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
index 3043c47..dc4bcff 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
@@ -97,6 +97,16 @@
<input class="layui-input" name="HEndDate" id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">璁惧淇濆吇瑙勭▼<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="hidden" name="HEquipMaintainRuleInterID" id="HEquipMaintainRuleInterID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HEquipMaintainRuleInterNo" id="HEquipMaintainRuleInterNo" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HEquipMaintainRuleInterList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
@@ -255,13 +265,14 @@
//琛屽唴浜嬩欢
table.on('tool(mainTable)', function (obj) {
set_GridDelete(obj); //琛屽唴鍒犻櫎
- set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+ set_GridCellCheckMain(obj); //琛屽唴蹇嵎閿瓫閫�
});
//琛屽唴浜嬩欢
table.on('tool(mainTable1)', function (obj) {
set_GridDelete1(obj); //琛屽唴鍒犻櫎
set_GridCellCheck1(obj); //琛屽唴蹇嵎閿瓫閫�
});
+
//琛ㄥご淇℃伅璁惧寮圭獥
form.on('submit(ProductModulList)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -302,6 +313,103 @@
url: GetWEBURL() + "/Web/GetMaintainItemtemByEquipProjectID",
type: "GET",
data: { "EquipProjectID": $("#HEquipID").val() },
+ success: function (result) {
+ if (result != null) {
+ if (result.count == 1) {
+ var BYData = result.list[0];//淇濆吇
+ var PJData = result.list[1];//閰嶄欢
+ var rowdate1 = layui.table.cache["mainTable"];
+ var rowdate2 = layui.table.cache["mainTable1"];
+ option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
+ option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "0", "HRemark": "" }];
+ table.render(option);
+ table.render(option1);
+ $("#HEquipMaintainRuleInterID").val(BYData[0].HInterID);
+ $("#HEquipMaintainRuleInterNo").val(BYData[0].HBillNo)
+ if (BYData.length != 0) //琛ㄤ綋鏁版嵁涓虹┖鏃�
+ {
+ buttonArr = [];//娓呯┖鏁扮粍
+ for (var i = 0; i < BYData.length; i++) {
+ var checkrow = {
+ "HMaintainItemID": BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].HMaintainItemNumber, "HMaintainItem": BYData[i].HMaintainItem,
+ "HMaintainPart": BYData[i].HMaintainPart, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerNumber,
+ "HManagerName": BYData[i].HManagerName, "HClaim": rowdate1[i].HClaim, "HRemark": rowdate1[i].HRemark
+ };
+ buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+ }
+ table.reload("mainTable", {
+ data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ })
+ }
+
+
+
+ if (PJData.length != 0) //琛ㄤ綋鏁版嵁涓虹┖鏃�
+ {
+ buttonArr = [];//娓呯┖鏁扮粍
+ for (var i = 0; i < PJData.length; i++) {
+ var checkrow = {
+ "HMaterID": PJData[i].HMaterID, "HMaterNumber": PJData[i].HMaterNumber, "HMaterName": PJData[i].HMaterName,
+ "HUnitID": PJData[i].HUnitID, "HUnitNumber": PJData[i].HUnitNumber,
+ "HUnitName": PJData[i].HUnitName, "HQty": PJData[i].HQty,
+ "HManagerID": rowdate2[i].HManagerID, "HManagerNumber": rowdate2[i].HManagerNumber, "HManagerName": rowdate2[i].HManagerName,
+ "HRemark": rowdate2[i].HRemark
+ };
+ buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+ }
+ table.reload("mainTable1", {
+ data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ })
+ }
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }
+ }
+ })
+ }
+
+ //琛ㄥご淇℃伅璁惧淇濆吇瑙勭▼
+ form.on('submit(HEquipMaintainRuleInterList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璁惧淇濆吇瑙勭▼鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipMaintainRuleList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HEquipMaintainRuleInterNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+ $("#HEquipMaintainRuleInterID").val(checkStatus.data[0].hmainid);
+ get_MaintainItem2();
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ },
+ success: function (layero, index) {
+ }
+ });
+ });
+ function get_MaintainItem2() {
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMaintainItemtemByMaintainRuleID",
+ type: "GET",
+ data: { "EquipProjectID": $("#HEquipMaintainRuleInterID").val() },
success: function (result) {
if (result != null) {
if (result.count == 1) {
@@ -397,9 +505,7 @@
//鏂板
form.on('submit(set_AddNew)', function (data) {
- $("#component-form-group")[0].reset();
- layui.form.render();
- set_AddFNew();
+ location.reload();
});
//淇濆瓨
form.on('submit(Saver)', function (data) {
@@ -408,7 +514,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
- var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr1;
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr1 + ";" + sessionStorage["HUserName"];
if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
{
return false;
@@ -508,8 +614,8 @@
{ type: 'checkbox', fixed: 'left' }
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
, { field: 'HMaintainItemID', title: '淇濆吇椤圭洰ID', edit: 'text', hide: true }
- , { field: 'HMaintainItemNumber', title: '淇濆吇椤圭洰浠ｇ爜', edit: 'text', event: 'HMaintainItemNumber' }
- , { field: 'HMaintainItem', title: '淇濆吇椤圭洰', edit: 'text' }
+ , { field: 'HMaintainItemNumber', title: '淇濆吇椤圭洰浠ｇ爜', hide: true ,edit: 'text' }
+ , { field: 'HMaintainItem', title: '淇濆吇椤圭洰', edit: 'text', event: 'HMaintainItemNumber' }
, { field: 'HMaintainPart', title: '淇濆吇閮ㄤ綅', edit: 'text' }
, { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
, { field: 'HManagerID', title: '璐熻矗浜篒D', edit: 'text', hide: true }
@@ -774,7 +880,7 @@
}
}
//琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
- function set_GridCellCheck(obj) {
+ function set_GridCellCheckMain(obj) {
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
if (obj.event === 'HMaintainItemNumber') //淇濆吇椤圭洰淇℃伅
--
Gitblit v1.9.1