Browse Source

新增采购微调

hejq 7 years ago
parent
commit
31c05d3e03
1 changed files with 26 additions and 16 deletions
  1. 26 16
      src/main/webapp/resources/tpl/index/purc/addOrder.html

+ 26 - 16
src/main/webapp/resources/tpl/index/purc/addOrder.html

@@ -176,23 +176,29 @@
 						<b>税率(%)</b> <b>交货日期</b> <b>备注</b> <b class="wid02">&nbsp;</b>
 						<b>税率(%)</b> <b>交货日期</b> <b>备注</b> <b class="wid02">&nbsp;</b>
 					</dt>
 					</dt>
 					<dd ng-repeat="item in order.orderItems">
 					<dd ng-repeat="item in order.orderItems">
-						<b>{{$index + 1}}</b> <b class="wid01">
-							<p>{{item.code}}</p>
-							<p>{{item.title}}</p>
-							<p>{{item.spec}}</p>
-						</b> <b>{{item.unit||'-'}}</b> <b><input class="editable" type="text"
+						<b>{{$index + 1}}</b>
+                        <b class="wid01">
+							<p>{{::item.code}}</p>
+							<p>{{::item.title}}</p>
+							<p>{{::item.spec}}</p>
+						</b> <b>{{::item.unit||'-'}}</b>
+						<b><input class="editable" type="text"
 							ng-model="item.qty" placeholder="数量" style="cursor: pointer;"
 							ng-model="item.qty" placeholder="数量" style="cursor: pointer;"
 							required="true"
 							required="true"
-							ng-pattern="/^(([0-9]+\.[0-9]{1,3})|([0-9]*[1-9][0-9]*\.[0-9]{1,3})|([0-9]*[1-9][0-9]*))$/" /></b>
+							ng-pattern="/^(([0-9]+\.[0-9]{1,3})|([0-9]*[1-9][0-9]*\.[0-9]{1,3})|([0-9]*[1-9][0-9]*))$/" />
+						</b>
 						<b><input class="editable" type="text" ng-model="item.price"
 						<b><input class="editable" type="text" ng-model="item.price"
 							placeholder="单价" style="cursor: pointer;" required="true"
 							placeholder="单价" style="cursor: pointer;" required="true"
-							ng-pattern="/^(([0-9]+\.[0-9]{1,6})|([0-9]*[1-9][0-9]*\.[0-9]{1,6})|([0-9]*[1-9][0-9]*))$/" /></b>
-						<b ng-if="order.currency == 'RMB'"><input class="editable"
-							type="text" ng-model="item.taxrate" placeholder="税率"
-							style="cursor: pointer;" ng-pattern="/^[0-9][0-9]{0,1}$/" /></b> <b
-							ng-if="order.currency != 'RMB'"><input class="editable"
-							type="text" style="cursor: pointer;" value="0"
-							readonly="readonly" /></b> <b> <input ng-model="item.delivery"
+							ng-pattern="/^(([0-9]+\.[0-9]{1,6})|([0-9]*[1-9][0-9]*\.[0-9]{1,6})|([0-9]*[1-9][0-9]*))$/" />
+						</b>
+						<b ng-if="order.currency == 'RMB'">
+							<input class="editable" type="text" ng-model="item.taxrate" placeholder="税率"
+                                   style="cursor: pointer;" ng-pattern="/^[0-9][0-9]{0,1}$/" />
+						</b>
+						<b ng-if="order.currency != 'RMB'">
+                            <input class="editable" type="text" style="cursor: pointer;" value="0" readonly="readonly" />
+                        </b>
+                        <b> <input ng-model="item.delivery"
 							type="text" class="editable" placeholder="选择时间"
 							type="text" class="editable" placeholder="选择时间"
 							datepicker-popup="yyyy-MM-dd" is-open="item.$endDateOpen"
 							datepicker-popup="yyyy-MM-dd" is-open="item.$endDateOpen"
 							min-date="getMinDate()" ng-required="true" current-text="今天"
 							min-date="getMinDate()" ng-required="true" current-text="今天"
@@ -201,9 +207,13 @@
 							ng-focus="openDatePicker($event, item.$endDateOpen)"
 							ng-focus="openDatePicker($event, item.$endDateOpen)"
 							readonly="readonly"
 							readonly="readonly"
 							ng-click="openDatePicker($event, item.$endDateOpen, $index)">
 							ng-click="openDatePicker($event, item.$endDateOpen, $index)">
-						</b> <b class="textMore"><input class="editable" type="text"
-							ng-model="item.remark" placeholder="备注" /></b> <b class="wid02"><a
-							ng-click="deleteProduct($index)"><i class="fa fa-close"></i></a></b>
+						</b>
+						<b class="textMore">
+                            <input class="editable" type="text" ng-model="item.remark" placeholder="备注" />
+                        </b>
+						<b class="wid02">
+							<a ng-click="deleteProduct($index)"><i class="fa fa-close"></i></a>
+						</b>
 					</dd>
 					</dd>
 				</dl>
 				</dl>
 				<div class="save" ng-if="order.orderItems[0].code != null">
 				<div class="save" ng-if="order.orderItems[0].code != null">