采购接收MES更新数据，修复采购和合同测试过程发现的BUG，优化采购和合同

shares/js/yw/master1_bpm/customflow/customProcessFlow.js

@@ -595,7 +595,7 @@ function saveFlow() {
 			location = "MTFlowAction.do?task=toPurchaseDealList";
 		}else{
 			//location="MTFlowAction.do?task=toDealList";
-			yrConfirm(data+"是否继续办理下一个流程？",nextdeal);
+			yrConfirm("流程办理成功，是否继续办理下一个流程？",nextdeal);
 		}
 	}
 }

src/main/contract/com/yw/contract/client/action/PurchaseUpdateAction.java

@@ -0,0 +1,77 @@
+package com.yw.contract.client.action;
+
+import com.yw.contract.contract.model.ContractPurchaseForm;
+import com.yw.contract.contract.service.ContractPurchaseService;
+import com.yw.core.clientImpl.model.ResultVo;
+import com.yw.core.clientImpl.service.RequestAbs;
+import com.yw.core.session.AppSession;
+import com.yw.core.utils.RegisterCodeImpl;
+import com.yw.core.utils.StringUtil;
+import com.yw.core.utils.TokenAi;
+import com.yw.eu.base.user.model.User;
+import com.yw.eu.base.user.service.UserService;
+import com.yw.master1.eu.ai.model.AiMessage;
+import com.yw.master1.eu.ai.service.AiMessageService;
+import net.sf.json.JSONObject;
+import org.springframework.context.ApplicationContext;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 从mes推送采购单状态到OA
+ */
+public class PurchaseUpdateAction extends RequestAbs {
+    public final String serviceId = "contract_purchaseUpdate";
+    private ApplicationContext cxt = null;
+    @Override
+    public String getResult() {
+        // 获取请求的参数
+        String param = getParameters();
+        JSONObject json = JSONObject.fromObject(param); 
+        String purchaseNumber = json.getString("purchaseNumber"); 
+        int purchaseStatus = json.getInt("purchaseStatus"); 
+        if (null == cxt) {
+            cxt = AppSession.getApplicationContext();
+        }
+        ResultVo rv = null;
+		if(!StringUtil.isEmpty(purchaseNumber)){ 
+			ContractPurchaseService contractPurchaseService = (ContractPurchaseService) cxt.getBean("contractPurchaseService"); 
+			ContractPurchaseForm contractPurchaseForm = new ContractPurchaseForm();
+			contractPurchaseForm.setContractPurchaseNumber(purchaseNumber);
+			contractPurchaseForm.setPurchaseStatus(purchaseStatus);
+			int num;
+			try {
+				num = contractPurchaseService.updatePurchaseByNumber(contractPurchaseForm);
+				if(num > 0){ 
+					rv = new ResultVo();
+					rv.setReturnCode("1");
+					rv.setReturnMsg("success"); 
+					return JSONObject.fromObject(rv, config).toString();
+				 } 
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			
+		} 
+		rv = new ResultVo();
+		rv.setReturnCode("-1");
+		rv.setReturnMsg("failed");
+		rv.setReturnParams("");
+		return JSONObject.fromObject(rv,config).toString();
+    }
+
+    @Override
+    public String getServiceId() {
+        return serviceId;
+    }
+    
+    public static void main(String[] args) throws Exception {
+		String url = "http://localhost:8080/ynet/clientServices.do?iscrypt=1";
+		String param = "{\"serviceId\":\"contract_purchaseUpdate\"," + "\"params\":{\"purchaseNumber\":\"CG20250711002\",\"purchaseStatus\":\"2\"}}";
+		String rs = RegisterCodeImpl.requestPage(url, param);
+		System.out.println(rs);
+	}
+}

src/main/contract/com/yw/contract/contract/action/ContractPurchaseAction.java

@@ -360,9 +360,10 @@ public class ContractPurchaseAction  extends BpmBaseAction {
 	public void viewContractPurchase(HttpServletRequest request, HttpServletResponse response) throws Exception {
 		contractPurchaseService = this.getBean(ContractPurchaseService.class, "contractPurchaseService"); 
 		String formInsId = request.getParameter("universalid"); 
-		if(contractPurchaseForm == null) {
+		/*if(contractPurchaseForm == null) {
 			contractPurchaseForm = new ContractPurchaseForm();
-		}
+		}*/
+		contractPurchaseForm = new ContractPurchaseForm();
 		contractPurchaseForm.setlFormInsId(StringUtil.strToLong(formInsId)); 
 		contractPurchaseForm = contractPurchaseService.getContractPurchaseForm(contractPurchaseForm);
 		ContractPurchaseDetail contractPurchaseDetail = new ContractPurchaseDetail();
@@ -432,6 +433,9 @@ public class ContractPurchaseAction  extends BpmBaseAction {
 		int rs = contractPurchaseService.saveContractNumber(contractPurchaseForm);
 		if (rs > 0) { 
 			this.addInfo("修改成功");
+		} else if(rs == -99){
+			this.addError("合同物料和采购单物料不匹配");
+			return "contractPurchaseAction.do?task=viewContractPurchase&universalid=" + contractPurchaseForm.getUniversalid();
 		} else {
 			this.addError("修改失败");
 			return "contractPurchaseAction.do?task=viewContractPurchase&universalid=" + contractPurchaseForm.getUniversalid();

src/main/contract/com/yw/contract/contract/service/ContractPurchaseService.java

@@ -55,4 +55,6 @@ public interface ContractPurchaseService {
 	 * @throws Exception 
 	 */
 	public int saveContractNumber(ContractPurchaseForm contractPurchaseForm) throws Exception;
+
+	public int updatePurchaseByNumber(ContractPurchaseForm contractPurchaseForm) throws Exception;
 }

src/main/contract/com/yw/contract/contract/service/ContractPurchaseServiceImpl.java

@@ -23,6 +23,7 @@ import com.yw.contract.common.sync.jdy.JdyPurOrderHelper;
 import com.yw.contract.common.sync.mes.MesCommonHelper;
 import com.yw.contract.contract.dao.ContractPurchaseDao;
 import com.yw.contract.contract.model.ContractInfo;
+import com.yw.contract.contract.model.ContractMaterial;
 import com.yw.contract.contract.model.ContractPurchaseDetail;
 import com.yw.contract.contract.model.ContractPurchaseForm;
 import com.yw.contract.contract.model.StockBillMaterial;
@@ -266,12 +267,39 @@ public class ContractPurchaseServiceImpl implements ContractPurchaseService{
 	}
 
 	@Override
-	public int saveContractNumber(ContractPurchaseForm contractPurchaseForm) throws Exception { 
+	public int saveContractNumber(ContractPurchaseForm contractPurchaseForm) throws Exception {
+		Long formInsId = contractPurchaseForm.getUniversalid();
+		ContractPurchaseDetail contractPurchaseDetail = new ContractPurchaseDetail();
+		contractPurchaseDetail.setlFormInsId(formInsId);
+		List<Object> detailList = this.getObjectList(contractPurchaseDetail);
+		List<ContractPurchaseDetail> contractPurchaseDetailList = (List<ContractPurchaseDetail>) (List<?>) detailList; 
+		
+		Long contractId = contractPurchaseForm.getContractId();
+		ContractMaterial contractMaterial = new ContractMaterial();
+		contractMaterial.setlFormInsId(contractId);
+		List<Object> contractMaterials = this.getObjectList(contractMaterial);
+		List<ContractMaterial> contractMaterialList = (List<ContractMaterial>) (List<?>) contractMaterials; 
+		
+		for (ContractPurchaseDetail detail : contractPurchaseDetailList) { 
+	        String materialCode = detail.getMaterialCode();   
+	        boolean found = false; 
+	        for (ContractMaterial material : contractMaterialList) { 
+	            String itemCode = material.getItemCode();  
+	            if (materialCode.equals(itemCode))  { 
+	                found = true; 
+	                break; 
+	            } 
+	        } 
+	        if (!found) {  
+	            return -99; 
+	        } 
+	    } 
+		
 		int num  = purchaseDao.editContractPurchaseForm(contractPurchaseForm,"universalid");
 		if(num > 0){
-			Long id = contractPurchaseForm.getUniversalid();
+			
 			contractPurchaseForm = new ContractPurchaseForm(); 
-			contractPurchaseForm.setlFormInsId(id); 
+			contractPurchaseForm.setlFormInsId(formInsId); 
 			contractPurchaseForm = getContractPurchaseForm(contractPurchaseForm);
 			int status = contractPurchaseForm.getSyncStatus();
 			if(status == 1 || status == 3){
@@ -286,4 +314,10 @@ public class ContractPurchaseServiceImpl implements ContractPurchaseService{
 		}
 		return num;
 	}
+
+	@Override
+	public int updatePurchaseByNumber(ContractPurchaseForm contractPurchaseForm) throws Exception {
+		int num  = purchaseDao.editContractPurchaseForm(contractPurchaseForm,"contractPurchaseNumber");
+		return num;
+	}
 }

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

@@ -270,7 +270,7 @@
                 </c:choose>
 			</td>
 			<td class="l-table-edit-text">电话:</td>
-			<td class="l-table-edit-td">
+			<td class="l-table-edit-td" style="width: 150px;">
 				<c:choose>
                     <c:when test="${curTacheModel.n_se ne 1}">${contractInfo.salesmanTel}</c:when>
                     <c:otherwise>

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

@@ -124,7 +124,7 @@
 				 ${contractInfo.contract_entrying_operator_name}  
 			</td>
 			<td class="l-table-edit-text">电话:</td>
-			<td class="l-table-edit-td">
+			<td class="l-table-edit-td" style="width: 120px;">
 				 ${contractInfo.salesmanTel}
                      	
 			</td> 

src/main/webapp/yw/contract/contractPurchase/contractPurchaseList.jsp

@@ -52,6 +52,20 @@ function loadContractPurchaseList(params) {
 									name : 'contractName',
 									width : 250
 								},
+								{ display: '执行状态', name: 'purchaseStatus',
+						        	 render: function (item)
+						             {
+						                 if(item.purchaseStatus == 0) {
+						    				return '未开始';
+						    			 }else if(item.purchaseStatus == '1'){
+						    				 return '执行中';
+						    			 }else if(item.purchaseStatus == '2'){
+						    				 return '已完成';
+						    			 }else{
+						    				 return '';
+						    			 } 
+						             }
+						        },
 								{
 									display : '操作',
 									isAllowHide : false,

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

@@ -210,7 +210,13 @@ function f_importCancelMaterialNoContract(item, dialog) {
 
 //选择供应商
 function supplier_search(){
-	$.ligerDialog.open({
+	var obj = window.top;
+	var contractId = $("#contractId").val();  
+	if (contractId) { 
+		obj.$.ligerDialog.warn('合同已存在供应商信息，不能变更！');
+		return;
+	}
+	obj.$.ligerDialog.open({
 		title : '选择供应商',
 		width : 860,
 		height : 350, 
@@ -282,6 +288,12 @@ function f_RelationContractOK(item, dialog){
 		obj.$.ligerDialog.warn('只能选择一个合同！');
 		return;
 	}
+	var supplierCode = $("#supplierCode").val(); 
+	if(rows[0].supplierCode != supplierCode){
+		var obj = window.top;
+		obj.$.ligerDialog.warn('该合同的供应商和采购单中的供应商不一致！');
+		return;
+	}
 	$("#contractId").val(rows[0].universalid); 
 	$("#contractNumber").val(rows[0].contract_number);
 	$("#contractName").val(rows[0].contract_name);  
@@ -290,4 +302,10 @@ function f_RelationContractOK(item, dialog){
 
 function f_RelationContractCancel(item, dialog) {
 	dialog.close();
+}
+
+function clearContract(){
+	$("#contractId").val(''); 
+	$("#contractNumber").val('');
+	$("#contractName").val(''); 
 }

src/main/webapp/yw/contract/contractPurchase/processContractPurchase.jsp

@@ -40,7 +40,7 @@
                 $(".TextDisplay").each(function (i, v) { // 	将input隐藏，显示该input的文本值（不带文本框）
                     $(v).hide();
                     if ($(v).val() == '') {
-                        $(v).after('------------');
+                        $(v).after('');
                     } else {
                         $(v).after($(v).val());
                     }
@@ -178,14 +178,14 @@
             <td class="l-table-edit-td">${contractPurchaseForm.processId}</td>
         </tr> --%>
         <tr>
-            <td class="l-table-edit-text" style="width: 150px;">申请部门：</td>
+            <td class="l-table-edit-text" style="width: 100px;">申请部门：</td>
             <td class="l-table-edit-td" style="width: 250px;">
                 <input type="hidden" id="department" name="contractPurchaseForm.department" value="${contractPurchaseForm.department}"/>
                 ${contractPurchaseForm.department}
                 
                 <input type="hidden" id="initiator" name="contractPurchaseForm.initiator" value="${contractPurchaseForm.initiator}"/>
             </td>
-            <td class="l-table-edit-text" style="width: 150px;">申请日期:</td>
+            <td class="l-table-edit-text" style="width: 100px;">申请日期:</td>
             <td class="l-table-edit-td" style="width: 250px;">
                 <input type="hidden" id="applyDate" name="contractPurchaseForm.applyDate" value="${contractPurchaseForm.applyDate}"/>
                 ${contractPurchaseForm.applyDate}
@@ -224,6 +224,7 @@
                     <c:otherwise>
                        <input type="text" readonly="readonly" id="contractNumber" name="contractPurchaseForm.contractNumber" value="${contractPurchaseForm.contractNumber}">
 						<img id="searhdepartment" class="fee" onClick="selectContract()" src="${pageContext.request.contextPath}/images/sousuo.png" style="height: 20px; width: 20px; cursor: pointer;">
+						<input id="clearContractBtn" name="clearContractBtn" type="button" class="button_fj" value="清除" onclick="clearContract()"/>		
                     </c:otherwise>
                 </c:choose> 
 			</td> 

src/main/webapp/yw/contract/contractPurchase/startContractPurchase.jsp

@@ -73,6 +73,7 @@
         function save() {
             saveAjaxForm("${pageContext.request.contextPath}/contractPurchaseAction.do?task=start", "formIns");
         }
+        
     </script>
     <style type="text/css">
         .l-table-edit-new {
@@ -133,14 +134,14 @@
             <td class="l-table-edit-td">自动生成</td>
         </tr> --%>
         <tr>
-            <td class="l-table-edit-text" style="width: 150px;">申请部门：</td>
+            <td class="l-table-edit-text" style="width: 100px;">申请部门：</td>
             <td class="l-table-edit-td" style="width: 250px;">
                 <input type="hidden" id="department" name="contractPurchaseForm.department" value="${department}"/>
                 ${department}
                 
                 <input type="hidden" id="initiator" name="contractPurchaseForm.initiator" value="${initiator}"/>
             </td>
-            <td class="l-table-edit-text" style="width: 150px;">申请日期:</td>
+            <td class="l-table-edit-text" style="width: 100px;">申请日期:</td>
             <td class="l-table-edit-td" style="width: 250px;">
                 <input type="hidden" id="applyDate" name="contractPurchaseForm.applyDate" value="${applyDate}"/>
                 ${applyDate}
@@ -162,6 +163,7 @@
 				<input type="hidden" id="contractId" name="contractPurchaseForm.contractId" value="" />
 				<input type="text" readonly="readonly" id="contractNumber" name="contractPurchaseForm.contractNumber">
 				<img id="searhdepartment" class="fee" onClick="selectContract()" src="${pageContext.request.contextPath}/images/sousuo.png" style="height: 20px; width: 20px; cursor: pointer;">
+				<input id="clearContractBtn" name="clearContractBtn" type="button" class="button_fj" value="清除" onclick="clearContract()"/>		
 			</td> 
 			<td class="l-table-edit-text">合同名称：</td>
 			<td class="l-table-edit-td"> 

src/main/webapp/yw/contract/contractPurchase/viewContractPurchase.jsp

@@ -35,7 +35,7 @@
                 $(".TextDisplay").each(function (i, v) { // 	将input隐藏，显示该input的文本值（不带文本框）
                     $(v).hide();
                     if ($(v).val() == '') {
-                        $(v).after('------------');
+                        $(v).after('');
                     } else {
                         $(v).after($(v).val());
                     }
@@ -136,11 +136,11 @@
             <td class="l-table-edit-td">${contractPurchaseForm.processId}</td>
         </tr> --%>
         <tr>
-            <td class="l-table-edit-text" style="width: 150px;">申请部门：</td>
+            <td class="l-table-edit-text" style="width: 100px;">申请部门：</td>
             <td class="l-table-edit-td" style="width: 250px;"> 
                 ${contractPurchaseForm.department}
             </td>
-            <td class="l-table-edit-text" style="width: 150px;">申请日期:</td>
+            <td class="l-table-edit-text" style="width: 100px;">申请日期:</td>
             <td class="l-table-edit-td" style="width: 250px;">
                ${contractPurchaseForm.applyDate}
             </td>

src/main/webapp/yw/contract/contractPurchase/viewContractPurchaseInfo.jsp

@@ -36,7 +36,7 @@ $(function () {
         $(".TextDisplay").each(function (i, v) { // 	将input隐藏，显示该input的文本值（不带文本框）
             $(v).hide();
             if ($(v).val() == '') {
-                $(v).after('------------');
+                $(v).after('');
             } else {
                 $(v).after($(v).val());
             }
@@ -122,7 +122,8 @@ body {
 					<input type="hidden" id="universalid" name="contractPurchaseForm.universalid" value="${contractPurchaseForm.universalid}">
     				<input type="hidden" id="lFormInsId" name="contractPurchaseForm.lFormInsId" value="${contractPurchaseForm.lFormInsId}">
 					<input type="hidden" id="contractPurchaseNumber" name="contractPurchaseForm.contractPurchaseNumber" value="${contractPurchaseForm.contractPurchaseNumber }"/>
-			
+					<input id="supplierName" name="contractPurchaseForm.supplierName" type="hidden" value="${contractPurchaseForm.supplierName }" />							
+					<input id="supplierCode" name="contractPurchaseForm.supplierCode" type="hidden" value="${contractPurchaseForm.supplierCode }"/>
 					<c:if test="${empty contractPurchaseForm.contractNumber}"> 
 						<div id="leftBtn" >
 							<input type="button" value="保存" class="l-button" onclick="saveContractNumber()" id="saveContractNumberBtn" />
@@ -136,7 +137,7 @@ body {
 							</th>
 						</tr>
 						<tr>
-				            <td class="l-table-edit-text">申请人：</td>
+				            <td class="l-table-edit-text">申请人:</td>
 				            <td class="l-table-edit-td">
 				               ${contractPurchaseForm.initiator}
 				            </td>
@@ -144,7 +145,7 @@ body {
 				            <td class="l-table-edit-td">${contractPurchaseForm.processId}</td>
 				        </tr>
 				        <tr>
-				            <td class="l-table-edit-text">在职部门：</td>
+				            <td class="l-table-edit-text">申请部门:</td>
 				            <td class="l-table-edit-td"> 
 				                ${contractPurchaseForm.department}
 				            </td>
@@ -154,11 +155,11 @@ body {
 				            </td>
 				        </tr>
 				        <tr>
-				            <td class="l-table-edit-text">合同采购单编号：</td>
+				            <td class="l-table-edit-text">采购单编号:</td>
 				            <td class="l-table-edit-td">
 				            	 ${contractPurchaseForm.contractPurchaseNumber} 
 				            </td>
-				             <td class="l-table-edit-text">合同采购单名称：</td>
+				             <td class="l-table-edit-text">采购单名称:</td>
 				            <td class="l-table-edit-td">
 				               	${contractPurchaseForm.contractPurchaseName} 
 				            </td>
@@ -173,7 +174,7 @@ body {
 						                <input type="text" readonly="readonly" id="contractNumber" name="contractPurchaseForm.contractNumber" value="${contractPurchaseForm.contractNumber}">
 										<img id="searhdepartment" class="fee" onClick="selectRelationContract()" src="${pageContext.request.contextPath}/images/sousuo.png" style="height: 20px; width: 20px; cursor: pointer;">         
 									</td> 
-									<td class="l-table-edit-text">合同名称：</td>
+									<td class="l-table-edit-text">合同名称:</td>
 									<td class="l-table-edit-td"> 
 						                <input type="text" id="contractName" name="contractPurchaseForm.contractName" value="${contractPurchaseForm.contractName}" readonly="readonly">
 						          	</td> 
@@ -181,20 +182,26 @@ body {
 		                    </c:when>
 		                    <c:otherwise>
 		                    	<tr>
-									<td class="l-table-edit-text">合同编号： 
+									<td class="l-table-edit-text">合同编号:
 									</td>
 									<td class="l-table-edit-td">
 										 ${contractPurchaseForm.contractNumber} 
 									</td> 
-									<td class="l-table-edit-text">合同名称：</td>
+									<td class="l-table-edit-text">合同名称:</td>
 									<td class="l-table-edit-td">
 										 ${contractPurchaseForm.contractName}  
 									</td> 
 								</tr>
 		                    </c:otherwise>
 		                </c:choose>  
+		                <tr>  
+							<td class="l-table-edit-text">供应商:</td>
+							<td class="l-table-edit-td" colspan="3">
+								${contractPurchaseForm.supplierName}  
+							</td> 
+						</tr> 
 						 <tr>
-				            <td class="l-table-edit-text">部门意见： 
+				            <td class="l-table-edit-text">部门意见:
 				            </td>
 				            <td class="l-table-edit-td" colspan="3"> 
 				               <div id="departmental_opinion_span" style="width: 100%; overflow: auto; padding: 5px 5px;;position: relative; font-size: 15px;">
@@ -206,7 +213,7 @@ body {
 				            </td>
 				          </tr>
 				          <tr>
-				            <td class="l-table-edit-text">副总经理： 
+				            <td class="l-table-edit-text">副总经理:
 				            </td>
 				            <td class="l-table-edit-td" colspan="3">
 				               	<div id="deputy_general_manager_opinion_span" style="width: 100%; overflow: auto; padding: 5px 5px;;position: relative; font-size: 15px;">
@@ -218,7 +225,7 @@ body {
 				            </td>
 				         </tr>
 				         <tr>
-				            <td class="l-table-edit-text">总经理： 
+				            <td class="l-table-edit-text">总经理:
 				            </td>
 				            <td class="l-table-edit-td" colspan="3"> 
 				                <div id="general_manager_opinion_span" style="width: 100%; overflow: auto; padding: 5px 5px;;position: relative; font-size: 15px;">
@@ -246,7 +253,7 @@ body {
 				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">物料编码</th>
 				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">物料名称</th>
 				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">型号/规格</th>
-				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;"> 供应商</th>  
+				                <!-- <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;"> 供应商</th>   -->
 				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">数量</th> 
 				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">单价</th>
 				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">税率</th> 
@@ -264,9 +271,9 @@ body {
 				                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
 				                        <input type="text" name="" class="input-width materialModel TextDisplay" value="${items.materialModel}" readonly>
 				                    </td>
-				                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
+				                    <%-- <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
 				                        <input type="text" name="" class="input-width supplier TextDisplay" value="${items.supplier}" readonly>
-				                    </td>
+				                    </td> --%>
 				                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
 				                        <input type="text" name="" class="input-width qty TextDisplay" onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')" value="${items.qty}">
 				                    </td>
@@ -282,7 +289,7 @@ body {
 				            
 				            <tr id="firstPoint"></tr>
 				            <tr>
-				                <td class="l-table-edit-new" colspan="4" style="padding-right: 0px;padding-left: 0px;"></td>
+				                <td class="l-table-edit-new" colspan="3" style="padding-right: 0px;padding-left: 0px;"></td>
 				                <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;"> 合计(元)：</td>
 				                <td class="l-table-edit-new" colspan="1"
 				                    style="padding-right: 0px;padding-left: 0px;text-align: center;">

src/main/webapp/yw/master1_contract/contractPurchase/contractPurchaseList.jsp

@@ -69,6 +69,13 @@
 							if(arr.contractNumber){
 								html += ' 合同编号：'+arr.contractNumber;
 							}
+							if(arr.purchaseStatus == 0) {
+								html += '【未开始】';
+			    			 }else if(arr.purchaseStatus == '1'){
+			    				html += '【执行中】';
+			    			 }else if(arr.purchaseStatus == '2'){
+			    				html += '【已完成】';
+			    			 }
 							html += '</p>';
 							html += '<p class="mar5">' + arr.applyDate + '</p>';
 							html += '</div>';

src/main/webapp/yw/master1_contract/contractPurchase/viewContractPurchase.jsp

@@ -49,7 +49,7 @@ $(function () {
         $(".TextDisplay").each(function (i, v) { // 	将input隐藏，显示该input的文本值（不带文本框）
             $(v).hide();
             if ($(v).val() == '') {
-                $(v).after('------------');
+                $(v).after('');
             } else {
                 $(v).after($(v).val());
             }

src/main/webapp/yw/master1_contract/contractPurchase/viewContractPurchaseInfo.jsp

@@ -47,7 +47,7 @@ $(function () {
         $(".TextDisplay").each(function (i, v) { // 	将input隐藏，显示该input的文本值（不带文本框）
             $(v).hide();
             if ($(v).val() == '') {
-                $(v).after('------------');
+                $(v).after('');
             } else {
                 $(v).after($(v).val());
             }
@@ -140,6 +140,8 @@ body {
 			<input type="hidden" id="universalid" name="contractPurchaseForm.universalid" value="${contractPurchaseForm.universalid}">
     		<input type="hidden" id="lFormInsId" name="contractPurchaseForm.lFormInsId" value="${contractPurchaseForm.lFormInsId}">
 			<input type="hidden" id="contractPurchaseNumber" name="contractPurchaseForm.contractPurchaseNumber" value="${contractPurchaseForm.contractPurchaseNumber }"/>
+			<input id="supplierName" name="contractPurchaseForm.supplierName" type="hidden" value="${contractPurchaseForm.supplierName }" />							
+			<input id="supplierCode" name="contractPurchaseForm.supplierCode" type="hidden" value="${contractPurchaseForm.supplierCode }"/>
 			<div id="layout1">
 				<div position="center" id="center" title="" class="forum-container">
 					<table class="l-table-edit line" width="100%">
@@ -149,7 +151,7 @@ body {
 							</th>
 						</tr>
 				        <tr>
-				            <td class="l-table-edit-text">申请人：</td>
+				            <td class="l-table-edit-text">申请人:</td>
 				            <td class="l-table-edit-td">
 				               ${contractPurchaseForm.initiator}
 				            </td>
@@ -157,7 +159,7 @@ body {
 				            <td class="l-table-edit-td">${contractPurchaseForm.processId}</td>
 				        </tr>
 				        <tr>
-				            <td class="l-table-edit-text">在职部门：</td>
+				            <td class="l-table-edit-text">申请部门:</td>
 				            <td class="l-table-edit-td"> 
 				                ${contractPurchaseForm.department}
 				            </td>
@@ -167,11 +169,11 @@ body {
 				            </td>
 				        </tr>
 				        <tr>
-				            <td class="l-table-edit-text">合同采购单编号：</td>
+				            <td class="l-table-edit-text">采购单编号:</td>
 				            <td class="l-table-edit-td">
 				            	 ${contractPurchaseForm.contractPurchaseNumber} 
 				            </td>
-				             <td class="l-table-edit-text">合同采购单名称：</td>
+				             <td class="l-table-edit-text">采购单名称:</td>
 				            <td class="l-table-edit-td">
 				               	${contractPurchaseForm.contractPurchaseName} 
 				            </td>
@@ -186,7 +188,7 @@ body {
 						                <input type="text" readonly="readonly" id="contractNumber" name="contractPurchaseForm.contractNumber" value="${contractPurchaseForm.contractNumber}">
 										<img id="searhdepartment" class="fee" onClick="selectRelationContract()" src="${pageContext.request.contextPath}/images/sousuo.png" style="height: 20px; width: 20px; cursor: pointer;">         
 									</td> 
-									<td class="l-table-edit-text">合同名称：</td>
+									<td class="l-table-edit-text">合同名称:</td>
 									<td class="l-table-edit-td"> 
 						                <input type="text" id="contractName" name="contractPurchaseForm.contractName" value="${contractPurchaseForm.contractName}" readonly="readonly">
 						          	</td> 
@@ -194,20 +196,26 @@ body {
 		                    </c:when>
 		                    <c:otherwise>
 		                    	<tr>
-									<td class="l-table-edit-text">合同编号： 
+									<td class="l-table-edit-text">合同编号: 
 									</td>
 									<td class="l-table-edit-td">
 										 ${contractPurchaseForm.contractNumber} 
 									</td> 
-									<td class="l-table-edit-text">合同名称：</td>
+									<td class="l-table-edit-text">合同名称:</td>
 									<td class="l-table-edit-td">
 										 ${contractPurchaseForm.contractName}  
 									</td> 
 								</tr>
 		                    </c:otherwise>
 		                </c:choose>  
+		                <tr>  
+							<td class="l-table-edit-text">供应商:</td>
+							<td class="l-table-edit-td" colspan="3">
+								${contractPurchaseForm.supplierName}  
+							</td> 
+						</tr> 
 						 <tr>
-				            <td class="l-table-edit-text">部门意见： 
+				            <td class="l-table-edit-text">部门意见:
 				            </td>
 				            <td class="l-table-edit-td" colspan="3"> 
 				               <div id="departmental_opinion_span" style="width: 100%; overflow: auto; padding: 5px 5px;;position: relative; font-size: 15px;">
@@ -219,7 +227,7 @@ body {
 				            </td>
 				          </tr>
 				          <tr>
-				            <td class="l-table-edit-text">副总经理： 
+				            <td class="l-table-edit-text">副总经理:
 				            </td>
 				            <td class="l-table-edit-td" colspan="3">
 				               	<div id="deputy_general_manager_opinion_span" style="width: 100%; overflow: auto; padding: 5px 5px;;position: relative; font-size: 15px;">
@@ -231,7 +239,7 @@ body {
 				            </td>
 				         </tr>
 				         <tr>
-				            <td class="l-table-edit-text">总经理： 
+				            <td class="l-table-edit-text">总经理:
 				            </td>
 				            <td class="l-table-edit-td" colspan="3"> 
 				                <div id="general_manager_opinion_span" style="width: 100%; overflow: auto; padding: 5px 5px;;position: relative; font-size: 15px;">
@@ -259,7 +267,7 @@ body {
 				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">物料编码</th>
 				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">物料名称</th>
 				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">型号/规格</th>
-				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;"> 供应商</th>  
+				                <!-- <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;"> 供应商</th>   -->
 				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">数量</th> 
 				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">单价</th>
 				                <th class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">税率</th> 
@@ -277,9 +285,9 @@ body {
 				                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
 				                        <input type="text" name="" class="input-width materialModel TextDisplay" value="${items.materialModel}" readonly>
 				                    </td>
-				                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
+				                    <%-- <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
 				                        <input type="text" name="" class="input-width supplier TextDisplay" value="${items.supplier}" readonly>
-				                    </td>
+				                    </td> --%>
 				                    <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;">
 				                        <input type="text" name="" class="input-width qty TextDisplay" onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')" value="${items.qty}">
 				                    </td>
@@ -295,7 +303,7 @@ body {
 				            
 				            <tr id="firstPoint"></tr>
 				            <tr>
-				                <td class="l-table-edit-new" colspan="4" style="padding-right: 0px;padding-left: 0px;"></td>
+				                <td class="l-table-edit-new" colspan="3" style="padding-right: 0px;padding-left: 0px;"></td>
 				                <td class="l-table-edit-new" colspan="1" style="padding-right: 0px;padding-left: 0px;"> 合计(元)：</td>
 				                <td class="l-table-edit-new" colspan="1"
 				                    style="padding-right: 0px;padding-left: 0px;text-align: center;">