From 88134cd28261f3be97f147111ca666a015ac3599 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 19 十一月 2021 17:52:15 +0800
Subject: [PATCH] 设备保养点检记录选择设备带出规程记录
---
WebTM/views/设备管理/Sb_EquipDotCheckBillEdit.html | 16 +++
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/PublicPage/EqpInformation.html | 2
WebTM/views/设备管理/Sb_EquipMaintainBillEdit.html | 16 +++
WebTM/views/设备管理/设备档案/Gy_EquipFileMainEdit.html | 143 ++++++++++++++++++++++++++++++-----
5 files changed, 153 insertions(+), 28 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 802a542..f6d4f0e 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -2,11 +2,11 @@
function GetWEBURL() {
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴
- var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
+ //var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
//var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
- //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃�
+ var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃�
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
//var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ缃�
diff --git a/WebTM/views/PublicPage/EqpInformation.html b/WebTM/views/PublicPage/EqpInformation.html
index 823ff3f..327f12a 100644
--- a/WebTM/views/PublicPage/EqpInformation.html
+++ b/WebTM/views/PublicPage/EqpInformation.html
@@ -144,7 +144,7 @@
, cellMinWidth: 90
, cols: [[
{ type: 'radio', fixed: 'left' }
- , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+ , { field: 'HInterID', title: 'HItemID', sort: true, hide: true }
, { field: 'ParentID', title: 'ParentID', sort: true, hide: true }
, { field: 'HNumber', title: '璁惧浠ｇ爜' }
, { field: 'HName', title: '璁惧' }
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 2e37072..e15f7f1 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"
@@ -232,7 +232,8 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HEquipName").val(checkStatus.data[0].HName);
- $("#HEquipID").val(checkStatus.data[0].HItemID);
+ $("#HEquipID").val(checkStatus.data[0].HInterID);
+ get_MaintainItem();
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -245,6 +246,19 @@
}
});
});
+ function get_MaintainItem() {
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetDotCheckRuleItemByEquipProjectID",
+ type: "GET",
+ data: { "EquipProjectID": $("#HEquipID").val() },
+ success: function (result) {
+ if (result != null) {
+ option.data = result.data;
+ table.render(option);
+ }
+ }
+ })
+ }
// 鎻愪氦淇濆瓨
form.on('submit(set_SaveBill)', function (data) {//淇濆瓨
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 012e23f..3449879 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"
@@ -279,7 +279,8 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HEquipName").val(checkStatus.data[0].HName);
- $("#HEquipID").val(checkStatus.data[0].HItemID);
+ $("#HEquipID").val(checkStatus.data[0].HInterID);
+ get_MaintainItem();
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -292,6 +293,19 @@
}
});
});
+ function get_MaintainItem() {
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMaintainItemtemByEquipProjectID",
+ type: "GET",
+ data: { "EquipProjectID": $("#HEquipID").val() },
+ success: function (result) {
+ if (result != null) {
+ option.data = result.data;
+ table.render(option);
+ }
+ }
+ })
+ }
//鏂板
form.on('submit(set_AddNew)', function (data) {
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 072b703..2afe8b4 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"
@@ -68,36 +68,58 @@
<input type="text" class="layui-input" name="HBarCode" id="HBarCode">
</div>
</div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">璁惧缂栧彿</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HEquipFileNo" id="HEquipFileNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">璁惧鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HName" id="HName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">璁惧瑙勬牸</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HModel" id="HModel">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">璁惧鍨嬪彿</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HModel2" id="HModel2">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">璁惧浠ｇ爜</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HEquipFileNumber" id="HEquipFileNumber">
</div>
</div>
- </div>
- <div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">璁惧缂栧彿</label>
+ <label class="layui-form-label">榛樿淇濆吇瑙勭▼</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HEquipFileNo" id="HEquipFileNo" >
+ <input type="text" class="layui-input" name="HEquipMaintainRuleInterName" id="HEquipMaintainRuleInterName" style="float:left;width:150px;">
+ <input type="hidden" class="layui-input" name="HEquipMaintainRuleInterID" id="HEquipMaintainRuleInterID" style="float:left;width:150px;">
+ <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 class="layui-inline">
- <label class="layui-form-label">璁惧鍚嶇О</label>
+ <label class="layui-form-label">榛樿鐐规瑙勭▼</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HName" id="HName" >
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">璁惧瑙勬牸</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HModel" id="HModel" >
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">璁惧鍨嬪彿</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HModel2" id="HModel2" >
+ <input type="text" class="layui-input" name="HEquipDotCheckRuleInterName" id="HEquipDotCheckRuleInterName" style="float:left;width:150px;">
+ <input type="hidden" class="layui-input" name="HEquipDotCheckRuleInterID" id="HEquipDotCheckRuleInterID" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HEquipDotCheckRuleInterList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
</div>
@@ -107,7 +129,7 @@
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="float:left;width:150px;">
<input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" style="width:40px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
@@ -132,7 +154,7 @@
</button>
</div>
</div>
-
+
<div class="layui-inline">
<label class="layui-form-label">渚涘簲鍟�</label>
<div class="layui-input-inline">
@@ -196,13 +218,13 @@
<div class="layui-inline">
<label class="layui-form-label">瀹夎鍦扮偣</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HAddress" id="HAddress" >
+ <input type="text" class="layui-input" name="HAddress" id="HAddress">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">瀹夎鏃ユ湡</label>
<div class="layui-input-inline">
- <input type="date" class="layui-input" name="HSetupDate" id="HSetupDate" >
+ <input type="date" class="layui-input" name="HSetupDate" id="HSetupDate">
</div>
</div>
<div class="layui-inline">
@@ -245,7 +267,7 @@
</div>
</div>
</div>
- </div>
+ </div>
</div>
<!--鍏朵粬淇℃伅-->
<!--<div class="layui-tab-content">
@@ -386,6 +408,81 @@
set_btnSave(data);
})
+
+ //璁惧淇濆吇瑙勭▼
+ 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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HEquipMaintainRuleInterName").val(checkStatus.data[0].鍗曟嵁鍙�);
+ $("#HEquipMaintainRuleInterID").val(checkStatus.data[0].hmainid);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //璁惧鐐规瑙勭▼
+ form.on('submit(HEquipDotCheckRuleInterList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐗╂枡鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HEquipDotCheckRuleInterName").val(checkStatus.data[0].鍗曟嵁鍙�);
+ $("#HEquipDotCheckRuleInterID").val(checkStatus.data[0].hmainid);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
//瀵瑰簲Erp鐗╂枡
form.on('submit(HMaterList)', function () {
//椤甸潰灞�-鑷畾涔�
--
Gitblit v1.9.1