Merge remote-tracking branch 'origin/feature-b2b-ssr-wangcz' into feature-b2b-ssr-wangcz

# Conflicts:
#	src/main/webapp/resources/js/common/b2bServices.js
#	src/main/webapp/resources/js/common/controllers/b2bCommonCtrls.js
#	src/main/webapp/resources/js/usercenter/app.js

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

@@ -935,22 +935,22 @@ define([ 'angular', 'common/services', 'common/utils', 'big'], function(angular,
           });
         }])
         .factory('B2bSaleTruck', ['$resource', 'BaseService', function($resource, BaseService) {
-          var b2bPath = BaseService.getB2bUrl();
-          return $resource(b2bPath + 'sale/truck', {}, {
-            save: {
-              isArray: true,
-              method: 'POST'
-            },
-            remove: {
-              isArray: true,
-              method: 'DELETE'
-            },
-            detail: {
-              url: b2bPath +  'sale/truck/items',
-              isArray: true
-            }
-          });
-    }])
+            var b2bPath = BaseService.getB2bUrl();
+            return $resource(b2bPath + 'sale/truck', {}, {
+              save: {
+                isArray: true,
+                method: 'POST'
+              },
+              remove: {
+                isArray: true,
+                method: 'DELETE'
+              },
+              detail: {
+                url: b2bPath +  'sale/truck/items',
+                isArray: true
+              }
+            });
+        }])
         .factory('B2bPurcInquiry', ['$resource', 'BaseService', function($resource, BaseService) {
             var b2bPath = BaseService.getB2bUrl();
             return $resource(b2bPath + '/sale/inquiry/info/search', {}, {
@@ -1812,41 +1812,44 @@ define([ 'angular', 'common/services', 'common/utils', 'big'], function(angular,
                     method: 'GET'
                 }
             })
-        }]).factory('B2bShipAddress', ['$resource', 'BaseService', function($resource, BaseService){
-        var b2bUrl = BaseService.getB2bUrl();
-        return $resource(b2bUrl + '/account/enterprise', {}, {
-            saveAddress: {
-                url: b2bUrl + '/account/enterprise/saveShipAddress',
-                method: 'POST'
-            },
-            shipAddList: {
-                url: b2bUrl + '/account/enterprise/shipAddList',
-                method: 'GET',
-                isArray: true
-            },
-            removeShipAddress: {
-                url: b2bUrl + '/account/enterprise/removeShipAddress/:id',
-                method: 'DELETE'
-            }
-        });
-    }]).factory('B2bRecentPrice', ['$resource', 'BaseService', function($resource, BaseService) {
-        var b2bUrl = BaseService.getB2bUrl();
-        return $resource(b2bUrl + '/sale/inquiry', {}, {
-            // 获取最新的已采纳的价信息
-            agreed: {
-                url: b2bUrl + '/sale/inquiry/recentPrice/:prId',
-                method: 'GET'
-            }
-        });
-    }]).factory('B2bToken', ['$resource', 'BaseService', function($resource, BaseService) {
-        var b2bUrl = BaseService.getB2bUrl();
-        return $resource(b2bUrl + '/token', {}, {
-            info: {
-                url: b2bUrl + '/token',
-                mehtod: 'GET'
-            }
-        })
-    }])
+        }])
+        .factory('B2bShipAddress', ['$resource', 'BaseService', function($resource, BaseService){
+          var b2bUrl = BaseService.getB2bUrl();
+          return $resource(b2bUrl + '/account/enterprise', {}, {
+              saveAddress: {
+                  url: b2bUrl + '/account/enterprise/saveShipAddress',
+                  method: 'POST'
+              },
+              shipAddList: {
+                  url: b2bUrl + '/account/enterprise/shipAddList',
+                  method: 'GET',
+                  isArray: true
+              },
+              removeShipAddress: {
+                  url: b2bUrl + '/account/enterprise/removeShipAddress/:id',
+                  method: 'DELETE'
+              }
+          });
+        }])
+        .factory('B2bRecentPrice', ['$resource', 'BaseService', function($resource, BaseService) {
+            var b2bUrl = BaseService.getB2bUrl();
+            return $resource(b2bUrl + '/sale/inquiry', {}, {
+                // 获取最新的已采纳的价信息
+                agreed: {
+                    url: b2bUrl + '/sale/inquiry/recentPrice/:prId',
+                    method: 'GET'
+                }
+            });
+        }])
+        .factory('B2bToken', ['$resource', 'BaseService', function($resource, BaseService) {
+            var b2bUrl = BaseService.getB2bUrl();
+            return $resource(b2bUrl + '/token', {}, {
+                info: {
+                    url: b2bUrl + '/token',
+                    mehtod: 'GET'
+                }
+            })
+        }])
         .factory('B2bPurchaseOrder', ['$resource', 'BaseService', function($resource, BaseService){
             var b2bUrl = BaseService.getB2bUrl();
             return $resource(b2bUrl + '/purchase', {}, {
@@ -2586,5 +2589,53 @@ define([ 'angular', 'common/services', 'common/utils', 'big'], function(angular,
                 method: 'GET'
             }
         })
+    }])
+        .factory('B2bPurcProduct', ['$resource', 'BaseService', function($resource, BaseService) {
+            var b2bUrl = BaseService.getB2bUrl();
+            return $resource(b2bUrl + '/purcProduct/info/search', {}, {
+            getAll : {
+                isArray : false
+            },
+            getStandard: {
+                params: {
+                    _state: 'standard'
+                }
+            },
+            getNonstandard: {
+                params: {
+                    _state: 'nonstandard'
+                }
+            },
+            setRead:{
+                url: b2bUrl + '/purcProduct/setRead',
+                method: 'POST'
+            },
+            matchbytype: {
+                url: b2bUrl + '/purcProduct/edit/matchbytype/:type',
+                method: 'POST'
+            },
+            exportXls: {
+                url: b2bUrl + '/purcProduct/xls/permission',
+                method: 'GET'
+            }
+        })
+    }])
+        .factory('B2bPurcProductNewest', ['$resource', 'BaseService', function($resource, BaseService) {
+            var b2bUrl = BaseService.getB2bUrl();
+            return $resource(b2bUrl + '/purcProduct/info/nosearch', {}, {
+            getAll : {
+                isArray : false
+            },
+            getStandard: {
+                params: {
+                    _state: 'standard'
+                }
+            },
+            getNonstandard: {
+                params: {
+                    _state: 'nonstandard'
+                }
+            }
+        })
     }]);
 });

src/main/webapp/resources/js/common/controllers/b2bCommonCtrls.js

@@ -373,4 +373,96 @@ define([ 'app/app' ], function(app) {
             $modalInstance.dismiss();
         }
     }]);
+    // 查找供应商
+    app.controller('DbfindVendorCtrl', ['$scope', 'B2bVendor', 'BaseService', 'ngTableParams', 'toaster', '$modalInstance', '$rootScope', function ($scope, Vendor, BaseService, ngTableParams, toaster, $modalInstance, $rootScope) {
+        BaseService.scrollBackToTop();
+        // 搜索框回车
+        $scope.onSearch = function (keyword) {
+            $scope.keyword = keyword;
+            $scope.tableParams.page(1);
+            $scope.tableParams.reload();
+        };
+
+        $scope.tableParams = new ngTableParams({
+            page: 1,
+            count: 20
+        }, {
+            total: 0,
+            counts: [10, 25, 50, 100],
+            getData: function ($defer, params) {
+                $scope.loading = true;
+                var pageParams = params.url();
+                pageParams.keyword = $scope.keyword;
+                Vendor.getVendor.call(null, BaseService.parseParams(pageParams), function (page) {
+                    $scope.loading = false;
+                    if (page) {
+                        params.total(page.totalElement);
+                        $defer.resolve(page.content);
+                        // 添加供应商时，将已存在的选中
+                        if ($rootScope.tenderVendor) {
+                            angular.forEach(page.content, function (vendor) {
+                                for (var i = 0; i < $rootScope.tenderVendor.length; i++) {
+                                    vendor.checked = false;
+                                    if (vendor.vendorEnterprise.enName == $rootScope.tenderVendor[i].enName) {
+                                        vendor.checked = true;
+                                        break;
+                                    }
+                                }
+                            });
+                        }
+                    }
+                    $scope.totalCount = page.totalElement;
+                }, function (response) {
+                    $scope.loading = false;
+                    toaster.pop('error', '数据加载失败', response.data);
+                });
+            }
+        });
+
+
+        $scope.cancel = function () {
+            $modalInstance.dismiss();
+        };
+
+        $scope.checks = {
+            checked: false
+        };// 全选框
+
+        $scope.checkAll = function () {
+            angular.forEach($scope.tableParams.data, function (vendor) {
+                vendor.checked = $scope.checks.checked;
+            });
+        };
+
+        // 单选
+        $scope.checkOne = function (vendor) {
+            vendor.checked = true;
+
+            var checked = true;
+            angular.forEach($scope.tableParams.data, function (message) { // 单选全部时，全选选中
+                if (!message.checked) {
+                    checked = false;
+                }
+            });
+            $scope.checks.checked = checked;
+        };
+
+        // 单反选
+        $scope.unCheckOne = function (vendor) {
+            vendor.checked = false;
+            $scope.checks.checked = false;
+        };
+
+        $scope.close = function () {
+            var vendors = [];
+            angular.forEach($scope.tableParams.data, function (vendor) {
+                if (vendor.checked) {
+                    vendors.push(vendor);
+                    $modalInstance.close(vendors);
+                }
+            });
+        };
+
+    }]);
+
 });

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

@@ -546,6 +546,12 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
             templateUrl: "static/view/usercenter/b2b/order/outorder_detail.html",
             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: "/purc/purcinquiry/:bussinessCode",
 			templateUrl: "static/view/usercenter/b2b/Purc/purcinquiry_new.html",
@@ -556,6 +562,12 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
 			templateUrl: "static/view/usercenter/b2b/Purc/right.html",
 			controller: 'CustServeCtrl',
 			controllerUrl: 'app/controllers/b2b/Purc/CustServeCtrl'
+		})).state('purc_inquiry_new', angularAMD.route({
+			url: "/purc/purcinquiry",
+			templateUrl: "static/view/usercenter/b2b/Purc/inquiry_new.html",
+			controller: 'PurcInquiryCtrl',
+			controllerUrl: 'app/controllers/b2b/Purc/PurcInquiryCtrl'
+			/*新增公共询价*/
 		}));
 	}]);
 

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

@@ -0,0 +1,546 @@
+define(['app/app'], function(app) {
+    // 平台新增的询价单
+    app.register.controller('PurcInquiryCtrl', ['$scope', 'B2bPurchaseInquiry', 'toaster', 'BaseService', '$upload', '$filter', '$modal', '$rootScope', 'ngTableParams', 'B2bPurcProduct', 'B2bPurcProductNewest', '$timeout', '$http', 'B2bShipAddress', 'B2bSearch', 'B2bComponentActiveAPI', '$state',
+        function ($scope, PurchaseInquiry, toaster, BaseService, $upload, $filter, $modal, $rootScope, ngTableParams, PurcProduct, PurcProductNewest, $timeout, $http, ShipAddress, Search, ComponentActiveAPI, $state) {
+            $scope.status = 'InquiryNew';
+            $scope.active = 'all';
+            $rootScope.tenderVendor = null;// 清除掉已选择的
+            $scope.searchMethod = false;
+            var getService = function () {
+                return $scope.searchMethod ? PurcProduct : PurcProductNewest;
+            };
+            $scope.inquiry = {
+                code: 'XJ' + $filter('date')(new Date(), 'yyMMddsss'),
+                showdate: $filter('date')(new Date, 'yyyy-MM-dd'),
+                priceType: '采购',
+                isOpen: 1,
+                invoice: 0,
+                ifTax: 1,
+                currency: 'RMB',
+                inquirytype: '询价'
+            };
+
+
+            $scope.changeCurrency = function (inquiry) {
+                if (inquiry.currency !== 'RMB') {
+                    $scope.notRMB = true;
+                    inquiry.ifTax = 0; // 非RMB时，默认不含税和不需要发票，且不可更改
+                    inquiry.invoice = 0;
+                } else {
+                    $scope.notRMB = false;
+                }
+            };
+
+            // 获取收货地址列表
+            var loadShipAddress = function () {
+                ShipAddress.shipAddList({}, function (data) {
+                    $scope.ships = data;
+                    if (angular.isDefined($scope.ships)) {
+                        $scope.inquiry.ship = $scope.ships[0].address + $scope.ships[0].addressdet + $scope.ships[0].receiver + $scope.ships[0].usertel;
+                    }
+                });
+            };
+            loadShipAddress();
+
+            // 获取地址信息
+            $http.get('resources/citydata/city.json', {
+                "Accept": "application/json;charset=utf-8", "Accept-Charset": "charset=utf-8"
+            }).then(function (response) {
+                $scope.provinces = response.data;
+            });
+
+            // 新增收货地址保存
+            $scope.saveShipAddress = function (ship) {
+                ship.address = ship.province + ship.city + ship.district;
+                ShipAddress.saveAddress({}, ship, function (data) {
+                    if (data.success) {
+                        // 获取收货地址列表
+                        loadShipAddress();
+                        toaster.pop('success', '提示', data.success);
+                    }
+                    if (data.error) {
+                        toaster.pop('error', '提示', data.error);
+                    }
+                });
+            };
+
+            $scope.currentDay = function () {
+                return $filter('date')(new Date(), 'yyyy-MM-dd');
+            };
+
+            $scope.vendors = [];
+            // 查找供应商
+            $scope.dbfindVendor = function () {
+                var modalInstance = $modal.open({
+                    templateUrl: 'static/view/usercenter/b2b/modal/tender_vendor.html',
+                    controller: 'DbfindVendorCtrl',
+                    size: 'lg',
+                    resolve: {}
+                });
+
+                modalInstance.result.then(function (data) {
+                    var ifPush = true;
+                    modalInstance.result.then(function (data) {
+                        angular.forEach(data, function (vendor) {
+                            if (!$scope.vendors) {// 不存在就先创建
+                                $scope.vendors = [{}];
+                                $scope.vendors.splice(0, 1, vendor.vendorEnterprise);
+                            } else {
+                                for (var i = 0; i < $scope.vendors.length; i++) {
+                                    ifPush = true;
+                                    if ($scope.vendors[i].enName == vendor.vendorEnterprise.enName) {
+                                        ifPush = false;
+                                        break; // 判定到已存在供应商，就终止循环。
+                                    }
+                                }
+                                if (ifPush) {
+                                    $scope.vendors.push({
+                                        enName: vendor.vendorEnterprise.enName,
+                                        enuu: vendor.vendorEnterprise.uu
+                                    });
+                                }
+                            }
+                        });
+                        $rootScope.tenderVendor = $scope.vendors;
+                    }, function () {
+
+                    });
+                }, function () {
+
+                });
+            };
+            // 删除一个供应商
+            $scope.removeVendor = function (index) {
+                $scope.vendors.splice(index, 1);
+            };
+
+            $scope.removeChecked = function () {
+                if ($scope.vendors.length > 0) {
+                    $scope.vendors = [];
+                    $rootScope.tenderVendor = '';
+                }
+            }
+
+            // 物料信息
+            $scope.tableParams = new ngTableParams({
+                page: 1,
+                count: 20,
+                sorting: {
+                    id: 'desc'
+                }
+            }, {
+                total: 0,
+                counts: [5, 10, 25, 50],
+                getData: function ($defer, params) {
+                    $scope.loading = true;
+                    var pageParams = params.url();
+                    pageParams.keyword = $scope.keyword;
+                    $scope.tip = $scope.keyword;
+                    pageParams.searchFilter = $scope.searchFilter;
+                    getService()[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function (page) {
+                        $scope.loading = false;
+                        if (page) {
+                            params.total(page.totalElement);
+                            $scope.total = page.totalElement;
+                            $defer.resolve(page.content);
+                        }
+                    }, function (response) {
+                        $scope.loading = false;
+                        toaster.pop('error', '数据加载失败', response.data);
+                    });
+                }
+            });
+
+            // 搜索框回车
+            $scope.onSearch = function (keyword) {
+                // 每次搜索重置获取数据方法
+                $scope.searchMethod = false;
+                if(keyword != null && keyword != '') {
+                    $scope.searchMethod = true;
+                }
+                $scope.tableParams.page(1);
+                $scope.tableParams.reload();
+            };
+
+            $scope.inquiry.inquiryItems = [];
+            var prod = {
+                cmpCode: null,
+                prodTitle: null,
+                inbrand: null,
+                toDate: null,
+                unit: 'PCS',
+                needquantity: null
+            };
+            $scope.inquiry.inquiryItems.push(prod);
+            // 联想词start
+
+            // 获取品牌联想词
+            $scope.getSimilarBrands = function (value) {
+                if (value) {
+                    // 获取品牌联想词
+                    return Search.getSimilarBrands({keyword: value}).$promise.then(function (data) {
+                        return data.map(function (item) {
+                            return item;
+                        });
+                    });
+                }
+            };
+
+            // 获取产品型号联想词
+            $scope.getSimilarCodes = function (value) {
+                if (value) {
+                    // 获取产品型号联想词
+                    return Search.getSimilarComponents({keyword: value}).$promise.then(function (data) {
+                        return data.map(function (item) {
+                            return item;
+                        })
+                    });
+                }
+            };
+
+            $scope.selectKind = function (prod) {
+                var submit = [];
+                $modal.open({
+                    animation: true,
+                    size: 'lg',
+                    templateUrl: 'static/view/usercenter/b2b/modal/product_kindChoose_modal.html',
+                    controller: 'ProdKindChooseCtrl',
+                    resolve: {
+                        actives: function () {
+                            return $scope.actives;
+                        }
+                    }
+                }).result.then(function (data) {
+                    $scope.actives = data.actives;
+                    var size = data.actives.length;
+                    submit.gradeOneKiName = '';
+                    submit.gradeTwoKiName = '';
+                    submit.gradeThreeKiName = '';
+                    if (size > 0) {
+                        submit.gradeOneKiName = $scope.actives[0].nameCn;
+                        prod.prodTitle = submit.gradeOneKiName;
+                        if (size > 1) {
+                            submit.gradeTwoKiName = $scope.actives[1].nameCn;
+                            prod.prodTitle = submit.gradeTwoKiName;
+                            if (size > 2) {
+                                submit.gradeThreeKiName = $scope.actives[2].nameCn;
+                                prod.prodTitle = submit.gradeThreeKiName;
+                            }
+                        }
+                    }
+                }, function () {
+
+                });
+            };
+
+            // 点击联想词获取品牌信息
+            $scope.onAssociateBrandClick = function (brand, prod) {
+                if (brand instanceof String) {
+                    prod.inbrand = brand;
+                } else if (brand instanceof Object) {
+                    prod.inbrand = brand.brandCn;
+                }
+            };
+
+            // 打开品牌选择的模态框
+            $scope.selectBrand = function (prod) {  //打开模态
+                var modalInstance = $modal.open({
+                    templateUrl: 'static/view/usercenter/b2b/modal/product_brandChoose_modal.html',  //指向上面创建的视图
+                    controller: 'BrandModalInstanceCtrl'  // 初始化模态范围
+                });
+                modalInstance.opened.then(function () {// 模态窗口打开之后执行的函数
+                });
+                modalInstance.result.then(function (brand) {
+                    prod.inbrand = brand.nameCn;
+                }, function (reason) {
+
+                });
+            };
+
+            // 点击联想词获取器件信息 带入产品分类和品牌
+            $scope.onAssociateCmpClick = function (cmp, prod) {
+                ComponentActiveAPI.get({uuid: cmp.uuid}, {}, function (data) {
+                    $scope.component = data;
+                    prod.cmpCode = data.code;
+                    prod.prodTitle = data.kind.nameCn;
+                    prod.inbrand = data.brand.nameCn;
+                }, function (res) {
+                    toaster.pop('error', '提示', '产品信息加载失败，请刷新页面');
+                })
+            };
+            //联想词end
+
+            // 导入商品信息
+            $scope.uplodaByBatch = function () {
+                var modalInstance = $modal.open({
+                    templateUrl: 'static/view/usercenter/b2b/modal/uplodaByBatch.html',
+                    controller: 'PurcInquiryUploadCtrl',
+                    size: 'lg',
+                    resolve: {}
+                });
+
+                modalInstance.result.then(function (data) {
+                    angular.forEach(data, function (prod) {
+                        $scope.inquiry.inquiryItems.push(prod);
+                        for (var i = 0; i < $scope.inquiry.inquiryItems.length; i++) {
+                            if ($scope.inquiry.inquiryItems[i].prodCode == null) { // 如果没有填写就删除这行数据
+                                $scope.inquiry.inquiryItems.splice(i, 1);
+                            }
+                        }
+                    })
+
+                }, function () {
+
+                });
+            }
+            //增加商品
+            $scope.add = function () {
+                $scope.inquiry.inquiryItems.push(
+                    {
+                        cmpCode: null,
+                        prodTitle: null,
+                        unit: 'PCS',
+                        ibrand: null,
+                        toDate: null,
+                        needquantity: null
+                    });
+            };
+            //删除商品
+            $scope.del = function (index) {
+                $scope.inquiry.inquiryItems.splice(index, 1);
+            };
+
+            $scope.check = function (product) {
+                for (var i = 0; i < $scope.inquiry.inquiryItems.length; i++) {
+                    if ($scope.inquiry.inquiryItems[i].prodCode == null) { // 如果没有填写就删除这行数据
+                        $scope.inquiry.inquiryItems.splice(i, 1);
+                    }
+                }
+                $scope.inquiry.inquiryItems.push({
+                    cmpCode: product.cmpCode, prodTitle: product.title, spec: product.spec, unit: product.unit,
+                    currency: null, toDate: null, needquantity: null, productId: product.id, inbrand: product.brand
+                });
+            }
+
+            $scope.getMinDate = function (item) {
+                return $filter('date')(new Date, 'yyyy-MM-dd');
+            };
+
+            $scope.openDatePicker = function ($event, openParam, index) {
+                $event.preventDefault();
+                $event.stopPropagation();
+                $scope.inquiry.inquiryItems[index].$toDateOpen = !openParam;
+            };
+
+            $scope.openEndDatePicker = function ($event, item, openParam) {
+                $event.preventDefault();
+                $event.stopPropagation();
+                item[openParam] = !item[openParam];
+            };
+
+            $scope.ifrepeat = false;
+            // 保存
+            $scope.save = function () {
+                $scope.loading = true;
+                for (var i = 0; i < $scope.inquiry.inquiryItems.length; i++) {
+                    $scope.item = $scope.inquiry.inquiryItems[i];
+                    for (var j = 0; j < $scope.inquiry.inquiryItems.length; j++) {
+                        $scope.otheritem = $scope.inquiry.inquiryItems[j];
+                        if (i != j) {
+                            if ($scope.item.prodCode == $scope.otheritem.prodCode && $scope.item.prodTitle == $scope.otheritem.prodTitle
+                                && $scope.item.inbrand == $scope.otheritem.inbrand && $scope.item.needquantity == $scope.otheritem.needquantity
+                                && $scope.item.toDate.getTime() == $scope.otheritem.toDate.getTime()) {
+                                $scope.ifrepeat = true;
+                            }
+                        }
+                    }
+                }
+                if (!$scope.ifrepeat) {
+                    var file = $scope.myFiles, file = file && file.length > 0 ? file[0] : null;// 可以不传附件
+                    if ($scope.inquiry.isOpen == 0) { // 指定询价
+                        if ($scope.vendors.length > 0) {
+                            $upload.upload({
+                                url: 'purc/inquiry/save/withVendor',
+                                file: file,
+                                method: 'POST',
+                                data: {
+                                    inquiry: $scope.inquiry,
+                                    contacts: $scope.vendors
+                                },
+                            }).success(function (data) {
+                                $scope.loading = false;
+                                if (data.success) {
+                                    toaster.pop('success', '提示', data.success);
+                                    $timeout(function () {
+                                        $rootScope.active = 'todo';
+                                        window.location.hash = "#/purc/inquiry_unapply";
+                                    }, 500);
+                                }
+                                if (data.error) {
+                                    toaster.pop('error', '提示', data.error);
+                                }
+                            }).error(function (data, status, headers, config) {
+                                $scope.loadingShow = false;
+                                if (status == 403) { // 抛异常专用
+                                    toaster.pop('error', '操作失败', data);
+                                } else {
+                                    toaster.pop('error', '操作失败', data.error);
+                                }
+                            });
+                        } else {
+                            toaster.pop('info', '提示', '请先选择供应商');
+                        }
+                    } else {
+                        $upload.upload({
+                            url: 'purc/inquiry/save/withoutVendor',
+                            file: file,
+                            method: 'POST',
+                            data: {
+                                inquiry: $scope.inquiry,
+                            },
+                        }).success(function (data) {
+                            $scope.loading = false;
+                            if (data.success) {
+                                toaster.pop('success', '提示', data.success);
+                            }
+                            if (data.error) {
+                                toaster.pop('error', '提示', data.error);
+                            }
+                        }).error(function (data, status, headers, config) {
+                            $scope.loadingShow = false;
+                            if (status == 403) { // 抛异常专用
+                                toaster.pop('error', '操作失败', data);
+                            } else {
+                                toaster.pop('error', '操作失败', data.error);
+                            }
+                        });
+                    }
+                } else {
+                    $scope.loading = false;
+                    toaster.pop('error', '提示', '存在相同条件的物料信息');
+                }
+            }
+
+            // 保存并提交
+            $scope.submit = function () {
+                $scope.loading = true;
+                for (var i = 0; i < $scope.inquiry.inquiryItems.length; i++) {
+                    $scope.item = $scope.inquiry.inquiryItems[i];
+                    for (var j = 0; j < $scope.inquiry.inquiryItems.length; j++) {
+                        $scope.otheritem = $scope.inquiry.inquiryItems[j];
+                        if (i != j) {
+                            if ($scope.item.prodCode == $scope.otheritem.prodCode && $scope.item.prodTitle == $scope.otheritem.prodTitle
+                                && $scope.item.inbrand == $scope.otheritem.inbrand && $scope.item.needquantity == $scope.otheritem.needquantity
+                                && $scope.item.toDate.getTime() == $scope.otheritem.toDate.getTime()) {
+                                $scope.ifrepeat = true;
+                            }
+                        }
+                    }
+                }
+                var file = $scope.myFiles, file = file && file.length > 0 ? file[0] : null;// 可以不传附件
+                if (!$scope.ifrepeat) {
+                    if ($scope.inquiry.isOpen == 0) { // 指定询价
+                        if ($scope.vendors.length > 0) {
+                            $upload.upload({
+                                url: 'purc/inquiry/submit/withVendor',
+                                file: file,
+                                method: 'POST',
+                                data: {
+                                    inquiry: $scope.inquiry,
+                                    contacts: $scope.vendors
+                                },
+                            }).success(function (data) {
+                                $scope.loading = false;
+                                if (data.success) {
+                                    toaster.pop('success', '提示', data.success);
+                                    $timeout(function () {
+                                        window.location.hash = "#/purc/purchaseinquiry";
+                                    }, 500);
+                                }
+                                if (data.error) {
+                                    toaster.pop('error', '提示', data.error);
+                                }
+                            }).error(function (data, status, headers, config) {
+                                $scope.loadingShow = false;
+                                if (status == 403) { // 抛异常专用
+                                    toaster.pop('error', '操作失败', data);
+                                } else {
+                                    toaster.pop('error', '操作失败', data.error);
+                                }
+                            });
+                        } else {
+                            toaster.pop('info', '提示', '请先选择供应商');
+                        }
+                    } else {
+                        $upload.upload({
+                            url: 'purc/inquiry/submit/withoutVendor',
+                            file: file,
+                            method: 'POST',
+                            data: {
+                                inquiry: $scope.inquiry,
+                            },
+                        }).success(function (data) {
+                            $scope.loading = false;
+                            if (data.success) {
+                                toaster.pop('success', '提示', data.success);
+                            }
+                            if (data.error) {
+                                toaster.pop('error', '提示', data.error);
+                            }
+                        }).error(function (data, status, headers, config) {
+                            $scope.loadingShow = false;
+                            if (status == 403) { // 抛异常专用
+                                toaster.pop('error', '操作失败', data);
+                            } else {
+                                toaster.pop('error', '操作失败', data.error);
+                            }
+                        });
+                    }
+                } else {
+                    $scope.loading = false;
+                    toaster.pop('error', '提示', '存在相同条件的物料信息');
+                }
+            }
+
+            $scope.previewShow = false;
+            $scope.pdfShow = false;
+            $scope.noneFileShow = true;
+            $scope.$watch('myFiles', function () {
+                if ($scope.myFiles) {
+                    $scope.noneFileShow = false;
+                    var file = $scope.myFiles[0];
+                    if (file.name.indexOf('.pdf') != -1 || file.name.indexOf('.PDF') != -1) {//pdf文件
+                        $scope.pdfShow = true;
+                        $scope.previewShow = false;
+                        $scope.imgPreviewName = file.name;
+                    } else {
+                        if (typeof(Worker) !== "undefined") {//支持HTML5
+                            $scope.imgPreview = getObjectURL(file);
+                            $scope.imgPreviewName = file.name;
+                        } else {//不支持HTML5
+                            $scope.imgPreview = 'static/img/all/preview-error.jpg';
+                            $scope.imgPreviewName = file.name;
+                        }
+                        $scope.previewShow = true;
+                        $scope.pdfShow = false;
+                    }
+                } else {
+                    $scope.noneFileShow = true;
+                    $scope.previewShow = false;
+                    $scope.pdfShow = false;
+                }
+            });
+            //建立一个可存取到该file的url
+            var getObjectURL = function (file) {
+                var url = null;
+                if (window.createObjectURL != undefined) { // basic
+                    url = window.createObjectURL(file);
+                } else if (window.URL != undefined) { // mozilla(firefox)
+                    url = window.URL.createObjectURL(file);
+                } else if (window.webkitURL != undefined) { // webkit or chrome
+                    url = window.webkitURL.createObjectURL(file);
+                }
+                return url;
+            };
+        }]);
+});

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

@@ -0,0 +1,289 @@
+define(['app/app'], function(app) {
+  // 平台询价单(已提交)
+  app.register.controller('PurchaseInquiryCtrl', ['$scope', '$filter', 'ngTableParams', 'toaster', 'BaseService', 'B2bPurchaseInquiry', '$rootScope', 'B2bCurrentRole', function ($scope, $filter, ngTableParams, toaster, BaseService, PurchaseInquiry, $rootScope, CurrentRole) {
+    $rootScope.active = 'purc_haseinquiry'
+    $scope.status = 'InquirySubmit';
+    BaseService.scrollBackToTop();
+    // 获取当前用户是否为普通用户
+    CurrentRole.isUser({}, {}, function (data) {
+      $scope.isUser = data.isUser;
+    });
+    // if ($rootScope.active) {
+    //   $scope.active = $rootScope.active;
+    //   $rootScope.active = null;
+    // } else {
+      $scope.active = 'todo';
+    // }
+    $scope.agreedText = '全部';
+    $scope.dateZoneText = '一个月内';
+    $scope.condition = {dateZone: 1};
+
+    /* 时间筛选初始化*/
+    var fromDate = new Date();
+    var toDate = new Date();
+    fromDate.setMonth(fromDate.getMonth() - 1);
+    fromDate.setHours(0, 0, 0, 0);
+    toDate.setHours(23, 59, 59, 999);
+    $scope.condition.dateFrom = fromDate;
+    $scope.condition.dateTo = toDate;
+
+    $scope.changeAgreed = function (agreed) {
+      $scope.condition.agreed = agreed;
+      $scope.agreedText = typeof agreed == 'undefined' ? '全部' : (agreed == 1 ? '已采纳' : '未采纳');
+      $scope.condition.$agreedOpen = false;
+    };
+    $scope.changeDateZone = function (zone) {
+      $scope.condition.dateZone = zone;
+      $scope.dateZoneText = zone == 1 ? '最近一个月' : (zone == 3 ? '最近三个月' : (zone == 6 ? '最近六个月' : '自定义'));
+      $scope.condition.$dateZoneOpen = false;
+      getDateCondition(zone, $scope.condition);
+      $scope.tableParams.page(1);
+      $scope.tableParams.reload();
+    };
+
+    $scope.setActive = function (state) {
+      if ($scope.active != state) {
+        $scope.active = state;
+        if ($scope.tableParams.page() == 1) {
+          $scope.tableParams.reload();
+        } else {
+          $scope.tableParams.page(1);
+        }
+      }
+    }
+
+    var getService = function () {
+      return PurchaseInquiry;
+    };
+
+    $scope.tableParams = new ngTableParams({
+      page: 1,
+      count: 20,
+      sorting: {
+        'inquiry.date': 'desc',
+        'inquiry.enterprise.enName': 'asc',
+        'inquiry.code': 'asc'
+      }
+    }, {
+      total: 0,
+      counts: [5, 10, 25, 50],
+      getData: function ($defer, params) {
+        $scope.loading = true;
+        var pageParams = params.url();
+        var realActive = {};
+        pageParams.searchFilter = {
+          keyword: $scope.keyword,
+          fromDate: getDateTime($scope.condition.dateFrom),
+          endDate: getDateTime($scope.condition.dateTo)
+        };
+        if ($scope.active == 'overdue') {
+          $scope.active = 'end';
+        }
+        getService()[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function (page) {
+          $scope.loading = false;
+          if (page) {
+            params.total(page.totalElement);
+            $defer.resolve(page.content);
+            $scope.infoCommon = page
+            $scope.infoCommon.all = page.content.length
+            $scope.searchFilterXls = angular.copy(pageParams.searchFilter);//保存当前取值的关键词
+          }
+        }, function (response) {
+          $scope.loading = false;
+          toaster.pop('error', '数据加载失败', response.data);
+        });
+      }
+    });
+
+    //获得各分类未阅读数量
+    var getUnreadCount = function () {
+      PurchaseInquiry.getUnreadCount(null, function(data){
+        $scope.unread = data;
+      });
+    };
+    getUnreadCount();
+
+    //设置单据已读
+    $scope.setOrdersRead = function (id) {
+      // 如果单据本身已读，则不发送请求修改数据
+      if (!$scope.isUnread(id)){
+        return;
+      }
+      var sourceId = [];
+      sourceId.push(id);
+      PurchaseInquiry.setRead({}, sourceId, function (message) {
+        getUnreadIds();
+        getUnreadCount();
+      });
+    };
+
+    //获得未读单据id
+    var getUnreadIds = function (){
+      PurchaseInquiry.getUnreadIds({}, "", function (message) {
+        $scope.unreadCode = message.content;
+      });
+    };
+    getUnreadIds();
+    //判断单据是否未读
+    $scope.isUnread = function (id){
+      for (var i in $scope.unreadCode) {
+        if (id == $scope.unreadCode[i]) {
+          return true;
+        }
+      }
+    };
+
+    $scope.openDatePicker = function ($event, item, openParam) {
+      $event.preventDefault();
+      $event.stopPropagation();
+      item[openParam] = !item[openParam];
+    };
+
+    $scope.openFilterDatePicker = function ($event, item, openParam) {
+      $event.preventDefault();
+      $event.stopPropagation();
+      item[openParam] = !item[openParam];
+      if ($scope.condition.dateFrom && $scope.condition.dateTo && !item[openParam]) {
+        $scope.tableParams.reload();
+      }
+    };
+
+    // 搜索框回车
+    $scope.onSearch = function () {
+      $scope.tableParams.page(1);
+      $scope.tableParams.reload();
+    };
+
+    // 采纳
+    $scope.accept = function (id) {
+      PurchaseInquiry.accept({id: id}, {}, function (data) {
+        if (data.success) {
+          toaster.pop('success', '提示', data.success);
+          $scope.tableParams.reload();
+        }
+        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);
+          $scope.tableParams.reload();
+        }
+        if (data.error) {
+          toaster.pop('error', '提示', data.error);
+        }
+      }, function (response) {
+        toaster.pop('error', '提示', response.data);
+      })
+    }
+
+    // 导出
+    $scope.exportXls = function () {
+      PurchaseInquiry.exportXls({}, {}, function (data) {
+        if (data.success){
+          window.location.href = 'purc/inquiry/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+        }
+      }, function (response) {
+        toaster.pop('error', '数据加载失败', response.data);
+      });
+    }
+    /**
+     * 将日期转化为整数日期
+     */
+    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/tender.js

@@ -958,96 +958,4 @@ define(['app/app'], function(app) {
       $modalInstance.dismiss();
     }
   }]);
-  // 查找供应商
-  app.register.controller('DbfindVendorCtrl', ['$scope', 'B2bVendor', 'BaseService', 'ngTableParams', 'toaster', '$modalInstance', '$rootScope', function ($scope, Vendor, BaseService, ngTableParams, toaster, $modalInstance, $rootScope) {
-    BaseService.scrollBackToTop();
-    // 搜索框回车
-    $scope.onSearch = function (keyword) {
-      $scope.keyword = keyword;
-      $scope.tableParams.page(1);
-      $scope.tableParams.reload();
-    };
-
-    $scope.tableParams = new ngTableParams({
-      page: 1,
-      count: 20
-    }, {
-      total: 0,
-      counts: [10, 25, 50, 100],
-      getData: function ($defer, params) {
-        $scope.loading = true;
-        var pageParams = params.url();
-        pageParams.keyword = $scope.keyword;
-        Vendor.getVendor.call(null, BaseService.parseParams(pageParams), function (page) {
-          $scope.loading = false;
-          if (page) {
-            params.total(page.totalElement);
-            $defer.resolve(page.content);
-            // 添加供应商时，将已存在的选中
-            if ($rootScope.tenderVendor) {
-              angular.forEach(page.content, function (vendor) {
-                for (var i = 0; i < $rootScope.tenderVendor.length; i++) {
-                  vendor.checked = false;
-                  if (vendor.vendorEnterprise.enName == $rootScope.tenderVendor[i].enName) {
-                    vendor.checked = true;
-                    break;
-                  }
-                }
-              });
-            }
-          }
-          $scope.totalCount = page.totalElement;
-        }, function (response) {
-          $scope.loading = false;
-          toaster.pop('error', '数据加载失败', response.data);
-        });
-      }
-    });
-
-
-    $scope.cancel = function () {
-      $modalInstance.dismiss();
-    };
-
-    $scope.checks = {
-      checked: false
-    };// 全选框
-
-    $scope.checkAll = function () {
-      angular.forEach($scope.tableParams.data, function (vendor) {
-        vendor.checked = $scope.checks.checked;
-      });
-    };
-
-    // 单选
-    $scope.checkOne = function (vendor) {
-      vendor.checked = true;
-
-      var checked = true;
-      angular.forEach($scope.tableParams.data, function (message) { // 单选全部时，全选选中
-        if (!message.checked) {
-          checked = false;
-        }
-      });
-      $scope.checks.checked = checked;
-    };
-
-    // 单反选
-    $scope.unCheckOne = function (vendor) {
-      vendor.checked = false;
-      $scope.checks.checked = false;
-    };
-
-    $scope.close = function () {
-      var vendors = [];
-      angular.forEach($scope.tableParams.data, function (vendor) {
-        if (vendor.checked) {
-          vendors.push(vendor);
-          $modalInstance.close(vendors);
-        }
-      });
-    };
-
-  }]);
-
 })

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

@@ -0,0 +1,1319 @@
+<!--  询价单  -->
+<link rel="stylesheet" href="static/css/add.css " />
+<style>
+
+    /* 标题 */
+    .tender-label {
+        /*height: 30px;*/
+        /*margin-left: 10px;*/
+        /*margin-right: 10px;*/
+        /*background-color: #e8e8e8;*/
+        /*box-shadow: 0 0 5px #6f6f6f;*/
+        /*border-top-right-radius: 20px;*/
+        width: 100%;
+        height: 40px;
+        line-height: 42px;
+        /*background: url(static/img/comm_bg01.png) no-repeat center;*/
+        background-size: 100%;
+    }
+    /* 主体 */
+    .purc-tender {
+        font-size: 14px;
+    }
+
+    .purc-tender .row {
+        margin-left: 0;
+        margin-right: 0;
+        padding-left: 7px;
+        padding-right: 15px;
+    }
+
+    .tender-content {
+        background-color: #fff;
+        display: inline-block;
+        width: 100%;
+    }
+
+    .tender-content>div>div {
+        margin-top: 3px;
+        margin-bottom: 3px;
+    }
+    /* 二级标题栏 */
+    .title-div {
+        font-size: 14px;
+        font-weight: 600;
+        padding-left: 30px;
+        height: 50px;
+        padding-top: 11px;
+    }
+
+    /* 输入框前描述 */
+    .tender-desc {
+        width: 100px;
+        float: left;
+        /*padding-top: 4px;*/
+    }
+    /* 输入框 */
+    .tender-input {
+        /*border: #bfbfbf 1px solid !important;
+            padding-left: 10px;
+            height: 34px;
+            line-height: 34px;
+            width: 160px;*/
+
+    }
+
+    .tender-input01 {
+        border: #bfbfbf 1px solid !important;
+        padding-left: 10px;
+        height: 34px;
+        line-height: 34px;
+        width: 150px;
+    }
+
+    .tender-input:focus {
+        border: #3578ba 1px solid !important;
+    }
+
+    /* 收货地址 */
+    .address-group {
+        border-bottom: 1px solid #323232;
+        border-bottom-left-radius: 0;
+        margin-right: 20px;
+    }
+
+    .address-group>input:focus {
+        outline: none;
+    }
+
+    /* 基本信息 */
+    .base-info {
+        border-bottom: 1px solid #e8e8e8;
+        padding-bottom: 30px;
+        padding-top: 20px;
+        margin-bottom: 0; /* 去除index中公共样式影响 */
+    }
+
+    /* 地址附加图标 */
+    .address-addon {
+        border: none;
+        background: none;
+    }
+
+    /* 下拉选项 */
+    .select-menu {
+        margin: 4px 0;
+        width: 100px;
+        padding: 0 5%;
+        height: 30px;
+    }
+
+    select.select-menu {
+        /*Chrome和Firefox里面的边框是不一样的，所以复写了一下*/
+        border: solid 1px #bfbfbf;
+        height: 34px;
+        line-height: 34px;
+        width: 280px;
+        font-size: 14px;
+        /*很关键：将默认的select选择框样式清除*/
+        /* appearance:none;
+            -moz-appearance:none;
+            -webkit-appearance:none;*/
+        /*在选择框的最右侧中间显示小箭头图片*/
+        /*background: url("static/img/tender/select.png") no-repeat scroll right center transparent;*/
+        /*为下拉小箭头留出一点位置，避免被文字覆盖*/
+        padding-right: 14px;
+    }
+
+    /*清除ie的默认选择框样式清除，隐藏下拉箭头*/
+    select.select-menu::-ms-expand {
+        display: none;
+    }
+
+    /* 日期选择器 */
+    .purc-tender .date-picker {
+        /*padding-top: 10px;*/
+        width: 280px;
+    }
+
+    .purc-tender .date-picker input {
+        border-radius: 0;
+        border: 1px solid #bfbfbf;
+        border-right: none;
+        font-size: 12px;
+        background: #fff;
+        font-size: 14px;
+    }
+
+    .purc-tender .date-picker span .btn-open {
+        color: #fff;
+        background-color: #bfbfbf;
+        border-radius: 0;
+        border: 1px solid #bfbfbf;
+        border-left: none;
+    }
+    .purc-tender .date-picker input:focus{
+        border: #5078cb 1px solid;
+    }
+    .purc-tender .date-picker span .btn-open:focus{
+        background: #5078cb;
+    }
+    /* 修改本页内btn的样式 及datepicker中的btn-success的样式 */
+    .tender-content .date-picker .btn {
+        border-radius: 0;
+    }
+
+    .tender-content .date-picker .btn-success {
+        background-color: #3f84f6;
+    }
+
+    .tender-content .date-picker ul {
+        border-radius: 0;
+    }
+
+    .tender-content .date-picker ul div:focus {
+        outline: none;
+        border-radius: 0;
+        border: none;
+    }
+
+    /* 附件上传 */
+    .purc-tender .base-info .attach-upload {
+        display: inline;
+    }
+
+    .purc-tender .base-info .attach-upload input {
+        height: 100px;
+        width: 100px;
+        margin: 6px 0 0 100px;
+        opacity: 0;
+        z-index: 1;
+        position: relative;
+    }
+
+    .purc-tender .base-info .attach-upload input:hover {
+        cursor: pointer;
+    }
+
+    .fileInputContainer {
+        height: 100px;
+        background-image: url('static/img/tender/upload.png');
+        position: relative;
+        width: 100px;
+        margin-left: 100px;
+        margin-top: 20px;
+    }
+
+    .fileInput {
+        height: 100px;
+        width: 100px;
+        font-size: 100px;
+        position: absolute;
+        margin-left: 100px;
+        margin-top: 20px;
+        right: 0;
+        top: 0;
+        opacity: 0;
+        filter: alpha(opacity = 0);
+        cursor: pointer;
+    }
+    /* 图片点击上传 */
+    /*.upload-bg {*/
+    /*width: 100px;*/
+    /*height: 100px;*/
+    /*background-image: url('static/img/tender/upload.png');*/
+    /*margin-top: 10px;*/
+    /*margin-left: 100px;*/
+    /*border: 1px solid #e8e8e8;*/
+    /*z-index: 2;*/
+    /*}*/
+    /* 供应商信息 添加供应商 */
+    .vend-info  a.add-vendor {
+        color: #5078cb;
+    }
+
+    .vend-info  a.add-vendor:hover {
+        cursor: pointer;
+        color: #55b6ff;
+    }
+
+    .vend-info  a.remove-vendor {
+        color: #FF2E2F;
+    }
+
+    .vend-info  a.remove-vendor:hover {
+        cursor: pointer;
+        color: #D32526;
+    }
+
+    /* 单选框 复选框 */
+    input[type="radio"], input[type="checkbox"] {
+        vertical-align: text-bottom;
+        margin-bottom: 2px;
+        margin-bottom: -2px\9;
+    }
+
+    .vend-info .input-select {
+        float: left;
+        padding-top: 4px;
+        margin-left: -20px;
+    }
+
+    .vend-info .input-select input {
+        margin-right: 8px;
+    }
+
+    /* 右下角按钮 */
+    .tender-content>div {
+        background-color: #fff;
+        width: auto;
+    }
+
+    .tender-content>div>div>button {
+        width: 94px;
+        height: 36px;
+        font-size: 14px;
+        color: #fff;
+        border-radius: 0;
+    }
+
+    .tender-content>div>div.btn-publish>button {
+        background-color: #3f84f6;
+    }
+
+    .tender-content>div>div.btn-save>button {
+        background-color: #32bebc;
+    }
+
+    .read-only {
+        border: none;
+        color: #969595;
+    }
+
+    .read-only:focus {
+        border: none;
+    }
+
+    .attach-file {
+        margin-left: 100px;
+        width: 400px;
+    }
+
+    .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;
+    }
+
+    .com_title01  a {
+        color: #5078cb;
+    }
+
+    .com_title01  a:hover {
+        cursor: pointer;
+        color: #55b6ff;
+    }
+
+    /*招标单*/
+    .tender-list02 dl {
+        width: 990px;
+        margin: 0 auto;
+        position: relative;
+    }
+
+    .tender-list02 dl dt {
+        width: 100%;
+        margin: 0 auto;
+        height: 40px;
+        text-align: center;
+        background: #f5f8fe;
+    }
+
+    .tender-list02 dl dt span {
+        height: 40px;
+        line-height: 40px;
+        display: inline-block;
+        color: #323232;
+        width: 13.45%;
+        border-bottom: #e8e8e8 1px solid;
+        text-align: left;
+    }
+
+    .tender-list02 dl dd {
+        width: 100%;
+        margin: 0 auto;
+        border: 1px solid #dae5fd;
+    }
+
+    .tender-list02 dl dd:hover span a {
+        display: inline-block;
+    }
+
+    .tender-list02 dl dd span {
+        height: 50px;
+        line-height: 50px;
+        display: inline-block;
+        width: 13.45%;
+        font-size: 14px;
+        float: left;
+        text-align: center;
+    }
+    .tender-list02 dl dd span:first-child,.tender-list02 dl dt span:first-child{
+        width: 6%;
+    }
+
+    .tender-list02 dl span.wid01 {
+        width: 16.8%;
+    }
+
+    .tender-list02 dl span.wid02 {
+        width: 15%;
+    }
+
+    .tender-list02 dl span.wid03 {
+        width: 5%;
+    }
+
+    .tender-list02 .editable {
+        text-align: center;
+        width: 100%;
+    }
+
+    .tender-list02  .scroll-y dd input {
+        width: 97%;
+        height: 34px;
+        border: none;
+        font-size: 14px;
+        padding-left: 4px;
+        text-align: center;
+        vertical-align: middle;
+        line-height: 34px;
+    }
+
+    .tender-list02 dl span.wid03 a {
+        display: none;
+    }
+
+    .tender-list02 dl span.wid03 a.active {
+        display: inline-block;
+    }
+
+    .tender-list02 dl span.wid03 a i {
+        width: 20px;
+        height: 20px;
+        display: inline-block;
+        line-height: 20px;
+        background: #d2272d;
+        text-align: center;
+        border-radius: 100%;
+        color: #fff;
+    }
+
+    .tender-list02 .com_title01 a {
+        float: right;
+        margin-right: 45px;
+        font-size: 14px;
+        line-height: 50px;
+    }
+
+    .scroll-y {
+        width: 100%;
+        margin: 0 auto;
+        max-height: 500px;
+        overflow-y: auto;
+        min-height: 100px;
+    }
+
+    .scroll-y.active {
+        overflow-y: scroll;
+        overflow-x: hidden;
+    }
+
+    /**日期选择器  start**/
+    .tender-list02 .dropdown-menu{
+        min-width: auto;
+    }
+
+    .tender-list02 .save button {
+        border: 1px;
+        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;
+        float:left;
+    }
+
+    .btn-group.pull-left{
+        width:120px;
+    }
+
+    .tender-list02 .dropdown-menu tr,.tender-list02 .dropdown-menu th,.tender-list02 .dropdown-menu td{
+        line-height:30px;
+    }
+    .tender-list02 .dropdown-menu button span{
+        line-height:15px;
+        width:15px;
+        height:15px;
+        font-size:12px;
+    }
+    .tender-list02 .dropdown-menu tr td button{
+        border: none;
+    }
+    /*end*/
+    /* 弹框 */
+    .bomb-box {
+        width: 100%;
+        height: 100%;
+        position: fixed;
+        z-index: 11111;
+        background: rgba(0, 0, 0, 0.2);
+        top: 0;
+        left: 0;
+    }
+
+    .bomb-box .box {
+        position: absolute;
+        left: 0;
+        right: 0;
+        top: 0;
+        bottom: 0;
+        margin: auto;
+        box-shadow: 0 0 3px #888;
+    }
+
+    .bomb-box .box01 {
+        width: 580px;
+        height: 406px;
+        border-radius: 5px;
+        background: #fff;
+    }
+
+    .bomb-box .box i.off {
+        width: 20px;
+        height: 20px;
+        display: inline-block;
+        position: absolute;
+        right: 8px;
+        top: 8px;
+        text-align: center;
+        cursor: pointer;
+    }
+
+    .bomb-box .box p {
+        height: 40px;
+        line-height: 40px;
+        font-size: 14px;
+        width: 100%;
+        margin: 0 auto;
+        border-bottom: #e8e8e8 1px solid;
+        padding-left: 20px;
+    }
+
+    .per-data {
+        width: 90%;
+        margin: 0 auto;
+    }
+
+    .per-data ul, .per-data ul li {
+        width: 100%;
+        margin: 0 auto;
+    }
+
+    .per-data ul li {
+        height: 34px;
+        line-height: 34px;
+        margin-top: 15px;
+    }
+
+    .per-data ul li em {
+        width: 60px;
+        font-size: 14px;
+        float: left;
+    }
+
+    .per-data ul li input, .per-data ul li select {
+        width: 236px;
+        height: 34px;
+        border: #e8e8e8 1px solid;
+        font-size: 14px;
+        padding-left: 10px;
+    }
+
+    .per-data ul li select {
+        background: url("../images/select.png") no-repeat right;
+        -webkit-appearance: none;
+        appearance: none;
+        -o-appearance: none;
+        -moz-appearance: none;
+        -ms-appearance: none;
+    }
+
+    .per-data ul li select option {
+        line-height: 30px;
+    }
+
+    .per-data ul li span {
+        color: #959595;
+        line-height: 18px;
+        float: right;
+        width: 215px;
+        display: inline-block;
+    }
+
+    .per-data ul li.per-btn {
+        margin-top: 30px;
+    }
+
+    .per-data ul li a {
+        width: 94px;
+        height: 36px;
+        display: inline-block;
+        font-size: 14px;
+        color: #fff;
+        text-align: center;
+        line-height: 34px;
+        float: left;
+    }
+
+    .per-data ul li a.save {
+        margin-left: 60px;
+        background: #3f84f6;
+    }
+
+    .per-data ul li a.mod-psd {
+        background: #8dc7f9;
+        margin-left: 30px;
+    }
+
+    .per-data ul li a:hover {
+        background: #3578ba;
+    }
+
+    .add-address {
+        color: #3f84f6;
+        font-size: 14px;
+        padding-left: 30px;
+    }
+
+    .add-address:hover {
+        color: #8dc7f9;
+    }
+
+    .tender-content  ul.association {
+        position: absolute;
+        left: 0;
+        top: 100%;
+        right: 61px;
+        list-style: none;
+        -webkit-padding-start: 0;
+        background: #ffffff;
+        border: 1px solid #dddddd;
+        z-index: 21;
+    }
+
+    .tender-content  ul.association li {
+        padding: 0 15px;
+        line-height: 30px;
+        text-align: left;
+    }
+
+    .tender-content  ul.association li.active, .tender-content  ul.association li.active:hover
+    {
+        background: #dddddd;
+    }
+
+    .tender-content  ul.association li:hover {
+        background: #EEEEEE;
+        cursor: pointer;
+    }
+
+    /*增加样式*/
+    .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;
+    }
+    .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;
+    }
+    .search-bg .form-group{
+        position: relative;
+    }
+    .title-div span{
+        font-weight: bold;
+        font-size: 14px;
+    }
+    .add-vendor{
+        float: right;
+        font-weight: normal;
+        color: #5078cb;
+    }
+    .vend-info{
+        padding-bottom: 10px;
+        padding-top: 10px;
+    }
+    .vend-info input{
+        font-size: 14px;
+        width: 200px;
+    }
+    .base-info{
+        box-shadow: none;
+    }
+    .tender-content input{
+        font-size: 14px;
+    }
+
+    #isOpenChoice {
+        margin-top: 10px;
+        line-height: 34px;
+    }
+    #isOpenChoice div{
+        line-height: 34px;
+        padding-top: 0;
+    }
+    #isOpenChoice div.tender-desc{
+        margin-left: 15px;
+    }
+    #isOpenChoice div span{
+        font-size: 14px;
+    }
+    .tender-content .row{
+        margin-bottom: 15px;
+    }
+    .tender-content .row .tender-desc{
+        line-height: 35px;
+    }
+    .tender-content .input-select{
+        padding: 0;
+    }
+    .tender-list02  .scroll-y dd input{
+        border: #ccc 1px solid;
+    }
+    #li01 .com01 ul li {
+        height: 30px;
+        line-height: 30px;
+        padding: 0;
+    }
+
+    #li01 .com01 ul li a {
+        display: inline-block;
+        height: 30px;
+        width: 100%;
+    }
+    #li01 .com01  .input-group-addon {
+        width: 30px;
+        line-height: 34px;
+        height: 34px;
+        padding: 0;
+        display: inline-block;
+        position: relative;
+        top: -50px;
+        right: -7px;
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
+        left: 40%;
+    }
+    .title-div a{
+        float: right;
+        color: #5078cb;
+        font-weight :normal;
+        margin-right: 30px;
+    }
+    .well{
+        background-color: #fff;
+        border-radius: 0;
+        padding: 10px;
+    }
+    .width160{
+        width: 160px !important;
+    }
+    select.disabled {
+        background-color: #f5f5f5;
+    }
+    .left-dropdown-menu .dropdown-menu{
+        left: 700px !important;
+    }
+    .info-line span,.info-line input{
+        float: left;
+        font-size: 14px;
+    }
+    .info-line{
+        line-height: 34px;
+    }
+    .info-line span:last-child{
+        margin-left: 8px;
+    }
+    .left-dropdown-menu .dropdown-menu li span{
+        width: auto !important;
+    }
+    .inquiry-new .b2b-com-title {
+        margin-left: 20px;
+    }
+    .inquiry-new .select .select-adder {
+        width: 100px;
+    }
+    .line35 {
+        line-height: 35px;
+    }
+</style>
+<div class="user_right fr inquiry-new">
+    <div class="b2b-com-head">询价单</div>
+    <div class="ng-scope">
+        <form name="tenderForm">
+            <div class="purc-tender">
+                <div class="tender-content ng-scope">
+                    <div class="b2b-com-title">基本信息</div>
+                    <div class="row base-info">
+                        <div class="row">
+                            <div class="col-xs-6">
+                                <div class="tender-desc inline-block">询价单号：</div>
+                                <span class="inline-block line35" ng-bind="inquiry.code"></span>
+                            </div>
+                            <div class="col-xs-6">
+                                <div class="tender-desc inline-block">询价日期：</div>
+                                <span class="inline-block line35" ng-bind="inquiry.showdate"></span>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-xs-6">
+                                <span class="tender-desc f14">报价截止时间:</span>
+                                <div class="input-group input-trigger date-picker">
+                                    <input type="text" ng-model="inquiry.endDate" required
+                                           class="form-control" placeholder="点击选择截止日期" readonly="readonly"
+                                           datepicker-popup="yyyy-MM-dd" is-open="inquiry.$fromOpened"
+                                           ng-required="true" current-text="今天" min-date = "currentDay()"
+                                           clear-text="清除" close-text="关闭"
+                                           datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+                                           ng-click="openDatePicker($event, condition, '$fromOpened')"> <span
+                                        class="input-group-btn">
+							<button type="button" class="btn btn-default btn-open"
+                                    ng-click="openEndDatePicker($event, inquiry, '$fromOpened')">
+								<i class="fa fa-calendar"></i>
+							</button>
+						</span>
+                                </div>
+                            </div>
+                            <div class="col-xs-6">
+                                <div class="tender-desc">交易币别：</div>
+                                <select class="select-menu" data-style="btn-primary" ng-model="inquiry.currency" ng-change="changeCurrency(inquiry)">
+                                    <option value ="RMB">RMB</option>
+                                    <option value ="USD">USD</option>
+                                    <option value ="HKD">HKD</option>
+                                    <option value ="EUR">EUR</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-xs-6">
+                                <div class="tender-desc">是否含税：</div>
+                                <select class="select-menu" ng-model="inquiry.ifTax" ng-disabled="notRMB" ng-class="{'disabled':notRMB}">
+                                    <option value ="1">是</option>
+                                    <option value ="0">否</option>
+                                </select>
+                            </div>
+                            <div class="col-xs-6">
+                                <div class="tender-desc">发票要求：</div>
+                                <select class="select-menu" ng-model="inquiry.invoice" ng-disabled="notRMB" ng-class="{'disabled':notRMB}">
+                                    <option value ="2">增值税专用发票</option>
+                                    <option value ="1">普通发票</option>
+                                    <option value ="0">不需要发票</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-xs-12" id="isOpenChoice">
+                                <div class="tender-desc" style="margin-left: 0;">询价类型：</div>
+                                <div class="input-select col-xs-1">
+                                    <input  class="tender-input" name="inquirytype" type="radio" value="询价" ng-model="inquiry.inquirytype"/>
+                                    <span>询价</span>
+                                </div>
+                                <div class="input-select col-xs-1">
+                                    <input class="tender-input" name="inquirytype" type="radio" value="求购" ng-model="inquiry.inquirytype"/>
+                                    <span>求购</span>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class = "col-xs-12">
+                                <div class="tender-desc">备注：</div>
+                                <input class="tender-input01" type="text" name="user" ng-model="inquiry.remark" style="width: 738px"/>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-xs-12">
+                                <div class="tender-desc">上传附件：</div>
+                                <div class="fileInputContainer">
+                                    <input class="fileInput" type="file" ng-file-select name="file" ng-model="myFiles"/>
+                                </div>
+                                <div style="margin-left: 100px; color: #969595; font-size: 12px; ">
+                                    提示：选择附件大小不超过5MB，可上传JPG,PNG,EXCEL,WORD,PDF
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row" style="margin-bottom: 0;">
+                            <div class="col-xs-12">
+                                <div ng-show="previewShow">
+                                    <div class="fl" style="margin-left: 100px;">
+                                        <div class="well margin-b-0">
+                                            <div ng-show="previewShow">
+                                                <img ng-show="previewShow" alt="营业执照复印件" src="{{imgPreview}}" width="200px" height="100px">
+                                                <div>
+                                                    &nbsp;&nbsp;<span class="text-primary"><b>{{imgPreviewName}}</b></span>
+                                                </div>
+                                            </div>
+                                            <div ng-show="pdfShow">
+                                                <img ng-show="pdfShow" src="static/img/all/pdf.jpg" alt="PDF文件" width="30px" height="40px">
+                                                &nbsp;&nbsp;<span class="text-primary"><b>{{imgPreviewName}}</b></span>
+                                            </div>
+                                            <div ng-show="noneFileShow">
+                                                <span class="text-warning">请上传清晰照片的图片文件或PDF文件</span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="wrap">
+                        <div class="content">
+                            <div class="tender-list02">
+                                <!--产品信息-->
+                                <div class="b2b-com-title">
+                                    <span class="f14">询价明细</span>
+                                    <span class="base-blue" style="opacity: 0.8; margin-left: 10px; font-weight: normal;">
+                                        <i class="fa fa-info-circle"></i>您可以在页面下方选择本企业物料
+                                    </span>
+                                    <a ng-click="add()" class="operate" style="margin-left: 20px;margin-right: 13px;">
+                                        <i class="fa fa-plus-circle"></i> 新增询价明细
+                                    </a>
+                                    <a class="operate" ng-click="uplodaByBatch()"><i class="fa fa-arrow-circle-o-up"></i> 批量导入</a>
+                                </div>
+                                <dl>
+                                    <dt>
+                                        <span>序号</span>
+                                        <span class="wid01">型号</span>
+                                        <span class="wid01">名称</span>
+                                        <span class="wid02">品牌</span>
+                                        <span>数量</span>
+                                        <span>单位</span>
+                                        <span>报价有效期</span>
+                                        <span class="wid03">&nbsp;</span>
+                                    </dt>
+                                    <div class="scroll-y">
+                                        <dd ng-repeat="prod in inquiry.inquiryItems" id="li01" class="clearfix">
+                                            <span>{{$index + 1}}</span>
+                                            <span class="com01 wid01 text-center">
+                                        	<input type="text" name="code" ng-model="prod.prodCode" ng-change="getSimilarCodes(prod.prodCode)" ng-focus="onFocus('code')" placeholder="请输入标准原厂型号" typeahead="prod.code for prod in getSimilarCodes($viewValue)" autocomplete="off" typeahead-on-select="onAssociateCmpClick($item, prod)" spellcheck = "false" required>
+                                        </span>
+                                            <span class="com01 wid01">
+                                        	<input type="text" style="text-align: left;" class="input01" name="kindName" ng-model="prod.prodTitle"  required placeholder="请输入或选择分类" spellcheck = "false" autocomplete="off" />
+                                        	<div class="input-group-addon" ng-click="selectKind(prod)">
+                                                <i class="fa fa-search" aria-hidden="true"></i>
+                                            </div>
+                                        </span>
+                                            <span class="com01 wid02 text-center">
+                                       		 <input type="text" style="width: 93%; text-align: left;" ng-change="getSimilarBrands(prod.inbrand)" class="input01" name="brandName" ng-model="prod.inbrand" required  placeholder="请输入或选择品牌" spellcheck = "false" typeahead="prod.brandCn for prod in getSimilarBrands($viewValue)" autocomplete="off" typeahead-on-select="onAssociateBrandClick($item, prod)" />
+                                             <div class="input-group-addon" ng-click="selectBrand(prod)">
+                                                 <i class="fa fa-search" aria-hidden="true"></i>
+                                             </div>
+										</span>
+                                            <span class="text-center"><input type="text" ng-model="prod.needquantity" placeholder="点击输入数量" required style="width: 93%;"/></span>
+                                            <span class="text-center"><input type="text" ng-model="prod.unit" placeholder="点击填入单位" required style="width: 93%;"/></span>
+                                            <span class="left-dropdown-menu"><input ng-model="prod.toDate" type="text" class="editable"  required
+                                                                                    placeholder="选择时间" datepicker-popup="yyyy-MM-dd" is-open="prod.$toDateOpen"
+                                                                                    min-date="getMinDate()" current-text="今天" clear-text="清除" close-text="关闭"
+                                                                                    datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+                                                                                    ng-focus="openDatePicker($event, prod.$toDateOpen)" readonly="readonly"
+                                                                                    ng-click="openDatePicker($event, prod.$toDateOpen, $index)"></span>
+                                            <span class="wid03"><a ng-click="del($index)"><i class="fa fa-close"></i></a></span>
+                                        </dd>
+                                    </div>
+                                    <div ng-if="inquiry.inquiryItems.length == 0" class="no-record">暂无产品信息！</div>
+                                </dl>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="b2b-com-title">供应商信息
+                        <input  class="tender-input" name="ifOpen" style="display: none" ng-init="inquiry.isOpen = 0"/>
+                        <a class="operate" ng-click="dbfindVendor()" href="javascript:void(0)" ng-if="inquiry.isOpen == 0">
+                            <i class="fa fa-plus-circle fa-fw"></i>添加供应商&nbsp;
+                        </a>
+                    </div>
+                    <div class="row vend-info">
+                        <div class="col-xs-12" style="" ng-repeat="vendor in vendors">
+                            <div class="col-xs-1 control-label" style="width: 60px;">{{$index + 1}}</div>
+                            <div class="info-line col-xs-4"><span>供应商</span><span><input class="tender-input01" ng-model="vendor.enName" type="text" readonly></span></div>
+                            <div class="info-line col-xs-3">
+                                <span>币别</span>
+                                <span>
+                                <select ng-model="vendor.currency" ng-init="vendor.currency = 'RMB'" class="tender-input01" style="width: 140px;">
+                            	<option value ="RMB">RMB</option>
+                                <option value ="USD">USD</option>
+                                <option value ="HKD">HKD</option>
+                                <option value ="EUR">EUR</option>
+                            </select>
+                            </span>
+                            </div>
+                            <div class="info-line col-xs-3">
+                                <span>税率</span>
+                                <span>
+                                <input ng-model="vendor.rate" type="text" class="tender-input01" style="width: 140px;">
+                            </span>
+                            </div>
+                            <div class="col-xs-1">
+                                <a class="remove-vendor" href="javascript:void(0)" ng-click="removeVendor($index)" title="删除"><i class="fa fa-trash-o"></i></a>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="btn-save text-right" style="padding: 0 30px 30px; width: 100%;" ng-if="inquiry.inquiryItems.length>0">
+                        <button class="b2b-btn-submit b2b-btn" style="margin-right: 20px;" ng-disabled="tenderForm.$invalid || vendors.length==0" ng-click="submit()">发布</button>
+                        <button class="b2b-btn-submit b2b-btn" ng-disabled="tenderForm.$invalid || vendors.length==0" ng-click="save()">保存</button>
+                    </div>
+                </div>
+            </div>
+        </form>
+        <div class="pro-add-data02" style="min-height: 500px;background: #fff;" >
+            <div class="pro-search">
+                <div class="b2b-com-title">我的物料库</div>
+                <div class="b2b-com-search">
+                    <div class="search-result">搜索到<em>{{total}}</em>条</div>
+                    <div class="search-content fr">
+                        <input type="text" placeholder="输入物料关键字查询" ng-model="keyword" ng-search="onSearch(keyword)"/>
+                        <a class="seek" ng-click="onSearch(keyword)" style="right: inherit;">搜索</a>
+                    </div>
+                </div>
+            </div>
+            <table class="table b2b-modal-table" style="margin-top: 10px;" ng-table="tableParams">
+                <thead>
+                <tr class="header">
+                    <th width="160px">物料编号</th>
+                    <th width="120px">名称</th>
+                    <th>规格</th>
+                    <th width="120px">单位</th>
+                    <th width="80px">选择</th>
+                </tr>
+                </thead>
+                <tbody ng-if="tableParams.total() == 0">
+                <tr>
+                    <td colspan="5" style="border-bottom: 1px solid transparent">
+                        <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 ng-if="tip != null">搜索"{{tip}}"未找到产品信息，请重新输入搜索条件</p>
+                                <p ng-if="tip == null">暂无物料信息</p>
+                                <a ng-if="tip == null" ui-sref="purc.uploadProduct" target="_blank"><i class="way_icon"></i>立即添加</a>
+                            </div>
+                        </div>
+                    </td>
+                </tr>
+                </tbody>
+                <tbody>
+                <tr ng-repeat="product in $data">
+                    <td class="text-center" ng-bind="::product.code"></td>
+                    <td class="text-center" ng-bind="::product.title"></td>
+                    <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>
+                    </td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+    <!--设置-企业设置-收货地址编辑-->
+    <div class="bomb-box" style="display: none">
+        <form class="box04 box" name="shipAddress" id="shipAddress">
+            <i class="off"><img src="static/img/purc/close.png" alt="" /></i>
+            <p>收货人资料</p>
+            <ul>
+                <li class="line01">
+                    <div class="fl">
+                        <span class="fl">收货人<em>*</em>：</span>
+                        <span class="fr"><input type="text" placeholder="填写收货人" ng-model="ship.receiver" required="true" ng-pattern="/^[\u4e00-\u9fa5]{1,6}$|^[\dA-Za-z]{1,12}$/"/></span>
+                    </div>
+                    <div class="fr">
+                        <span class="fl">手机<em>*</em>：</span>
+                        <span class="fr"><input type="text" ng-model="ship.usertel" required="true" ng-pattern="/^1(3|4|5|7|8)\d{9}$/"/></span>
+                    </div>
+                </li>
+                <li class="line01">
+                    <div class="fl">
+                        <span class="fl">固定电话<em></em>：</span>
+                        <span class="fr"><input type="text" ng-model="ship.phone"  ng-pattern="/([0-9]{3,4}-)?[0-9]{7,8}/"/></span>
+                    </div>
+                    <div class="fr">
+                        <span class="fl">邮箱：</span>
+                        <span class="fr emaill"><input type="text" ng-model="ship.email" ng-pattern="/^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/"/><i>用于接收订单提醒邮件，便于您及时了解订单状态</i></span>
+                    </div>
+                </li>
+                <li class="line02 margin-top40">
+                    <div class="fl">所在地址<em>*</em>：</div>
+                    <div class="select fr">
+                        <select required="" class="area-select" ng-model="ship.province" ng-options="key as key for (key,value) in provinces"
+                                ng-change="ship.city='';ship.district='';" required="true">
+                            <option value="">省</option>
+                        </select>
+                        <select class="area-select" ng-model="ship.city" ng-options="key as key for (key,value) in provinces[ship.province]"
+                                ng-change="ship.district='';" required="true">
+                            <option value="">市</option>
+                        </select>
+                        <select class="area-select" ng-model="ship.district" ng-options="value as value for value in provinces[ship.province][ship.city]" required="true">
+                            <option value="">区</option>
+                        </select>
+                    </div>
+                </li>
+                <li class="line02">
+                    <div class="fl">详细地址<em>*</em>：</div>
+                    <div class="fr"><input type="text" ng-model="ship.addressdet" required="true"/></div>
+                </li>
+                <li class="line02">
+                    <div class="fl">地址别名：</div>
+                    <div class="fr address"><input type="text" ng-model="ship.addalias"/><i>建议填写常用名称：家里/父母家/公司</i></div>
+                </li>
+            </ul>
+            <div class="many-file-btn">
+                <button class="btn01" ng-click="saveShipAddress(ship);" ng-disabled="shipAddress.$invalid">保存</button><a href="javascript:void(0);" class="btn02">取消</a>
+            </div>
+        </form>
+    </div>
+</div>
+<script src="static/lib/jquery/jquery.min.js"></script>
+<script>
+    $(function(){
+        var size10= $(".tender-list02 dl dd").size();
+        if(size10 > 10){
+            $(".scroll-y").addClass("active");
+        }else{
+            $(".scroll-y").removeClass("active");
+        }
+
+        /*下拉效果*/
+        $('.select p').click(function(e){
+            $('.select').toggleClass('open');
+            e.stopPropagation();
+        });
+        $('.select ul li').click(function(e){
+            var title=$(this).html();
+            $('.select p').html(title);
+            $(this).addClass('selected').siblings().removeClass('selected');
+            $('.select').removeClass('open');
+            e.stopPropagation();
+        });
+        $(document).click(function(){
+            $('.select').removeClass('open');
+        })
+
+        //新增收货地址
+        $(".tender-content .base-info .add-address").click(function(){
+            document.getElementById('shipAddress').reset();
+            $(".bomb-box").show();
+        });
+        $(".bomb-box .box04 .off,.box04 .many-file-btn .btn02").click(function(){
+            $(".bomb-box").hide();
+        });
+        $(".bomb-box .box04 .off,.box04 .many-file-btn .btn01").click(function(){
+            $(".bomb-box").hide();
+        })
+    })
+</script>

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

@@ -0,0 +1,1030 @@
+<style>
+  /*增加样式*/
+  .view-slide-in {
+    /*margin-top: 20px;*/
+  }
+  .view-slide-in .block {
+    background: #fff;
+  }
+  .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;
+  }
+  .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 {
+    font-size: 16px;
+    height: 40px;
+    line-height: 40px;
+    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;
+  }
+  .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;
+  }
+  .search-bg .form-group{
+    position: relative;
+  }
+
+  .order-table .header>th {
+    height: 38px;
+    text-align: center;
+    background: #f5f5f5;
+    border-top: 1px solid #e8e8e8;
+    border-bottom: 1px solid #e8e8e8;
+  }
+
+  .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 {
+    padding: 0 5px;
+  }
+
+  .order-table>tbody {
+    border: 1px solid transparent;
+  }
+
+  .order-table>tbody:hover {
+    border-color: #3f84f6;
+    border-width: 2px;
+  }
+
+  .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;
+    /*vertical-align: top;*/
+    position: relative;
+  }
+
+  .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;
+  }
+
+  .input-group-xs .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+  }
+
+  @media ( min-width : 768px) {
+    .form-horizontal .form-group-xs .control-label {
+      padding-top: 5px;
+    }
+  }
+
+  .info-container .info:hover {
+    color: #CC3333;
+  }
+  .input-error{
+    background-color: #fff8ee;
+    border-color: #CC0033;
+  }
+  input.input-error:focus {
+    background-color: #fff8ee;
+    border-color: #CC0033;
+  }
+  .block{
+    /*background: #f5f5f5;*/
+  }
+  .order-table{
+    background: #fff;
+  }
+  .inquiry-todo {
+    font-size: 14px;
+    padding: 0;
+    margin-left: 55px;
+  }
+
+  .inquiry-todo a{
+    float: left;
+    margin-left: 15px;
+    font-size: 16px;
+    font-family: "Microsoft YaHei", "微软雅黑";
+  }
+  .inquiry-cz{
+    font-size: 14px;
+    padding: 0;
+    margin-left: 55px;
+  }
+  .inquiry-cz a{
+    color: #5078cb;
+    float: left;
+    margin-left: 15px;
+  }
+  .inquiry-cz a img{
+    margin-right: 3px;
+  }#public .menu .btn-group{
+     height: inherit !important;
+   }
+  .menu .new-dot{
+    width: 20px;
+    height: 20px;
+    line-height: 20px;
+    font-size: 12px;
+    color: #fff;
+    font-weight: inherit;
+    top: -2px;
+  }
+</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;
+  }
+</style>
+<div class="user_right fr" style="position: relative">
+
+  <div class="com_tab" style="margin-bottom: 10px">
+    <ul class="fl" style="width: 100%">
+      <li class="active"><a >采购询价</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>-->
+      <!--</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>
+    </ul>
+  </div>
+  <div class="screen check-filter">
+    <div class="radio-block date-radio" style="width: 33%">
+      时间：
+      <label class="com-check-radio">
+        <input type="radio" id="oneMonth" name="date" ng-click="changeDateZone(1);condition.$open=false" checked>
+        <label for="oneMonth"></label>
+        30天
+      </label>
+      <label class="com-check-radio">
+        <input type="radio" id="threeMonth" name="date" ng-click="changeDateZone(3);condition.$open=false">
+        <label for="threeMonth"></label>
+        90天
+      </label>
+      <label class="com-check-radio">
+        <input type="radio" id="sixMonth" name="date" ng-click="changeDateZone(6);condition.$open=false">
+        <label for="sixMonth"></label>
+        180天
+      </label>
+      <label class="com-check-radio">
+        <input type="radio" id="autoMonth" name="date" ng-click="condition.$open=!condition.$open;changeDateZone(-1)">
+        <label for="autoMonth"></label>
+        自定义
+      </label>
+    </div>
+    <div class="sreach fr">
+      <div ng-show="condition.$open" class="date fl">
+        <div class="data-input">
+          <input type="text" ng-model="condition.dateFrom"
+                 class="form-control select-adder" placeholder="起始时间"
+                 datepicker-popup="yyyy-MM-dd"
+                 is-open="condition.$fromOpened"
+                 max-date="condition.dateTo" current-text="今天" clear-text="清除" close-text="关闭"
+                 ng-focus="openFilterDatePicker($event, condition, '$fromOpened')"
+                 datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+                 style="width: 130px"
+          />
+          <button class="open" ng-click="openFilterDatePicker($event, condition, '$fromOpened')"></button>
+        </div>
+
+        <em>–</em>
+        <div class="data-input">
+          <input type="text" ng-model="condition.dateTo"
+                 class="form-control select-adder" placeholder="结束时间"
+                 datepicker-popup="yyyy-MM-dd"
+                 is-open="condition.$toOpened"
+                 min-date="condition.dateFrom" current-text="今天" clear-text="清除" close-text="关闭"
+                 ng-focus="openFilterDatePicker($event, condition, '$toOpened')"
+                 datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+                 style="width: 130px"
+          />
+          <button class="open" ng-click="openFilterDatePicker($event, condition, '$toOpened')"></button>
+        </div>
+      </div>
+      <div class="sreach-input fr">
+        <input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
+        <a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+      </div>
+    </div>
+  </div>
+  <table class="order-table block" ng-table="tableParams">
+    <thead>
+    <tr class="header">
+      <th>物料</th>
+      <th width="60">单位</th>
+      <th width="90"><span class="text-default" style="color: #323232">≥</span>分段数</th>
+      <th width="90">价格</th>
+      <th width="80">最小订购</th>
+      <th width="80">最小包装</th>
+      <th width="120">有效期</th>
+      <th width="90">操作</th>
+    </tr>
+    <!--<tr class="sep-row">-->
+      <!--<td colspan="8"></td>-->
+    <!--</tr>-->
+    </thead>
+    <tbody ng-if="tableParams.total() == 0">
+    <tr>
+      <td colspan="8">
+        <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="8">
+        <div id="empty_info">
+          <div class="f16 text-center empty_title">
+            <p>为什么我没有接收到客户的询价单？</p>
+          </div>
+          <div class="f14 empty_explain">
+            <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>
+        </div>
+      </td>
+    </tr>
+    </tbody>
+    <tbody ng-repeat="inquiryItem in $data track by inquiryItem.id">
+    <tr class="order-hd">
+      <td class="first" colspan="6">
+        <div class="order-main">
+          <a href="javascript:void(0)" ng-if="!isUnread(inquiryItem.id)" class="circle-icon fixed" style="color: #fff">
+            已读
+          </a>
+          <!--<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)" class="no-circle-icon fixed" style="color: #fff">
+            <!--<i class="fa fa-circle" style="color: #f40;"></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}}">时间：{{::inquiryItem.inquiry.date | date:'yyyy-MM-dd'}}</span>
+          <span title="{{::inquiryItem.enterprise.enName}}">
+            <img src="static/img/user/images/shop_home.png" style="margin-right: 5px">
+            {{::inquiryItem.enterprise.enName}}
+          </span>
+          <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})"
+                       ng-click="setOrdersRead(inquiryItem.id)"></a></span>
+          <!--href="#/purc/purcinquirydetail/{{inquiryItem.inquiry.id}}"-->
+          <span>
+             币别：<span ng-bind="::inquiryItem.currency"></span>
+          </span>
+          <span>
+            税率：<span ng-bind="::inquiryItem.taxrate || 0"></span>%
+          </span>
+        </div>
+      </td>
+      <td  colspan="1" class="order-sum" style="text-align: center">
+        <div ng-if="inquiryItem.replyable">
+          <span class="text-inverse text-bold" ng-bind-html="::inquiryItem.inquiry.endDate | date:'yyyy-MM-dd'"></span>
+        </div>
+      </td>
+      <td class="text-center">
+        <div class="operates">
+        </div>
+      </td>
+    </tr>
+    <tr class="order-bd">
+      <td class="product">
+        <div class="text-num text-bold" title="{{::inquiryItem.product.code || inquiryItem.prodCode}}">
+          物料编号：{{::inquiryItem.product.code || inquiryItem.prodCode}}
+        </div>
+        <div title="{{::inquiryItem.product.title || inquiryItem.prodTitle}}">
+          物料名称：{{::inquiryItem.product.title || inquiryItem.prodTitle}}
+        </div>
+        <div class="text-muted" title="{{::inquiryItem.product.spec || inquiryItem.spec}}">
+          物料规格：{{::inquiryItem.product.spec || inquiryItem.spec}}
+        </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.brand && !inquiryItem.$editing" class="text-muted">
+          品牌：<spans ng-bind="::inquiryItem.brand"></spans>
+        </div>
+        <div ng-if="::inquiryItem.vendorprodcode && !inquiryItem.$editing" class="text-muted">
+          物料编号：<spans ng-bind="::inquiryItem.vendorprodcode"></spans>
+        </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="number" class="form-control input-xs" ng-change="verify(inquiryItem.leadtime,'leadtime')"
+                 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>
+      </td>
+      <td class="text-center">
+        <div ng-bind="inquiryItem.product.unit"></div>
+      </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)"
+                     ng-model="reply.lapQty" min="{{reply.lapQty == 0 ? 0 : 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>
+          <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>
+        <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 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-show="!inquiryItem.$editing"
+             ng-init="parseDate(inquiryItem)">
+          <div ng-show="inquiryItem.fromDate">
+            <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.fromDate">
+            <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>
+            <span class="text-bold text-inverse">注意：</span>
+            <div><strong>交货周期</strong>和<strong>单价</strong>为必填项;<strong>分段</strong>是指按购买数量分成几个等级，然后在不同范围内报出对应的价格，一般量越大价格越低!</div>
+          </div>
+        </div>
+      </td>
+      <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>
+        </div>
+        <div ng-if="inquiryItem.invalid == 1" class="block">
+          <span class="text-trans text-light">已失效</span>
+        </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.agreed == 0 && inquiryItem.invalid != 1" class="block">
+          <span class="text-trans error">未采纳</span>
+        </div>
+        <div ng-if="inquiryItem.status == 200 && inquiryItem.invalid != 1">
+          <span class="text-trans half">未报价</span>
+        </div>
+        <div ng-if="inquiryItem.status == 314 && inquiryItem.invalid != 1">
+          <span class="text-trans text-light">已失效</span>
+        </div>
+      </td>
+      <td class="text-center br-l" ng-if="inquiryItem.overdue == 1">
+        <div class="block">
+          <span class="text-trans error">已过期</span>
+        </div>
+      </td>
+    </tr>
+    </tbody>
+  </table>
+  <div ng-if="infoCommon.totalElement > 0" class="text-mns text-right" ng-class="infoCommon.totalElement >= 20 ? '': 'Boom18'">
+    显示&nbsp;{{(infoCommon .page - 1 ) * infoCommon.size + 1}}-{{infoCommon.all >= 20 ? infoCommon.page *  infoCommon.size: (infoCommon.page - 1 ) * infoCommon.size + infoCommon.all}}&nbsp;条，共&nbsp;{{infoCommon.totalElement}}&nbsp;条
+  </div>
+</div>

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

@@ -377,6 +377,7 @@ input[type="radio"], input[type="checkbox"] {
 	display: inline-block;
 	color: #323232;
     width: 11.6%;
+    text-align: left;
 }
 
 .tender-list02 dl dd {
@@ -908,6 +909,9 @@ select.disabled {
 .purc-inquiry-new .select .select-adder {
     width: 100px;
 }
+    .line35 {
+        line-height: 35px;
+    }
 </style>
 <div class="user_right fr purc-inquiry-new">
     <div class="b2b-com-head">询价单</div>
@@ -919,12 +923,12 @@ select.disabled {
                     <div class="row base-info">
                         <div class="row">
                             <div class = "col-xs-6">
-                                <div class="tender-desc">询价单号：</div>
-                                <span ng-bind="inquiry.code"></span>
+                                <div class="tender-desc inline-block">询价单号：</div>
+                                <span class="inline-block line35" ng-bind="inquiry.code"></span>
                             </div>
                             <div class = "col-xs-6">
-                                <div class="tender-desc">询价日期：</div>
-                                <span ng-bind="inquiry.showdate"></span>
+                                <div class="tender-desc inline-block">询价日期：</div>
+                                <span class="inline-block line35" ng-bind="inquiry.showdate"></span>
                             </div>
                         </div>
                         <div class="row">

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

@@ -43,6 +43,7 @@
                 <li ng-class="{'active' : active == 'buyer_pay_center'}"><a  ui-sref="pay_center">应付对账</a></li>
                 <li ng-class="{'active' : active == 'buyer_invoice'}"><a  ui-sref="buyer_no_invoice">发票管理</a></li>
                 <li ng-class="{'active' : active == 'buyer_tender'}"><a  ui-sref="purc_tenderlist">采购招标</a></li>
+                <li ng-class="{'active' : active == 'purc_haseinquiry'}"><a  ui-sref="purc_haseinquiry">采购询价</a></li>
                 <!--<div ng-hide="!(userInfo.pwdEnable && userInfo.haveUserQuestion &&  userInfo.emailValidCode && userInfo.emailValidCode == 2)">-->
                     <!--<li ng-class="{'active' : active == 'buyer_order'}"><a  ui-sref="buyer_order">订单中心</a></li>-->
                     <!--<li ng-class="{'active' : active == 'seek_purchase'}"><a  ui-sref="buyerSeekPurchase">我的求购</a></li>-->

src/main/webapp/resources/view/vendor/b2b/sale_makechange.html

@@ -235,7 +235,7 @@
 				</li>
 			</ul>
 		</div>
-		<div class="tab_top">
+		<div class="tab_top" style="margin-bottom: 0px">
 			<ul class="fl" style="width: 100%">
 				<li ng-class="{'active': storeType=='order'}"><a ui-sref="saleOrder">客户采购订单</a></li>
 				<li ng-class="{'active': storeType=='change'}"><a ui-sref="saleChange">客户采购变更单</a></li>