Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
Y
YX_IDENT_beijing_auxiliary_YD
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhangyusheng
YX_IDENT_beijing_auxiliary_YD
Commits
a29aa240
Commit
a29aa240
authored
Apr 24, 2019
by
cuizhiyuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加错误信息下拉框
parent
d12a70ad
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
4 deletions
+30
-4
application.yml
src/main/resources/application.yml
+1
-1
service.js
src/main/resources/static/js/service.js
+12
-0
saveDeliveredFailedInfo.html
...iews/saveDeliveredFailedInfo/saveDeliveredFailedInfo.html
+6
-1
saveDeliveredFailedInfo.js
.../views/saveDeliveredFailedInfo/saveDeliveredFailedInfo.js
+11
-2
No files found.
src/main/resources/application.yml
View file @
a29aa240
...
@@ -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.1
0.208
:1521:yingxin
username
:
yingxin
username
:
yingxin
password
:
yingxin
password
:
yingxin
servlet
:
servlet
:
...
...
src/main/resources/static/js/service.js
View file @
a29aa240
...
@@ -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
src/main/resources/static/views/saveDeliveredFailedInfo/saveDeliveredFailedInfo.html
View file @
a29aa240
...
@@ -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>
...
...
src/main/resources/static/views/saveDeliveredFailedInfo/saveDeliveredFailedInfo.js
View file @
a29aa240
...
@@ -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
{
a
lert
(
"提交失败!!"
)
MessageService
.
showA
lert
(
"提交失败!!"
)
}
}
})
})
}
}
}
})
})
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment