#328-4 结构化非结构化适配

OBE-MANAGEMENT/src/com/gx/obe/management/composite/PriceFactorsManagerComposite.java

@@ -445,7 +445,7 @@ public class PriceFactorsManagerComposite extends Composite {
 		gd_bid_price_label.widthHint = 200;
 		gd_bid_price_label.minimumWidth = 200;
 		bid_price_text.setLayoutData(gd_bid_price_label);
-		bid_price_text.setText(Messages.BidPrice);
+		//bid_price_text.setText(Messages.BidPrice);
 		
 		config_bid_price = new ELink(composite_3, SWT.NONE);
 		config_bid_price.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 2));
@@ -1044,7 +1044,6 @@ public class PriceFactorsManagerComposite extends Composite {
 				WidgetUtils.setControlVisible(weightComposite, true);
 			}
 		}
-		bid_price_text.setText("");
 		del_bid_price.setVisible(false);
 		if(null != curFactor.getBidPriceCode()){
 			if(null != bidPriceMap.get(curFactor.getBidPriceCode())){
@@ -1058,15 +1057,6 @@ public class PriceFactorsManagerComposite extends Composite {
 					}
 					bidPriceResultService.updateBidPriceAndFinalPrice(supplierMap);
 				}
-				//结构化投标报价保险写入
-				if(StringUtils.isEmpty(bid_price_text.getText())) {
-					List<BidPrice> bidPriceList = bidPriceService.getBidPriceFactorList(tenderProject.getId());
-					if(bidPriceList != null && bidPriceList.size() == 1) {
-						bid_price_text.setText(bidPriceList.get(0).getBidPriceName());
-						curFactor.setBidPriceCode(bidPriceList.get(0).getBidPriceCode());
-						evaluationFactorService.updateAssignProperty(curFactor, new String[]{"id","bidPriceCode"});
-					}
-				}
 				//del_bid_price.setVisible(true);
 			}else {
 				curFactor.setBidPriceCode(null);
@@ -1075,6 +1065,15 @@ public class PriceFactorsManagerComposite extends Composite {
 				}
 			}
 		}
+		//非结构化投标报价保险写入
+		if(StringUtils.isEmpty(bid_price_text.getText())) {
+			List<BidPrice> bidPriceList = bidPriceService.getBidPriceFactorList(tenderProject.getId());
+			if(bidPriceList != null && bidPriceList.size() == 1) {
+				bid_price_text.setText(bidPriceList.get(0).getBidPriceName());
+				curFactor.setBidPriceCode(bidPriceList.get(0).getBidPriceCode());
+				evaluationFactorService.updateAssignProperty(curFactor, new String[]{"id","bidPriceCode"});
+			}
+		}
 		showFormulaInfo();
 		bid_price_text.getParent().layout();
 		scroContentComposite.layout();