From 22870b2ceda5ea1dc4e83c8b8d6a11973b834be3 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 24 八月 2023 15:37:56 +0800
Subject: [PATCH] 指引卡开工单列表 指引卡完工单列表
---
WebTM/views/项目管理/工作任务/PM_WorkTaskBill.html | 58 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 32 insertions(+), 26 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 f9b4b71..e1d02f5 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"
@@ -59,10 +59,10 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
+ <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CloseBill" id="set_CloseBill">鍏抽棴</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">鍙嶅叧闂�</button>
+ <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">
<ul class="layui-tab-title" lay-filter="tab-all">
@@ -75,7 +75,7 @@
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�*</label>
+ <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" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
@@ -88,7 +88,7 @@
</div>
</div>-->
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">椤圭洰浠ｇ爜*</label>
+ <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="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">-->
@@ -106,7 +106,7 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">椤圭洰闃舵*</label>
+ <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="HProjectStageName" name="HProjectStageName" id="HProjectStageName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HProjectStageID" id="HProjectStageID" lay-verify="HProjectStageID" value="0">
@@ -122,7 +122,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
+ <label class="layui-form-label" style="width: 85px;">鏃ユ湡<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px; width:180px;">
<input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
</div>
@@ -158,7 +158,7 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">娲惧崟浜�*</label>
+ <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="HSendEmp" name="HSendEmp" id="HSendEmp" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<!--<input type="hidden" name="HPMEmpID" id="HPMEmpID" lay-verify="HPMEmpID" value="0">-->
@@ -199,7 +199,7 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">澶囨敞<label style="color:red"> * </label></label>
+ <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
<div class="layui-input-block" style="margin-left: 120px; width: 501px;">
<input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
</div>
@@ -207,7 +207,7 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">缁勭粐*</label>
+ <label class="layui-form-label" style="width: 85px;">缁勭粐<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px; width: 501px;">
<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
@@ -591,8 +591,18 @@
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
- $("#HProNumber").val(checkStatus.data[0].HProNumber);//宸ョ▼椤圭洰浠ｇ爜
- $("#HProName").val(checkStatus.data[0].HProName);//宸ョ▼椤圭洰浠ｇ爜
+ //鍒ゆ柇椤圭洰鏄惁鍏抽棴
+ if (checkStatus.data[0].鍏抽棴浜� == null || checkStatus.data[0].鍏抽棴浜� == "") {
+ $("#HProNumber").val(checkStatus.data[0].椤圭洰浠ｇ爜);//宸ョ▼椤圭洰浠ｇ爜
+ $("#HProName").val(checkStatus.data[0].椤圭洰鍚嶇О);//宸ョ▼椤圭洰浠ｇ爜
+ $("#HProjectStageID").val(checkStatus.data[0].HProjectStageID);//宸ョ▼椤圭洰浠ｇ爜
+ $("#HProjectStageName").val(checkStatus.data[0].椤圭洰闃舵);//宸ョ▼椤圭洰浠ｇ爜
+ } else {
+ layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
+ }
+
+
+
layer.close(index);//鍏抽棴寮圭獥
}
, btn2: function (index, layero) { }
@@ -623,10 +633,7 @@
}
$("#HProjectStageID").val(checkStatus.data[0].HItemID);//椤圭洰闃舵id
- $("#HProjectStageName").val(checkStatus.data[0].HName);//椤圭洰闃舵鍚嶇О
- if ($("#HProjectStageName").val() == "") {
- $("#HProjectStageName").val(checkStatus.data[0].HNumber);
- }
+ $("#HProjectStageName").val(checkStatus.data[0].闃舵鍚嶇О);//椤圭洰闃舵鍚嶇О
layer.close(index);//鍏抽棴寮圭獥
}
, btn2: function (index, layero) { }
@@ -795,14 +802,14 @@
, "HMaker": tableMain[0]["HMaker"]
, "HUpdater": tableMain[0]["HUpdater"]
, "HChecker": tableMain[0]["HChecker"]
- , "HMakerDate": tableMain[0]["HMakerDate"] == null ? "" : Format(new Date(tableMain[0]["HMakerDate"]), "yy-MM-dd")
- , "HUpdaterDate": tableMain[0]["HUpdaterDate"] == null ? "" : Format(new Date(tableMain[0]["HUpdaterDate"]), "yy-MM-dd")
- , "HCheckerDate": tableMain[0]["HCheckerDate"] == null ? "" : Format(new Date(tableMain[0]["HCheckerDate"]), "yy-MM-dd")
+ , "HMakerDate": tableMain[0]["HMakerDate"] == null ? "" : Format(new Date(tableMain[0]["HMakerDate"]), "yyyy-MM-dd")
+ , "HUpdaterDate": tableMain[0]["HUpdaterDate"] == null ? "" : Format(new Date(tableMain[0]["HUpdaterDate"]), "yyyy-MM-dd")
+ , "HCheckerDate": tableMain[0]["HCheckerDate"] == null ? "" : Format(new Date(tableMain[0]["HCheckerDate"]), "yyyy-MM-dd")
, "HCloseMan": tableMain[0]["HCloseMan"]
, "HDeleteMan": tableMain[0]["HDeleteMan"]
, "HBacker": tableMain[0]["HBacker"]
- , "HCloseManDate": tableMain[0]["HCloseManDate"] == null ? "" : Format(new Date(tableMain[0]["HCloseManDate"]), "yyyy-MM-dd")
- , "HDeleteManDate": tableMain[0]["HDeleteManDate"] == null ? "" : tFormat(new Date(tableMain[0]["HDeleteManDate"]), "yyyy-MM-dd")
+ , "HCloseManDate": tableMain[0]["HCloseDate"] == null ? "" : Format(new Date(tableMain[0]["HCloseDate"]), "yyyy-MM-dd")
+ , "HDeleteManDate": tableMain[0]["HDeleteDate"] == null ? "" : Format(new Date(tableMain[0]["HDeleteDate"]), "yyyy-MM-dd")
, "HBackerDate": tableMain[0]["HBackerDate"] == null ? "" : Format(new Date(tableMain[0]["HBackerDate"]), "yyyy-MM-dd")
, "HBackRemark": tableMain[0]["HBackRemark"]
});
@@ -921,16 +928,11 @@
layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
return false;
}
-
if ($("#HProNumber").val() == "") {
layer.msg("椤圭洰浠ｇ爜涓嶈兘涓虹┖!");
return false;
}
- if ($("#HProName").val() == "") {
- layer.msg("椤圭洰鍚嶇О涓嶈兘涓虹┖!");
- return false;
- }
- if ($("#HProjectStageName").val() == "") {
+ if ($("#HProjectStageID").val() == "0") {
layer.msg("椤圭洰闃舵娌℃湁閫夋嫨!");
return false;
}
@@ -938,6 +940,10 @@
layer.msg("浠诲姟鍚嶇О涓嶈兘涓虹┖!");
return false;
}
+ if ($("#HDate").val() == "") {
+ layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
+ return false;
+ }
if ($("#HSendEmp").val() == "") {
layer.msg("娲惧崟浜烘病鏈夐�夋嫨!");
return false;
--
Gitblit v1.9.1