From 08d431794af4939813303beff9364dfaa1f0b12a Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 10 七月 2023 15:47:46 +0800
Subject: [PATCH] 1
---
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 8 ++--
WebTM/views/项目管理/工作任务/PM_WorkTaskBill.html | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++---
2 files changed, 104 insertions(+), 10 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 34e9b8f..310083a 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -4272,7 +4272,7 @@
<publishTime>07/10/2023 09:34:06</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskBill.html">
- <publishTime>07/08/2023 23:45:29</publishTime>
+ <publishTime>07/10/2023 15:47:01</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskBillList.html">
<publishTime>07/08/2023 23:52:28</publishTime>
@@ -4284,7 +4284,7 @@
<publishTime>07/09/2023 11:43:49</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBill.html">
- <publishTime>07/09/2023 14:39:58</publishTime>
+ <publishTime>07/10/2023 15:32:04</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBillList.html">
<publishTime>07/09/2023 13:47:48</publishTime>
@@ -4296,7 +4296,7 @@
<publishTime>07/08/2023 23:54:41</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/椤圭洰闃舵/Add_Edit_Gy_ProjectStage.html">
- <publishTime>07/09/2023 14:28:24</publishTime>
+ <publishTime>07/10/2023 15:26:34</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/椤圭洰闃舵/Gy_ProjectStage.html">
<publishTime>07/08/2023 11:32:20</publishTime>
@@ -4305,7 +4305,7 @@
<publishTime>07/06/2023 09:17:28</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/椤圭洰闃舵/PM_ProjectReportBill.html">
- <publishTime>07/10/2023 15:22:55</publishTime>
+ <publishTime>07/10/2023 15:30:19</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/椤圭洰闃舵/PM_ProjectReportBillList.html">
<publishTime>07/10/2023 15:17:20</publishTime>
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html"
index a926ba0..50007e4 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html"
@@ -81,16 +81,26 @@
<input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
</div>
</div>
- <div class="layui-inline">
+ <!--<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">椤圭洰浠ｇ爜<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" lay-verify="HProNumber" name="HProNumber" id="HProNumber">
+ </div>
+ </div>-->
+ <div class="layui-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="HProNumber" name="HProNumber" id="HProNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <!--<input type="hidden" name="HProjectStageID" id="HProjectStageID" lay-verify="HProjectStageID" value="0">-->
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProNumber" id="btnSearchHProNumber" 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 style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HProName" name="HProName" id="HProName">
+ <input type="text" class="layui-input" lay-verify="HProName" name="HProName" id="HProName" readonly>
</div>
</div>
</div>
@@ -158,9 +168,13 @@
</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" lay-verify="HReceiveEmp" name="HReceiveEmp" id="HReceiveEmp">
+ <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="HReceiveEmp" name="HReceiveEmp" id="HReceiveEmp" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <!--<input type="hidden" name="HPMEmpID" id="HPMEmpID" lay-verify="HPMEmpID" value="0">-->
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHReceiveEmp" id="btnSearchHReceiveEmp" 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">
@@ -321,6 +335,8 @@
//妯″潡鍚�
var HModName = "PM_WorkTaskBill";
+ //璁板綍缁勭粐鐨勫��
+ var HOrgIDBar = 0;
//鑾峰彇鍙傛暟
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
@@ -348,6 +364,8 @@
//#region 鍒ゆ柇骞惰缃搷浣滅被鍨嬨�侀〉闈㈠垵濮嬪寲
if (OperationType == null || OperationType == 1) { //鏂板
+ //绂佺敤缁勭粐閫夐」
+ $("#HOrgID").attr("disabled", true);
OperationType = 1;
//鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
createBillNo();
@@ -389,6 +407,12 @@
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
//#region 寮圭獥閫夋嫨瑙﹀彂浜嬩欢
+ //#region 閫夋嫨椤圭洰浠ｇ爜鎸夐挳
+ form.on('submit(btnSearchHProNumber)', function () {
+ get_checkSearchHProNumber();
+ });
+ //#endregion
+
//#region 閫夋嫨椤圭洰闃舵鎸夐挳
form.on('submit(btnSearchHProjectStage)', function () {
get_checkSearchHProjectStage();
@@ -398,6 +422,12 @@
//#region 閫夋嫨娲惧崟浜烘寜閽�
form.on('submit(btnSearchHSendEmp)', function () {
get_checkSearchHSendEmp();
+ });
+ //#endregion
+
+ //#region 閫夋嫨鎺ユ敹浜烘寜閽�
+ form.on('submit(btnSearchHReceiveEmp)', function () {
+ get_checkSearchHReceiveEmp();
});
//#endregion
@@ -498,7 +528,10 @@
Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
}
$("#HOrgID").append(Organization);
- $("#HOrgID").val(sessionStorage["OrganizationID"])
+ if (OperationType == 1) {
+ HOrgIDBar = sessionStorage["OrganizationID"];
+ }
+ $("#HOrgID").val(HOrgIDBar);
form.render('select');
}
layer.closeAll("loading");
@@ -536,6 +569,36 @@
}
//#endregion
+ //#region 椤圭洰浠ｇ爜閫夋嫨椤甸潰
+ function get_checkSearchHProNumber() {
+ //鎵撳紑宸ョ▼椤圭洰灏忕獥浣�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "宸ョ▼椤圭洰鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBillList.html", "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ $("#HProNumber").val(checkStatus.data[0].HProNumber);//宸ョ▼椤圭洰浠ｇ爜
+ $("#HProName").val(checkStatus.data[0].HProName);//宸ョ▼椤圭洰浠ｇ爜
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
//#region 椤圭洰闃舵閫夋嫨椤甸潰
function get_checkSearchHProjectStage() {
@@ -591,6 +654,34 @@
$("#HSendEmp").val(checkStatus.data[0].HName);//瀹㈡埛鍚嶇О
if ($("#HSendEmp").val() == "") {
$("#HSendEmp").val(checkStatus.data[0].HNumber);
+ }
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
+ //#region 鎺ユ敹浜洪�夋嫨椤甸潰
+ function get_checkSearchHReceiveEmp() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鍛樺伐琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HReceiveEmp").val(checkStatus.data[0].HName);//鎺ユ敹浜哄悕绉�
+ if ($("#HReceiveEmp").val() == "") {
+ $("#HReceiveEmp").val(checkStatus.data[0].HNumber);
}
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -708,6 +799,9 @@
, "HBackerDate": tableMain[0]["HBackerDate"] == null ? "" : Format(new Date(tableMain[0]["HBackerDate"]), "yyyy-MM-dd")
, "HBackRemark": tableMain[0]["HBackRemark"]
});
+
+ //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
+ HOrgIDBar = tableMain[0]["HOrgID"];
}
})
}
--
Gitblit v1.9.1