shenjj 7 anni fa
parent
commit
e24f6a1308

BIN
src/main/resources/jxls-tpl/trade/releaseByBatchError-rmb.xls


BIN
src/main/resources/jxls-tpl/trade/releaseByBatchError-usd.xls


+ 4 - 2
src/main/webapp/resources/js/usercenter/controllers/forstore/bom_detail_ctrl.js

@@ -747,6 +747,7 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
                   },300)
                 };
 
+
                 $scope.caleUrl = function(seek){
                   return window.location.protocol + '//' +  window.location.host + '/mobile/share/purChase/' + seek.id
                 };
@@ -755,11 +756,11 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
                 $scope.caleTop = function(index){
                   if( index == 0) {
                     return {
-                      top: '110' * (index + 1) + 'px'
+                      top: '130' * (index + 1) + 'px'
                     }
                   } else {
                     return {
-                      top: 40 + 70 * (index + 1) + 'px'
+                      top: 120 * (index + 1) + 'px'
                     }
                   }
                 }
@@ -780,6 +781,7 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
                     // _this.showShare = false
                   })
                 }
+
                 $scope.bomTableParams = new ngTableParams({
                   page: 1,
                   count: 10

+ 2 - 2
src/main/webapp/resources/js/usercenter/controllers/forstore/seek_purchase_ctrl.js

@@ -970,11 +970,11 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
           $scope.caleTop = function(index){
             if( index == 0) {
               return {
-                top: '110' * (index + 1) + 'px'
+                top: '120' * (index + 1) + 'px'
               }
             } else {
               return {
-                top: 40 + 70 * (index + 1) + 'px'
+                top: 120 * (index + 1) + 'px'
               }
             }
           }

+ 8 - 7
src/main/webapp/resources/view/usercenter/forstore/bomDetail.html

@@ -143,12 +143,13 @@
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td.operate-seek{
         text-align: left;
         text-indent: 12px;
-        border-right: 1px solid #dae5fd
+        border-right: 1px solid #dae5fd;
+        line-height: 68px;
     }
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td.operate-seek >span {
         color: #4290f7;
         cursor: pointer;
-
+        margin-left: 12px;
         text-align: left;
     }
     .seek-purchase .red-text {
@@ -633,9 +634,9 @@
             <thead>
             <tr>
                 <th width="102">发布时间</th>
-                <th width="670">产品信息</th>
-                <th width="132">截止时间</th>
-                <th width="96">状态</th>
+                <th width="650">产品信息</th>
+                <th width="112">截止时间</th>
+                <th width="136">状态</th>
                     <!--
                     <select class="select-adder form-control" ng-model="searchStatus" ng-change="onSearch(searchStatus)">
                         <option value="0">全部</option>
@@ -644,7 +645,7 @@
                         <option value="202">已采纳</option>
                     </select>
                     -->
-                    状态
+                    <!--状态-->
                 </th>
                 <!--
                 <th width="92">操作</th>
@@ -686,7 +687,7 @@
                             <img src="static/img/user/images/code.png" />
                         </div>
                     </div>
-                    <div ng-style="caleTop($index)" class="sharescancode icon-style" ref="sharescancode" @mouseover="showShowShare(!showShare, index, purchaseMan.id)" @mouseout="hideShowShare(!showShare, index, purchaseMan.id)">
+                    <div ng-style="caleTop($index)" class="sharescancode icon-style" ref="sharescancode" ng-mouseover="setShowShare(seek,$index)" ng-mouseleave="hideShare($index)">
                         <div class="share">
                             <div>
                                 <div class="title">求购分享</div>

+ 13 - 8
src/main/webapp/resources/view/usercenter/forstore/seekPurchase.html

@@ -157,6 +157,10 @@
     .seek-purchase .screen .sreach .date input:hover{
         cursor: pointer;
     }
+    .seek-purchase .seek-purchase-content >table >tbody >tr.default-row .operate-seek .row-wrap >span {
+        float: left;
+        margin-left: 7px
+    }
     .seek-purchase .screen .sreach .date em{
         float: left;
         line-height: 32px;
@@ -262,7 +266,8 @@
         line-height: 68px
     }
     .seek-purchase .seek-purchase-content >table >tbody >tr .row-wrap {
-        height: 117px;
+        height: 117px
+    }
     .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td.operate-seek >span {
         color: #4290f7;
         cursor: pointer;
@@ -981,9 +986,9 @@
             <thead>
             <tr>
                 <th width="102">发布时间</th>
-                <th width="670">产品信息</th>
-                <th width="132">状态/截止时间</th>
-                <th width="96">操作</th>
+                <th width="650">产品信息</th>
+                <th width="112">状态/截止时间</th>
+                <th width="136">操作</th>
             </tr>
             </thead>
             <tbody ng-repeat="seek in seekListData.content" ng-class="{'active': seek.$status && (seek.$status == 1 || seek.$status == 2)}">
@@ -1031,7 +1036,7 @@
                                 <img src="static/img/user/images/code.png" />
                             </div>
                         </div>
-                        <div ng-style="caleTop($index)" class="sharescancode icon-style" ref="sharescancode" @mouseover="showShowShare(!showShare, index, purchaseMan.id)" @mouseout="hideShowShare(!showShare, index, purchaseMan.id)">
+                        <div ng-style="caleTop($index)" class="sharescancode icon-style" ng-mouseover="setShowShare(seek,$index)" ng-mouseleave="hideShare($index)">
                             <div class="share">
                                 <div>
                                     <div class="title">求购分享</div>
@@ -1152,7 +1157,7 @@
                 </td>
             </tr>
             </tbody>
-            <tbody class="pager-tbody" style="border: 0px">
+            <tbody class="pager-tbody">
                 <tr class="pager-row" ng-if="seekListData.totalElements > 0">
                 <td colspan="10">
                     <div>
@@ -1221,8 +1226,8 @@
         -->
         <table ng-table="bomTableParams">
             <tbody>
-            <tr ng-repeat="bom in $data" ng-click="toBomdetail(bom.id)">
-                <td>
+            <tr ng-repeat="bom in $data">
+                <td ng-click="toBomdetail(bom.id)">
                     <img src="static/img/seekPurchase/Excel.png" alt="">
                     <div>
                         <p ng-bind="bom.remark"></p>

+ 8 - 8
src/main/webapp/resources/view/vendor/forstore/seekPurchase.html

@@ -733,14 +733,14 @@
                 </tr>
             </tbody>
             <tbody ng-if="seekListData.length == 0">
-            <tr class="empty">
-                <td colspan="10">
-                    <div>
-                        <img src="static/img/all/empty-cart.png">
-                        <span>暂无求购信息</span>
-                    </div>
-                </td>
-            </tr>
+                <tr class="empty">
+                    <td colspan="10">
+                        <div>
+                            <img src="static/img/all/empty-cart.png">
+                            <span>暂无求购信息</span>
+                        </div>
+                    </td>
+                </tr>
             </tbody>
         </table>
     </div>

+ 1 - 1
src/main/webapp/resources/view/vendor/forstore/vendor_material.html

@@ -2527,7 +2527,7 @@
         <div class="line"></div>
       </div>
       <ul ng-if="resultDatalist.length > 0">
-        <li ng-repeat="list in resultDatalist" ng-if="list.userUU">
+        <li ng-repeat="list in resultDatalist">
           <div class="sort">{{list.detno}}</div>
           <div class="text">{{list.ptrCmpcode}}</div>
           <div class="text">{{list.ptrBranden}}</div>