B2B商务修改样式页面完成

src/main/webapp/resources/js/index/app.js

@@ -6911,7 +6911,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             notice.send.code = $filter('date')(new Date(), 'yyMMddHHmmss-sss');
         };
         
-        // 获取token信息
+        // 获取token信息 并打开询价模态框
         $scope.getToken = function() {
     		token.info({userType: 'salenotice'}, {}, function(data) {
     			$scope.token = data.token;
@@ -22810,7 +22810,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
     /**
      * 针对卖家，已转询价的公共询价单列表
      */
-    app.controller('SalePubInquiryCtrl', ['$scope', '$filter', 'PubInquirySearchInfo', 'ngTableParams', 'toaster', 'BaseService', 'PubInquiryNoSearchInfo', '$upload', '$rootScope', 'token', '$timeout', 'CurrentRole', 'publicInquiry', function ($scope, $filter, PubInquirySearchInfo, ngTableParams, toaster, BaseService, PubInquiryNoSearchInfo, $upload, $rootScope, token, $timeout, CurrentRole, publicInquiry) {
+    app.controller('SalePubInquiryCtrl', ['$scope', '$filter', 'PubInquirySearchInfo', 'ngTableParams', 'toaster', 'BaseService', 'PubInquiryNoSearchInfo', '$upload', '$rootScope', 'token', '$timeout', 'CurrentRole', 'publicInquiry', '$modal', function ($scope, $filter, PubInquirySearchInfo, ngTableParams, toaster, BaseService, PubInquiryNoSearchInfo, $upload, $rootScope, token, $timeout, CurrentRole, publicInquiry, $modal) {
         BaseService.scrollBackToTop();
 
         // 获取当前用户是否为普通用户
@@ -23012,6 +23012,14 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             }, function(response) {
                 toaster.pop('error', '提示', response.data);
             });
+            $modal.open({
+                animation: true,
+                templateUrl: 'static/tpl/index/sale/modal/quote_inquiry.html',
+                controller: 'quoteInquiryCtrl',
+                resolve: {}
+            }).result.then(function (data) {
+
+            }, function () {})
         };
 
         $scope.deleteAttach = function (attaches, index) {
@@ -23732,6 +23740,11 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             })
         }
     }]);
+    /**
+     * 公共询价模态框
+     * **/
+    app.controller('quoteInquiryCtrl', ['$scope', '$stateParams', 'toaster', function ($scope, $stateParams, toaster) {
 
+    }])
     return app;
 });

src/main/webapp/resources/tpl/index/baseInfo/inquiryItem_detail.html

@@ -510,101 +510,254 @@ input[type="radio"], input[type="checkbox"] {
     }
 </style>
 
-<div class="ng-scope" style="width: 1170px; margin-left: -240px;">
-    <form name="tenderForm">
-        <div class="purc-tender">
-            <div class="pub-com_head">
-                <span>公共询价单</span>
-                <div class="p-right">
-                    <span class="fr"><em class="ng-binding">录入人：{{::inquiryItem.inquiry.recorder}}</em><time class="ng-binding">日期：{{::inquiryItem.inquiry.date | date :'yyyy-MM-dd HH:mm'}}</time></span>
-                </div>
-            </div>
-            <div class="tender-content ng-scope">
-                <div class="title-div" style="border-bottom: 1px dotted #327ebe;">
-                    <span>询价信息</span>&nbsp;
-                    <span style="color: rgb(211,37,38);">*</span>
-                </div>
-                <div class="row base-info">
-                    <div class = "col-xs-4">
-                        <div class="tender-desc">询价编号：</div>
-                        <div ng-bind="::inquiryItem.inquiry.code"></div>
-                    </div>
-                    <div class = "col-xs-4">
-                        <div class="tender-desc">询价企业：</div>
-                        <div ng-bind="::inquiryItem.inquiry.enterprise.enName"></div>
-                    </div>
-                    <div class = "col-xs-4">
-                        <div class="tender-desc">联系人：</div>
-                        <div ng-bind="::inquiryItem.inquiry.recorder"></div>
-                    </div>
-                    <div class = "col-xs-4">
-                        <div class="tender-desc">联系电话：</div>
-                        <div ng-bind="::inquiryItem.inquiry.userBaseInfo.userTel"></div>
-                    </div>
-                    <div class="col-xs-4">
-                        <span class="tender-desc">报价截止时间:</span>
-                        <div ng-bind="::inquiryItem.inquiry.endDate | date:'yyyy-MM-dd'"></div>
-                    </div>
-                    <div class="col-xs-4">
-                    </div>
-                    <div class="col-xs-12">
-                        <div class="tender-desc">附件：</div>
-                        <div ng-if="inquiryItem.inquiry.attachs" class="col-xs-10">
-                            <a class="file" ng-repeat="attach in inquiryItem.inquiry.attachs" href="file/{{attach.id}}">{{::attach.name}}</a>
-                        </div>
-                        <div ng-if="inquiryItem.inquiry.attachs == 0" class="col-xs-10" style="color: #959595;">无</div>
-                    </div>
-                </div>
-				<div class="title-div" style="border-bottom: 1px dotted #327ebe;">
-                    <span>物料信息</span>&nbsp;
-                    <span style="color: rgb(211,37,38);">*</span>
-                </div>
-                <div class="row base-info">
-                    <div class = "col-xs-4">
-                        <div class="tender-desc">原厂型号：</div>
-                        <div ng-bind="::inquiryItem.product.cmpCode"></div>
-                    </div>
-                    <div class = "col-xs-4">
-                        <div class="tender-desc">品牌：</div>
-                        <div ng-bind="::inquiryItem.product.brand"></div>
-                    </div>
-                    <div class = "col-xs-4">
-                        <div class="tender-desc">物料规格：</div>
-                        <div ng-bind="::inquiryItem.product.spec"></div>
-                    </div>
-                    <div class = "col-xs-4">
-                        <div class="tender-desc">物料名称：</div>
-                        <div ng-bind="::inquiryItem.product.title"></div>
-                    </div>
-                    <div class = "col-xs-4">
-                        <div class="tender-desc">单位：</div>
-                        <div ng-bind="::inquiryItem.product.unit"></div>
-                    </div>
-                    <div class="col-xs-4">
-                        <span class="tender-desc">数量:</span>
-                        <div ng-bind="::inquiryItem.needquantity"></div>
-                    </div>
-                   <!--  <div class="col-xs-4">
-                    	<span class="tender-desc">开始时间:</span>
-                        <div ng-bind="::inquiryItem.fromDate| date:'yyyy-MM-dd'"></div>
-                    </div>
-                    <div class="col-xs-4">
-                    	<span class="tender-desc">截止时间:</span>
-                        <div ng-bind="::inquiryItem.toDate| date:'yyyy-MM-dd'"></div>
-                    </div> -->
-                </div>
-                <div class="col-xs-12" style="padding: 50px 0;">
-                    <div ng-show="!currentHasBid" class="col-xs-2 pull-right btn-publish">
-                        <button class="btn" ng-click="transtoInquiry(inquiryItem.id)" ng-disabled="enterprise.uu == inquiryItem.inquiry.enterprise.uu || nowdate > inquiryItem.toDate" ng-hide="inquiryItem.overdue == 1" title="如果询价单已过期，将无法进入报价">我要报价</button>
-                    </div>
-                    <div class="col-xs-2 pull-right btn-disabled" ng-show="currentHasBid">
-                        <button class="btn" ng-disabled="disabled">已转报价</button>
-                    </div>
-                    <div class="pull-right a-detail" ng-show="currentHasBid">
-                        <a ui-sref="sale.pubinquiry_detail({id:id})" target="_self" title="点击查看详情">>>查看详情</a>
-                    </div>
-                </div>
-            </div>
+<!--<div class="ng-scope" style="width: 1170px; margin-left: -240px;">-->
+    <!--<form name="tenderForm">-->
+        <!--<div class="purc-tender">-->
+            <!--<div class="pub-com_head">-->
+                <!--<span>公共询价单</span>-->
+                <!--<div class="p-right">-->
+                    <!--<span class="fr"><em class="ng-binding">录入人：{{::inquiryItem.inquiry.recorder}}</em><time class="ng-binding">日期：{{::inquiryItem.inquiry.date | date :'yyyy-MM-dd HH:mm'}}</time></span>-->
+                <!--</div>-->
+            <!--</div>-->
+            <!--<div class="tender-content ng-scope">-->
+                <!--<div class="title-div" style="border-bottom: 1px dotted #327ebe;">-->
+                    <!--<span>询价信息</span>&nbsp;-->
+                    <!--<span style="color: rgb(211,37,38);">*</span>-->
+                <!--</div>-->
+                <!--<div class="row base-info">-->
+                    <!--<div class = "col-xs-4">-->
+                        <!--<div class="tender-desc">询价编号：</div>-->
+                        <!--<div ng-bind="::inquiryItem.inquiry.code"></div>-->
+                    <!--</div>-->
+                    <!--<div class = "col-xs-4">-->
+                        <!--<div class="tender-desc">询价企业：</div>-->
+                        <!--<div ng-bind="::inquiryItem.inquiry.enterprise.enName"></div>-->
+                    <!--</div>-->
+                    <!--<div class = "col-xs-4">-->
+                        <!--<div class="tender-desc">联系人：</div>-->
+                        <!--<div ng-bind="::inquiryItem.inquiry.recorder"></div>-->
+                    <!--</div>-->
+                    <!--<div class = "col-xs-4">-->
+                        <!--<div class="tender-desc">联系电话：</div>-->
+                        <!--<div ng-bind="::inquiryItem.inquiry.userBaseInfo.userTel"></div>-->
+                    <!--</div>-->
+                    <!--<div class="col-xs-4">-->
+                        <!--<span class="tender-desc">报价截止时间:</span>-->
+                        <!--<div ng-bind="::inquiryItem.inquiry.endDate | date:'yyyy-MM-dd'"></div>-->
+                    <!--</div>-->
+                    <!--<div class="col-xs-4">-->
+                    <!--</div>-->
+                    <!--<div class="col-xs-12">-->
+                        <!--<div class="tender-desc">附件：</div>-->
+                        <!--<div ng-if="inquiryItem.inquiry.attachs" class="col-xs-10">-->
+                            <!--<a class="file" ng-repeat="attach in inquiryItem.inquiry.attachs" href="file/{{attach.id}}">{{::attach.name}}</a>-->
+                        <!--</div>-->
+                        <!--<div ng-if="inquiryItem.inquiry.attachs == 0" class="col-xs-10" style="color: #959595;">无</div>-->
+                    <!--</div>-->
+                <!--</div>-->
+				<!--<div class="title-div" style="border-bottom: 1px dotted #327ebe;">-->
+                    <!--<span>物料信息</span>&nbsp;-->
+                    <!--<span style="color: rgb(211,37,38);">*</span>-->
+                <!--</div>-->
+                <!--<div class="row base-info">-->
+                    <!--<div class = "col-xs-4">-->
+                        <!--<div class="tender-desc">原厂型号：</div>-->
+                        <!--<div ng-bind="::inquiryItem.product.cmpCode"></div>-->
+                    <!--</div>-->
+                    <!--<div class = "col-xs-4">-->
+                        <!--<div class="tender-desc">品牌：</div>-->
+                        <!--<div ng-bind="::inquiryItem.product.brand"></div>-->
+                    <!--</div>-->
+                    <!--<div class = "col-xs-4">-->
+                        <!--<div class="tender-desc">物料规格：</div>-->
+                        <!--<div ng-bind="::inquiryItem.product.spec"></div>-->
+                    <!--</div>-->
+                    <!--<div class = "col-xs-4">-->
+                        <!--<div class="tender-desc">物料名称：</div>-->
+                        <!--<div ng-bind="::inquiryItem.product.title"></div>-->
+                    <!--</div>-->
+                    <!--<div class = "col-xs-4">-->
+                        <!--<div class="tender-desc">单位：</div>-->
+                        <!--<div ng-bind="::inquiryItem.product.unit"></div>-->
+                    <!--</div>-->
+                    <!--<div class="col-xs-4">-->
+                        <!--<span class="tender-desc">数量:</span>-->
+                        <!--<div ng-bind="::inquiryItem.needquantity"></div>-->
+                    <!--</div>-->
+                   <!--&lt;!&ndash;  <div class="col-xs-4">-->
+                    	<!--<span class="tender-desc">开始时间:</span>-->
+                        <!--<div ng-bind="::inquiryItem.fromDate| date:'yyyy-MM-dd'"></div>-->
+                    <!--</div>-->
+                    <!--<div class="col-xs-4">-->
+                    	<!--<span class="tender-desc">截止时间:</span>-->
+                        <!--<div ng-bind="::inquiryItem.toDate| date:'yyyy-MM-dd'"></div>-->
+                    <!--</div> &ndash;&gt;-->
+                <!--</div>-->
+                <!--<div class="col-xs-12" style="padding: 50px 0;">-->
+                    <!--<div ng-show="!currentHasBid" class="col-xs-2 pull-right btn-publish">-->
+                        <!--<button class="btn" ng-click="transtoInquiry(inquiryItem.id)" ng-disabled="enterprise.uu == inquiryItem.inquiry.enterprise.uu || nowdate > inquiryItem.toDate" ng-hide="inquiryItem.overdue == 1" title="如果询价单已过期，将无法进入报价">我要报价</button>-->
+                    <!--</div>-->
+                    <!--<div class="col-xs-2 pull-right btn-disabled" ng-show="currentHasBid">-->
+                        <!--<button class="btn" ng-disabled="disabled">已转报价</button>-->
+                    <!--</div>-->
+                    <!--<div class="pull-right a-detail" ng-show="currentHasBid">-->
+                        <!--<a ui-sref="sale.pubinquiry_detail({id:id})" target="_self" title="点击查看详情">>>查看详情</a>-->
+                    <!--</div>-->
+                <!--</div>-->
+            <!--</div>-->
+        <!--</div>-->
+    <!--</form>-->
+<!--</div>-->
+
+<style>
+    .detail{
+        width: 1170px;
+        margin-left: -240px;
+        background: #fff;
+        padding:30px 20px;
+    }
+    .detail .top{
+        position:relative;
+        margin-bottom:30px;
+    }
+    .detail .top h3{
+        font-size: 20px;
+        color:#54a9f0;
+        text-align: center;
+        margin:0;
+    }
+    .detail .top .top-right{
+        position:absolute;
+        top:3px;
+        right:0;
+        color:#999;
+    }
+    .detail .top .top-right span{
+        font-size:14px;
+        margin-left:10px;
+    }
+    .detail .top .top-right span em{
+        font-style:normal;
+    }
+    .detail .middle{
+        border-top:1px solid #e5e5e5;
+        padding-top:40px;
+    }
+    .detail .middle ul{}
+    .detail .middle ul li{
+        width:33%;
+        margin-bottom:50px;
+    }
+    .detail .middle ul li span{
+        color:#333;
+        margin-right:30px;
+        font-size: 14px;
+        font-weight: bold;
+    }
+    .detail .middle ul li em{
+        color:#999;
+        font-size: 14px;
+        font-style: normal;
+    }
+    .detail table{
+        border:1px solid #dcdcdc;
+    }
+    .detail table thead th{
+        background: #ebf5fe;
+        font-weight: bold;
+        font-size: 14px;
+        color:#333;
+        padding-left:10px;
+    }
+    .detail table thead th:before{
+        content:'';
+        display:inline-block;
+        position:relative;
+        left:-11px;
+        top:2px;
+        width:1px;
+        height:16px;
+        border-left: 1px solid #dcdcdc;
+    }
+    .detail table tr td{
+        padding-top:20px;
+        padding-bottom:30px;
+    }
+    .detail table td ul li{
+        padding-left:10px;
+    }
+    .detail table td a{
+        font-size: 14px;
+        color:#54a9f0;
+    }
+    .detail table td a:hover{
+        text-decoration: underline;
+        cursor:pointer;
+    }
+    .detail table td ul li p{}
+    .detail table td ul li p span{}
+    .detail table td ul li p span em{}
+    .detail .footer{
+        padding-top:20px;
+        text-align: center;
+    }
+    .detail .footer button{
+        background: #327ebe;
+        color:#fff;
+    }
+</style>
+<div class="detail">
+    <div class="top">
+        <h3>客户公共询价单</h3>
+        <div class="top-right">
+            <span>日期：<em>2017-11-11</em></span>
+            <span>报价单号：<em>2017-11-11</em></span>
         </div>
-    </form>
+    </div>
+    <div class="middle">
+        <ul class="list-inline">
+            <li>
+                <span>询价企业</span><em></em>
+            </li>
+            <li>
+                <span>联系人&nbsp;</span><em></em>
+            </li>
+            <li>
+                <span>联系电话</span><em></em>
+            </li>
+            <li>
+                <span>企业地址</span><em></em>
+            </li>
+            <li>
+                <span>报价截止</span><em></em>
+            </li>
+        </ul>
+    </div>
+    <table class="table">
+        <thead>
+        <tr>
+            <th>产品名称</th>
+            <th>产品型号</th>
+            <th>品牌</th>
+            <th>产品规格</th>
+            <th>单位</th>
+            <th>数量</th>
+            <th>图纸/备注</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr>
+            <td><em></em></td>
+            <td><em></em></td>
+            <td><em></em></td>
+            <td><em></em></td>
+            <td><em></em></td>
+            <td><em></em></td>
+            <td><em></em></td>
+        </tr>
+        </tbody>
+    </table>
+    <div class="footer">
+        <button class="btn">我要报价</button>
+    </div>
 </div>

src/main/webapp/resources/tpl/index/sale/modal/quote_inquiry.html

@@ -0,0 +1,232 @@
+<style>
+    .modal-dialog{
+        position: fixed;
+        top: 23%;
+        left: 50%;
+        margin: -150px 0 0 -195px;
+    }
+    .modal-content{
+        width: 700px;
+        min-height: 420px;
+    }
+    .modal-header {
+        width: 100%;
+        height: 39px;
+        text-align: left;
+        background: #fff;
+        border-top-left-radius: 6px;
+        border-top-right-radius: 6px;
+    }
+    .modal-header span{
+        padding-left: 18px;
+        font-size: 14px;
+        color: #323232;
+        font-weight: bold;
+    }
+    .modal-body{
+        padding:30px 25px 10px 25px;
+        margin-left: 15px;
+    }
+    .modal-add{
+        background: #f5f5f5;
+        margin-left: 0;
+        padding: 20px 20px 20px 40px;
+    }
+    .modal-add i{
+        position: absolute;
+        top: 4px;
+        right: 0;
+        display: block;
+        width: 30px;
+        text-align: center;
+        height: 30px;
+        line-height: 30px;
+        font-size: 20px;
+    }
+    .modal-body .modal-file{
+        margin-left:-15px;
+    }
+    .modal-body .modal-file span{
+        font-size: 14px;
+        color:#999;
+    }
+    .modal-body .modal-file a{
+        color:#5078Cb;
+    }
+    .modal-body .modal-file a:hover{
+        cursor:pointer;
+        text-decoration: underline;
+    }
+    .modal-body .form-horizontal{
+        padding-left:0;
+    }
+    .modal-body .form-group{
+        margin:0 0 15px 0;
+    }
+    .modal-body .control-label{
+        text-align:left;
+        padding:0;
+        padding-top:7px;
+    }
+    .modal-body .bottom{
+        padding-top:10px;
+    }
+    .modal-body .bottom a{
+        display:inline-block;
+        color:#5078Cb;
+        font-size: 14px;
+        margin-bottom:15px;
+        text-decoration: none;
+    }
+    .modal-body .bottom a:hover{
+        cursor:pointer;
+        text-decoration: underline;
+    }
+    .modal-body .bottom a i{
+        margin-right:10px;
+    }
+    .modal-footer{
+        border-top: none;
+    }
+    .modal-footer button{
+        display: inline-block;
+        width: 80px;
+        height: 32px;
+        font-size: 14px;
+        background: #fff;
+        color:#5078Cb;
+        text-align: center;
+        text-decoration: none;
+        border-radius: 4px;
+        border:1px solid #5078Cb;
+        outline: none;
+        margin-right: 10px;
+    }
+    .modal-footer button:last-child{
+        background: #fff;
+        border:1px solid #d2d2d2;
+        color:#666;
+    }
+    .modal-footer button:hover{
+        background: #3578ba;
+        color:#fff;
+        border:1px solid #5078Cb;
+    }
+    .modal-footer span{
+        color:#999;
+        margin-right:10px;
+    }
+</style>
+<div class="modal-header">
+    <span>报价详情</span>
+</div>
+<div class="modal-body">
+    <div class="row">
+        <div class="col-xs-6 form-horizontal">
+            <div class="form-group">
+                <label for="inputEmail3" class="col-xs-4 control-label">最小订购</label>
+                <div class="col-xs-8">
+                    <input type="text" class="form-control" id="inputEmail3" placeholder="1000">
+                </div>
+            </div>
+        </div>
+        <div class="col-xs-6 form-horizontal">
+            <div class="form-group">
+                <label for="inputEmail1" class="col-xs-4 control-label">最小包装</label>
+                <div class="col-xs-8">
+                    <input type="text" class="form-control" id="inputEmail1" placeholder="1000">
+                </div>
+            </div>
+        </div>
+        <div class="col-xs-6 form-horizontal">
+            <div class="form-group">
+                <label for="inputEmail2" class="col-xs-4 control-label">交货周期（天）</label>
+                <div class="col-xs-8">
+                    <input type="text" class="form-control" id="inputEmail2" placeholder="20">
+                </div>
+            </div>
+        </div>
+        <div class="col-xs-6 form-horizontal">
+            <div class="form-group">
+                <label class="col-xs-4 control-label">币种（选择）</label>
+                <div class="col-xs-8">
+                    <select name="" id="" class="form-control">
+                        <option value="">RMB</option>
+                        <option value="">YEN</option>
+                    </select>
+                </div>
+            </div>
+        </div>
+        <div class="col-xs-6 form-horizontal">
+            <div class="form-group">
+                <label for="inputEmail4" class="col-xs-4 control-label">税率（%）</label>
+                <div class="col-xs-8">
+                    <input type="text" class="form-control" id="inputEmail4" placeholder="10">
+                </div>
+            </div>
+        </div>
+        <div class="col-xs-6 form-horizontal">
+            <div class="form-group">
+                <label for="inputEmail5" class="col-xs-4 control-label">供应商型号</label>
+                <div class="col-xs-8">
+                    <input type="text" class="form-control" id="inputEmail5" placeholder="1000">
+                </div>
+            </div>
+        </div>
+        <div class="col-xs-6 form-horizontal">
+            <div class="form-group">
+                <label for="inputEmail6" class="col-xs-4 control-label">分段数量</label>
+                <div class="col-xs-8">
+                    <input type="text" class="form-control" id="inputEmail6">
+                </div>
+            </div>
+        </div>
+        <div class="col-xs-6 form-horizontal">
+            <div class="form-group">
+                <label for="inputEmail7" class="col-xs-4 control-label">价格</label>
+                <div class="col-xs-8">
+                    <input type="text" class="form-control" id="inputEmail7">
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="modal-body modal-add">
+    <div class="row" >
+        <div style="position:relative;" ng-repeat="">
+            <i class="fa fa-trash"></i>
+            <div class="col-xs-6 form-horizontal">
+                <div class="form-group">
+                    <label for="inputNum1" class="col-xs-4 control-label">分段数量</label>
+                    <div class="col-xs-8">
+                        <input type="text" class="form-control" id="inputNum1">
+                    </div>
+                </div>
+            </div>
+            <div class="col-xs-6 form-horizontal">
+                <div class="form-group">
+                    <label for="inputNum2" class="col-xs-4 control-label">价格</label>
+                    <div class="col-xs-8">
+                        <input type="text" class="form-control" id="inputNum2">
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="modal-file">
+        <span>附件：</span><a href="javascript:void(0)">1651656.pdf</a>
+    </div>
+</div>
+<div class="modal-body">
+    <div class="bottom">
+        <a href=""><i class="fa fa-plus"></i>增加分段数量和分段报价</a>
+        <br/>
+        <a href=""><i class="fa fa-plus"></i>添加附件</a>
+    </div>
+</div>
+<div class="modal-footer">
+    <span>确认报价后，将无法修改</span>
+    <button >确认报价</button>
+    <button >保存</button>
+    <button >取消</button>
+</div>

src/main/webapp/resources/tpl/index/sale/pubinquiry.html

@@ -87,6 +87,28 @@
 	.order-table .order-bd .product {
 		padding-left: 20px;
 	}
+	.order-table .order-bd .product .dropdown-toggle{
+		position:relative;
+		display:inline-block;
+	}
+	.order-table .order-bd .product .dropdown-toggle:hover{
+		text-decoration: none;
+		color:#327ebe;
+		cursor:pointer;
+	}
+	.order-table .order-bd .product .dropdown-toggle i{
+		position:relative;
+		top:-3px;
+		color:#c8c8c8;
+	}
+	.order-table .order-bd .product .dropdown-toggle:hover i{
+		text-decoration: none;
+		color:#000;
+	}
+	.order-table .order-bd .product .dropdown-toggle:hover .dropdown-menu{
+		display:block;
+		margin:0;
+	}
 
 	.input-xs,.input-group-xs>.form-control,.input-group-xs>.input-group-addon,.input-group-xs>.input-group-btn>.btn
 	{
@@ -247,22 +269,20 @@
 	<table class="order-table block" ng-table="tableParams">
 		<thead>
 		<tr class="header">
-			<th>产品</th>
-			<th width="60">单位</th>
-			<th width="110"><span class="text-default">≥</span>分段数</th>
+			<th>产品型号</th>
+			<th width="160">品牌</th>
+			<th width="110">分段数量</th>
 			<th width="90">价格</th>
-			<th width="80">最小订购</th>
-			<th width="80">最小包装</th>
-			<th width="120">有效期</th>
+			<th width="160">最小订购/包装</th>
 			<th width="75">操作</th>
 		</tr>
 		<tr class="sep-row">
-			<td colspan="7"></td>
+			<td colspan="6"></td>
 		</tr>
 		</thead>
 		<tbody ng-if="tableParams.total() == 0">
 		<tr>
-			<td colspan="7">
+			<td colspan="6">
 				<div class="row text-muted info-container" style="padding: 50px 10px;">
 					<div class="col-md-4 text-center">
 						<br>
@@ -297,24 +317,18 @@
 		</tbody>
 		<tbody ng-repeat="inquiryItem in $data track by inquiryItem.id">
 		<tr class="order-hd">
-			<td class="first" colspan="4">
+			<td class="first" colspan="2">
 				<div class="order-main">
-						<!--<span> <input type="checkbox" class="selector"
-									  ng-model="inquiryItem.$selected">
-						</span> -->
-					<a href="javascript:void(0)" ng-if="!isUnread(inquiryItem.id)">
-						<i class="fa fa-circle-thin"></i>
-					</a>
-					<a href="javascript:void(0)" ng-if="isUnread(inquiryItem.id)">
-						<i class="fa fa-circle" style="color: #f40;"></i>
-					</a>
-					&nbsp;&nbsp;<span class="text-num text-bold" title="{{inquiryItem.inquiry.date}}"
-									  ng-bind="::inquiryItem.inquiry.date | date:'yyyy-MM-dd'"></span>
-					<span
-							ng-bind="::inquiryItem.inquiry.enterprise.enName"></span>
-					<span>流水号：<a title="查看详情"
-						class="text-num order-detail" ng-bind="::inquiryItem.inquiry.code" ui-sref="sale.pubinquiry_detail({id:inquiryItem.inquiry.id})" target="_self"
-						ng-click="setOrdersRead(inquiryItem.id)"></a>
+					<span class="text-num text-bold" title="{{inquiryItem.inquiry.date}}"
+						  ng-bind="::inquiryItem.inquiry.date | date:'yyyy-MM-dd'"></span>
+					<span ng-bind="::inquiryItem.inquiry.enterprise.enName"></span>
+					<span>流水号：
+						<a title="查看详情"
+						   class="text-num order-detail"
+						   ng-bind="::inquiryItem.inquiry.code"
+						   ui-sref="sale.pubinquiry_detail({id:inquiryItem.inquiry.id})"
+						   target="_self"
+						   ng-click="setOrdersRead(inquiryItem.id)"></a>
 					</span>
 				</div>
 			</td>
@@ -322,69 +336,36 @@
 				币别：<span ng-bind="::(isUser?'-':inquiryItem.currency)"></span>
 			</td>
 			<td>
-				税率：<input  type="text" ng-pattern="/^\+?[1-9]\d*$/" ng-model="inquiryItem.taxrate" style="width: 25px" ng-readonly="!inquiryItem.$editing">%
+				税率：<span>17</span>%
 			</td>
-			<td class="text-right" colspan="1" class="order-sum">
+			<td class="text-right" colspan="2" class="order-sum">
 				<div ng-if="inquiryItem.replyable">
 					<span class="text-inverse text-bold" ng-bind="::inquiryItem.inquiry.endDate | timespan"></span>
-					<span class="text-muted">后截止报价</span>
-				</div>
-			</td>
-			<td class="text-center">
-				<div class="">
-					类型： <span ng-bind="::inquiryItem.inquiry.inquirytype || '无'"></span>
+					<span class="text-muted" style="margin-right:35px;">后截止报价</span>
 				</div>
 			</td>
 		</tr>
 		<tr class="order-bd">
 			<td class="product">
-				<div class="text-num text-bold" ng-bind="::inquiryItem.product.code"></div>
-				<div ng-bind="::inquiryItem.product.title"></div>
-				<div class="text-muted" ng-bind="::inquiryItem.product.spec"></div>
-				<div ng-if="::inquiryItem.brand && !inquiryItem.$editing" class="text-muted">
-					品牌：<span ng-bind="::inquiryItem.brand"></span>
-				</div>
-				<div ng-if="::inquiryItem.vendorprodcode && !inquiryItem.$editing" class="text-muted">
-					供应商物料编号：<span ng-bind="::inquiryItem.vendorprodcode"></span>
-				</div>
-				<div ng-if="::inquiryItem.needquantity" class="text-num text-bold">
-					需求数量：<span ng-bind="::inquiryItem.needquantity"></span>
-				</div>
-				<div ng-show="inquiryItem.remark">
-					备注：{{::inquiryItem.remark}}
-				</div>
-				<div ng-if="inquiryItem.inquiry.attachs.length" class="text-muted">
-					<i class="fa fa-paperclip fa-fw" style="color: #ffa340; font-size: 18px;"></i>附件：<a class="file" ng-repeat="attach in inquiryItem.inquiry.attachs" href="file/{{attach.id}}">{{::attach.name}}</a>
-				</div>
-				<div ng-if="inquiryItem.attaches.length" class="text-muted">
-					<i class="fa fa-paperclip fa-fw" style="color: #ffa340; font-size: 18px;"></i>报价附件：
-					<div ng-repeat="attach in inquiryItem.attaches">
-						<a class="file" href="file/{{attach.id}}">{{::attach.name}}&nbsp;</a>
-						<a ng-show="inquiryItem.$editing" ng-click="deleteAttach(inquiryItem.attaches, $index)" title="删除附件"><i class="fa fa-trash-o fa-lg"></i></a>
-					</div>
-				</div>
-				<div class="form-group" ng-if="inquiryItem.$editing" style="width: 180px;">
-					<input type="text" class="form-control input-xs"
-						   ng-model="inquiryItem.brand" placeholder="物料品牌">
-				</div>
-				<div class="form-group" ng-if="inquiryItem.$editing" style="width: 180px;">
-					<input type="text" class="form-control input-xs"
-						   ng-model="inquiryItem.vendorprodcode" placeholder="供应商物料编号">
-				</div>
-				<div class="form-group" ng-if="inquiryItem.$editing" style="width: 220px;">
-					<input type="text" class="form-control input-xs" ng-change="verify(inquiryItem.leadtime,'leadtime')" ng-pattern="/^\+?[1-9]\d*$/"
-						   ng-model="inquiryItem.leadtime" placeholder="交货周期(确切天数)" style="display: inline-block;width: 180px;">
-					<span ng-if="!inquiryItem.leadtime" class="text-inverse"> 必填*</span>
-					<div style="margin-left: 50px;"class="text-bold text-inverse" ng-show="!leadtimeVerify">请填数字!</div>
-				</div>
-				<div class="input-group form-group" ng-if="inquiryItem.$editing" style="width: 300px;">
-					<div class="input-group-addon">上传附件：</div>
-					<input type="file" ng-model="inquiryItem.myFiles" ng-file-select
-						   ng-multiple="false" class="form-control input-sm input-group" name="file">
+				<div class="text-num text-bold">
+					<a class="dropdown-toggle"
+					   ng-mouseover="getHistory(inquiryItem)">
+						<span ng-bind="::inquiryItem.product.code"></span>
+						<i class="fa fa-fw fa-sort-desc"></i>
+						<div class="dropdown-menu pane" style="width: 270px;">
+							<div class="pane-body">
+								<ul class="list-unstyled list-menu">
+									<li ng-repeat="historyItem in ::inquiryItem.history">{{historyItem}}</li>
+								</ul>
+								<div ng-show="!inquiryItem.history || inquiryItem.history.length == 0"
+									 class="text-center text-muted">暂无产品信息</div>
+							</div>
+						</div>
+					</a>
 				</div>
 			</td>
 			<td class="text-center">
-				<span ng-bind="::inquiryItem.product.unit"></span>
+				<span ng-bind="::inquiryItem.brand"></span>
 			</td>
 			<td class="text-center">
 				<div ng-show="!inquiryItem.$editing">
@@ -392,104 +373,22 @@
 						<span ng-bind="reply.lapQty"></span>
 					</div>
 				</div>
-				<div style="margin: 0 auto;" ng-if="inquiryItem.$editing">
-					<div ng-repeat="reply in inquiryItem.replies">
-						<div class="form-group input-group input-group-xs">
-							<input type="text" class="form-control input-xs" ng-class="{'input-error': !replylapQtys[$index]}"  ng-change="verifylapQty(reply.lapQty,$index, inquiryItem)"
-								   ng-model="reply.lapQty" min="{{$index == 0 ? 0 :(inquiryItem.replies[$index - 1].lapQty + 1)}}" ng-pattern="/^\+?[1-9]\d*$/"
-								   ng-Readonly="$index == 0"  placeholder="数量" />
-								   <span class="input-group-btn" ng-show="$index != 0">
-									<button class="btn btn-default" type="button"
-											ng-click="removeStep(inquiryItem, $index)">
-										<i class="fa fa-trash-o"></i>
-									</button>
-								</span>
-						</div>
-						<div class="text-bold text-inverse" style="margin-top:-15px" ng-show="!replylapQtys[$index]">分段数量递增!</div>
-					</div>
-					<a ng-click="addStep(inquiryItem)" class="btn btn-default btn-xs"
-					   ng-show="!inquiryItem.custLap">添加分段</a>
-				</div>
 			</td>
-			<td class="text-center br-l">
+			<td class="text-center">
 				<div ng-show="!inquiryItem.$editing">
 					<div ng-repeat="reply in inquiryItem.replies">
-						<span ng-bind="isUser?'':(reply.price | number:6)"></span> <span
-							ng-show="reply.price == null || isUser" class="text-muted">-</span>
-					</div>
-					<div class="dropdown">
-						<a href="javascript:void(0);" class="dropdown-toggle text-default"
-						   ng-mouseover="getHistory(inquiryItem)">历史报价<i
-								class="fa fa-fw fa-angle-down"></i></a>
-						<div class="dropdown-menu pane" style="width: 270px;">
-							<div class="pane-body">
-								<ul class="list-unstyled list-menu">
-									<li ng-repeat="historyItem in ::inquiryItem.history">
-										<div ng-class="{'text-inverse': $index==0}">
-											<div class="row row-sm"
-												 ng-repeat="historyReply in historyItem.replies">
-												<div class="col-xs-5">≥{{historyReply.lapQty}}</div>
-												<div class="col-xs-5">价格{{historyReply.price | number:6}}</div>
-											</div>
-										</div>
-										<div class="text-muted">{{historyItem.inquiry.date |
-											date:'yyyy-MM-dd'}}{{historyItem.inquiry.enterprise.enName}}
-										</div>
-									</li>
-								</ul>
-								<div ng-show="!inquiryItem.history || inquiryItem.history.length == 0"
-										class="text-center text-muted">暂无历史报价</div>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div style="margin: 0 auto;" ng-if="inquiryItem.$editing">
-					<div ng-repeat="reply in inquiryItem.replies">
-						<div class="form-group">
-							<input type="text" class="form-control input-xs " ng-class="{'input-error': !replyPrices[$index]}" ng-model="reply.price"
-								   ng-change="verify(reply.price,$index)" placeholder="单价(必填)" ng-init="reply.price = isUser?'-':reply.price"/>
-							<div class="text-bold text-inverse" style="margin-bottom:-15px" ng-show="!replyPrices[$index]">请填数字!</div>
-						</div>
+						<span ng-bind="isUser?'':(reply.price | number:6)"></span>
+						<span ng-show="reply.price == null || isUser" class="text-muted">-</span>
 					</div>
 				</div>
 			</td>
-			<td class="text-center br-l">
-				<div ng-show="!inquiryItem.$editing">
-					<span ng-bind="inquiryItem.minOrderQty"></span> <span
-						ng-show="inquiryItem.minOrderQty == null" class="text-muted">-</span>
-				</div>
-				<div ng-if="inquiryItem.$editing">
-					<input type="text" class="form-control input-xs" ng-change="verify(inquiryItem.minOrderQty,'minOrderQty')"
-						   ng-class="{'input-error': !minOrderQtyVerify}" ng-model="inquiryItem.minOrderQty" placeholder="最小订购" >
-					<div class="text-bold text-inverse" ng-show="!minOrderQtyVerify">请填数字!</div>
-				</div>
-			</td>
-			<td class="text-center br-l">
+			<td class="text-center">
 				<div ng-show="!inquiryItem.$editing">
-					<span ng-bind="inquiryItem.minPackQty"></span> <span
-						ng-show="inquiryItem.minPackQty == null" class="text-muted">-</span>
-				</div>
-				<div ng-if="inquiryItem.$editing">
-					<input type="text" class="form-control input-xs"
-						   ng-model="inquiryItem.minPackQty" placeholder="最小包装"
-						   ng-change="verify(inquiryItem.minPackQty,'minPackQty')" ng-class="{'input-error': !minPackQtyVerify}" >
-					<div class="text-bold text-inverse" ng-show="!minPackQtyVerify">请填数字!</div>
+					<span ng-bind="inquiryItem.minOrderQty ? inquiryItem.minOrderQty : '-'"></span> /
+					<span ng-bind="inquiryItem.minPackQty ? inquiryItem.minPackQty : '-'"></span>
 				</div>
 			</td>
-			<td class="text-center br-l">
-				<div ng-init="parseDate(inquiryItem)">
-					<div ng-show="inquiryItem.toDate">
-						<span class="text-muted">从 </span><span
-							ng-bind="inquiryItem.fromDate | date:'yyyy-MM-dd'"></span> <span
-							class="text-muted">到 </span><span
-							ng-bind="inquiryItem.toDate | date:'yyyy-MM-dd'"></span>
-					</div>
-					<div ng-show="!inquiryItem.toDate">
-						<span class="text-muted">-</span>
-					</div>
-				</div>
-			</td>
-			<td class="text-center br-l">
+			<td class="text-center">
 				<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == null && inquiryItem.invalid != 1" class="block">
 					<span class="text-trans warning">已报价</span>
 					<div ng-if="inquiryItem.inquiry.overdue == 0 && inquiryItem.inquiry.check != 1" style="padding-top: 50px;">
@@ -526,24 +425,24 @@
 				<div ng-if="inquiryItem.status == 200">
 					<div ng-if="inquiryItem.inquiry.overdue == 0 && inquiryItem.inquiry.check != 1">
 						<div ng-show="!inquiryItem.$editing">
-							<a ng-click="inquiryItem.$editing=!inquiryItem.$editing; getToken()">报 价</a>
+							<a ng-click="getToken()">报 价</a>
 						</div>
-						<div ng-show="inquiryItem.$editing">
-							<div>
-								<a ng-click="inquiryItem.$editing=!inquiryItem.$editing; cancel()">取消</a>
-							</div>
-							<div>
-								<button ng-click="onReplyClick(inquiryItem);setOrdersRead(inquiryItem.id)"
-										ng-disabled="!isValid(inquiryItem)"
-										class="btn btn-link btn-xs text-default">保存</button>
-							</div>
-							<div>
-								<button ng-click="onReplyClick(inquiryItem, true);setOrdersRead(inquiryItem.id)"
-										ng-disabled="!isValid(inquiryItem, true)"
-										class="btn btn-link btn-xs text-inverse">
-									保存并<br>确认报价
-								</button>
-							</div>
+						<!--<div ng-show="inquiryItem.$editing">-->
+							<!--<div>-->
+								<!--<a ng-click="inquiryItem.$editing=!inquiryItem.$editing; cancel()">取消</a>-->
+							<!--</div>-->
+							<!--<div>-->
+								<!--<button ng-click="onReplyClick(inquiryItem);setOrdersRead(inquiryItem.id)"-->
+										<!--ng-disabled="!isValid(inquiryItem)"-->
+										<!--class="btn btn-link btn-xs text-default">保存</button>-->
+							<!--</div>-->
+							<!--<div>-->
+								<!--<button ng-click="onReplyClick(inquiryItem, true);setOrdersRead(inquiryItem.id)"-->
+										<!--ng-disabled="!isValid(inquiryItem, true)"-->
+										<!--class="btn btn-link btn-xs text-inverse">-->
+									<!--保存并<br>确认报价-->
+								<!--</button>-->
+							<!--</div>-->
 						</div>
 					</div>
 					<div ng-if="inquiryItem.inquiry.overdue == 0 && inquiryItem.inquiry.check == 1">
@@ -558,4 +457,294 @@
 		</tr>
 		</tbody>
 	</table>
+	<!--<table class="order-table block" ng-table="tableParams">-->
+		<!--<thead>-->
+		<!--<tr class="header">-->
+			<!--<th>产品</th>-->
+			<!--<th width="60">单位</th>-->
+			<!--<th width="110"><span class="text-default">≥</span>分段数</th>-->
+			<!--<th width="90">价格</th>-->
+			<!--<th width="80">最小订购</th>-->
+			<!--<th width="80">最小包装</th>-->
+			<!--<th width="120">有效期</th>-->
+			<!--<th width="75">操作</th>-->
+		<!--</tr>-->
+		<!--<tr class="sep-row">-->
+			<!--<td colspan="7"></td>-->
+		<!--</tr>-->
+		<!--</thead>-->
+		<!--<tbody ng-if="tableParams.total() == 0">-->
+		<!--<tr>-->
+			<!--<td colspan="7">-->
+				<!--<div class="row text-muted info-container" style="padding: 50px 10px;">-->
+					<!--<div class="col-md-4 text-center">-->
+						<!--<br>-->
+						<!--<br>-->
+						<!--<div><img src="static/img/all/info.png" width="130px" height="90px"></div>-->
+						<!--<div class="f16">当前没有对应的客户询价单！</div>-->
+					<!--</div>-->
+					<!--<div class="col-md-8 br-l">-->
+						<!--<div class="f16">-->
+							<!--<p>为什么我没有接收到客户的询价单？</p>-->
+						<!--</div>-->
+						<!--<div class="f14">-->
+							<!--<div class="info">-->
+								<!--<p>1、您的客户还没有提交审核询价单<br>-->
+									<!--解决：与您的客户沟通确认单据是否已经审核（只有客户ERP中已经审核的单据才能接收到）</p>-->
+							<!--</div>-->
+							<!--<div class="info">-->
+								<!--<p>2、客户ERP中供应商信息有误<br>-->
+									<!--解决：与您的客户沟通确认您的信息在客户的供应商资料中是否维护正确，尤其是企业UU号</p>-->
+							<!--</div>-->
+							<!--<div class="info">-->
+								<!--<p>3、您的客户正在使用旧版本的UAS商务平台<br>-->
+									<!--解决：我们仍有部分用户在使用旧版本UAS商务平台系统，你可以用您的企业UU号和管理员个人UU号 <a href="http://www.usoftchina.com" class="text-bold text-link" title="http://www.usoftchina.com" target="_blank">登陆旧版本UAS商务平台</a></p>-->
+							<!--</div>-->
+						<!--</div>-->
+						<!--<br>-->
+						<!--<br>-->
+					<!--</div>-->
+				<!--</div>-->
+			<!--</td>-->
+		<!--</tr>-->
+		<!--</tbody>-->
+		<!--<tbody ng-repeat="inquiryItem in $data track by inquiryItem.id">-->
+		<!--<tr class="order-hd">-->
+			<!--<td class="first" colspan="4">-->
+				<!--<div class="order-main">-->
+						<!--&lt;!&ndash;<span> <input type="checkbox" class="selector"-->
+									  <!--ng-model="inquiryItem.$selected">-->
+						<!--</span> &ndash;&gt;-->
+					<!--<a href="javascript:void(0)" ng-if="!isUnread(inquiryItem.id)">-->
+						<!--<i class="fa fa-circle-thin"></i>-->
+					<!--</a>-->
+					<!--<a href="javascript:void(0)" ng-if="isUnread(inquiryItem.id)">-->
+						<!--<i class="fa fa-circle" style="color: #f40;"></i>-->
+					<!--</a>-->
+					<!--&nbsp;&nbsp;<span class="text-num text-bold" title="{{inquiryItem.inquiry.date}}"-->
+									  <!--ng-bind="::inquiryItem.inquiry.date | date:'yyyy-MM-dd'"></span>-->
+					<!--<span-->
+							<!--ng-bind="::inquiryItem.inquiry.enterprise.enName"></span>-->
+					<!--<span>流水号：<a title="查看详情"-->
+						<!--class="text-num order-detail" ng-bind="::inquiryItem.inquiry.code" ui-sref="sale.pubinquiry_detail({id:inquiryItem.inquiry.id})" target="_self"-->
+						<!--ng-click="setOrdersRead(inquiryItem.id)"></a>-->
+					<!--</span>-->
+				<!--</div>-->
+			<!--</td>-->
+			<!--<td>-->
+				<!--币别：<span ng-bind="::(isUser?'-':inquiryItem.currency)"></span>-->
+			<!--</td>-->
+			<!--<td>-->
+				<!--税率：<input  type="text" ng-pattern="/^\+?[1-9]\d*$/" ng-model="inquiryItem.taxrate" style="width: 25px" ng-readonly="!inquiryItem.$editing">%-->
+			<!--</td>-->
+			<!--<td class="text-right" colspan="1" class="order-sum">-->
+				<!--<div ng-if="inquiryItem.replyable">-->
+					<!--<span class="text-inverse text-bold" ng-bind="::inquiryItem.inquiry.endDate | timespan"></span>-->
+					<!--<span class="text-muted">后截止报价</span>-->
+				<!--</div>-->
+			<!--</td>-->
+			<!--<td class="text-center">-->
+				<!--<div class="">-->
+					<!--类型： <span ng-bind="::inquiryItem.inquiry.inquirytype || '无'"></span>-->
+				<!--</div>-->
+			<!--</td>-->
+		<!--</tr>-->
+		<!--<tr class="order-bd">-->
+			<!--<td class="product">-->
+				<!--<div class="text-num text-bold" ng-bind="::inquiryItem.product.code"></div>-->
+				<!--<div ng-bind="::inquiryItem.product.title"></div>-->
+				<!--<div class="text-muted" ng-bind="::inquiryItem.product.spec"></div>-->
+				<!--<div ng-if="::inquiryItem.brand && !inquiryItem.$editing" class="text-muted">-->
+					<!--品牌：<span ng-bind="::inquiryItem.brand"></span>-->
+				<!--</div>-->
+				<!--<div ng-if="::inquiryItem.vendorprodcode && !inquiryItem.$editing" class="text-muted">-->
+					<!--供应商物料编号：<span ng-bind="::inquiryItem.vendorprodcode"></span>-->
+				<!--</div>-->
+				<!--<div ng-if="::inquiryItem.needquantity" class="text-num text-bold">-->
+					<!--需求数量：<span ng-bind="::inquiryItem.needquantity"></span>-->
+				<!--</div>-->
+				<!--<div ng-show="inquiryItem.remark">-->
+					<!--备注：{{::inquiryItem.remark}}-->
+				<!--</div>-->
+				<!--<div ng-if="inquiryItem.inquiry.attachs.length" class="text-muted">-->
+					<!--<i class="fa fa-paperclip fa-fw" style="color: #ffa340; font-size: 18px;"></i>附件：<a class="file" ng-repeat="attach in inquiryItem.inquiry.attachs" href="file/{{attach.id}}">{{::attach.name}}</a>-->
+				<!--</div>-->
+				<!--<div ng-if="inquiryItem.attaches.length" class="text-muted">-->
+					<!--<i class="fa fa-paperclip fa-fw" style="color: #ffa340; font-size: 18px;"></i>报价附件：-->
+					<!--<div ng-repeat="attach in inquiryItem.attaches">-->
+						<!--<a class="file" href="file/{{attach.id}}">{{::attach.name}}&nbsp;</a>-->
+						<!--<a ng-show="inquiryItem.$editing" ng-click="deleteAttach(inquiryItem.attaches, $index)" title="删除附件"><i class="fa fa-trash-o fa-lg"></i></a>-->
+					<!--</div>-->
+				<!--</div>-->
+				<!--<div class="form-group" ng-if="inquiryItem.$editing" style="width: 180px;">-->
+					<!--<input type="text" class="form-control input-xs"-->
+						   <!--ng-model="inquiryItem.brand" placeholder="物料品牌">-->
+				<!--</div>-->
+				<!--<div class="form-group" ng-if="inquiryItem.$editing" style="width: 180px;">-->
+					<!--<input type="text" class="form-control input-xs"-->
+						   <!--ng-model="inquiryItem.vendorprodcode" placeholder="供应商物料编号">-->
+				<!--</div>-->
+				<!--<div class="form-group" ng-if="inquiryItem.$editing" style="width: 220px;">-->
+					<!--<input type="text" class="form-control input-xs" ng-change="verify(inquiryItem.leadtime,'leadtime')" ng-pattern="/^\+?[1-9]\d*$/"-->
+						   <!--ng-model="inquiryItem.leadtime" placeholder="交货周期(确切天数)" style="display: inline-block;width: 180px;">-->
+					<!--<span ng-if="!inquiryItem.leadtime" class="text-inverse"> 必填*</span>-->
+					<!--<div style="margin-left: 50px;"class="text-bold text-inverse" ng-show="!leadtimeVerify">请填数字!</div>-->
+				<!--</div>-->
+				<!--<div class="input-group form-group" ng-if="inquiryItem.$editing" style="width: 300px;">-->
+					<!--<div class="input-group-addon">上传附件：</div>-->
+					<!--<input type="file" ng-model="inquiryItem.myFiles" ng-file-select-->
+						   <!--ng-multiple="false" class="form-control input-sm input-group" name="file">-->
+				<!--</div>-->
+			<!--</td>-->
+			<!--<td class="text-center">-->
+				<!--<span ng-bind="::inquiryItem.product.unit"></span>-->
+			<!--</td>-->
+			<!--<td class="text-center">-->
+				<!--<div ng-show="!inquiryItem.$editing">-->
+					<!--<div ng-repeat="reply in inquiryItem.replies">-->
+						<!--<span ng-bind="reply.lapQty"></span>-->
+					<!--</div>-->
+				<!--</div>-->
+				<!--<div style="margin: 0 auto;" ng-if="inquiryItem.$editing">-->
+					<!--<div ng-repeat="reply in inquiryItem.replies">-->
+						<!--<div class="form-group input-group input-group-xs">-->
+							<!--<input type="text" class="form-control input-xs" ng-class="{'input-error': !replylapQtys[$index]}"  ng-change="verifylapQty(reply.lapQty,$index, inquiryItem)"-->
+								   <!--ng-model="reply.lapQty" min="{{$index == 0 ? 0 :(inquiryItem.replies[$index - 1].lapQty + 1)}}" ng-pattern="/^\+?[1-9]\d*$/"-->
+								   <!--ng-Readonly="$index == 0"  placeholder="数量" />-->
+								   <!--<span class="input-group-btn" ng-show="$index != 0">-->
+									<!--<button class="btn btn-default" type="button"-->
+											<!--ng-click="removeStep(inquiryItem, $index)">-->
+										<!--<i class="fa fa-trash-o"></i>-->
+									<!--</button>-->
+								<!--</span>-->
+						<!--</div>-->
+						<!--<div class="text-bold text-inverse" style="margin-top:-15px" ng-show="!replylapQtys[$index]">分段数量递增!</div>-->
+					<!--</div>-->
+					<!--<a ng-click="addStep(inquiryItem)" class="btn btn-default btn-xs"-->
+					   <!--ng-show="!inquiryItem.custLap">添加分段</a>-->
+				<!--</div>-->
+			<!--</td>-->
+			<!--<td class="text-center br-l">-->
+				<!--<div ng-show="!inquiryItem.$editing">-->
+					<!--<div ng-repeat="reply in inquiryItem.replies">-->
+						<!--<span ng-bind="isUser?'':(reply.price | number:6)"></span> <span-->
+							<!--ng-show="reply.price == null || isUser" class="text-muted">-</span>-->
+					<!--</div>-->
+
+				<!--</div>-->
+				<!--<div style="margin: 0 auto;" ng-if="inquiryItem.$editing">-->
+					<!--<div ng-repeat="reply in inquiryItem.replies">-->
+						<!--<div class="form-group">-->
+							<!--<input type="text" class="form-control input-xs " ng-class="{'input-error': !replyPrices[$index]}" ng-model="reply.price"-->
+								   <!--ng-change="verify(reply.price,$index)" placeholder="单价(必填)" ng-init="reply.price = isUser?'-':reply.price"/>-->
+							<!--<div class="text-bold text-inverse" style="margin-bottom:-15px" ng-show="!replyPrices[$index]">请填数字!</div>-->
+						<!--</div>-->
+					<!--</div>-->
+				<!--</div>-->
+			<!--</td>-->
+			<!--<td class="text-center br-l">-->
+				<!--<div ng-show="!inquiryItem.$editing">-->
+					<!--<span ng-bind="inquiryItem.minOrderQty"></span> <span-->
+						<!--ng-show="inquiryItem.minOrderQty == null" class="text-muted">-</span>-->
+				<!--</div>-->
+				<!--<div ng-if="inquiryItem.$editing">-->
+					<!--<input type="text" class="form-control input-xs" ng-change="verify(inquiryItem.minOrderQty,'minOrderQty')"-->
+						   <!--ng-class="{'input-error': !minOrderQtyVerify}" ng-model="inquiryItem.minOrderQty" placeholder="最小订购" >-->
+					<!--<div class="text-bold text-inverse" ng-show="!minOrderQtyVerify">请填数字!</div>-->
+				<!--</div>-->
+			<!--</td>-->
+			<!--<td class="text-center br-l">-->
+				<!--<div ng-show="!inquiryItem.$editing">-->
+					<!--<span ng-bind="inquiryItem.minPackQty"></span> <span-->
+						<!--ng-show="inquiryItem.minPackQty == null" class="text-muted">-</span>-->
+				<!--</div>-->
+				<!--<div ng-if="inquiryItem.$editing">-->
+					<!--<input type="text" class="form-control input-xs"-->
+						   <!--ng-model="inquiryItem.minPackQty" placeholder="最小包装"-->
+						   <!--ng-change="verify(inquiryItem.minPackQty,'minPackQty')" ng-class="{'input-error': !minPackQtyVerify}" >-->
+					<!--<div class="text-bold text-inverse" ng-show="!minPackQtyVerify">请填数字!</div>-->
+				<!--</div>-->
+			<!--</td>-->
+			<!--<td class="text-center br-l">-->
+				<!--<div ng-init="parseDate(inquiryItem)">-->
+					<!--<div ng-show="inquiryItem.toDate">-->
+						<!--<span class="text-muted">从 </span><span-->
+							<!--ng-bind="inquiryItem.fromDate | date:'yyyy-MM-dd'"></span> <span-->
+							<!--class="text-muted">到 </span><span-->
+							<!--ng-bind="inquiryItem.toDate | date:'yyyy-MM-dd'"></span>-->
+					<!--</div>-->
+					<!--<div ng-show="!inquiryItem.toDate">-->
+						<!--<span class="text-muted">-</span>-->
+					<!--</div>-->
+				<!--</div>-->
+			<!--</td>-->
+			<!--<td class="text-center br-l">-->
+				<!--<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == null && inquiryItem.invalid != 1" class="block">-->
+					<!--<span class="text-trans warning">已报价</span>-->
+					<!--<div ng-if="inquiryItem.inquiry.overdue == 0 && inquiryItem.inquiry.check != 1" style="padding-top: 50px;">-->
+						<!--<div ng-show="!inquiryItem.$editing && inquiryItem.replyable">-->
+							<!--<a ng-click="inquiryItem.$editing=!inquiryItem.$editing;  getToken();">修改报价</a>-->
+						<!--</div>-->
+						<!--<div ng-show="inquiryItem.$editing">-->
+							<!--<div>-->
+								<!--<a ng-click="inquiryItem.$editing=!inquiryItem.$editing; cancel()">取消</a>-->
+							<!--</div>-->
+							<!--<div>-->
+								<!--<button ng-click="onReplyClick(inquiryItem, true);setOrdersRead(inquiryItem.id)"-->
+										<!--ng-disabled="!isValid(inquiryItem, true)"-->
+										<!--class="btn btn-link btn-xs text-inverse">-->
+									<!--保存并<br>确认报价-->
+								<!--</button>-->
+							<!--</div>-->
+						<!--</div>-->
+					<!--</div>-->
+					<!--<div ng-if="inquiryItem.inquiry.check == 1" class="text-muted" style="padding-top: 50px;">客户正在<br>审批...</div>-->
+				<!--</div>-->
+				<!--<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == 1 && inquiryItem.invalid != 1" class="block">-->
+					<!--<span class="text-trans success">已采纳</span>-->
+				<!--</div>-->
+				<!--<div ng-if="inquiryItem.status == 201 && inquiryItem.invalid == 1" class="block">-->
+					<!--<span class="text-trans text-light">已失效</span>-->
+				<!--</div>-->
+				<!--<div ng-if="inquiryItem.status == 314" class="block">-->
+					<!--<span class="text-trans text-light">已作废</span>-->
+				<!--</div>-->
+				<!--<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == 0" class="block">-->
+					<!--<span class="text-trans error">未采纳</span>-->
+				<!--</div>-->
+				<!--<div ng-if="inquiryItem.status == 200">-->
+					<!--<div ng-if="inquiryItem.inquiry.overdue == 0 && inquiryItem.inquiry.check != 1">-->
+						<!--<div ng-show="!inquiryItem.$editing">-->
+							<!--<a ng-click="inquiryItem.$editing=!inquiryItem.$editing; getToken()">报 价</a>-->
+						<!--</div>-->
+						<!--<div ng-show="inquiryItem.$editing">-->
+							<!--<div>-->
+								<!--<a ng-click="inquiryItem.$editing=!inquiryItem.$editing; cancel()">取消</a>-->
+							<!--</div>-->
+							<!--<div>-->
+								<!--<button ng-click="onReplyClick(inquiryItem);setOrdersRead(inquiryItem.id)"-->
+										<!--ng-disabled="!isValid(inquiryItem)"-->
+										<!--class="btn btn-link btn-xs text-default">保存</button>-->
+							<!--</div>-->
+							<!--<div>-->
+								<!--<button ng-click="onReplyClick(inquiryItem, true);setOrdersRead(inquiryItem.id)"-->
+										<!--ng-disabled="!isValid(inquiryItem, true)"-->
+										<!--class="btn btn-link btn-xs text-inverse">-->
+									<!--保存并<br>确认报价-->
+								<!--</button>-->
+							<!--</div>-->
+						<!--</div>-->
+					<!--</div>-->
+					<!--<div ng-if="inquiryItem.inquiry.overdue == 0 && inquiryItem.inquiry.check == 1">-->
+						<!--<span class="text-trans half">未报价</span>-->
+						<!--<div class="text-muted" style="padding-top: 50px;">询价单已<br>被提交...</div>-->
+					<!--</div>-->
+					<!--<div ng-if="inquiryItem.inquiry.overdue == 1" class="block">-->
+						<!--<span class="text-trans error">已过期</span>-->
+					<!--</div>-->
+				<!--</div>-->
+			<!--</td>-->
+		<!--</tr>-->
+		<!--</tbody>-->
+	<!--</table>-->
 </div>

src/main/webapp/resources/tpl/index/sale/pubinquiry_detail.html

@@ -1,591 +1,192 @@
 <style>
-	#order-detail-list .table-default tbody tr td{
-		vertical-align: top;
-	}
-	.pub-com_head span.fr {
-		margin-right: 20px;
-		color: #959595;
-		float: right;
-	}
-	.pub-com_head span.fr em {
-		margin-right: 50px;
-		font-size: 14px;
-		font-style: inherit;
-	}
+.detail{
+	background: #fff;
+	padding:30px 20px;
+}
+.detail .top{
+	position:relative;
+	margin-bottom:30px;
+}
+.detail .top h3{
+	font-size: 20px;
+	color:#54a9f0;
+	text-align: center;
+	margin:0;
+}
+.detail .top .top-right{
+	position:absolute;
+	top:3px;
+	right:0;
+	color:#999;
+}
+.detail .top .top-right span{
+	font-size:14px;
+	margin-left:10px;
+}
+.detail .top .top-right span em{
+	font-style:normal;
+}
+.detail .middle{
+	border-top:1px solid #e5e5e5;
+	padding-top:40px;
+}
+.detail .middle ul{}
+.detail .middle ul li{
+	width:33%;
+	margin-bottom:50px;
+}
+.detail .middle ul li span{
+	color:#333;
+	margin-right:30px;
+	font-size: 14px;
+	font-weight: bold;
+}
+.detail .middle ul li em{
+	color:#999;
+	font-size: 14px;
+	font-style: normal;
+}
+.detail table{
+	border:1px solid #dcdcdc;
+}
+.detail table thead th{
+	background: #ebf5fe;
+	font-weight: bold;
+	font-size: 14px;
+	color:#333;
+	padding-left:10px;
+}
+.detail table thead th:before{
+	content:'';
+	display:inline-block;
+	position:relative;
+	left:-11px;
+	top:2px;
+	width:1px;
+	height:16px;
+	border-left: 1px solid #dcdcdc;
+}
+.detail table tr td{
+	padding-top:20px;
+	padding-bottom:30px;
+}
+.detail table td ul li{
+	padding-left:10px;
+}
+.detail table td a{
+	font-size: 14px;
+	color:#54a9f0;
+}
+.detail table td a:hover{
+	text-decoration: underline;
+	cursor:pointer;
+}
+.detail table td ul li p{}
+.detail table td ul li p span{}
+.detail table td ul li p span em{}
+.detail table td .info{
+	display:inline-block;
+	position:relative;
+	color:#999;
+}
+.detail table td .info:hover >span{
+	color:#54a9f0;
+}
+.detail table td .info:hover >i{
+	color:#54a9f0;
+}
+.detail table td .info:hover .modal-content{
+	display:block;
+}
+.detail table td .info .modal-content{
+	display:none;
+	position:absolute;
+	top:100%;
+	left:0;
+	margin:0;
+	padding:10px;
+}
+.detail table td .info .modal-content ul{}
+.detail table td .info .modal-content ul li{}
+.detail table td .info .modal-content ul li span{
+	font-size: 14px;
+	color:#333;
+}
+.detail table td .info .modal-content ul li span em{
+	font-size: 14px;
+	color:#999;
+}
 </style>
-<div class="pane base-info" id="order-detail-list">
-	<div class="pub-com_head">
-		<span>客户公共询价单</span>
-		<span class="fr"><em>制单人：{{inquiry.recorder}}</em><time>制单日期：{{inquiry.date | date:'yyyy-MM-dd'}}</time></span>
-	</div>
-	<div class="pane-body">
-		<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
-			<span class="f14">单据信息</span>
-		</div>
-		<div class="row row-sm item">
-			<div class="col-xs-3">
-				<span class="title">流水号：</span>
-				<div class="content" ng-bind="::inquiry.code"></div>
-			</div>
-			<div class="col-xs-6">
-				<span class="title">客户：</span>
-				<div class="content" ng-bind="::inquiry.enterprise.enName"></div>
-			</div>
-			<div class="col-xs-3">
-				<span class="title">截止报价：</span>
-				<div class="content" ng-bind="::inquiry.endDate | date:'yyyy-MM-dd'"></div>
-			</div>
-		</div>
-		<div class="row row-sm item">
-			<div class="col-xs-12">
-				<div class="title">收货地址：</div>
-				<div class="unchanged-info">{{inquiry.ship}}</div>
-			</div>
-		</div>
-		<!--<div class="row row-sm item">
-			<div class="col-xs-3">
-				<span class="title">审核人：</span>
-				<div class="content" ng-bind="::inquiry.auditor"></div>
-			</div>
-			<div class="col-xs-3">
-				<span class="title">环保要求：</span>
-				<div class="content" ng-bind="::inquiry.environment"></div>
-			</div>
-			<div class="col-xs-6">
-				<span class="title">价格种类：</span>
-				<div class="content" ng-bind="::inquiry.priceType"></div>
-			</div>
-		</div>-->
-		<div class="row row-sm item">
-			<div class="col-xs-6">
-				<div class="title">发票类型：</div>
-				<div class="unchanged-info" ng-if="inquiry.invoice == 2">增值税专用发票</div>
-				<div class="unchanged-info" ng-if="inquiry.invoice == 1">增值税普通发票</div>
-				<div class="unchanged-info" ng-if="inquiry.invoice == 0">不需要发票</div>
-			</div>
-			<div class="col-xs-6">
-				<span class="title">询价类型：</span>
-				<div class="content" ng-bind="::inquiry.inquirytype"></div>
-			</div>
-		</div>
-		<div class="row row-sm item">
-			<div class="col-xs-6">
-				<span class="title">备注：</span>
-				<div class="content" ng-bind="::inquiry.remark"></div>
-			</div>
-		</div>
-		<div class="headerline" ng-if="inquiry.attachs.length">
-			<span class="content">附件</span>
-		</div>
-		<div class="row row-sm attach" ng-if="inquiry.attachs.length">
-			<div class="col-xs-3 item" ng-repeat="file in inquiry.attachs">
-				<div class="bg">
-					<div class="global_icon larger icon_undefined_l"
-						ng-class="{'icon_pdf_l': file.type == 'pdf','icon_xls_l': file.type == 'xls' || file.type == 'xlsx' || file.type == 'et', 'icon_doc_l': file.type == 'doc' || file.type == 'docx', 'icon_txt_l': file.type == 'txt', 'icon_zip_l': file.type == 'zip' || file.type == 'rar', 'icon_image_l': file.type == 'png' || file.type == 'jpg' || file.type == 'jpeg' || file.type == 'bmp'|| file.type == 'gif'}"></div>
-				</div>
-				<div class="title" ng-bind="::file.name"></div>
-				<div class="download">
-					<a href="file/{{file.id}}">下载</a>
-				</div>
-			</div>
-		</div>
-		<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
-			<span class="f14">产品价格详情</span>&nbsp;
-		</div>
-		<div class="block">
-			<table class="block table table-default table-striped" style=" margin-bottom: 0">
-				<thead>
-					<tr class="header">
-						<th width="60">序号</th>
-						<th width="130">产品</th>
-						<th width="60">单位</th>
-						<th width="90"><span class="text-default">≥</span>分段数</th>
-						<th width="120">价格</th>
-						<th width="50">币别</th>
-						<th width="60">税率</th>
-						<th width="90">最小订购</th>
-						<th width="90">最小包装</th>
-						<th width="120">有效期</th>
-						<th width="80">操作</th>
-					</tr>
-				</thead>
-				<tbody ng-repeat="inquiryItem in newinquiryItems | orderBy:'number'" ng-class="{'scoroll':order.orderItems.length>10}">
-				<tr>
-					<td>
-						<!-- <div ng-bind="::inquiryItem.number">
-                        </div> -->
-						{{$index + 1}}
-					</td>
-					<td>
-						<div class="text-num text-bold"
-							 ng-bind="::inquiryItem.product.code"></div>
-						<div ng-bind="::inquiryItem.product.title"></div>
-						<div class="text-muted" ng-bind="::inquiryItem.product.spec"></div>
-						<div ng-if="::inquiryItem.needquantity" class="text-num text-bold">
-							需求数量：<span ng-bind="::inquiryItem.needquantity"></span>
-						</div>
-						<div ng-show="inquiryItem.remark">
-							备注：{{::inquiryItem.remark}}
-						</div>
-						<div ng-if="inquiryItem.attaches.length" class="text-muted">
-							<i class="fa fa-paperclip fa-fw" style="color: #ffa340; font-size: 18px;"></i>报价附件：
-							<div ng-repeat="attach in inquiryItem.attaches">
-								<a class="file" href="file/{{attach.id}}">{{::attach.name}}&nbsp;</a>
-								<a ng-show="inquiryItem.$editing" ng-click="deleteAttach(inquiryItem.attaches, $index)" title="删除附件"><i class="fa fa-trash-o fa-lg"></i></a>
-							</div>
-						</div>
-						<div class="form-group" ng-if="inquiryItem.$editing"
-							 style="width: 150px;">
-							<input type="text" class="form-control input-xs"
-								   ng-model="inquiryItem.brand" placeholder="物料品牌">
-						</div>
-						<div class="form-group" ng-if="inquiryItem.$editing"
-							 style="width: 150px;">
-							<input type="text" class="form-control input-xs"
-								   ng-model="inquiryItem.vendorprodcode" placeholder="供应商物料编号">
-						</div>
-						<div class="form-group" ng-if="inquiryItem.$editing" style="width: 150px;">
-							<input type="text" class="form-control input-xs" ng-change="verify(inquiryItem.leadtime,'leadtime')" ng-pattern="/^\+?[1-9]\d*$/"
-								   ng-model="inquiryItem.leadtime" placeholder="交货周期(确切天数)" style="display: inline-block;width: 150px;">
-							<span ng-if="!inquiryItem.leadtime" class="text-inverse"> 必填*</span>
-							<div style="margin-left: 50px;" class="text-bold text-inverse" ng-show="!leadtimeVerify">请填数字!</div>
-						</div>
-						<div class="input-group form-group" ng-if="inquiryItem.$editing" style="width: 100%;
-    margin-bottom: 0;position: relative;top: -14px;">
-							<div class="input-group-addon">上传附件：</div>
-							<input type="file" ng-model="inquiryItem.myFiles" ng-file-select
-								   ng-multiple="false" class="form-control input-sm input-group" name="file" style="width: 200px;    line-height: 29px;">
-						</div>
-					</td>
-					<td class="text-center">
-						<span ng-bind="::inquiryItem.product.unit"></span>
-					</td>
-					<td class="text-center">
-						<div ng-show="!inquiryItem.$editing">
-							<div ng-repeat="reply in inquiryItem.replies">
-								<span ng-bind="reply.lapQty"></span>
-							</div>
-						</div>
-						<div style="margin: 0 auto;" ng-if="inquiryItem.$editing">
-							<div ng-repeat="reply in inquiryItem.replies">
-								<div class="form-group input-group input-group-xs">
-									<input type="text" class="form-control input-xs" ng-change="verifylapQty(reply.lapQty,$index, inquiryItem)"
-										   ng-model="reply.lapQty" min="{{$index == 0 ? 0 :(inquiryItem.replies[$index - 1].lapQty + 1)}}"
-										   ng-Readonly="$index == 0"  placeholder="数量" />
-									<span class="input-group-btn" ng-show="$index != 0">
-											<button class="btn btn-default" type="button"
-													ng-click="removeStep(inquiryItem, $index)">
-												<i class="fa fa-trash-o"></i>
-											</button>
-										</span>
-								</div>
-								<div class="text-bold text-inverse" style="margin-top:-15px" ng-show="!replylapQtys[$index]">分段数递增!</div>
-							</div>
-							<a ng-click="addStep(inquiryItem)" class="btn btn-default btn-xs"
-							   ng-show="!inquiryItem.custLap">添加分段</a>
-						</div>
-					</td>
-					<td class="text-center br-l">
-						<div ng-show="!inquiryItem.$editing">
-							<div ng-repeat="reply in inquiryItem.replies">
-								<span ng-if="!isUser" ng-bind="reply.price | number:6"></span> <span
-									ng-show="reply.price == null || isUser" class="text-muted">-</span>
-							</div>
-							<div class="dropdown">
-								<a href="javascript:void(0);" class="dropdown-toggle text-default"
-								   ng-mouseover="getHistory(inquiryItem)">历史报价<i
-										class="fa fa-fw fa-angle-down"></i></a>
-								<div class="dropdown-menu pane" style="width: 270px;">
-									<div class="pane-body">
-										<ul class="list-unstyled list-menu">
-											<li ng-repeat="historyItem in ::inquiryItem.history">
-												<div ng-class="{'text-inverse': $index==0}">
-													<div class="row row-sm"
-														 ng-repeat="historyReply in historyItem.replies">
-														<div class="col-xs-5">≥{{historyReply.lapQty}}</div>
-														<div class="col-xs-5">价格{{historyReply.price | number:6}}</div>
-													</div>
-												</div>
-												<div class="text-muted">{{historyItem.inquiry.date |
-													date:'yyyy-MM-dd'}}{{historyItem.inquiry.enterprise.enName}}
-												</div>
-											</li>
-										</ul>
-										<div ng-show="!inquiryItem.history || inquiryItem.history.length == 0"
-											 class="text-center text-muted">暂无历史报价</div>
-									</div>
-								</div>
-							</div>
-						</div>
-						<div style="margin: 0 auto;" ng-if="inquiryItem.$editing">
-							<div ng-repeat="reply in inquiryItem.replies">
-								<div class="form-group">
-									<input type="text" class="form-control input-xs " ng-class="{'input-error': !replyPrices[$index]}" ng-model="reply.price"
-										   ng-change="verify(reply.price,$index)" placeholder="单价(必填)" ng-init="reply.price = isUser?'-':reply.price"  />
-									<div class="text-bold text-inverse" style="margin-bottom:-15px" ng-show="!replyPrices[$index]">请填数字!</div>
-								</div>
-							</div>
-						</div>
-					</td>
-					<td class="text-center" ng-bind="::inquiryItem.currency"></td>
-					<td class="text-center">
-						<input type="text" ng-pattern="/^\+?[1-9]\d*$/" ng-model="inquiryItem.taxrate" style="width: 25px" ng-readonly="!inquiryItem.$editing">%</td>
-					<td class="text-center">
-						<div ng-show="!inquiryItem.$editing">
-							<span ng-bind="inquiryItem.minOrderQty"></span> <span
-								ng-show="inquiryItem.minOrderQty == null" class="text-muted">-</span>
-						</div>
-						<div ng-if="inquiryItem.$editing">
-							<input type="text" class="form-control input-xs" ng-change="verify(inquiryItem.minOrderQty,'minOrderQty')"
-								   ng-model="inquiryItem.minOrderQty" placeholder="最小订购">
-						</div>
-					</td>
-					<td class="text-center">
-						<div ng-show="!inquiryItem.$editing">
-							<span ng-bind="inquiryItem.minPackQty"></span> <span
-								ng-show="inquiryItem.minPackQty == null" class="text-muted">-</span>
-						</div>
-						<div ng-if="inquiryItem.$editing">
-							<input type="text" class="form-control input-xs" ng-change="verify(inquiryItem.minPackQty,'minPackQty')"
-								   ng-model="inquiryItem.minPackQty" placeholder="最小包装">
-						</div>
-					</td>
-					<td class="text-center">
-                        <div ng-init="parseDate(inquiryItem)">
-                            <div ng-show="inquiryItem.toDate">
-                                <span class="text-muted">从 </span><span
-                                    ng-bind="inquiryItem.fromDate | date:'yyyy-MM-dd'"></span> <span
-                                    class="text-muted">到 </span><span
-                                    ng-bind="inquiryItem.toDate | date:'yyyy-MM-dd'"></span>
-                            </div>
-                            <div ng-show="!inquiryItem.toDate">
-                                <span class="text-muted">-</span>
-                            </div>
-                        </div>
-					</td>
-					<td class="text-center">
-						<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == null && inquiryItem.invalid != 1" class="block">
-							<span class="text-trans warning">已报价</span>
-							<div ng-if="inquiryItem.inquiry.overdue == 0 && inquiryItem.inquiry.check != 1" style="padding-top: 50px;">
-								<div ng-show="!inquiryItem.$editing && inquiryItem.replyable">
-									<a ng-click="inquiryItem.$editing=!inquiryItem.$editing;getToken()">修改报价</a>
-								</div>
-								<div ng-show="inquiryItem.$editing">
-									<div>
-										<a ng-click="inquiryItem.$editing=!inquiryItem.$editing; cancel()">取消</a>
-									</div>
-									<div>
-										<button ng-click="onReplyClick(inquiryItem, true)"
-												ng-disabled="!isValid(inquiryItem, true)"
-												class="btn btn-link btn-xs text-inverse">
-											保存并<br>确认报价
-										</button>
-									</div>
-								</div>
-							</div>
-							<div ng-if="inquiryItem.inquiry.check == 1" class="text-muted" style="padding-top: 50px;">客户正在<br>审批...</div>
-						</div>
-						<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == 1 && inquiryItem.invalid != 1" class="block">
-							<span class="text-trans success">已采纳</span>
-						</div>
-						<div ng-if="inquiryItem.status == 201 && inquiryItem.invalid == 1" class="block">
-							<span class="text-trans text-light">已失效</span>
-						</div>
-						<div ng-if="inquiryItem.status == 314" class="block">
-							<span class="text-trans text-light">已作废</span>
-						</div>
-						<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == 0" class="block">
-							<span class="text-trans error">未采纳</span>
-						</div>
-						<div ng-if="inquiryItem.status == 200">
-							<div ng-if="inquiryItem.inquiry.overdue == 0 && inquiryItem.inquiry.check != 1">
-								<div ng-show="!inquiryItem.$editing">
-									<a ng-click="inquiryItem.$editing=!inquiryItem.$editing;getToken()">报 价</a>
-								</div>
-								<div ng-show="inquiryItem.$editing">
-									<div>
-										<a ng-click="inquiryItem.$editing=!inquiryItem.$editing; cancel()">取消</a>
-									</div>
-									<div>
-										<button ng-click="onReplyClick(inquiryItem)"
-												ng-disabled="!isValid(inquiryItem)"
-												class="btn btn-link btn-xs text-default">保存</button>
-									</div>
-									<div>
-										<button ng-click="onReplyClick(inquiryItem, true)"
-												ng-disabled="!isValid(inquiryItem, true)"
-												class="btn btn-link btn-xs text-inverse">
-											保存并<br>确认报价
-										</button>
-									</div>
-								</div>
-							</div>
-							<div ng-if="inquiryItem.inquiry.overdue == 0 && inquiryItem.inquiry.check == 1">
-								<span class="text-trans half">未报价</span>
-								<div class="text-muted" style="padding-top: 50px;">询价单已<br>被提交...</div>
-							</div>
-							<div ng-if="inquiryItem.inquiry.overdue == 1" class="block">
-								<span class="text-trans error">已过期</span>
-							</div>
-						</div>
-					</td>
-				</tr>
-				</tbody>
-			</table>
-			<!--<table class="block table table-default table-striped">-->
-				<!--<tbody>-->
-					<!--<tr-->
-						<!--ng-repeat="inquiryItem in newinquiryItems | orderBy:'number'" ng-class="{'scoroll':order.orderItems.length>10}">-->
-						<!--<td width="40">-->
-							<!--&lt;!&ndash; <div ng-bind="::inquiryItem.number">-->
-							<!--</div> &ndash;&gt;-->
-							<!--{{$index + 1}}-->
-						<!--</td>-->
-						<!--<td width="200">-->
-							<!--<div class="text-num text-bold"-->
-								<!--ng-bind="::inquiryItem.product.code"></div>-->
-							<!--<div ng-bind="::inquiryItem.product.title"></div>-->
-							<!--<div class="text-muted" ng-bind="::inquiryItem.product.spec"></div>-->
-							<!--<div ng-if="::inquiryItem.needquantity" class="text-num text-bold">-->
-								<!--需求数量：<span ng-bind="::inquiryItem.needquantity"></span>-->
-							<!--</div>-->
-							<!--<div ng-show="inquiryItem.remark">-->
-								<!--备注：{{::inquiryItem.remark}}-->
-							<!--</div>-->
-							<!--<div ng-if="inquiryItem.attaches.length && !inquiryItem.$editing" class="text-muted">-->
-								<!--附件：<a class="file" ng-repeat="attach in inquiryItem.attaches" href="file/{{attach.id}}">{{::attach.name}}</a>-->
-							<!--</div>-->
-							<!--<div class="form-group" ng-if="inquiryItem.$editing"-->
-								<!--style="width: 180px;">-->
-								<!--<input type="text" class="form-control input-xs"-->
-									<!--ng-model="inquiryItem.brand" placeholder="物料品牌">-->
-							<!--</div>-->
-							<!--<div class="form-group" ng-if="inquiryItem.$editing"-->
-								<!--style="width: 180px;">-->
-								<!--<input type="text" class="form-control input-xs"-->
-									<!--ng-model="inquiryItem.vendorprodcode" placeholder="供应商物料编号">-->
-							<!--</div>-->
-							<!--<div class="form-group" ng-if="inquiryItem.$editing" style="width: 220px;">-->
-								<!--<input type="text" class="form-control input-xs" ng-change="verify(inquiryItem.leadtime,'leadtime')" ng-pattern="/^\+?[1-9]\d*$/"-->
-									   <!--ng-model="inquiryItem.leadtime" placeholder="交货周期(确切天数)" style="display: inline-block;width: 180px;">-->
-								<!--<span ng-if="!inquiryItem.leadtime" class="text-inverse"> 必填*</span>-->
-								<!--<div style="margin-left: 50px;" class="text-bold text-inverse" ng-show="!leadtimeVerify">请填数字!</div>-->
-							<!--</div>-->
-							<!--<div class="input-group form-group" ng-if="inquiryItem.$editing && !inquiryItem.attaches.length" style="width: 300px;">-->
-								<!--<div class="input-group-addon">上传附件：</div>-->
-								<!--<input type="file" ng-model="inquiryItem.myFiles" ng-file-select-->
-									   <!--ng-multiple="false" class="form-control input-sm input-group" name="file">-->
-							<!--</div>-->
-						<!--</td>-->
-						<!--<td class="text-center" width="40">-->
-							<!--<span ng-bind="::inquiryItem.product.unit"></span>-->
-						<!--</td>-->
-						<!--<td class="text-center" width="90">-->
-							<!--<div ng-show="!inquiryItem.$editing">-->
-								<!--<div ng-repeat="reply in inquiryItem.replies">-->
-									<!--<span ng-bind="reply.lapQty"></span>-->
-								<!--</div>-->
-							<!--</div>-->
-							<!--<div style="margin: 0 auto;" ng-if="inquiryItem.$editing">-->
-								<!--<div ng-repeat="reply in inquiryItem.replies">-->
-									<!--<div class="form-group input-group input-group-xs">-->
-										<!--<input type="text" class="form-control input-xs" ng-change="verifylapQty(reply.lapQty,$index, inquiryItem)"-->
-											   <!--ng-model="reply.lapQty" min="{{$index == 0 ? 0 :(inquiryItem.replies[$index - 1].lapQty + 1)}}"-->
-											   <!--ng-Readonly="$index == 0"  placeholder="数量" />-->
-										<!--<span class="input-group-btn" ng-show="$index != 0">-->
-											<!--<button class="btn btn-default" type="button"-->
-													<!--ng-click="removeStep(inquiryItem, $index)">-->
-												<!--<i class="fa fa-trash-o"></i>-->
-											<!--</button>-->
-										<!--</span>-->
-									<!--</div>-->
-									<!--<div class="text-bold text-inverse" style="margin-top:-15px" ng-show="!replylapQtys[$index]">分段数递增!</div>-->
-								<!--</div>-->
-								<!--<a ng-click="addStep(inquiryItem)" class="btn btn-default btn-xs"-->
-								   <!--ng-show="!inquiryItem.custLap">添加分段</a>-->
-							<!--</div>-->
-						<!--</td>-->
-						<!--<td class="text-center br-l" width="100">-->
-							<!--<div ng-show="!inquiryItem.$editing">-->
-								<!--<div ng-repeat="reply in inquiryItem.replies">-->
-									<!--<span ng-bind="reply.price | number:6"></span> <span-->
-										<!--ng-show="reply.price == null" class="text-muted">-</span>-->
-								<!--</div>-->
-								<!--<div class="dropdown">-->
-									<!--<a href="javascript:void(0);" class="dropdown-toggle text-default"-->
-									   <!--ng-mouseover="getHistory(inquiryItem)">历史报价<i-->
-											<!--class="fa fa-fw fa-angle-down"></i></a>-->
-									<!--<div class="dropdown-menu pane" style="width: 270px;">-->
-										<!--<div class="pane-body">-->
-											<!--<ul class="list-unstyled list-menu">-->
-												<!--<li ng-repeat="historyItem in ::inquiryItem.history">-->
-													<!--<div ng-class="{'text-inverse': $index==0}">-->
-														<!--<div class="row row-sm"-->
-															 <!--ng-repeat="historyReply in historyItem.replies">-->
-															<!--<div class="col-xs-5">≥{{historyReply.lapQty}}</div>-->
-															<!--<div class="col-xs-5">价格{{historyReply.price | number:6}}</div>-->
-														<!--</div>-->
-													<!--</div>-->
-													<!--<div class="text-muted">{{historyItem.inquiry.date |-->
-														<!--date:'yyyy-MM-dd'}}{{historyItem.inquiry.enterprise.enName}}-->
-													<!--</div>-->
-												<!--</li>-->
-											<!--</ul>-->
-											<!--<div ng-show="!inquiryItem.history || inquiryItem.history.length == 0"-->
-												 <!--class="text-center text-muted">暂无历史报价</div>-->
-										<!--</div>-->
-									<!--</div>-->
-								<!--</div>-->
-							<!--</div>-->
-							<!--<div style="margin: 0 auto;" ng-if="inquiryItem.$editing">-->
-								<!--<div ng-repeat="reply in inquiryItem.replies">-->
-									<!--<div class="form-group">-->
-										<!--<input type="text" class="form-control input-xs " ng-class="{'input-error': !replyPrices[$index]}" ng-model="reply.price"-->
-											   <!--ng-change="verify(reply.price,$index)" placeholder="单价(必填)"  />-->
-										<!--<div class="text-bold text-inverse" style="margin-bottom:-15px" ng-show="!replyPrices[$index]">请填数字!</div>-->
-									<!--</div>-->
-								<!--</div>-->
-							<!--</div>-->
-						<!--</td>-->
-						<!--<td class="text-center" ng-bind="::inquiryItem.currency" width="50"></td>-->
-						<!--<td class="text-center" width="60">-->
-						<!--<input type="text" ng-pattern="/^\+?[1-9]\d*$/" ng-model="inquiryItem.taxrate" style="width: 25px" ng-readonly="!inquiryItem.$editing">%</td>-->
-						<!--<td class="text-center" width="85">-->
-							<!--<div ng-show="!inquiryItem.$editing">-->
-								<!--<span ng-bind="inquiryItem.minOrderQty"></span> <span-->
-									<!--ng-show="inquiryItem.minOrderQty == null" class="text-muted">-</span>-->
-							<!--</div>-->
-							<!--<div ng-if="inquiryItem.$editing">-->
-								<!--<input type="text" class="form-control input-xs" ng-change="verify(inquiryItem.minOrderQty,'minOrderQty')"-->
-									<!--ng-model="inquiryItem.minOrderQty" placeholder="最小订购">-->
-							<!--</div>-->
-						<!--</td>-->
-						<!--<td class="text-center" width="85">-->
-							<!--<div ng-show="!inquiryItem.$editing">-->
-								<!--<span ng-bind="inquiryItem.minPackQty"></span> <span-->
-									<!--ng-show="inquiryItem.minPackQty == null" class="text-muted">-</span>-->
-							<!--</div>-->
-							<!--<div ng-if="inquiryItem.$editing">-->
-								<!--<input type="text" class="form-control input-xs" ng-change="verify(inquiryItem.minPackQty,'minPackQty')"-->
-									<!--ng-model="inquiryItem.minPackQty" placeholder="最小包装">-->
-							<!--</div>-->
-						<!--</td>-->
-						<!--<td class="text-center" width="120">-->
-							<!--<div ng-show="!inquiryItem.$editing"-->
-								<!--ng-init="parseDate(inquiryItem)">-->
-								<!--<div ng-show="inquiryItem.vendFromDate">-->
-									<!--<span class="text-muted">从 </span><span-->
-										<!--ng-bind="inquiryItem.vendFromDate | date:'yyyy-MM-dd'"></span>-->
-									<!--<span class="text-muted">到 </span><span-->
-										<!--ng-bind="inquiryItem.vendToDate | date:'yyyy-MM-dd'"></span>-->
-								<!--</div>-->
-								<!--<div ng-show="!inquiryItem.vendFromDate">-->
-									<!--<span class="text-muted">-</span>-->
-								<!--</div>-->
-							<!--</div>-->
-							<!--<div ng-if="inquiryItem.$editing">-->
-								<!--<div class="form-group input-group input-group-xs input-trigger">-->
-									<!--<input type="text" ng-model="inquiryItem.vendFromDate"-->
-										<!--class="form-control" placeholder="开始日期"-->
-										<!--datepicker-popup="yyyy-MM-dd"-->
-										<!--is-open="inquiryItem.$fromOpened"-->
-										<!--min-date="getMinDate(inquiryItem)" ng-required="true"-->
-										<!--current-text="今天" clear-text="清除" close-text="关闭"-->
-										<!--datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"-->
-										<!--ng-focus="openDatePicker($event, inquiryItem, '$fromOpened')">-->
-									<!--<span class="input-group-btn">-->
-										<!--<button type="button" class="btn btn-default"-->
-											<!--ng-click="openDatePicker($event, inquiryItem, '$fromOpened')">-->
-											<!--<i class="fa fa-calendar"></i>-->
-										<!--</button>-->
-									<!--</span>-->
-								<!--</div>-->
-								<!--<div class="form-group input-group input-group-xs input-trigger">-->
-									<!--<input type="text" ng-model="inquiryItem.vendToDate"-->
-										<!--class="form-control" placeholder="结束日期"-->
-										<!--datepicker-popup="yyyy-MM-dd" is-open="inquiryItem.$toOpened"-->
-										<!--min-date="inquiryItem.vendFromDate" ng-required="true"-->
-										<!--current-text="今天" clear-text="清除" close-text="关闭"-->
-										<!--datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"-->
-										<!--ng-focus="openDatePicker($event, inquiryItem, '$toOpened')">-->
-									<!--<span class="input-group-btn">-->
-										<!--<button type="button" class="btn btn-default"-->
-											<!--ng-click="openDatePicker($event, inquiryItem, '$toOpened')">-->
-											<!--<i class="fa fa-calendar"></i>-->
-										<!--</button>-->
-									<!--</span>-->
-								<!--</div>-->
-							<!--</div>-->
-						<!--</td>-->
-						<!--<td class="text-center" width="75">-->
-							<!--<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == null && inquiryItem.invalid != 1" class="block">-->
-								<!--<span class="text-trans warning">已报价</span>-->
-								<!--<div ng-if="inquiryItem.inquiry.overdue == 0 && inquiryItem.inquiry.check != 1" style="padding-top: 50px;">-->
-									<!--<div ng-show="!inquiryItem.$editing">-->
-										<!--<a ng-click="inquiryItem.$editing=!inquiryItem.$editing;getToken()">修改报价</a>-->
-									<!--</div>-->
-									<!--<div ng-show="inquiryItem.$editing">-->
-										<!--<div>-->
-											<!--<a ng-click="inquiryItem.$editing=!inquiryItem.$editing; cancel()">取消</a>-->
-										<!--</div>-->
-										<!--<div>-->
-											<!--<button ng-click="onReplyClick(inquiryItem, true)"-->
-													<!--ng-disabled="!isValid(inquiryItem, true)"-->
-													<!--class="btn btn-link btn-xs text-inverse">-->
-												<!--保存并<br>确认报价-->
-											<!--</button>-->
-										<!--</div>-->
-									<!--</div>-->
-								<!--</div>-->
-								<!--<div ng-if="inquiryItem.inquiry.check == 1" class="text-muted" style="padding-top: 50px;">客户正在<br>审批...</div>-->
-							<!--</div>-->
-							<!--<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == 1 && inquiryItem.invalid != 1" class="block">-->
-								<!--<span class="text-trans success">已采纳</span>-->
-							<!--</div>-->
-							<!--<div ng-if="inquiryItem.status == 201 && inquiryItem.invalid == 1" class="block">-->
-								<!--<span class="text-trans text-light">已失效</span>-->
-							<!--</div>-->
-							<!--<div ng-if="inquiryItem.status == 314" class="block">-->
-								<!--<span class="text-trans text-light">已作废</span>-->
-							<!--</div>-->
-							<!--<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == 0" class="block">-->
-								<!--<span class="text-trans error">未采纳</span>-->
-							<!--</div>-->
-							<!--<div ng-if="inquiryItem.status == 200">-->
-								<!--<div ng-if="inquiryItem.inquiry.overdue == 0 && inquiryItem.inquiry.check != 1">-->
-									<!--<div ng-show="!inquiryItem.$editing">-->
-										<!--<a ng-click="inquiryItem.$editing=!inquiryItem.$editing;getToken()">报 价</a>-->
-									<!--</div>-->
-									<!--<div ng-show="inquiryItem.$editing">-->
-										<!--<div>-->
-											<!--<a ng-click="inquiryItem.$editing=!inquiryItem.$editing; cancel()">取消</a>-->
-										<!--</div>-->
-										<!--<div>-->
-											<!--<button ng-click="onReplyClick(inquiryItem)"-->
-													<!--ng-disabled="!isValid(inquiryItem)"-->
-													<!--class="btn btn-link btn-xs text-default">保存</button>-->
-										<!--</div>-->
-										<!--<div>-->
-											<!--<button ng-click="onReplyClick(inquiryItem, true)"-->
-													<!--ng-disabled="!isValid(inquiryItem, true)"-->
-													<!--class="btn btn-link btn-xs text-inverse">-->
-												<!--保存并<br>确认报价-->
-											<!--</button>-->
-										<!--</div>-->
-									<!--</div>-->
-								<!--</div>-->
-								<!--<div ng-if="inquiryItem.inquiry.overdue == 0 && inquiryItem.inquiry.check == 1">-->
-									<!--<span class="text-trans half">未报价</span>-->
-									<!--<div class="text-muted" style="padding-top: 50px;">询价单已<br>被提交...</div>-->
-								<!--</div>-->
-								<!--<div ng-if="inquiryItem.inquiry.overdue == 1" class="block">-->
-									<!--<span class="text-trans error">已过期</span>-->
-								<!--</div>-->
-							<!--</div>-->
-						<!--</td>-->
-					<!--</tr>-->
-				<!--</tbody>-->
-			<!--</table>-->
+<div class="detail">
+	<div class="top">
+		<h3>客户公共询价单</h3>
+		<div class="top-right">
+			<span>日期：<em>2017-11-11</em></span>
+			<span>报价单号：<em>2017-11-11</em></span>
 		</div>
 	</div>
+	<div class="middle">
+		<ul class="list-inline">
+			<li>
+				<span>询价企业</span><em></em>
+			</li>
+			<li>
+				<span>联系人&nbsp;</span><em></em>
+			</li>
+			<li>
+				<span>联系电话</span><em></em>
+			</li>
+			<li>
+				<span>企业地址</span><em></em>
+			</li>
+			<li>
+				<span>报价截止</span><em></em>
+			</li>
+		</ul>
+	</div>
+	<table class="table">
+		<thead>
+			<tr>
+				<th>产品型号</th>
+				<th>品牌</th>
+				<th>币种</th>
+				<th>税率</th>
+				<th>分段数量</th>
+				<th>价格</th>
+				<th>交货周期</th>
+				<th>最小订购/包装</th>
+				<th>附件</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<td>
+					<div class="info">
+						<span>3242543254</span>&nbsp;&nbsp;<i class="fa fa-caret-down"></i>
+						<div class="modal-content">
+							<ul class="list-unstyled">
+								<li>
+									<span>品牌：</span><em>人是哪</em>
+								</li>
+							</ul>
+						</div>
+					</div>
+				</td>
+				<td>
+					<p ng-repeat="">
+						<span></span>
+					</p>
+				</td>
+				<td><span></span></td>
+				<td></td>
+				<td></td>
+				<td></td>
+				<td></td>
+				<td></td>
+				<td>
+					<a href="javescript:void(0)">dsafsa.paf</a>
+				</td>
+		</tr>
+		</tbody>
+	</table>
 </div>