Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
H
hls-xcmg-vue-app
Project
Project
Details
Activity
Releases
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
xugong
hls-xcmg-vue-app
Commits
4775b06a
Commit
4775b06a
authored
Sep 22, 2020
by
jiacheng.mao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
企业用户绑定无法保存附件问题调整
身份证识别【长期】问题调整
parent
d60da710
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
147 additions
and
18 deletions
+147
-18
dev.env.js
config/dev.env.js
+1
-1
prod.env.js
config/prod.env.js
+1
-1
uat.env.js
config/uat.env.js
+3
-3
naturePerson.vue
src/pages/userBind/np/naturePerson.vue
+20
-2
enterprise.vue
src/pages/userBind/org/enterprise.vue
+20
-2
base-info.vue
src/pages/userBindNew/np/base-info.vue
+20
-2
baseInfo.vue
src/pages/userBindNew/org/baseInfo.vue
+82
-7
No files found.
config/dev.env.js
View file @
4775b06a
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
module
.
exports
=
{
module
.
exports
=
{
NODE_ENV
:
'"production"'
,
NODE_ENV
:
'"production"'
,
CONFIG_ENV
:
JSON
.
stringify
(
process
.
env
.
CONFIG_ENV
),
CONFIG_ENV
:
JSON
.
stringify
(
process
.
env
.
CONFIG_ENV
),
debug
:
fals
e
,
debug
:
tru
e
,
isMobilePlatform
:
true
,
isMobilePlatform
:
true
,
loginPath
:
'"http://180.104.121.66:8088/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" '
,
loginPath
:
'"http://180.104.121.66:8088/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" '
,
basePath
:
'"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_UAT&apiName="'
,
basePath
:
'"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_UAT&apiName="'
,
...
...
config/prod.env.js
View file @
4775b06a
...
@@ -11,5 +11,5 @@ module.exports = {
...
@@ -11,5 +11,5 @@ module.exports = {
ocrPath
:
'"http://www.xcmgfs.com:8087/r/api"'
,
ocrPath
:
'"http://www.xcmgfs.com:8087/r/api"'
,
fileUploadSvcPath
:
'"http://www.xcmgfs.com:8087/r/api/app/fileUploadSvc?sysName=XCMG_PROD&apiName="'
,
fileUploadSvcPath
:
'"http://www.xcmgfs.com:8087/r/api/app/fileUploadSvc?sysName=XCMG_PROD&apiName="'
,
appId
:
'"com.xcmg.app"'
,
appId
:
'"com.xcmg.app"'
,
currentVersion
:
'"0.1.
6
"'
currentVersion
:
'"0.1.
8
"'
}
}
config/uat.env.js
View file @
4775b06a
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
module
.
exports
=
{
module
.
exports
=
{
NODE_ENV
:
'"production"'
,
NODE_ENV
:
'"production"'
,
CONFIG_ENV
:
JSON
.
stringify
(
process
.
env
.
CONFIG_ENV
),
CONFIG_ENV
:
JSON
.
stringify
(
process
.
env
.
CONFIG_ENV
),
debug
:
fals
e
,
debug
:
tru
e
,
isMobilePlatform
:
true
,
isMobilePlatform
:
true
,
loginPath
:
'"http://180.104.121.66:8088/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" '
,
loginPath
:
'"http://180.104.121.66:8088/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" '
,
basePath
:
'"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_UAT&apiName="'
,
basePath
:
'"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_UAT&apiName="'
,
...
@@ -11,5 +11,5 @@ module.exports = {
...
@@ -11,5 +11,5 @@ module.exports = {
ocrPath
:
'"http://180.104.121.66:8088/r/api"'
,
ocrPath
:
'"http://180.104.121.66:8088/r/api"'
,
fileUploadSvcPath
:
'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="'
,
fileUploadSvcPath
:
'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="'
,
appId
:
'"com.xcmg.app.dev"'
,
appId
:
'"com.xcmg.app.dev"'
,
currentVersion
:
'"2.2.6"'
currentVersion
:
'"2.3.2"'
}
}
\ No newline at end of file
src/pages/userBind/np/naturePerson.vue
View file @
4775b06a
...
@@ -1267,10 +1267,28 @@ export default {
...
@@ -1267,10 +1267,28 @@ export default {
let
result
=
res
.
result
.
words_result
let
result
=
res
.
result
.
words_result
if
(
cardType
===
'idCard'
)
{
if
(
cardType
===
'idCard'
)
{
vm
.
baseInfo
.
id_card_date_from
=
result
.
签发日期
.
words
vm
.
baseInfo
.
id_card_date_from
=
result
.
签发日期
.
words
vm
.
baseInfo
.
id_card_date_to
=
result
.
失效日期
.
words
if
(
result
.
失效日期
.
words
.
indexOf
(
'长期'
)
!=
-
1
){
hlsPopup
.
showPopup
({
title
:
'提示'
,
content
:
`检测到您的身份证为长期有效,系统自动置为【9999-12-31】`
,
onConfirm
:
()
=>
{},
})
vm
.
baseInfo
.
id_card_date_to
=
'9999-12-31'
}
else
{
vm
.
baseInfo
.
id_card_date_to
=
result
.
失效日期
.
words
}
}
else
{
}
else
{
vm
.
baseInfo
.
id_card_date_from_sp
=
result
.
签发日期
.
words
vm
.
baseInfo
.
id_card_date_from_sp
=
result
.
签发日期
.
words
vm
.
baseInfo
.
id_card_date_to_sp
=
result
.
失效日期
.
words
if
(
result
.
失效日期
.
words
.
indexOf
(
'长期'
)
!=
-
1
){
hlsPopup
.
showPopup
({
title
:
'提示'
,
content
:
`检测到您的身份证为长期有效,系统自动置为【9999-12-31】`
,
onConfirm
:
()
=>
{},
})
vm
.
baseInfo
.
id_card_date_to_sp
=
'9999-12-31'
}
else
{
vm
.
baseInfo
.
id_card_date_to_sp
=
result
.
失效日期
.
words
}
}
}
})
})
},
},
...
...
src/pages/userBind/org/enterprise.vue
View file @
4775b06a
...
@@ -1551,11 +1551,29 @@ export default {
...
@@ -1551,11 +1551,29 @@ export default {
if
(
cardType
===
'idCard'
)
{
// 法定代表人
if
(
cardType
===
'idCard'
)
{
// 法定代表人
// 未授权 身份证有效期从,身份证有效期到
// 未授权 身份证有效期从,身份证有效期到
vm
.
legal_personMsg
.
id_card_date_from
=
result
.
签发日期
.
words
vm
.
legal_personMsg
.
id_card_date_from
=
result
.
签发日期
.
words
vm
.
legal_personMsg
.
id_card_date_to
=
result
.
失效日期
.
words
if
(
result
.
失效日期
.
words
.
indexOf
(
'长期'
)
!=
-
1
){
hlsPopup
.
showPopup
({
title
:
'提示'
,
content
:
`检测到您的身份证为长期有效,系统自动置为【9999-12-31】`
,
onConfirm
:
()
=>
{},
})
vm
.
legal_personMsg
.
id_card_date_to
=
'9999-12-31'
}
else
{
vm
.
legal_personMsg
.
id_card_date_to
=
result
.
失效日期
.
words
}
}
else
{
}
else
{
// 已授权 身份证有效期从,身份证有效期到
// 已授权 身份证有效期从,身份证有效期到
vm
.
authMsg
.
auth_id_card_date_from
=
result
.
签发日期
.
words
vm
.
authMsg
.
auth_id_card_date_from
=
result
.
签发日期
.
words
vm
.
authMsg
.
auth_id_card_date_to
=
result
.
失效日期
.
words
if
(
result
.
失效日期
.
words
.
indexOf
(
'长期'
)
!=
-
1
){
hlsPopup
.
showPopup
({
title
:
'提示'
,
content
:
`检测到您的身份证为长期有效,系统自动置为【9999-12-31】`
,
onConfirm
:
()
=>
{},
})
vm
.
authMsg
.
auth_id_card_date_to
=
'9999-12-31'
}
else
{
vm
.
authMsg
.
auth_id_card_date_to
=
result
.
失效日期
.
words
}
}
}
})
})
},
},
...
...
src/pages/userBindNew/np/base-info.vue
View file @
4775b06a
...
@@ -1372,10 +1372,28 @@ export default {
...
@@ -1372,10 +1372,28 @@ export default {
let
result
=
res
.
result
.
words_result
let
result
=
res
.
result
.
words_result
if
(
cardType
===
'idCard'
)
{
if
(
cardType
===
'idCard'
)
{
vm
.
baseInfo
.
id_card_date_from
=
vm
.
timeFormat
(
result
.
签发日期
.
words
)
vm
.
baseInfo
.
id_card_date_from
=
vm
.
timeFormat
(
result
.
签发日期
.
words
)
vm
.
baseInfo
.
id_card_date_to
=
vm
.
timeFormat
(
result
.
失效日期
.
words
)
if
(
result
.
失效日期
.
words
.
indexOf
(
'长期'
)
!=
-
1
){
hlsPopup
.
showPopup
({
title
:
'提示'
,
content
:
`检测到您的身份证为长期有效,系统自动置为【9999-12-31】`
,
onConfirm
:
()
=>
{},
})
vm
.
baseInfo
.
id_card_date_to
=
'9999-12-31'
}
else
{
vm
.
baseInfo
.
id_card_date_to
=
vm
.
timeFormat
(
result
.
失效日期
.
words
)
}
}
else
{
}
else
{
vm
.
baseInfo
.
id_card_date_from_sp
=
vm
.
timeFormat
(
result
.
签发日期
.
words
)
vm
.
baseInfo
.
id_card_date_from_sp
=
vm
.
timeFormat
(
result
.
签发日期
.
words
)
vm
.
baseInfo
.
id_card_date_to_sp
=
vm
.
timeFormat
(
result
.
失效日期
.
words
)
if
(
result
.
失效日期
.
words
.
indexOf
(
'长期'
)
!=
-
1
){
hlsPopup
.
showPopup
({
title
:
'提示'
,
content
:
`检测到您的身份证为长期有效,系统自动置为【9999-12-31】`
,
onConfirm
:
()
=>
{},
})
vm
.
baseInfo
.
id_card_date_to_sp
=
'9999-12-31'
}
else
{
vm
.
baseInfo
.
id_card_date_to_sp
=
vm
.
timeFormat
(
result
.
失效日期
.
words
)
}
}
}
})
})
},
},
...
...
src/pages/userBindNew/org/baseInfo.vue
View file @
4775b06a
...
@@ -1281,22 +1281,78 @@ export default {
...
@@ -1281,22 +1281,78 @@ export default {
}
}
vm
.
hlsPopup
.
showLoading
(
'请稍候'
)
vm
.
hlsPopup
.
showLoading
(
'请稍候'
)
vm
.
hlsHttp
.
post
(
url
,
param
).
then
(
function
(
res
)
{
vm
.
hlsHttp
.
post
(
url
,
param
).
then
(
function
(
res
)
{
vm
.
hlsPopup
.
hideLoading
()
if
(
res
.
result
===
'S'
)
{
if
(
res
.
result
===
'S'
)
{
// vm.hlsPopup.showSuccess('保存成功,请去维护附件信息')
// vm.hlsPopup.showSuccess('保存成功,请去维护附件信息')
vm
.
bp_id
=
res
.
bp_id
vm
.
bp_id
=
res
.
bp_id
window
.
localStorage
.
setItem
(
'bp_type'
,
vm
.
baseInfo
.
bp_type
)
window
.
localStorage
.
setItem
(
'bp_type'
,
vm
.
baseInfo
.
bp_type
)
window
.
localStorage
.
setItem
(
'bp_id'
,
res
.
bp_id
)
window
.
localStorage
.
setItem
(
'bp_id'
,
res
.
bp_id
)
vm
.
bindCheck
()
vm
.
loadCheckIdAndSaveAtt
(
res
.
bp_id
)
vm
.
saveAttatchment
()
// 查询资料清单
// vm.loadItemList(flag)
}
else
{
}
else
{
vm
.
hlsPopup
.
showLongCenter
(
res
.
message
)
vm
.
hlsPopup
.
showLongCenter
(
res
.
message
)
}
}
})
})
}
}
},
},
loadCheckIdAndSaveAtt
(
bp_id
){
console
.
log
(
'获取checkId并保存附件'
)
let
vm
=
this
let
type
;
if
(
vm
.
baseInfo
.
auth_flag
===
'Y'
)
{
type
=
'HLS_ORG_AUTH'
;
}
else
if
(
vm
.
baseInfo
.
auth_flag
===
'N'
)
{
type
=
'HLS_ORG_NAUTH'
;
}
let
bpId
=
bp_id
let
url
=
process
.
env
.
basePath
+
'prj_cdd_check_list'
let
param
=
{
master
:
{
'document_id'
:
bpId
,
'document_table'
:
'HLS_BP_MASTER'
,
'tab_group'
:
type
,
},
}
vm
.
$post
(
url
,
param
).
then
(
function
(
res
)
{
if
(
res
.
result
===
'S'
)
{
var
listTemp
=
[...
res
.
lists
]
listTemp
.
forEach
(
item
=>
{
console
.
log
(
'check_id====>'
+
item
.
check_id
)
switch
(
item
.
cdd_item
)
{
case
'LEGAL_ID_CARD_F'
:
// 法定代表人身份证正面
vm
.
idCardFrontCheck_id
=
item
.
check_id
break
case
'LEGAL_ID_CARD_B'
:
// 法定代表人身份证背面
vm
.
idCardBackCheck_id
=
item
.
check_id
break
case
'AUTHOR_ID_CARD_F'
:
// 授权人身份证正面
vm
.
authidCardFrontCheck_id
=
item
.
check_id
break
case
'AUTHOR_ID_CARD_B'
:
// 授权人身份证背面
vm
.
authidCardBackCheck_id
=
item
.
check_id
break
case
'ORG_CODE'
:
vm
.
licenseCheck_id
=
item
.
check_id
break
case
'BANK_CARD'
:
break
case
'L/A'
:
vm
.
laCheck_id
=
item
.
check_id
break
default
:
// vm.cddItemList.push(item)
}
})
}
}).
then
(
function
(
res
){
console
.
log
(
'保存附件开始'
)
vm
.
saveAttatchment
()
//保存附件
console
.
log
(
'保存附件结束'
)
}).
then
(
function
(
res
){
console
.
log
(
'跳转页面开始'
)
vm
.
bindCheck
()
//校验+跳转
console
.
log
(
'跳转页面结束'
)
})
},
saveAttatchment
()
{
saveAttatchment
()
{
let
vm
=
this
let
vm
=
this
if
(
vm
.
idCardFrontEditFlag
)
{
// 法定代表人身份证正面图片已修改,重新上传
if
(
vm
.
idCardFrontEditFlag
)
{
// 法定代表人身份证正面图片已修改,重新上传
...
@@ -1806,11 +1862,29 @@ export default {
...
@@ -1806,11 +1862,29 @@ export default {
if
(
cardType
===
'idCard'
)
{
// 法定代表人
if
(
cardType
===
'idCard'
)
{
// 法定代表人
// 未授权 身份证有效期从,身份证有效期到
// 未授权 身份证有效期从,身份证有效期到
vm
.
legal_personMsg
.
id_card_date_from
=
vm
.
timeFormat
(
result
.
签发日期
.
words
)
vm
.
legal_personMsg
.
id_card_date_from
=
vm
.
timeFormat
(
result
.
签发日期
.
words
)
vm
.
legal_personMsg
.
id_card_date_to
=
vm
.
timeFormat
(
result
.
失效日期
.
words
)
if
(
result
.
失效日期
.
words
.
indexOf
(
'长期'
)
!=
-
1
){
hlsPopup
.
showPopup
({
title
:
'提示'
,
content
:
`检测到您的身份证为长期有效,系统自动置为【9999-12-31】`
,
onConfirm
:
()
=>
{},
})
vm
.
legal_personMsg
.
id_card_date_to
=
'9999-12-31'
}
else
{
vm
.
legal_personMsg
.
id_card_date_to
=
vm
.
timeFormat
(
result
.
失效日期
.
words
)
}
}
else
{
}
else
{
// 已授权 身份证有效期从,身份证有效期到
// 已授权 身份证有效期从,身份证有效期到
vm
.
authMsg
.
auth_id_card_date_from
=
vm
.
timeFormat
(
result
.
签发日期
.
words
)
vm
.
authMsg
.
auth_id_card_date_from
=
vm
.
timeFormat
(
result
.
签发日期
.
words
)
vm
.
authMsg
.
auth_id_card_date_to
=
vm
.
timeFormat
(
result
.
失效日期
.
words
)
if
(
result
.
失效日期
.
words
.
indexOf
(
'长期'
)
!=
-
1
){
hlsPopup
.
showPopup
({
title
:
'提示'
,
content
:
`检测到您的身份证为长期有效,系统自动置为【9999-12-31】`
,
onConfirm
:
()
=>
{},
})
vm
.
authMsg
.
auth_id_card_date_to
=
'9999-12-31'
}
else
{
vm
.
authMsg
.
auth_id_card_date_to
=
vm
.
timeFormat
(
result
.
失效日期
.
words
)
}
}
}
})
})
},
},
...
@@ -2158,6 +2232,7 @@ export default {
...
@@ -2158,6 +2232,7 @@ export default {
}
}
if
(
!
list
[
i
].
attachment_id
)
{
if
(
!
list
[
i
].
attachment_id
)
{
attLength
++
attLength
++
console
.
log
(
list
[
i
])
hlsUtil
.
fileUploadSvc
(
list
[
i
],
uploadSuccess
)
hlsUtil
.
fileUploadSvc
(
list
[
i
],
uploadSuccess
)
}
}
}
}
...
...
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