Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
portalhtml
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
rex
portalhtml
Commits
bb39dc16
Commit
bb39dc16
authored
Oct 19, 2021
by
jiangqihao
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://120.25.63.219:6088/rex/portalhtml
into dev
parents
067af916
c001cbbb
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
61 additions
and
51 deletions
+61
-51
index.vue
src/views/customers/citypotenial-list/index.vue
+6
-3
index.vue
src/views/customers/potential-list/index.vue
+5
-3
index.vue
src/views/login/city-progress/index.vue
+21
-20
index.vue
src/views/login/city-register/index.vue
+8
-5
index.vue
src/views/login/prov-progress/index.vue
+20
-18
index.vue
src/views/login/prov-register/index.vue
+1
-2
No files found.
src/views/customers/citypotenial-list/index.vue
View file @
bb39dc16
...
@@ -96,7 +96,7 @@
...
@@ -96,7 +96,7 @@
<div
class=
"form-container"
>
审批意见
</div>
<div
class=
"form-container"
>
审批意见
</div>
<div
class=
"btn"
>
<div
class=
"btn"
>
<el-button
type=
"primary"
<el-button
type=
"primary"
@
click=
"approve"
>
确认
</el-button>
@
click=
"approve"
>
审批
</el-button>
<el-button
type=
""
<el-button
type=
""
@
click=
"reject"
>
退回
</el-button>
@
click=
"reject"
>
退回
</el-button>
</div>
</div>
...
@@ -373,8 +373,11 @@ export default {
...
@@ -373,8 +373,11 @@ export default {
getCustomer
({
objectID
:
this
.
id
}).
then
((
resp
)
=>
{
getCustomer
({
objectID
:
this
.
id
}).
then
((
resp
)
=>
{
this
.
loading
=
false
this
.
loading
=
false
this
.
formData
=
resp
.
results
[
0
]
this
.
formData
=
resp
.
results
[
0
]
this
.
formData
.
ExtLockRsp_SDK
=
[]
if
(
this
.
formData
.
ExtProcessNode_SDK
==
2
){
this
.
formData
.
ExtLockCity_SDK
=
[]
this
.
formData
.
ExtChannelType_SDK
=
[]
this
.
formData
.
ExtLockRsp_SDK
=
[]
this
.
formData
.
ExtLockCity_SDK
=
[]
}
lockRsp
({
extProvince_SDK
:
resp
.
results
[
0
].
ExtProvince_SDK
}).
then
((
resp
)
=>
{
lockRsp
({
extProvince_SDK
:
resp
.
results
[
0
].
ExtProvince_SDK
}).
then
((
resp
)
=>
{
this
.
province
=
resp
.
results
this
.
province
=
resp
.
results
})
})
...
...
src/views/customers/potential-list/index.vue
View file @
bb39dc16
...
@@ -59,7 +59,7 @@
...
@@ -59,7 +59,7 @@
<div
class=
"form-container"
>
审批意见
</div>
<div
class=
"form-container"
>
审批意见
</div>
<div
class=
"btn"
>
<div
class=
"btn"
>
<el-button
type=
"primary"
<el-button
type=
"primary"
@
click=
"approve"
>
确认
</el-button>
@
click=
"approve"
>
审批
</el-button>
<el-button
type=
""
<el-button
type=
""
@
click=
"reject"
>
退回
</el-button>
@
click=
"reject"
>
退回
</el-button>
</div>
</div>
...
@@ -307,7 +307,7 @@ export default {
...
@@ -307,7 +307,7 @@ export default {
page
:
{},
page
:
{},
// 同 vue-ele-form
// 同 vue-ele-form
rules
:
{
rules
:
{
ExtLockCity_SDK
:
{
required
:
true
,
message
:
'请选择覆盖城市范围'
},
ExtLockCity_SDK
:
{
required
:
true
,
message
:
'请选择覆盖城市范围'
,
trigger
:
'change'
},
}
}
}
}
},
},
...
@@ -345,7 +345,9 @@ export default {
...
@@ -345,7 +345,9 @@ export default {
getCustomer
({
objectID
:
this
.
id
}).
then
((
resp
)
=>
{
getCustomer
({
objectID
:
this
.
id
}).
then
((
resp
)
=>
{
this
.
loading
=
false
this
.
loading
=
false
this
.
formData
=
resp
.
results
[
0
]
this
.
formData
=
resp
.
results
[
0
]
this
.
formData
.
ExtLockCity_SDK
=
[]
if
(
this
.
formData
.
ExtProcessNode_SDK
==
2
){
this
.
formData
.
ExtLockCity_SDK
=
[]
}
const
app
=
{
provinceCode
:
resp
.
results
[
0
].
ExtProvince_SDK
}
const
app
=
{
provinceCode
:
resp
.
results
[
0
].
ExtProvince_SDK
}
this
.
$request
(
Country
.
searchCity
,
app
).
then
((
resp
)
=>
{
this
.
$request
(
Country
.
searchCity
,
app
).
then
((
resp
)
=>
{
this
.
province
=
resp
.
results
this
.
province
=
resp
.
results
...
...
src/views/login/city-progress/index.vue
View file @
bb39dc16
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
<div
class=
"div_list"
>
<div
class=
"div_list"
>
<div
id=
"parallelogram"
<div
id=
"parallelogram"
:class=
"
{'bgcolor':formData.ExtProcessNode_SDK==2}">
:class=
"
{'bgcolor':formData.ExtProcessNode_SDK==2}">
<div
class=
"div_txt2"
>
审批
_1区域渠道经理
</div>
<div
class=
"div_txt2"
>
确认
_1区域渠道经理
</div>
</div>
</div>
<div
class=
"parallelogram1"
></div>
<div
class=
"parallelogram1"
></div>
<div
class=
"triangle_right"
></div>
<div
class=
"triangle_right"
></div>
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
<div
class=
"div_list"
>
<div
class=
"div_list"
>
<div
id=
"parallelogram"
<div
id=
"parallelogram"
:class=
"
{'bgcolor':formData.ExtProcessNode_SDK==3}">
:class=
"
{'bgcolor':formData.ExtProcessNode_SDK==3}">
<div
class=
"div_txt2"
>
审批
_2渠道销售总监
</div>
<div
class=
"div_txt2"
>
确认
_2渠道销售总监
</div>
</div>
</div>
<div
class=
"parallelogram1"
></div>
<div
class=
"parallelogram1"
></div>
<div
class=
"triangle_right"
></div>
<div
class=
"triangle_right"
></div>
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
<div
class=
"div_list"
>
<div
class=
"div_list"
>
<div
id=
"parallelogram"
<div
id=
"parallelogram"
:class=
"
{'bgcolor':formData.ExtProcessNode_SDK==4}">
:class=
"
{'bgcolor':formData.ExtProcessNode_SDK==4}">
<div
class=
"div_txt2"
>
审批
_3渠道管理部
</div>
<div
class=
"div_txt2"
>
确认
_3渠道管理部
</div>
</div>
</div>
<div
class=
"parallelogram1"
></div>
<div
class=
"parallelogram1"
></div>
<div
class=
"triangle_right"
></div>
<div
class=
"triangle_right"
></div>
...
@@ -112,9 +112,6 @@
...
@@ -112,9 +112,6 @@
<el-table-column
prop=
"Node"
<el-table-column
prop=
"Node"
label=
"审批节点"
>
label=
"审批节点"
>
</el-table-column>
</el-table-column>
<el-table-column
prop=
"CreateName_SDK"
label=
"审批人"
>
</el-table-column>
<el-table-column
prop=
"Result"
<el-table-column
prop=
"Result"
label=
"审批结果"
>
label=
"审批结果"
>
</el-table-column>
</el-table-column>
...
@@ -321,22 +318,26 @@ export default {
...
@@ -321,22 +318,26 @@ export default {
},
},
created
()
{
created
()
{
this
.
id
=
this
.
$route
.
query
.
objectID
this
.
id
=
this
.
$route
.
query
.
objectID
this
.
getList
()
if
(
this
.
id
){
this
.
getHistoryList
()
this
.
getList
()
this
.
getFile
()
this
.
getHistoryList
()
this
.
getChannelType
()
// this.getFile()
this
.
getChannelType
()
}
else
{
this
.
$message
.
error
(
'请求链接无效'
)
}
},
},
methods
:
{
methods
:
{
getFile
()
{
//
getFile() {
const
page
=
{
//
const page = {
currentPage
:
1
,
//
currentPage: 1,
pageSize
:
10
,
//
pageSize: 10,
businessObjectID
:
this
.
id
//
businessObjectID: this.id
}
//
}
getOneModel
(
page
).
then
(
resp
=>
{
//
getOneModel(page).then(resp => {
this
.
tableData2
=
resp
.
results
//
this.tableData2 = resp.results
})
//
})
},
//
},
getList
()
{
getList
()
{
this
.
loading
=
true
this
.
loading
=
true
getCustomer
({
objectID
:
this
.
id
}).
then
((
resp
)
=>
{
getCustomer
({
objectID
:
this
.
id
}).
then
((
resp
)
=>
{
...
...
src/views/login/city-register/index.vue
View file @
bb39dc16
...
@@ -473,11 +473,14 @@ export default {
...
@@ -473,11 +473,14 @@ export default {
this
.
$request
(
Customer
.
searchUrl
,
this
.
paramsToFormData
(
this
.
formData
)).
then
((
resp
)
=>
{
this
.
$request
(
Customer
.
searchUrl
,
this
.
paramsToFormData
(
this
.
formData
)).
then
((
resp
)
=>
{
this
.
btnloading
=
false
this
.
btnloading
=
false
this
.
$message
.
success
(
'提交成功!'
)
this
.
$message
.
success
(
'提交成功!'
)
// setTimeout(function(){
setTimeout
(()
=>
{
// console.log('延时两秒')
this
.
$router
.
back
()
window
.
location
.
href
=
"about:blank"
;
},
1000
);
window
.
close
();
// setTimeout(function(){
// },20000);
// console.log('延时两秒')
// window.location.href="about:blank";
// window.close();
// },20000);
}).
catch
((
err
)
=>
{
}).
catch
((
err
)
=>
{
this
.
btnloading
=
false
this
.
btnloading
=
false
})
})
...
...
src/views/login/prov-progress/index.vue
View file @
bb39dc16
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
<div
class=
"div_list"
>
<div
class=
"div_list"
>
<div
id=
"parallelogram"
<div
id=
"parallelogram"
:class=
"
{'bgcolor':formData.ExtProcessNode_SDK==2}">
:class=
"
{'bgcolor':formData.ExtProcessNode_SDK==2}">
<div
class=
"div_txt2"
>
审批
_1区域渠道经理
</div>
<div
class=
"div_txt2"
>
确认
_1区域渠道经理
</div>
</div>
</div>
<div
class=
"parallelogram1"
></div>
<div
class=
"parallelogram1"
></div>
<div
class=
"triangle_right"
></div>
<div
class=
"triangle_right"
></div>
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
<div
class=
"div_list"
>
<div
class=
"div_list"
>
<div
id=
"parallelogram"
<div
id=
"parallelogram"
:class=
"
{'bgcolor':formData.ExtProcessNode_SDK==3}">
:class=
"
{'bgcolor':formData.ExtProcessNode_SDK==3}">
<div
class=
"div_txt2"
>
审批
_2渠道销售部大区负责人
</div>
<div
class=
"div_txt2"
>
确认
_2渠道销售部大区负责人
</div>
</div>
</div>
<div
class=
"parallelogram1"
></div>
<div
class=
"parallelogram1"
></div>
<div
class=
"triangle_right"
></div>
<div
class=
"triangle_right"
></div>
...
@@ -38,7 +38,7 @@
...
@@ -38,7 +38,7 @@
<div
class=
"div_list"
>
<div
class=
"div_list"
>
<div
id=
"parallelogram"
<div
id=
"parallelogram"
:class=
"
{'bgcolor':formData.ExtProcessNode_SDK==4}">
:class=
"
{'bgcolor':formData.ExtProcessNode_SDK==4}">
<div
class=
"div_txt2"
>
审批
_3渠道销售总监
</div>
<div
class=
"div_txt2"
>
确认
_3渠道销售总监
</div>
</div>
</div>
<div
class=
"parallelogram1"
></div>
<div
class=
"parallelogram1"
></div>
<div
class=
"triangle_right"
></div>
<div
class=
"triangle_right"
></div>
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
<div
class=
"div_list"
>
<div
class=
"div_list"
>
<div
id=
"parallelogram"
<div
id=
"parallelogram"
:class=
"
{'bgcolor':formData.ExtProcessNode_SDK==5}">
:class=
"
{'bgcolor':formData.ExtProcessNode_SDK==5}">
<div
class=
"div_txt2"
>
审批
_4渠道管理部
</div>
<div
class=
"div_txt2"
>
确认
_4渠道管理部
</div>
</div>
</div>
<div
class=
"parallelogram1"
></div>
<div
class=
"parallelogram1"
></div>
<div
class=
"triangle_right"
></div>
<div
class=
"triangle_right"
></div>
...
@@ -189,9 +189,6 @@
...
@@ -189,9 +189,6 @@
<el-table-column
prop=
"Node"
<el-table-column
prop=
"Node"
label=
"审批节点"
>
label=
"审批节点"
>
</el-table-column>
</el-table-column>
<el-table-column
prop=
"CreateName_SDK"
label=
"审批人"
>
</el-table-column>
<el-table-column
prop=
"Result"
<el-table-column
prop=
"Result"
label=
"审批结果"
>
label=
"审批结果"
>
</el-table-column>
</el-table-column>
...
@@ -453,10 +450,15 @@ export default {
...
@@ -453,10 +450,15 @@ export default {
},
},
created
()
{
created
()
{
this
.
id
=
this
.
$route
.
query
.
objectID
this
.
id
=
this
.
$route
.
query
.
objectID
if
(
this
.
id
){
this
.
getList
()
this
.
getList
()
this
.
getCommon
()
this
.
getCommon
()
this
.
getFile
()
//
this.getFile()
this
.
getHistoryList
()
this
.
getHistoryList
()
}
else
{
this
.
$message
.
error
(
'请求链接无效'
)
}
},
},
methods
:
{
methods
:
{
getList
()
{
getList
()
{
...
@@ -490,16 +492,16 @@ export default {
...
@@ -490,16 +492,16 @@ export default {
handleUpload
()
{
handleUpload
()
{
},
},
getFile
()
{
//
getFile() {
const
page
=
{
//
const page = {
currentPage
:
1
,
//
currentPage: 1,
pageSize
:
10
,
//
pageSize: 10,
businessObjectID
:
this
.
id
//
businessObjectID: this.id
}
//
}
getOneModel
(
page
).
then
(
resp
=>
{
//
getOneModel(page).then(resp => {
this
.
tableData2
=
resp
.
results
//
this.tableData2 = resp.results
})
//
})
},
//
},
btnLink
(
row
)
{
btnLink
(
row
)
{
window
.
open
(
row
.
FileURL
)
window
.
open
(
row
.
FileURL
)
},
},
...
...
src/views/login/prov-register/index.vue
View file @
bb39dc16
...
@@ -638,8 +638,7 @@ export default {
...
@@ -638,8 +638,7 @@ export default {
this
.
$message
.
success
(
'提交成功!'
)
this
.
$message
.
success
(
'提交成功!'
)
setTimeout
(
function
(){
setTimeout
(
function
(){
this
.
$router
.
back
()
this
.
$router
.
back
()
},
20000
);
},
1000
);
}).
catch
((
err
)
=>
{
}).
catch
((
err
)
=>
{
this
.
btnloading
=
false
this
.
btnloading
=
false
})
})
...
...
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