新增采购变更单页面样式调整

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

@@ -24054,10 +24054,10 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             });
         }
 
-        $scope.openDatePicker = function ($event, openParam) {
+        $scope.openDatePicker = function ($event, openParam, index) {
             $event.preventDefault();
             $event.stopPropagation();
-            $scope.$dateOpen = !openParam;
+            $scope.change.orderChangeItems[index].$dateOpen = !openParam;
         };
 
         $scope.save = function() {

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

@@ -186,8 +186,11 @@
 .purchase_xq .table tbody tr td input.form-control:focus{
     border: none!important;
 }
-.purchase_xq .table tbody tr td .input-group ul.dropdown-menu{
-    left: -60px !important;
+.purchase_xq .table tbody tr td ul.dropdown-menu{
+    min-width: auto !important;
+    display: block;
+    top: 712px;
+    left: 1100.5px!important;
 }
 </style>
 <div class="warp">
@@ -302,15 +305,14 @@
                             <td ng-bind="item.oldTaxrate || '-'" title="{{item.oldTaxrate}}"></td>
                             <td><input type="text" class="text-center" ng-model="item.newTaxrate" placeholder="新税率"></td>
                             <td ng-bind="item.oldDelivery | date: 'yyyy-MM-dd'" title="{{item.oldDelivery | date: 'yyyy-MM-dd'}}"></td>
-                            <td style="overflow: visible;">
-                                <div class="input-group">
-                                    <input ng-model="item.newDelivery" type="text" class="form-control"
-                                           placeholder="点击选择时间" datepicker-popup="yyyy-MM-dd" is-open="$dateOpen"
-                                           min-date="getMinDate()" ng-required="true"
-                                           current-text="今天" clear-text="清除" close-text="关闭"
-                                           datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-                                           ng-focus="openDatePicker($event, $dateOpen)" readonly>
-                                </div>
+                            <td style="overflow: visible;" id="delivery">
+                                <input ng-model="item.newDelivery" type="text" class="editable"
+                                       placeholder="点击选择时间" datepicker-popup="yyyy-MM-dd" is-open="item.$dateOpen"
+                                       min-date="getMinDate()" ng-required="true"
+                                       current-text="今天" clear-text="清除" close-text="关闭"
+                                       datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+                                       ng-focus="openDatePicker($event, $dateOpen)" readonly
+                                       ng-click="openDatePicker($event, item.$dateOpen, $index)">
                             </td>
                             <td>
                                 <a ng-click="add($index)" style="color: #1f4fb2">添加</a><a ng-click="del($index)" style="color: #d32526"> 删除</a>
@@ -318,50 +320,8 @@
                         </tr>
                         </tbody>
                     </table>
-                    <!--<dl>-->
-                        <!--<dt>-->
-                            <!--<span class="wid01">序号</span>-->
-                            <!--<span class="wid02">产品名称</span>-->
-                            <!--<span>型号</span>-->
-                            <!--<span>品牌</span>-->
-                            <!--<span>品牌</span>-->
-                            <!--<span>原数量</span>-->
-                            <!--<span>新数量</span>-->
-                            <!--<span>原单价</span>-->
-                            <!--<span>新单价</span>-->
-                            <!--<span>原税率</span>-->
-                            <!--<span>新税率</span>-->
-                            <!--<span>原交货日期</span>-->
-                            <!--<span>新交货日期</span>-->
-                        <!--</dt>-->
-                        <!--<dd ng-repeat="item in change.orderChangeItems">-->
-                            <!--<span class="wid01">{{$index+1}}</span>-->
-                            <!--<span class="wid02" ng-bind="item.oldProduct.title"></span>-->
-                            <!--<span ng-bind="item.oldProduct.cmpCode"></span>-->
-                            <!--<span ng-bind="item.oldProduct.brand"></span>-->
-                            <!--<span ng-bind="item.oldQty"></span>-->
-                            <!--<span><input type="text" class="text-center" ng-model="item.newQty"></span>-->
-                            <!--<span ng-bind="item.oldPrice"></span>-->
-                            <!--<span><input type="text" class="text-center" ng-model="item.newPrice"></span>-->
-                            <!--<span ng-bind="item.oldTaxrate"></span>-->
-                            <!--<span><input type="text" class="text-center" ng-model="item.newTaxrate"></span>-->
-                            <!--<span ng-bind="item.oldDelivery | date: 'yyyy-MM-dd'"></span>-->
-                            <!--<span>-->
-                                <!--<div class="input-group">-->
-                                    <!--<input ng-model="item.newDelivery" type="text" class="form-control"-->
-                                           <!--placeholder="点击选择时间" datepicker-popup="yyyy-MM-dd" is-open="$dateOpen"-->
-                                           <!--min-date="getMinDate()" ng-required="true"-->
-                                           <!--current-text="今天" clear-text="清除" close-text="关闭"-->
-                                           <!--datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"-->
-                                           <!--ng-focus="openDatePicker($event, $dateOpen)" readonly>-->
-                                <!--</div>-->
-                            <!--</span>-->
-                            <!--<span><a ng-click="add($index)" style="color: #1f4fb2">添加</a><a ng-click="del($index)" style="color: #d32526"> 删除</a></span>-->
-                        <!--</dd>-->
-                    <!--</dl>-->
                 </div>
                 <div class="save">
-                	<!--<button ng-click="save('保存')">保存</button>-->
                 	<button ng-click="save()">提交</button>
                 </div>
             </div>

src/main/webapp/resources/tpl/index/purc/modal/enableOrderList.html

@@ -238,7 +238,7 @@
                 </td>
             </tr>
             <tr class="order-bd" ng-repeat="item in order.orderItems track by item.id" ng-if="!order.$collapsed ">
-                <td><input type="checkbox" ng-click="checkItem(item)" ng-checked="item.checked"
+                <td class="text-center"><input type="checkbox" ng-click="checkItem(item)" ng-checked="item.checked"
                            ng-disabled="checkedOrder == null || (checkedOrder != null && checkedOrder.id != order.id)">
                 </td>
                 <td class="product">