From be7d738131c8cf9c8e00c6abfde469f2d82cbfb0 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 15 三月 2024 16:48:45 +0800
Subject: [PATCH] 1
---
WebTM/views/项目管理/工作任务/PM_WorkTaskBill.html | 121 +++++++++++++++++++++++++++-------------
1 files changed, 82 insertions(+), 39 deletions(-)
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 d3a52d4..15304b8 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"
@@ -14,6 +14,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/PageTitle.js"></script>
<style>
.main-btn { /*澶撮儴涓绘寜閽�*/
padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
@@ -65,6 +66,7 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">鍙嶅叧闂�</button>-->
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
+ <h1 style="text-align: center; padding: 10px 0;"><b>宸ヤ綔浠诲姟</b></h1>
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
<li lay-id="2" style="padding:1px;">闄勪欢淇℃伅</li>
@@ -83,11 +85,11 @@
</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="HProNumber" name="HProNumber" id="HProNumber">
- </div>
- </div>-->
+ <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 style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
@@ -202,16 +204,6 @@
<div class="layui-input-block" style="margin-left: 120px;">
<select name="HOrderLevID" id="HOrderLevID" lay-filter="HOrderLevID" style="width:120px;">
</select>
- </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="HHasten" name="HHasten" id="HHasten" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly >
-
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHHasten" id="btnSearchHHasten" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
</div>
</div>
</div>
@@ -427,10 +419,18 @@
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var HEntryID = params[params[3]]; //宸ョ▼椤圭洰瀛愬唴鐮�
-
+ var HSouceBillType = params[params[2]]; //婧愬崟绫诲瀷
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ var HModuleType = "4753";
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+ $("h1").html('<b>' + HPageTitle + '</b>');
+ //#endregion
+
//#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
if (sessionStorage.login != "login") {
layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
@@ -442,6 +442,8 @@
//#region 浠诲姟绫诲瀷绫诲瀷涓嬫媺妗嗘樉绀�
ColFilter();
//#endregion
+ //鍒濆鍖栬鍗曠瓑绾�
+ HOrderLev();
//#region 鍒ゆ柇骞惰缃搷浣滅被鍨嬨�侀〉闈㈠垵濮嬪寲
if (OperationType == null || OperationType == 1) { //鏂板
@@ -464,8 +466,9 @@
//鏂囦欢閫夋嫨鍒濆鍖�
PicUpload();
- //鍒濆鍖栬鍗曠瓑绾�
- HOrderLev();
+
+
+
}
//else if (OperationType == 2) { //澶嶅埗
@@ -485,11 +488,13 @@
// });
//}
else if (OperationType == 3) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- //鍒濆鍖栬鍗曠瓑绾�
- HOrderLev();
+
//缂栬緫
////绂佺敤缁勭粐閫夐」
//$("#HOrgID").attr("disabled", true);
+
+
+
//鍒濆鍖栭」鐩樁娈佃〃
RoadBillMain(linterid);
@@ -497,6 +502,7 @@
PicUpload();
//灞曠ず宸蹭笂浼犵殑鏂囦欢
getFileList_loaded();
+
} else if (OperationType == 4 && HProjectStageID != null) { //涓嬫帹
////绂佺敤缁勭粐閫夐」
@@ -517,19 +523,21 @@
//涓嬫帹-椤甸潰璁剧疆
- set_WorkTaskReport();
+ //椤圭洰闇�姹傚強闂娓呭崟 涓嬫帹宸ヤ綔浠诲姟 椤甸潰璧嬪�煎鏋滅瓑浜� 4759 灏辨槸椤圭洰闇�姹傚強闂娓呭崟鐨勪笅鎺�
+ if (HSouceBillType == 4759) {
+ CustomerTaskRoadBillMain();
+ } else {
+ set_WorkTaskReport();
+ }
+
//鏂囦欢閫夋嫨鍒濆鍖�
PicUpload();
- //鍒濆鍖栬鍗曠瓑绾�
- HOrderLev();
+
}
//#endregion
- //#region 鍒濆鍖栫粍缁�
+ //#region 鍒濆鍖栫粍缁�
Organ();
- //#endregion
-
-
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
@@ -656,7 +664,7 @@
Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
}
$("#HOrgID").append(Organization);
- if (OperationType == 1) {
+ if (OperationType == 1 || OperationType == 4) {
HOrgIDBar = sessionStorage["OrganizationID"];
}
$("#HOrgID").val(HOrgIDBar);
@@ -683,10 +691,7 @@
Order += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
}
$("#HOrderLevID ").append(Order);
- //if (OperationType == 1) {
- // HOrgIDBar = sessionStorage["OrganizationID"];
- //}
- //$("#HOrderLevID ").val(HOrgIDBar);
+
form.render('select');
}
layer.closeAll("loading");
@@ -696,12 +701,7 @@
//#endregion
- //#region 鑾峰彇鍌績娆℃暟
- document.getElementById('btnSearchHHasten').addEventListener('click', function () {
- var input = document.getElementById('HHasten');
- input.value = parseInt(input.value) + 1;
- });
-
+
//#endregion
//#region 鑾峰彇鍙傛暟
@@ -1056,6 +1056,9 @@
function set_AddNew(data) {
//鑾峰彇缁勭粐鏁版嵁
data.field.HPRDORGID = sessionStorage["OrganizationID"];//缁勭粐
+ if (data.field.HOrderLevID == "") {
+ data.field.HOrderLevID = 0;
+ }
//鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
if (OperationType == 3) {
data.field.HUpdater = sessionStorage["HUserName"];
@@ -1128,7 +1131,6 @@
, "HRemark": tableMain[0]["HRemark"]
, "HOrgID": tableMain[0]["HOrgID"]
, "HOrderLevID": tableMain[0]["HOrderLevID"]
- , "HHasten": tableMain[0]["HHasten"]
, "HMainSourceInterID": tableMain[0]["HMainSourceInterID"]
, "HMainSourceEntryID": tableMain[0]["HMainSourceEntryID"]
@@ -1189,6 +1191,47 @@
}
})
}
+
+ // 椤圭洰闇�姹傚強闂娓呭崟 涓嬫帹宸ヤ綔浠诲姟 椤甸潰璧嬪��
+ function CustomerTaskRoadBillMain( )//鍔犺浇琛ㄥご
+ {
+ $.ajax({
+ url: GetWEBURL() + "/PM_ProjectBill/PM_CustomerTaskBillMainEditList",
+ type: "GET",
+ async: false,
+ data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ var tableMain = result.data;
+
+ //涓昏〃 璧嬪��
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HMainSourceInterID": tableMain[0]["HInterID"]
+ , "HMainSourceBillNo": tableMain[0]["鍗曟嵁鍙�"]
+ , "HMainSourceBillType": tableMain[0]["鍗曟嵁绫诲瀷"]
+ , "HProjectID": tableMain[0]["HProjectID"]
+ , "HProNumber": tableMain[0]["椤圭洰浠ｇ爜"]
+ , "HProName": tableMain[0]["椤圭洰鍚嶇О"]
+ , "HProjectStageID": tableMain[0]["HProjectStageID"]
+ , "HProjectStageName": tableMain[0]["椤圭洰闃舵"]
+ , "HName": tableMain[0]["闇�姹傚悕绉�"]
+ , "HDate": Format(new Date(tableMain[0]["鏃ユ湡"]), "yyyy-MM-dd")
+ , "HTaskNote": tableMain[0]["闇�姹傛弿杩�"]
+ , "HType": tableMain[0]["闇�姹傜被鍨�"]
+ , "HSendEmp": tableMain[0]["瀹㈡埛鎻愬嚭浜�"]
+ , "HReceiveEmp": tableMain[0]["鎺ユ敹浜�"]
+ , "HCopyEmp": tableMain[0]["鎶勯�佷汉"]
+ , "HRemark": tableMain[0]["琛ㄥご澶囨敞"]
+ , "HTaskStatus": tableMain[0]["闇�姹傜姸鎬�"]
+ , "HOrderLevID": tableMain[0]["HOrderLevID"]
+ , "HLastDate": Format(new Date(tableMain[0]["瑕佹眰瀹屾垚鏃ユ湡"]), "yyyy-MM-dd")
+ , "HOrgID": tableMain[0]["HOrgID"]
+
+ });
+
+ }
+ })
+ }
+
//#endregion
//#region 瀹℃牳
--
Gitblit v1.9.1