需求调整

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

@@ -18,6 +18,9 @@ define(['app/app'], function (app) {
           }
           $scope.initInquiryItem();
 
+            //卖家待报价推送信息，self为与我相关，all为全部
+            $scope.vendorType = 'self';
+
           // 获取当前卖家求购推送列表
           $scope.seekPurchaseTableParams = new ngTableParams({
             pageNumber: 1,
@@ -28,7 +31,6 @@ define(['app/app'], function (app) {
               const param = BaseService.parseParams(params.url());
               // param.deadline = $scope.deadline;
               // param.status = $scope.status;
-              param.enUU = $scope.userInfo.enterprise.uu;
               param.keyword = $scope.keyWord;
               param.fromDate = $scope.startDate
                   ? $scope.startDate.getTime() : null;
@@ -41,10 +43,19 @@ define(['app/app'], function (app) {
                 params.page(1);
                 $scope.isSearch = false;
               }
+              var isSelf = $scope.vendorType == 'self';
+              if (!isSelf) {
+                param.enUU = $scope.userInfo.enterprise.uu;
+                param.userUU = $scope.userInfo.userUU;
+              } else {
+                param.enuu = $scope.userInfo.enterprise.uu;
+                param.useruu = $scope.userInfo.userUU;
+              }
+              var target = isSelf ? '/inquiry/sale/remind' : '/inquiry/public';
               $http({
                 method: 'get',
                 dataType: 'json',
-                url: seekUrl + '/inquiry/public',
+                url: seekUrl + target,
                 params: param
               }).success(function (data) {
                 params.total(data.totalElements);
@@ -56,6 +67,15 @@ define(['app/app'], function (app) {
             }
           });
 
+            // 更换待报价状态
+            $scope.onVendorTypeChange = function () {
+              $scope.keyword = '';
+              $scope.startDate = null;
+              $scope.endDate = null;
+              $scope.seekPurchaseTableParams.page(1);
+              $scope.seekPurchaseTableParams.reload();
+            }
+
           // 搜索
           $scope.onSearch = function () {
             $scope.isSearch = true;

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

@@ -671,7 +671,7 @@
                         <div class="il-box-small il-box">
                             <div title="{{seek.encapsulation}}" class="item"><span>封装：</span>{{seek.encapsulation || '-'}}</div>
                             <div title="{{seek.produceDate}}" class="item"><span>生产日期：</span>{{seek.produceDate || '-'}}</div>
-                            <div title="{{seek.needquantity}}" class="item"><span>采购数量：</span>{{seek.needquantity || '-'}}</div>
+                            <div title="{{seek.needquantity}}" class="item"><span>采购数量(PCS)：</span>{{seek.needquantity || '-'}}</div>
                             <div title="{{seek.currency + seek.unitPrice | currencyStr}}" class="item"><span>单价预算：</span>{{seek.currency + seek.unitPrice | currencyStr}}</div>
                         </div>
                     </div>

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

@@ -906,7 +906,7 @@
                     />
                 </div>
                 <div class="form-block">
-                    <span>采购数量</span>
+                    <span>采购数量(PCS)</span>
                     <input type="text" ng-change="onAmountChange()" class="form-group" ng-class="{'error': !validObj.amount}" ng-model="applyObj.amount" ng-blur="checkAmount()" >
                 </div>
                 <div class="form-block single-price">
@@ -1018,7 +1018,7 @@
                         <div class="il-box-small il-box">
                             <div title="{{seek.encapsulation}}" class="item"><span>封装：</span>{{seek.encapsulation || '-'}}</div>
                             <div title="{{seek.produceDate}}" class="item"><span>生产日期：</span>{{seek.produceDate || '-'}}</div>
-                            <div title="{{seek.needquantity}}" class="item"><span>采购数量：</span>{{seek.needquantity || '-'}}</div>
+                            <div title="{{seek.needquantity}}" class="item"><span>采购数量(PCS)：</span>{{seek.needquantity || '-'}}</div>
                             <div title="{{seek.currency + seek.unitPrice | currencyStr}}" class="item"><span>单价预算：</span>{{seek.currency + seek.unitPrice | currencyStr}}</div>
                         </div>
                     </div>

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

@@ -690,7 +690,7 @@
                         <div class="il-box-small il-box">
                             <div title="{{seek.encapsulation}}" class="item"><span>封装：</span>{{seek.encapsulation || '-'}}</div>
                             <div title="{{seek.produceDate}}" class="item"><span>生产日期：</span>{{seek.produceDate || '-'}}</div>
-                            <div title="{{seek.needquantity}}" class="item"><span>采购数量：</span>{{seek.needquantity || '-'}}</div>
+                            <div title="{{seek.needquantity}}" class="item"><span>采购数量(PCS)：</span>{{seek.needquantity || '-'}}</div>
                             <div title="{{seek.currency + seek.unitPrice | currencyStr}}" class="item"><span>单价预算：</span>{{seek.currency + seek.unitPrice | currencyStr}}</div>
                         </div>
                     </div>

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

@@ -604,6 +604,15 @@
     .oder01 ul li.active:after{
         display: block
     }
+    .vendor-type {
+        display: inline-block;
+        width: 111px;
+        float: left;
+        margin-right: 234px;
+        text-align: center;
+        border: 1px solid #4290f7;
+        color: #999;
+    }
 </style>
 <div class="user_right fr seek-purchase">
     <!--求购询价-->
@@ -650,6 +659,10 @@
                 -->
             </div>
             <div class="sreach fr">
+                <select class="form-control select-adder vendor-type" ng-model="vendorType" ng-change="onVendorTypeChange(vendorType)">
+                    <option value="self">与我相关</option>
+                    <option value="all">全部</option>
+                </select>
                 <span>发布时间&nbsp;</span>
                 <div class="date fl">
                     <div class="data-input">
@@ -715,7 +728,7 @@
                             <div class="il-box-small il-box">
                                 <div title="{{seek.encapsulation}}" class="item"><span>封装：</span>{{seek.encapsulation || '-'}}</div>
                                 <div title="{{seek.produceDate}}" class="item"><span>生产日期：</span>{{seek.produceDate || '-'}}</div>
-                                <div title="{{seek.needquantity}}" class="item"><span>采购数量：</span>{{seek.needquantity || '-'}}</div>
+                                <div title="{{seek.needquantity}}" class="item"><span>采购数量(PCS)：</span>{{seek.needquantity || '-'}}</div>
                                 <div title="{{seek.currency + seek.unitPrice | currencyStr}}" class="item"><span>单价预算：</span>{{seek.currency + seek.unitPrice | currencyStr}}</div>
                             </div>
                         </div>

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

@@ -342,6 +342,14 @@
 	.pro_management .table .check-active label {
 		margin-right: 0 !important;
 	}
+	.check-input {
+		position: relative;
+	}
+	.check-input img {
+		position: absolute;
+		left: 0;
+		top: 0;
+	}
 	.check-input input{
 		display: none;
 	}
@@ -1940,6 +1948,7 @@
 					<!--<tr ng-class="{ 'active': material.selected }" class="gre-bg">-->
 					<tr ng-class="{ 'active': material.selected, 'gre-bg' : material.exPandOper}">
 						<td class="check-input">
+							<img src="static/img/vendor/images/person-material-pc.png" ng-if="material.addProductPerson" alt="">
 							<span><input type="checkbox" ng-checked="material.isChoosed"  ng-click="chooseOne(material)"  id="{{$index+1}}"/><label for="{{$index+1}}"></label><br/></span>
 						</td>
 						<td>

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

@@ -2295,7 +2295,7 @@
 						<img src="static/img/all/empty-cart.png">
 					</p>
 					<div class="empty-info">
-						<p class="grey"> 创建您的个人产品库，可为您精准推送客户需求 </p>
+						<p class="grey"> 上传物料至个人物料库，可获得更多的商机哦！ </p>
 						<a href="vendor#/vendor_upload?type=self"><i></i>马上去上传</a>
 					</div>
 				</div>

src/main/webapp/resources/view/vendor/left_nav.html

@@ -60,7 +60,7 @@
 				<!-- 我的店铺申述 store -->
 				<span  ui-sref="vendor_store_maintain" ng-if="store && store.status && store.status !== 'OPENED'">我的店铺</span>
 			</li>
-			<li ng-class="{'active' : active == 'vendor_seek_purchase'}"><span ui-sref="vendorSeekPurchase">求购询价</span></li>
+			<li ng-class="{'active' : active == 'vendor_seek_purchase'}"><span ui-sref="vendorSeekPurchase">我的商机</span></li>
 		<li ng-class="{'active' : active == 'vendor_logistics'}">
 			<span  ui-sref="vendor_logistics" ng-hide="store && (!store.status || store.status === 'OPENED')">物流管理</span>
 			<span  ui-sref="vendor_deliveryRule" ng-if="store && (!store.status || store.status === 'OPENED')">物流管理</span>
@@ -96,7 +96,7 @@
 				<!-- 我的店铺申述 store -->
 				<span ng-click="promptUpdate()" class="disabled"  ng-if="store && store.status && store.status !== 'OPENED'">店铺管理</span>
 			</li>
-			<li ng-class="{'active' : active == 'vendor_seek_purchase'}"><span ng-click="promptUpdate()" class="disabled">求购询价</span></li>
+			<li ng-class="{'active' : active == 'vendor_seek_purchase'}"><span ng-click="promptUpdate()" class="disabled">我的商机</span></li>
 			<li ng-class="{'active' : active == 'vendor_logistics'}"><span ng-click="promptUpdate()" class="disabled">物流管理</span></li>
 			<li ng-class="{'active' : active == 'vendor_invoice'}"><span ng-click="promptUpdate()" class="disabled" >发票管理</span></li>
 			<!--	<li ng-class="{'active' : active == 'vendor_logistics'}"><span  ui-sref="vendor_logistics">物流管理</span></li>-->