From 65968b3e0e9e03ef0904de35b78872224b9ce00a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 23 九月 2025 14:15:38 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/设备管理/Sb_EquipMaintainPlanBillEdit.html | 147 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 116 insertions(+), 31 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
index 014101d..c7ca50d 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
@@ -16,7 +16,6 @@
</style>
</head>
<body>
-
<div id="layout1" class="layui-fluid">
<div class="layui-row layui-col-space15">
<div class="layui-col-md12">
@@ -29,17 +28,15 @@
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="view">棰勮</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="print">鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
-
</div>
-
</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-row">
@@ -161,6 +158,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>
@@ -221,6 +288,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 params = get_UrlVars();
@@ -276,6 +344,12 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鏂板
set_AddFNew();
+ }
+ else if (OperationType == 2) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new //澶嶅埗
+ OperationType = 1;
+ set_EditFromGrid(linterid);
+ //鑾峰彇鏈�澶у崟鎹彿
+ get_MAXNum();
}
else if (OperationType == 3) {//缂栬緫
set_EditFromGrid(linterid);
@@ -342,7 +416,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) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -424,7 +498,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) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -456,7 +530,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) {
@@ -494,7 +568,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) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -677,6 +751,7 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
+ async: false,
data: { "HBillType": sBillType },
success: function (d) {
//console.log(d.data);
@@ -714,31 +789,31 @@
function set_EditFromGrid(linterid) {
set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
- option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
- table.render(option);
+ //option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
+ //table.render(option);
- option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "0", "HRemark": "" }];
- table.render(option1);
+ //option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "0", "HRemark": "" }];
+ //table.render(option1);
set_EditGrid_Plan(linterid); //缂栬緫鑾峰彇琛ㄤ綋--鐐规璁″垝
- option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HSafeEndTime": "", "HErrBeginTime": "","HRelationFlag": "鏈偣妫�", "DiffDate": 0 }];
- table.render(option_plan);
+ //option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HSafeEndTime": "", "HErrBeginTime": "","HRelationFlag": "鏈偣妫�", "DiffDate": 0 }];
+ //table.render(option_plan);
}
//缂栬緫鑾峰彇琛ㄥご
function set_EditForm(linterid) {
$.ajax({
- url: GetWEBURL() + "Sb_EquipMaintainPlanBill/Sb_EquipMaintainPlanBillListCheckDetai",
+ url: GetWEBURL() + "/Sb_EquipMaintainPlanBill/Sb_EquipMaintainPlanBillListCheckDetai",
type: "GET",
+ async: false,
data: {
"HID": linterid
},
success: function (result) {
- //console.log(result.code)
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- console.log(result)
- var data = result.data.h_v_Sb_EquipMaintainPlanBillList[0];
+ var data = result.data.h_v_Sb_EquipMaintainPlanBill_Edit[0];
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HBillNo": data.鍗曟嵁鍙�
+ "HInterID": OperationType == 2 ? "" : linterid
+ , "HBillNo": OperationType == 2 ? "" : data.鍗曟嵁鍙�
, "HDate": formatDate(data.鏃ユ湡)
, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
, "HEquipID": data.璁惧ID
@@ -757,6 +832,16 @@
, "HUSEORGID": data.HUSEORGID
, "HDeptID": data.HDeptID
, "HDeptName": 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 ($("#HUSEORGID").val() == null || $("#HUSEORGID").val() == "" || $("#HUSEORGID").val() == undefined) {
$("#HUSEORGID").val(sessionStorage["OrganizationID"])
@@ -771,11 +856,11 @@
}
//缂栬緫鑾峰彇琛ㄤ綋
function set_EditGrid(linterid) {
- $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
//缂栬緫鍔犺浇鏁版嵁
$.ajax({
- url: GetWEBURL() + 'Sb_EquipMaintainPlanBill/Sb_EquipMaintainPlanBillListProjectDetaiNew',
+ url: GetWEBURL() + '/Sb_EquipMaintainPlanBill/Sb_EquipMaintainPlanBillListProjectDetaiNew',
type: "GET",
+ async: false,
data: { "HInterID": linterid },
success: function (result) {
if (result.count == 1) {
@@ -855,11 +940,11 @@
// 缂栬緫鑾峰彇琛ㄤ綋--鐐规璁″垝
function set_EditGrid_Plan(linterid) {
- $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
//缂栬緫鍔犺浇鏁版嵁
$.ajax({
- url: GetWEBURL() + 'Sb_EquipMaintainPlanBill/GetPlanList',
+ url: GetWEBURL() + '/Sb_EquipMaintainPlanBill/GetPlanList',
type: "GET",
+ async: false,
data: { "sqlWhere": "and hmainid=" + linterid },
success: function (result) {
if (result.count == 1) {
@@ -1008,7 +1093,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../鍩虹璧勬枡/鍩虹璧勬枡/Gy_MaintainList.html', 'yes'],
+ content: ['../鍩虹璧勬枡/鍩虹璧勬枡/Gy_MaintainList.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -1066,7 +1151,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
+ content: ['../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1116,7 +1201,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes'],
+ content: ['../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?Type=HUnitList', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -1152,7 +1237,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
+ content: ['../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -1188,7 +1273,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
+ content: ['../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
--
Gitblit v1.9.1