1、买家中心采购询价恢复

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

@@ -580,7 +580,17 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
             templateUrl: "static/view/usercenter/b2b/Purc/purchaseInquiryCtrl.html",
             controller: 'PurchaseInquiryCtrl',
             controllerUrl: 'app/controllers/b2b/Purc/purchaseInquiryCtrl'
-        })).state('purc_cart', angularAMD.route({
+        })).state('purc_inquiryInfo_detail', angularAMD.route({
+			      url: "/purcinquirydetail/:id",
+			      templateUrl: "static/view/usercenter/b2b/Purc/inquiryInfo_detail.html",
+			      controller: 'PurcInquiryInfoDetailCtrl',
+            controllerUrl: 'app/controllers/b2b/Purc/inquiryInfo_detail'
+			    })).state('purc_inquiry_unapply', angularAMD.route({
+			      url: "/inquiry_unapply",
+			      templateUrl: "static/view/usercenter/b2b/Purc/inquiry_unapply.html",
+			      controller: 'UnapplyInquiryCtrl',
+						controllerUrl: 'app/controllers/b2b/Purc/inquiry_unapply'
+			    })).state('purc_cart', angularAMD.route({
             url: "/purc/cart",
             title: '买家中心-B2b采购购物车',
             templateUrl: "static/view/usercenter/b2b/Purc/cart.html",

src/main/webapp/resources/js/usercenter/controllers/b2b/fa/arCheck_detail.js

@@ -1,7 +1,8 @@
 define(['app/app'], function(app) {
 // 应付对账单详情页
-  app.register.controller('SaleArCheckDetailCtrl', ['$scope', '$stateParams', 'B2bFaArCheck', 'toaster', '$state', 'BaseService', function ($scope, $stateParams, FaArCheck, toaster, $state, BaseService) {
+  app.register.controller('SaleArCheckDetailCtrl', ['$rootScope','$scope', '$stateParams', 'B2bFaArCheck', 'toaster', '$state', 'BaseService', function ($rootScope, $scope, $stateParams, FaArCheck, toaster, $state, BaseService) {
     BaseService.scrollBackToTop();
+    $rootScope.active = 'buyer_pay_center'
     var loadData = function () {
       FaArCheck.get({id: $stateParams.id}, function (data) {
         $scope.order = data;

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

@@ -680,12 +680,12 @@
   <table class="order-table inquiry-table block" ng-table="tableParams">
     <thead>
     <tr class="header">
-      <th width="280">商品</th>
+      <th width="360">商品</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="160" colspan="2">供应商</th>
       <th width="100">操作</th>
     </tr>
     <!--<tr class="sep-row">-->
@@ -747,7 +747,7 @@
           <span class="text-inverse text-bold" ng-bind="::inquiry.endDate| date: 'yyyy-MM-dd'"></span>
         </div>
       </td>
-      <td colspan="2" class="text-center">
+      <td colspan="2">
         备注：<span ng-bind="::inquiry.remark"></span>
       </td>
       <td colspan="1" class="text-center">
@@ -762,13 +762,12 @@
         <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>
+          <span ng-bind="" title="{{::item.prodCode}}">物料编号：{{::item.prodCode}}</span>
         </div>
-        <div>
-          <span ng-bind="::item.prodTitle"></span>
+        <div title="{{::item.prodTitle}}">
+          <span>物料名称：{{::item.prodTitle}}</span>
         </div>
-        <div class="text-muted"
-             ng-bind="::item.spec"></div>
+        <div class="text-muted" title="{{::item.spec}}">物料规格：{{::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">

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

@@ -626,6 +626,7 @@
   table tbody tr td {
     border-bottom: #e8e8e8 1px solid;
     border-right: #e8e8e8 1px solid;
+    border-left:1px solid #e8e8e8;
     font-size: 14px;
     color: #333;
   }

src/main/webapp/resources/view/usercenter/b2b/fa/arCheck_detail.html

@@ -225,47 +225,47 @@
     </div>
       <div class="row row-sm item">
         <div class="col-xs-6">
-          <span class="title">供应商</span>
+          <span class="title">供应商：</span>
           <div class="content" ng-bind="::order.vendor.enName"></div>
         </div>
         <div class="col-xs-6">
-          <span class="title">对账期间</span>
+          <span class="title">对账期间：</span>
           <div class="content text-num">{{::order.fromDate | date:'yyyy/MM/dd'}} - {{::order.toDate | date:'yyyy/MM/dd'}}</div>
         </div>
       </div>
       <div class="row row-sm item">
         <div class="col-xs-6">
-          <span class="title">单据编号</span>
+          <span class="title">单据编号：</span>
           <div class="content text-num" ng-bind="::order.code"></div>
         </div>
         <div class="col-xs-6">
-          <span class="title">录单日期</span>
+          <span class="title">录单日期：</span>
           <div class="content" ng-bind="::order.date | date:'MM月dd日 HH:mm'"></div>
         </div>
       </div>
       <div class="row row-sm item">
         <div class="col-xs-6">
-          <span class="title">录单人</span>
+          <span class="title">录单人：</span>
           <div class="content" ng-bind="::order.recorder"></div>
         </div>
         <div class="col-xs-6">
-          <span class="title">审批人</span>
+          <span class="title">审批人：</span>
           <div class="content" ng-bind="::order.auditor"></div>
         </div>
       </div>
       <div class="row row-sm item">
         <div class="col-xs-6">
-          <span class="title">应收日期</span>
+          <span class="title">应收日期：</span>
           <div class="content" ng-bind="::order.arDate | date:'MM月dd日'"></div>
         </div>
         <div class="col-xs-6">
-          <span class="title">对方业务员</span>
+          <span class="title">对方业务员：</span>
           <div class="content" ng-bind="::order.sellerName"></div>
         </div>
       </div>
       <div class="row row-sm item" ng-if="order.remark">
         <div class="col-xs-12">
-          <span class="title">供应商备注</span>
+          <span class="title">供应商备注：</span>
           <div class="content" ng-bind="::order.remark"></div>
         </div>
       </div>
@@ -276,32 +276,32 @@
     </div>
     <div class="row row-sm item">
       <div class="col-xs-3">
-        <span class="title">对账总额</span>
+        <span class="title">对账总额：</span>
         <div class="content text-num" ng-bind="::order.checkAmount | number:6"></div>
       </div>
       <div class="col-xs-3">
-        <span class="title">币别</span>
+        <span class="title">币别：</span>
         <div class="content" ng-bind="::order.currency"></div>
       </div>
       <div class="col-xs-3">
-        <span class="title">汇率</span>
+        <span class="title">汇率：</span>
         <div class="content text-num" ng-bind="::order.rate"></div>
       </div>
       <div class="col-xs-3">
-        <span class="title">付款方式</span>
+        <span class="title">付款方式：</span>
         <div class="content" ng-bind="::order.payments"></div>
       </div>
     </div>
     <div class="row row-sm item">
       <div class="col-xs-3">
-        <span class="title">本期收账</span>
+        <span class="title">本期收账：</span>
         <div class="content text-num">
           <span ng-bind="order.payAmount | number:6"></span>
           <span ng-if="">-</span>
         </div>
       </div>
       <div class="col-xs-9">
-        <span class="title">期初金额</span>
+        <span class="title">期初金额：</span>
         <div class="content text-num">
           <span ng-if="order.beginAmount" ng-bind="order.beginAmount | number:6"></span>
           <span ng-if="!order.beginAmount">-</span>