From 38e570f110201c3f50b5c5a745586a3561f177ac Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 26 六月 2025 14:34:39 +0800
Subject: [PATCH] 工程界面: 新建工程项目页面 工程界面: 新增工程费用页面
---
WebTM/WebTM.csproj.user | 2
WebTM/views/项目管理/工程项目/PM_ProjectTaskFeesQuery.html | 651 +++++++++++++++++---------
WebTM/views/项目管理/工程项目/PM_ProjectTaskStepsQuery.html | 767 ++++++++++++++++++++-----------
3 files changed, 905 insertions(+), 515 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 2f7c57c..cbf1153 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -4,7 +4,7 @@
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ShowAllFiles</ProjectView>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
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_ProjectTaskFeesQuery.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_ProjectTaskFeesQuery.html"
index f856190..a1a7e24 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_ProjectTaskFeesQuery.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_ProjectTaskFeesQuery.html"
@@ -1,11 +1,13 @@
锘�<!DOCTYPE html>
<html>
+
<head>
<meta charset="utf-8" />
- <title>宸ョ▼闃舵鍒楄〃</title>
+ <title>宸ョ▼璐圭敤鍒楄〃</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <meta name="viewport"
+ content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<!--寮曠敤layui鏍峰紡鏂囦欢-->
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
@@ -19,16 +21,21 @@
<script src="../../../layuiadmin/PageTitle.js"></script>
<script src="../../../layuiadmin/HideButton.js"></script>
<script src="../../../layuiadmin/SetColumn.js"></script>
+ <script src="../../../layuiadmin/common.js"></script>
<style type="text/css">
/* 绂佺敤鐘舵�佷笅鐨勮緭鍏ユ鏍峰紡 */
input:disabled {
- background-color: #f0f0f0; /* 娴呯伆鑹� */
- color: #888888; /* 鐏拌壊 */
+ background-color: #f0f0f0;
+ /* 娴呯伆鑹� */
+ color: #888888;
+ /* 鐏拌壊 */
}
textarea:disabled {
- background-color: #f0f0f0; /* 娴呯伆鑹� */
- color: #888888; /* 鐏拌壊 */
+ background-color: #f0f0f0;
+ /* 娴呯伆鑹� */
+ color: #888888;
+ /* 鐏拌壊 */
}
.operate-zone {
@@ -38,14 +45,49 @@
align-items: center;
padding: 20px 0;
}
+
+ /* 鑷畾涔夌被锛岄伩鍏嶄笌LayUI鍘熺敓鏍峰紡鍐茬獊 */
+ .custom-form-item {
+ display: flex;
+ align-items: flex-start;
+ }
+
+ .custom-form-label {
+ width: 100px !important;
+ flex-shrink: 0;
+ padding-left: 0;
+ padding-right: 15px;
+ text-align: right;
+ }
+
+ .custom-input-block {
+ margin-left: 5px !important;
+ flex-grow: 1;
+ }
+
+ .custom-input-block textarea,
+ .custom-input-block input {
+ width: 100% !important;
+ box-sizing: border-box;
+ }
+
+ .custom-input-block textarea {
+ padding-top: 5px;
+ }
+
+ label[hidden] {
+ display: none;
+ }
</style>
</head>
+
<body>
<div id="layout1" class="layui-fluid">
<div class="layui-col-md12">
- <div class="layui-card" style="">
+ <div class="layui-card">
<div class="layui-card-body" style="padding:1px">
- <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <form class="layui-form" action="" lay-filter="formData" id="formData"
+ style="background-color:white;">
<div class="layui-col-xs6">
<div class="layui-tab layui-tab-card" lay-filter="table">
<ul class="layui-tab-title">
@@ -54,11 +96,27 @@
<div class="layui-tab-content" style="padding:0px;">
<div class="layui-tab-item layui-show">
<div class="layui-row" style="background: #fff;padding: 10px 0;">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 64px;padding: 9px 18px;">宸ョ▼缂栧彿</label>
- <div class="layui-input-block" style="margin-left: 64px;">
- <input type="hidden" class="layui-input" lay-filter="HDeptID" name="HDeptID" id="HDeptID" value="0" style="background-color:#efefef4d;display: inline-block;" disabled>
- <input type="text" class="layui-input" lay-filter="HDeptName" name="HDeptName" id="HDeptName" value="" style="width: 80%;display: inline-block;">
+ <div class="layui-inline custom-form-item"
+ style="width: 33%; display: inline-flex;">
+ <label class="layui-form-label custom-form-label"
+ style="width: 64px;padding: 9px 18px;">宸ョ▼缂栧彿</label>
+ <div class="layui-input-block custom-input-block"
+ style="margin-left: 64px;">
+ <input type="text" class="layui-input"
+ lay-filter="HProjNumberSearch" name="HProjNumberSearch"
+ id="HProjNumberSearch" value=""
+ style="min-width: 100px;display: inline-block;">
+ </div>
+ </div>
+ <div class="layui-inline custom-form-item"
+ style="width: 33%; display: inline-flex;">
+ <label class="layui-form-label custom-form-label"
+ style="width: 64px;padding: 9px 18px;">宸ョ▼鍚嶇О</label>
+ <div class="layui-input-block custom-input-block"
+ style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-filter="HProjNameSearch"
+ name="HProjNameSearch" id="HProjNameSearch" value=""
+ style="display: inline-block;min-width: 100px;">
<!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptID" id="btnHDeptID" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>-->
@@ -66,19 +124,12 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 64px;padding: 9px 18px;">宸ョ▼鍚嶇О</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="hidden" class="layui-input" lay-filter="HDeptID" name="HDeptID" id="HDeptID" value="0" style="background-color:#efefef4d;display: inline-block;" disabled>
- <input type="text" class="layui-input" lay-filter="HDeptName" name="HDeptName" id="HDeptName" value="" style="width: 80%;display: inline-block;">
- <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptID" id="btnHDeptID" 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">
- <button class="layui-btn layui-btn-normal" style="margin-left: 40px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 5px" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 40px"
+ type="button" lay-submit="" lay-filter="btnSearch"
+ id="btnSearch">鏌ヨ</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 5px"
+ type="button" lay-submit="" lay-filter="btnReSearch"
+ id="btnReSearch">閲嶇疆</button>
<!--<button class="layui-btn layui-btn-normal" style="margin-left: 5px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>-->
</div>
</div>
@@ -102,42 +153,62 @@
<div class="layui-tab-content" style="padding:0px;">
<!--鍩烘湰淇℃伅-->
<div class="layui-tab-item layui-show">
- <div id="projectMessage" class="layui-form-item" style="padding-top: 10px; background-color: white" lay-filter="">
+ <div id="projectMessage" class="layui-form-item"
+ style="padding-top: 10px; background-color: white" lay-filter="">
<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;">
- <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled>
- <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
- <input type="hidden" name="HBillSubType" id="HBillSubType" value="">
+ <input type="text" class="layui-input" name="HProcType"
+ lay-verify="HProcType" id="HProcType" disabled>
</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="HProNumber" name="HProNumber" id="HProNumber" disabled>
+ <input type="text" class="layui-input" lay-verify="HProNumber"
+ name="HProNumber" id="HProNumber" disabled>
</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;">
- <input type="text" class="layui-input" lay-verify="HProName" name="HProName" id="HProName" disabled>
+ <div class="layui-input-block"
+ style="margin-left: 120px; width: 180px;">
+ <input type="date" class="layui-input" lay-verify="HReDate"
+ name="HReDate" id="HReDate" style="padding-left: 40px;"
+ disabled>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">浠诲姟鍗曠紪鍙�</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: 40px;" disabled>
+ <div class="layui-input-block"
+ style="margin-left: 120px; width:180px;">
+ <input type="text" class="layui-input" lay-verify="HPicNo"
+ name="HPicNo" id="HPicNo" style="padding-left: 40px;"
+ disabled>
</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; width:180px;">
- <input type="text" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 40px;" disabled>
+ <div class="layui-input-block"
+ style="margin-left: 120px; width:180px;">
+ <input type="text" class="layui-input" lay-verify="HDate"
+ name="HDate" id="HDate" style="padding-left: 40px;"
+ disabled>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline custom-form-item">
+ <label class="layui-form-label custom-form-label"
+ style="width: 85px;">宸ョ▼鍚嶇О</label>
+ <div class="layui-input-block custom-input-block">
+ <input type="text" class="layui-input" lay-verify="HProName"
+ name="HProName" id="HProName" disabled>
</div>
</div>
</div>
@@ -145,53 +216,102 @@
<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="HProName" name="HProName" id="HProName" disabled>
+ <input type="text" class="layui-input"
+ lay-verify="HProPMEmpName1" name="HProPMEmpName1"
+ id="HProPMEmpName1" disabled>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏂藉伐鍛�</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: 40px;" disabled>
+ <div class="layui-input-block"
+ style="margin-left: 120px; width:180px;">
+ <input type="text" class="layui-input" lay-verify="HWorkerName1"
+ name="HWorkerName1" id="HWorkerName1"
+ disabled>
</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;">
- <input type="text" class="layui-input" lay-verify="HProName" name="HProName" id="HProName" disabled>
+ <div class="layui-input-block"
+ style="margin-left: 120px; width:180px;">
+ <input type="text" class="layui-input"
+ lay-verify="HMangerEmpName1" name="HMangerEmpName1"
+ id="HMangerEmpName1" disabled>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">瀹屽伐鏃ユ湡</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: 40px;" disabled>
+ <div class="layui-input-block"
+ style="margin-left: 120px; width:180px;">
+ <input type="date" class="layui-input" lay-verify="HEndDate1"
+ name="HEndDate1" id="HEndDate1" style="padding-left: 40px;"
+ disabled>
</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 style="width: 600px;height:5rem; display: inline-block; resize: vertical;" type="text" class="layui-input" name="HTaskWorkEmp" lay-verify="HTaskWorkEmp" id="HTaskWorkEmp" disabled></textarea>
+ <div class="layui-inline custom-form-item"> <!-- 娣诲姞鑷畾涔夌被 -->
+ <label class="layui-form-label custom-form-label"
+ id="projectContent">宸ョ▼鍐呭</label>
+ <!-- <label class="layui-form-label custom-form-label" id="projContent">宸ョ▼鍐呭</label> -->
+ <div class="layui-input-block custom-input-block">
+ <textarea type="text" class="layui-input" name="HProjectNote"
+ lay-verify="HProjectNote" id="HProjectNote"></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 style="width: 600px; display: inline-block; resize: vertical;" type="text" class="layui-input" name="HTaskRemark" lay-verify="HTaskRemark" id="HTaskRemark" disabled></textarea>
+ <div class="layui-inline custom-form-item">
+ <label class="layui-form-label custom-form-label">瀹㈡埛</label>
+ <div class="layui-input-block custom-input-block">
+ <input type="text" class="layui-input" name="HCusName"
+ lay-verify="HCusName" id="HCusName" disabled></input>
+ <input type="hidden" class="layui-input" name="HCusID"
+ lay-verify="HCusID" id="HCusID" disabled></input>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline custom-form-item">
+ <label class="layui-form-label custom-form-label"
+ style="width: 85px;">鏂藉伐瀹屾垚鎯呭喌</label>
+ <div class="layui-input-block custom-input-block"
+ style="margin-left: 120px;">
+ <textarea
+ style="width: 600px;height:5rem; display: inline-block; resize: vertical;"
+ type="text" class="layui-input" name="HWorkProcNote"
+ lay-verify="HWorkProcNote" id="HWorkProcNote"
+ disabled></textarea>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline custom-form-item">
+ <label class="layui-form-label custom-form-label"
+ style="width: 85px;">澶囨敞</label>
+ <div class="layui-input-block custom-input-block"
+ style="margin-left: 120px;">
+ <textarea
+ style="width: 600px; display: inline-block; resize: vertical;"
+ type="text" class="layui-input" name="HRemark"
+ lay-verify="HRemark" id="HRemark" disabled></textarea>
</div>
</div>
</div>
+
<div class="operate-zone" id="operateZone">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveBill" id="saveBill">淇濆瓨</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Exit" id="exit">閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled"
+ lay-submit lay-event="set_SaveBill" id="saveBill"
+ lay-filter="saveBill" disabled>淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-sm"
+ lay-event="set_Exit" id="exit">閫�鍑�</button>
</div>
</div>
- <div class="layui-tab" lay-filter="tab-POStockInBill" style=" background-color: white">
+ <div class="layui-tab" lay-filter="tab-POStockInBill"
+ style=" background-color: white">
<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container" id="toolbarDemo_ButtonSet">
@@ -202,40 +322,49 @@
</div>
</div>
</div>
-
+ <div class="layui-inline" hidden>
+ <div class="layui-input-block">
+ <input type="hidden" class="layui-input" name="HInterID" lay-verify="HInterID"
+ id="HInterID" disabled></input>
+ </div>
+ </div>
</div>
</form>
</div>
</div>
</div>
</div>
-
- <template id="step1">
+ <!-- 宸ヨ垂褰曞叆 -->
+ <template id="workFeeEntry">
<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;">
- <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled>
+ <input type="text" class="layui-input" name="HYuSuanMoney" lay-verify="HYuSuanMoney"
+ id="HYuSuanMoney" disabled>
</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="HProNumber" name="HProNumber" id="HProNumber">
+ <input type="text" class="layui-input" lay-verify="HYuShouKuanMoney" name="HYuShouKuanMoney"
+ id="HYuShouKuanMoney">
</div>
</div>
</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>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled>
+ <input type="text" class="layui-input" name="HJieSuanMoney" lay-verify="HJieSuanMoney"
+ id="HJieSuanMoney" disabled>
</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="text" class="layui-input" lay-verify="HProNumber" name="HProNumber" id="HProNumber" disabled>
+ <input type="text" class="layui-input" lay-verify="HHeTongMoney" name="HHeTongMoney"
+ id="HHeTongMoney" disabled>
</div>
</div>
</div>
@@ -243,7 +372,8 @@
<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" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled>
+ <input type="text" class="layui-input" name="HShenJiMoney" lay-verify="HShenJiMoney"
+ id="HShenJiMoney" disabled>
<input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
<input type="hidden" name="HBillSubType" id="HBillSubType" value="">
</div>
@@ -251,40 +381,43 @@
<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="HProNumber" name="HProNumber" id="HProNumber" disabled>
+ <input type="text" class="layui-input" lay-verify="HBanZuMoney" name="HBanZuMoney" id="HBanZuMoney"
+ disabled>
</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;">
- <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled>
- <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
- <input type="hidden" name="HBillSubType" id="HBillSubType" value="">
+ <div class="layui-input-block" style="margin-left: 120px; width:180px;">
+ <input disabled type="date" class="layui-input" name="HBeginDate" lay-verify="HBeginDate"
+ id="HBeginDate" style="padding-left: 40px;">
</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="HProNumber" name="HProNumber" id="HProNumber">
+ <div class="layui-input-block" style="margin-left: 120px; width:180px;">
+ <input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate"
+ style="padding-left: 40px;">
</div>
</div>
</div>
</template>
-
- <template id="step2">
+ <!-- 闆舵槦椤圭洰褰曞叆 -->
+ <template id="SporadicProjectsEntry">
<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;">
- <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo">
+ <input type="text" class="layui-input" name="HCaiLiaoMoney" lay-verify="HCaiLiaoMoney"
+ id="HCaiLiaoMoney">
</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="HProNumber" name="HProNumber" id="HProNumber" disabled>
+ <input type="text" class="layui-input" lay-verify="HYuShouKuanMoney" name="HYuShouKuanMoney"
+ id="HYuShouKuanMoney" disabled>
</div>
</div>
</div>
@@ -292,7 +425,8 @@
<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" name="HBillNo" lay-verify="HBillNo" id="HBillNo">
+ <input type="text" class="layui-input" name="HAnZhuangMoney" lay-verify="HAnZhuangMoney"
+ id="HAnZhuangMoney">
<input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
<input type="hidden" name="HBillSubType" id="HBillSubType" value="">
</div>
@@ -300,7 +434,7 @@
<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="HProNumber" name="HProNumber" id="HProNumber">
+ <input type="text" class="layui-input" lay-verify="HBanZuMoney" name="HBanZuMoney" id="HBanZuMoney">
</div>
</div>
</div>
@@ -308,23 +442,28 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">缁撶畻缁撹处鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="date" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" data-required="true">
+ <input type="date" class="layui-input" name="HAccountDate" lay-verify="HAccountDate"
+ id="HAccountDate" data-required="true">
</div>
</div>
</div>
</template>
- <template id="step3">
+
+ <!-- 宸ョ▼缁撶畻閫犱环褰曞叆 -->
+ <template id="ProjectFeeSettleEntry">
<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;">
- <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo">
+ <input type="text" class="layui-input" name="HYuSuanMoney" lay-verify="HYuSuanMoney"
+ id="HYuSuanMoney">
</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="HProNumber" name="HProNumber" id="HProNumber">
+ <input type="text" class="layui-input" lay-verify="HYuShouKuanMoney" name="HYuShouKuanMoney"
+ id="HYuShouKuanMoney">
</div>
</div>
</div>
@@ -332,7 +471,8 @@
<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" name="HBillNo" lay-verify="HBillNo" id="HBillNo">
+ <input type="text" class="layui-input" name="HJieSuanMoney" lay-verify="HJieSuanMoney"
+ id="HJieSuanMoney">
<input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
<input type="hidden" name="HBillSubType" id="HBillSubType" value="">
</div>
@@ -340,7 +480,8 @@
<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="HProNumber" name="HProNumber" id="HProNumber">
+ <input type="text" class="layui-input" lay-verify="HHeTongMoney" name="HHeTongMoney"
+ id="HHeTongMoney">
</div>
</div>
</div>
@@ -348,29 +489,34 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">瀹¤閫犱环</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="date" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo">
+ <input type="text" class="layui-input" name="HShenJiMoney" lay-verify="HShenJiMoney"
+ id="HShenJiMoney">
</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="date" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled>
+ <input type="text" class="layui-input" name="HBanZuMoney" lay-verify="HBanZuMoney" id="HBanZuMoney"
+ disabled>
</div>
</div>
</div>
</template>
- <template id="step4">
+ <!-- 宸ヨ垂瀹℃牳 -->
+ <template id="WorkFeeCheck">
<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;">
- <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled>
+ <input type="text" class="layui-input" name="HYuShouKuanMoney" lay-verify="HYuShouKuanMoney"
+ id="HYuShouKuanMoney" disabled>
</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="HProNumber" name="HProNumber" id="HProNumber" disabled>
+ <input type="text" class="layui-input" lay-verify="HCaiLiaoMoney" name="HCaiLiaoMoney"
+ id="HCaiLiaoMoney" disabled>
</div>
</div>
</div>
@@ -378,13 +524,15 @@
<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" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled>
+ <input type="text" class="layui-input" name="HYuSuanMoney" lay-verify="HYuSuanMoney"
+ id="HYuSuanMoney" disabled>
</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="HProNumber" name="HProNumber" id="HProNumber" disabled>
+ <input type="text" class="layui-input" lay-verify="HAnZhuangMoney" name="HAnZhuangMoney"
+ id="HAnZhuangMoney" disabled>
</div>
</div>
</div>
@@ -392,13 +540,15 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">缁撶畻閫犱环</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="date" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled>
+ <input type="text" class="layui-input" name="HJieSuanMoney" lay-verify="HJieSuanMoney"
+ id="HJieSuanMoney" disabled>
</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="date" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled>
+ <input type="text" class="layui-input" name="HHeTongMoney" lay-verify="HHeTongMoney"
+ id="HHeTongMoney" disabled>
</div>
</div>
</div>
@@ -406,43 +556,49 @@
<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" name="HBillNo" lay-verify="HBillNo" id="HBillNo">
+ <input type="text" class="layui-input" name="HShenJiMoney" lay-verify="HShenJiMoney"
+ id="HShenJiMoney" disabled>
</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="HProNumber" name="HProNumber" id="HProNumber">
+ <input type="text" class="layui-input" lay-verify="HBanZuMoney" name="HBanZuMoney" id="HBanZuMoney">
</div>
</div>
</div>
<div class="layui-row">
- <div class="layui-inline" style="visibility: hidden">
- <label class="layui-form-label" style="width: 85px;"></label>
+ <div class="layui-inline" style="visibility: hidden;">
+ <label class="layui-form-label" style="width: 85px;">鍗犱綅</label>
<div class="layui-input-block" style="margin-left: 120px;">
-
+ <input type="text" class="layui-input" disabled>
</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="date" class="layui-input" lay-verify="HProNumber" name="HProNumber" id="HProNumber" data-required="true">
+ <input type="date" class="layui-input" lay-verify="HAccountWorkMoneyDate"
+ name="HAccountWorkMoneyDate" id="HAccountWorkMoneyDate" data-required="true">
</div>
</div>
</div>
</template>
- <template id="step5">
+
+ <!-- 宸ョ▼椤圭洰閫犱环瀹℃牳 -->
+ <template id="ProjectFeeCheck">
<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;">
- <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" >
+ <input type="text" class="layui-input" name="HYuShouKuanMoney" lay-verify="HYuShouKuanMoney"
+ id="HYuShouKuanMoney">
</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="HProNumber" name="HProNumber" id="HProNumber" >
+ <input type="text" class="layui-input" lay-verify="HCaiLiaoMoney" name="HCaiLiaoMoney"
+ id="HCaiLiaoMoney">
</div>
</div>
</div>
@@ -450,13 +606,15 @@
<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" name="HBillNo" lay-verify="HBillNo" id="HBillNo" >
+ <input type="text" class="layui-input" name="HYuSuanMoney" lay-verify="HYuSuanMoney"
+ id="HYuSuanMoney">
</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="HProNumber" name="HProNumber" id="HProNumber" >
+ <input type="text" class="layui-input" lay-verify="HAnZhuangMoney" name="HAnZhuangMoney"
+ id="HAnZhuangMoney">
</div>
</div>
</div>
@@ -464,13 +622,15 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">缁撶畻閫犱环</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="date" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" >
+ <input type="text" class="layui-input" name="HJieSuanMoney" lay-verify="HJieSuanMoney"
+ id="HJieSuanMoney">
</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="date" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" >
+ <input type="text" class="layui-input" name="HHeTongMoney" lay-verify="HHeTongMoney"
+ id="HHeTongMoney">
</div>
</div>
</div>
@@ -478,54 +638,59 @@
<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" name="HBillNo" lay-verify="HBillNo" id="HBillNo">
+ <input type="text" class="layui-input" name="HShenJiMoney" lay-verify="HShenJiMoney"
+ id="HShenJiMoney">
</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="HProNumber" name="HProNumber" id="HProNumber" disabled>
+ <input type="text" class="layui-input" lay-verify="HBanZuMoney" name="HBanZuMoney" id="HBanZuMoney"
+ disabled>
</div>
</div>
</div>
<div class="layui-row">
- <div class="layui-inline" style="visibility: hidden">
- <label class="layui-form-label" style="width: 85px;"></label>
+ <div class="layui-inline" style="visibility: hidden;">
+ <label class="layui-form-label" style="width: 85px;">鍗犱綅</label>
<div class="layui-input-block" style="margin-left: 120px;">
-
+ <input type="text" class="layui-input" disabled>
</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="date" class="layui-input" lay-verify="HProNumber" name="HProNumber" id="HProNumber" data-required="true">
+ <input type="date" class="layui-input" lay-verify="HAccountDate" name="HAccountDate"
+ id="HAccountDate" data-required="true">
</div>
</div>
</div>
</template>
<script>
- var type;
+ var params = get_UrlVars()
+ var type = params[params[0]] // 绗�0涓弬鏁拌〃绀洪�掑叆鐨勫弬鏁�
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
- //#region 鍏敤鍙橀噺
+ }).use(['index', 'form', 'laydate', 'table', 'element','util'], function () {
+ //#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
, table = layui.table
, form = layui.form
, laydate = layui.laydate
- , element = layui.element;
+ , element = layui.element
+ , util = layui.util;
var option = [];
var optionNeedSave = [];
var ins; //鐢ㄤ簬瀵煎嚭excel
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["hmainid", "HBillType", "HSupID", "HPSStyleID", "HSSID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID", "HUnitID",
- "HFeedback", "HPriority", "HUserID", "甯佸埆浠ｇ爜", "閲囪喘鏂瑰紡浠ｇ爜", "缁撶畻鏂瑰紡浠ｇ爜", "閮ㄩ棬浠ｇ爜", "涓荤浠ｇ爜", "涓氬姟鍛樹唬鐮�", "璁￠噺鍗曚綅浠ｇ爜", "HSaveFlowStatusID", "HSaveFlowID","HSaveItemID"];
+ "HFeedback", "HPriority", "HUserID", "甯佸埆浠ｇ爜", "閲囪喘鏂瑰紡浠ｇ爜", "缁撶畻鏂瑰紡浠ｇ爜", "閮ㄩ棬浠ｇ爜", "涓荤浠ｇ爜", "涓氬姟鍛樹唬鐮�", "璁￠噺鍗曚綅浠ｇ爜", "HSaveFlowStatusID", "HSaveFlowID", "HSaveItemID"];
//#endregion
var HModName = "PM_ProjectTaskNeedSaveQuery";
var HModName2 = "PM_ProjectTaskNeedSaveQuery_SellOut";
@@ -593,8 +758,8 @@
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function () {
- $("#HDeptID").val(0);//杞﹂棿id
- $("#HDeptName").val("");//杞﹂棿鍚嶇О
+ $("#HProjNumberSearch").val("")
+ $("#HProjNameSearch").val("")
})
//#region 閫�鍑�
@@ -640,7 +805,8 @@
//obj.tr.find('.layui-form-radio').addClass('layui-form-radioed');
//鏄剧ず椤圭洰淇℃伅
- RoadBillMain(obj.data["HInterID"]);
+ $("#saveBill").removeClass("layui-btn-disabled").attr("disabled", false)
+ RoadBillMain(obj.data);
})
//#endregion
@@ -715,11 +881,16 @@
//蹇�熻繃婊�
function get_FastQuery() {
- var HDept = $("#HDeptID").val();
+ let HProjNumberSearch = $("#HProjNumberSearch").val()
+ let HProjNameSearch = $("#HProjNameSearch").val()
//鍒濆璇濇寜閽偣鍑�
- var sWhere = " '" + addSWhereByOpenType() + "'";
- if (HDept) {
- sWhere += "," + HDept
+ var sWhere = " and 鍗曟嵁瀛愮被鍨� = N'椤圭洰绫�'" + addSWhereByOpenType();
+
+ if (isEmpty(HProjNumberSearch) === false) {
+ sWhere += " and 宸ョ▼缂栧彿 like '\%" + HProjNumberSearch + "\%'"
+ }
+ if (isEmpty(HProjNameSearch) === false) {
+ sWhere += " and 宸ョ▼鍚嶇О like '\%" + HProjNameSearch + "\%'"
}
//鏌ヨ
get_Display(sWhere);
@@ -798,7 +969,7 @@
, height: 'full-120'
, limit: 50
, limits: [50, 500, 5000, 20000]
- , data : []
+ , data: []
};
option = {
@@ -819,10 +990,10 @@
function get_Display(sWhere) {
var ajaxLoad = layer.load();//閬僵
$.ajax({
- url: GetWEBURL() + '/PM_ProjectBill/NeedSaveQuery',
+ url: GetWEBURL() + '/PM_ProjectBill_WorkFee/list',
type: "GET",
async: false,
- data: { "user": sessionStorage["HUserName"], "sWhere": sWhere },
+ data: { "user": sessionStorage["HUserName"], "sWhere": sWhere, "stage": type },
success: function (data1) {
if (data1.count == 1) {
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -871,68 +1042,110 @@
}
});
- }
+ }
+ //#endregion
+
+ //#region 琛ㄥ崟淇濆瓨鏁版嵁
+ form.on('submit(saveBill)', function (data) {
+ let requires = $("[data-required]")
+ let formValidate = 1;
+ requires.each(function () {
+ let $element = $(this);
+ if (isEmpty($element.val()) === true) {
+ let labelText = $element.closest(".layui-inline").find("label")[0].innerText
+ formValidate = 0
+ layer.alert(labelText + ": 鍊间笉鑳戒负绌�!");
+ return
+ }
+ })
+ if (formValidate == 0) {
+ return
+ }
+
+ let d = data.field
+ var HInterID = d.HInterID;
+ let sMainStr = JSON.stringify(d);
+ sMainStr = sMainStr + ";" + type + ";" + sessionStorage["HUserName"];
+ if (HInterID != 0) {
+ //閫昏緫淇濆瓨鏂规硶
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/PM_ProjectBill_WorkFee/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "oMainStr": sMainStr },
+ success: function (result) {
+ if (result.count == 1) {
+ //if (type =="OtherMoneySave") {
+ // //鏇存柊浠诲姟鏉愭枡璐�
+ // set_SaveHTaskMaterMoney(HInterID)
+ //}
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ $("#saveBill").addClass("layui-btn-disabled").attr("disabled", true)
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ get_FastQuery();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ })
//#endregion
//#region 缂栬緫 椤甸潰璧嬪��
- function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+ function RoadBillMain(data)//鍔犺浇琛ㄥご
{
- $.ajax({
- url: GetWEBURL() + "/PM_ProjectBill/editInit",
- type: "GET",
- async: false,
- data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
- success: function (result) {
- var tableMain = result.data[0];
- //涓昏〃 璧嬪��
- form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HInterID": tableMain[0]["HInterID"]
- , "HProNumber": tableMain[0]["HProNumber"]
- , "HProName": tableMain[0]["HProName"]
- , "HBillNo": tableMain[0]["HBillNo"]
- , "HDate": Format(new Date(tableMain[0]["HDate"]), "yyyy-MM-dd")
- ,"HTaskMaterMoney": tableMain[0]["HTaskMaterMoney"],
- "HTaskSetupMoney": tableMain[0]["HTaskSetupMoney"],
- "HTaskOtherMoney": tableMain[0]["HTaskOtherMoney"],
- "HTaskExamMoney": tableMain[0]["HTaskExamMoney"],
- "HTaskWorkMoney": tableMain[0]["HTaskWorkMoney"],
- "HTaskClassName": tableMain[0]["HTaskClassName"],
- "HIsAccount": tableMain[0]["HIsAccount"],
- "HAccountWorkMoneyDate": tableMain[0]["HAccountWorkMoneyDate"],
- "HAccountDate": tableMain[0]["HAccountDate"],
- "HTaskClassEntryName": tableMain[0]["HTaskClassEntryName"],
- "HTaskAddress": tableMain[0]["HTaskAddress"],
- "HBreakStatus": tableMain[0]["HBreakStatus"],
- "HPipeDiameter": tableMain[0]["HPipeDiameter"],
- "HReceTime": tableMain[0]["HReceTime"],
- "HTaskBTime": tableMain[0]["HTaskBTime"],
- "HTaskETime": tableMain[0]["HTaskETime"],
- "HTaskNote": tableMain[0]["HTaskNote"],
- "HTaskWorkEmp": tableMain[0]["HTaskWorkEmp"],
- "HTaskRemark": tableMain[0]["HTaskRemark"]
+ debugger
+ form.val("formData", {
+ HInterID: data["HInterID"], // 闅愯棌瀛楁
+ HProNumber: data["宸ョ▼缂栧彿"], // 瀵瑰簲鍓嶇name="HProNumber"
+ HReDate: isEmpty(data["鍙楃悊鏃ユ湡"]) === true ? "" : util.toDateString(data["鍙楃悊鏃ユ湡"], "yyyy-MM-dd"), // 瀵瑰簲name="HReDate"
+ HPicNo: data["浠诲姟鍗曠紪鍙�"], // 瀵瑰簲name="HPicNo"
+ HProName: data["宸ョ▼鍚嶇О"], // 瀵瑰簲name="HProName"
+ HProjectNote: data["椤圭洰鍐呭"], // 瀵瑰簲name="HProjectNote"锛坱extarea锛�
+ HWorkProcNote: data["鏂藉伐瀹屾垚璁板綍"], // 瀵瑰簲name="HWorkProcNote"锛坱extarea锛�
+ HRemark: data["澶囨敞"], // 瀵瑰簲name="HRemark"锛坱extarea锛�
+ HWorkNote: data["绔ｅ伐璧勬枡"], // 瀵瑰簲妯℃澘#jungong鐨刵ame="HWorkNote"
+ HWorkPicNumber: data["绔ｅ伐鍥剧紪鍙�"], // 瀵瑰簲妯℃澘#jungong鐨刵ame="HWorkPicNumber"
+ HBeginDate: isEmpty(data["寮�宸ユ棩鏈�"]) === true ? "" : util.toDateString(data["寮�宸ユ棩鏈�"], "yyyy-MM-dd"), // 瀵瑰簲妯℃澘#jiaodi鐨刵ame="HBeginDate"
+ HEndDate: isEmpty(data["瀹屽伐鏃ユ湡"]) === true ? "" : util.toDateString(data["瀹屽伐鏃ユ湡"], "yyyy-MM-dd"), // 瀵瑰簲name="HEndDate1"鍜宯ame="HEndDate"
+ HEndDate1: isEmpty(data["瀹屽伐鏃ユ湡"]) === true ? "" : util.toDateString(data["瀹屽伐鏃ユ湡"], "yyyy-MM-dd"), // 瀵瑰簲name="HEndDate1"鍜宯ame="HEndDate"
+ HYuShouKuanMoney: data["棰勬敹娆�"], // 瀵瑰簲妯℃澘#jiaodi鐨刵ame="HYuShouKuanMoney"
+ HSumMoney: data["鍚堝悓鎬婚噾棰�"], // 瀵瑰簲鏁版嵁搴撳瓧娈�"鍚堝悓鎬婚噾棰�"
+ HProMoney: data["浜у搧璐�"], // 瀵瑰簲鏁版嵁搴撳瓧娈�"浜у搧璐�"
- });
- //淇濆瓨鎸夐挳璁剧疆
- $('#btnSaveSetupMoney').prop('disabled', true).addClass('layui-btn-disabled');
- $('#btnSaveOtherMoney').prop('disabled', true).addClass('layui-btn-disabled');
- $('#btnSaveExamMoney').prop('disabled', true).addClass('layui-btn-disabled');
- $('#btnSaveWorkMoney').prop('disabled', true).addClass('layui-btn-disabled');
- if (tableMain[0]["HTaskSetupMoneySaveFlag"] == false) {
- $('#btnSaveSetupMoney').prop('disabled', false).removeClass('layui-btn-disabled');
- }
- if (tableMain[0]["HTaskOtherMoneySaveFlag"] == false) {
- $('#btnSaveOtherMoney').prop('disabled', false).removeClass('layui-btn-disabled');
- }
- if (tableMain[0]["HTaskExamMoneySaveFlag"] == false) {
- $('#btnSaveExamMoney').prop('disabled', false).removeClass('layui-btn-disabled');
- }
- if (tableMain[0]["HTaskWorkMoneySaveFlag"] == false) {
- $('#btnSaveWorkMoney').prop('disabled', false).removeClass('layui-btn-disabled');
- }
- form.render('checkbox');
- RoadBillSub(linterid);
- }
+ // 浜哄憳瀛楁锛堟敞鎰忓墠绔痭ame鍚庣紑涓�1锛�
+ HProPMEmpName1: data["椤圭洰缁忕悊"], // 瀵瑰簲name="HProPMEmpName1"
+ HWorkerName1: data["鏂藉伐鍛�"], // 瀵瑰簲name="HWorkerName1"
+ HMangerEmpName1: data["绠＄悊鍛�"], // 瀵瑰簲name="HMangerEmpName1"
+
+ // 闅愯棌瀛楁涓庡叧鑱斿瓧娈�
+ HCusID: data["HCusID"], // 瀹㈡埛ID闅愯棌瀛楁
+ HCusName: data["瀹㈡埛"], // 瀹㈡埛鍚嶇О
+ HTestCheckerName: data["璇曞帇楠屾敹浜哄憳"], // 瀵瑰簲name="HTestCheckerName"
+ HTestCheckerID: data["HTestCheckerID"], // 璇曞帇楠屾敹浜哄憳ID闅愯棌瀛楁
+
+ // 閫犱环閮ㄥ垎
+ "HYuSuanMoney": data["棰勭畻閫犱环"],
+ "HYuShouKuanMoney": data["棰勬敹娆�"],
+ "HJieSuanMoney": data["缁撶畻閫犱环"],
+ "HHeTongMoney": data["鍚堝悓閫犱环"],
+ "HShenJiMoney": data["瀹¤閫犱环"],
+ "HBanZuMoney": data["鐝粍宸ヨ垂"],
+ "HCaiLiaoMoney": data["鏉愭枡璐�"],
+ "HAnZhuangMoney": data["瀹夎璐�"],
+ "HAccountDate": isEmpty(data["缁撶畻缁撹处鏃ユ湡"]) === true ? "" : util.toDateString(data["缁撶畻缁撹处鏃ユ湡"], "yyyy-MM-dd"),
+ "HAccountWorkMoneyDate": isEmpty(data["宸ヨ垂缁撹处鏃ユ湡"]) === true ? "" : util.toDateString(data["宸ヨ垂缁撹处鏃ユ湡"], "yyyy-MM-dd"),
})
+
+ form.render()
}
//#endregion
@@ -941,7 +1154,7 @@
{
var ajaxLoad = layer.load();//閬僵
//鏄庣粏鍒楄〃
- var sql = "exec h_p_PM_GetSellOutBillListByHProjectID " + linterid ;
+ var sql = "exec h_p_PM_GetSellOutBillListByHProjectID " + linterid;
$.ajax({
url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
type: "GET",
@@ -971,7 +1184,7 @@
}
else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120, filter: true });
- } else {
+ } else {
switch (data[i].Type) {
//int
case 'DateTime':
@@ -1006,7 +1219,7 @@
//#endregion
//#region 鍙嶄繚瀛�/淇濆瓨鏁版嵁
- function set_SaveBill(type,HMoney) {
+ function set_SaveBill(type, HMoney) {
var HInterID = $("#HInterID").val();
if (HInterID != 0) {
//閫昏緫淇濆瓨鏂规硶
@@ -1065,7 +1278,7 @@
layer.alert(result.code + result.Message, { icon: 5 });
}
}, error: function (err) {
- layer.alert("鎺ュ彛璇锋眰澶辫触"+err.Message, { icon: 5 });
+ layer.alert("鎺ュ彛璇锋眰澶辫触" + err.Message, { icon: 5 });
}
});
}
@@ -1257,69 +1470,34 @@
//鑾峰彇鍙傛暟
var params = get_UrlVars();
var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡
- var addSWhere = openType;
- //鏍规嵁閫掑叆鍙傛暟闅愯棌瀵瑰簲鎸夐挳鍜屾樉绀哄垪
- if (openType == "SetupMoney") {
- $('#btnSaveSetupMoney').show();
- $('#btnSearchHTaskSetupMoney').show();
- $('#btnSearchHTaskOtherMoney').show();
- $('#HAccountDate').prop('disabled', false)
- $('#HIsAccount').prop('disabled', false)
- //titleData.push("浠诲姟宸ヨ垂瀹℃牳");
- //titleData.push("浠诲姟鑰冩牳璐瑰鏍�");
- //titleData.push("浠诲姟闄勫睘璐瑰鏍�");
- } else if (openType == "OtherMoney") {
- $('#btnSaveOtherMoney').show();
- $('#btnSearchHTaskOtherMoney').show();
- //titleData.push("浠诲姟瀹夎璐瑰鏍�");
- //titleData.push("浠诲姟宸ヨ垂瀹℃牳");
- //titleData.push("浠诲姟鑰冩牳璐瑰鏍�");
- } else if (openType == "ExamMoney") {
- $('#btnSaveExamMoney').show();
- $('#btnSearchHTaskExamMoney').show();
- //titleData.push("浠诲姟瀹夎璐瑰鏍�");
- //titleData.push("浠诲姟宸ヨ垂瀹℃牳");
- //titleData.push("浠诲姟闄勫睘璐瑰鏍�");
- } else if (openType == "WorkMoney") {
- $('#btnSaveWorkMoney').show();
- $('#btnSearchHTaskWorkMoney').show();
- $('#HAccountWorkMoneyDate').prop('disabled', false)
- //titleData.push("浠诲姟瀹夎璐瑰鏍�");
- //titleData.push("浠诲姟鑰冩牳璐瑰鏍�");
- //titleData.push("浠诲姟闄勫睘璐瑰鏍�");
- } else {
- addSWhere = "other"
- //titleData.push("浠诲姟瀹夎璐瑰鏍�");
- //titleData.push("浠诲姟宸ヨ垂瀹℃牳");
- //titleData.push("浠诲姟鑰冩牳璐瑰鏍�");
- //titleData.push("浠诲姟闄勫睘璐瑰鏍�");
- }
+ var addSWhere = "";
+
return addSWhere;
}
//#endregion\
//#endregion
function renderConditionTag(type) {
- debugger
let parent = document.getElementById("projectMessage")
let operateZone = document.getElementById("operateZone")
let step
switch (type) {
- case "step1":
- step = document.importNode(document.getElementById("step1").content, true)
+ case "ProjectFeeCheck":
+ step = document.importNode(document.getElementById("ProjectFeeCheck").content, true)
; break;
- case "step2":
- step = document.importNode(document.getElementById("step2").content, true);
+ case "WorkFeeCheck":
+ step = document.importNode(document.getElementById("WorkFeeCheck").content, true);
; break;
- case "step3":
- step = document.importNode(document.getElementById("step3").content, true);
+ case "ProjectFeeSettleEntry":
+ step = document.importNode(document.getElementById("ProjectFeeSettleEntry").content, true);
break;
- case "step4":
- step = document.importNode(document.getElementById("step4").content, true);
+ case "SporadicProjectsEntry":
+ step = document.importNode(document.getElementById("SporadicProjectsEntry").content, true);
break;
- case "step5":
- step = document.importNode(document.getElementById("step5").content, true);
+ case "workFeeEntry":
+ step = document.importNode(document.getElementById("workFeeEntry").content, true);
break;
+ default: step = document.importNode(document.createElement("div"), true);
}
parent.insertBefore(step, operateZone);
@@ -1349,4 +1527,5 @@
}
</script>
</body>
-</html>
+
+</html>
\ No newline at end of file
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_ProjectTaskStepsQuery.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_ProjectTaskStepsQuery.html"
index b4abe60..56a8a12 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_ProjectTaskStepsQuery.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_ProjectTaskStepsQuery.html"
@@ -1,11 +1,13 @@
锘�<!DOCTYPE html>
<html>
+
<head>
<meta charset="utf-8" />
<title>宸ョ▼闃舵鍒楄〃</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <meta name="viewport"
+ content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<!--寮曠敤layui鏍峰紡鏂囦欢-->
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
@@ -19,16 +21,21 @@
<script src="../../../layuiadmin/PageTitle.js"></script>
<script src="../../../layuiadmin/HideButton.js"></script>
<script src="../../../layuiadmin/SetColumn.js"></script>
+ <script src="../../../layuiadmin/common.js"></script>
<style type="text/css">
/* 绂佺敤鐘舵�佷笅鐨勮緭鍏ユ鏍峰紡 */
input:disabled {
- background-color: #f0f0f0; /* 娴呯伆鑹� */
- color: #888888; /* 鐏拌壊 */
+ background-color: #f0f0f0;
+ /* 娴呯伆鑹� */
+ color: #888888;
+ /* 鐏拌壊 */
}
textarea:disabled {
- background-color: #f0f0f0; /* 娴呯伆鑹� */
- color: #888888; /* 鐏拌壊 */
+ background-color: #f0f0f0;
+ /* 娴呯伆鑹� */
+ color: #888888;
+ /* 鐏拌壊 */
}
.operate-zone {
@@ -39,14 +46,57 @@
padding: 20px 0;
}
+
+ /* 鑷畾涔夌被锛岄伩鍏嶄笌LayUI鍘熺敓鏍峰紡鍐茬獊 */
+ .custom-form-item {
+ display: flex;
+ align-items: flex-start;
+ }
+
+ .custom-form-label {
+ width: 100px !important;
+ /* 鍥哄畾label瀹藉害 */
+ flex-shrink: 0;
+ /* 闃叉label琚帇缂� */
+ padding-left: 0;
+ /* 绉婚櫎LayUI榛樿鐨勫乏鍐呰竟璺� */
+ padding-right: 15px;
+ /* 淇濇寔涓嶭ayUI涓�鑷寸殑鍙冲唴杈硅窛 */
+ /* box-sizing: border-box; */
+ text-align: right;
+ /* 鏂囧瓧鍙冲榻� */
+ }
+
+ .custom-input-block {
+ margin-left: 5px !important;
+ /* 绉婚櫎LayUI榛樿鐨勫乏澶栬竟璺� */
+ flex-grow: 1;
+ /* 璁﹖extarea瀹瑰櫒鍗犳弧鍓╀綑绌洪棿 */
+ }
+
+ .custom-input-block textarea,.custom-input-block input {
+ width: 100% !important;
+ /* 纭繚textarea鍗犳弧瀹瑰櫒瀹藉害 */
+ box-sizing: border-box;
+ /* 鍖呭惈鍐呰竟璺濆拰杈规 */
+ }
+ .custom-input-block textarea{
+ padding-top: 5px !important;
+ }
+
+ label[hidden] {
+ display: none;
+ }
</style>
</head>
+
<body>
<div id="layout1" class="layui-fluid">
<div class="layui-col-md12">
- <div class="layui-card" style="">
+ <div class="layui-card">
<div class="layui-card-body" style="padding:1px">
- <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <form class="layui-form" id="formData" action="" lay-filter="formData"
+ style="background-color:white;">
<div class="layui-col-xs6">
<div class="layui-tab layui-tab-card" lay-filter="table">
<ul class="layui-tab-title">
@@ -55,11 +105,27 @@
<div class="layui-tab-content" style="padding:0px;">
<div class="layui-tab-item layui-show">
<div class="layui-row" style="background: #fff;padding: 10px 0;">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 64px;padding: 9px 18px;">宸ョ▼缂栧彿</label>
- <div class="layui-input-block" style="margin-left: 64px;">
- <input type="hidden" class="layui-input" lay-filter="HDeptID" name="HDeptID" id="HDeptID" value="0" style="background-color:#efefef4d;display: inline-block;" disabled>
- <input type="text" class="layui-input" lay-filter="HDeptName" name="HDeptName" id="HDeptName" value="" style="width: 80%;display: inline-block;">
+ <div class="layui-inline custom-form-item"
+ style="width: 33%; display: inline-flex;">
+ <label class="layui-form-label custom-form-label"
+ style="width: 64px;padding: 9px 18px;">宸ョ▼缂栧彿</label>
+ <div class="layui-input-block custom-input-block"
+ style="margin-left: 64px;">
+ <input type="text" class="layui-input"
+ lay-filter="HProjNumberSearch" name="HProjNumberSearch"
+ id="HProjNumberSearch" value=""
+ style="display: inline-block;min-width: 100px;">
+ </div>
+ </div>
+ <div class="layui-inline custom-form-item"
+ style="width: 33%; display: inline-flex;">
+ <label class="layui-form-label custom-form-label"
+ style="width: 64px;padding: 9px 18px;">宸ョ▼鍚嶇О</label>
+ <div class="layui-input-block custom-input-block"
+ style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-filter="HProjNameSearch"
+ name="HProjNameSearch" id="HProjNameSearch" value=""
+ style="display: inline-block;min-width: 100px;">
<!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptID" id="btnHDeptID" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>-->
@@ -67,19 +133,12 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 64px;padding: 9px 18px;">宸ョ▼鍚嶇О</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="hidden" class="layui-input" lay-filter="HDeptID" name="HDeptID" id="HDeptID" value="0" style="background-color:#efefef4d;display: inline-block;" disabled>
- <input type="text" class="layui-input" lay-filter="HDeptName" name="HDeptName" id="HDeptName" value="" style="width: 80%;display: inline-block;">
- <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptID" id="btnHDeptID" 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">
- <button class="layui-btn layui-btn-normal" style="margin-left: 40px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 5px" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 40px"
+ type="button" lay-submit="" lay-filter="btnSearch"
+ id="btnSearch">鏌ヨ</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 5px"
+ type="button" lay-submit="" lay-filter="btnReSearch"
+ id="btnReSearch">閲嶇疆</button>
<!--<button class="layui-btn layui-btn-normal" style="margin-left: 5px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>-->
</div>
</div>
@@ -103,42 +162,51 @@
<div class="layui-tab-content" style="padding:0px;">
<!--鍩烘湰淇℃伅-->
<div class="layui-tab-item layui-show">
- <div id="projectMessage" class="layui-form-item" style="padding-top: 10px; background-color: white" lay-filter="">
+ <div id="projectMessage" class="layui-form-item"
+ style="padding-top: 10px; background-color: white" lay-filter="">
<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;">
- <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled>
- <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
- <input type="hidden" name="HBillSubType" id="HBillSubType" value="">
+ <input type="text" class="layui-input" name="HProcType"
+ lay-verify="HProcType" id="HProcType" disabled>
</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="HProNumber" name="HProNumber" id="HProNumber" disabled>
+ <input type="text" class="layui-input" lay-verify="HProNumber"
+ name="HProNumber" id="HProNumber" disabled>
</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;">
- <input type="text" class="layui-input" lay-verify="HProName" name="HProName" id="HProName" disabled>
+ <div class="layui-input-block"
+ style="margin-left: 120px; width: 180px;">
+ <input type="date" class="layui-input" lay-verify="HReDate"
+ name="HReDate" id="HReDate" style="padding-left: 40px;"
+ disabled>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">浠诲姟鍗曠紪鍙�</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: 40px;" disabled>
+ <div class="layui-input-block"
+ style="margin-left: 120px; width:180px;">
+ <input type="text" class="layui-input" lay-verify="HPicNo"
+ name="HPicNo" id="HPicNo" style="padding-left: 40px;"
+ disabled>
</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; width:180px;">
- <input type="text" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 40px;" disabled>
+ <div class="layui-inline custom-form-item">
+ <label class="layui-form-label custom-form-label"
+ style="width: 85px;">宸ョ▼鍚嶇О</label>
+ <div class="layui-input-block custom-input-block">
+ <input type="text" class="layui-input" lay-verify="HProName"
+ name="HProName" id="HProName" disabled>
</div>
</div>
</div>
@@ -146,53 +214,99 @@
<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="HProName" name="HProName" id="HProName" disabled>
+ <input type="text" class="layui-input"
+ lay-verify="HProPMEmpName1" name="HProPMEmpName1"
+ id="HProPMEmpName1" disabled>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏂藉伐鍛�</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: 40px;" disabled>
+ <div class="layui-input-block"
+ style="margin-left: 120px; width:180px;">
+ <input type="text" class="layui-input" lay-verify="HWorkerName1"
+ name="HWorkerName1" id="HWorkerName1" disabled>
</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;">
- <input type="text" class="layui-input" lay-verify="HProName" name="HProName" id="HProName" disabled>
+ <div class="layui-input-block"
+ style="margin-left: 120px; width:180px;">
+ <input type="text" class="layui-input"
+ lay-verify="HMangerEmpName1" name="HMangerEmpName1"
+ id="HMangerEmpName1" disabled>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">瀹屽伐鏃ユ湡</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: 40px;" disabled>
+ <div class="layui-input-block"
+ style="margin-left: 120px; width:180px;">
+ <input type="date" class="layui-input" lay-verify="HEndDate1"
+ name="HEndDate1" id="HEndDate1" style="padding-left: 40px;"
+ disabled>
</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 style="width: 600px;height:5rem; display: inline-block; resize: vertical;" type="text" class="layui-input" name="HTaskWorkEmp" lay-verify="HTaskWorkEmp" id="HTaskWorkEmp" disabled></textarea>
+ <div class="layui-inline custom-form-item"> <!-- 娣诲姞鑷畾涔夌被 -->
+ <label class="layui-form-label custom-form-label"
+ id="projectLabel">椤圭洰鍐呭</label>
+ <label class="layui-form-label custom-form-label" id="projectWorkLabel" hidden>宸ョ▼鍐呭</label>
+ <div class="layui-input-block custom-input-block">
+ <textarea type="text" class="layui-input" name="HProjectNote"
+ lay-verify="HProjectNote" id="HProjectNote"
+ disabled></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 style="width: 600px; display: inline-block; resize: vertical;" type="text" class="layui-input" name="HTaskRemark" lay-verify="HTaskRemark" id="HTaskRemark" disabled></textarea>
+ <div class="layui-inline custom-form-item">
+ <label class="layui-form-label custom-form-label">瀹㈡埛</label>
+ <div class="layui-input-block custom-input-block">
+ <input type="text" class="layui-input" name="HCusName"
+ lay-verify="HCusName" id="HCusName" disabled></input>
+ <input type="hidden" class="layui-input" name="HCusID"
+ lay-verify="HCusID" id="HCusID" disabled></input>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline custom-form-item">
+ <label class="layui-form-label custom-form-label"
+ style="width: 85px;">鏂藉伐瀹屾垚鎯呭喌</label>
+ <div class="layui-input-block custom-input-block"
+ style="margin-left: 120px;">
+ <textarea
+ style="width: 600px;height:5rem; display: inline-block; resize: vertical;"
+ type="text" class="layui-input" name="HWorkProcNote"
+ lay-verify="HWorkProcNote" id="HWorkProcNote"></textarea>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline custom-form-item">
+ <label class="layui-form-label custom-form-label"
+ style="width: 85px;">澶囨敞</label>
+ <div class="layui-input-block custom-input-block"
+ style="margin-left: 120px;">
+ <textarea
+ style="width: 600px; display: inline-block; resize: vertical;"
+ type="text" class="layui-input" name="HRemark"
+ lay-verify="HRemark" id="HRemark"></textarea>
</div>
</div>
</div>
<div class="operate-zone" id="operateZone">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveBill" id="saveBill">淇濆瓨</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Exit" id="exit">閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit
+ lay-filter="saveBill" id="saveBill">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-filter="exit"
+ lay-submit id="exit">閫�鍑�</button>
</div>
</div>
- <div class="layui-tab" lay-filter="tab-POStockInBill" style=" background-color: white">
+ <div class="layui-tab" lay-filter="tab-POStockInBill"
+ style=" background-color: white">
<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container" id="toolbarDemo_ButtonSet">
@@ -203,7 +317,12 @@
</div>
</div>
</div>
-
+ <div class="layui-inline" hidden>
+ <div class="layui-input-block">
+ <input type="hidden" class="layui-input" name="HInterID" lay-verify="HInterID"
+ id="HInterID" disabled></input>
+ </div>
+ </div>
</div>
</form>
</div>
@@ -211,100 +330,96 @@
</div>
</div>
- <template id="step1">
+ <!-- 绔ｅ伐鍥惧強璧勬枡褰曞叆 -->
+ <template id="jungong">
<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 style="width: 600px;height:5rem; display: inline-block; resize: vertical;" type="text" class="layui-input" name="HTaskWorkEmp" lay-verify="HTaskWorkEmp" id="HTaskWorkEmp"></textarea>
+ <div class="layui-inline custom-form-item">
+ <label class="layui-form-label custom-form-label">绔ｅ伐璧勬枡</label>
+ <div class="layui-input-block custom-input-block">
+ <textarea style="height:5rem; padding-top: 5px;" type="text" class="layui-input" name="HWorkNote"
+ lay-verify="HWorkNote" id="HWorkNote"></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 style="width: 600px; display: inline-block; resize: vertical;" type="text" class="layui-input" name="HTaskRemark" lay-verify="HTaskRemark" id="HTaskRemark"></textarea>
+ <div class="layui-inline custom-form-item">
+ <label class="layui-form-label custom-form-label">绔ｅ伐鍥剧紪鍙�</label>
+ <div class="layui-input-block custom-input-block">
+ <input type="text" class="layui-input" name="HWorkPicNumber" lay-verify="HWorkPicNumber"
+ id="HWorkPicNumber"></textarea>
</div>
</div>
</div>
</template>
- <template id="step2">
+ <!-- 鏂藉伐闃舵鎯呭喌褰曞叆 -->
+ <template id="shigong">
<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 style="width: 600px;height:5rem; display: inline-block; resize: vertical;" type="text" class="layui-input" name="HTaskWorkEmp" lay-verify="HTaskWorkEmp" id="HTaskWorkEmp"></textarea>
+ <div class="layui-inline custom-form-item">
+ <label class="layui-form-label custom-form-label">璇曞帇璁板綍</label>
+ <div class="layui-input-block custom-input-block">
+ <textarea style="height:5rem; padding-top: 5px;" type="text" class="layui-input" name="HTestNote"
+ lay-verify="HTestNote" id="HTestNote"></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;">
- <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo">
- <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
- <input type="hidden" name="HBillSubType" id="HBillSubType" value="">
+ <div class="layui-input-block" style="margin-left: 120px; width:180px;">
+ <input type="date" class="layui-input" lay-verify="HTestDate" name="HTestDate" id="HTestDate"
+ data-required="true" style="padding-left: 40px;">
</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="HProNumber" name="HProNumber" id="HProNumber">
+ <div class="layui-input-block" style="margin-left: 120px; width:180px;">
+ <input type="text" class="layui-input" lay-verify="HTestCheckerName" name="HTestCheckerName"
+ id="HTestCheckerName" style="width: 136px !important; display: inline-block;">
+ <input type="hidden" class="layui-input" lay-verify="HTestCheckerID" name="HTestCheckerID"
+ id="HTestCheckerID">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HTestCheckerList"
+ style="width:40px;display: inline-block;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</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;">
- <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo">
- <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
- <input type="hidden" name="HBillSubType" id="HBillSubType" value="">
+ <div class="layui-input-block" style="margin-left: 120px; width:180px;">
+ <input type="date" class="layui-input" name="HSewageDate" lay-verify="HSewageDate" id="HSewageDate"
+ style="padding-left: 40px;">
</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="HProNumber" name="HProNumber" id="HProNumber">
- </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;">
- <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled>
- <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
- <input type="hidden" name="HBillSubType" id="HBillSubType" value="">
- </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="HProNumber" name="HProNumber" id="HProNumber" disabled>
+ <div class="layui-input-block" style="margin-left: 120px; width:180px;">
+ <input type="date" class="layui-input" lay-verify="HWaterSupplyDate" name="HWaterSupplyDate"
+ id="HWaterSupplyDate" style="padding-left: 40px;">
</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;">
- <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled>
- <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
- <input type="hidden" name="HBillSubType" id="HBillSubType" value="">
+ <div class="layui-input-block" style="margin-left: 120px; width:180px;">
+ <input disabled type="date" class="layui-input" name="HBeginDate" lay-verify="HBeginDate"
+ id="HBeginDate" style="padding-left: 40px;">
</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="HProNumber" name="HProNumber" id="HProNumber">
+ <div class="layui-input-block" style="margin-left: 120px; width:180px;">
+ <input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate"
+ style="padding-left: 40px;">
</div>
</div>
</div>
</template>
- <template id="step3">
+ <!-- 浜ゅ簳闃舵鎯呭喌褰曞叆 -->
+ <template id="jiaodi">
<!--<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">璇曞帇璁板綍</label>
@@ -316,32 +431,47 @@
<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;">
- <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo">
- <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
- <input type="hidden" name="HBillSubType" id="HBillSubType" value="">
+ <div class="layui-input-block" style="margin-left: 120px; width: 180px;">
+ <input type="text" class="layui-input" name="HProPMEmpName" lay-verify="HProPMEmpName"
+ id="HProPMEmpName" style="width: 136px !important; display: inline-block;">
+ <input type="hidden" name="HProPMEmpID" id="HProPMEmpID" lay-verify="HProPMEmpID">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HProPMEmpList"
+ style="width:40px;display: inline-block;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</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="HProNumber" name="HProNumber" id="HProNumber">
+ <div class="layui-input-block" style="margin-left: 120px; width: 180px;">
+ <input type="text" class="layui-input" lay-verify="HWorkerName" name="HWorkerName" id="HWorkerName"
+ style="width: 136px !important; display: inline-block;">
+ <input type="hidden" name="HWorkerID" id="HWorkerID" lay-verify="HWorkerID">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkerList"
+ style="width:40px;display: inline-block;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</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;">
- <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo">
- <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
- <input type="hidden" name="HBillSubType" id="HBillSubType" value="">
+ <div class="layui-input-block" style="margin-left: 120px; width: 180px;">
+ <input type="text" class="layui-input" name="HMangerEmpName" lay-verify="HMangerEmpName"
+ id="HMangerEmpName" style="width: 136px !important; display: inline-block;">
+ <input type="hidden" name="HMangerEmpID" id="HMangerEmpID" lay-verify="HMangerEmpID">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HMangerEmpList"
+ style="width:40px;display: inline-block;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</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="HProNumber" name="HProNumber" id="HProNumber">
+ <div class="layui-input-block" style="margin-left: 120px; width:180px;">
+ <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate"
+ data-required="true" style="padding-left: 40px;">
</div>
</div>
</div>
@@ -349,9 +479,8 @@
<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" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled>
- <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
- <input type="hidden" name="HBillSubType" id="HBillSubType" value="">
+ <input type="number" class="layui-input" name="HYuShouKuanMoney" lay-verify="HYuShouKuanMoney"
+ id="HYuShouKuanMoney">
</div>
</div>
<!--<div class="layui-inline">
@@ -364,40 +493,42 @@
</template>
<script>
- var type;
+ var params = get_UrlVars()
+ var type = params[params[0]] // 绗�0涓弬鏁拌〃绀洪�掑叆鐨勫弬鏁�
+
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
- //#region 鍏敤鍙橀噺
+ }).use(['index', 'form', 'laydate', 'table', 'element', 'util'], function () {
+ //#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
, table = layui.table
, form = layui.form
, laydate = layui.laydate
- , element = layui.element;
+ , element = layui.element
+ , util = layui.util;
var option = [];
var optionNeedSave = [];
var ins; //鐢ㄤ簬瀵煎嚭excel
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["hmainid", "HBillType", "HSupID", "HPSStyleID", "HSSID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID", "HUnitID",
- "HFeedback", "HPriority", "HUserID", "甯佸埆浠ｇ爜", "閲囪喘鏂瑰紡浠ｇ爜", "缁撶畻鏂瑰紡浠ｇ爜", "閮ㄩ棬浠ｇ爜", "涓荤浠ｇ爜", "涓氬姟鍛樹唬鐮�", "璁￠噺鍗曚綅浠ｇ爜", "HSaveFlowStatusID", "HSaveFlowID","HSaveItemID"];
+ "HFeedback", "HPriority", "HUserID", "甯佸埆浠ｇ爜", "閲囪喘鏂瑰紡浠ｇ爜", "缁撶畻鏂瑰紡浠ｇ爜", "閮ㄩ棬浠ｇ爜", "涓荤浠ｇ爜", "涓氬姟鍛樹唬鐮�", "璁￠噺鍗曚綅浠ｇ爜", "HSaveFlowStatusID", "HSaveFlowID", "HSaveItemID"];
//#endregion
var HModName = "PM_ProjectTaskNeedSaveQuery";
var HModName2 = "PM_ProjectTaskNeedSaveQuery_SellOut";
//#region 杩涘叆椤甸潰鏃㈠姞杞�
//鍒濆鍖栬〃鏍�
+ renderConditionTag(type)
set_InitGrid();
//鑾峰彇榛樿閮ㄩ棬
GetDefValByUser()
get_FastQuery();
//#endregion
- var params = get_UrlVars()
- type = param[param[0]] // 绗�0涓弬鏁拌〃绀洪�掑叆鐨勫弬鏁�
- renderConditionTag(type)
+
//#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
//#region 澶村伐鍏锋爮浜嬩欢
@@ -450,43 +581,90 @@
get_FastQuery();
})
+ form.on("submit(HTestCheckerList)", function () {
+ get_PersonnelSelection("HEmp")
+ })
+
+ // 椤圭洰缁忕悊閫夋嫨
+ form.on("submit(HProPMEmpList)", function () {
+ get_PersonnelSelection("HPM")
+ })
+
+ // 鏂藉伐鍛橀�夋嫨
+ form.on("submit(HWorkerList)", function () {
+ get_PersonnelSelection("HWorker")
+ })
+
+ // 绠＄悊鍛橀�夋嫨
+ form.on("submit(HMangerEmpList)", function () {
+ get_PersonnelSelection("HManager")
+
+ })
+
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function () {
- $("#HDeptID").val(0);//杞﹂棿id
- $("#HDeptName").val("");//杞﹂棿鍚嶇О
+ $("#HProjNumberSearch").val("")
+ $("#HProjNameSearch").val("")
})
//#region 閫�鍑�
- form.on('submit(btnEdit)', function (data) {
+ form.on('submit(exit)', function (data) {
Pub_Close(2);
});
//#endregion
+ //#region 琛ㄥ崟淇濆瓨鏁版嵁
+ form.on('submit(saveBill)', function (data) {
+ let requires = $("[data-required]")
+ let formValidate = 1;
+ requires.each(function () {
+ let $element = $(this);
+ if (isEmpty($element.val()) === true) {
+ let labelText = $element.closest(".layui-inline").find("label")[0].innerText
+ formValidate = 0
+ layer.alert(labelText + ": 鍊间笉鑳戒负绌�!");
+ return
+ }
+ })
+ if (formValidate == 0) {
+ return
+ }
- //#region 淇濆瓨
- form.on('submit(btnSaveSetupMoney)', function (data) {
- set_SaveBill("SetupMoneySave", $("#HTaskSetupMoney").val() == "" ? 0 : $("#HTaskSetupMoney").val());
- set_SaveBill("OtherMoneySave", $("#HTaskOtherMoney").val() == "" ? 0 : $("#HTaskOtherMoney").val());//瀹夎瀹℃牳璐逛繚瀛�
- //鏇存柊浠诲姟鏉愭枡璐�
- set_SaveHTaskMaterMoney($("#HInterID").val());
- //鏇存柊缁撶畻缁撹处鏃ユ湡銆佹槸鍚﹁嚜鏉ユ按鍏徃缁撹处
- set_SaveHAccountDate($("#HInterID").val());
- $('#btnSaveSetupMoney').prop('disabled', true).addClass('layui-btn-disabled');
- });
- form.on('submit(btnSaveOtherMoney)', function (data) {
- set_SaveBill("OtherMoneySave", $("#HTaskOtherMoney").val() == "" ? 0 : $("#HTaskOtherMoney").val())
- $('#btnSaveOtherMoney').prop('disabled', true).addClass('layui-btn-disabled');
- });
- form.on('submit(btnSaveExamMoney)', function (data) {
- set_SaveBill("ExamMoneySave", $("#HTaskExamMoney").val() == "" ? 0 : $("#HTaskExamMoney").val())
- $('#btnSaveExamMoney').prop('disabled', true).addClass('layui-btn-disabled');
- });
- form.on('submit(btnSaveWorkMoney)', function (data) {
- set_SaveBill("WorkMoneySave", $("#HTaskWorkMoney").val() == "" ? 0 : $("#HTaskWorkMoney").val())
- //宸ヨ垂缁撹处鏃ユ湡
- set_SaveHAccountWorkMoneyDate($("#HInterID").val());
- $('#btnSaveWorkMoney').prop('disabled', true).addClass('layui-btn-disabled');
- });
+ let d = data.field
+ var HInterID = d.HInterID;
+ let sMainStr = JSON.stringify(d);
+ sMainStr = sMainStr + ";" + type + ";" + sessionStorage["HUserName"];
+ if (HInterID != 0) {
+ //閫昏緫淇濆瓨鏂规硶
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/PM_ProjectBill_Work/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "oMainStr": sMainStr },
+ success: function (result) {
+ if (result.count == 1) {
+ //if (type =="OtherMoneySave") {
+ // //鏇存柊浠诲姟鏉愭枡璐�
+ // set_SaveHTaskMaterMoney(HInterID)
+ //}
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ $("#saveBill").addClass("layui-btn-disabled").attr("disabled", true)
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ get_FastQuery();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ })
//#endregion
//#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -497,9 +675,9 @@
$('tr').attr({ "style": "background:" });
$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
//obj.tr.find('.layui-form-radio').addClass('layui-form-radioed');
-
+ $("#saveBill").removeClass("layui-btn-disabled").attr("disabled", false)
//鏄剧ず椤圭洰淇℃伅
- RoadBillMain(obj.data["HInterID"]);
+ RoadBillMain(obj.data);
})
//#endregion
@@ -574,11 +752,16 @@
//蹇�熻繃婊�
function get_FastQuery() {
- var HDept = $("#HDeptID").val();
+ let HProjNumberSearch = $("#HProjNumberSearch").val()
+ let HProjNameSearch = $("#HProjNameSearch").val()
//鍒濆璇濇寜閽偣鍑�
- var sWhere = " '" + addSWhereByOpenType() + "'";
- if (HDept) {
- sWhere += "," + HDept
+ var sWhere = " and 鍗曟嵁瀛愮被鍨� = N'椤圭洰绫�'" + addSWhereByOpenType();
+
+ if (isEmpty(HProjNumberSearch) === false) {
+ sWhere += " and 宸ョ▼缂栧彿 like '\%" + HProjNumberSearch + "\%'"
+ }
+ if (isEmpty(HProjNameSearch) === false) {
+ sWhere += " and 宸ョ▼鍚嶇О like '\%" + HProjNameSearch + "\%'"
}
//鏌ヨ
get_Display(sWhere);
@@ -657,7 +840,7 @@
, height: 'full-120'
, limit: 50
, limits: [50, 500, 5000, 20000]
- , data : []
+ , data: []
};
option = {
@@ -677,11 +860,12 @@
//#region 鍔犺浇琛ㄦ牸
function get_Display(sWhere) {
var ajaxLoad = layer.load();//閬僵
+ console.log(type)
$.ajax({
- url: GetWEBURL() + '/PM_ProjectBill/NeedSaveQuery',
+ url: GetWEBURL() + '/PM_ProjectBill_Work/list',
type: "GET",
async: false,
- data: { "user": sessionStorage["HUserName"], "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "stage": type },
success: function (data1) {
if (data1.count == 1) {
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -707,7 +891,7 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
break;
default:
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
@@ -730,26 +914,30 @@
}
});
- }
+ }
//#endregion
function renderConditionTag(type) {
- debugger
let parent = document.getElementById("projectMessage")
let operateZone = document.getElementById("operateZone")
let step
switch (type) {
- case "step1":
- step = document.importNode(document.getElementById("step1").content, true)
- ; break;
- case "step2":
- step = document.importNode(document.getElementById("step2").content, true);
- ; break;
- case "step3":
- step = document.importNode(document.getElementById("step3").content, true);
+ case "jungong":
+ step = document.importNode(document.getElementById("jungong").content, true);
+ $("#HWorkProcNote").attr("disabled", true);
+ $("#HRemark").attr("disabled", true);
+ break;
+ case "shigong":
+ step = document.importNode(document.getElementById("shigong").content, true);
+ break;
+ case "jiaodi":
+ step = document.importNode(document.getElementById("jiaodi").content, true);
+ $("#projectLabel").attr("hidden", true)
+ $("#projectWorkLabel").attr("hidden", false)
+ $("#HProjectNote").attr("disabled", false)
break;
default:
- step = "<div></div>"
+ step = step = document.importNode(document.createElement("div"), true);
}
parent.insertBefore(step, operateZone);
@@ -758,64 +946,55 @@
//#region 缂栬緫 椤甸潰璧嬪��
- function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+ function RoadBillMain(data)//鍔犺浇琛ㄥご
{
- $.ajax({
- url: GetWEBURL() + "/PM_ProjectBill/editInit",
- type: "GET",
- async: false,
- data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
- success: function (result) {
- var tableMain = result.data[0];
- //涓昏〃 璧嬪��
- form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HInterID": tableMain[0]["HInterID"]
- , "HProNumber": tableMain[0]["HProNumber"]
- , "HProName": tableMain[0]["HProName"]
- , "HBillNo": tableMain[0]["HBillNo"]
- , "HDate": Format(new Date(tableMain[0]["HDate"]), "yyyy-MM-dd")
- ,"HTaskMaterMoney": tableMain[0]["HTaskMaterMoney"],
- "HTaskSetupMoney": tableMain[0]["HTaskSetupMoney"],
- "HTaskOtherMoney": tableMain[0]["HTaskOtherMoney"],
- "HTaskExamMoney": tableMain[0]["HTaskExamMoney"],
- "HTaskWorkMoney": tableMain[0]["HTaskWorkMoney"],
- "HTaskClassName": tableMain[0]["HTaskClassName"],
- "HIsAccount": tableMain[0]["HIsAccount"],
- "HAccountWorkMoneyDate": tableMain[0]["HAccountWorkMoneyDate"],
- "HAccountDate": tableMain[0]["HAccountDate"],
- "HTaskClassEntryName": tableMain[0]["HTaskClassEntryName"],
- "HTaskAddress": tableMain[0]["HTaskAddress"],
- "HBreakStatus": tableMain[0]["HBreakStatus"],
- "HPipeDiameter": tableMain[0]["HPipeDiameter"],
- "HReceTime": tableMain[0]["HReceTime"],
- "HTaskBTime": tableMain[0]["HTaskBTime"],
- "HTaskETime": tableMain[0]["HTaskETime"],
- "HTaskNote": tableMain[0]["HTaskNote"],
- "HTaskWorkEmp": tableMain[0]["HTaskWorkEmp"],
- "HTaskRemark": tableMain[0]["HTaskRemark"]
+ form.val("formData", {
+ // 鍩虹瀛楁锛堥敭鍚嶄笌鍓嶇name瀹屽叏涓�鑷达級
+ HInterID: data.HInterID, // 闅愯棌瀛楁
+ HProNumber: data.宸ョ▼缂栧彿, // 瀵瑰簲鍓嶇name="HProNumber"
+ HReDate: isEmpty(data["鍙楃悊鏃ユ湡"]) === true ? "" : util.toDateString(data["鍙楃悊鏃ユ湡"], "yyyy-MM-dd"), // 瀵瑰簲name="HReDate"
+ HPicNo: data.浠诲姟鍗曠紪鍙�, // 瀵瑰簲name="HPicNo"
+ HProName: data.宸ョ▼鍚嶇О, // 瀵瑰簲name="HProName"
+ HProjectNote: data.椤圭洰鍐呭, // 瀵瑰簲name="HProjectNote"锛坱extarea锛�
+ HWorkProcNote: data.鏂藉伐瀹屾垚璁板綍, // 瀵瑰簲name="HWorkProcNote"锛坱extarea锛�
+ HRemark: data.澶囨敞, // 瀵瑰簲name="HRemark"锛坱extarea锛�
+ HWorkNote: data.绔ｅ伐璧勬枡, // 瀵瑰簲妯℃澘#jungong鐨刵ame="HWorkNote"
+ HWorkPicNumber: data.绔ｅ伐鍥剧紪鍙�, // 瀵瑰簲妯℃澘#jungong鐨刵ame="HWorkPicNumber"
+ HTestNote: data.璇曞帇璁板綍, // 瀵瑰簲妯℃澘#shigong鐨刵ame="HTestNote"
+ HTestDate: isEmpty(data["璇曞帇鏃ユ湡"]) === true ? "" : util.toDateString(data["璇曞帇鏃ユ湡"], "yyyy-MM-dd"),
+ HSewageDate: isEmpty(data["鎺掓薄鏃ユ湡"]) === true ? "" : util.toDateString(data["鎺掓薄鏃ユ湡"], "yyyy-MM-dd"),
+ HWaterSupplyDate: isEmpty(data["閫氭按鏃ユ湡"]) === true ? "" : util.toDateString(data["閫氭按鏃ユ湡"], "yyyy-MM-dd"),
+ HBeginDate: isEmpty(data["寮�宸ユ棩鏈�"]) === true ? "" : util.toDateString(data["寮�宸ユ棩鏈�"], "yyyy-MM-dd"), // 瀵瑰簲妯℃澘#jiaodi鐨刵ame="HBeginDate"
+ HEndDate: isEmpty(data["瀹屽伐鏃ユ湡"]) === true ? "" : util.toDateString(data["瀹屽伐鏃ユ湡"], "yyyy-MM-dd"), // 瀵瑰簲name="HEndDate1"鍜宯ame="HEndDate"
+ HEndDate1: isEmpty(data["瀹屽伐鏃ユ湡"]) === true ? "" : util.toDateString(data["瀹屽伐鏃ユ湡"], "yyyy-MM-dd"), // 瀵瑰簲name="HEndDate1"鍜宯ame="HEndDate"
+ HSumMoney: data.鍚堝悓鎬婚噾棰�, // 瀵瑰簲鏁版嵁搴撳瓧娈�"鍚堝悓鎬婚噾棰�"
+ HProMoney: data.浜у搧璐�, // 瀵瑰簲鏁版嵁搴撳瓧娈�"浜у搧璐�"
- });
- //淇濆瓨鎸夐挳璁剧疆
- $('#btnSaveSetupMoney').prop('disabled', true).addClass('layui-btn-disabled');
- $('#btnSaveOtherMoney').prop('disabled', true).addClass('layui-btn-disabled');
- $('#btnSaveExamMoney').prop('disabled', true).addClass('layui-btn-disabled');
- $('#btnSaveWorkMoney').prop('disabled', true).addClass('layui-btn-disabled');
- if (tableMain[0]["HTaskSetupMoneySaveFlag"] == false) {
- $('#btnSaveSetupMoney').prop('disabled', false).removeClass('layui-btn-disabled');
- }
- if (tableMain[0]["HTaskOtherMoneySaveFlag"] == false) {
- $('#btnSaveOtherMoney').prop('disabled', false).removeClass('layui-btn-disabled');
- }
- if (tableMain[0]["HTaskExamMoneySaveFlag"] == false) {
- $('#btnSaveExamMoney').prop('disabled', false).removeClass('layui-btn-disabled');
- }
- if (tableMain[0]["HTaskWorkMoneySaveFlag"] == false) {
- $('#btnSaveWorkMoney').prop('disabled', false).removeClass('layui-btn-disabled');
- }
- form.render('checkbox');
- RoadBillSub(linterid);
- }
+ // 浜哄憳瀛楁锛堟敞鎰忓墠绔痭ame鍚庣紑涓�1锛�
+ HProPMEmpName1: data.椤圭洰缁忕悊, // 瀵瑰簲name="HProPMEmpName1"
+ HWorkerName1: data.鏂藉伐鍛�, // 瀵瑰簲name="HWorkerName1"
+ HMangerEmpName1: data.绠＄悊鍛�, // 瀵瑰簲name="HMangerEmpName1"
+
+ // 闅愯棌瀛楁涓庡叧鑱斿瓧娈�
+ HCusID: data.HCusID, // 瀹㈡埛ID闅愯棌瀛楁
+ HCusName: data.瀹㈡埛, // 瀹㈡埛鍚嶇О
+ HTestCheckerName: data.璇曞帇楠屾敹浜哄憳, // 瀵瑰簲name="HTestCheckerName"
+ HTestCheckerID: data.HTestCheckerID, // 璇曞帇楠屾敹浜哄憳ID闅愯棌瀛楁
+
+
+ // 鐘舵�佷笌浜哄憳鎿嶄綔瀛楁锛堢洿鎺ヨ祴鍊硷級
+ 鍗曟嵁鐘舵��: data.鍗曟嵁鐘舵��, // 瀵瑰簲SQL鍒悕锛屽墠绔嫢鏈塶ame="鍗曟嵁鐘舵��"鍙洿鎺ヨ祴鍊�
+ 鍒跺崟浜�: data.鍒跺崟浜�, // 瀵瑰簲name="HMaker"锛堥渶纭鍓嶇name鏄惁涓�"鍒跺崟浜�"锛�
+ 鍒跺崟鏃ユ湡: isEmpty(data["鍒跺崟鏃ユ湡"]) === true ? "" : util.toDateString(data["鍒跺崟鏃ユ湡"], "yyyy-MM-dd"), // 瀵瑰簲name="HMakeDate"
+ 淇敼浜�: data.淇敼浜�, // 瀵瑰簲name="HUpDater"
+ 瀹℃牳浜�: data.瀹℃牳浜�, // 瀵瑰簲name="HChecker"
+ 瀹℃牳鏃堕棿: isEmpty(data["瀹℃牳鏃堕棿"]) === true ? "" : util.toDateString(data["瀹℃牳鏃堕棿"], "yyyy-MM-dd"), // 瀵瑰簲name="HCheckDate"
+ 鍏抽棴浜�: data.鍏抽棴浜�, // 瀵瑰簲name="HCloseMan"
+ 鍏抽棴鏃堕棿: isEmpty(data["鍏抽棴鏃堕棿"]) === true ? "" : util.toDateString(data["鍏抽棴鏃堕棿"], "yyyy-MM-dd"), // 瀵瑰簲name="HCloseDate"
+ 浣滃簾浜�: data.浣滃簾浜� // 瀵瑰簲name="HDeleteMan"
})
+
+ form.render()
}
//#endregion
@@ -824,7 +1003,7 @@
{
var ajaxLoad = layer.load();//閬僵
//鏄庣粏鍒楄〃
- var sql = "exec h_p_PM_GetSellOutBillListByHProjectID " + linterid ;
+ var sql = "exec h_p_PM_GetSellOutBillListByHProjectID " + linterid;
$.ajax({
url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
type: "GET",
@@ -854,11 +1033,11 @@
}
else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120, filter: true });
- } else {
+ } else {
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, filter: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, filter: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
break;
default:
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, filter: true });
@@ -888,8 +1067,56 @@
}
//#endregion
+ function get_PersonnelSelection(type) {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鑱屽憳鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=' + type, 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index];
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ switch (type) {
+ case "HWorker":
+ $("#HWorkerID").val(checkStatus.data[0]["HItemID"]);
+ $("#HWorkerName").val(checkStatus.data[0]["鑱屽憳鍚嶇О"]);
+ break;
+ case "HPM":
+ $("#HProPMEmpID").val(checkStatus.data[0]["HItemID"]);
+ $("#HProPMEmpName").val(checkStatus.data[0]["鑱屽憳鍚嶇О"]);
+ break;
+ case "HManager":
+ $("#HMangerEmpID").val(checkStatus.data[0]["HItemID"]);
+ $("#HMangerEmpName").val(checkStatus.data[0]["鑱屽憳鍚嶇О"]);
+ break;
+ case "HEmp":
+ $("#HTestCheckerID").val(checkStatus.data[0]["HItemID"]);
+ $("#HTestCheckerName").val(checkStatus.data[0]["鑱屽憳鍚嶇О"]);
+ break;
+ }
+
+ layer.close(layer.index);
+ }
+ , btn2: function (index, layero) {
+ },
+ end: function () {
+
+ }
+ });
+ }
+
//#region 鍙嶄繚瀛�/淇濆瓨鏁版嵁
- function set_SaveBill(type,HMoney) {
+ function set_SaveBill(type, HMoney) {
var HInterID = $("#HInterID").val();
if (HInterID != 0) {
//閫昏緫淇濆瓨鏂规硶
@@ -948,7 +1175,7 @@
layer.alert(result.code + result.Message, { icon: 5 });
}
}, error: function (err) {
- layer.alert("鎺ュ彛璇锋眰澶辫触"+err.Message, { icon: 5 });
+ layer.alert("鎺ュ彛璇锋眰澶辫触" + err.Message, { icon: 5 });
}
});
}
@@ -1038,7 +1265,6 @@
})
}
//#endregion
-
//#region 浠诲姟闄勫睘璐归�夋嫨椤甸潰
function get_checkSearchHTaskOtherMoney() {
@@ -1138,45 +1364,9 @@
//#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
function addSWhereByOpenType() {
//鑾峰彇鍙傛暟
- var params = get_UrlVars();
- var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡
- var addSWhere = openType;
- //鏍规嵁閫掑叆鍙傛暟闅愯棌瀵瑰簲鎸夐挳鍜屾樉绀哄垪
- if (openType == "SetupMoney") {
- $('#btnSaveSetupMoney').show();
- $('#btnSearchHTaskSetupMoney').show();
- $('#btnSearchHTaskOtherMoney').show();
- $('#HAccountDate').prop('disabled', false)
- $('#HIsAccount').prop('disabled', false)
- //titleData.push("浠诲姟宸ヨ垂瀹℃牳");
- //titleData.push("浠诲姟鑰冩牳璐瑰鏍�");
- //titleData.push("浠诲姟闄勫睘璐瑰鏍�");
- } else if (openType == "OtherMoney") {
- $('#btnSaveOtherMoney').show();
- $('#btnSearchHTaskOtherMoney').show();
- //titleData.push("浠诲姟瀹夎璐瑰鏍�");
- //titleData.push("浠诲姟宸ヨ垂瀹℃牳");
- //titleData.push("浠诲姟鑰冩牳璐瑰鏍�");
- } else if (openType == "ExamMoney") {
- $('#btnSaveExamMoney').show();
- $('#btnSearchHTaskExamMoney').show();
- //titleData.push("浠诲姟瀹夎璐瑰鏍�");
- //titleData.push("浠诲姟宸ヨ垂瀹℃牳");
- //titleData.push("浠诲姟闄勫睘璐瑰鏍�");
- } else if (openType == "WorkMoney") {
- $('#btnSaveWorkMoney').show();
- $('#btnSearchHTaskWorkMoney').show();
- $('#HAccountWorkMoneyDate').prop('disabled', false)
- //titleData.push("浠诲姟瀹夎璐瑰鏍�");
- //titleData.push("浠诲姟鑰冩牳璐瑰鏍�");
- //titleData.push("浠诲姟闄勫睘璐瑰鏍�");
- } else {
- addSWhere = "other"
- //titleData.push("浠诲姟瀹夎璐瑰鏍�");
- //titleData.push("浠诲姟宸ヨ垂瀹℃牳");
- //titleData.push("浠诲姟鑰冩牳璐瑰鏍�");
- //titleData.push("浠诲姟闄勫睘璐瑰鏍�");
- }
+ // var params = get_UrlVars();
+ var addSWhere = "";
+
return addSWhere;
}
//#endregion\
@@ -1205,6 +1395,27 @@
$("#HDeptID").val(obj[0].HItemID);//杞﹂棿id
$("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);//杞﹂棿鍚嶇О
}
+
+ function GetHManagerValue(obj) {
+ $("#HMangerEmpID").val(obj[0]["HItemID"]);
+ $("#HMangerEmpName").val(obj[0]["鑱屽憳鍚嶇О"]);
+ }
+
+ function GetHEmpValue(obj) {
+ $("#HTestCheckerID").val(obj[0]["HItemID"]);
+ $("#HTestCheckerName").val(obj[0]["鑱屽憳鍚嶇О"]);
+ }
+
+ function GetHWorkerValue(obj) {
+ $("#HWorkerID").val(obj[0]["HItemID"]);
+ $("#HWorkerName").val(obj[0]["鑱屽憳鍚嶇О"]);
+ }
+
+ function GetHPMValue(obj) {
+ $("#HProPMEmpID").val(obj[0]["HItemID"]);
+ $("#HProPMEmpName").val(obj[0]["鑱屽憳鍚嶇О"]);
+ }
</script>
</body>
-</html>
+
+</html>
\ No newline at end of file
--
Gitblit v1.9.1