From 226b08b8a5f3ecab663d6b0e02b48c3e16e644e0 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 26 六月 2025 14:34:49 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/基础资料/公用基础资料/Gy_EquipTypeEdit.html | 237 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 198 insertions(+), 39 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipTypeEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipTypeEdit.html"
index ccb35a7..a49ddfa 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipTypeEdit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipTypeEdit.html"
@@ -13,6 +13,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>
<style type="text/css">
.layui-form-label {
width: 85px;
@@ -27,15 +28,16 @@
<form id="form0" class="layui-form" lay-filter="component-form-group" action="">
<div class="layui-card-header">
<div class="layui-btn-group">
-
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</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>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
@@ -44,7 +46,6 @@
<div class="layui-input-inline">
<input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
<input id="HItemID" name="HItemID" type="hidden" />
- <input id="HParentID" name="HParentID" type="hidden" />
<input id="HLevel" name="HLevel" type="hidden" />
</div>
</div>
@@ -66,11 +67,85 @@
<textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎵�灞炵埗绾�</label>
+ <div class="layui-input-inline">
+ <select name="HParentID" id="HParentID" lay-verify="HParentID">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浣跨敤缁勭粐*</label>
+ <div class="layui-input-inline">
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍒涘缓缁勭粐*</label>
+ <div class="layui-input-inline">
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <select name="HCREATEORGID" id="HCREATEORGID" lay-verify="HCREATEORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">绂佺敤鏍囧織</label>
<div class="layui-input-block">
<input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="">
+ </div>
+ </div>
+ </div>
+ <!--鍒跺崟淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-row">
+ <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="HMakeEmp" id="HMakeEmp" 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="HStopEmp" id="HStopEmp" 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="HCheckEmp" id="HCheckEmp" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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="HMakeTime" id="HMakeTime" 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="HStopTime" id="HStopTime" 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="HCheckTime" id="HCheckTime" style="background-color:#efefef4d;" readonly>
+ </div>
</div>
</div>
</div>
@@ -90,7 +165,7 @@
var closeType = 2; //鍏抽棴绫诲瀷
} else {
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
- var linterid = params[params[1]];//婧愬崟id
+ var linterid = params[params[1]] == "" ? 0 : params[params[1]];//婧愬崟id
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
var closeType = params[params[3]]; //鍏抽棴绫诲瀷
}
@@ -110,35 +185,30 @@
, laydate = layui.laydate
, element = layui.element;
//#endregion
+ //绂佺敤缁勭粐閫夐」
+ $("#HUSEORGID").attr("disabled", true);
+ $("#HCREATEORGID").attr("disabled", true);
+ //绂佺敤绂佺敤鏍囧噯澶嶉�夋
+ $("#HStopflag").attr("disabled", true);
+ form.render('checkbox');
//甯歌鐢ㄦ硶
-
+ //鑾峰彇缁勭粐
+ Organ();
+ //鑾峰彇鐖剁骇
+ Parent();
//#region 宸ュ叿鎸夐挳
if (OperationType == 3) {
- $.ajax({
- url: GetWEBURL() + "/Gy_EquipType/Gy_EquipTypeCheckDetai",
- type: "GET",
- data: {
- "HInterID": linterid
- },
- success: function (d) {
-
- ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
- $("#HNumber").val(d.data[0].HNumber);
- $("#HName").val(d.data[0].HName);
- $("#HHelpCode").val(d.data[0].HHelpCode);
- $("#HRemark").val(d.data[0].HRemark);
- $("#HLevel").val(d.data[0].HLevel);
- $("input[name='HStopflag']").prop("checked", d.data[0].HStopflag);//true:閫変腑 false:涓嶉�変腑
- layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
- $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
- //table.reload(layTableId, {
- // data: ajaxReturnData
- //});
- }
-
- });
+ RoadBillMain(linterid);
+ } else if (OperationType == 2) {//澶嶅埗
+ //澶嶅埗鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(linterid);
+ $("#HMakeEmp").val(sessionStorage["HUserName"]);; //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鍒涘缓浜�
+ $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
+ } else if (OperationType == 1) {
+ $("#HMakeEmp").val(sessionStorage["HUserName"]);; //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鍒涘缓浜�
+ $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
}
-
+
//閫�鍑烘寜閽�
form.on('submit(Exit)', function () {
Pub_Close(1);
@@ -152,12 +222,11 @@
data.field.HItemID = linterid == "" ? 0 : linterid;
- data.field.HParentID = 0;
data.field.HLevel = $("#HLevel").val() == "" ? 1 : $("#HLevel").val();
var oMain = JSON.stringify(data.field)
- var sMainSub = oMain + ';' + linterid ;
+ var sMainSub = oMain + ';' + linterid + ";" + sessionStorage["HUserName"] + ";" + $("#HUSEORGID").val();
if (AllowLoadData()) {
if (OperationType == 3) {
@@ -174,20 +243,18 @@
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); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
}
else {
f_alert(data.Message);
- console.log("Reason" + sMainSub + "sub:" + JSON.stringify(layui.table.cache.mainTable));
}
layer.closeAll("loading");
},
error: function (err) {
f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
}
});
}
@@ -205,7 +272,7 @@
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); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
}
else {
@@ -222,6 +289,99 @@
}
});
+ //#region 鍔犺浇琛ㄥご
+ function RoadBillMain(linterid) {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_EquipType/Gy_EquipTypeCheckDetai",
+ type: "GET",
+ data: {
+ "HInterID": linterid
+ },
+ success: function (result) {
+ if (result.code == 1) {
+ var data = result.data[0];
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HNumber": data.HNumber
+ , "HName": data.HName
+ , "HHelpCode": data.HHelpCode
+ , "HRemark": data.HRemark
+ , "HLevel": data.HLevel
+ , "HUpDater": sessionStorage["HUserName"]
+ , "HUSEORGID": data.HUSEORGID
+ , "HCREATEORGID": data.HCREATEORGID
+ , "HParentID": data.HParentID
+ , "HMakeEmp": data.HMakeEmp == "" ? sessionStorage["HMaker"] : data.HMakeEmp
+ , "HMakeTime": data.HMakeTime == null ? "" : Format(new Date(data.HMakeTime), "yyyy-MM-dd")
+ , "HStopEmp": data.HStopEmp
+ , "HStopTime": data.HStopTime == null ? "" : Format(new Date(data.HStopTime), "yyyy-MM-dd")
+ , "HCheckEmp": data.HCheckEmp
+ , "HCheckTime": data.HCheckTime == null ? "" : Format(new Date(data.HCheckTime), "yyyy-MM-dd")
+ });
+ $("input[name='HStopflag']").prop("checked", data.HStopflag);//true:閫変腑 false:涓嶉�変腑
+ layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+ }
+ }
+ });
+ }
+ //#endregion
+
+ //鏌ヨ鐖剁骇
+ function Parent() {
+ /*var sWhere = " and HParentID=0 ";*/
+ var sWhere = "";
+ if (linterid != "" && linterid != null) {
+ sWhere += " and HItemID!=" + linterid + " and 瀹℃牳浜�!='' and 绂佺敤鏍囪=' ' ";
+ }
+ $.ajax({
+ url: GetWEBURL() + '/Gy_EquipType/GetList',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ var Parent = '<option style="color:blue;" value="0">鏃�</option>';
+ if (data1.count == 1) {
+ var data = data1.data;
+ for (var i = 0; i < data.length; i++) {
+ Parent += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].璁惧鍒嗙被鍚嶇О + '</option>';
+ }
+ $("#HParentID").append(Parent);
+ form.render('select');
+ } else {
+
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ async: false,
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HUSEORGID").append(Organization);
+ $("#HUSEORGID").val(sessionStorage["OrganizationID"]);
+ $("#HCREATEORGID").append(Organization);
+ $("#HCREATEORGID").val(sessionStorage["OrganizationID"]);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
function AllowLoadData() {
if ($("#HNumber").val() == '' || $("#HNumber").val() == '') {
layer.msg("璇峰～鍐欎唬鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -232,7 +392,7 @@
return Result = false;
}
return true;
- }
+ }
//#endregion
@@ -242,9 +402,8 @@
}
-
+
});
</script>
</body>
-
</html>
\ No newline at end of file
--
Gitblit v1.9.1