yangc 8 yıl önce
ebeveyn
işleme
015f0f850c

+ 9 - 0
src/main/webapp/resources/js/vendor/controllers/forstore/seek_purchase_ctrl.js

@@ -154,6 +154,7 @@ define(['app/app'], function (app) {
             return $scope.validOffer.unitPrice && $scope.validOffer.minDay && $scope.validOffer.maxDay;
           }
 
+          $scope.seekCurrency = 'RMB';
           // 保存报价
           $scope.saveOfferBtn = false;
           $scope.saveOffer = function () {
@@ -161,6 +162,9 @@ define(['app/app'], function (app) {
               $scope.inquiryItem.vendUU = $scope.userInfo.enterprise.uu;
               $scope.inquiryItem.vendUserUU = $scope.userInfo.userUU;
               $scope.inquiryItem.qutoApp = "MALL";
+              if (!$scope.inquiryItem.currency) {
+                $scope.inquiryItem.currency = $scope.seekCurrency;
+              }
               seekPurchase.saveOffer($scope.inquiryItem, function (data) {
                 toaster.pop('success', '报价成功');
                 $scope.isShowSayPriceBox = false;
@@ -397,6 +401,11 @@ define(['app/app'], function (app) {
           }*/
 
           $scope.checkValid = function () {
+            for (var i = 0; i < $scope.inquiryItem.replies.length; i++) {
+              if (!$scope.inquiryItem.replies[i].lapQty || !$scope.inquiryItem.replies[i].price) {
+                return false;
+              }
+            }
             return $scope.validSayPrice.leadtime && $scope.validSayPrice.repliesLapQty && $scope.validSayPrice.repliesPrice;
           }
 

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

@@ -363,14 +363,13 @@
     .seek-purchase .say-price-box {
       /*  display: none;*/
         position: fixed;
-        width: 527px;
+        width: 456px;
         top: 30%;
         left: 33%;
-        border-radius: 5px;
-        -webkit-box-shadow: 0 5px 15px rgba(0,0,0,.5);
+        /*-webkit-box-shadow: 0 5px 15px rgba(0,0,0,.5);
         -moz-box-shadow: 0 5px 15px rgba(0,0,0,.5);
-        box-shadow: 0 5px 15px rgba(0,0,0,.5);
-        z-index: 1;
+        box-shadow: 0 5px 15px rgba(0,0,0,.5);*/
+        z-index: 10000;
         font-size: 14px;
     }
     .seek-purchase .say-price-box .title {
@@ -379,11 +378,13 @@
         background: #4290f7;
         line-height: 44px;
         color: #fff;
+        border-top-right-radius: 5px;
+        border-top-left-radius: 5px;
     }
     .seek-purchase .say-price-box .title > div {
         display: inline-block;
-        padding-left: 66px;
-        width: 49%;
+        padding-left: 57px;
+        width: 47%;
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
@@ -465,6 +466,7 @@
     }
     .seek-purchase .say-price-box .content .content-line .form-right {
         padding-left: 13px;
+        position: relative;
     }
     .seek-purchase .say-price-box .content .content-line .form-right input {
         width: 101px;
@@ -472,8 +474,28 @@
     .seek-purchase .say-price-box .content .content-line .form-right > i {
         margin-left: 4px;
     }
+    .seek-purchase .say-price-box .content .content-line .form-right select {
+        position: absolute;
+        top: 0;
+        width: 32px;
+        height: 28px;
+        background: url(/images/applyPurchase/arrow-down.png) no-repeat right center;
+        border: none;
+        border-right: 1px solid #bfbfbf;
+        border-bottom-left-radius: 4px;
+        border-top-left-radius: 4px;
+        color: #5392f9;
+        font: small-caption;
+        padding-left: 8px;
+        outline: none;
+    }
+    .seek-purchase .say-price-box .content .content-line .form-right select + input {
+        padding-left: 36px;
+    }
     .seek-purchase .say-price-box .operate {
         border-top: 1px solid #e4e5e6;
+        border-bottom-left-radius: 5px;
+        border-bottom-right-radius: 5px;
         background: #fff;
         height: 62px;
         text-align: center;
@@ -679,72 +701,78 @@
             </tbody>
         </table>
     </div>
-    <div class="say-price-box" ng-show="isShowSayPriceBox">
-        <div class="title">
-            <div>型号:<span ng-bind="inquiryItem.cmpCode" title="{{inquiryItem.cmpCode}}">PMDIDASJD</span></div>
-            <div>品牌:<span ng-bind="inquiryItem.inbrand" title="{{inquiryItem.inbrand}}">台积电</span></div>
-            <i class="fa fa-close"></i>
-        </div>
-        <div class="content">
-            <div class="content-line">
-                <div class="form-item form-left">
-                    <span><i>*</i>交期:</span>
-                    <!--
-                    <input type="text" class="form-control" placeholder="天数">
-                    -
-                    -->
-                    <input type="text" class="form-control" ng-change="onLeadtimeInput()" ng-blur="onLeadtimeBlur()" ng-model="inquiryItem.leadtime" placeholder="天数">
-                </div>
-                <div class="form-item form-upload">
-                    <!--
-                    <label>
-                        <span><i>+</i>添加附件</span>
-                        <input type="file" ng-model="myFiles">
-                    </label>
-                    -->
-                    <!--<div>
-                      <span>我是Excel的名字111</span>
-                      <i class="fa fa-times-circle"></i>
-                      <a href="">更换</a>
-                    </div>-->
-                </div>
+    <div class="com-modal-wrap" ng-show="isShowSayPriceBox">
+        <div class="say-price-box">
+            <div class="title">
+                <div>型号:<span ng-bind="inquiryItem.cmpCode" title="{{inquiryItem.cmpCode}}">PMDIDASJD</span></div>
+                <div>品牌:<span ng-bind="inquiryItem.inbrand" title="{{inquiryItem.inbrand}}">台积电</span></div>
+                <i class="fa fa-close"></i>
             </div>
-            <div class="content-line" ng-repeat="reply in inquiryItem.replies track by $index">
-                <div class="form-item form-left">
-                    <span><i>*</i>价格梯度:</span>
-                    <!--
-                    <input type="text" class="form-control" placeholder="数量">
-                    -
-                    -->
-                    <input type="text" class="form-control" ng-blur="onReplyLapQtyBlur($index)" ng-model="reply.lapQty" placeholder="数量">
-                </div>
-                <div class="form-item form-right">
-                    <span><i>*</i>单价({{inquiryItem.currency == 'USD' ? '$' : '¥'}}):</span>
-                    <input type="text" class="form-control" ng-change="onReplyPriceInput($index)" ng-blur="onReplyPriceBlur($index)" ng-model="reply.price" placeholder="单价">
-                    <i class="fa fa-minus-circle" ng-if="inquiryItem.replies.length > 1" ng-click="setReplies('sub', $index)"></i>
-                    <i class="fa fa-plus-circle" ng-if="inquiryItem.replies.length < 5" ng-click="setReplies('add', $index)"></i>
+            <div class="content">
+                <div class="content-line">
+                    <div class="form-item form-left">
+                        <span><i>*</i>交期:</span>
+                        <!--
+                        <input type="text" class="form-control" placeholder="天数">
+                        -
+                        -->
+                        <input type="text" class="form-control" ng-change="onLeadtimeInput()" ng-blur="onLeadtimeBlur()" ng-model="inquiryItem.leadtime" placeholder="天数">
+                    </div>
+                    <div class="form-item form-upload">
+                        <!--
+                        <label>
+                            <span><i>+</i>添加附件</span>
+                            <input type="file" ng-model="myFiles">
+                        </label>
+                        -->
+                        <!--<div>
+                          <span>我是Excel的名字111</span>
+                          <i class="fa fa-times-circle"></i>
+                          <a href="">更换</a>
+                        </div>-->
+                    </div>
                 </div>
-            </div>
-            <!--
-            <div class="content-line">
-                <div class="form-item form-left">
-                    <span><i>*</i>价格梯度:</span>
-                    <input type="text" class="form-control" placeholder="数量">
-                    -
-                    <input type="text" class="form-control" placeholder="数量">
+                <div class="content-line" ng-repeat="reply in inquiryItem.replies track by $index">
+                    <div class="form-item form-left">
+                        <span><i>*</i>价格梯度:</span>
+                        <!--
+                        <input type="text" class="form-control" placeholder="数量">
+                        -
+                        -->
+                        <input type="text" class="form-control" ng-blur="onReplyLapQtyBlur($index)" ng-model="reply.lapQty" placeholder="数量">
+                    </div>
+                    <div class="form-item form-right">
+                        <span><i>*</i>单价<span ng-if="inquiryItem.currency" ng-bind="inquiryItem.currency == 'USD' ? '$' : '¥'"></span>:</span>
+                        <select ng-if="!inquiryItem.currency" ng-model="seekCurrency">
+                            <option value="RMB">¥</option>
+                            <option value="USD">$</option>
+                        </select>
+                        <input type="text" class="form-control" ng-change="onReplyPriceInput($index)" ng-blur="onReplyPriceBlur($index)" ng-model="reply.price" placeholder="单价">
+                        <i class="fa fa-minus-circle" ng-if="inquiryItem.replies.length > 1" ng-click="setReplies('sub', $index)"></i>
+                        <i class="fa fa-plus-circle" ng-if="inquiryItem.replies.length < 5" ng-click="setReplies('add', $index)"></i>
+                    </div>
                 </div>
-                <div class="form-item form-right">
-                    <span><i>*</i>单价($):</span>
-                    <input type="text" class="form-control" placeholder="单价" ng-model="reply.price">
-                    <i class="fa fa-minus-circle"></i>
-                    <i class="fa fa-plus-circle"></i>
+                <!--
+                <div class="content-line">
+                    <div class="form-item form-left">
+                        <span><i>*</i>价格梯度:</span>
+                        <input type="text" class="form-control" placeholder="数量">
+                        -
+                        <input type="text" class="form-control" placeholder="数量">
+                    </div>
+                    <div class="form-item form-right">
+                        <span><i>*</i>单价($):</span>
+                        <input type="text" class="form-control" placeholder="单价" ng-model="reply.price">
+                        <i class="fa fa-minus-circle"></i>
+                        <i class="fa fa-plus-circle"></i>
+                    </div>
                 </div>
+        -->
+            </div>
+            <div class="operate">
+                <span ng-click="saveOffer()">确定</span>
+                <span ng-click="setSeekActive(seek, false, index)">取消</span>
             </div>
-    -->
-        </div>
-        <div class="operate">
-            <span ng-click="saveOffer()">确定</span>
-            <span ng-click="setSeekActive(seek, false, index)">取消</span>
         </div>
     </div>
     <div class="com-mall-del-box link-saler-box" ng-if="linkBoxIndex > -1">