shenjunjie 7 лет назад
Родитель
Сommit
d64578ec5b

+ 1 - 1
src/main/webapp/resources/js/vendor/controllers/b2b/apCheck.js

@@ -258,7 +258,7 @@ define(['app/app'], function (app) {
       // 默认本月
       $scope.sdateTo = new Date();
       $scope.sdateFrom = new Date($scope.sdateTo.getFullYear(), $scope.sdateTo.getMonth(), 1);
-      $scope.thisMouth = $scope.sdateTo.getFullYear() +'-'+ ($scope.sdateTo.getMonth() + 1)
+      $scope.thisMouth = $scope.sdateTo.getFullYear() +'-'+ ($scope.sdateTo.getMonth())
       $scope.condition.uuorname = '';
       // $scope.condition.dateFrom = '';
       // $scope.condition.dateTo = '';

+ 20 - 19
src/main/webapp/resources/view/vendor/b2b/apCheck.html

@@ -745,11 +745,21 @@
       </div>
       <div class="form-group form-group-sm form-group-inline"
            ng-show="condition.$open">
-        <label class="col-sm-2 control-label">应付供应商:</label>
+        <!--<label class="col-sm-2 control-label">应付供应商:</label>-->
+        <!--<div class="col-sm-4">-->
+          <!--<div class="form-group form-group-sm has-feedback">-->
+            <!--<input type="search" class="form-control input-sm"-->
+                   <!--ng-model="receiveName" placeholder="可用应付供应商名称筛选" /><span-->
+                  <!--class="form-control-feedback text-simple"><i-->
+                  <!--class="fa fa-search"></i></span>-->
+          <!--</div>-->
+        <!--</div>-->
+        <!--ng-show="condition.$open">-->
+        <label class="col-sm-2 control-label">税率:</label>
         <div class="col-sm-4">
           <div class="form-group form-group-sm has-feedback">
             <input type="search" class="form-control input-sm"
-                   ng-model="receiveName" placeholder="可用应付供应商名称筛选" /><span
+                   ng-model="taxRate" placeholder="请输入税率" /><span
                   class="form-control-feedback text-simple"><i
                   class="fa fa-search"></i></span>
           </div>
@@ -785,18 +795,9 @@
           </div>
         </div>
       </div>
-      <div class="form-group form-group-sm form-group-inline"
-           ng-show="condition.$open">
-        <label class="col-sm-2 control-label">税率:</label>
-        <div class="col-sm-4">
-          <div class="form-group form-group-sm has-feedback">
-            <input type="search" class="form-control input-sm"
-                   ng-model="taxRate" placeholder="请输入税率" /><span
-                  class="form-control-feedback text-simple"><i
-                  class="fa fa-search"></i></span>
-          </div>
-        </div>
-      </div>
+      <!--<div class="form-group form-group-sm form-group-inline"-->
+        <!---->
+      <!--</div>-->
     </form>
     <!-- 标签scroll-table用于表头滚动 -->
     <div class="table-wrap" id="order-detail-list" scroll-table>
@@ -812,7 +813,7 @@
             <th width="35">序号</th>
             <th width="60">类型</th>
             <th width="60">单据<br>日期</th>
-            <th width="90">应付<br>供应商</th>
+            <!--<th width="90">应付<br>供应商</th>-->
             <th width="70">客户<br>采购单</th>
             <th width="65">客户<br>料号</th>
             <th width="70">客户物<br>料名称</th>
@@ -846,10 +847,10 @@
             <td width="35" align="center">{{::check.detno}}</td>
             <td width="60">{{::check.piclass}}</td>
             <td width="60">{{::check.pidate | date:'yyyy-MM-dd' }}</td>
-            <td width="90" title="{{check.receivename}}">
-              <div
-                      style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.receivename}}</div>
-            </td>
+            <!--<td width="90" title="{{check.receivename}}">-->
+              <!--<div-->
+                      <!--style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.receivename}}</div>-->
+            <!--</td>-->
             <td width="70">{{::check.ordercode}}</td>
             <td width="65">{{::check.prodcode}}</td>
             <td width="70" title="{{check.prodtitle}}">