From 6029d9cca9e132c4ba7a64cefe3db5eeaaecdf74 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 07 十一月 2025 09:24:53 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/设备管理/Sb_EquipMaintainBillEdit.html | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 156 insertions(+), 22 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 b55d981..e4a829e 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"
@@ -8,6 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/SetColumn.js"></script>
<script src="../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
.layui-form-label {
@@ -49,6 +50,7 @@
<ul class="layui-tab-title">
<li class="layui-this">鍩烘湰淇℃伅</li>
<li>闄勪欢淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
</ul>
<h1 style="text-align: center; padding: 10px 0;"><b>璁惧淇濆吇璁板綍鍗�</b></h1>
<div class="layui-tab-content">
@@ -93,6 +95,9 @@
<input type="hidden" name="HEquipMaintainPlanEntryID" id="HEquipMaintainPlanEntryID" class="layui-input" value="0" style="float:left;width:150px;">
<input type="hidden" name="HEquipMaintainPlanInterID" id="HEquipMaintainPlanInterID" class="layui-input" value="0" style="float:left;width:150px;">
<input type="text" name="HPlanName" id="HPlanName" class="layui-input" value="" style="float:left;width:150px;background-color:#efefef4d;" readonly">
+ <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0" readonly>
+ <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="0" readonly>
+ <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" value="0" readonly>
<button type="button" lay-submit="" class="layui-btn" lay-filter="HPlanList" id="HPlanList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -177,6 +182,76 @@
</div>
</div>
</div>
+ <!--鍒跺崟淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <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="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <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="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <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="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -200,7 +275,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
-
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
<script type="text/html" id="toolbarDemo1">
@@ -208,7 +283,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine1"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine1"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
-
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
<script type="text/html" id="xuhao">
@@ -239,6 +314,7 @@
<script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../layuiadmin/PubCustom.js"></script>
+ <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script>
var OptionData = [];
//鑾峰彇鍙傛暟
@@ -269,6 +345,8 @@
//鏌ヨ鏉′欢
var option = [];//淇濆吇
var option1 = [];//閰嶄欢
+ var HModName = "Sb_EquipMaintainRuleListSub1";
+ var HModName1 = "Sb_EquipMaintainRuleListSub2";
var sBillType = "3901";
//var TabRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " };//淇濆吇
//var TabRow1 = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "", "HRemark": "" };//閰嶄欢
@@ -322,6 +400,11 @@
//澶嶅埗涓�琛�
case 'btn-CopyLine': btnCopyLine(data);
break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumnEditWithCallback(HModName, sessionStorage["HUserName"], option, table, function () {
+ table.render(option)
+ });
+ break;
}
});
//澶村伐鍏锋爮浜嬩欢
@@ -335,6 +418,11 @@
break;
//澶嶅埗涓�琛�
case 'btn-CopyLine1': btnCopyLine1(data);
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn1': get_HideColumnEditWithCallback(HModName1, sessionStorage["HUserName"], option1, table, function () {
+ table.render(option1)
+ });
break;
}
});
@@ -359,7 +447,7 @@
value.HMaintainResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
}
});
-
+
console.log(table.cache['mainTable']);
var HQty = 0;//琛ㄤ綋琛屼笉鍚堟牸鏁伴噺
@@ -389,7 +477,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true
- , content: ['../璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainList.html', 'yes']
+ , content: ['../璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainList.html?openType=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -487,7 +575,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaintainLev.html', 'yes'],
+ content: ['../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaintainLev.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -524,7 +612,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipMaintainRuleList.html', 'yes'],
+ content: ['../璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipMaintainRuleList.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -562,7 +650,7 @@
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": "", "HQty": "0", "HRemark": "", "HMaintainResult": "Y"}];
+ option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HQty": "0", "HRemark": "", "HMaintainResult": "Y" }];
table.render(option);
table.render(option1);
@@ -630,8 +718,9 @@
var PJData = result.data[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": "", "HQty": "0", "HRemark": "", "HMaintainResult": "Y"}];
+
+ option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": $("#HEquipID").val(), "HMaintainItem": $("#HEquipName").val(), "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
+ option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HQty": "0", "HRemark": "", "HMaintainResult": "Y" }];
table.render(option);
table.render(option1);
@@ -690,7 +779,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../璁惧绠＄悊/Sb_EquipMaintainPlanBillList.html', 'yes'],
+ content: ['../璁惧绠＄悊/Sb_EquipMaintainPlanBillList.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -708,6 +797,12 @@
$("#HEquipMaintainRuleInterNo").val(checkStatus.data[0].淇濆吇瑙勭▼);
$("#HMaintainLevName").val(checkStatus.data[0].淇濆吇绾у埆鍚嶇О);
$("#HMaintainLevID").val(checkStatus.data[0].HMaintainLevID);
+
+
+ $("#HMainSourceBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+ $("#HMainSourceInterID").val(checkStatus.data[0].hmainid);
+ $("#HMainSourceEntryID").val(0);
+
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
get_MaintainItem3();
@@ -808,12 +903,12 @@
laydate.render({
elem: '#HDate',
});
- laydate.render({
- elem: '#HBeginDate'
- });
- laydate.render({
- elem: '#HEndDate'
- });
+ //laydate.render({
+ // elem: '#HBeginDate'
+ //});
+ //laydate.render({
+ // elem: '#HEndDate'
+ //});
}
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
@@ -825,7 +920,7 @@
//琛ㄥご
columns = [
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
- , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", style: "background:#ceedfa;color:black" }
, { field: 'HMaintainItemID', title: '淇濆吇椤圭洰ID', edit: 'text', hide: true }
, { field: 'HMaintainItemNumber', title: '淇濆吇椤圭洰浠ｇ爜', hide: true, edit: 'text' }
, { field: 'HMaintainItem', title: '淇濆吇椤圭洰', edit: 'text', event: 'HMaintainItemNumber' }
@@ -857,7 +952,7 @@
//琛ㄥご
columns = [
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
- , { templet: '#xuhao1', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+ , { templet: '#xuhao1', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", style: "background:#ceedfa;color:black" }
, { field: 'HMaterID', title: '閰嶄欢ID', edit: 'text', hide: true }
, { field: 'HMaterNumber', title: '閰嶄欢浠ｇ爜', edit: 'text', event: "HMaterCode" }
, { field: 'HMaterName', title: '閰嶄欢鍚嶇О', edit: 'text', event: "" }
@@ -891,7 +986,9 @@
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": " " }];
+ var ID = $("#HEquipID").val();
+ var Name = $("#HEquipName").val()
+ option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": ID, "HMaintainItem": Name, "HMaintainPart": " ", "HClaim": " ", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": " " }];
option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HQty": "0", "HRemark": "", "HMaintainResult": "Y" }];
table.render(option);
table.render(option1);
@@ -940,7 +1037,7 @@
//console.log(result.code)
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
//console.log(result)
- var data = result.data.h_v_Sb_EquipMaintainBillList[0];
+ var data = result.data.h_v_Sb_EquipMaintainBill_Edit[0];
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HBillNo": data.鍗曟嵁鍙�
, "HDate": formatDate(data.鏃ユ湡)
@@ -948,8 +1045,8 @@
, "HEquipName": data.璁惧鍚嶇О
, "HEquipID": data.璁惧ID //璁惧
, "HExplanation": data.鎽樿 //鎽樿
- , "HBeginDate": data.寮�濮嬫棩鏈� //
- , "HEndDate": data.缁撴潫鏃ユ湡 //
+ , "HBeginDate": data.寮�濮嬫棩鏈� == null ? "" : Format(new Date(data.寮�濮嬫棩鏈�), "yyyy-MM-dd") //
+ , "HEndDate": data.缁撴潫鏃ユ湡 == null ? "" : Format(new Date(data.缁撴潫鏃ユ湡), "yyyy-MM-dd") //
, "HPlanName": data.淇濆吇璁″垝
, "HPlanNo": data.淇濆吇璁″垝缂栧彿 //
, "HPlanName": data.淇濆吇璁″垝缂栧彿 //
@@ -958,6 +1055,16 @@
, "HEquipMaintainRuleInterNo": data.璁惧淇濆吇瑙勭▼ //澶囨敞
, "HMaintainLevID": data.HMaintainLevID
, "HMaintainLevName": data.淇濆吇绾у埆鍚嶇О
+ , "HMaker": data.鍒跺崟浜�
+ , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(data.鍒跺崟鏃ユ湡), "yyyy-MM-dd")
+ , "HChecker": data.瀹℃牳浜�
+ , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(data.瀹℃牳鏃ユ湡), "yyyy-MM-dd")
+ , "HUpDater": data.淇敼浜�
+ , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : Format(new Date(data.淇敼鏃ユ湡), "yyyy-MM-dd")
+ , "HCloseMan": data.鍏抽棴浜�
+ , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : Format(new Date(data.鍏抽棴鏃ユ湡), "yyyy-MM-dd")
+ , "HDeleteMan": data.浣滃簾浜�
+ , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : Format(new Date(data.浣滃簾鏃ユ湡), "yyyy-MM-dd")
});
if (data.鏈�缁堢粨璁� == "涓嶅悎鏍�") {
@@ -1663,6 +1770,33 @@
});
})
}
+
+ //淇濆吇绾у埆
+ function GetMaintainLevValue(obj) {
+ $("#HMaintainLevName").val(obj[0].淇濆吇绾у埆鍚嶇О);
+ $("#HMaintainLevID").val(obj[0].HItemID);
+ }
+ function GetMaintainValue(obj) {
+ $("#HPlanName").val(obj[0].鍗曟嵁鍙�);
+ $("#HPlanNo").val(obj[0].鍗曟嵁鍙�);
+ $("#HEquipMaintainPlanInterID").val(obj[0].hmainid);
+ $("#HEquipName").val(obj[0].璁惧鍚嶇О);
+ $("#HEquipID").val(obj[0].HEquipID);
+ $("#HEquipMaintainRuleInterID").val(obj[0].HMouldMaintainRuleID);
+ $("#HEquipMaintainRuleInterNo").val(obj[0].淇濆吇瑙勭▼);
+ $("#HMaintainLevName").val(obj[0].淇濆吇绾у埆鍚嶇О);
+ $("#HMaintainLevID").val(obj[0].HMaintainLevID);
+
+
+ $("#HMainSourceBillNo").val(obj[0].鍗曟嵁鍙�);
+ $("#HMainSourceInterID").val(obj[0].hmainid);
+ $("#HMainSourceEntryID").val(0);
+
+
+ }
+
+
+
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1