Merge remote-tracking branch 'origin/liusw-seekpurchae-v2.0.1.13' into liusw-seekpurchase-v2.0.1.13

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

@@ -11,6 +11,18 @@ define(['app/app'], function (app) {
             ngTableParams, Order, SessionService, $filter, $upload) {
           $rootScope.active = 'seek_purchase';
           document.title = '我的求购-优软商城';
+          $scope.activeType = 'seekManage';
+          $scope.isBOM = true;
+          $scope.isEditName = false;
+
+          $scope.toogleType = function (type) {
+            $scope.activeType = type;
+          }
+
+          $scope.setIsEditName = function (flag) {
+            $scope.isEditName = flag;
+          }
+
           var enIdFilter = $filter('EncryptionFilter');
 
           $scope.applyObj = {

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

@@ -84,7 +84,7 @@
         margin: 20px 0;
     }
     /*搜索时间筛选 start*/
-    .seek-purchase .seek-purchase-content .screen {
+    .seek-purchase .screen {
         font-size: 14px;
         line-height: 32px;
         clear: both;
@@ -94,10 +94,10 @@
         padding-top: 4px;
         padding-right: 13px;
     }
-    .seek-purchase .seek-purchase-content .screen .fl {
+    .seek-purchase .screen .fl {
         margin-left: 14px;
     }
-    .seek-purchase .seek-purchase-content .screen .fl select{
+    .seek-purchase .screen .fl select{
         width: 88px;
         height: 32px;
         border: 1px solid #4290f7;
@@ -107,33 +107,33 @@
         padding-left: 10px;
          box-shadow: none;
     }
-    .seek-purchase .seek-purchase-content .screen .sreach >span {
+    .seek-purchase .screen .sreach >span {
         float: left;
     }
-    .seek-purchase .seek-purchase-content .screen .sreach input{
+    .seek-purchase .screen .sreach input{
         border: #4290f7 1px solid;
         height: 32px;
         width: 267px;
         box-shadow: none;
     }
-    .seek-purchase .seek-purchase-content .screen .sreach .date{
+    .seek-purchase .screen .sreach .date{
         margin-right: 6px;
     }
-    .seek-purchase .seek-purchase-content .screen .sreach .date input{
+    .seek-purchase .screen .sreach .date input{
         width: 117px;
         text-align: left;
         border: 1px solid #4290f7;
     }
-    .seek-purchase .seek-purchase-content .screen .sreach .date input:hover{
+    .seek-purchase .screen .sreach .date input:hover{
         cursor: pointer;
     }
-    .seek-purchase .seek-purchase-content .screen .sreach .date em{
+    .seek-purchase .screen .sreach .date em{
         float: left;
         line-height: 32px;
         color: #999;
         margin: 0 5px;
     }
-    .seek-purchase .seek-purchase-content .screen .sreach a.seek{
+    .seek-purchase .screen .sreach a.seek{
         width: 58px;
         height: 32px;
         background: #4290f7;
@@ -141,17 +141,17 @@
         line-height: 32px;
         float: left;
     }
-    .seek-purchase .seek-purchase-content .screen .sreach a.seek:hover{
+    .seek-purchase .screen .sreach a.seek:hover{
         background: #3f7ae3;
     }
-    .seek-purchase .seek-purchase-content .screen .sreach .form-control{
+    .seek-purchase .screen .sreach .form-control{
         border-radius: 2px;
     }
-    .seek-purchase .seek-purchase-content .data-input{
+    .seek-purchase .data-input{
         float: left;
         position: relative;
     }
-    .seek-purchase .seek-purchase-content .data-input button.open{
+    .seek-purchase .data-input button.open{
         position: absolute;
         right: 1px;
         top: 1px;
@@ -161,7 +161,7 @@
         background-position-x: 100% !important;
         border: none;
     }
-    .seek-purchase .seek-purchase-content .screen .sreach .date input.form-control{
+    .seek-purchase .screen .sreach .date input.form-control{
         padding: 6px 6px;
     }
     .seek-purchase .seek-purchase-content .publish-purchase .fl .form-block .btn-default{
@@ -410,6 +410,147 @@
         text-overflow: ellipsis;
         white-space: nowrap;
     }
+    .seek-purchase .bom-manage {
+        margin: 10px 0 0 0;
+        background: #fff;
+        padding-bottom: 30px;
+    }
+    .seek-purchase .bom-manage .bom-manage-header {
+        height: 83px;
+        line-height: 83px;
+        padding: 0 16px 0 39px;
+    }
+    .seek-purchase .bom-manage .bom-manage-header p {
+        font-size: 18px;
+        font-weight: bold;
+        display: inline-block;
+    }
+    .seek-purchase .bom-manage .bom-manage-header p span {
+        font-size: 24px;
+        color: #fd7748;
+    }
+    .seek-purchase .bom-manage .bom-manage-header .fr a {
+        color: #4290f7;
+        font-size: 14px;
+        margin-right: 6px;
+    }
+    .seek-purchase .bom-manage .bom-manage-header .fr span {
+        display: inline-block;
+        height: 32px;
+        width: 104px;
+        text-align: center;
+        line-height: 32px;
+        color: #fff;
+        background: #fd7748;
+        cursor: pointer;
+        border-radius: 2px;
+        font-size: 14px;
+    }
+    .seek-purchase .bom-manage > table {
+        width: 1003px;
+        margin: 0 auto;
+        border-bottom: 1px solid #4290f7;
+    }
+    .seek-purchase .bom-manage > table tbody tr {
+        height: 100px;
+        line-height: 100px;
+        margin: 0 12px;
+        border: 1px solid #fff;
+    }
+    .seek-purchase .bom-manage > table tbody tr td img {
+        margin: 0 0 0 28px;
+    }
+    .seek-purchase .bom-manage > table tbody tr td > div {
+        display: inline-block;
+        line-height: 23px;
+        font-size: 14px;
+        vertical-align: middle;
+        margin: 0 0 0 21px;
+    }
+    .seek-purchase .bom-manage > table tbody tr td > div p {
+        font-size: 14px;
+        font-weight: bold;
+    }
+    .seek-purchase .blue-text {
+        color: #4290f7;
+    }
+    .seek-purchase .bom-manage > table tbody tr td > a {
+        width: 64px;
+        height: 24px;
+        display: inline-block;
+        font-size: 12px;
+        text-align: center;
+        line-height: 24px;
+        background: #4290f7;
+        color: #fff;
+        border-radius: 2px;
+        margin: 38px 20px 0 0;
+    }
+    .seek-purchase .bom-manage > table tbody tr:hover {
+        background: #fdf8f5;
+        border: 1px solid #fce8df;
+    }
+    .seek-purchase .seek-purchase-content .BOM-header {
+        height: 164px;
+        padding: 14px;
+    }
+    .seek-purchase .seek-purchase-content .BOM-header > a {
+        font-size: 14px;
+        color: #4290f7;
+    }
+    .seek-purchase .seek-purchase-content .BOM-header > div {
+        height: 100px;
+        margin: 14px 0 0 0;
+        line-height: 100px;
+        border: 1px dashed #fd7748;
+        padding: 0 66px 0 21px;
+    }
+    .seek-purchase .seek-purchase-content .BOM-header > div .fr {
+        line-height: normal;
+        font-size: 14px;
+        margin-top: 25px;
+    }
+    .seek-purchase .seek-purchase-content .BOM-header > div p.BOM-name-area {
+        font-size: 22px;
+        font-weight: bold;
+    }
+    .seek-purchase .seek-purchase-content .BOM-header > div p {
+        display: inline-block;
+    }
+    .seek-purchase .seek-purchase-content .BOM-header > div p.BOM-name-area a {
+        margin-left: 10px;
+        display: inline-block;
+        width: 102px;
+        height: 24px;
+        line-height: 24px;
+        text-align: center;
+        background: #fd7748;
+        color: #fff;
+        font-size: 12px;
+        cursor: pointer;
+        border-radius: 2px;
+        vertical-align: middle;
+        position: relative;
+        bottom: 2px;
+    }
+    .seek-purchase .seek-purchase-content .BOM-header > div p.BOM-edit input {
+        display: inline-block;
+        width: 358px;
+        height: 30px;
+        border-radius: 2px;
+        border: 1px solid #dedede;
+    }
+    .seek-purchase .seek-purchase-content .BOM-header > div p.BOM-edit a {
+        padding: 6px 14px;
+        color: #fff;
+        font-size: 12px;
+        border-radius: 2px;
+        background: #c6c6c6;
+        vertical-align: middle;
+    }
+    .seek-purchase .seek-purchase-content .BOM-header > div p.BOM-edit a:last-child {
+        background: #fd7748;
+    }
 </style>
 <div class="user_right fr seek-purchase">
     <!--求购询价-->
@@ -420,8 +561,33 @@
             </ul>
         </div>
     </div>
-    <div class="seek-purchase-content">
-        <div class="publish-purchase">
+    <div class="oder" style="margin-top: 10px;">
+        <div class="oder01">
+            <ul>
+                <li ng-class="{'active': activeType == 'seekManage'}"><a href="javascript:void(0)" ng-click="toogleType('seekManage')">求购管理</a></li>
+                <li ng-class="{'active': activeType == 'bomManage'}"><a href="javascript:void(0)" ng-click="toogleType('bomManage')">BOM管理</a></li>
+            </ul>
+        </div>
+    </div>
+    <div class="seek-purchase-content" ng-if="activeType == 'seekManage'">
+        <div class="BOM-header">
+            <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="fl">
                 <p>单个发布</p>
                 <div class="form-block">
@@ -470,14 +636,16 @@
                 <a href="javascript:void(0)" ng-click="release()">发布求购</a>
             </div>
         </div>
-        <div class="empty-line"></div>
+        <div class="empty-line" ng-if="!isBOM"></div>
         <!--搜索时间筛选-->
         <div class="screen">
             <div class="fl">
-                <label class="com-check-box">
+                <span ng-if="!isBOM">
+                    <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>
@@ -679,7 +847,89 @@
             </tbody>
         </table>
     </div>
-    <div class="com-del-box" ng-show="showUseFlag">
+    <div class="bom-manage" ng-if="activeType == 'bomManage'">
+        <div class="bom-manage-header">
+            <p><span>56</span>&nbsp;个BOM清单</p>
+            <div class="fr">
+                <a href="">下载BOM模板 <i class="fa fa-long-arrow-right"></i></a>
+                <span>导入新BOM</span>
+            </div>
+        </div>
+        <div class="screen">
+            <div class="sreach fr">
+                <span>发布时间&nbsp;</span>
+                <div class="date fl">
+                    <div class="data-input">
+                        <input type="text" ng-model="startDate"
+                               class="form-control select-adder" placeholder="起始时间"
+                               datepicker-popup="yyyy-MM-dd"
+                               is-open="condition.startDateOpen"
+                               max-date="endDate" current-text="今天" clear-text="清除" close-text="关闭"
+                               ng-click="openDatePicker($event, condition, 'startDateOpen',1)"
+                               datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+                               ng-change="vaildDate(true)"
+                        />
+                        <button class="open" ng-click="openDatePicker($event, condition, 'startDateOpen')"></button>
+                    </div>
+                    <em>–</em>
+                    <div class="data-input">
+                        <input type="text" ng-model="endDate"
+                               class="form-control select-adder" placeholder="结束时间"
+                               datepicker-popup="yyyy-MM-dd"
+                               is-open="condition.endDateOpen"
+                               min-date="startDate" current-text="今天" clear-text="清除" close-text="关闭"
+                               ng-click="openDatePicker($event, condition, 'endDateOpen',2)"
+                               datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+                               ng-change="changeEndDate()"
+                        />
+                        <button class="open" ng-click="openDatePicker($event, condition, 'endDateOpen')"></button>
+                    </div>
+                </div>
+                <div class="sreach-input fr">
+                    <input type="search" placeholder="BOM名称" class="form-control" ng-model="keyWord" ng-search="onSearch()"/>
+                    <a class="seek" href="javascript:void(0)">搜索</a>
+                </div>
+            </div>
+        </div>
+        <table>
+            <tbody>
+                <tr>
+                    <td>
+                        <img src="static/img/seekPurchase/Excel.png" alt="">
+                        <div>
+                            <p>我就是我</p>
+                            <div>共 <span class="blue-text">21</span> 个产品，<span class="red-text">10</span> 个有报价，<span class="red-text">7</span> 个有现货</div>
+                            <div>2017-12-12 11:11:11</div>
+                        </div>
+                        <a href="" class="fr">查看详情</a>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <img src="static/img/seekPurchase/Excel.png" alt="">
+                        <div>
+                            <p>我就是我</p>
+                            <div>共 <span class="blue-text">21</span> 个产品，<span class="red-text">10</span> 个有报价，<span class="red-text">7</span> 个有现货</div>
+                            <div>2017-12-12 11:11:11</div>
+                        </div>
+                        <a href="" class="fr">查看详情</a>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <img src="static/img/seekPurchase/Excel.png" alt="">
+                        <div>
+                            <p>我就是我</p>
+                            <div>共 <span class="blue-text">21</span> 个产品，<span class="red-text">10</span> 个有报价，<span class="red-text">7</span> 个有现货</div>
+                            <div>2017-12-12 11:11:11</div>
+                        </div>
+                        <a href="" class="fr">查看详情</a>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+    <div class="com-del-box" ng-if="showUseFlag">
         <div class="title">
             <i ng-click="setShowUseFlag(false)"></i>
         </div>

src/main/webapp/resources/view/vendor/forstore/purchaseOffer.html

@@ -171,7 +171,7 @@
         position: absolute;
         left: 0;
         top: 0;
-        width: 130px;
+        width: 150px;
     }
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td.release-time .seek-status div{
         position: relative;
@@ -183,10 +183,40 @@
         color: #fff;
         float: left;
     }
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.release-time .seek-status div{
+        position: relative;
+        width: 60px;
+        padding-right: 3px;
+        height: 21px;
+        line-height: 21px;
+        background: #4290f7;
+        color: #fff;
+        float: left;
+    }
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.release-time .seek-status .BOM-list-btn {
+        color: #39ae05;
+        width: 64px;
+        background: #fff;
+        font-size: 12px;
+        border-radius: 100px;
+        border: 1px solid #39ae05;
+        height: 18px;
+        line-height: 15px;
+        text-align: center;
+        padding-right: 0;
+        margin-top: 2px;
+        margin-left: 9px;
+        margin-right: 14px;
+        cursor: pointer;
+    }
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.release-time .seek-status .BOM-list-btn:hover {
+        background: #39ae05;
+        color: #fff;
+    }
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td.release-time .seek-status div.no-grounding {
         background: #f62d37;
     }
-    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.release-time .seek-status div::after {
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.release-time .seek-status div.status::after {
         content: '';
         position: absolute;
         right: 0;
@@ -194,7 +224,7 @@
         border-bottom: 21px solid #fff;
         border-left: 5px solid transparent;
     }
-    .seek-purchase .seek-purchase-content >table tbody tr.default-row:hover td.release-time .seek-status div::after {
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row:hover td.release-time .seek-status div.status::after {
         border-bottom: 21px solid #f1f5ff;
     }
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td.release-time .seek-status a {
@@ -359,9 +389,49 @@
     .ng-table-pager {
         margin-top: 20px;
     }
+    .seek-purchase .BOM-header {
+        height: 164px;
+        padding: 14px;
+        background: #fff;
+        margin-bottom: 10px;
+    }
+    .seek-purchase .BOM-header > a {
+        font-size: 14px;
+        color: #4290f7;
+    }
+    .seek-purchase .BOM-header > div {
+        height: 100px;
+        margin: 14px 0 0 0;
+        line-height: 100px;
+        border: 1px dashed #fd7748;
+        padding: 0 66px 0 21px;
+    }
+    .seek-purchase .BOM-header > div .fr {
+        line-height: normal;
+        font-size: 14px;
+        margin-top: 25px;
+    }
+    .seek-purchase .BOM-header > div p.BOM-name-area {
+        font-size: 22px;
+        font-weight: bold;
+    }
+    .seek-purchase .BOM-header > div p {
+        display: inline-block;
+    }
 </style>
 <div class="user_right fr seek-purchase">
     <!--求购询价-->
+    <div class="BOM-header">
+        <a ng-click="toogleType('bomManage')">&lt;返回</a>
+        <div>
+            <p class="BOM-name-area" ng-show="!isEditName">
+                <span>我是Excel的名称哈哈哈</span>
+            </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="oder">
         <div class="oder01">
             <ul>
@@ -450,9 +520,10 @@
                     <span ng-bind="seek.releaseDate | date:'yyyy-MM-dd'"></span>
                     <span ng-bind="seek.releaseDate | date:'HH:mm:ss'"></span>
                     <div class="seek-status">
+                        <div ng-show="seek.goodsEnuu" class="status">已在库</div>
                         <div ng-show="!seek.goodsEnuu" class="no-grounding">未在库</div>
+                        <div class="BOM-list-btn">BOM清单</div>
                         <a ng-show="!seek.goodsEnuu" target="_blank" href="vendor#/vendor_upload">产品导入>></a>
-                        <div ng-show="seek.goodsEnuu">已在库</div>
                     </div>
                 </td>
                 <td class="user-name"><div title="{{seek.userName}}" ng-bind="seek.userName"></div></td>

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

@@ -137,10 +137,29 @@
         color: #fff;
         float: left;
     }
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.release-time .seek-status .BOM-list-btn {
+        color: #39ae05;
+        width: 64px;
+        background: #fff;
+        font-size: 12px;
+        border-radius: 100px;
+        border: 1px solid #39ae05;
+        height: 18px;
+        line-height: 15px;
+        text-align: center;
+        padding-right: 0;
+        margin-top: 3px;
+        margin-left: 5px;
+        cursor: pointer;
+    }
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.release-time .seek-status .BOM-list-btn:hover {
+        background: #39ae05;
+        color: #fff;
+    }
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td.release-time .seek-status div.no-grounding {
         background: #f62d37;
     }
-    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.release-time .seek-status div::after {
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.release-time .seek-status div.status::after {
         content: '';
         position: absolute;
         right: 0;
@@ -148,7 +167,7 @@
         border-bottom: 21px solid #fff;
         border-left: 5px solid transparent;
     }
-    .seek-purchase .seek-purchase-content >table tbody tr.default-row:hover td.release-time .seek-status div::after {
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row:hover td.release-time .seek-status div.status::after {
         border-bottom: 21px solid #f1f5ff;
     }
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td.release-time .seek-status a {
@@ -307,9 +326,53 @@
     .ng-table-pager {
         margin-top: 20px;
     }
+    .seek-purchase .bom-manage > table tbody tr:hover {
+        background: #fdf8f5;
+        border: 1px solid #fce8df;
+    }
+    .seek-purchase .BOM-header {
+        height: 164px;
+        padding: 14px;
+        background: #fff;
+        margin-bottom: 10px;
+    }
+    .seek-purchase .BOM-header > a {
+        font-size: 14px;
+        color: #4290f7;
+    }
+    .seek-purchase .BOM-header > div {
+        height: 100px;
+        margin: 14px 0 0 0;
+        line-height: 100px;
+        border: 1px dashed #fd7748;
+        padding: 0 66px 0 21px;
+    }
+    .seek-purchase .BOM-header > div .fr {
+        line-height: normal;
+        font-size: 14px;
+        margin-top: 25px;
+    }
+    .seek-purchase .BOM-header > div p.BOM-name-area {
+        font-size: 22px;
+        font-weight: bold;
+    }
+    .seek-purchase .BOM-header > div p {
+        display: inline-block;
+    }
 </style>
 <div class="user_right fr seek-purchase">
     <!--求购询价-->
+    <div class="BOM-header">
+        <a ng-click="toogleType('bomManage')">&lt;返回</a>
+        <div>
+            <p class="BOM-name-area" ng-show="!isEditName">
+                <span>我是Excel的名称哈哈哈</span>
+            </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="oder">
         <div class="oder01">
             <ul>
@@ -393,7 +456,8 @@
                         <span ng-bind="seek.releaseDate | date:'yyyy-MM-dd'"></span>
                         <span ng-bind="seek.releaseDate | date:'HH:mm:ss'"></span>
                         <div class="seek-status">
-                            <div>已在库</div>
+                            <div class="status">已在库</div>
+                            <div class="BOM-list-btn">BOM清单</div>
                         </div>
                     </td>
                     <td class="user-name"><div title="{{seek.userName}}" ng-bind="seek.userName"></div></td>