Browse Source

前端修改

Hu Jie 7 years ago
parent
commit
d19695431b

+ 3 - 0
src/main/webapp/resources/tpl/index/purc/changeList.html

@@ -372,6 +372,9 @@
 				<div ng-if="change.agreed == 0" class="block">
 					<span class="text-trans warning">不同意</span>
 				</div>
+				<div ng-show="change.agreed == null && change.unNeedReply == 0" class="block">
+					<span class="text-trans success">待供应商确认</span>
+				</div>
 			</td>
 		</tr>
 	</tbody>

+ 4 - 0
src/main/webapp/resources/tpl/index/purc/change_detail.html

@@ -191,6 +191,10 @@
 							<div ng-if="change.unNeedReply == 1" class="block">
 								<span class="text-trans success">无需确认</span>
 							</div>
+							<div ng-show="change.agreed == null && change.unNeedReply == 0" class="block">
+								<span class="text-trans success">待供应商确认</span>
+							</div>
+
 						</td>
 					</tr>
 				</tbody>

+ 2 - 2
src/main/webapp/resources/tpl/index/purc/change_new.html

@@ -316,10 +316,10 @@
                             <td ng-bind="item.oldProduct.brand || '-'" title="{{item.oldProduct.brand}}"></td>
                             <td ng-bind="item.oldQty || '-'" title="{{item.oldQty}}"></td>
                             <td><input type="text" class="text-center" ng-model="item.newQty" placeholder="新数量"
-                                       ng-pattern="/^(([0-9]+\.[0-9]{1,3})|([0-9]*[1-9][0-9]*\.[0-9]{1,3})|([0-9]*[1-9][0-9]*))$/" ></td>
+                                       ng-pattern="/^(([0-9]+\.[0-9]{1,3})|([0-9]*[0-9][0-9]*\.[0-9]{1,3})|([0-9]*[0-9][0-9]*))$/" ></td>
                             <td ng-bind="item.oldPrice || '-'" title="{{item.oldPrice}}"></td>
                             <td><input type="text" class="text-center" ng-model="item.newPrice" placeholder="新单价"
-                                       ng-pattern="/^(([0-9]+\.[0-9]{1,6})|([0-9]*[1-9][0-9]*\.[0-9]{1,6})|([0-9]*[1-9][0-9]*))$/" ></td>
+                                       ng-pattern="/^(([0-9]+\.[0-9]{1,6})|([0-9]*[0-9][0-9]*\.[0-9]{1,6})|([0-9]*[0-9][0-9]*))$/" ></td>
                             <td ng-bind="item.oldTaxrate || '-'" title="{{item.oldTaxrate}}"></td>
                             <td><input type="text" class="text-center" ng-model="item.newTaxrate" placeholder="新税率"
                                        ng-pattern="/^[0-9][0-9]{0,1}$/"></td>