采购变更单

src/main/java/com/uas/platform/b2b/controller/PurcOrderChangeController.java

@@ -8,8 +8,11 @@ import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PurcOrderChangeService;
 import com.uas.platform.b2b.service.PurchaseOrderChangeService;
 import com.uas.platform.b2b.service.UserService;
+import com.uas.platform.b2b.support.JxlsExcelView;
 import com.uas.platform.b2b.support.SPageUtils;
 import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.b2b.support.UsageBufferedLogger;
+import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
@@ -22,7 +25,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -47,6 +52,8 @@ public class PurcOrderChangeController {
     @Autowired
     private PurchaseOrderChangeService purchaseOrderChangeService;
 
+    private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+
     /**
      * 查询可以做采购变更单的采购单
      *
@@ -75,20 +82,100 @@ public class PurcOrderChangeController {
     }
 
     /**
-     * 以客户的角度，查询所有的采购变更单
+     * 以客户的角度，查询所有采购变更单
      *
      * @param params 分页信息
      * @param searchFilter 过滤条件
      * @return
      */
-    @RequestMapping(value = "/info", params = RequestState.TODO, method = RequestMethod.GET)
+    @RequestMapping(value = "/info",method = RequestMethod.GET)
     public SPage<PurchaseOrderChange> getAllPurcOrderChange(PageParams params, String searchFilter) {
         SearchFilter filter =  JSONObject.parseObject(searchFilter, SearchFilter.class);
         com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
-        // 当前登录企业作为供应商
+        // 当前登录企业作为买方
+        if (!StringUtils.isEmpty(filter.getKeyword())) {
+            pageParams.getFilters().put("pc_enuu", SystemSession.getUser().getEnterprise().getUu());
+            List<Sort> sortList = new ArrayList<>();
+            sortList.add(new Sort("pc_id", false, Sort.Type.LONG, new Long(1)));
+            pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+            return searchService.searchPurchaseOrderChangeIds(filter.getKeyword(), pageParams);
+        } else {
+            PageInfo pageInfo = new PageInfo(params);
+            pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+            return SPageUtils.covertSPage(orderChangeService.findByPageInfo(pageInfo, filter));
+        }
+    }
+
+    /**
+     * 以客户的角度，查询采购变更单(待确认)
+     *
+     * @param params 分页信息
+     * @param searchFilter 过滤条件
+     * @return
+     */
+    @RequestMapping(value = "/info", params = RequestState.TODO, method = RequestMethod.GET)
+    public SPage<PurchaseOrderChange> getPurcOrderChangeTodo(PageParams params, String searchFilter) {
+        SearchFilter filter =  JSONObject.parseObject(searchFilter, SearchFilter.class);
+        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
+        // 当前登录企业作为买方
         if (!StringUtils.isEmpty(filter.getKeyword())) {
             pageParams.getFilters().put("pc_enuu", SystemSession.getUser().getEnterprise().getUu());
             pageParams.getFilters().put("pc_status", Status.NOT_REPLY.value());
+            pageParams.getFilters().put("pc_unneedreply", Constant.NO);
+            List<Sort> sortList = new ArrayList<>();
+            sortList.add(new Sort("pc_id", false, Sort.Type.LONG, new Long(1)));
+            pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+            return searchService.searchPurchaseOrderChangeIds(filter.getKeyword(), pageParams);
+        } else {
+            PageInfo pageInfo = new PageInfo(params);
+            pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+            pageInfo.filter("status",Status.NOT_REPLY.value());
+            pageInfo.filter("unNeedReply",Constant.NO);
+            return SPageUtils.covertSPage(orderChangeService.findByPageInfo(pageInfo, filter));
+        }
+    }
+
+    /**
+     * 以客户的角度，查询采购变更单(已处理)
+     *
+     * @param params 分页信息
+     * @param searchFilter 过滤条件
+     * @return
+     */
+    @RequestMapping(value = "/info", params = RequestState.DONE, method = RequestMethod.GET)
+    public SPage<PurchaseOrderChange> getPurcOrderChangeDone(PageParams params, String searchFilter) {
+        SearchFilter filter =  JSONObject.parseObject(searchFilter, SearchFilter.class);
+        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
+        // 当前登录企业作为买方
+        if (!StringUtils.isEmpty(filter.getKeyword())) {
+            pageParams.getFilters().put("pc_enuu", SystemSession.getUser().getEnterprise().getUu());
+            pageParams.getFilters().put("pc_status", Status.REPLIED.value());
+            List<Sort> sortList = new ArrayList<>();
+            sortList.add(new Sort("pc_id", false, Sort.Type.LONG, new Long(1)));
+            pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+            return searchService.searchPurchaseOrderChangeIds(filter.getKeyword(), pageParams);
+        } else {
+            PageInfo pageInfo = new PageInfo(params);
+            pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+            pageInfo.filter("status",Status.REPLIED.value());
+            return SPageUtils.covertSPage(orderChangeService.findByPageInfo(pageInfo, filter));
+        }
+    }
+
+    /**
+     * 以客户的角度，查询采购变更单(无需确认)
+     *
+     * @param params 分页信息
+     * @param searchFilter 过滤条件
+     * @return
+     */
+    @RequestMapping(value = "/info", params = RequestState.UNREAD, method = RequestMethod.GET)
+    public SPage<PurchaseOrderChange> getPurcOrderChangeUnread(PageParams params, String searchFilter) {
+        SearchFilter filter =  JSONObject.parseObject(searchFilter, SearchFilter.class);
+        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
+        // 当前登录企业作为买方
+        if (!StringUtils.isEmpty(filter.getKeyword())) {
+            pageParams.getFilters().put("pc_enuu", SystemSession.getUser().getEnterprise().getUu());
             pageParams.getFilters().put("pc_unneedreply", Constant.YES);
             List<Sort> sortList = new ArrayList<>();
             sortList.add(new Sort("pc_id", false, Sort.Type.LONG, new Long(1)));
@@ -97,10 +184,122 @@ public class PurcOrderChangeController {
         } else {
             PageInfo pageInfo = new PageInfo(params);
             pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+            pageInfo.filter("unNeedReply",Constant.YES);
             return SPageUtils.covertSPage(orderChangeService.findByPageInfo(pageInfo, filter));
         }
     }
 
+    /**
+     * 导出  -全部
+     * @param params
+     * @param searchFilter
+     * @return
+     */
+    @RequestMapping(value = "/xls", method = RequestMethod.GET)
+    public ModelAndView exportChanges(PageParams params, String searchFilter) {
+        PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
+        pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+        SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+        params.setPage(1);
+        params.setCount(SearchConstants.TOP_NUM);
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
+        ModelAndView modelAndView = new ModelAndView();
+        modelAndView.addObject("dateFormat", dateFormat);
+        modelAndView.addObject("state", "全部");
+        modelAndView.addObject("data", filter.getKeyword() == null ? orderChangeService.findByPageInfo(pageInfo, filter).getContent()
+                : getAllPurcOrderChange(params, searchFilter).getContent());
+        modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/purcChange", "客户采购变更单列表_全部"));
+        logger.log("客户采购变更单", "导出Excel列表", "导出全部Excel列表");
+        return modelAndView;
+    }
+
+    /**
+     * 导出  -已处理
+     * @param params
+     * @param searchFilter
+     * @return
+     */
+    @RequestMapping(value = "/xls",params = RequestState.DONE, method = RequestMethod.GET)
+    public ModelAndView exportChangesDone(PageParams params, String searchFilter) {
+        PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
+        pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+        pageInfo.filter("status",Status.REPLIED.value());
+        SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+        params.setPage(1);
+        params.setCount(SearchConstants.TOP_NUM);
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
+        ModelAndView modelAndView = new ModelAndView();
+        modelAndView.addObject("dateFormat", dateFormat);
+        modelAndView.addObject("state", "已处理");
+        modelAndView.addObject("data", filter.getKeyword() == null ? orderChangeService.findByPageInfo(pageInfo, filter).getContent()
+                : getPurcOrderChangeDone(params, searchFilter).getContent());
+        modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/purcChange", "客户采购变更单列表_已处理"));
+        logger.log("客户采购变更单", "导出Excel列表", "导出已处理Excel列表");
+        return modelAndView;
+    }
+
+    /**
+     * 导出  -待确认
+     * @param params
+     * @param searchFilter
+     * @return
+     */
+    @RequestMapping(value = "/xls",params = RequestState.TODO, method = RequestMethod.GET)
+    public ModelAndView exportChangesTodo(PageParams params, String searchFilter) {
+        PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
+        pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+        pageInfo.filter("status",Status.NOT_REPLY.value());
+        pageInfo.filter("unNeedReply",Constant.NO);
+        SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+        params.setPage(1);
+        params.setCount(SearchConstants.TOP_NUM);
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
+        ModelAndView modelAndView = new ModelAndView();
+        modelAndView.addObject("dateFormat", dateFormat);
+        modelAndView.addObject("state", "待确认");
+        modelAndView.addObject("data", filter.getKeyword() == null ? orderChangeService.findByPageInfo(pageInfo, filter).getContent()
+                : getPurcOrderChangeTodo(params, searchFilter).getContent());
+        modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/purcChange", "客户采购变更单列表_待确认"));
+        logger.log("客户采购变更单", "导出Excel列表", "导出待确认Excel列表");
+        return modelAndView;
+    }
+
+    /**
+     * 导出  -无需确认
+     * @param params
+     * @param searchFilter
+     * @return
+     */
+    @RequestMapping(value = "/xls",params = RequestState.UNREAD, method = RequestMethod.GET)
+    public ModelAndView exportChangesUnread(PageParams params, String searchFilter) {
+        PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
+        pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+        pageInfo.filter("unNeedReply",Constant.YES);
+        SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+        params.setPage(1);
+        params.setCount(SearchConstants.TOP_NUM);
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
+        ModelAndView modelAndView = new ModelAndView();
+        modelAndView.addObject("dateFormat", dateFormat);
+        modelAndView.addObject("state", "已处理");
+        modelAndView.addObject("data", filter.getKeyword() == null ? orderChangeService.findByPageInfo(pageInfo, filter).getContent()
+                : getPurcOrderChangeUnread(params, searchFilter).getContent());
+        modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/purcChange", "客户采购变更单列表_无需确认"));
+        logger.log("客户采购变更单", "导出Excel列表", "导出无需确认Excel列表");
+        return modelAndView;
+    }
+
+    /**
+     * 导出权限判断
+     *
+     * @return
+     */
+    @RequestMapping(value = "/xls/permission", method = RequestMethod.GET)
+    @ResponseBody
+    public ModelMap exportPermission() {
+        return new ModelMap("success", true);
+    }
+
     /**
      * 作为买家，根据变更单ID查找采购变更单(含明细)
      *

src/main/java/com/uas/platform/b2b/service/impl/PurcOrderChangeServiceImpl.java

@@ -1,11 +1,11 @@
 package com.uas.platform.b2b.service.impl;
 
 import com.uas.platform.b2b.dao.*;
-import com.uas.platform.b2b.model.PurchaseOrderAll;
-import com.uas.platform.b2b.model.PurchaseOrderChange;
-import com.uas.platform.b2b.model.SearchFilter;
+import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.service.PurcOrderChangeService;
 import com.uas.platform.b2b.support.SPageUtils;
+import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.persistence.criteria.CriterionExpression;
@@ -16,8 +16,10 @@ import com.uas.search.b2b.model.SPage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
+import org.springframework.security.access.method.P;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import javax.persistence.criteria.CriteriaBuilder;
@@ -25,6 +27,9 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
 
 /**
  * 采购变更单
@@ -101,7 +106,6 @@ public class PurcOrderChangeServiceImpl implements PurcOrderChangeService {
      */
     @Override
     public ModelMap save(PurchaseOrderChange change) {
-        change.setBackStatus((short) Status.NOT_UPLOAD.value());
         change.setBackStatus((short) Status.NOT_UPLOAD.value());
         change.setReplySendStatus((short) Status.NOT_UPLOAD.value());
        /* List<PurchaseOrderChangeItem> itemList = changeItemDao.save(change.getOrderChangeItems());
@@ -110,7 +114,63 @@ public class PurcOrderChangeServiceImpl implements PurcOrderChangeService {
             //TODO 采购单主表信息变更
             // TODO 采购单明细变更
         }*/
-        return null;
+       change.setEnUU(SystemSession.getUser().getEnterprise().getUu());
+       change.setUserUU(SystemSession.getUser().getUserUU());
+       change.setSendStatus((short) Status.NOT_UPLOAD.value());
+       change.setStatus((short)Status.NOT_REPLY.value());
+        if (!CollectionUtils.isEmpty(change.getOrderChangeItems())) {
+            StringBuffer stringBuffer = new StringBuffer();
+            Set<PurchaseOrderChangeItem> itemList = change.getOrderChangeItems();
+            Iterator<PurchaseOrderChangeItem> itemIterator = itemList.iterator();
+            while (itemIterator.hasNext()) {
+                PurchaseOrderChangeItem item = itemIterator.next();
+                item.setOrderChange(change);
+                if (!StringUtils.isEmpty(item.getNewQty()) || !StringUtils.isEmpty(item.getNewPrice())
+                        || !StringUtils.isEmpty(item.getNewTaxrate()) || !StringUtils.isEmpty(item.getNewDelivery())) {
+                    stringBuffer.append("行"+item.getOrderItemNumber()+":");
+                    if (!StringUtils.isEmpty(item.getNewPrice())) {
+                        stringBuffer.append("单价"+".");
+                    }
+                    if (!StringUtils.isEmpty(item.getNewQty())) {
+                        stringBuffer.append("数量"+".");
+                    }
+                    if (!StringUtils.isEmpty(item.getNewDelivery())) {
+                        stringBuffer.append("交换日期"+".");
+                    }
+                    if (!StringUtils.isEmpty(item.getNewTaxrate())) {
+                        stringBuffer.append("税率"+".");
+                    }
+                }
+            }
+            if (!StringUtils.isEmpty(stringBuffer)) {
+                change.setDescription(stringBuffer.toString());
+            }
+        }
+       List<PurchaseOrderChangeItem> items = changeItemDao.save(change.getOrderChangeItems());
+       if (change.getUnNeedReply().equals(Constant.YES)) {
+           PurchaseOrderInfo orderInfo = orderInfoDao.findOne(change.getOrderId());
+           orderInfo.setPayments(change.getNewPayments());
+           orderInfo.setCurrency(change.getNewCurrency());
+           orderInfo.setRate(change.getNewRate());
+           orderInfoDao.save(orderInfo);
+           Set<PurchaseOrderChangeItem> itemList = change.getOrderChangeItems();
+           //orderInfoItemDao.save(itemList);
+           Iterator<PurchaseOrderChangeItem> changeItemIterator = itemList.iterator();
+           while (changeItemIterator.hasNext()) {
+               PurchaseOrderChangeItem changeItem = changeItemIterator.next();
+               PurcOrderInfoItem orderInfoItem = orderInfoItemDao.findOne(changeItem.getOrderItemId());
+               orderInfoItem.setQty(changeItem.getNewQty());
+               orderInfoItem.setTaxrate(changeItem.getNewTaxrate());
+               orderInfoItem.setDelivery(changeItem.getNewDelivery());
+               orderInfoItem.setPrice(changeItem.getNewPrice());
+               orderInfoItemDao.save(orderInfoItem);
+           }
+           //无需更改的采购变更单无需再次传到ERP
+           //change.setStatus((short)Status.REPLIED.value());
+           change.setReplySendStatus((short)Status.DOWNLOADED.value());
+           changeDao.save(change);
+       }
+        return new ModelMap("id", items.get(0).getOrderChange().getId());
     }
 
     /**

src/main/java/com/uas/platform/b2b/service/impl/PurchaseOrderChangeServiceImpl.java

@@ -71,6 +71,12 @@ public class PurchaseOrderChangeServiceImpl implements PurchaseOrderChangeServic
 	@Autowired
 	private VendorDao vendorDao;
 
+	@Autowired
+	private PurchaseOrderInfoDao purchaseOrderInfoDao;
+
+	@Autowired
+	private PurcOrderInfoItemDao purcOrderInfoItemDao;
+
 	@Override
 	public void save(List<PurchaseOrderChangeItem> changeItems) {
 		changeItems = purchaseOrderChangeItemDao.save(changeItems);
@@ -388,6 +394,26 @@ public class PurchaseOrderChangeServiceImpl implements PurchaseOrderChangeServic
 						"供应商:" + vendor.getEnName(), "", "");
 			}
 		}
+		if (orderChange.getAgreed().equals(Constant.YES)) {
+			PurchaseOrderInfo orderInfo = purchaseOrderInfoDao.findOne(orderChange.getOrderId());
+			if (!StringUtils.isEmpty(orderInfo)) {
+				orderInfo.setPayments(orderChange.getNewPayments());
+				orderInfo.setCurrency(orderChange.getNewCurrency());
+				orderInfo.setRate(orderChange.getNewRate());
+				purchaseOrderInfoDao.save(orderInfo);
+				Set<PurchaseOrderChangeItem> itemList = orderChange.getOrderChangeItems();
+				Iterator<PurchaseOrderChangeItem> changeItemIterator = itemList.iterator();
+				while (changeItemIterator.hasNext()) {
+					PurchaseOrderChangeItem changeItem = changeItemIterator.next();
+					PurcOrderInfoItem orderInfoItem = purcOrderInfoItemDao.findOne(changeItem.getOrderItemId());
+					orderInfoItem.setPrice(changeItem.getNewPrice());
+					orderInfoItem.setQty(changeItem.getNewQty());
+					orderInfoItem.setTaxrate(changeItem.getNewTaxrate());
+					orderInfoItem.setDelivery(changeItem.getNewDelivery());
+					purcOrderInfoItemDao.save(orderInfoItem);
+				}
+			}
+		}
 		return orderChange;
 	}
 

src/main/webapp/WEB-INF/web.xml

@@ -8,7 +8,7 @@
 	<description>usoftchina platform b2b</description>
 	<context-param>
 		<param-name>webAppRootKey</param-name>
-		<param-value>spring.webapp.root_scm</param-value>
+		<param-value>spring1.webapp.root_scm</param-value>
 	</context-param>
 	<context-param>
 		<param-name>spring.profiles.active</param-name>

src/main/webapp/resources/js/index/app.js

@@ -23991,9 +23991,9 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         // 导出
         $scope.exportXls = function () {
-            PurcChange.exportXls({}, {}, function (data) {
+            change.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = 'sale/changes/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+                    window.location.href = 'purc/change/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -24043,6 +24043,9 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 $scope.change.oldCurrency = data.currency;
                 $scope.change.oldPayments = data.payments;
                 $scope.change.oldRate = data.rate;
+                $scope.change.vendUU = data.vendUU;
+                $scope.change.apVendorName = data.receiveName;
+                $scope.change.vendUserUU = data.vendUserUU;
                 angular.forEach($scope.orderItems, function (item) {
                     $scope.change.orderChangeItems.push({
                         oldProductId: item.productId,

src/main/webapp/resources/js/index/services/PurcChange.js

@@ -61,6 +61,13 @@ define([ 'ngResource'], function() {
                 url: 'purc/change/:id/info',
                 method: 'GET'
             },
+            /**
+             * 导出
+             */
+            exportXls: {
+                url: 'purc/change/xls/permission',
+                method: 'GET'
+            }
         })
     }])
 });

src/main/webapp/resources/tpl/index/purc/change_detail.html

@@ -93,38 +93,6 @@
 		</div>
 		<div class="title-div" style="border-bottom: 1px dashed #3f84f6; position: relative;">
 			<span class="f14">产品变更详情</span>
-			<div class="end" ng-show="change.status == 200">
-				<a class="btn btn-sm btn-default"
-					ng-click="change.$editing=!change.$editing" ng-if="change.unNeedReply != 1"><i
-					class="fa fa-share fa-fw"></i>我要回复</a>
-			</div>
-		</div>
-		<div class="row row-sm item" ng-if="change.$editing" style="line-height: 20px; padding-top: 20px;">
-			<div class="col-xs-3">
-				<div class="form-group pull-right" ng-init="change.$agreed = 1">
-					<label class="radio-inline"> <input type="radio"
-						ng-model="change.$agreed" value="1"> 同意
-					</label> <label class="radio-inline"> <input type="radio"
-						ng-model="change.$agreed" value="0"> 不同意
-					</label>
-				</div>
-			</div>
-			<div class="col-xs-7">
-				<div class="form-group">
-					<input type="text" ng-model="change.replyRemark"
-						class="form-control input-xs" placeholder="回复备注">
-				</div>
-			</div>
-			<div class="col-xs-2">
-				<div class="btn-group btn-group-xs btn-group-justified">
-					<div class="btn-group btn-group-xs">
-						<button type="button" class="btn btn-info btn-line" ng-click="onReplyClick(change)">确认回复</button>
-					</div>
-					<div class="btn-group btn-group-xs">
-						<button type="button" class="btn btn-default btn-line" ng-click="change.$editing=!change.$editing">取消</button>
-					</div>
-				</div>
-			</div>
 		</div>
 		<div class="block">
 			<table class="block table table-default table-striped table-hover" style="margin-bottom: 0;">

src/main/webapp/resources/tpl/index/purc/change_new.html

@@ -265,8 +265,8 @@
                             <div class="fr">
                                 <em>是否需要供应商确认：</em>
                                 <select name="" class="select" ng-model="change.unNeedReply" ng-required="true">
-                                    <option value="1">是</option>
-                                    <option value="0">否</option>
+                                    <option value="0">是</option>
+                                    <option value="1">否</option>
                                 </select>
                             </div>
                         </li>