From da19f4f42dddbff9e32e463b142b3ed263d79921 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 20 六月 2025 08:47:23 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/设备管理/Sb_Add_EqpMaintenanceBillList.html | 177 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 161 insertions(+), 16 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
index 8025c14..137721e 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
@@ -34,11 +34,11 @@
</div>
<div class="layui-card-body">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
- <!--<ul class="layui-tab-title">
- <li class="layui-this">鍩烘湰淇℃伅</li>-->
- <!--<li>鍏朵粬淇℃伅</li>-->
- <!--</ul>-->
<h1 style="text-align: center; padding: 10px 0;"><b>璁惧缁翠慨璁板綍鍗�</b></h1>
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+ </ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
@@ -113,7 +113,7 @@
<label class="layui-form-label">缁翠慨椤圭洰<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HRepairName" id="HRepairName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HRepairID" id="HRepairID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HRepairID" id="HRepairID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="RepairItemList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -173,6 +173,36 @@
</button>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">绱ф�ョ▼搴�</label>
+ <div class="layui-input-inline">
+ <select name="HUrgenLevel" lay-filter="HUrgenLevel" id="HUrgenLevel">
+ <option value="浣�" selected="selected">浣�</option>
+ <option value="涓�">涓�</option>
+ <option value="楂�">楂�</option>
+ </select>
+ </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" name="HRepairCategory" id="HRepairCategory" class="layui-input" value="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎶ヤ慨浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HRepairer" id="HRepairer" class="layui-input" value="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏄惁鏈変骇鑳藉奖鍝�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HIsCapacityImpact" id="HIsCapacityImpact" class="layui-input" value="">
+ </div>
+ </div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
@@ -191,6 +221,76 @@
<label class="layui-form-label">澶囨敞</label>
<div class="layui-input-inline">
<textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ </div>
+ </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>
@@ -252,6 +352,11 @@
<script src="../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../layuiadmin/PubCustom.js"></script>
<script>
+ //鑾峰彇鍙傛暟
+ var HEquipID = ""; //璁惧id
+ var edit = function (data) {
+ HEquipID = data[0].HEquipID;
+ }
var OptionData = [];
//鑾峰彇鍙傛暟
var params = get_UrlVars();
@@ -280,7 +385,6 @@
var option;//缁翠慨淇℃伅
var option1 = [];//閰嶄欢
var sBillType = "3910";
- //var TabRow = { "HRepairID1": 0, "HRepairCode": "", "HRepairName": "", "HManagerID1": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "" };
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -432,7 +536,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) {
@@ -508,7 +612,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true
- , content: ['../鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairList.html', 'yes']
+ , content: ['../鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairList.html?openType=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -519,7 +623,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HRepairName").val(checkStatus.data[0].缁翠慨椤圭洰);
- $("#HRepairID").val(checkStatus.data[0].HItemID);
+ $("#HRepairID").val(checkStatus.data[0].hitemid);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -546,7 +650,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true
- , content: ['../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?openType=2&HOrgName=' + sessionStorage["Organization"], 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -584,7 +688,7 @@
title: '璁惧鏁呴殰鐧昏鍗�',
shift: 2,
area: ['90%', '90%'],
- content: ['../璁惧绠＄悊/Sb_EqpConkBookBillList.html', 'yes'],
+ content: ['../璁惧绠＄悊/Sb_EqpConkBookBillList.html?type=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": " ", "HSourceBillType": " " };
@@ -664,7 +768,7 @@
title: '璁惧缁翠慨娲惧伐鍗�',
shift: 2,
area: ['90%', '90%'],
- content: ['../璁惧绠＄悊/璁惧缁翠慨娲惧伐鍗�/Sb_EquipRepairSendWorkBillList.html', 'yes'],
+ content: ['../璁惧绠＄悊/璁惧缁翠慨娲惧伐鍗�/Sb_EquipRepairSendWorkBillList.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -842,6 +946,9 @@
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
+ if (HEquipID != "") {
+ GetHEquip();
+ }
option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRepairExplanation": "", "HRemark": ""/*, "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": " ", "HSourceBillType": " "*/ }];
option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HQty": "0", "HRemark": "" }];
table.render(option);
@@ -889,19 +996,19 @@
},
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data.h_v_Sb_EquipRepairWorkBillList[0];
+ var data = result.data.h_v_Sb_EquipRepairWorkBill_Edit[0];
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HBillNo": data.鍗曟嵁鍙�
- , "HDate": formatDate(data.鏃ユ湡)
+ , "HDate": formatDate(data.鏃ユ湡, "yyyy-MM-dd")
, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
, "HEmpID": data.HEmpID //缁翠慨浜篒D
, "HEmpName": data.缁翠慨浜� //缁翠慨浜�
- , "HRepairBeginDate": formatDate(data.缁翠慨寮�濮嬫棩鏈�) //缁翠慨寮�濮嬫棩鏈�
+ , "HRepairBeginDate": formatDate(data.缁翠慨寮�濮嬫棩鏈�, "yyyy-MM-dd") //缁翠慨寮�濮嬫棩鏈�
, "HEquipID": data.HEquipID //璁惧ID
, "HEquipName": data.璁惧鍚嶇О //璁惧鍚嶇О
, "HManagerID": data.HManagerID //璐熻矗浜篒D
, "HManagerName": data.璐熻矗浜� //璐熻矗浜哄悕绉�
- , "HRepairEndDate": formatDate(data.缁翠慨缁撴潫鏃ユ湡) //缁翠慨缁撴潫鏃ユ湡
+ , "HRepairEndDate": formatDate(data.缁翠慨缁撴潫鏃ユ湡, "yyyy-MM-dd") //缁翠慨缁撴潫鏃ユ湡
, "HRepairID": data.HRepairID //缁翠慨椤圭洰ID
, "HRepairName": data.缁翠慨椤圭洰 //缁翠慨椤圭洰鍚嶇О
, "HDeptID": data.HDeptID //缁翠慨閮ㄩ棬ID
@@ -916,6 +1023,20 @@
, "HMainSourceBillNo": data.HMainSourceBillNo
, "HMainSourceInterID": data.HMainSourceInterID
, "HMainSourceEntryID": data.HMainSourceEntryID
+ , "HRepairCategory": data.鎶ヤ慨绫诲埆
+ , "HUrgenLevel": data.绱ф�ョ▼搴�
+ , "HRepairer": data.鎶ヤ慨浜�
+ , "HIsCapacityImpact": data.鏄惁鏈変骇鑳藉奖鍝�
+ , "HMaker": data.鍒跺崟浜�
+ , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : formatDate(new Date(data.鍒跺崟鏃ユ湡), "yyyy-MM-dd")
+ , "HChecker": data.瀹℃牳浜�
+ , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : formatDate(new Date(data.瀹℃牳鏃ユ湡), "yyyy-MM-dd")
+ , "HUpDater": data.淇敼浜�
+ , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : formatDate(new Date(data.淇敼鏃ユ湡), "yyyy-MM-dd")
+ , "HCloseMan": data.鍏抽棴浜�
+ , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : formatDate(new Date(data.鍏抽棴鏃ユ湡), "yyyy-MM-dd")
+ , "HDeleteMan": data.浣滃簾浜�
+ , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : formatDate(new Date(data.浣滃簾鏃ユ湡), "yyyy-MM-dd")
});
} else {
@@ -1400,6 +1521,30 @@
return true;
}
+ //#region 鑾峰彇浼犲叆鐨勪俊鎭洖鏄鹃〉闈�
+ function GetHEquip() {
+ $.ajax({
+ url: GetWEBURL() + "/Sb_EqpRepairWorkBill/Get_XT_EqpConkBookList",
+ type: "GET",
+ data: { "HInterID": HEquipID, "user": sessionStorage["HUserName"], },
+ success: function (result) {
+ if (result.count == 1) {
+ $("#HEquipID").val(result.data[0].hmainid);
+ $("#HEquipName").val(result.data[0].璁惧鍚嶇О);
+ $("#HMainSourceBillNo").val(result.data[0].鍗曟嵁鍙�);
+ $("#HMainSourceInterID").val(result.data[0].hmainid);
+ $("#HMainSourceEntryID").val(result.data[0].hsubid);
+ $("#HRepairCategory").val(result.data[0].鏁呴殰绫诲埆);
+ $("#HRepairer").val(result.data[0].鍙戠幇浜�);
+ } else {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ }
+ });
+ }
+ //#endregion
+
+
//#endregion
});
--
Gitblit v1.9.1