|
|
@@ -111,7 +111,8 @@ define(['app/app'], function (app) {
|
|
|
brand: true,
|
|
|
unitPrice: true,
|
|
|
amount: true,
|
|
|
- deadline: true
|
|
|
+ deadline: true,
|
|
|
+ spec: true
|
|
|
};
|
|
|
|
|
|
// 买家求购列表
|
|
|
@@ -179,12 +180,41 @@ define(['app/app'], function (app) {
|
|
|
$scope.deadDate.setMonth($scope.deadDate.getMonth() + 3);
|
|
|
$scope.deadDate.setDate($scope.deadDate.getDate() + 1);
|
|
|
|
|
|
+
|
|
|
+ $scope.checkNull = function (code) {
|
|
|
+ var str = code;
|
|
|
+ var filterStr = new Array("空", "没", "无", "-", "—", "null", "#N/A");
|
|
|
+ var flag = true;
|
|
|
+ angular.forEach (filterStr, function(item) {
|
|
|
+ if (str == item){
|
|
|
+ flag = false;
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ })
|
|
|
+ return flag;
|
|
|
+ }
|
|
|
+
|
|
|
+ $scope.checkSpec = function () {
|
|
|
+ if (!$scope.checkNull($scope.applyObj.spec)){
|
|
|
+ toaster.pop('error', '规格输入不合法');
|
|
|
+ $scope.validObj.spec = false;
|
|
|
+ } else {
|
|
|
+ $scope.validObj.spec = true;
|
|
|
+ }
|
|
|
+ return $scope.validObj.spec;
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
$scope.checkCode = function () {
|
|
|
$scope.setShowSimilarCodeList($scope.isInCodeList);
|
|
|
$scope.validObj.code = $scope.applyObj.code && $scope.applyObj.code !== '';
|
|
|
if (!$scope.validObj.code) {
|
|
|
toaster.pop('error', '型号不能为空');
|
|
|
}
|
|
|
+ if (!$scope.checkNull($scope.applyObj.code)){
|
|
|
+ toaster.pop('error', '型号输入不合法');
|
|
|
+ $scope.validObj.code = false;
|
|
|
+ }
|
|
|
return this.validObj.code;
|
|
|
}
|
|
|
$scope.checkBrand = function () {
|
|
|
@@ -194,6 +224,10 @@ define(['app/app'], function (app) {
|
|
|
if (!$scope.validObj.brand) {
|
|
|
toaster.pop('error', '品牌不能为空');
|
|
|
}
|
|
|
+ if (!$scope.checkNull($scope.applyObj.brand)){
|
|
|
+ toaster.pop('error', '品牌输入不合法');
|
|
|
+ $scope.validObj.brand = false;
|
|
|
+ }
|
|
|
return $scope.validObj.brand;
|
|
|
}
|
|
|
$scope.checkUnitPrice = function () {
|
|
|
@@ -296,7 +330,7 @@ define(['app/app'], function (app) {
|
|
|
}
|
|
|
$scope.checkAll = function () {
|
|
|
return $scope.checkCode() && $scope.checkBrand() && $scope.checkDeadline()
|
|
|
- && $scope.checkUnitPrice() && $scope.checkAmount();
|
|
|
+ && $scope.checkUnitPrice() && $scope.checkAmount() && $scope.checkSpec();
|
|
|
}
|
|
|
$scope.checkDeadline = function () {
|
|
|
$scope.validObj.deadline = $scope.applyObj.deadline
|