采购变更单显示调整

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

@@ -250,11 +250,12 @@
                             </div>
                             <div class="fr">
                                 <em>新付款币种：</em>
-                                <select name="" class="select" ng-model="change.newCurrency" ng-required="true">
+                                <input ng-model="change.newCurrency" list="newCurrency" class="select"  placeholder="选择付款币种" />
+                                <datalist id="newCurrency">
                                     <option value="RMB">RMB</option>
                                     <option value="USD">USD</option>
                                     <option value="HKD">HKD</option>
-                                </select>
+                                </datalist>
                                 <!--<span><input type="text" class="input01" ng-model="change.newCurrency"></span>-->
                             </div>
                         </li>

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

@@ -106,7 +106,8 @@
 				<span class="title" ng-if="change.newApVendorName">应付供应商</span>
 				<div class="content">
 				 	<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>
+				 	<s class="text-muted" ng-if="(change.apVendorName != change.newApVendorName) && (change.newApVendorName != null)" ng-bind="::change.apVendorName"></s>
+
 				</div>
 			</div>
 		</div>
@@ -162,21 +163,31 @@
 				<tbody>
 					<tr ng-repeat="item in change.orderChangeItems track by item.id">
 						<td width="380">
-							<div>
+							<div ng-show="(item.oldProduct.code != item.newProduct.code) && (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.oldProduct.title != item.newProduct.title) && (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.oldProduct.spec != item.newProduct.spec) && (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.title != item.newProduct.title) && (item.newProduct.title != null)" ng-bind="::item.oldProduct.spec"></s></div>
 						</td>
 						<td class="text-center" width="100">
 							<div class="text-num" ng-if="!isUser"