Bläddra i källkod

erp 实体类重写

xs 5 år sedan
förälder
incheckning
3d3fc713bb

+ 104 - 154
src/main/webapp/webpage/modules/sg/financial/erp/erpCreditForm.jsp

@@ -2,7 +2,7 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>Erp项目管理</title>
+	<title>新增ERP账户</title>
 	<meta name="decorator" content="ani"/>
 	<script type="text/javascript">
 
@@ -18,7 +18,7 @@
                 return false;
 			}else{
                 jp.loading();
-                jp.post("${ctx}/test/onetomany/dialog/testDataMain1/save",$('#inputForm').serialize(),function(data){
+                jp.post("${ctx}/sg/financial/erpCredit/save",$('#inputForm').serialize(),function(data){
                     if(data.success){
                         jp.getParent().refresh();
                         var dialogIndex = parent.layer.getFrameIndex(window.name); // 获取窗口索引
@@ -71,65 +71,91 @@
 	</script>
 </head>
 <body class="bg-white">
-		<form:form id="inputForm" modelAttribute="testDataMain1" action="${ctx}/test/onetomany/dialog/testDataMain1/save" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="erpCredit" action="${ctx}/sg/financial/erpCredit/save" method="post" class="form-horizontal">
 		<form:hidden path="id"/>
 		<table class="table table-bordered">
 		   <tbody>
 				<tr>
-					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>归属用户:</label></td>
+					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>项目定义编号:</label></td>
 					<td class="width-35">
-						<sys:userselect id="tuser" name="tuser.id" value="${testDataMain1.tuser.id}" labelName="tuser.name" labelValue="${testDataMain1.tuser.name}"
-							    cssClass="form-control required"/>
+						<form:input path="itemId" htmlEscape="false" class="form-control required"/>
 					</td>
-					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>归属部门:</label></td>
+					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>项目名称:</label></td>
 					<td class="width-35">
-						<sys:treeselect id="office" name="office.id" value="${testDataMain1.office.id}" labelName="office.name" labelValue="${testDataMain1.office.name}"
-							title="部门" url="/sys/office/treeData?type=2" cssClass="form-control required" allowClear="true" notAllowSelectParent="true"/>
+						<form:input path="itemName" htmlEscape="false"    class="form-control required"/>
 					</td>
 				</tr>
 				<tr>
-					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>归属区域:</label></td>
+					<td class="width-15 active"><label class="">实际投资:</label></td>
 					<td class="width-35">
-						<sys:treeselect id="area" name="area.id" value="${testDataMain1.area.id}" labelName="area.name" labelValue="${testDataMain1.area.name}"
-							title="区域" url="/sys/area/treeData" cssClass="form-control required" allowClear="true" notAllowSelectParent="true"/>
+						<form:input path="actualInvestment" htmlEscape="false"    class="form-control"/>
 					</td>
-					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>名称:</label></td>
+					<td class="width-15 active"><label class="">移交生产的资产总值:</label></td>
 					<td class="width-35">
-						<form:input path="name" htmlEscape="false"    class="form-control required"/>
+						<form:input path="transferAssets" htmlEscape="false"    class="form-control"/>
 					</td>
 				</tr>
 				<tr>
-					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>性别:</label></td>
+					<td class="width-15 active"><label class="">建筑费:</label></td>
 					<td class="width-35">
-						<form:radiobuttons path="sex" items="${fns:getDictList('sex')}" itemLabel="label" itemValue="value" htmlEscape="false" class="i-checks required"/>
+						<form:input path="consBuildingFee" htmlEscape="false"    class="form-control"/>
 					</td>
-					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>加入日期:</label></td>
+					<td class="width-15 active"><label class="">安装费:</label></td>
 					<td class="width-35">
-							<div class='input-group form_datetime' id='inDate'>
-			                    <input type='text'  name="inDate" class="form-control required"  value="<fmt:formatDate value="${testDataMain1.inDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
-			                    <span class="input-group-addon">
-			                        <span class="glyphicon glyphicon-calendar"></span>
-			                    </span>
-			                </div>						            
+						<form:input path="consInstallFee" htmlEscape="false"    class="form-control"/>
 					</td>
 				</tr>
 				<tr>
-					<td class="width-15 active"><label class="pull-right">备注信息:</label></td>
+					<td class="width-15 active"><label class="">施工费:合计:</label></td>
 					<td class="width-35">
-						<form:textarea path="remarks" htmlEscape="false" rows="4"    class="form-control "/>
+						<form:input path="consTotalFee" htmlEscape="false"    class="form-control"/>
 					</td>
-					<td class="width-15 active"></td>
-		   			<td class="width-35" ></td>
-		  		</tr>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">监理费:</label></td>
+					<td class="width-35">
+						<form:input path="otherSupervisorFee" htmlEscape="false"    class="form-control"/>
+					</td>
+					<td class="width-15 active"><label class="">设计费:</label></td>
+					<td class="width-35">
+						<form:input path="otherDesignFee" htmlEscape="false"    class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">项目前期工作费:</label></td>
+					<td class="width-35">
+						<form:input path="otherBeWorkFee" htmlEscape="false"    class="form-control"/>
+					</td>
+					<td class="width-15 active"><label class="">建设期贷款利息:</label></td>
+					<td class="width-35">
+						<form:input path="otherBuildLoan" htmlEscape="false"    class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">线路施工赔偿费:</label></td>
+					<td class="width-35">
+						<form:input path="otherLineDamages" htmlEscape="false"    class="form-control"/>
+					</td>
+					<td class="width-15 active"><label class="">法人管理费:</label></td>
+					<td class="width-35">
+						<form:input path="otherLegalManage" htmlEscape="false"    class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">其他费用:合计:</label></td>
+					<td class="width-35">
+						<form:input path="otherTotalFee" htmlEscape="false"    class="form-control"/>
+					</td>
+				</tr>
 		 	</tbody>
 		</table>
 		<div class="tabs-container">
             <ul class="nav nav-tabs">
-				<li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">火车票:</a>
+				<li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">设备费:</a>
                 </li>
-				<li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">飞机票:</a>
+				<li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">材料费:</a>
                 </li>
-				<li class=""><a data-toggle="tab" href="#tab-3" aria-expanded="false">汽车票:</a>
+				<li class=""><a data-toggle="tab" href="#tab-3" aria-expanded="false">10KV线路信息:</a>
                 </li>
             </ul>
             <div class="tab-content">
@@ -139,75 +165,48 @@
 				<thead>
 					<tr>
 						<th class="hide"></th>
-						<th><font color="red">*</font>出发地</th>
-						<th><font color="red">*</font>目的地</th>
-						<th><font color="red">*</font>出发时间</th>
-						<th><font color="red">*</font>代理价格</th>
-						<th>是否有票</th>
-						<th>备注信息</th>
+						<th><font color="red">*</font>物料描述</th>
+						<th>单位</th>
+						<th>台数</th>
+						<th>总容量(千伏安)</th>
+						<th>入账金额(不含税价)</th>
 						<th width="10">&nbsp;</th>
 					</tr>
 				</thead>
 				<tbody id="testDataChild11List">
 				</tbody>
 			</table>
-			<script type="text/template" id="testDataChild11Tpl">//<!--
+			<script type="text/template" id="testDataChild11Tpl">
 				<tr id="testDataChild11List{{idx}}">
 					<td class="hide">
-						<input id="testDataChild11List{{idx}}_id" name="testDataChild11List[{{idx}}].id" type="hidden" value="{{row.id}}"/>
-						<input id="testDataChild11List{{idx}}_delFlag" name="testDataChild11List[{{idx}}].delFlag" type="hidden" value="0"/>
+						<input id="testDataChild11List{{idx}}_id" name="erpCreditChild1s[{{idx}}].id" type="hidden" value="{{row.id}}"/>
+						<input id="testDataChild11List{{idx}}_delFlag" name="erpCreditChild1s[{{idx}}].delFlag" type="hidden" value="0"/>
 					</td>
-					
 					<td  class="max-width-250">
-						<sys:treeselect id="testDataChild11List{{idx}}_startArea" name="testDataChild11List[{{idx}}].startArea.id" value="{{row.startArea.id}}" labelName="testDataChild11List{{idx}}.startArea.name" labelValue="{{row.startArea.name}}"
-							title="区域" url="/sys/area/treeData" cssClass="form-control  required" allowClear="true" notAllowSelectParent="true"/>
+						<input  name="erpCreditChild1s[{{idx}}].eqmMaterialDetails1" class="form-control required" type="text" value="{{row.eqmMaterialDetails1}}"/>
 					</td>
-					
-					
 					<td  class="max-width-250">
-						<sys:treeselect id="testDataChild11List{{idx}}_endArea" name="testDataChild11List[{{idx}}].endArea.id" value="{{row.endArea.id}}" labelName="testDataChild11List{{idx}}.endArea.name" labelValue="{{row.endArea.name}}"
-							title="区域" url="/sys/area/treeData" cssClass="form-control  required" allowClear="true" notAllowSelectParent="true"/>
+						<input  name="erpCreditChild1s[{{idx}}].eqmUnit" class="form-control" type="text" value="{{row.eqmUnit}}"/>
 					</td>
-					
-					
 					<td>
-						<div class='input-group form_datetime' id="testDataChild11List{{idx}}_starttime">
-		                    <input type='text'  name="testDataChild11List[{{idx}}].starttime" class="form-control required"  value="{{row.starttime}}"/>
-		                    <span class="input-group-addon">
-		                        <span class="glyphicon glyphicon-calendar"></span>
-		                    </span>
-		                </div>						            
+						<input  name="erpCreditChild1s[{{idx}}].eqmNumbers" class="form-control" type="text" value="{{row.eqmNumbers}}"/>
 					</td>
-					
-					
 					<td>
-						<input id="testDataChild11List{{idx}}_price" name="testDataChild11List[{{idx}}].price" type="text" value="{{row.price}}"    class="form-control required isFloatGteZero"/>
+						<input  name="erpCreditChild1s[{{idx}}].eqmTotalCapacity" class="form-control" type="text" value="{{row.eqmTotalCapacity}}"/>
 					</td>
-					
-					
 					<td>
-						<select id="testDataChild11List{{idx}}_isHave" name="testDataChild11List[{{idx}}].isHave" data-value="{{row.isHave}}" class="form-control m-b  ">
-							<option value=""></option>
-							<c:forEach items="${fns:getDictList('yes_no')}" var="dict">
-								<option value="${dict.value}">${dict.label}</option>
-							</c:forEach>
-						</select>
+						<input  name="erpCreditChild1s[{{idx}}].eqmBookedFee1" class="form-control" type="text" value="{{row.eqmBookedFee1}}"/>
 					</td>
-					
-					
-					<td>
-						<textarea id="testDataChild11List{{idx}}_remarks" name="testDataChild11List[{{idx}}].remarks" rows="4"    class="form-control ">{{row.remarks}}</textarea>
-					</td>
-					
+
 					<td class="text-center" width="10">
 						{{#delBtn}}<span class="close" onclick="delRow(this, '#testDataChild11List{{idx}}')" title="删除">&times;</span>{{/delBtn}}
 					</td>
-				</tr>//-->
+				</tr>
 			</script>
 			<script type="text/javascript">
 				var testDataChild11RowIdx = 0, testDataChild11Tpl = $("#testDataChild11Tpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
 				$(document).ready(function() {
-					var data = ${fns:toJson(testDataMain1.testDataChild11List)};
+					var data = ${fns:toJson(erpCredit.erpCreditChild1s)};
 					for (var i=0; i<data.length; i++){
 						addRow('#testDataChild11List', testDataChild11RowIdx, testDataChild11Tpl, data[i]);
 						testDataChild11RowIdx = testDataChild11RowIdx + 1;
@@ -221,75 +220,39 @@
 				<thead>
 					<tr>
 						<th class="hide"></th>
-						<th><font color="red">*</font>出发地</th>
-						<th><font color="red">*</font>目的地</th>
-						<th><font color="red">*</font>出发时间</th>
-						<th><font color="red">*</font>代理价格</th>
-						<th><font color="red">*</font>是否有票</th>
-						<th><font color="red">*</font>备注信息</th>
+						<th><font color="red">*</font>物料描述</th>
+						<th>入账金额(不含税价)</th>
 						<th width="10">&nbsp;</th>
 					</tr>
 				</thead>
 				<tbody id="testDataChild12List">
 				</tbody>
 			</table>
-			<script type="text/template" id="testDataChild12Tpl">//<!--
+			<script type="text/template" id="testDataChild12Tpl">
 				<tr id="testDataChild12List{{idx}}">
 					<td class="hide">
-						<input id="testDataChild12List{{idx}}_id" name="testDataChild12List[{{idx}}].id" type="hidden" value="{{row.id}}"/>
-						<input id="testDataChild12List{{idx}}_delFlag" name="testDataChild12List[{{idx}}].delFlag" type="hidden" value="0"/>
+						<input id="testDataChild12List{{idx}}_id" name="erpCreditChild2s[{{idx}}].id" type="hidden" value="{{row.id}}"/>
+						<input id="testDataChild12List{{idx}}_delFlag" name="erpCreditChild2s[{{idx}}].delFlag" type="hidden" value="0"/>
 					</td>
 					
 					<td  class="max-width-250">
-						<sys:treeselect id="testDataChild12List{{idx}}_startArea" name="testDataChild12List[{{idx}}].startArea.id" value="{{row.startArea.id}}" labelName="testDataChild12List{{idx}}.startArea.name" labelValue="{{row.startArea.name}}"
-							title="区域" url="/sys/area/treeData" cssClass="form-control  required" allowClear="true" notAllowSelectParent="true"/>
+						<input  name="erpCreditChild2s[{{idx}}].eqmMaterialDetails2" class="form-control required" type="text" value="{{row.eqmMaterialDetails2}}"/>
 					</td>
 					
 					
 					<td  class="max-width-250">
-						<sys:treeselect id="testDataChild12List{{idx}}_endArea" name="testDataChild12List[{{idx}}].endArea.id" value="{{row.endArea.id}}" labelName="testDataChild12List{{idx}}.endArea.name" labelValue="{{row.endArea.name}}"
-							title="区域" url="/sys/area/treeData" cssClass="form-control  required" allowClear="true" notAllowSelectParent="true"/>
-					</td>
-					
-					
-					<td>
-						<div class='input-group form_datetime' id="testDataChild12List{{idx}}_startTime">
-		                    <input type='text'  name="testDataChild12List[{{idx}}].startTime" class="form-control required"  value="{{row.startTime}}"/>
-		                    <span class="input-group-addon">
-		                        <span class="glyphicon glyphicon-calendar"></span>
-		                    </span>
-		                </div>						            
-					</td>
-					
-					
-					<td>
-						<input id="testDataChild12List{{idx}}_price" name="testDataChild12List[{{idx}}].price" type="text" value="{{row.price}}"    class="form-control required isFloatGteZero"/>
-					</td>
-					
-					
-					<td>
-						<select id="testDataChild12List{{idx}}_isHave" name="testDataChild12List[{{idx}}].isHave" data-value="{{row.isHave}}" class="form-control m-b  required">
-							<option value=""></option>
-							<c:forEach items="${fns:getDictList('yes_no')}" var="dict">
-								<option value="${dict.value}">${dict.label}</option>
-							</c:forEach>
-						</select>
-					</td>
-					
-					
-					<td>
-						<textarea id="testDataChild12List{{idx}}_remarks" name="testDataChild12List[{{idx}}].remarks" rows="4"    class="form-control required">{{row.remarks}}</textarea>
+						<input  name="erpCreditChild2s[{{idx}}].mtlBookedFee2" class="form-control" type="text" value="{{row.mtlBookedFee2}}"/>
 					</td>
 					
 					<td class="text-center" width="10">
 						{{#delBtn}}<span class="close" onclick="delRow(this, '#testDataChild12List{{idx}}')" title="删除">&times;</span>{{/delBtn}}
 					</td>
-				</tr>//-->
+				</tr>
 			</script>
 			<script type="text/javascript">
 				var testDataChild12RowIdx = 0, testDataChild12Tpl = $("#testDataChild12Tpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
 				$(document).ready(function() {
-					var data = ${fns:toJson(testDataMain1.testDataChild12List)};
+					var data = ${fns:toJson(erpCredit.erpCreditChild2s)};
 					for (var i=0; i<data.length; i++){
 						addRow('#testDataChild12List', testDataChild12RowIdx, testDataChild12Tpl, data[i]);
 						testDataChild12RowIdx = testDataChild12RowIdx + 1;
@@ -303,64 +266,51 @@
 				<thead>
 					<tr>
 						<th class="hide"></th>
-						<th><font color="red">*</font>出发地</th>
-						<th><font color="red">*</font>目的地</th>
-						<th>代理价格</th>
-						<th>是否有票</th>
-						<th>备注信息</th>
+						<th><font color="red">*</font>10KV电缆、架空导线型号</th>
+						<th>单位</th>
+						<th>长度</th>
+						<th>10KV线路长度(KM)</th>
+						<th>其中:10KV线路</th>
+						<th>其中:400V及以下</th>
 						<th width="10">&nbsp;</th>
 					</tr>
 				</thead>
 				<tbody id="testDataChild13List">
 				</tbody>
 			</table>
-			<script type="text/template" id="testDataChild13Tpl">//<!--
+			<script type="text/template" id="testDataChild13Tpl">
 				<tr id="testDataChild13List{{idx}}">
 					<td class="hide">
-						<input id="testDataChild13List{{idx}}_id" name="testDataChild13List[{{idx}}].id" type="hidden" value="{{row.id}}"/>
-						<input id="testDataChild13List{{idx}}_delFlag" name="testDataChild13List[{{idx}}].delFlag" type="hidden" value="0"/>
+						<input id="testDataChild13List{{idx}}_id" name="erpCreditChild3s[{{idx}}].id" type="hidden" value="{{row.id}}"/>
+						<input id="testDataChild13List{{idx}}_delFlag" name="erpCreditChild3s[{{idx}}].delFlag" type="hidden" value="0"/>
 					</td>
-					
 					<td  class="max-width-250">
-						<sys:treeselect id="testDataChild13List{{idx}}_startArea" name="testDataChild13List[{{idx}}].startArea.id" value="{{row.startArea.id}}" labelName="testDataChild13List{{idx}}.startArea.name" labelValue="{{row.startArea.name}}"
-							title="区域" url="/sys/area/treeData" cssClass="form-control  required" allowClear="true" notAllowSelectParent="true"/>
+						<input  name="erpCreditChild3s[{{idx}}].tenKvModel" class="form-control required" type="text" value="{{row.tenKvModel}}"/>
 					</td>
-					
-					
 					<td  class="max-width-250">
-						<sys:treeselect id="testDataChild13List{{idx}}_endArea" name="testDataChild13List[{{idx}}].endArea.id" value="{{row.endArea.id}}" labelName="testDataChild13List{{idx}}.endArea.name" labelValue="{{row.endArea.name}}"
-							title="区域" url="/sys/area/treeData" cssClass="form-control  required" allowClear="true" notAllowSelectParent="true"/>
+						<input  name="erpCreditChild3s[{{idx}}].tenKvUnit" class="form-control" type="text" value="{{row.tenKvUnit}}"/>
 					</td>
-					
-					
-					<td>
-						<input id="testDataChild13List{{idx}}_price" name="testDataChild13List[{{idx}}].price" type="text" value="{{row.price}}"    class="form-control "/>
+					<td  class="max-width-250">
+						<input  name="erpCreditChild3s[{{idx}}].tenKvLength" class="form-control" type="text" value="{{row.tenKvLength}}"/>
 					</td>
-					
-					
-					<td>
-						<select id="testDataChild13List{{idx}}_isHave" name="testDataChild13List[{{idx}}].isHave" data-value="{{row.isHave}}" class="form-control m-b  ">
-							<option value=""></option>
-							<c:forEach items="${fns:getDictList('yes_no')}" var="dict">
-								<option value="${dict.value}">${dict.label}</option>
-							</c:forEach>
-						</select>
+					<td  class="max-width-250">
+						<input  name="erpCreditChild3s[{{idx}}].tenKvLineLength" class="form-control" type="text" value="{{row.tenKvLineLength}}"/>
 					</td>
-					
-					
-					<td>
-						<textarea id="testDataChild13List{{idx}}_remarks" name="testDataChild13List[{{idx}}].remarks" rows="4"    class="form-control ">{{row.remarks}}</textarea>
+					<td  class="max-width-250">
+						<input  name="erpCreditChild3s[{{idx}}].tenKvItsLine" class="form-control" type="text" value="{{row.tenKvItsLine}}"/>
+					</td>
+					<td  class="max-width-250">
+						<input  name="erpCreditChild3s[{{idx}}].tenKvItesFhvFollow" class="form-control" type="text" value="{{row.tenKvItesFhvFollow}}"/>
 					</td>
-					
 					<td class="text-center" width="10">
 						{{#delBtn}}<span class="close" onclick="delRow(this, '#testDataChild13List{{idx}}')" title="删除">&times;</span>{{/delBtn}}
 					</td>
-				</tr>//-->
+				</tr>
 			</script>
 			<script type="text/javascript">
 				var testDataChild13RowIdx = 0, testDataChild13Tpl = $("#testDataChild13Tpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
 				$(document).ready(function() {
-					var data = ${fns:toJson(testDataMain1.testDataChild13List)};
+					var data = ${fns:toJson(erpCredit.erpCreditChild3s)};
 					for (var i=0; i<data.length; i++){
 						addRow('#testDataChild13List', testDataChild13RowIdx, testDataChild13Tpl, data[i]);
 						testDataChild13RowIdx = testDataChild13RowIdx + 1;

+ 2 - 2
src/main/webapp/webpage/modules/sg/financial/erp/erpCreditList.js

@@ -150,7 +150,7 @@ $(document).ready(function() {
                    }
                    ,{
                        field: 'consTotalFee',
-                       title: '计',
+                       title: '施工费:合计',
                        sortable: true,
                        sortName: 'consTotalFee'
 
@@ -199,7 +199,7 @@ $(document).ready(function() {
                    }
                    ,{
                        field: 'otherTotalFee',
-                       title: '合计',
+                       title: '其他费用:合计',
                        sortable: true,
                        sortName: 'otherTotalFee'
 

+ 1 - 1
src/main/webapp/webpage/modules/sg/financial/erp/erpCreditList.jsp

@@ -23,7 +23,7 @@
 				<form:form id="searchForm" modelAttribute="erpCredit" class="form form-horizontal well clearfix">
 					<div class="col-xs-12 col-sm-6 col-md-4">
 						<label class="label-item single-overflow pull-left" title="项目定义编码:">项目定义编码:</label>
-						<form:input path="itemId" htmlEscape="false" maxlength="64"  class="form-control"/>
+						<form:input path="itemId" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>
 					<div class="col-xs-12 col-sm-6 col-md-4">
 						<div style="margin-top:26px">