From 7de00c5824ecfd39fec748386298ba0cedd4504e Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 16 一月 2024 16:06:10 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/设备管理/设备规程单/Sb_EquipDotCheckRuleEdit.html | 43 +++++++++++++++++++++----------------------
1 files changed, 21 insertions(+), 22 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
index f1b88f4..44ca517 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8" />
- <title>鏂板/缂栬緫璁惧妗ｆ</title>
+ <title>鏂板/缂栬緫璁惧鐐规瑙勭▼鍗�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -127,7 +127,9 @@
</div>
</div>
</div>
-
+ <script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -193,7 +195,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HDotCheckItemID": "0", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "" };
+ var NewRow = { "HDotCheckItemID": "0", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" };
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
@@ -240,12 +242,12 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鐗╂枡鍒楄〃',
+ title: '鐐规椤圭洰鍒楄〃',
closeBtn: 1,
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../PublicPage/CheckItemInformation.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckList.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -257,7 +259,7 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HDotCheckItemID: checkStatus.data[0].HItemID,
- HDotCheckItem: checkStatus.data[0].HName
+ HDotCheckItem: checkStatus.data[0].鐐规椤圭洰鍚嶇О
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -275,7 +277,7 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鐗╂枡鍒楄〃',
+ title: '璐熻矗浜哄垪琛�',
closeBtn: 1,
shift: 2,
area: ['90%', '90%'],
@@ -354,7 +356,7 @@
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [{ "HDotCheckItemID": "0", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "" }];
+ option.data = [{ "HDotCheckItemID": "0", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" }];
table.render(option);
}
//鑾峰彇鏈�澶у崟鎹彿
@@ -429,12 +431,12 @@
"HBillNo": data.鍗曟嵁鍙�
, "HInterID": data.hmainid
, "HDate": formatDate(data.鏃ユ湡)
- ,"HBeginDate":formatDate(data.璁″垝寮�濮嬫棩鏈�)
- ,"HEndDate":formatDate(data.璁″垝缁撴潫鏃ユ湡)
- ,"HCheckCycle":data.鐐规鍛ㄦ湡
- ,"HCycleUnit":data.鍛ㄦ湡鍗曚綅
- ,"HExplanation":data.鎽樿
- ,"HRemark":data.澶囨敞
+ , "HBeginDate": formatDate(data.璁″垝寮�濮嬫棩鏈�)
+ , "HEndDate": formatDate(data.璁″垝缁撴潫鏃ユ湡)
+ , "HCheckCycle": data.鐐规鍛ㄦ湡
+ , "HCycleUnit": data.鍛ㄦ湡鍗曚綅
+ , "HExplanation": data.鎽樿
+ , "HRemark": data.澶囨敞
});
} else {
@@ -493,16 +495,13 @@
async: true,
data: { "msg": sMainSub },
dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂�
- });
+ success: function (data1) {
+ if (data1.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ layer.msg(data1.Message, { time: 1 * 1000, icon: 1 });
}
else {
- f_alert(data.Message);
+ f_alert(data1.Message);
console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
}
layer.closeAll("loading");
--
Gitblit v1.9.1