新增采购询价，待发布

src/main/webapp/resources/js/common/services.js

@@ -151,7 +151,7 @@ define([ 'angular', 'common/utils', 'big'], function(angular, utils, Big) {
 					// defer.promise.then(function (resolve) {
 					// 	$rootScope.b2bUrl = resolve.url;
 					// });
-					$rootScope.b2bUrl = this.getRootPath().indexOf('usoftmall.com') > -1 ? 'http://uas.ubtob.com' : 'http://10.1.51.91:8090/platform-b2b';
+					$rootScope.b2bUrl = this.getRootPath().indexOf('usoftmall.com') > -1 ? 'http://uas.ubtob.com' : 'http://10.1.51.91:8090/platform-b2b/';
 				}
 				return $rootScope.b2bUrl;
 			}

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

@@ -565,12 +565,24 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
             controller: 'PurcMakeOutOrderDetailCtrl',
             controllerUrl: 'app/controllers/b2b/order/purcMakeOutOrderDetailCtrl'
         })).state('purc_haseinquiry', angularAMD.route({
-            url: "/purchaseinquiry",
-            title: '买家中心-B2b委外订单',
-            templateUrl: "static/view/usercenter/b2b/Purc/purchaseInquiryCtrl.html",
-            controller: 'PurchaseInquiryCtrl',
-            controllerUrl: 'app/controllers/b2b/Purc/purchaseInquiryCtrl'
-        })).state('purc_purcinquiry_new', angularAMD.route({
+      url: "/purchaseinquiry",
+      title: '买家中心-采购询价',
+      templateUrl: "static/view/usercenter/b2b/Purc/purchaseInquiryCtrl.html",
+      controller: 'PurchaseInquiryCtrl',
+      controllerUrl: 'app/controllers/b2b/Purc/purchaseInquiryCtrl'
+    })).state('purc_inquiry_unapply', angularAMD.route({
+      url: "/inquiry_unapply",
+      title: '买家中心-待发布',
+      templateUrl: "static/view/usercenter/b2b/Purc/inquiry_unapply.html",
+      controller: 'UnapplyInquiryCtrl',
+      controllerUrl: 'app/controllers/b2b/Purc/inquiry_unapply'
+    })).state('purc_inquiryInfo_detail', angularAMD.route({
+      url: "/purcinquirydetail/:id",
+      title: '买家中心-采购询价详情',
+      templateUrl: "static/view/usercenter/b2b/Purc/inquiryInfo_detail.html",
+      controller: 'PurcInquiryInfoDetailCtrl',
+      controllerUrl: 'app/controllers/b2b/Purc/inquiryInfo_detail'
+    })).state('purc_purcinquiry_new', angularAMD.route({
 			url: "/purc/purcinquiry/:bussinessCode",
 			templateUrl: "static/view/usercenter/b2b/Purc/purcinquiry_new.html",
 			controller: 'PurcInquiryNewCtrl',

src/main/webapp/resources/js/usercenter/controllers/b2b/Purc/PurcInquiryCtrl.js

@@ -43,7 +43,7 @@ define(['app/app'], function(app) {
             loadShipAddress();
 
             // 获取地址信息
-            $http.get('resources/citydata/city.json', {
+            $http.get('static/js/prod/data/city.json', {
                 "Accept": "application/json;charset=utf-8", "Accept-Charset": "charset=utf-8"
             }).then(function (response) {
                 $scope.provinces = response.data;
@@ -542,5 +542,94 @@ define(['app/app'], function(app) {
                 }
                 return url;
             };
+          /**
+           * 将日期转化为整数日期
+           */
+          var getDateTime = function (date) {
+            if (angular.isDate(date)) {
+              return date.getTime();
+            } else {
+              return null;
+            }
+          };
+
+          var getState = function (active) {
+            var fn = 'get';
+            switch (active) {
+              case 'done':
+                fn = 'getDone';
+                break;
+              case 'todo':
+                fn = 'getTodo';
+                break;
+              case 'end':
+                fn = 'getEnd';
+                break;
+              case 'waiting':
+                fn = 'getWaiting';
+                break;
+              case 'received':
+                fn = 'getReceived';
+                break;
+              case 'invalid':
+                fn = 'getInvalid';
+                break;
+                // 已采纳
+              case 'agreed':
+                fn = 'getAgreed';
+                break;
+                // 未采纳
+              case 'refused':
+                fn = 'getRefused';
+                break;
+                // 个人
+              case 'personal':
+                fn = 'getPersonal';
+                break;
+                // 集体
+              case 'teams':
+                fn = 'getTeams';
+                break;
+                // 非标准
+              case 'nonstandard':
+                fn = 'getNonstandard';
+                break;
+                // 标准
+              case 'standard':
+                fn = 'getStandard';
+                break;
+                // 变更单无需确认
+              case 'unread':
+                fn = 'getUnread';
+                break;
+            }
+            return fn;
+          };
+
+          var getDateCondition = function (zone, condition) {
+            var fromDate = new Date();
+            var toDate = new Date();
+            //去除时分秒限制，dateFrom设置成0时0分0秒，dateTo设置成23时59分59秒
+            fromDate.setHours(0, 0, 0, 0);
+            toDate.setHours(23, 59, 59, 999);
+            if (zone == -1) { // 自定义时间，什么都不做
+
+            } else if (zone == 1) {
+              fromDate.setMonth(fromDate.getMonth() - 1);
+              condition.dateFrom = fromDate;
+              condition.dateTo = toDate;
+            } else if (zone == 3) {
+              fromDate.setMonth(fromDate.getMonth() - 3);
+              condition.dateFrom = fromDate;
+              condition.dateTo = toDate;
+            } else if (zone == 6) {
+              fromDate.setMonth(fromDate.getMonth() - 6);
+              condition.dateFrom = fromDate;
+              condition.dateTo = toDate;
+            } else {
+              condition.dateFrom = null;
+              condition.dateTo = null;
+            }
+          };
         }]);
 });

src/main/webapp/resources/js/usercenter/controllers/b2b/Purc/inquiryInfo_detail.js

@@ -0,0 +1,115 @@
+define(['app/app'], function(app) {
+  // 询价单明细（发出）
+  app.register.controller('PurcInquiryInfoDetailCtrl', ['$rootScope', '$scope', '$stateParams', 'B2bPurchaseInquiry', '$filter', 'toaster', 'B2bCurrentRole', function ($rootScope, $scope, $stateParams, PurchaseInquiry, $filter, toaster, CurrentRole) {
+    // 获取当前用户是否为普通用户
+    $rootScope.active = 'purc_haseinquiry'
+    CurrentRole.isUser({}, {}, function (data) {
+      $scope.isUser = data.isUser;
+    });
+    var loadData = function () {
+      PurchaseInquiry.detail({id: $stateParams.id}, {},function (data) {
+        $scope.inquiry = data;
+      },function (response) {
+        toaster.pop('error', '提示', response.data);
+      });
+    };
+    loadData();
+    $scope.getMinDate = function (item) {
+      return $filter('date')(item.inquiry.date, 'yyyy-MM-dd');
+    };
+    $scope.nowDate = new Date().getTime();
+    $scope.addStep = function (inquiryItem) {
+      if (inquiryItem.replies.length >= 10) {
+        toaster.pop('warning', '提示', '最多支持10个分段！');
+      } else
+        inquiryItem.replies.push({});
+    };
+
+    $scope.removeStep = function (inquiryItem, stepIndex) {
+      inquiryItem.replies.splice(stepIndex, 1);
+    };
+
+    $scope.openDatePicker = function ($event, item, openParam) {
+      $event.preventDefault();
+      $event.stopPropagation();
+      item[openParam] = !item[openParam];
+    };
+
+    $scope.getHistory = function (item) {
+      if (!item.history) {
+        PurcInquiry.getHistory({itemId: item.id}, function (data) {
+          item.history = data;
+        });
+      }
+    };
+
+    $scope.isValid = function (item, withSteps) {
+      var bool = item.leadtime && item.replies && item.replies[0].price > 0;
+      if (!withSteps || !bool)
+        return bool;
+      angular.forEach(item.replies, function (r, i) {
+        bool = (i > 0 ? r.lapQty : 1) && r.price;
+      });
+      return bool;
+    };
+
+    $scope.onReplyClick = function (item, withSteps) {
+      if (item.vendFromDate instanceof Date) {
+        item.vendFromDate = item.vendFromDate.getTime();
+      }
+      if (item.vendToDate instanceof Date) {
+        item.vendToDate = item.vendToDate.getTime();
+      }
+      if (item.vendFromDate > item.vendToDate) {
+        toaster.pop('warning', '警告', '有效开始日期不能超过有效截止日期');
+        return;
+      }
+      var replies = [];
+      angular.forEach(item.replies, function (r, i) {
+        if ((i > 0 ? r.lapQty : 1) || r.price)
+          replies.push(r);
+      });
+      item.replies = replies;
+      if (withSteps) {
+        PurcInquiry.reply({itemId: item.id}, item, function () {
+          toaster.pop('info', '提示', '报价成功');
+          loadData();
+        }, function (response) {
+          toaster.pop('error', '报价失败', response.data);
+        });
+      }
+    };
+
+    // 采纳
+    $scope.accept = function (id) {
+      PurchaseInquiry.accept({id: id}, {}, function (data) {
+        if (data.success) {
+          toaster.pop('success', '提示', data.success);
+          loadData();
+        }
+        if (data.error) {
+          toaster.pop('error', '提示', data.error);
+        }
+
+      }, function (response) {
+        toaster.pop('error', '提示', response.data);
+      })
+    };
+
+    // 拒绝
+    $scope.refuse = function (id) {
+      PurchaseInquiry.refuse({id: id}, {}, function (data) {
+        if (data.success) {
+          toaster.pop('success', '提示', data.success);
+          loadData();
+        }
+        if (data.error) {
+          toaster.pop('error', '提示', data.error);
+        }
+      }, function (response) {
+        toaster.pop('error', '提示', response.data);
+      })
+    }
+  }]);
+
+})

src/main/webapp/resources/js/usercenter/controllers/b2b/Purc/inquiry_unapply.js

@@ -0,0 +1,108 @@
+define(['app/app'], function(app) {
+  // 平台询价单（未提交）
+  app.register.controller('UnapplyInquiryCtrl', ['$scope', 'B2bPurchaseInquiry', 'ngTableParams', 'BaseService', 'toaster', '$rootScope', function ($scope, PurchaseInquiry, ngTableParams, BaseService, toaster, $rootScope) {
+    BaseService.scrollBackToTop();
+    $rootScope.active = 'purc_haseinquiry'
+    // if ($rootScope.active = 'done') {
+    //   $scope.active = 'done';
+    //   $rootScope.active = '';
+    // }
+    // if ($rootScope.active = 'todo') {
+      $scope.active = 'todo';
+    //   $rootScope.active = '';
+    // }
+    var getService = function () {
+      if ($scope.active == 'todo') {
+        return PurchaseInquiry.getUnapply;
+      }
+      if ($scope.active == 'done') {
+        return PurchaseInquiry.getSubmit;
+      }
+    }
+
+    $scope.setActive = function (state) {
+      if ($scope.active != state) {
+        $scope.active = state;
+        if ($scope.tableParams.page() == 1) {
+          $scope.tableParams.reload();
+        } else {
+          $scope.tableParams.page(1);
+        }
+      }
+    }
+
+    $scope.tableParams = new ngTableParams({
+      page: 1,
+      count: 20,
+      sorting: {
+        'date': 'desc',
+        'enterprise.enName': 'asc',
+        'code': 'asc'
+      }
+    }, {
+      total: 0,
+      counts: [5, 10, 25, 50],
+      getData: function ($defer, params) {
+        $scope.loading = true;
+        var pageParams = params.url();
+        var realActive = {};
+        if ($scope.active == 'overdue') {
+          $scope.active = 'end';
+        }
+        getService().call(null, BaseService.parseParams(pageParams), function (page) {
+          $scope.loading = false;
+          if (page) {
+            params.total(page.totalElements);
+            $defer.resolve(page.content);
+          }
+        }, function (response) {
+          $scope.loading = false;
+          toaster.pop('error', '数据加载失败', response.data);
+        });
+      }
+    });
+
+    // 删除明细
+    $scope.deleteById = function (id) {
+      PurchaseInquiry.deleteById({id: id}, {}, function (data) {
+        toaster.pop('success', '提示', '删除成功');
+        $scope.tableParams.reload();
+      }, function (response) {
+        toaster.pop('error', '提示', response.data);
+      });
+    }
+
+    // 删除主表
+    $scope.clearOrder = function (id) {
+      PurchaseInquiry.clearOrder({id: id}, {}, function (data) {
+        toaster.pop('success', '提示', '删除成功');
+        $scope.tableParams.reload();
+      }, function (response) {
+        toaster.pop('error', '提示', response.data);
+      });
+    }
+
+    // 提交
+    $scope.submit = function (id) {
+      PurchaseInquiry.submitUnapply({id: id}, {}, function (data) {
+        toaster.pop('success', '提示', '单据提交成功');
+        $scope.active = 'done';
+        $scope.tableParams.reload();
+      }, function (response) {
+        toaster.pop('error', '提示', response.data);
+      })
+    }
+
+    // 发布公共询价
+    $scope.publish = function (id) {
+      PurchaseInquiry.publishInquiry({id: id}, {}, function (data) {
+        toaster.pop('success', '提示', data.success);
+        $scope.active = 'done';
+        $scope.tableParams.reload();
+      }, function (response) {
+        toaster.pop('error', '提示', response.data);
+      })
+    }
+  }]);
+
+})

src/main/webapp/resources/view/usercenter/b2b/Purc/inquiryInfo_detail.html

@@ -0,0 +1,750 @@
+<!-- 报价单  -->
+<style>
+
+  /* 标题 */
+  .bid-label {
+    height: 30px;
+    margin-left: 10px;
+    margin-right: 10px;
+    background-color: #e8e8e8;
+    box-shadow: 0 0 5px #6f6f6f;
+    border-top-right-radius: 20px;
+  }
+
+  /* 主体 */
+  .purc-bid {
+    line-height: 2;
+    font-size: 14px;
+  }
+
+  .purc-bid .row {
+    margin-left: 0px;
+    margin-right: 0px;
+    padding-left: 15px;
+    padding-right: 15px;
+  }
+
+  .bid-content {
+    background-color: #fff;
+  }
+
+  .bid-content>div>div {
+    margin-top: 3px;
+    margin-bottom: 3px;
+  }
+
+  /* 读取显示无法修改的数据 */
+  .unchanged-info {
+
+    overflow: hidden;
+  }
+
+  /* 二级标题栏 */
+  .title-div {
+    font-size: 14px;
+    font-weight: 600;
+    padding-left: 20px;
+    height: 50px;
+    padding-top: 11px;
+  }
+
+  /* 输入框前描述 */
+  .bid-desc {
+    width: 100px;
+    color: #969595;
+    float: left;
+  }
+
+  /* 输入框 */
+  .bid-input {
+    border: none;
+    border-bottom: 1px solid #323232;
+    text-align: center;
+  }
+
+  .bid-input:focus {
+    outline: none;
+    border-bottom: 1px solid #5078cb;
+  }
+
+  /* 基本信息 */
+  .base-info {
+    padding-bottom: 30px;
+    /*padding-top: 20px;*/
+    margin-bottom: 0; /* 去除index中公共样式影响 */
+  }
+
+  /* 右下角按钮 */
+  .bid-content>div {
+    background-color: #fff;
+  }
+
+  .bid-content>div>div>button {
+    width: 94px;
+    height: 36px;
+    font-size: 14px;
+    color: #fff;
+    border-radius: 0;
+  }
+
+  .bid-content>div>div.btn-bid>button {
+    background-color: #3f84f6;
+  }
+
+  .bid-content>div>div.btn-bid>button:hover {
+    background: #3a89d1;
+    color: #fff;
+  }
+  /* 列表内容 */
+  .tender-table {
+    padding: 0 20px;
+  }
+
+  .tender-table .header {
+    height: 50px;
+    background-color: #fff;
+    color: rgb(50, 50, 50);
+    border-bottom: 1px solid #3f84f6;
+  }
+
+  .tender-table thead>tr>th:first-child, .tender-table tbody>tr>td:first-child
+  {
+    padding-left: 30px;
+  }
+
+  .tender-table tr {
+    height: 50px;
+    border-bottom: 1px dashed #969595;
+  }
+
+  .tender-table>tbody {
+    height: 100px;
+    font-size: 14px;
+    color: #323232;
+    border: 1px solid transparent;
+  }
+
+  .tender-table tbody tr td a {
+    color: #3f84f6;
+    font-size: 12px;
+  }
+
+  .tender-table tbody tr td a:hover {
+    color: #D32526;
+    cursor: pointer;
+  }
+
+  /* 输入框 */
+  .tender-input {
+    border: none;
+    width: 100px;
+  }
+
+  .tender-input:focus {
+    outline: none;
+  }
+
+  .com_head a {
+    color: #fff;
+    float: right;
+    margin-right: 40px;
+    font-size: 14px;
+  }
+
+  .com_head a i {
+    margin-left: 5px;
+    line-height: 40px;
+  }
+
+  .com_head a:hover {
+    color: #d2272d;
+  }
+
+  .com_title {
+    width: 100%;
+    margin: 0px auto;
+    height: 40px;
+    line-height: 40px;
+    font-size: 14px;
+    color: #323232;
+    background: #f5f5f5;
+  }
+
+  .com_title font {
+    color: #3f84f6;
+  }
+
+  .com_title01 {
+    height: 50px;
+    line-height: 50px;
+    width: 100%;
+    border-bottom: #3578ba 1px dotted;
+    border-top: #e8e8e8 1px solid;
+    margin-top: -4px;
+  } /*  这里修改过 margin-top*/
+  .com_title01 span {
+    margin-left: 20px;
+    font-size: 14px;
+    line-height: 50px;
+    color: #555;
+    font-weight: bold;
+  }
+
+  .comment-oder-list  a {
+    color: #5078cb;
+  }
+
+  .comment-oder-list  a:hover {
+    cursor: pointer;
+    color: #d2272d;
+  }
+
+  /*评标单*/
+  .tender-list02 .comment-oder {
+    padding: 0 20px;
+    width: auto;
+    margin: 20px 0;
+    border-bottom: 1px solid #e4e7fe
+  }
+  .tender-list02 .comment-oder:nth-last-of-type(1) {
+    border-bottom: 0px;
+  }
+
+  .tender-list02 .comment-oder:hover {
+    /*border: #d32526 1px solid;*/
+  }
+
+  .tender-list02 .comment-oder-text {
+    /*border-bottom: #5078cb 1px solid;*/
+  }
+
+  .tender-list02 .comment-oder-text, .comment-oder-text ul {
+    width: 100%;
+    margin: 0 auto;
+    padding: 5px 0;
+    position: relative;
+  }
+
+  .tender-list02 .comment-oder-text i {
+    position: absolute;
+    top: -1px;
+    left: 1px;
+    width: 20px;
+    height: 20px;
+    line-height: 15px;
+    text-align: center;
+    background: #595959;
+    display: inline-block;
+    font-weight: 700;
+    font-size: 14px;
+    color: #fff;
+    border-radius: 0 0 50px 0;
+  }
+
+  .tender-list02 .comment-oder-text ul li {
+    width: 94%;
+    margin: 0 auto;
+    height: 30px;
+    line-height: 30px;
+  }
+
+  .tender-list02 .comment-oder-text ul li span {
+    width: 33.3333%;
+    float: left;
+  }
+
+  .tender-list02 .comment-oder-text ul li span em, .comment-oder-text ul li span b
+  {
+    font-size: 14px;
+  }
+
+  .tender-list02 .comment-oder-text ul li span em {
+    width: 70px;
+    display: inline-block;
+    color: #959595
+  }
+
+  .tender-list02 .comment-oder-text ul li span b {
+    /*color: #959595;*/
+    width: 190px;
+    display: inline-block;
+    float: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .tender-list02 .comment-oder-list, .comment-oder-list dl {
+    width: 100%;
+    margin: 0 auto;
+  }
+
+  .tender-list02 .comment-oder-list dl dt, .comment-oder-list dl dd {
+    width: 100%;
+    margin: 0 auto;
+    border-bottom: 1px solid #e4e7fe;
+    min-height: 50px;
+    /*line-height: 50px;*/
+  }
+
+  .tender-list02 .comment-oder-list dl dt span.wid01 {
+    text-align: center;
+    /*padding-left: 30px;*/
+  }
+
+  .tender-list02 .comment-oder-list dl dd span.wid01 {
+    text-align: left;
+    padding-left: 30px;
+  }
+
+  .tender-list02 .comment-oder-list dl span {
+    font-size: 14px;
+    width: 9%;
+    float: left;
+    color: #323232 !important;
+    line-height: 50px;
+    position: relative;
+    /*overflow: hidden;*/
+  }
+
+  .tender-list02 .comment-oder-list dl span.wid01 {
+    width: 19%;
+  }
+
+  .tender-list02 .comment-oder-list dl span.wid02 {
+    width: 15%;
+  }
+
+  .tender-list02 .comment-oder-list dl dd span a {
+    margin-top: 15px;
+    margin-left: 15px;
+    font-size: 12px;
+    width: 104px;
+    height: 25px;
+    line-height: 25px;
+    float: left;
+
+  }
+  .dropdown:hover>.dropdown-menu{
+    margin-top: 51px;
+  }
+  .tender-list02 .comment-oder-list dl dd:hover {
+    /*border-bottom: #ccc 1px dotted;*/
+    border-top: none;
+    border-left: none;
+    border-right: none;
+  }
+
+  .tender-list02 .change01 {
+    width: 16px;
+    height: 14px;
+    display: inline-block;
+    float: right;
+    line-height: 7px;
+    position: absolute;
+    top: 13px;
+  }
+
+  .tender-list02 .change01 i {
+    width: 100%;
+    display: inline-block;
+    height: 7px;
+    color: #000;
+  }
+
+  .tender-list02 .change01:hover i {
+    color: #5078cb;
+  }
+
+  .tender-list02 .explain {
+    width: 90%;
+    height: 30px;
+    border: none;
+    text-align: center;
+    line-height: 30px;
+  }
+
+  .tender-list02 .save {
+    margin-top: 30px;
+  }
+
+  .tender-list02 .save a {
+    width: 94px;
+    height: 36px;
+    display: inline-block;
+    background: #3578ba;
+    text-align: center;
+    color: #fff;
+    font-size: 14px;
+    float: right;
+    line-height: 36px;
+    margin-right: 40px;
+  }
+
+  .tender-list02 .save a:hover {
+    background: #1f4fb2;
+  }
+
+  .tender-list02 .com_title01, .tender-list .com_title01 {
+    margin-top: 0;
+  }
+
+  i, em {
+    font-style: normal;
+  }
+
+  .prod-number { /* 数字居右 */
+    text-align: center;
+  }
+
+  .tender-list02 .comment-oder-list dl dt span {
+    text-align: center;
+  }
+  .tender-list02 .comment-oder-list dl span{
+    text-align: center;
+  }
+  .tender-list02 .comment-oder-list dl dd span:first-child{
+    /*line-height: 20px;*/
+    /*padding-top: 5px;*/
+  }
+  .tender-list02 .comment-oder-list dl span a.active {
+    text-decoration: none;
+    color: #D32526;
+  }
+  .tender-list02 .comment-oder-list dl span.text-trans{
+    line-height: 25px;
+    padding: 0;
+    top: 10px;
+    right: -15px;
+  }
+  .tender-list02 .comment-oder-list dl span.text-trans.error{
+    color: #d44950 !important;
+    border-color: #d44950;
+  }
+  .comment-oder-list dl dd:last-child{
+    border-bottom: none;
+  }
+  .tender-list02 .comment-oder-list {
+    border: 1px solid #e4e7fe;
+    margin-bottom: 20px;
+  }
+  .tender-list02 .comment-oder-list dl dt {
+    background: #f5f8fe;
+  }
+  .tender-list02 .comment-oder-text {
+    border: 1px solid #e4e7fe;
+    margin-bottom: 20px;
+    background: #f9fafd;
+  }
+</style>
+<style>
+  .base-info-content {
+    box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+    -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+    -o-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+    -moz-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+    border-radius: 5px;
+    /*min-height: 1066px;*/
+    background: #fff;
+    width: 1026px;
+  }
+  #order-detail-list {
+    font-size: 14px;
+  }
+  .pub-com_head, .com_head {
+    width: 100%;
+    height: 35px;
+    line-height: 35px;
+    background: #5078cb;
+    border-radius: 5px 5px 0 0;
+    /* background: url(../img/approvalFlow/comm_bg01.png) no-repeat left; */
+    /* background-color: #f5f5f5; */
+    /* background-size: 100% 100%; */
+  }
+  .pub-com_head span, .com_head span {
+    margin-left: 10px;
+    color: #fff;
+    font-size: 14px;
+    font-weight: bold;
+  }
+  .pub-com_head .p-right {
+    float: right;
+  }
+  .pane .pane-body {
+    /*padding: 15px!important;*/
+  }
+  com_title01, .title-div {
+    /*border-bottom: 1px dashed #3f84f6 !important;*/
+  }
+  .title-div {
+    color: #5078cb;
+    font-size: 14px;
+    font-weight: 600;
+    /*padding-left: 20px !important;*/
+    height: 50px;
+    padding-top: 11px;
+    position: relative;
+  }
+  .f14 {
+    font-size: 14px !important;
+  }
+  #order-detail-list .row {
+    width: 96%;
+    margin: 0 auto;
+    line-height: 30px;
+  }
+  .base-info-content .item {
+    line-height: 26px;
+    /* border-bottom: 1px dotted #e8e8e8; */
+    padding: 5px 0;
+  }
+  #order-detail-list .title {
+    font-weight: inherit;
+  }
+  .base-info-content .title {
+    float: left;
+    width: 92px;
+    color: #333;
+    font-weight: bold;
+  }
+  #order-detail-list .content {
+    color: #666;
+  }
+  .base-info-content .content {
+    float: left;
+    white-space: nowrap;
+  }
+  .title-div .end {
+    position: absolute;
+    top: 10px;
+    right: 0;
+    line-height: 24px;
+    padding-left: 15px;
+    background: #fff;
+    z-index: 2;
+  }
+  .block {
+    background-color: #fff;
+    border-radius: 5px;
+    width: 100%;
+    /*position: relative;*/
+    margin-bottom: 0px;
+  }
+  #order-detail-list .table-default .header {
+    box-shadow: none;
+    border: none;
+    background: none;
+    background: #f9f9f9;
+  }
+  #order-detail-list .table-default .header th {
+    display: inline-block;
+    border-bottom: none;
+    font-weight: normal;
+    color: #999;
+    padding: 8px 0;
+    text-align: center;
+  }
+  #order-detail-list .table-default th, #order-detail-list .table-default td {
+    /*border-top: #ddd 1px dotted;*/
+  }
+  #order-detail-list .table-default tbody tr {
+    background: none;
+    position: relative;
+  }
+  #order-detail-list table.table-default.pms tbody tr td {
+    vertical-align: middle;
+    color: #323232;
+    min-height: 140px;
+    position: relative;
+    padding: 15px 0;
+    font-size: 14px;
+  }
+  [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak, .ng-hide:not(.ng-hide-animate) {
+    display: none !important;
+  }
+  .text-bold {
+    font-weight: 700;
+  }
+
+  .text-num {
+    font-style: normal;
+    word-break: break-all;
+    font-size: 14px;
+  }
+  .text-muted {
+    color: #333;
+    font-size: 14px;
+  }
+  .bottomB {
+    border-bottom: 2px solid #f5f5f5;
+    padding: 15px 30px 15px 15px;
+  }
+
+  .title-div .f14{
+    border-left: 5px solid #5078cb;padding-left: 10px;
+  }
+
+  .order-number {
+    position: absolute;
+    top: -1px;
+    left: -1px;
+    width: 20px;
+    height: 20px;
+    line-height: 20px;
+    text-align: center;
+    background: #f9f9f9;
+    font-weight: 500;
+    border: solid 1px #d5d5d5;
+    border-radius: 0 0 10px 0;
+  }
+  #order-detail-list .table-default.pms tbody tr td.product {
+    padding-left: 30px;
+  }
+  #order-detail-list .table-default tbody tr td{
+    border-right: 1px solid #e8e8e8;
+  }
+  .text-trans {
+    top: 14px;
+    right: 20px;
+  }
+  .f14{
+    font-size: 14px;
+  }
+</style>
+<div class="ng-scope base-info-content fr">
+  <form name="bidForm">
+    <div class="purc-bid">
+      <div class="com_head"><span>报价单</span></div>
+      <div class="bid-content ng-scope">
+        <div class="title-div">
+          <span class="f14">基本信息</span>
+        </div>
+        <div class="row base-info">
+          <div class="col-xs-4" style="margin-bottom: 5px">
+            <div class="bid-desc">询价单号：</div>
+            <div class="unchanged-info">{{inquiry.code}}</div>
+          </div>
+          <div class="col-xs-4" style="margin-bottom: 5px">
+            <div class="bid-desc">报价日期：</div>
+            <div class="unchanged-info">{{inquiry.date| date: 'yyyy-MM-dd'}}</div>
+          </div>
+          <div class="col-xs-4" style="margin-bottom: 5px">
+            <div class="bid-desc">截止日期：</div>
+            <div class="unchanged-info">{{inquiry.endDate| date: 'yyyy-MM-dd'}}</div>
+          </div>
+          <div class="col-xs-12" style="margin-bottom: 5px">
+            <div class="bid-desc">收货地址：</div>
+            <div class="unchanged-info">{{inquiry.ship}}</div>
+          </div>
+          <div class="col-xs-12" style="margin-bottom: 5px">
+            <div class="bid-desc">发票类型：</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-12" style="margin-bottom: 5px">
+            <div class="bid-desc">备注：</div>
+            <div class="unchanged-info">{{inquiry.remark || '无'}}</div>
+          </div>
+          <div class="col-xs-12" style="margin-bottom: 5px">
+            <div class="bid-desc">附件：</div>
+            <div class="unchanged-info"><a class="file" ng-repeat="attach in inquiry.attachs" href="file/{{attach.id}}"><span ng-bind="attach.name != null ? attach.name : '无'"></span></a></div>
+          </div>
+        </div>
+        <div class="title-div" style="margin-bottom: 20px">
+          <span class="f14">报价信息</span>
+        </div>
+        <div class="tender-list02">
+          <!--报价信息-->
+          <div class="comment-oder" ng-repeat="product in inquiry.products | orderBy : 'index'">
+            <div class="comment-oder-text">
+              <ul>
+                <li class="list-unstyled">
+                  <span><em style="width: 80px;">物料型号：</em><b title="{{product.code}}">{{product.code}}</b></span>
+                  <span><em>物料名称：</em><b title="{{product.title}}">{{product.title}}</b></span>
+                  <span><em>品牌：</em><b title="{{product.brand}}">{{product.brand}}</b></span>
+                </li>
+                <li class="list-unstyled">
+                  <span style="width: 66.6%;"><em style="width: 80px;">规格：</em><b style="width:85%;">{{product.spec}}</b></span>
+                  <span><em style="width: 80px;">单位：</em><b title="{{product.unit}}">{{product.unit}}</b></span>
+                </li>
+              </ul>
+              <i>{{$index + 1}}</i>
+            </div>
+            <div class="comment-oder-list">
+              <dl>
+                <dt>
+                  <span style="width: 246px">供应商</span>
+                  <span>币别</span>
+                  <span>税率(% )</span>
+                  <span>单价</span>
+                  <span>交货周期</span>
+                  <span>最小订购</span>
+                  <span>最小包装</span>
+                  <span>有效期</span>
+                  <span style="width: 118px;">操作</span>
+                </dt>
+                <dd ng-if="inquiry.products.inquiryItems.enterprise.length == 0">
+                  <div style="font-size: 14px; color: #969595; text-align: center;">
+                    暂无企业报价
+                  </div>
+                </dd>
+                <dd ng-repeat = "inquiryItem in product.inquiryItems">
+                                    <span style="width: 246px">{{inquiryItem.enterprise.enName}}
+                                    </span>
+                  <span class="prod-number">{{inquiryItem.currency}}</span>
+                  <span class="prod-number">{{inquiryItem.taxrate || 0}}</span>
+                  <span>
+                                    	<div class="dropdown" ng-if="::inquiryItem.replies.length > 1">
+											<a href="javascript:void(0);"
+                         class="dropdown-toggle text-default">报价信息<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">
+															<div ng-class="{'text-inverse': $index==0}">
+																<div class="row row-sm"
+                                     ng-repeat="reply in ::inquiryItem.replies">
+																	<div class="col-xs-5">≥{{reply.lapQty}}</div>
+																	<div class="col-xs-5">价格{{isUser?'-':(reply.price | number:6)}}</div>
+																</div>
+															</div>
+													</ul>
+													<div ng-show="inquiryItem.replies.length == 0"
+                               class="text-center text-muted">暂无报价信息</div>
+												</div>
+											</div>
+										</div>
+										<div  ng-if="::inquiryItem.replies.length == 1">
+											<div class="row row-sm"
+                           ng-repeat="reply in ::inquiryItem.replies">
+												<div class="col-xs-5">≥{{reply.lapQty}}</div>
+												<div class="col-xs-5">{{isUser?'-':(reply.price | number:6)}}</div>
+											</div>
+										</div>
+										<div  ng-if="::inquiryItem.replies.length == 0">暂无报价信息</div>
+                                    </span>
+                  <span class="prod-number">{{inquiryItem.leadtime|| '无'}}</span>
+                  <span class="prod-number">{{inquiryItem.minOrderQty|| '无'}}</span>
+                  <span class="prod-number">{{inquiryItem.minPackQty|| '无'}}</span>
+                  <span style="line-height: 20px; padding-top: 5px;">
+                                        <em>{{inquiryItem.fromDate| date:'yyyy-MM-dd'}}</em><br/>
+                                        <em>{{inquiryItem.toDate|date: 'yyyy-MM-dd'}}</em>
+                                    </span>
+                  <span ng-if="inquiryItem.status == 200" class="text-trans info" >暂未报价</span>
+                  <!---->
+                  <span  style="width: 118px" ng-if="inquiryItem.status == 201 && inquiryItem.agreed == null">
+                                        <em ng-click="accept(inquiryItem.id)" style="width: 40px;height: 24px;line-height: 24px;color:#3c7cf5;border:1px solid #3c7cf5;display:inline-block;text-align: center">采纳</em>
+                      <em style="width: 40px;height: 24px;line-height: 24px;color:#3c7cf5;border:1px solid #3c7cf5;display:inline-block;text-align: center" ng-click="refuse(inquiryItem.id)">拒绝</em>
+                                    </span>
+                  <span  ng-if="inquiryItem.status == 201 && inquiryItem.agreed == 1" class="text-trans success">已采纳</span>
+                  <span  ng-if="inquiryItem.status == 201 && inquiryItem.agreed == 0" class="text-trans error">未采纳</span>
+                  <!--<span ng-if="inquiryItem.status == 201 && inquiryItem.agreed == null && inquiryItem.toDate < nowDate" class="text-trans text-light">已失效</span>-->
+                </dd>
+              </dl>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </form>
+</div>

src/main/webapp/resources/view/usercenter/b2b/Purc/inquiry_new.html

@@ -1,5 +1,5 @@
 <!--  询价单  -->
-<link rel="stylesheet" href="static/css/add.css " />
+<!--<link rel="stylesheet" href="static/css/add.css " />-->
 <style>
 
     /* 标题 */
@@ -1187,34 +1187,34 @@
                     <td class="text-center f12" ng-bind="::product.spec"></td>
                     <td class="text-center" ng-bind="::product.unit"></td>
                     <td class="text-center" ><a title="添加" href="javascript:void(0)" ng-click="check(product)" style="text-decoration: none; color: #3f84f6;" id="click" class="add01">添加</a>
-                        <div class="add-tanchuang">
-                            <ul>
-                                <li>
-                                    <div class="fl">数量：</div>
-                                    <div class="fr">
-                                        <div class="btn-wrap">
-	                                        <span class="number">
-	                                            <a href="###" class="reduce">-</a>
-	                                            <input type="text" value="100">
-	                                            <a href="###" class="add">+</a>
-	                                        </span>
-                                        </div>
-                                    </div>
-                                </li>
-                                <li>
-                                    <div class="fl">交期：</div>
-                                    <div class="fr"><input type="text" class="price-input" value="时间选择"></div>
-                                </li>
-                                <li>
-                                    <div class="fl">单价：</div>
-                                    <div class="fr"><input type="text" class="price-input" value="￥1.23"></div>
-                                </li>
-                                <li class="add-btn">
-                                    <div class="fl">&nbsp;</div>
-                                    <div class="fr"><a href="javascript:void(0);" class="off">取消</a><a href="javascript:void(0);" class="ok">确认</a></div>
-                                </li>
-                            </ul>
-                        </div>
+                        <!--<div class="add-tanchuang">-->
+                            <!--<ul>-->
+                                <!--<li>-->
+                                    <!--<div class="fl">数量：</div>-->
+                                    <!--<div class="fr">-->
+                                        <!--<div class="btn-wrap">-->
+	                                        <!--<span class="number">-->
+	                                            <!--<a href="###" class="reduce">-</a>-->
+	                                            <!--<input type="text" value="100">-->
+	                                            <!--<a href="###" class="add">+</a>-->
+	                                        <!--</span>-->
+                                        <!--</div>-->
+                                    <!--</div>-->
+                                <!--</li>-->
+                                <!--<li>-->
+                                    <!--<div class="fl">交期：</div>-->
+                                    <!--<div class="fr"><input type="text" class="price-input" value="时间选择"></div>-->
+                                <!--</li>-->
+                                <!--<li>-->
+                                    <!--<div class="fl">单价：</div>-->
+                                    <!--<div class="fr"><input type="text" class="price-input" value="￥1.23"></div>-->
+                                <!--</li>-->
+                                <!--<li class="add-btn">-->
+                                    <!--<div class="fl">&nbsp;</div>-->
+                                    <!--<div class="fr"><a href="javascript:void(0);" class="off">取消</a><a href="javascript:void(0);" class="ok">确认</a></div>-->
+                                <!--</li>-->
+                            <!--</ul>-->
+                        <!--</div>-->
                     </td>
                 </tr>
                 </tbody>

src/main/webapp/resources/view/usercenter/b2b/Purc/inquiry_unapply.html

@@ -0,0 +1,794 @@
+<style>
+  .condition .more.open {
+    margin-top: 10px;
+    height: 36px;
+    opacity: 1;
+  }
+
+  .condition .more .form-group {
+    margin-bottom: 10px;
+  }
+
+  .inquiry-table .header>th {
+    height: 38px;
+    text-align: center;
+    background: #f5f5f5;
+    binquiry-top: 1px solid #e8e8e8;
+    binquiry-bottom: 1px solid #e8e8e8;
+  }
+
+  .inquiry-table .sep-row {
+    height: 10px;
+  }
+
+  .inquiry-table .selector {
+    vertical-align: middle;
+    margin: 0 0 2px 0;
+  }
+
+  .toolbar label {
+    margin-right: 10px;
+    margin-bottom: 0;
+  }
+
+  .toolbar .select_all {
+    margin: 0 6px 0 10px;
+    line-height: 20px;
+  }
+
+  .toolbar .btn {
+    -moz-binquiry-radius: 2px;
+    margin-right: 5px;
+    binquiry: 1px solid #dcdcdc;
+    binquiry-radius: 2px;
+    -webkit-binquiry-radius: 2px;
+  }
+
+  .inquiry-table .inquiry-hd {
+    background: #f5f5f5;
+    height: 40px;
+    line-height: 40px;
+  }
+  .inquiry-table .inquiry-hd td{
+    text-align: center;
+  }
+  .inquiry-table .inquiry-hd td.first {
+    padding-left: 20px;
+    text-align: left;
+  }
+
+  .inquiry-table .inquiry-hd .inquiry-main span {
+    margin-right: 8px;
+  }
+
+  .inquiry-table .inquiry-hd .inquiry-code {
+    font-style: normal;
+    font-family: verdana;
+  }
+
+  .inquiry-table .inquiry-hd .inquiry-sum {
+    padding: 0 5px;
+  }
+
+  .inquiry-table>tbody {
+    binquiry: 1px solid transparent;
+  }
+
+  .inquiry-table>tbody:hover {
+    binquiry-color: #d32526;
+    binquiry-width: 2px;
+  }
+  .inquiry-table>tbody:hover tr.inquiry-bbd{
+    background: #f8fafe
+  }
+  .inquiry-table .operates {
+    display: none;
+  }
+
+  .inquiry-table .operates i {
+    padding: 0 2px;
+  }
+
+  .inquiry-table>tbody:hover .operates {
+    display: block;
+  }
+  .inquiry-table>tbody:hover .operates-status {
+    display: none;
+  }
+
+
+  .inquiry-table .inquiry-bd {
+    border-top: 1px solid #e6e6e6;
+  }
+
+  .inquiry-table .inquiry-bd>td {
+    padding: 10px 5px;
+    vertical-align: top;
+    position: relative;
+  }
+
+  .inquiry-table .inquiry-bd .product {
+    padding-left: 20px;
+  }
+
+  .inquiry-table .inquiry-bd .inquiry-number {
+    position: absolute;
+    top: -1px;
+    left: 1px;
+    width: 20px;
+    height: 20px;
+    line-height: 20px;
+    text-align: center;
+    background: #f5f5f5;
+    font-weight: 500;
+    binquiry: solid 1px #d5d5d5;
+    binquiry-radius: 0 0 10px 0;
+  }
+
+  .inquiry-table .inquiry-bd .inquiry-number.key {
+    background: #56a022;
+    color: #ffffff;
+  }
+
+  .unPrinted {
+    color: #56a022;
+  }
+
+  .info-container .info:hover {
+    color: #CC3333;
+  }
+
+  /*增加样式*/
+  .view-slide-in {
+    /*margin-top: 20px;*/
+  }
+  .view-slide-in .block {
+    background: #f5f5f5;
+  }
+  .view-slide-in .group-container {
+    background: #fff;
+    margin-bottom: 10px;
+  }
+  .view-slide-in .group-container .btn-group {
+    width: 160px;
+    border: none;
+    height: 45px;
+  }
+  .view-slide-in .group-container .btn-group .btn {
+    color: #000;
+  }
+  .view-slide-in .group-container .btn-group .btn-info {
+    color: #d32526;
+    background: #fff;
+    border: none;
+  }
+  .view-slide-in .group-container .btn-group .btn {
+    border: none;
+    font-size: 16px;
+    font-family: "Microsoft YaHei", "微软雅黑";
+  }
+  .view-slide-in .group-container .btn-group .btn em {
+    color: #d32526;
+    font-style: inherit;
+  }
+  .view-slide-in .group-container .btn-group .btn:hover {
+    background: #fff;
+    color: #d32526;
+  }
+  .inquiry-table>tbody:hover{
+    border: #3f84f6 2px solid;
+  }
+  .view-slide-in .group-container {
+    padding: 0;
+  }
+  .view-slide-in .search-bg {
+    margin-top: 15px;
+    margin-bottom: 15px;
+  }
+  #topSearch {
+    font-size: 18px;
+  }
+  .view-slide-in #topSearch .search-bg i {
+    color: #999;
+    margin-left: 10px;
+  }
+  .form-group-sm .form-control-feedback {
+    width: 85px;
+    height: 36px;
+    line-height: 36px;
+    color: #fff;
+    background: #3f84f6;
+    text-align: center;
+    font-size: 14px;
+    cursor: pointer;
+  }
+  #topSearch .input-sm, .form-group-sm .form-control {
+    height: 36px;
+    line-height: 36px;
+    border: #3f84f6 1px solid;
+    border-radius: 0px;
+    font-size: 14px;
+  }
+  .search-bg .col-xs-6,.search-bg .row {
+    padding-right: 0;
+  }
+  .order-table .company-list,.order-table .order-hd:first-child {
+    background: #fff;
+    font-size: 16px;
+    height: 55px;
+    line-height: 55px;
+    border-bottom: #ddd 1px solid;
+  }
+  .order-table .company-list {
+    width:100%;
+    height: 190px;
+    border-bottom: 20px solid #f5f5f5;
+  }
+  .order-table .order-hd span.margin-left20 {
+    margin-left: 20px;
+  }
+  .order-table .product {
+    line-height: 25px;
+    font-size: 14px;
+  }
+  .order-table .product span {
+    margin-right: 10px;
+  }
+  .grey01 {
+    color: #969595;
+    font-size: 14px;
+    text-align: center;
+  }
+  .order-table .btn {
+    border-radius: 0;
+    width: 94px;
+    height: 36px;
+    color: #fff;
+  }
+  .order-table .btn01 {
+    color: #3f84f6;
+    background: #fff;
+    border: none;
+    font-size: 16px;
+  }
+  .order-table .order-hd td.first {
+    line-height: 25px;
+    font-size: 14px;
+    padding-top: 10px;
+    padding-bottom: 10px;
+  }
+  .search-bg .input-group-addon{
+    width: 85px;
+    height: 36px;
+    display: inline-block;
+    background: #3f84f6;
+    font-size: 16px;
+    text-align: center;
+    line-height: 36px;
+    color: #fff;
+    padding: 0;
+    border: none;
+    border-radius: 0;
+    position: absolute;
+    top: 0;
+    right: 0;
+  }
+  .inquiry-hd td{
+    border-bottom: #e8e8e8 1px solid;
+  }
+  .search-bg .form-group{
+    position: relative;
+  }
+</style>
+<style>
+  .com_tab {
+    height: 40px;
+    margin-bottom: 10px;
+  }
+  .com_tab ul {
+    width: 100%;
+    margin: 0 auto;
+    height: 40px;
+    line-height: 40px;
+    background: #fff;
+  }
+  .com_tab ul li {
+    height: 40px;
+    text-align: center;
+    float: left;
+    position: relative;
+    min-width: 110px;
+  }
+  .com_tab:nth-of-type(1) ul li.active > a {
+    border-bottom: #fff;
+    background: #5078cb;
+    color: #fff !important;
+  }
+  .com_tab ul li a {
+    min-width: 110px;
+  }
+  .com_tab ul li > a {
+    font-size: 14px;
+    height: 40px;
+    padding: 0 20px;
+    display: inline-block;
+  }
+  .com_tab:nth-of-type(1) ul li::after {
+    background:url('/static/img/vendor/images/downicon.png')
+    width: 11px;
+    height: 6px;
+    position: absolute;
+    bottom: 0px;
+    left: 50%;
+    content: ' ';
+    margin-left: -5px;
+    display: none;
+  }
+  .com_tab ul li::after {
+    background:url('/static/img/vendor/images/downicon.png');
+    width: 11px;
+    height: 6px;
+    position: absolute;
+    bottom: 0px;
+    left: 50%;
+    content: ' ';
+    margin-left: -5px;
+    display: none;
+  }
+  .com_tab ul li.active:after {
+    display: block;
+  }
+  .oder01 ul li.active a{
+    border-bottom: 1px solid #fff;
+    color: #f15601;
+  }
+  .oder01 ul li.active a em {
+    color: #f15601;
+  }
+  .oder01 ul li a em {
+    color: #323232
+  }
+  .screen {
+    background: #fff;
+    padding-top: 10px;
+    padding-right: 11px;
+    line-height: 32px;
+    padding-left: 22px;
+    width: 100%;
+    height: 50px;
+    position: relative;
+  }
+  .screen .sreach input {
+    border: #5078cb 1px solid;
+    height: 32px;
+    width: 280px;
+    box-shadow: none;
+    padding-left: 10px;
+    background: #fff;
+    float: left;
+    vertical-align: middle;
+    font-size: 14px;
+  }
+  .screen .sreach a.seek {
+    width: 58px;
+    height: 32px;
+    background: #5078cb;
+    color: #fff;
+    line-height: 32px;
+    float: none;
+    border-radius: 2px;
+    vertical-align: unset;
+  }
+  .order-table {
+    background: #fff;
+    width: 100%;
+  }
+  .order-table .header > th {
+    height: 38px;
+    text-align: center;
+    background: #fff;
+    border-top: 1px solid #e8e8e8;
+    border-bottom: 1px solid #e8e8e8;
+    font-size: 14px;
+  }
+
+  .order-table .sep-row {
+    height: 10px;
+  }
+
+  .order-table .selector {
+    vertical-align: middle;
+    margin: 0 0 2px 0;
+  }
+
+  .toolbar label {
+    margin-right: 10px;
+    margin-bottom: 0;
+  }
+
+  .toolbar .select_all {
+    margin: 0 6px 0 10px;
+    line-height: 20px;
+  }
+
+  .toolbar .btn {
+    -moz-border-radius: 2px;
+    margin-right: 5px;
+    border: 1px solid #dcdcdc;
+    border-radius: 2px;
+    -webkit-border-radius: 2px;
+  }
+
+  .order-table .order-hd {
+    background: #f5f5f5;
+    height: 40px;
+    line-height: 40px;
+  }
+
+  .order-table .order-hd td.first {
+    padding-left: 20px;
+  }
+
+  .order-table .order-hd .order-main span {
+    margin-right: 8px;
+  }
+
+  .order-table .order-hd .order-code {
+    font-style: normal;
+    font-family: verdana;
+  }
+
+  .order-table .order-hd .order-sum {
+    position: relative;
+    padding: 0 5px;
+  }
+
+  .order-table .order-hd .dropdown-toggle {
+    line-height: 40px;
+    display: block;
+    color: #5078cb;
+    /*padding: 0 10px;*/
+  }
+
+
+  .order-table .operates {
+    display: none;
+  }
+
+  .order-table > tbody:hover .operates {
+    display: block;
+  }
+
+  .order-table .order-bd {
+    border-bottom: 1px solid #e6e6e6;
+  }
+
+  .order-table .order-bd > td {
+    padding: 10px 5px;
+  }
+
+  .order-table .order-bd .product {
+    padding-left: 20px;
+  }
+
+  .input-xs, .input-group-xs > .form-control, .input-group-xs > .input-group-addon, .input-group-xs > .input-group-btn > .btn {
+    height: 26px;
+    padding: 0 5px;
+    font-size: 12px;
+    line-height: 1.5;
+    border-radius: 3px;
+  }
+  .order-table .order-hd .dropdown-toggle:hover + .order-snapshot {
+    display: block;
+  }
+  .order-table .order-hd .order-snapshot{
+    padding: 10px 15px;
+    display: none;
+    width: 250px;
+    position: absolute;
+    top: 32px;
+    left: 39px;
+    border: 1px solid rgba(0,0,0,0.15);
+    -webkit-box-shadow: 0 0 5px rgba(0,0,0,0.3);
+    -moz-box-shadow: 0 0 5px rgba(0,0,0,0.3);
+    -o-box-shadow: 0 0 5px rgba(0,0,0,0.3);
+    box-shadow: 0 0 5px rgba(0,0,0,0.3);
+  }
+  .order-snapshot .title {
+    border-top: 1px dashed #ddd;
+  }
+
+  .order-snapshot .dl-horizontal dt {
+    width: 60px;
+    text-align: left;
+    font-weight: normal;
+    color: #999;
+    padding: 4px 0;
+  }
+
+  .order-snapshot .dl-horizontal dd {
+    margin-left: 80px;
+    padding: 4px 0;
+  }
+
+  /*arrow*/
+  .order-send {
+    position: relative;
+  }
+
+  .order-send.arrow-border:before, .arrow-border:after {
+    content: '';
+    position: absolute;
+    top: 20px;
+    width: 0;
+    height: 0;
+    border: 7px solid transparent;
+  }
+
+  .order-send.arrow-border.arrow-bottom-right:before {
+    content: '';
+    position: absolute;
+    left: -13px;
+    border-bottom-color: #fff;
+    border-right-color: #fff;
+    margin-top: -10px;
+  }
+
+  .menu .new-dot {
+    width: 20px;
+    height: 20px;
+    line-height: 20px;
+    font-size: 12px;
+    color: #fff;
+    font-weight: inherit;
+    top: -2px;
+  }
+  .f14{
+    font-size:14px;
+  }
+  .screen .sreach input {
+    width: 288px
+  }
+  .modal {
+    position: fixed;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 1050;
+    display: none;
+    overflow: hidden;
+    -webkit-overflow-scrolling: touch;
+    outline: 0;
+    margin: 0 !important;
+  }
+  .modal-open .modal {
+    overflow-x: hidden;
+    overflow-y: auto;
+  }
+  #empty {
+    padding: 70px 0;
+    margin: 0 auto;
+    text-align: center;
+  }
+  #empty .left_img {
+    display: inline-block;
+    color: #3f84f6;
+  }
+  #empty .left_img a {
+    font-size: 25px;
+    color: #3f84f6;
+  }
+  #empty .right_link p {
+    margin: 0;
+    font-size: 14px;
+    color: #666;
+  }
+  #empty_info .empty_title {
+    color: #3f84f6;
+    font-size: 18px;
+  }
+  #empty_info .empty_explain {
+    font-size: 16px;
+    color: #999;
+  }
+  #empty_info .empty_explain .info {
+    text-indent: -22px;
+  }
+  .f16 {
+    font-size: 16px !important;
+  }
+  .f14 {
+    font-size: 14px !important;
+  }
+  #empty_info {
+    padding-left: 60px;
+    padding-bottom: 40px;
+  }
+  table tbody tr td {
+    border-bottom: #e8e8e8 1px solid;
+    border-right: #e8e8e8 1px solid;
+    font-size: 14px;
+    color: #333;
+  }
+  .ng-table-pager::after {
+    clear: both;
+    content: ' ';
+    zoom: 1;
+    display: block;
+    visibility: hidden;
+  }
+  .ng-table-pager {
+    padding-right: 20px;
+    padding-top: 50px;
+    margin-right: 0 !important;
+  }
+  .text-mns {
+    padding-right: 15px;
+    position: absolute;
+    bottom: 64px;
+    right: 20px;
+    font-size: 12px;
+  }
+  .Boom18 {
+    bottom: 18px;
+  }
+  .fixed {
+    width: 40px;
+  }
+  .text-trans {
+    left: 50%;
+    right: auto;
+    top: 50%;
+    margin: -20px 0 0 -40px;
+  }
+  .oder01 ul li {
+    margin-left: 0px
+  }
+  .order-table .inquiry-bd .order-number {
+    position: absolute;
+    top: -1px;
+    left: -1px;
+    width: 20px;
+    height: 20px;
+    line-height: 20px;
+    text-align: center;
+    background: #f9f9f9;
+    font-weight: 500;
+    border: solid 1px #d5d5d5;
+    border-radius: 0 0 10px 0;
+  }
+</style>
+<!--<link rel="stylesheet" href="static/css/public.css">-->
+<div class="user_right fr" style="position: relative">
+  <div class="com_tab" style="margin-bottom: 10px">
+    <ul class="fl" style="width: 100%">
+      <li><a ui-sref="purchaseinquiry">采购询价</a></li>
+      <li class="active"><a>待发布</a></li>
+      <!--<li class="down-purchase" style="margin-right: 0;min-width: 80px">-->
+      <!--<a ui-sref="purc_tenderanswerlist" style="color: #5078cb;line-height: 40px;padding: 0;min-width: 80px"><i class="fa fa-external-link-square fa-fw"></i>待发布</a>-->
+      <!--</li>-->
+
+    </ul>
+  </div>
+  <div class="oder01" style="margin-bottom: 10px">
+    <ul>
+      <li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>已发布</a></li>
+      <li ng-class="{'active': active=='todo'}" ng-click="setActive('todo')"><a>待发布</a></li>
+    </ul>
+  </div>
+  <table class="order-table inquiry-table block" ng-table="tableParams">
+    <thead>
+    <tr class="header">
+      <th width="280">商品</th>
+      <th width="120">编号</th>
+      <th width="100">录入人</th>
+      <th width="120">截止日期</th>
+      <!--<th width="180">备注</th>-->
+      <th width="240" colspan="2">供应商</th>
+      <th width="100">操作</th>
+    </tr>
+    <!--<tr class="sep-row">-->
+      <!--<td colspan="6"></td>-->
+    <!--</tr>-->
+    </thead>
+    <tbody ng-if="tableParams.total() == 0">
+    <tr>
+      <td colspan="6">
+        <div id="empty">
+          <div class="left_img">
+            <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+            <a href="#/index" title="B2B商务首页">B2B 商务</a>
+          </div>
+          <div class="right_link">
+            <p>当前没有对应的询价单！</p>
+          </div>
+        </div>
+      </td>
+    </tr>
+    <tr>
+      <td colspan="6">
+        <div id="empty_info">
+          <div class="f16 text-center empty_title">
+            <p>为什么我没有询价单？</p>
+          </div>
+          <div class="f14 empty_explain">
+            <div class="info">
+              <p>1、您的采购单在ERP系统上还没审核，订单无法上传到平台<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>
+        </div>
+      </td>
+    </tr>
+    </tbody>
+    <tbody ng-repeat="inquiry in $data track by inquiry.id">
+    <tr class="inquiry-hd" ng-dblclick="inquiry.$collapsed=!inquiry.$collapsed" ng-class="{'text-bold': inquiry.display>0}">
+      <td class="first" width="200px">
+        <div class="inquiry-main">
+					<span> {{$index+1}}
+					</span>
+          &nbsp;<span class="text-num text-bold"
+                      ng-bind="::inquiry.date | date:'yyyy-MM-dd'"></span>
+        </div>
+      </td>
+      <td colspan="1"><span ng-bind="::inquiry.code"></span></td>
+      <td colspan="1" class="text-center">{{::inquiry.recorder}}</td>
+      <td colspan="1" class="inquiry-sum">
+        <div >
+          <span class="text-inverse text-bold" ng-bind="::inquiry.endDate| date: 'yyyy-MM-dd'"></span>
+        </div>
+      </td>
+      <td colspan="2" class="text-center">
+        备注：<span ng-bind="::inquiry.remark"></span>
+      </td>
+      <td colspan="1" class="text-center">
+        <a ng-click="submit(inquiry.id)" ng-if="inquiry.isOpen==0 && inquiry.enteryStatus != 313" style="color:#5078cb;font-size: 14px">提交</a>
+        <a ng-click="publish(inquiry.id)" ng-if="inquiry.isOpen==1 && inquiry.enteryStatus != 313" style="color:#5078cb;font-size: 14px">发布</a>
+        <a ng-click="clearOrder(inquiry.id)" ng-if="inquiry.enteryStatus != 313" style="color:#5078cb;font-size: 14px">删除</a>
+      </td>
+    </tr>
+    <tr class="inquiry-bd inquiry-bbd" ng-repeat="item in inquiry.inquiryItems track by item.id"
+        ng-if="!inquiry.$collapsed ">
+      <td class="product">
+        <div class="text-num order-number" ng-class="{'key': item.key&&inquiry.$showAll}" title="第{{::item.number + 1}}行">{{::item.number + 1}}</div>
+        <!--<div class="text-num inquiry-number" ng-class="{'key': item.key&&inquiry.$showAll}" title="第{{::item.number+1}}行">{{::item.number + 1}}</div>-->
+        <div class="text-num text-bold">
+          <span ng-bind="::item.prodCode"></span>
+        </div>
+        <div>
+          <span ng-bind="::item.prodTitle"></span>
+        </div>
+        <div class="text-muted"
+             ng-bind="::item.spec"></div>
+        <div class="text-muted text-bold" ng-if="item.currency"><span ng-bind="::item.currency"></span></div>
+      </td>
+      <td class="text-center">
+        <div class="text-muted">税率：{{::item.taxrate || 0}}%</div>
+      </td>
+      <td class="text-center">
+        <div class="text-num" ng-bind="::item.qty"></div>
+        <div class="text-muted" ng-bind="::item.unit"></div>
+        <div style="margin: 0 auto" ng-if="item.$editing">
+          <input type="number" ng-model="item.reply.qty" min="0" max="{{item.qty}}"
+                 ng-init="item.reply.qty=item.qty-item.replyQty"
+                 class="form-control input-xs" placeholder="0~{{item.qty-item.replyQty}}">
+        </div>
+      </td>
+      <td class="text-center br-l">
+        <div class="text-num" ng-bind="::item.toDate | date:'yyyy-MM-dd'"></div>
+      </td>
+      <td ng-bind="::item.enterprise.enName" colspan="2"></td>
+      <td class="text-center"><a ng-click="deleteById(item.id)"  ng-if="inquiry.enteryStatus != 313"style="color:#5078cb;font-size: 14px;width: 40px;height: 24px;line-height: 24px;text-align: center;border: 1px solid #5078cb;border-radius: 2px;display: inline-block">删除</a></td>
+    </tr>
+    </tbody>
+  </table>
+</div>

src/main/webapp/resources/view/usercenter/b2b/Purc/purchaseInquiryCtrl.html

@@ -199,6 +199,9 @@
     border-width: 2px;
   }
 
+  .order-table>tbody:hover  .order-bd {
+    background: #f8fafe
+  }
   .order-table .operates {
     display: none;
   }
@@ -663,22 +666,27 @@
   <div class="com_tab" style="margin-bottom: 10px">
     <ul class="fl" style="width: 100%">
       <li class="active"><a >采购询价</a></li>
+      <li><a ui-sref="purc_inquiry_unapply">待发布</a></li>
+      <li class="down-purchase" style="margin-right: 0;color: #fff;min-width: 80px">
+        <a href="#" style="color: #5078cb;padding: 0;min-width: 80px" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i style="color: #5078cb;" class="fa fa-file-text fa-fw"></i>导出</a>
+      </li>
+      <li class="down-purchase" style="margin-right: 0;color: #fff;min-width: 80px">
+        <a style="color: #5078cb;padding: 0;min-width: 80px" ui-sref="purc_inquiry_new"><i style="color: #5078cb;" class="fa fa-plus-square fa-fw"></i>新增</a>
+      </li>
       <!--<li class="down-purchase" style="margin-right: 0;min-width: 80px">-->
-        <!--<a ui-sref="purc_tender"  style="color: #5078cb;line-height: 40px;min-width: 80px;padding: 0;" type="button" title="新增招标单" class="btn btn-tender">-->
-          <!--<i class="fa fa-plus-square fa-fw"></i>新增-->
-        <!--</a>-->
-      <!--</li>-->
-      <!--<li class="down-purchase" style="margin-right: 0">-->
-        <!--<a ui-sref="purc_tenderanswerlist" style="color: #5078cb;line-height: 40px;padding: 0;">招标提问列表</a>-->
+        <!--<a ui-sref="purc_tenderanswerlist" style="color: #5078cb;line-height: 40px;padding: 0;min-width: 80px"><i class="fa fa-external-link-square fa-fw"></i>待发布</a>-->
       <!--</li>-->
+
     </ul>
   </div>
   <div class="oder01" style="margin-bottom: 0px">
     <ul>
-      <li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部</a></li>
-      <li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>待评标</a></li>
-      <li ng-class="{'active': active=='todo'}" ng-click="setActive('todo')"><a>待投标</a></li>
-      <li ng-class="{'active': active=='waiting'}" ng-click="setActive('waiting')"><a>待发布</a></li>
+      <li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部<span ng-if="unread.replied>0">(<em ng-class="{'color-black': !unread.replied }" ng-bind="unread.replied || 0"></em>)</span></a></li>
+      <li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>已报价<span>(<em ng-class="{'color-black': !unread.replied }" ng-bind="unread.replied || 0"></em>)</span></a></li>
+      <li ng-class="{'active': active=='todo'}" ng-click="setActive('todo')"><a>待报价</a></li>
+      <li ng-class="{'active': active=='agreed'}" ng-click="setActive('agreed')"><a>已采纳</a></li>
+      <li ng-class="{'active': active=='refused'}" ng-click="setActive('refused')"><a>未采纳</a></li>
+      <li ng-class="{'active': active=='end'}" ng-click="setActive('end')"><a>已失效</a></li>
     </ul>
   </div>
   <div class="screen check-filter">
@@ -820,7 +828,7 @@
           <span>流水号：<a title="查看详情"
                        style="color:#3c7cf5"
                        class="text-num order-detail" ng-bind="::inquiryItem.inquiry.code" target="_self"
-                       ui-sref="purc_inquiry_detail({id:inquiryItem.inquiry.id})"
+                       ui-sref="purc_inquiryInfo_detail({id:inquiryItem.inquiry.id})"
                        ng-click="setOrdersRead(inquiryItem.id)"></a></span>
           <!--href="#/purc/purcinquirydetail/{{inquiryItem.inquiry.id}}"-->
           <span>
@@ -997,8 +1005,9 @@
       <td class="text-center br-l" ng-if="inquiryItem.overdue != 1">
         <div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == null && inquiryItem.invalid != 1" class="block">
           <div ng-if="inquiryItem.replies.length > 0" class="text-muted" style="padding-top: 50px;">
-            <a ng-click="accept(inquiryItem.id);setOrdersRead(inquiryItem.id)">采纳</a>
-            <a ng-click="refuse(inquiryItem.id);setOrdersRead(inquiryItem.id)">拒绝</a></div>
+            <a ng-click="accept(inquiryItem.id);setOrdersRead(inquiryItem.id)" style="width: 40px;height: 24px;line-height: 24px;color:#3c7cf5;border:1px solid #3c7cf5">采纳</a>
+            <a ng-click="refuse(inquiryItem.id);setOrdersRead(inquiryItem.id)" style="width: 40px;height: 24px;line-height: 24px;color:#3c7cf5;border:1px solid #3c7cf5">拒绝</a>
+          </div>
         </div>
         <div ng-if="inquiryItem.invalid == 1" class="block">
           <span class="text-trans text-light">已失效</span>

src/main/webapp/resources/view/usercenter/b2b/Purc/tenderlist.html

@@ -532,8 +532,8 @@
     </div>
     <div class="oder01" style="margin-bottom: 0px">
       <ul>
-        <li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部</a></li>
-        <li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>待评标</a></li>
+        <li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部(<em ng-class="{'color-black': !unread.all }" ng-bind="unread.all || 0"></em>)</a></li>
+        <li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>待评标(<em ng-class="{'color-black': !unread.notReply }" ng-bind="unread.notReply || 0"></em>)</a></li>
         <li ng-class="{'active': active=='todo'}" ng-click="setActive('todo')"><a>待投标</a></li>
         <li ng-class="{'active': active=='waiting'}" ng-click="setActive('waiting')"><a>待发布</a></li>
       </ul>

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

@@ -631,7 +631,7 @@
 						<span class="wd01">单价</span>
 						<span class="wd01">数量</span>
 						<span style="width: 10%">小计</span>
-						<span>物料编码</span>
+						<span>物料编号</span>
 						<span>备注</span>
 					</dt>
 					<div ng-repeat="(key, details) in $$orderDetailsMap track by $index">

src/main/webapp/resources/view/vendor/b2b/sale/sale_accept.html

@@ -417,11 +417,11 @@
         <div class="text-num text-bold">
 						<span  title="{{item.orderItem.product.code}}"
                   ng-if="item.orderItem.product.code != null">
-              物料编码：{{item.orderItem.product.code}}
+              物料编号：{{item.orderItem.product.code}}
             </span>
           <span title="{{item.product.code}}"
             ng-if="item.orderItem.product.code == null">
-            物料编码：{{item.product.code}}
+            物料编号：{{item.product.code}}
           </span>
         </div>
         <div>

src/main/webapp/resources/view/vendor/b2b/sale/sale_badOut.html

@@ -428,7 +428,7 @@
 
         <div class="text-num text-bold" title="{{::item.orderItem.product.code}}">
           <span >
-            物料编码：{{::item.orderItem.product.code}}
+            物料编号：{{::item.orderItem.product.code}}
           </span>
         </div>
         <div title="{{::item.orderItem.product.title}}">

src/main/webapp/resources/view/vendor/b2b/sale/sale_make_accept.html

@@ -443,7 +443,7 @@
         <div class="text-num order-number" class="key" title="第{{$index + 1}}行">{{$index + 1}}</div>
         <div class="text-num text-bold" title="{{item.order.product.code}}">
           <span>
-            物料编码：{{item.order.product.code}}
+            物料编号：{{item.order.product.code}}
           </span>
         </div>
         <div title="{{item.order.product.title}}">

src/main/webapp/resources/view/vendor/b2b/sale/sale_make_returns.html

@@ -423,7 +423,7 @@
     <tr class="order-bd" ng-repeat="item in returns.returnItems">
       <td class="product" style="text-align: left">
         <div class="text-num text-bold" title="{{::item.order.product.code}}">
-          <span>物料编码：{{::item.order.product.code}}</span>
+          <span>物料编号：{{::item.order.product.code}}</span>
         </div>
         <div title="{{::item.order.product.title}}">
           <span style="color: #666 !important;">

src/main/webapp/resources/view/vendor/b2b/sale/sale_returns.html

@@ -428,7 +428,7 @@
       <td class="product" style="text-align: left">
         <div class="text-num text-bold">
           <span>
-            物料编码：{{::item.product.code}}
+            物料编号：{{::item.product.code}}
           </span>
         </div>
         <div>

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

@@ -428,7 +428,7 @@
 						<span class="wd01">单价</span>
 						<span style="width: 10%;">数量</span>
 						<span class="wd01">小计</span>
-						<span class="wd01">物料编码</span>
+						<span class="wd01">物料编号</span>
 						<span class="wd01">备注</span>
 					</dt>
 					<!--<dd>-->