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
00bd6bf7
Commit
00bd6bf7
authored
4 years ago
by
786817560
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ren' into develop
parents
e18af40d
dd073a93
Changes
6
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
393 additions
and
83 deletions
+393
-83
contract-create-list.vue
src/pages/contractCreate/contract-create-list.vue
+250
-30
create-enclosure-info.vue
src/pages/contractCreate/create-enclosure-info.vue
+123
-39
sales-info.vue
src/pages/contractCreate/sales-info.vue
+11
-5
contract-detail.vue
src/pages/contractSigning/contract-detail.vue
+3
-3
contract-signing.vue
src/pages/contractSigning/contract-signing.vue
+3
-3
contract-details.vue
src/pages/distributorSign/contract-details.vue
+3
-3
No files found.
src/pages/contractCreate/contract-create-list.vue
View file @
00bd6bf7
This diff is collapsed.
Click to expand it.
src/pages/contractCreate/create-enclosure-info.vue
View file @
00bd6bf7
...
...
@@ -3,7 +3,7 @@
<h-header
:proportion=
"[5,1,1]"
class=
"bar-custom"
>
<div
slot=
"left"
class=
"h-header-btn"
>
<img
src=
"@/assets/userBind/arrow.png"
@
click=
"$routeGo()"
>
<span>
基本
信息
</span>
<span>
附件
信息
</span>
</div>
</h-header>
<h-content>
...
...
@@ -73,11 +73,11 @@
<div
class=
"userInfo"
>
补充资料
</div>
<div
class=
"house"
>
<p
class=
"titles"
>
特批申请书
</p>
<div
v-if=
"!applicationImg"
class=
"card-upload"
@
click=
"ocrShow('
CAR_CARD', ''
)"
>
<div
v-if=
"!applicationImg"
class=
"card-upload"
@
click=
"ocrShow('
特批申请书', checkId
)"
>
<img
src=
"@/assets/userBind/camera.png"
class=
"upload-btn"
>
</div>
<div
v-if=
"applicationImg && status !== 'APPROVED'"
class=
"card-upload"
>
<img
:src=
"applicationImg"
@
click=
"ocrShow('
', ''
)"
>
<img
:src=
"applicationImg"
@
click=
"ocrShow('
特批申请书', checkId
)"
>
</div>
<div
v-if=
"applicationImg && status === 'APPROVED'"
class=
"card-upload"
>
<img
:src=
"applicationImg"
@
click=
"showBigPicture(applicationImg)"
>
...
...
@@ -85,7 +85,7 @@
</div>
</h-content>
<bottom-tab
class=
"add-box"
>
<tab-button
class=
"before"
@
click
.
native=
"
$routeGo()
"
>
保存
</tab-button>
<tab-button
class=
"before"
@
click
.
native=
"
handSave
"
>
保存
</tab-button>
<tab-button
class=
"next"
@
click
.
native=
"handleSubmit"
>
提交
</tab-button>
</bottom-tab>
</h-view>
...
...
@@ -139,20 +139,114 @@ export default {
})
},
// ocr识别入口
ocrShow
(
ocrType
,
type
)
{
ocrShow
(
desc
,
checkId
)
{
let
vm
=
this
hlsPopup
.
showActionSheet
({
titleText
:
'请选择照片'
,
buttonArray
:
[
'拍照'
,
'从相册取'
],
callback
:
index
=>
{
if
(
index
===
0
)
{
vm
.
openCamera
(
ocrType
,
type
)
vm
.
openCamera
(
desc
,
checkId
)
}
else
{
vm
.
takePicture
(
ocrType
,
type
)
vm
.
takePicture
(
desc
,
checkId
)
}
},
})
},
openCamera
(
desc
,
checkId
)
{
let
vm
=
this
let
obj
=
{
'pkvalue'
:
checkId
,
'source_type'
:
'PRJ_CDD_ITEM_CHECK'
,
'picture'
:
''
,
'check_id'
:
checkId
,
'filePath'
:
''
,
'attachment_id'
:
''
,
'user_id'
:
1
,
'fileName'
:
desc
+
'_'
+
new
Date
().
getTime
(),
}
let
cameraoptions
=
{
quality
:
100
,
}
let
success
=
function
(
imgdata
)
{
obj
.
picture
=
imgdata
obj
.
filePath
=
imgdata
let
list
=
[]
list
.
push
(
obj
)
// 拍完一张立马执行保存图片逻辑
vm
.
save_picture
(
list
)
}
let
error
=
function
()
{
hlsPopup
.
showLongCenter
(
'请拍照'
)
}
hlsUtil
.
openCamera
(
cameraoptions
,
success
,
error
)
},
takePicture
(
desc
,
checkId
)
{
let
vm
=
this
let
cameraoptions
=
{
quality
:
100
,
}
let
success
=
function
(
imgUrl
)
{
var
list
=
[]
for
(
let
i
=
0
;
i
<
imgUrl
.
length
;
i
++
)
{
let
obj
=
{
'pkvalue'
:
checkId
,
'source_type'
:
'PRJ_CDD_ITEM_CHECK'
,
'picture'
:
''
,
'check_id'
:
checkId
,
'filePath'
:
''
,
'attachment_id'
:
''
,
'user_id'
:
1
,
'fileName'
:
desc
+
'_'
+
new
Date
().
getTime
(),
}
obj
.
picture
=
imgUrl
[
i
]
obj
.
filePath
=
imgUrl
[
i
]
list
.
push
(
obj
)
}
vm
.
save_picture
(
list
)
}
let
error
=
function
()
{
}
vm
.
hlsUtil
.
takePicture
(
cameraoptions
,
success
,
error
)
},
// 图片保存
save_picture
(
list
)
{
let
vm
=
this
if
(
list
.
length
)
{
// hlsPopup.showLoading('图片上传请稍候')
var
alreadyUploadNum
=
0
var
attLength
=
0
var
recordUploadInterval
=
setInterval
(
function
()
{
if
(
alreadyUploadNum
===
attLength
)
{
clearInterval
(
recordUploadInterval
)
/* hlsPopup.hideLoading()
hlsPopup.showLongCenter('图片上传成功') */
}
},
500
)
for
(
var
i
=
0
;
i
<
list
.
length
;
i
++
)
{
let
uploadSuccess
=
function
(
res
)
{
if
(
res
.
result
===
'S'
)
{
alreadyUploadNum
++
for
(
var
j
=
0
;
j
<
list
.
length
;
j
++
)
{
if
(
list
[
j
].
filePath
===
res
.
response
.
filePath
)
{
list
[
j
].
attachment_id
=
res
.
response
.
attachment_id
vm
.
upload_list
.
push
(
list
[
j
])
break
}
}
}
else
{
hlsPopup
.
hideLoading
()
}
}
if
(
!
list
[
i
].
attachment_id
)
{
attLength
++
hlsUtil
.
fileUploadSvc
(
list
[
i
],
uploadSuccess
)
}
}
}
else
{
hlsPopup
.
hideLoading
()
}
},
loadItemList
()
{
let
vm
=
this
vm
.
dowload_list
=
[]
...
...
@@ -180,24 +274,24 @@ export default {
let
listTemp
=
[...
res
.
lists
]
listTemp
.
forEach
(
item
=>
{
switch
(
item
.
cdd_item
)
{
case
'NP_ID_CARD_F'
:
// 自然人身份证正面
vm
.
idCardFrontCheck_id
=
item
.
check_id
break
case
'LEGAL_ID_CARD_F'
:
// 法人代表身份证正面
vm
.
idCardFrontCheck_id
=
item
.
check_id
break
case
'NP_ID_CARD_B'
:
// 身份证背面
vm
.
idCardBackCheck_id
=
item
.
check_id
break
case
'LEGAL_ID_CARD_B'
:
// 身份证背面
vm
.
idCardBackCheck_id
=
item
.
check_id
break
case
'HOUSE_CARD'
:
// 房产证
vm
.
house_id
=
item
.
check_id
break
case
'CAR_CARD'
:
// 行驶证
vm
.
car_id
=
item
.
check_id
break
//
case 'NP_ID_CARD_F': // 自然人身份证正面
//
vm.idCardFrontCheck_id = item.check_id
//
break
//
case 'LEGAL_ID_CARD_F': // 法人代表身份证正面
//
vm.idCardFrontCheck_id = item.check_id
//
break
//
case 'NP_ID_CARD_B': // 身份证背面
//
vm.idCardBackCheck_id = item.check_id
//
break
//
case 'LEGAL_ID_CARD_B': // 身份证背面
//
vm.idCardBackCheck_id = item.check_id
//
break
//
case 'HOUSE_CARD': // 房产证
//
vm.house_id = item.check_id
//
break
//
case 'CAR_CARD': // 行驶证
//
vm.car_id = item.check_id
//
break
case
'ORG_CODE'
:
// 营业执照
vm
.
license_id
=
item
.
check_id
break
...
...
@@ -282,26 +376,16 @@ export default {
}
})
},
// 获取项目id
getPrjId
()
{
let
vm
=
this
let
url
=
process
.
env
.
basePath
+
'get_project_id'
let
param
=
{
}
vm
.
hlsPopup
.
showLoading
(
'请稍候'
)
vm
.
hlsHttp
.
post
(
url
,
param
).
then
(
function
(
res
)
{
vm
.
hlsPopup
.
hideLoading
()
console
.
log
(
'获取项目id'
,
res
)
if
(
res
.
result
===
'S'
)
{
// vm.showLists = res.lists
}
})
// 保存
handSave
()
{
hlsPopup
.
showLongCenter
(
'保存成功!'
)
},
// 项目提交审批
handleSubmit
()
{
let
vm
=
this
let
url
=
process
.
env
.
basePath
+
'prj_project_submit'
let
param
=
{
project_id
:
vm
.
project_id
,
project_id
:
window
.
localStorage
.
project_id
,
}
vm
.
hlsPopup
.
showLoading
(
'请稍候'
)
vm
.
hlsHttp
.
post
(
url
,
param
).
then
(
function
(
res
)
{
...
...
This diff is collapsed.
Click to expand it.
src/pages/contractCreate/sales-info.vue
View file @
00bd6bf7
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime : 2019-12-2
3 16:14:57
* @LastEditTime : 2019-12-2
6 12:05:03
* @LastEditors : Please set LastEditors
* @Description: In User Settings Edit
-->
...
...
@@ -74,15 +74,15 @@
</item>
<item
v-if=
"user_bp_type === 'AGENT'"
>
<div
slot=
"name"
class=
"font-color"
>
授信额度
</div>
<input
slot=
"content"
placeholder=
"授信额度"
>
<input
slot=
"content"
v-model=
"inflow_line"
readonly
placeholder=
"授信额度"
>
</item>
<item
v-if=
"user_bp_type === 'AGENT'"
>
<div
slot=
"name"
class=
"font-color"
>
已使用授信额度
</div>
<input
slot=
"content"
placeholder=
"已使用授信额度"
>
<input
slot=
"content"
v-model=
"inflow_used"
readonly
placeholder=
"已使用授信额度"
>
</item>
<item
v-if=
"user_bp_type === 'AGENT'"
>
<div
slot=
"name"
class=
"font-color"
>
剩余授信额度
</div>
<input
slot=
"content"
placeholder=
"剩余授信额度"
>
<input
slot=
"content"
v-model=
"inflow_reset"
readonly
placeholder=
"剩余授信额度"
>
</item>
<item
@
click
.
native=
"showTime('YYYY-MM-DD')"
>
<div
slot=
"name"
class=
"font-color"
>
签约日期
</div>
...
...
@@ -280,7 +280,13 @@ export default {
if
(
res
.
result
===
'S'
)
{
vm
.
bp_agent_name
=
res
.
info
.
bp_agent_name
vm
.
bp_agent_id
=
res
.
info
.
bp_agent_id
if
(
window
.
localStorage
.
bp_type
===
'OFFICE'
)
{
vm
.
office_name
=
res
.
info
.
bp_agent_name
vm
.
salesInfo
.
office_id
=
res
.
info
.
bp_agent_id
vm
.
salesInfo
.
bp_id_agent
=
''
}
else
{
vm
.
salesInfo
.
bp_id_agent
=
res
.
info
.
bp_agent_id
}
vm
.
salesInfo
.
bp_user_id
=
res
.
info
.
bp_user_id
vm
.
lesseeQuery
()
vm
.
salesQuery
()
...
...
This diff is collapsed.
Click to expand it.
src/pages/contractSigning/contract-detail.vue
View file @
00bd6bf7
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime
: 2019-12-19 10:38:3
5
* @LastEditors: Please set LastEditors
* @LastEditTime
: 2019-12-26 12:08:2
5
* @LastEditors
: Please set LastEditors
* @Description: In User Settings Edit
-->
<
template
>
...
...
@@ -241,7 +241,7 @@
</div>
<list-item
:item-height=
"44"
class=
"second-part"
>
<item>
<div
slot=
"name"
class=
"font-color"
>
参数项
</div>
<div
slot=
"name"
class=
"font-color"
>
设备识别号
</div>
<input
slot=
"content"
v-model=
"info.product_code"
readonly
>
</item>
<item>
...
...
This diff is collapsed.
Click to expand it.
src/pages/contractSigning/contract-signing.vue
View file @
00bd6bf7
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime
: 2019-12-19 11:11:37
* @LastEditors: Please set LastEditors
* @LastEditTime
: 2019-12-26 13:39:32
* @LastEditors
: Please set LastEditors
* @Description: In User Settings Edit
-->
<
template
>
...
...
@@ -80,7 +80,7 @@ export default {
watch
:
{
'num'
:
{
handler
(
newVal
,
oldVal
)
{
this
.
$refs
.
scroll
.
update
(
false
)
//
this.$refs.scroll.update(false)
if
(
newVal
===
2
)
{
if
(
!
this
.
approvedFlag
)
{
this
.
contractList
()
...
...
This diff is collapsed.
Click to expand it.
src/pages/distributorSign/contract-details.vue
View file @
00bd6bf7
...
...
@@ -2,8 +2,8 @@
* @Description: 合同详情
* @Author: your name
* @Date: 2019-09-25 15:38:21
* @LastEditTime
: 2019-12-20 15:36:19
* @LastEditors: Please set LastEditors
* @LastEditTime
: 2019-12-26 12:08:42
* @LastEditors
: Please set LastEditors
-->
<
template
>
<h-view
id=
"details"
class=
"public-style"
title=
"经销商签约"
>
...
...
@@ -127,7 +127,7 @@
<p>
设备清单
</p></div>
<list-item
:item-height=
"44"
class=
"second-part"
>
<item>
<div
slot=
"name"
class=
"font-color"
>
参数项
</div>
<div
slot=
"name"
class=
"font-color"
>
设备识别号
</div>
<input
slot=
"content"
v-model=
"info.product_code"
readonly
>
</item>
<item>
...
...
This diff is collapsed.
Click to expand it.
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