增加物料搜索、合同金额修改

src/main/webapp/yw/contract/contractFlowCustom/js/contract.js

@@ -532,15 +532,12 @@ function calculatePaymentAmount() {
     });
 }
 
+// 初始化时设置合同金额为可编辑状态
+
 function updateContractMoneyState() {
-    var hasMaterial = $(".startTr1:not(.hide)").length > 0;
-    if (hasMaterial) {
-        $("#contract_money").prop("readonly", false);
-        $(".contract-money-hint").hide();
-    } else {
-        $("#contract_money").prop("readonly", true);
-        $(".contract-money-hint").show();
-    }
+    // 始终允许输入合同金额，不再限制
+    $("#contract_money").prop("readonly", false);
+    $(".contract-money-hint").hide();
 }
 
 //显示行内错误提示

src/main/webapp/yw/contract/contractFlowCustom/processContract.jsp

@@ -507,7 +507,7 @@
                     <c:when test="${fn:contains(curTacheModel.table_fields, ',contract_money,') || curTacheModel.n_se eq 1}">
                         <input type="text" id="contract_money" name="contractInfo.contract_money" value="${contractInfo.contract_money }" onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')">
                         <div class="contract-money-hint manual-input-hint" style="display: none;">
-						        请先添加物料信息后才能编辑合同金额
+						        合同金额可随时输入，添加物料后会自动计算总金额
 						 </div>
                     </c:when>
                     <c:otherwise>

src/main/webapp/yw/contract/contractFlowCustom/startContract.jsp

@@ -74,9 +74,7 @@
                 });
             });
              
-            //checkMaterialFilled();
-            
-         	// 监听合同金额手动输入
+        	// 监听合同金额手动输入
             $("#contract_money").on('input', function() {
             	var contractMoney = parseFloat($("#contract_money").val());
             	if(contractMoney){
@@ -411,7 +409,7 @@
 			<td class="l-table-edit-td" colspan="2">
 				 <input id="contract_money" name="contractInfo.contract_money" type='text' value="" onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')"/> 
 				 <div class="contract-money-hint manual-input-hint" style="display: none;">
-				        请先添加物料信息后才能编辑合同金额
+				        合同金额可随时输入，添加物料后会自动计算总金额
 				 </div>
 			</td>
         </tr>

src/main/webapp/yw/contract/selectMaterialForContract.jsp

@@ -313,6 +313,8 @@ function initPurchaseDetailList(){
 	params=params+"&contractPurchaseFormId="+encodeURI(encodeURI(contractPurchaseFormId));
 	var contractPurchaseFormNumber=$("#contractPurchaseFormNumber").val();
 	params=params+"&contractPurchaseFormNumber="+encodeURI(encodeURI(contractPurchaseFormNumber));
+	var materialName=$("#materialName").val();
+	params=params+"&materialName="+encodeURI(encodeURI(materialName));
 	var qtyRemainMore=$("#qtyRemainMore").val();
 	params=params+"&qtyRemainMore="+qtyRemainMore;
 	loadPurchaseOrderMaterials(params);
@@ -392,6 +394,12 @@ body {
 						<input type="hidden" id="contractPurchaseFormNumber" name="contractPurchaseFormNumber" value="" />
 					</li>
 				</ul>
+				<ul class="list_search" style="float:left;width:185px;margin-left:50px;" >
+					<li class="title" style="width:80px;">物料名称：</li>
+					<li class="text" style="width:100px;"><input type="text" name="materialName"
+						id="materialName" value=""/></li>
+				</ul>
+				
 				<ul style="float:left;;width:85px;margin-left:50px;">
 					<li class="search-button"> 
 						<!-- <input type="button" class='l-button' name="searchPurchase" onclick="selectPurchase()" value="选择" /> -->