bom求购

src/main/java/com/uas/platform/b2c/trade/seek/service/SeekPurchaseService.java

@@ -3,6 +3,7 @@ package com.uas.platform.b2c.trade.seek.service;
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.prod.commodity.model.Goods;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchase;
+import com.uas.platform.b2c.trade.seek.model.SeekPurchaseBom;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchaseBomList;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchaseByBatch;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchaseGoods;
@@ -121,4 +122,6 @@ public interface SeekPurchaseService {
     ResultMap updateSeekPurchaseByBatch(SeekPurchaseByBatch seekPurchaseByBatch);
 
     ResultMap deleteSeekPurchaseByBatch(String spIds);
+
+    ResultMap updateSeekPurchaseBom(SeekPurchaseBom seekPurchaseBom);
 }

src/main/java/com/uas/platform/b2c/trade/seek/service/impl/SeekPurchaseServiceImpl.java

@@ -566,4 +566,10 @@ public class SeekPurchaseServiceImpl implements SeekPurchaseService {
         namedParameterJdbcTemplate.update(sql, param);
         return ResultMap.success(null);
     }
+
+    @Override
+    public ResultMap updateSeekPurchaseBom(SeekPurchaseBom seekPurchaseBom) {
+        seekPurchaseBomDao.save(seekPurchaseBom);
+        return ResultMap.success(null);
+    }
 }

src/main/webapp/resources/js/usercenter/controllers/forstore/bom_detail_ctrl.js

@@ -6,9 +6,9 @@ define(['app/app'], function (app) {
     'use strict';
     app.register.controller('seekPurchaseCtrl',
         ['$scope', '$rootScope', 'seekPurchase', 'toaster', 'BaseService',
-            'ngTableParams', 'Order', 'SessionService', '$filter', '$upload',
+            'ngTableParams', 'Order', 'SessionService', '$filter', '$upload', '$stateParams',
             function ($scope, $rootScope, seekPurchase, toaster, BaseService,
-                      ngTableParams, Order, SessionService, $filter, $upload) {
+                      ngTableParams, Order, SessionService, $filter, $upload, $stateParams) {
                 $rootScope.active = 'seek_purchase';
                 document.title = '我的求购-优软商城';
                 $scope.isEditName = false;
@@ -227,6 +227,7 @@ define(['app/app'], function (app) {
                         param.deadline = $scope.deadline;
                         param.keyWord = $scope.keyWord;
                         param.status = $scope.searchStatus;
+                        param.bomId = $stateParams.id;
                         param.minReleaseDate = $scope.startDate
                             ? $scope.startDate.getTime() : null;
                         param.maxReleaseDate = $scope.endDate ? $scope.endDate.getTime()

src/main/webapp/resources/js/usercenter/controllers/forstore/seek_purchase_ctrl.js

@@ -12,49 +12,10 @@ define(['app/app'], function (app) {
           $rootScope.active = 'seek_purchase';
           document.title = '我的求购-优软商城';
           $scope.activeType = 'seekManage';
-          $scope.isBOM = false;
-          $scope.isEditName = false;
 
           $scope.toogleType = function (type) {
             $scope.activeType = type;
           }
-
-          $scope.setIsEditName = function (flag) {
-            $scope.isEditName = flag;
-          }
-
-          $scope.setIsBom = function (flag, bomId) {
-            if (flag) {
-              $scope.activeType = 'seekManage';
-              $scope.seekPurchaseTableParams = new ngTableParams({
-                page: 1,
-                count: 10
-              }, {
-                total: 0,
-                getData: function ($defer, params) {
-                  const param = BaseService.parseParams(params.url());
-                  param.isMallGoods = $scope.isMallGoods;
-                  param.deadline = $scope.deadline;
-                  param.keyWord = $scope.keyWord;
-                  param.status = $scope.searchStatus;
-
-                  param.minReleaseDate = $scope.startDate
-                      ? $scope.startDate.getTime() : null;
-                  param.maxReleaseDate = $scope.endDate ? $scope.endDate.getTime()
-                      : null;
-                  seekPurchase.getUserSeekPageInfo(param, function (data) {
-                    params.total(data.totalElements);
-                    $defer.resolve(data.content);
-                    $scope.seekListData = data;
-                  }, function (response) {
-                    toaster.pop('error', response.data);
-                  });
-                }
-              });
-            }
-            $scope.isBOM = flag;
-          }
-
           var enIdFilter = $filter('EncryptionFilter');
 
           $scope.applyObj = {
@@ -258,8 +219,8 @@ define(['app/app'], function (app) {
           // 采纳报价
           $scope.adopt = function () {
             if (!$scope.purchaseQuantity) {
-                toaster.pop('error', "请输入正确的采购数量");
-                return;
+              toaster.pop('error', "请输入正确的采购数量");
+              return;
             }
             seekPurchase.updateSeekPurchaseStatus({
               spId: $scope.currentOffer.spId,
@@ -667,5 +628,7 @@ define(['app/app'], function (app) {
               });
             }
           });
+
+
         }]);
 });

src/main/webapp/resources/view/usercenter/forstore/seekPurchase.html

@@ -105,7 +105,7 @@
         border-radius: 2px;
         margin-right: 11px;
         padding-left: 10px;
-         box-shadow: none;
+        box-shadow: none;
     }
     .seek-purchase .screen .sreach >span {
         float: left;
@@ -572,25 +572,8 @@
             </ul>
         </div>
     </div>
-    <div class="seek-purchase-content" ng-if="activeType == 'seekManage'">
-        <div class="BOM-header" ng-if="isBOM">
-            <a ng-click="toogleType('bomManage')">&lt;返回BOM列表</a>
-            <div>
-                <p class="BOM-name-area" ng-show="!isEditName">
-                    <span>我是Excel的名称哈哈哈</span>
-                    <a ng-click="setIsEditName(true)">编辑BOM名称</a>
-                </p>
-                <p class="BOM-edit" ng-show="isEditName">
-                    <input type="text" class="form-control">
-                    <a ng-click="setIsEditName(false)">取消</a>
-                    <a >确认</a>
-                </p>
-                <div class="fr">
-                    配单分析：<span>本单共<span class="blue-text">100</span>个产品，<span class="red-text">10</span>个有报价。</span><br/><b class="red-text">81</b>个有现货
-                </div>
-            </div>
-        </div>
-        <div class="publish-purchase" ng-if="!isBOM">
+    <div class="seek-purchase-content" ng-show="activeType == 'seekManage'">
+        <div class="publish-purchase">
             <div class="fl">
                 <p>单个发布</p>
                 <div class="form-block">
@@ -639,16 +622,14 @@
                 <a href="javascript:void(0)" ng-click="release()">发布求购</a>
             </div>
         </div>
-        <div class="empty-line" ng-if="!isBOM"></div>
+        <div class="empty-line"></div>
         <!--搜索时间筛选-->
         <div class="screen">
             <div class="fl">
-                <span ng-if="!isBOM">
-                    <label class="com-check-box">
+                <label class="com-check-box">
                     <input type="checkbox" id="1" ng-model="isMallGoods" ng-change="onSearch()">
                     <label for="1"></label>
                 </label>&nbsp;有现货&nbsp;&nbsp;
-                </span>
                 截止时间&nbsp;
                 <select class="form-control select-adder" ng-model="deadline" ng-change="onSearch()" ng-init="deadline='全部'">
                     <option value="全部">全部</option>
@@ -692,12 +673,6 @@
                 </div>
             </div>
         </div>
-        <!--<div class="upload-content">-->
-            <!--<input type="text" name="txt" id="upload_text" />-->
-            <!--<i>选择文件</i>-->
-            <!--<input type="file" id="uploadCommodity" ng-file-select="" ng-change="selectFile()" accept="*.xls,*.xlsx" ng-model="bomFiles" ng-multiple="false" class="upload01" />-->
-            <!--<a href="javascript:void(0)" ng-click="upload()" class="blue-bg" style="margin-left: 18px;">确认上传</a>-->
-        <!--</div>-->
         <table ng-table="seekPurchaseTableParams">
             <thead>
             <tr>
@@ -755,7 +730,7 @@
                             <table>
                                 <thead>
                                 <tr>
-                                   <!-- <th width="68">全选</th>-->
+                                    <!-- <th width="68">全选</th>-->
                                     <th width="214">卖家</th>
                                     <th width="83">交期(天)</th>
                                     <th width="104">单价</th>
@@ -840,17 +815,17 @@
             </tr>
             </tbody>
             <tbody>
-                <tr class="pager-row">
-                    <td colspan="10">
-                        <div>
-                            显示&nbsp;{{(seekListData.number - 1 ) * seekListData.size + 1}}-{{seekListData.number * seekListData.size}}&nbsp;条，共&nbsp;{{seekListData.totalElements}}&nbsp;条
-                        </div>
-                    </td>
-                </tr>
+            <tr class="pager-row">
+                <td colspan="10">
+                    <div>
+                        显示&nbsp;{{(seekListData.number - 1 ) * seekListData.size + 1}}-{{seekListData.number * seekListData.size}}&nbsp;条，共&nbsp;{{seekListData.totalElements}}&nbsp;条
+                    </div>
+                </td>
+            </tr>
             </tbody>
         </table>
     </div>
-    <div class="bom-manage" ng-if="activeType == 'bomManage'">
+    <div class="bom-manage" ng-show="activeType == 'bomManage'">
         <div class="bom-manage-header">
             <p><span ng-bind="bomTotal">56</span>&nbsp;个BOM清单</p>
             <div class="fr">
@@ -898,21 +873,21 @@
         </div>
         <table ng-table="bomTableParams">
             <tbody>
-                <tr ng-repeat="bom in $data">
-                    <td>
-                        <img src="static/img/seekPurchase/Excel.png" alt="">
-                        <div>
-                            <p ng-bind="bom.name"></p>
-                            <div>共 <span class="blue-text" ng-bind="bom.productAmount"></span> 个产品，<span class="red-text" ng-bind="bom.offerAmount">10</span> 个有报价，<span class="red-text" ng-bind="bom.goodsAmount">7</span> 个有现货</div>
-                            <div ng-bind="bom.releaseDate | date:'yyyy-MM-dd HH:mm:ss'"></div>
-                        </div>
-                        <a ng-click="setIsBom(true, bom.bomId)" class="fr">查看详情</a>
-                    </td>
-                </tr>
+            <tr ng-repeat="bom in $data">
+                <td>
+                    <img src="static/img/seekPurchase/Excel.png" alt="">
+                    <div>
+                        <p ng-bind="bom.name"></p>
+                        <div>共 <span class="blue-text" ng-bind="bom.productAmount"></span> 个产品，<span class="red-text" ng-bind="bom.offerAmount">10</span> 个有报价，<span class="red-text" ng-bind="bom.goodsAmount">7</span> 个有现货</div>
+                        <div ng-bind="bom.releaseDate | date:'yyyy-MM-dd HH:mm:ss'"></div>
+                    </div>
+                    <a href="user#/bomDetail/{{bom.bomId}}" class="fr">查看详情</a>
+                </td>
+            </tr>
             </tbody>
         </table>
     </div>
-    <div class="com-del-box" ng-if="showUseFlag">
+    <div class="com-del-box" ng-show="showUseFlag">
         <div class="title">
             <i ng-click="setShowUseFlag(false)"></i>
         </div>