From ebef191888d9d2c2a2e7a7f677189164e4eef0b3 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 05 八月 2025 19:04:33 +0800
Subject: [PATCH] 车间委外接收单列表bug处理
---
WebTM/views/项目管理/工程项目/PM_ProjectTaskFeesQuery.html | 656 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 414 insertions(+), 242 deletions(-)
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..704c5ea 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="HBillSubType"
+ lay-verify="HBillSubType" id="HBillSubType" 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,101 @@
<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 +321,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,48 +371,50 @@
<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="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" 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,15 +422,14 @@
<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="">
+ <input type="text" class="layui-input" name="HAnZhuangMoney" lay-verify="HAnZhuangMoney"
+ id="HAnZhuangMoney">
</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>
@@ -308,23 +437,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,15 +466,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="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
- <input type="hidden" name="HBillSubType" id="HBillSubType" value="">
+ <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="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 +482,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 +517,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 +533,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 +549,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 +599,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 +615,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 +631,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 +751,8 @@
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function () {
- $("#HDeptID").val(0);//杞﹂棿id
- $("#HDeptName").val("");//杞﹂棿鍚嶇О
+ $("#HProjNumberSearch").val("")
+ $("#HProjNameSearch").val("")
})
//#region 閫�鍑�
@@ -640,7 +798,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 +874,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 +962,7 @@
, height: 'full-120'
, limit: 50
, limits: [50, 500, 5000, 20000]
- , data : []
+ , data: []
};
option = {
@@ -819,10 +983,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 +1035,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"]
+ form.val("formData", {
+ HInterID: data["HInterID"], // 闅愯棌瀛楁
+ HProNumber: data["宸ョ▼缂栧彿"], // 瀵瑰簲鍓嶇name="HProNumber"
+ HBillSubType: data["宸ョ▼绫诲瀷"],
+ 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 +1147,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 +1177,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 +1212,7 @@
//#endregion
//#region 鍙嶄繚瀛�/淇濆瓨鏁版嵁
- function set_SaveBill(type,HMoney) {
+ function set_SaveBill(type, HMoney) {
var HInterID = $("#HInterID").val();
if (HInterID != 0) {
//閫昏緫淇濆瓨鏂规硶
@@ -1065,7 +1271,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 +1463,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 +1520,5 @@
}
</script>
</body>
-</html>
+
+</html>
\ No newline at end of file
--
Gitblit v1.9.1