From 07cf94734c36d4eae6ddbc4dd338bf5af81a2193 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 28 十月 2024 16:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/基础资料/工资基础资料/Gy_ClassTimePrjEdit.html | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjEdit.html"
index d3d8967..6f87592 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjEdit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjEdit.html"
@@ -110,7 +110,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-block" style="margin-left: 200px;">
- <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
+ <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤"disabled="disabled">
<input type="hidden" value="false" name="HStopflag" id="HStopflag">
</div>
</div>
@@ -262,8 +262,6 @@
//$("#HUSEORGID").attr("disabled", true);
}
else if (OperationType == 2) { //缂栬緫
- //绂佺敤缁勭粐閫夐」
- $("#HUSEORGID").attr("disabled", true);
$("#HItemID").val(HItemID);//淇敼鏃朵富琛↖D
//缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
RoadBillMain(HItemID);
@@ -288,6 +286,13 @@
if (IsHStopflag) {
$("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
}
+ if (data.瀹℃牳浜�!="") {
+ $('#btn_Save').addClass("layui-btn-disabled").attr("disabled", true);
+ }
+ if (data.HUSEORGID != 0) {
+ //绂佺敤缁勭粐閫夐」
+ $("#HUSEORGID").attr("disabled", true);
+ }
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HItemID": data.HItemID
, "HNumber": data.鏍哥畻鏂瑰紡浠ｇ爜
@@ -302,13 +307,13 @@
, "HRemark": data.澶囨敞
, "HUSEORGID": data.HUSEORGID
, "HMakeEmp": data.鍒涘缓浜�
- , "HMakeTime": data.鍒涘缓鏃ユ湡 == null ? "" : Format(data.鍒涘缓鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+ , "HMakeTime": data.鍒涘缓鏃ユ湡 == null ? "" : Pub_Format(data.鍒涘缓鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
, "HCheckEmp": data.瀹℃牳浜�
- , "HCheckTime": data.瀹℃牳鏃ユ湡 == null ? "" : Format(data.瀹℃牳鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+ , "HCheckTime": data.瀹℃牳鏃ユ湡 == null ? "" : Pub_Format(data.瀹℃牳鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
, "HModifyEmp": data.淇敼浜�
- , "HModifyTime": data.淇敼鏃ユ湡 == null ? "" : Format(data.淇敼鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+ , "HModifyTime": data.淇敼鏃ユ湡 == null ? "" : Pub_Format(data.淇敼鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
, "HStopEmp": data.绂佺敤浜�
- , "HStopTime": data.绂佺敤鏃ユ湡 == null ? "" : Format(data.绂佺敤鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+ , "HStopTime": data.绂佺敤鏃ユ湡 == null ? "" : Pub_Format(data.绂佺敤鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
});
layer.close(ajaxLoad);
} else {
@@ -358,7 +363,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鏍哥畻鏂瑰紡缁勫垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_ClassTimePrjGroupList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ClassTimePrjGroupList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -367,7 +372,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HParentID").val(checkStatus.data[0].HItemID);
- $("#HParentName").val(checkStatus.data[0].HName);
+ $("#HParentName").val(checkStatus.data[0].鏍哥畻鏂瑰紡缁勫悕绉�);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -383,7 +388,7 @@
, area: ['90%', '90%']//澶у皬
, title: '閮ㄩ棬鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../PublicPage/DeptInformation.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -392,7 +397,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HDeptID").val(checkStatus.data[0].HItemID);
- $("#HDeptName").val(checkStatus.data[0].HName);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -408,7 +413,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鐝粍鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../PublicPage/GroupInformation.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -417,7 +422,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HGroupID").val(checkStatus.data[0].HItemID);
- $("#HGroupName").val(checkStatus.data[0].HName);
+ $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -466,6 +471,10 @@
layer.msg("鎵�灞炴牳绠楁柟寮忕粍涓嶅厑璁镐负绌猴紝璇烽�夋嫨鎵�灞炴牳绠楁柟寮忕粍锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
+ if (data.field.HUSEORGID == '') {
+ layer.msg("缁勭粐涓嶅厑璁镐负绌猴紝璇烽�夋嫨缁勭粐锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
var sMainStr = JSON.stringify(data.field) + ';' + HMaker + ';' + OperationType;
@@ -479,7 +488,7 @@
success: function (data) {
if (data.count == 1) {
layer.msg(data.Message, { icon: 1 });
- $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#btn_Save').addClass("layui-btn-disabled").attr("disabled", true);
layer.close(index);
}
else {
--
Gitblit v1.9.1