采购变更单显示调整

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

@@ -66,6 +66,7 @@ public class PurcOrderChangeController {
         PageInfo pageInfo = new PageInfo(pageParams);
         SearchFilter filter =  JSONObject.parseObject(searchFilter, SearchFilter.class);
         pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+
 //        pageInfo.filter("source", "B2B");
         return orderChangeService.findEnableToChange(pageInfo, filter);
     }

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

@@ -78,6 +78,7 @@ public class PurcOrderChangeServiceImpl implements PurcOrderChangeService {
                 pageInfo.expression(logical);
             }
         }
+        pageInfo.expression(PredicateUtils.isNull("erpId"));
         Page<PurchaseOrderAll> pageOrders = purchaseOrderAllDao.findAll(new Specification<PurchaseOrderAll>() {
             @Override
             public Predicate toPredicate(Root<PurchaseOrderAll> root, CriteriaQuery<?> query, CriteriaBuilder builder) {

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

@@ -24086,7 +24086,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     window.location.hash = "/purc/change/" + data.id;
                     toaster.pop('success', '采购变更单保存成功');
                 }, function(res) {
-
+                    toaster.pop('error','请输入正确的信息')
                 });
             }
         }

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

@@ -169,6 +169,9 @@
 							<div ng-if="change.agreed == 0" class="block">
 								<span class="text-trans warning">不同意</span>
 							</div>
+							<div ng-if="change.unNeedReply == 1" class="block">
+								<span class="text-trans success">无需确认</span>
+							</div>
 						</td>
 					</tr>
 				</tbody>

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

@@ -258,16 +258,16 @@
                                 <!--<span><input type="text" class="input01" ng-model="change.newCurrency"></span>-->
                             </div>
                         </li>
-                        <li>
-                            <div class="fr">
-                                <em>原付款汇率：</em>
-                                <span ng-bind="change.oldRate || '无'"></span>
-                            </div>
-                            <div class="fr">
-                                <em>新付款汇率：</em>
-                                <span><input type="text" class="input01" ng-model="change.newRate"></span>
-                            </div>
-                        </li>
+                        <!--<li>-->
+                            <!--<div class="fr">-->
+                                <!--<em>原付款汇率：</em>-->
+                                <!--<span ng-bind="change.oldRate || '无'"></span>-->
+                            <!--</div>-->
+                            <!--<div class="fr">-->
+                                <!--<em>新付款汇率：</em>-->
+                                <!--<span><input type="text" class="input01" ng-model="change.newRate"></span>-->
+                            <!--</div>-->
+                        <!--</li>-->
                         <li>
                             <div class="fr">
                                 <em>备注：</em>

src/main/webapp/resources/tpl/index/sale/change.html

@@ -289,9 +289,10 @@
 				 	<span ng-class="{'text-inverse': change.newPayments != change.oldPayments}" ng-bind="::change.newPayments"></span>&nbsp;
 				 	<s class="text-muted" ng-if="change.newPayments != change.oldPayments" ng-bind="::change.oldPayments"></s>&nbsp;&nbsp;&nbsp;&nbsp;
 				 </span>
-				<span><span class="text-bold" ng-if="change.newApVendorName">应付供应商：</span>
-				 	<span ng-class="{'text-inverse': change.apVendorName != change.newApVendorName}" ng-bind="::change.newApVendorName"></span>&nbsp;
-				 	<s class="text-muted" ng-if="change.apVendorName != change.newApVendorName" ng-bind="::change.apVendorName"></s>
+				<span><span class="text-bold" ng-if="change.newApVendorName || change.newApVendorName == null">应付供应商：</span>
+				 	<span ng-class="{'text-inverse': change.apVendorName != change.newApVendorName && change.newApVendorName != null}" ng-bind="::change.newApVendorName"></span>&nbsp;
+				 	<s class="text-muted" ng-if="(change.apVendorName != change.newApVendorName)  && (change.newApVendorName != null)" ng-bind="::change.apVendorName"></s>
+					<span ng-if="change.apVendorName != change.newApVendorName  && change.newApVendorName == null" ng-bind="::change.apVendorName"></span>
 				</span>
 			</td>
 		</tr>
@@ -324,21 +325,31 @@
 		</tr>
 		<tr class="order-bd" ng-repeat="item in ::change.orderChangeItems">
 			<td class="product">
-				<div>
+				<div ng-show = "item.newProduct.code != null">
 					<span class="text-num text-bold" ng-class="{'text-inverse': item.oldProduct.code != item.newProduct.code}" ng-bind="::item.newProduct.code"></span><span class="text-muted">（型号）</span>
 					<span class="text-light">&nbsp;&nbsp;&nbsp;订单第 <span class="text-num">{{::item.orderItemNumber}}</span> 行</span>
 				</div>
-				<div ng-show="item.oldProduct.code != item.newProduct.code">
+				<div ng-show = "item.newProduct.code == null">
+					<span class="text-num text-bold"  ng-bind="::item.oldProduct.code"></span><span class="text-muted">（型号）</span>
+					<span class="text-light">&nbsp;&nbsp;&nbsp;订单第 <span class="text-num">{{::item.orderItemNumber}}</span> 行</span>
+				</div>
+				<div ng-show="(item.oldProduct.code != item.newProduct.code) && (item.newProduct.code != null) ">
 					<s class="text-num text-bold"  ng-bind="::item.oldProduct.code"></s>
 				</div>
-				<div>
+				<div ng-show="item.newProduct.title != null">
 					<span ng-class="{'text-inverse': item.oldProduct.title != item.newProduct.title}" ng-bind="::item.newProduct.title"></span><span class="text-muted">（名称）</span>
 				</div>
-				<div><s ng-show="item.oldProduct.title != item.newProduct.title" ng-bind="::item.oldProduct.title"></s></div>
-				<div>
+				<div ng-show="item.newProduct.title == null">
+					<span  ng-bind="::item.oldProduct.title"></span><span class="text-muted">（名称）</span>
+				</div>
+				<div><s ng-show="((item.oldProduct.title != item.newProduct.title) && (item.newProduct.title != null))" ng-bind="::item.oldProduct.title"></s></div>
+				<div ng-show="item.newProduct.spec != null">
 					<span ng-class="{'text-inverse': item.oldProduct.spec != item.newProduct.spec}" ng-bind="::item.newProduct.spec"></span><span class="text-muted">（规格）</span>
 				</div>
-				<div><s class="text-muted" ng-show="item.oldProduct.spec != item.newProduct.spec" ng-bind="::item.oldProduct.spec"></s></div>
+				<div ng-show="item.newProduct.spec == null">
+					<span  ng-bind="::item.oldProduct.spec"></span><span class="text-muted">（规格）</span>
+				</div>
+				<div><s class="text-muted" ng-show="((item.oldProduct.spec != item.newProduct.spec) && (item.newProduct.spec != null))" ng-bind="::item.oldProduct.spec"></s></div>
 			</td>
 			<td class="text-center">
 				<div class="text-num" ng-if="!isUser"