From ada17c645dbc51a5ee4a7ba35e7068802d802bbb Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期三, 01 十二月 2021 17:55:14 +0800
Subject: [PATCH] 设备点检记录和保养记录选设备带出默认点检规程和默认保养规程数据
---
WebTM/views/设备管理/Sb_EquipDotCheckBillEdit.html | 30 +++++
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html | 18 +++
WebTM/views/设备管理/Sb_EquipMaintainBillList.html | 2
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldDotCheckBillList.html | 86 +++++++++++++++-
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainBillList.html | 83 +--------------
WebTM/views/设备管理/Sb_EquipMaintainBillEdit.html | 51 +++++++++
WebTM/views/设备管理/设备档案/Gy_EquipFileMainEdit.html | 5
7 files changed, 185 insertions(+), 90 deletions(-)
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/Gy_MouldFile.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/Gy_MouldFile.html"
index 28f3697..e68bd51 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/Gy_MouldFile.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/Gy_MouldFile.html"
@@ -468,6 +468,24 @@
set_btnSave(data);
})
+ //鑷姩璁＄畻鍓╀綑瀵垮懡
+ $("#HUseLife").blur(function () {
+ var beginlife = $("#HDesignLife").val();
+ var userlife = $("#HUseLife").val();
+ var result = beginlife - userlife;
+ if (result > 0) {
+ $("#HLeaveLife").val(result)
+ }
+ });
+ $("#HDesignLife").blur(function () {
+ var beginlife = $("#HDesignLife").val();
+ var userlife = $("#HUseLife").val();
+ var result = beginlife - userlife;
+ if (result > 0) {
+ $("#HLeaveLife").val(result)
+ }
+ });
+
//瀵瑰簲Erp鐗╂枡
form.on('submit(btnHMaterList)', function () {
//椤甸潰灞�-鑷畾涔�
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_Add_MouldDotCheckBillList.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_Add_MouldDotCheckBillList.html"
index 1668bde..386f030 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_Add_MouldDotCheckBillList.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_Add_MouldDotCheckBillList.html"
@@ -201,7 +201,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "" };
+ var NewRow = { "HDotCheckItemID":0,"HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "" };
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
@@ -222,6 +222,39 @@
//琛ㄥご鐐规璁″垝鍐呯爜淇℃伅
form.on('submit(HPlanInterList)', function () {
//椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐐规璁″垝鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../妯℃不鍏风鐞�/Sc_MouldDotCheckPlanBillList.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('璇烽�夋嫨鏁版嵁');
+ }
+ console.log(checkStatus);
+ $("#HPlanInterName").val(checkStatus.data[0].鍗曟嵁鍙�);
+ $("#HPlanInterID").val(checkStatus.data[0].hmainid);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
});
@@ -306,10 +339,46 @@
}
});
}
+ if (obj.event === 'HDotCheckItem') //鐐规椤圭洰浠ｇ爜
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐗╂枡鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../PublicPage/CheckItemInformation.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HDotCheckItemID: checkStatus.data[0].HItemID,
+ HDotCheckItem: checkStatus.data[0].HName
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ }
+ });
+ }
obj.event = "";
return false;
}
+
})
}
@@ -321,7 +390,6 @@
});
//淇濆瓨
form.on('submit(Saver)', function (data) {
- data.field.HPlanInterID = 0;
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = sMainStr + ';' + sSubStr;
@@ -401,7 +469,8 @@
columns = [
{ type: 'checkbox', fixed: 'left' }
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
- , { field: 'HDotCheckItem', title: '鐐规椤圭洰', edit: 'text' }
+ , { field: 'HDotCheckItemID', title: '鐐规ID', edit: 'text', hide: true }
+ , { field: 'HDotCheckItem', title: '鐐规椤圭洰', edit: 'text', event: 'HDotCheckItem'}
, { field: 'HDotCheckPart', title: '鐐规閮ㄤ綅', edit: 'text' }
, { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
, { field: 'HManagerID', title: '璐熻矗浜篒D', edit: 'text', hide: true }
@@ -437,7 +506,7 @@
function set_EditFromGrid() {
set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
- option.data = [{ "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "" }];
+ option.data = [{ "HDotCheckItemID":0,"HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "" }];
table.render(option);
}
@@ -485,7 +554,8 @@
, "HExplanation": data.鎽樿
, "HRemark": data.澶囨敞
, "HPlanNo": data.鐐规璁″垝缂栧彿
- , "HPlanInterID": data.鐐规璁″垝鍐呯爜
+ , "HPlanInterID": data.HPlanInterID
+ , "HPlanInterName": data.鐐规璁″垝鍐呯爜
, "HMouldID": data.HMouldID
});
@@ -600,12 +670,12 @@
if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
sSubStr = JSON.parse(sSubStr);
for (var i = 0; i < sSubStr.length; i++) {
- if (sSubStr[i].HDotCheckItem == "") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐐规椤圭洰涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if (sSubStr[i].HDotCheckItemID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璇烽�夋嫨鐐规椤圭洰!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
if (sSubStr[i].HManagerNumber == "") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璐熻矗浜轰唬鐮佷负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璇烽�夋嫨璐熻矗浜轰唬鐮�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
}
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_Add_MouldMaintainBillList.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_Add_MouldMaintainBillList.html"
index ddf941f..84d15d0 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_Add_MouldMaintainBillList.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_Add_MouldMaintainBillList.html"
@@ -321,7 +321,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../PublicPage/MouldInformation.html', 'yes'],
+ content: ['../妯℃不鍏风鐞�/Sc_MouldMaintainRuleBillList.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -360,8 +360,12 @@
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": " " }];
+ option2.data = [{ "HMaterID": 0, "HMaterNumber": " ", "HMaterName": " ", "HMaterSpec": " ", "HUnitID": "0", "HUnitNumber": " ", "HUnitName": " ", "HQty": "0", "HQtyMust": "0", "HManagerID": "0", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
+ table.render(option);
+ table.render(option2);
- if (rowdate1.length == 0) //琛ㄤ綋鏁版嵁涓虹┖鏃�
+ if (BYData.length != 0) //琛ㄤ綋鏁版嵁涓虹┖鏃�
{
buttonArr = [];//娓呯┖鏁扮粍
for (var i = 0; i < BYData.length; i++) {
@@ -376,44 +380,10 @@
data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
})
}
- if (rowdate1.length > 0 && rowdate1.length <= BYData.length) //琛ㄤ綋鏁版嵁涓嶄负绌�,涓旇〃浣撴暟鎹鏁板皬浜庣瓑浜庨�変腑甯﹀洖鏁版嵁琛屾暟
- {
- buttonArr = [];//娓呯┖鏁扮粍
- for (var i = 0; i < rowdate1.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); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
- }
- //buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
- table.reload("mainTable", {
- data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
- })
- }
- if (rowdate1.length > 0 && rowdate1.length > BYData.length) //琛ㄤ綋鏁版嵁涓嶄负绌�,涓旇〃浣撴暟鎹鏁板ぇ浜庨�変腑甯﹀洖鏁版嵁琛屾暟
- {
- console.log(checkStatus.data.length);
- buttonArr = [];//娓呯┖鏁扮粍
- for (var i = 0; i < rowdate.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); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
- }
- //buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
- table.reload("mainTable", {
- data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
- })
- }
+
-
-
- if (rowdate2.length == 0) //琛ㄤ綋鏁版嵁涓虹┖鏃�
+ if (PJData.length != 0) //琛ㄤ綋鏁版嵁涓虹┖鏃�
{
buttonArr = [];//娓呯┖鏁扮粍
for (var i = 0; i < PJData.length; i++) {
@@ -430,42 +400,7 @@
data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
})
}
- if (rowdate2.length > 0 && rowdate2.length <= PJData.length) //琛ㄤ綋鏁版嵁涓嶄负绌�,涓旇〃浣撴暟鎹鏁板皬浜庣瓑浜庨�変腑甯﹀洖鏁版嵁琛屾暟
- {
- buttonArr = [];//娓呯┖鏁扮粍
- for (var i = 0; i < rowdate2.length; i++) {
- var checkrow = {
- "HMaterID": PJData[i].HMaterID, "HMaterNumber": PJData[i].HMaterNumber, "HMaterName": PJData[i].HMaterName,
- "HMaterSpec": PJData[i].HMaterSpec, "HUnitID": PJData[i].HUnitID, "HUnitNumber": PJData[i].HUnitNumber,
- "HUnitName": PJData[i].HUnitName, "HQty": PJData[i].HQty, "HQtyMust": PJData[i].HQtyMust,
- "HManagerID": rowdate2[i].HManagerID, "HManagerNumber": rowdate2[i].HManagerNumber, "HManagerName": rowdate2[i].HManagerName,
- "HRemark": rowdate2[i].HRemark
- };
- buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
- }
- //buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
- table.reload("mainTable1", {
- data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
- })
- }
- if (rowdate2.length > 0 && rowdate2.length > PJData.length) //琛ㄤ綋鏁版嵁涓嶄负绌�,涓旇〃浣撴暟鎹鏁板ぇ浜庨�変腑甯﹀洖鏁版嵁琛屾暟
- {
- console.log(checkStatus.data.length);
- buttonArr = [];//娓呯┖鏁扮粍
- for (var i = 0; i < rowdate.length; i++) {
- var checkrow = {
- "HMaterID": PJData[i].HMaterID, "HMaterNumber": PJData[i].HMaterNumber, "HMaterName": PJData[i].HMaterName,
- "HMaterSpec": PJData[i].HMaterSpec, "HUnitID": PJData[i].HUnitID, "HUnitNumber": PJData[i].HUnitNumber,
- "HUnitName": PJData[i].HUnitName, "HQty": PJData[i].HQty, "HQtyMust": PJData[i].HQtyMust,
- "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 });
}
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
index ff6ae47..36d9a5c 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
@@ -233,7 +233,7 @@
}
$("#HEquipName").val(checkStatus.data[0].HName);
$("#HEquipID").val(checkStatus.data[0].HInterID);
- get_MaintainItem();
+ get_DocCheckItem();
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -246,15 +246,37 @@
}
});
});
- function get_MaintainItem() {
+ function get_DocCheckItem() {
$.ajax({
url: GetWEBURL() + "/Web/GetDotCheckRuleItemByEquipProjectID",
type: "GET",
data: { "EquipProjectID": $("#HEquipID").val() },
success: function (result) {
if (result != null) {
- option.data = result.data;
- table.render(option);
+ if (result.count == 1) {
+ var BYData = result;//
+ var rowdate1 = layui.table.cache["mainTable"];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
+ table.render(option);
+
+ if (BYData.data.length != 0) //琛ㄤ綋鏁版嵁涓虹┖鏃�
+ {
+ buttonArr = [];//娓呯┖鏁扮粍
+ for (var i = 0; i < BYData.data.length; i++) {
+ var checkrow = {
+ "HDotCheckItemID": BYData.data[i].HDotCheckItemID, "HDotCheckCode": BYData.data[i].HDotCheckCode, "HDotCheckItem": BYData.data[i].HDotCheckItem,
+ "HDotCheckPart": BYData.data[i].HDotCheckPart, "HClaim": rowdate1[i].HClaim, "HManagerID": BYData.data[i].HManagerID, "HManagerCode": BYData.data[i].HManagerCode,
+ "HManagerName": BYData.data[i].HManagerName, "HRemark": rowdate1[i].HRemark
+ };
+ buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+ }
+ table.reload("mainTable", {
+ data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ })
+ }
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
}
}
})
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 893e987..a5508ae 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"
@@ -300,8 +300,55 @@
data: { "EquipProjectID": $("#HEquipID").val() },
success: function (result) {
if (result != null) {
- option.data = result.data;
- table.render(option);
+ 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);
+
+ 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 });
+ }
}
}
})
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
index 8bcd2e1..d64cb79 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
@@ -257,7 +257,7 @@
, { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
, { field: '閰嶄欢浠ｇ爜', title: '閰嶄欢浠ｇ爜', width: 115, hide: true }
, { field: '閰嶄欢鍚嶇О', title: '閰嶄欢鍚嶇О', width: 200 }
- , { field: '鍗曚綅', title: '鍗曚綅', width: 200 }
+ , { field: '鍗曚綅鍚嶇О', title: '鍗曚綅鍚嶇О', width: 200 }
, { field: '瀹為檯鐢ㄩ噺', title: '瀹為檯鐢ㄩ噺', width: 200 }
, { field: '鏍囧噯鐢ㄩ噺', title: '鏍囧噯鐢ㄩ噺', width: 200 }
, { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
index d97f752..7532ab3 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
@@ -862,7 +862,10 @@
$("#HSetupDate").val(d.data[0].瀹夎鏃ユ湡);
$("#HStartupDate").val(d.data[0].杩愯寮�濮嬫棩鏈�);
$("#HStatus").val(d.data[0].褰撳墠鐘舵��);
-
+ $("#HEquipDotCheckRuleInterID").val(d.data[0].HEquipDotCheckRuleInterID);
+ $("#HEquipDotCheckRuleInterName").val(d.data[0].榛樿鐐规瑙勭▼);
+ $("#HEquipMaintainRuleInterID").val(d.data[0].HEquipMaintainRuleInterID);
+ $("#HEquipMaintainRuleInterName").val(d.data[0].榛樿淇濆吇瑙勭▼);
$("#HProNum").val(d.data[0].宸ョ▼缂栫爜);
$("#HWorkArea").val(d.data[0].浜у湴);
$("#HLogo").val(d.data[0].鍝佺墝);
--
Gitblit v1.9.1