Commit a29aa240 authored by cuizhiyuan's avatar cuizhiyuan

添加错误信息下拉框

parent d12a70ad
...@@ -4,7 +4,7 @@ server: ...@@ -4,7 +4,7 @@ server:
spring: spring:
datasource: datasource:
driver-class-name: oracle.jdbc.driver.OracleDriver driver-class-name: oracle.jdbc.driver.OracleDriver
url: jdbc:oracle:thin:@192.168.1.102:1521:yingxin url: jdbc:oracle:thin:@192.168.10.208:1521:yingxin
username: yingxin username: yingxin
password: yingxin password: yingxin
servlet: servlet:
......
...@@ -1099,5 +1099,16 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -1099,5 +1099,16 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}) })
}, },
queryDeliveredFailedType:function (success) {
$http({
method: 'GET',
url: "../DeliveredApi/queryDeliveredFailedType" + urlTimeStamp(),
}).then(function successCallback(response) {
success(response.data)
})
},
} }
}); });
\ No newline at end of file
...@@ -43,7 +43,12 @@ ...@@ -43,7 +43,12 @@
</tr> </tr>
<tr> <tr>
<td>退回原因:</td> <td>退回原因:</td>
<td><input type="text" class="form-control" ng-model="backReason" placeholder="退回原因"></td> <td>
<select class="form-control select2" ng-model="backReason">
<option value="">--请选择退回原因--</option>
<option ng-repeat="item in backReasonList" value="{{item.id}}">{{item.reason}}</option>
</select>
</td>
<td>备注:</td> <td>备注:</td>
<td><input type="text" class="form-control" ng-model="note" placeholder="备注"></td> <td><input type="text" class="form-control" ng-model="note" placeholder="备注"></td>
......
...@@ -8,11 +8,18 @@ angular.module("AvatarCheck.saveDeliveredFailedInfo",['ngRoute', 'AvatarCheck.ht ...@@ -8,11 +8,18 @@ angular.module("AvatarCheck.saveDeliveredFailedInfo",['ngRoute', 'AvatarCheck.ht
}); });
}]) }])
.controller('saveDeliveredFailedInfoContr', function ($scope, $rootScope, $timeout, HttpService, $filter, $interval, MessageService, ngDialog) { .controller('saveDeliveredFailedInfoContr', function ($scope, $rootScope, $timeout, HttpService, $filter, $interval, MessageService, ngDialog) {
HttpService.queryDeliveredFailedType(function(data) {
console.log(data)
$scope.backReasonList = data;
})
$scope.saveDeliveredFailedInfo=function () { $scope.saveDeliveredFailedInfo=function () {
var waybillNumber = $scope.waybillNumber; var waybillNumber = $scope.waybillNumber;
var registerName = $scope.registerName; var registerName = $scope.registerName;
var cardId = $scope.cardId; var cardId = $scope.cardId;
var backReason = $scope.backReason; var backReason = $scope.backReason;
if(backReason==null){
MessageService.showAlert("请选择退回原因")
}else{
var note = $scope.note; var note = $scope.note;
var arr = [{"waybillNumber":waybillNumber,"registerName":registerName,"cardId":cardId,"backReason":backReason,"note":note}]; var arr = [{"waybillNumber":waybillNumber,"registerName":registerName,"cardId":cardId,"backReason":backReason,"note":note}];
...@@ -20,11 +27,12 @@ angular.module("AvatarCheck.saveDeliveredFailedInfo",['ngRoute', 'AvatarCheck.ht ...@@ -20,11 +27,12 @@ angular.module("AvatarCheck.saveDeliveredFailedInfo",['ngRoute', 'AvatarCheck.ht
HttpService.saveDeliveredFailedInfo(arr,function (data) { HttpService.saveDeliveredFailedInfo(arr,function (data) {
if(data==true){ if(data==true){
confirm("提交成功"); MessageService.showAlert("提交成功");
}else{ }else{
alert("提交失败!!") MessageService.showAlert("提交失败!!")
} }
}) })
} }
}
}) })
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment