From d5f8c5ea1acfe1fc08f8ddf69dff6f5164eea683 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 23 二月 2024 13:18:37 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/设备管理/Sb_EquipMaintainPlanBillEdit.html | 124 +++++++++++++++++++++--------------------
1 files changed, 64 insertions(+), 60 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 118338e..310c62c 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"
@@ -41,90 +41,88 @@
<h1 style="text-align:center;"><b>璁惧淇濆吇璁″垝鍗�</b></h1>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
- <div class="layui-form-item">
+ <div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo">
- <input id="HInterID" name="HInterID" type="hidden" />
+ <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="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
<input id="HMaker" name="HMaker" type="hidden" /><!--鍒跺崟浜�-->
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鏃ユ湡</label>
- <div class="layui-input-inline">
+ <label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
- <div class="layui-input-inline">
- <input type="text" name="HInnerBillNo" id="HInnerBillNo" class="layui-input">
+ <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="HCheckCycle" lay-verify="HCheckCycle" id="HCheckCycle">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璁惧<label style="color:red"> * </label></label>
- <div class="layui-input-inline">
- <input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="" style="float:left;width:150px;">
- <input type="text" name="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="ProductModulList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">鍛ㄦ湡鍗曚綅</label>
- <div class="layui-input-inline">
+ <label class="layui-form-label" style="width: 85px;">鍛ㄦ湡鍗曚綅</label>
+ <div class="layui-input-block" style="margin-left: 120px;width: 185px;" ">
<select name="HCycleUnit" lay-filter="aihao" id="HCycleUnit">
<option value="澶�">澶�</option>
<option value="鏈�">鏈�</option>
- <option value="鍛�">鍛�</option>
</select>
</div>
</div>
+ <div class="layui-inline" style="display:none;">
+ <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="HInnerBillNo" lay-verify="HInnerBillNo" id="HInnerBillNo" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:10px;">
<div class="layui-inline">
- <label class="layui-form-label">淇濆吇鍛ㄦ湡</label>
- <div class="layui-input-inline">
- <input type="text" name="HCheckCycle" id="HCheckCycle" class="layui-input" value="0">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璁惧</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HEquipName" name="HEquipName" id="HEquipName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HEquipID" id="HEquipID" lay-verify="HEquipID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HEquipList" id="HEquipList" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫棩鏈�</label>
- <div class="layui-input-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">淇濆吇瑙勭▼</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HMouldMaintainRuleNo" name="HMouldMaintainRuleNo" id="HMouldMaintainRuleNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HMouldMaintainRuleID" id="HMouldMaintainRuleID" lay-verify="HMouldMaintainRuleID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HEquipDotCheckRuleInterList" id="HEquipDotCheckRuleInterList" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </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 class="layui-input" name="HBeginDate" id="HBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
-
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃ユ湡</label>
- <div class="layui-input-inline">
+ <label class="layui-form-label" style="width: 85px;">璁″垝缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input class="layui-input" name="HEndDate" id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
</div>
</div>
- <div class="layui-form-item">
+ <div class="layui-row" style="margin-top:10px;">
<div class="layui-inline">
- <label class="layui-form-label">璁惧淇濆吇瑙勭▼<label style="color:red"></label></label>
- <div class="layui-input-inline">
- <input type="hidden" name="HMouldMaintainRuleID" id="HMouldMaintainRuleID" class="layui-input" value="0" style="float:left;width:150px;">
- <input type="text" name="HMouldMaintainRuleNo" id="HMouldMaintainRuleNo" class="layui-input" value="" style="float:left;width:150px;background-color:#efefef4d;" readonly>
- <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>
+ <label class="layui-form-label" style="width: 85px;">鎽樿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation" style="width:493px;"></textarea>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鎽樿</label>
- <div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark" id="HRemark" style="width:493px;"></textarea>
</div>
</div>
</div>
@@ -255,7 +253,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " };
+ var NewRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": " " };
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
@@ -270,7 +268,7 @@
table.on('toolbar(mainTable1)', function (obj) {
var checkStatus = table.checkStatus('mainTable1')
, data = checkStatus.data;
- var NewRow = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "0", "HRemark": "" };
+ var NewRow = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HQty": "0", "HRemark": "" };
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine1': btnAddLine1(NewRow);
@@ -291,12 +289,12 @@
set_GridCellCheck1(obj); //琛屽唴蹇嵎閿瓫閫�
});
//琛ㄥご淇℃伅璁惧寮圭獥
- form.on('submit(ProductModulList)', function () {
+ form.on('submit(HEquipList)', function () {
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '杞﹂棿鍒楄〃',
+ title: '璁惧鍒楄〃',
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
@@ -394,6 +392,9 @@
}
$("#HMouldMaintainRuleNo").val(checkStatus.data[0].鍗曟嵁鍙�);
$("#HMouldMaintainRuleID").val(checkStatus.data[0].hmainid);
+ $("#HCycleUnit").val(checkStatus.data[0].鍛ㄦ湡鍗曚綅);
+ $("#HCheckCycle").val(checkStatus.data[0].淇濆吇鍛ㄦ湡);
+
get_DocCheckItem2(checkStatus.data[0].hmainid);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -458,7 +459,7 @@
function Table() {
//琛ㄥご
columns = [
- { type: 'checkbox', fixed: 'left' }
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
, { field: 'HMaintainItemID', title: '淇濆吇椤圭洰ID', edit: 'text', hide: true }
, { field: 'HMaintainItemNumber', title: '淇濆吇椤圭洰浠ｇ爜', edit: 'text', event: 'HMaintainItemNumber' }
@@ -476,6 +477,7 @@
, elem: '#mainTable'
, toolbar: '#toolbarDemo'
, page: false
+ , totalRow: true
, cellMinWidth: 120
, height: 500
, cols: [columns]
@@ -488,7 +490,7 @@
function Table1() {
//琛ㄥご
columns = [
- { type: 'checkbox', fixed: 'left' }
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
, { field: 'HMaterID', title: '閰嶄欢ID', edit: 'text', hide: true }
, { field: 'HMaterNumber', title: '閰嶄欢浠ｇ爜', edit: 'text', event: "HMaterCode" }
@@ -499,7 +501,7 @@
//, { field: 'HManagerID', title: '璐熻矗浜篒D', edit: 'text', hide: true }
//, { field: 'HManagerNumber', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: 'HManagerNumber' }
//, { field: 'HManagerName', title: '璐熻矗浜�', edit: 'text' }
- , { field: 'HQty', title: '鐢ㄩ噺', edit: 'text' }
+ , { field: 'HQty', title: '鐢ㄩ噺', edit: 'text', totalRow: true }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo1', width: 150 }
];
@@ -509,6 +511,7 @@
, toolbar: '#toolbarDemo1'
, height: 500
, page: true
+ , totalRow: true
, limit: 500
, cellMinWidth: 120
, height: 500
@@ -521,7 +524,7 @@
function Table3() {
//鐐规璁″垝
columns_plan = [
- { type: 'checkbox', fixed: 'left' }
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
, { templet: '#xuhao', title: '搴忓彿', sort: true, event: "qwe" }
, { field: 'HPlanDate', title: '璁″垝鏃ユ湡' }
, { field: 'HPlanBeginTime', title: '璁″垝寮�濮嬫椂闂寸偣' }
@@ -534,6 +537,7 @@
, elem: '#mainTable_plan'
, toolbar: '#toolbarDemo'
, page: true
+ , totalRow: true
, limit: 500
, limits: [50, 200, 500, 1000, 3000]
, cellMinWidth: 120
@@ -548,8 +552,8 @@
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- 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": "" }];
+ option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": " " }];
+ 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);
table.render(option1);
}
--
Gitblit v1.9.1