hangb 7 лет назад
Родитель
Сommit
1377f50ebc

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

@@ -134,6 +134,60 @@
 }
 .com_title01 span{
     margin-left: 37px;
+}
+    /*新增变更明细*/
+.purchase_xq {
+    width: 948px;
+    overflow: scroll;
+}
+.purchase_xq .table{
+    margin-bottom: 0;
+    table-layout: fixed;
+    border-collapse: collapse;
+    width: 100%;
+}
+.purchase_xq .table thead tr>th{
+    font-size: 14px;
+    height: 35px;
+    line-height: 35px;
+    color: #323232;
+    border-bottom: 1px solid #ddd;
+    font-weight: normal;
+    text-align: center;
+}
+.purchase_xq .table tbody tr td{
+    width: 100%;
+    text-align: center;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    vertical-align: middle;
+}
+.purchase_xq .table tbody tr td input{
+    border: none;
+    height: 35px;
+    width: 80px;
+    font-size: 14px;
+}
+.purchase_xq .table tbody tr td input:focus {
+    border: #3578ba 1px solid !important;
+    outline: 0;
+    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
+    box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
+}
+.purchase_xq .input-group .form-control {
+        width: 80px;
+        height: 30px;
+        line-height: 30px;
+        border: none;
+        border-radius: 5px;
+        background: #dcdcdc;
+    }
+.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;
 }
 </style>
 <div class="warp">
@@ -217,35 +271,38 @@
                 </div>
                 <div class="com_title01"><span>变更明细</span></div>
                 <div class="purchase_xq clearfix" scroll-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>
+                    <table class="table">
+                        <thead>
+                        <tr>
+                            <th width="60">序号</th>
+                            <th width="160">产品名称</th>
+                            <th width="160">型号</th>
+                            <th width="160">品牌</th>
+                            <th width="100">原数量</th>
+                            <th width="100">新数量</th>
+                            <th width="100">原单价</th>
+                            <th width="100">新单价</th>
+                            <th width="100">原税率</th>
+                            <th width="100">新税率</th>
+                            <th width="100">原交货日期</th>
+                            <th width="100">新交货日期</th>
+                            <th width="130">操作</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr ng-repeat="item in change.orderChangeItems">
+                            <td>{{$index+1}}</td>
+                            <td ng-bind="item.oldProduct.title || '-'" title="{{item.oldProduct.title}}"></td>
+                            <td ng-bind="item.oldProduct.cmpCode || '-'" title="{{item.oldProduct.cmpCode}}"></td>
+                            <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="新数量"></td>
+                            <td ng-bind="item.oldPrice || '-'" title="{{item.oldPrice}}"></td>
+                            <td><input type="text" class="text-center" ng-model="item.newPrice" placeholder="新单价"></td>
+                            <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"
@@ -254,10 +311,54 @@
                                            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>
+                            </td>
+                            <td>
+                                <a ng-click="add($index)" style="color: #1f4fb2">添加</a><a ng-click="del($index)" style="color: #d32526"> 删除</a>
+                            </td>
+                        </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>-->

+ 1 - 0
src/main/webapp/resources/tpl/index/purc/modal/enableOrderList.html

@@ -273,6 +273,7 @@
                 <td class="text-center br-l">
                     <div class="text-num" ng-bind="::item.delivery | date:'yyyy-MM-dd'"></div>
                 </td>
+                <td></td>
             </tr>
             </tbody>
         </table>