From 1f8aa17a8b3cde29e5273ab3eb27032585cbc9b0 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 17 三月 2025 10:52:10 +0800
Subject: [PATCH] 项目任务类修改
---
WebTM/views/项目管理/基础建模/Gy_TaskClass.html | 23 +++++++
WebTM/views/项目管理/工程项目/PM_ProjectBill.html | 99 ++++++++++++++++++++++++++------
2 files changed, 101 insertions(+), 21 deletions(-)
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_TaskClass.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_TaskClass.html"
index a04f3e0..c9e40d7 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_TaskClass.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_TaskClass.html"
@@ -213,7 +213,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_Display(sWhere);
+ get_FastQuery();
}
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
@@ -338,6 +338,7 @@
if (HName) {
sWhere += " and 浠诲姟绫诲埆鍚嶇О like '%" + HName + "%'";
}
+ sWhere += addSWhereByOpenType();
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -663,6 +664,26 @@
}
//#endregion
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = get_UrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var number = params[params[1]]; //鐖剁被缂栫爜
+ var sWhere = "";
+ if (typeof (openType) != "undefined") {
+ if (openType == "HTask") {
+ sWhere += " and LEN(浠诲姟绫诲埆浠ｇ爜) = 1 "
+ } else if (typeof (number) != "undefined") {
+ sWhere += " and 浠诲姟绫诲埆浠ｇ爜 LIKE '" + number + "%'";
+ }
+
+ }
+ return sWhere;
+
+ }
+ //#endregion
+
//浠ヤ笂鏄痩ayui妯″潡
});
</script>
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
index cde9100..bfd2f7f 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
@@ -540,6 +540,7 @@
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浠诲姟澶х被<!--<label style="color:red"> * </label>--></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" lay-verify="HTaskClassName" name="HTaskClassName" id="HTaskClassName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HTaskClassNumber" id="HTaskClassNumber" lay-verify="HTaskClassNumber" value="">
<input type="hidden" name="HTaskClassID" id="HTaskClassID" lay-verify="HTaskClassID" value="0">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHTaskClass" id="btnSearchHTaskClass" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -651,11 +652,11 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏄惁缁撹处</label>
<div class="layui-input-block" style="margin-left: 120px; width: 200px;">
- <input type="checkbox" class="layui-input" name="HIsAccount" lay-verify="HIsAccount" id="HIsAccount" title="鏄�" lay-skin="tag" value="true" checked >
+ <input type="checkbox" class="layui-input" name="HIsAccount" lay-verify="HIsAccount" id="HIsAccount" title="鏄�" lay-skin="tag" value="true" >
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">缁撶畻缁撹处鏃ユ湡</label>
+ <label class="layui-form-label" style="width: 85px;">鎶慨瀹屽伐鏃堕棿</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="datetime-local" step="1" class="layui-input" name="HAccountDate" lay-verify="HAccountDate" id="HAccountDate" >
</div>
@@ -669,7 +670,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏄惁瀹℃牳鑰冩牳璐�</label>
<div class="layui-input-block" style="margin-left: 120px; width: 200px;">
- <input type="checkbox" class="layui-input" name="HIsCheckExam" lay-verify="HIsCheckExam" id="HIsCheckExam" title="鏄�" lay-skin="tag" checked value="true">
+ <input type="checkbox" class="layui-input" name="HIsCheckExam" lay-verify="HIsCheckExam" id="HIsCheckExam" title="鏄�" lay-skin="tag" value="true">
</div>
</div>
</div>
@@ -677,7 +678,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏄惁瀹℃牳宸ヨ垂</label>
<div class="layui-input-block" style="margin-left: 120px; width: 200px;">
- <input type="checkbox" class="layui-input" name="HIsCheckWorkMoney" lay-verify="HIsCheckWorkMoney" id="HIsCheckWorkMoney" title="鏄�" lay-skin="tag" checked value="true">
+ <input type="checkbox" class="layui-input" name="HIsCheckWorkMoney" lay-verify="HIsCheckWorkMoney" id="HIsCheckWorkMoney" title="鏄�" lay-skin="tag" value="true">
</div>
</div>
<div class="layui-inline">
@@ -690,12 +691,6 @@
<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="HInfoBackMan" lay-verify="HInfoBackMan" id="HInfoBackMan" >
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍥炲鍐呭</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <textarea type="text" class="layui-textarea" name="HInfoNote" lay-verify="HInfoNote" id="HInfoNote" ></textarea>
</div>
</div>
</div>
@@ -716,12 +711,6 @@
<label class="layui-form-label" style="width: 85px;">浠诲姟璇︾粏鍐呭</label>
<div class="layui-input-block" style="margin-left: 120px;">
<textarea type="text" class="layui-textarea" name="HTaskNote" lay-verify="HTaskNote" id="HTaskNote" ></textarea>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">宸ヤ綔浜哄憳</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <textarea type="text" class="layui-textarea" name="HTaskWorkEmp" lay-verify="HTaskWorkEmp" id="HTaskWorkEmp" ></textarea>
</div>
</div>
</div>
@@ -775,6 +764,24 @@
<div class="layui-input-block" style="margin-left: 120px;">
<textarea type="text" class="layui-textarea" name="HTaskRemark" lay-verify="HTaskRemark" id="HTaskRemark" ></textarea>
</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;">
+ <textarea type="text" class="layui-textarea" name="HInfoNote" lay-verify="HInfoNote" id="HInfoNote" style="width:485px"></textarea>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">宸ヤ綔浜哄憳</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <textarea type="text" class="layui-textarea" name="HTaskWorkEmp" lay-verify="HTaskWorkEmp" id="HTaskWorkEmp" style="width: 485px; display: inline-block;"></textarea>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHTaskWorkEmp" id="btnSearchHTaskWorkEmp" style="padding: 0 10px;float: right;margin-top: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+
</div>
</div>
</div>
@@ -1178,7 +1185,16 @@
form.on('submit(btnSearchHTestChecker)', function () {
get_checkSearchHTestChecker();
});
+
//#endregion
+
+ //#region 閫夋嫨宸ヤ綔浜哄憳鎸夐挳
+ form.on('submit(btnSearchHTaskWorkEmp)', function () {
+ get_checkSearchHTaskWorkEmp();
+ });
+
+ //#endregion
+
//#endregion
//#region 澶嶉�夋 閫変腑/鍙栨秷 瑙﹀彂浜嬩欢
@@ -2036,6 +2052,38 @@
}
//#endregion
+ //#region 宸ヤ綔浜哄憳閫夋嫨椤甸潰
+ function get_checkSearchHTaskWorkEmp() {
+ var HOrgID = $("#HOrgID").val();
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鍛樺伐琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?openType=HEmpList&HOrgID=' + HOrgID, '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('璇烽�夋嫨鏁版嵁');
+ }
+
+ var HTaskWorkEmpList = "";
+ for (var emp of checkStatus.data) {
+ HTaskWorkEmpList += ("," + emp.鑱屽憳鍚嶇О);
+ }
+ let result = HTaskWorkEmpList.slice(1);
+ //鑾峰彇鏁版嵁
+ $("#HTaskWorkEmp").val(result);//鍛樺伐鍚嶇О
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
//#region 椤圭洰闃舵娓呭崟 閫夋嫨 甯﹀嚭琛ㄤ綋鏁版嵁
function get_BT(HBillInterID) {
$.ajax({
@@ -2099,9 +2147,9 @@
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
- , title: '鍛樺伐琛�'//鏍囬
+ , title: '浠诲姟澶х被琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../椤圭洰绠＄悊/鍩虹寤烘ā/Gy_TaskClass.html', 'yes']
+ , content: ['../../椤圭洰绠＄悊/鍩虹寤烘ā/Gy_TaskClass.html?type=HTask', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -2112,6 +2160,8 @@
//鑾峰彇鏁版嵁
$("#HTaskClassID").val(checkStatus.data[0].HItemID);
$("#HTaskClassName").val(checkStatus.data[0].浠诲姟绫诲埆鍚嶇О);
+ $("#HTaskClassNumber").val(checkStatus.data[0].浠诲姟绫诲埆浠ｇ爜);
+
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -2119,6 +2169,7 @@
if (typeof (TaskData.HItemID) != undefined) {
$("#HTaskClassID").val(TaskData.HItemID);
$("#HTaskClassName").val(TaskData.浠诲姟绫诲埆鍚嶇О);
+ $("#HTaskClassNumber").val(TaskData.浠诲姟绫诲埆浠ｇ爜);
}
TaskData = [];
}
@@ -2127,13 +2178,17 @@
//#endregion
//#region 椤圭洰绫诲埆閫夋嫨椤甸潰
function get_checkSearchHTaskClassEntry() {
+ var strurl = '../../椤圭洰绠＄悊/鍩虹寤烘ā/Gy_TaskClass.html'
+ if ($("#HTaskClassNumber").val() != "") {
+ strurl = "../../椤圭洰绠＄悊/鍩虹寤烘ā/Gy_TaskClass.html?type=HTaskClass&HNumber=" + $("#HTaskClassNumber").val()
+ }
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
- , title: '鍛樺伐琛�'//鏍囬
+ , title: '浠诲姟鍒嗙被琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../椤圭洰绠＄悊/鍩虹寤烘ā/Gy_TaskClass.html', 'yes']
+ , content: [strurl, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -3401,6 +3456,10 @@
$("#HProjectStageBillInterID").val(obj[0].HInterID);//瀹㈡埛id
$("#HProjectStageBillNumber").val(obj[0].鍗曟嵁鍙�);//瀹㈡埛鍚嶇О
}
+ //宸ヤ綔浜哄憳
+ function GetHEmpListValue(obj) {
+ $("#HTaskWorkEmp").val(obj.鑱屽憳鍚嶇О);
+ }
//椤圭洰闃舵
function GetProjectStageValue(obj) {
ProjectStageData = obj;
--
Gitblit v1.9.1