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
a11f5faf
Commit
a11f5faf
authored
Oct 13, 2021
by
qinj
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://120.25.63.219:6088/rex/portalhtml
into dev
parents
fd4aed7b
d79b42fd
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
191 additions
and
59 deletions
+191
-59
customers.js
src/api/customers.js
+38
-9
dictionary.js
src/api/dictionary.js
+1
-0
lov-data.js
src/api/lov-data.js
+10
-0
fetch-dictionary.js
src/utils/fetch-dictionary.js
+1
-1
index.vue
...customers-add/components/customersAdd-accessory/index.vue
+20
-10
index.vue
...rs/customers-add/components/customersAdd-adress/index.vue
+21
-7
index.vue
src/views/customers/customers-add/index.vue
+97
-30
constant.js
src/views/customers/customers-overview/constant.js
+2
-1
index.vue
src/views/public/file-info/index.vue
+1
-1
No files found.
src/api/customers.js
View file @
a11f5faf
...
@@ -29,6 +29,36 @@ export function customerCreate(data) {
...
@@ -29,6 +29,36 @@ export function customerCreate(data) {
data
data
})
})
}
}
// 查询省
export
function
provinceSearch
(
data
)
{
return
request
({
url
:
'/province/searchAll'
,
method
:
'post'
,
data
})
}
// 查询市
export
function
citySearch
(
data
){
return
request
({
url
:
'/city/searchAll'
,
method
:
'post'
,
data
})
}
// 查询市
export
function
districtSearch
(
data
){
return
request
({
url
:
'/district/searchAll'
,
method
:
'post'
,
data
})
}
// 客户发布记录
// 签约产品组
// 签约产品组
export
function
searchProduct
(
data
)
{
export
function
searchProduct
(
data
)
{
return
request
({
return
request
({
...
@@ -224,15 +254,14 @@ export const project = {
...
@@ -224,15 +254,14 @@ export const project = {
// updateUrl: '/paymentTerm/updateDetail'
// updateUrl: '/paymentTerm/updateDetail'
// }
// }
// // 客户附件
// 客户附件
// export const file = {
export
const
file
=
{
// createUrl: '/file/create',
createUrl
:
'/create'
,
// searchUrl: '/file/search',
searchUrl
:
'/search'
,
// detailUrl: '/file/getOne',
detailUrl
:
'/getOne'
,
// updateUrl: '/file/update',
updateUrl
:
'/update'
,
// deleteUrl: '/file/delete',
deleteUrl
:
'/delete'
,
// deleteDetailUrl: '/file/deleteDetail'
}
// }
// export const businessLog = {
// export const businessLog = {
// searchUrl: '/businessLog/search'
// searchUrl: '/businessLog/search'
...
...
src/api/dictionary.js
View file @
a11f5faf
...
@@ -424,6 +424,7 @@ export default {
...
@@ -424,6 +424,7 @@ export default {
'module'
:
'OpportunityPhaseTask'
'module'
:
'OpportunityPhaseTask'
},
},
flowDefinitions
:
'flow/definition/getAllEnum'
,
flowDefinitions
:
'flow/definition/getAllEnum'
,
flowNodesByDefinition
:
'flow/node/getAllEnumByDefinitionId?definitionId=1424712643570155522'
,
flowNodesByDefinition
:
'flow/node/getAllEnumByDefinitionId?definitionId=1424712643570155522'
,
...
...
src/api/lov-data.js
View file @
a11f5faf
...
@@ -182,6 +182,16 @@ export default {
...
@@ -182,6 +182,16 @@ export default {
label
:
'公司名称'
,
label
:
'公司名称'
,
type
:
'input'
,
type
:
'input'
,
layout
:
12
layout
:
12
},
OperName
:
{
label
:
'法人'
,
type
:
'input'
,
layout
:
12
},
CreditCode
:
{
label
:
'社会统一信用代码'
,
type
:
'input'
,
layout
:
12
}
}
}
}
}
}
...
...
src/utils/fetch-dictionary.js
View file @
a11f5faf
...
@@ -11,7 +11,7 @@ function fetchDictionary(data) {
...
@@ -11,7 +11,7 @@ function fetchDictionary(data) {
return
enums
[
code
]
return
enums
[
code
]
}
}
return
request
({
return
request
({
url
:
'/
enum/query
All'
,
url
:
'/
commonSession/search
All'
,
method
:
'post'
,
method
:
'post'
,
data
data
}).
then
((
res
)
=>
{
}).
then
((
res
)
=>
{
...
...
src/views/customers/customers-add/components/customersAdd-accessory/index.vue
View file @
a11f5faf
<
template
>
<
template
>
<div
v-if=
"addBtnStart"
>
<div
v-if=
"addBtnStart"
>
<
BusinessTable
v-bind=
"constant"
/>
<
FileTable
:type-code=
"typeCode"
:objectID=
'objectId'
/>
</div>
</div>
</
template
>
</
template
>
<
script
>
<
script
>
import
constant
from
'./constant'
import
{
uploadCode
}
from
'@/api/upload'
import
FileTable
from
'@/views/public/file-info'
export
default
{
export
default
{
components
:
{
FileTable
},
props
:
{
props
:
{
addBtnStart
:
{
addBtnStart
:
{
type
:
Boolean
,
type
:
Boolean
,
default
:
false
default
:
false
},
objectId
:
{
type
:
String
,
default
:
''
}
}
},
},
data
()
{
data
()
{
return
{
return
{
constant
:
{}
typeCode
:
uploadCode
.
customer
}
},
created
()
{
// 设置表单的初始搜索条件,该条件一般不会发生改变
constant
.
tableConfig
.
initialParams
=
{
AccountID
:
this
.
$route
.
query
.
objectID
}
}
this
.
constant
=
constant
},
},
watch
:
{
watch
:
{
addBtnStart
:
{
addBtnStart
:
{
...
@@ -33,6 +34,15 @@ export default {
...
@@ -33,6 +34,15 @@ export default {
},
},
immediate
:
true
,
immediate
:
true
,
deep
:
true
deep
:
true
},
objectId
:
{
handler
(
newVal
)
{
constant
.
tableConfig
.
initialParams
=
{
BusinessObjectID
:
newVal
}
},
immediate
:
true
,
deep
:
true
}
}
}
}
}
}
...
...
src/views/customers/customers-add/components/customersAdd-adress/index.vue
View file @
a11f5faf
...
@@ -12,6 +12,10 @@ export default {
...
@@ -12,6 +12,10 @@ export default {
addBtnStart
:
{
addBtnStart
:
{
type
:
Boolean
,
type
:
Boolean
,
default
:
false
default
:
false
},
objectId
:
{
type
:
String
,
default
:
''
}
}
},
},
data
()
{
data
()
{
...
@@ -19,13 +23,6 @@ export default {
...
@@ -19,13 +23,6 @@ export default {
constant
:
{}
constant
:
{}
}
}
},
},
created
()
{
// 设置表单的初始搜索条件,该条件一般不会发生改变
constant
.
tableConfig
.
initialParams
=
{
AccountID
:
this
.
$route
.
query
.
objectID
}
this
.
constant
=
constant
},
watch
:
{
watch
:
{
addBtnStart
:
{
addBtnStart
:
{
handler
(
newVal
)
{
handler
(
newVal
)
{
...
@@ -33,7 +30,24 @@ export default {
...
@@ -33,7 +30,24 @@ export default {
},
},
immediate
:
true
,
immediate
:
true
,
deep
:
true
deep
:
true
},
objectId
:
{
handler
(
newVal
)
{
constant
.
tableConfig
.
initialParams
=
{
BusinessObjectID
:
newVal
}
}
this
.
constant
=
constant
},
immediate
:
true
,
deep
:
true
}
},
created
()
{
// 设置表单的初始搜索条件,该条件一般不会发生改变
constant
.
tableConfig
.
initialParams
=
{
BusinessObjectID
:
this
.
$route
.
query
.
objectID
}
this
.
constant
=
constant
}
}
}
}
</
script
>
</
script
>
...
...
src/views/customers/customers-add/index.vue
View file @
a11f5faf
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
<Title
:title=
"title"
>
<Title
:title=
"title"
>
<span>
*
</span>
为必填项
<span>
*
</span>
为必填项
</Title>
</Title>
<div>
<div
class=
"basic-info"
>
<ele-form-section
<ele-form-section
v-model=
"formData"
v-model=
"formData"
:request-fn=
"handleSubmit"
:request-fn=
"handleSubmit"
...
@@ -12,8 +12,8 @@
...
@@ -12,8 +12,8 @@
@
request-success=
"handleSuccess"
@
request-success=
"handleSuccess"
/>
/>
</div>
</div>
<customerAddAddress
:addBtnStart=
'addBtnStart'
/>
<customerAddAddress
:addBtnStart=
'addBtnStart'
:objectId=
'objectId'
/>
<customerAddAccessory
:addBtnStart=
'addBtnStart'
/>
<customerAddAccessory
:addBtnStart=
'addBtnStart'
:objectId=
'objectId'
/>
<!--
<div
class=
"btn"
>
<!--
<div
class=
"btn"
>
<el-button
type=
"primary"
>
提交保存
</el-button>
<el-button
type=
"primary"
>
提交保存
</el-button>
</div>
-->
</div>
-->
...
@@ -22,34 +22,44 @@
...
@@ -22,34 +22,44 @@
<
script
>
<
script
>
import
Title
from
'@/components/Title'
import
Title
from
'@/components/Title'
import
{
customerCreate
}
from
'@/api/customers'
;
import
{
customerCreate
,
provinceSearch
,
citySearch
,
districtSearch
}
from
'@/api/customers'
;
import
customerAddAddress
from
'./components/customersAdd-adress/index'
import
customerAddAddress
from
'./components/customersAdd-adress/index'
import
customerAddAccessory
from
'./components/customersAdd-accessory/index'
import
customerAddAccessory
from
'./components/customersAdd-accessory/index'
// import dictionary from '@/api/dictionary'
import
path
from
'path'
;
export
default
{
export
default
{
components
:
{
components
:
{
Title
,
Title
,
customerCreate
,
customerCreate
,
customerAddAddress
,
customerAddAddress
,
customerAddAccessory
customerAddAccessory
,
provinceSearch
,
citySearch
,
districtSearch
},
},
data
()
{
data
()
{
return
{
return
{
title
:
'代理商新增'
,
title
:
'代理商新增'
,
addBtnStart
:
false
,
addBtnStart
:
false
,
objectId
:
''
,
formData
:
{},
formData
:
{},
province
:
[],
sections
:
[
sections
:
[
{
{
title
:
'基本信息'
,
title
:
'基本信息'
,
formDesc
:
{
formDesc
:
{
Name
:
{
Name
:
{
type
:
'
lov
'
,
type
:
'
input
'
,
label
:
'公司企称'
,
label
:
'公司企称'
,
layout
:
24
,
layout
:
24
,
code
:
'qcc'
,
code
:
'qcc'
,
returnFn
:
function
(
row
)
{
returnFn
:
function
(
row
)
{
return
{
return
{
Name
:
row
.
Name
Name
:
row
.
Name
,
ExtSocialUnifiedCreditCode_SDK
:
row
.
CreditCode
,
ExtCorporateName_SDK
:
row
.
OperName
}
}
},
},
},
},
...
@@ -83,21 +93,65 @@ export default {
...
@@ -83,21 +93,65 @@ export default {
{
{
title
:
'地址信息'
,
title
:
'地址信息'
,
formDesc
:
{
formDesc
:
{
// Name: {
ExtProvinceCode_SDK
:
{
// type: 'select',
type
:
'select'
,
// label: '省份',
label
:
'省份'
,
// layout: 12
layout
:
12
,
// },
options
:
async
data
=>
{
// ExtSecondName_SDK: {
const
res
=
await
provinceSearch
({})
// type: 'select',
var
result
=
res
.
results
.
map
(
item
=>
{
// label: '城市',
return
{
// layout: 12,
text
:
item
.
Name
,
// },
value
:
item
.
Code
// ExtSocialUnifiedCreditCode_SDK: {
}
// type: 'select',
})
// label: '县市',
return
result
// layout: 12
},
// },
},
ExtCityCode_SDK
:
{
type
:
'select'
,
label
:
'城市'
,
layout
:
12
,
isOptions
:
true
,
optionsLinkageFields
:
[
'ExtProvinceCode_SDK'
],
options
:
async
data
=>
{
if
(
!
data
.
ExtProvinceCode_SDK
)
{
return
[]
}
const
res
=
await
citySearch
({
provinceCode
:
data
.
ExtProvinceCode_SDK
})
var
result
=
res
.
results
.
map
(
item
=>
{
return
{
text
:
item
.
Name
,
value
:
item
.
Code
}
})
return
result
},
},
ExtDistrictCode_SDK
:
{
type
:
'select'
,
label
:
'县市'
,
layout
:
12
,
isOptions
:
true
,
optionsLinkageFields
:
[
'ExtProvinceCode_SDK'
,
'ExtCityCode_SDK'
],
options
:
async
data
=>
{
if
(
!
data
.
ExtCityCode_SDK
)
{
return
[]
}
const
res
=
await
districtSearch
({
cityCode
:
data
.
ExtCityCode_SDK
})
var
result
=
res
.
results
.
map
(
item
=>
{
return
{
text
:
item
.
Name
,
value
:
item
.
Code
}
})
return
result
},
},
ExtAddressDetail_SDK
:
{
ExtAddressDetail_SDK
:
{
type
:
'input'
,
type
:
'input'
,
label
:
'详细经营地址'
,
label
:
'详细经营地址'
,
...
@@ -158,17 +212,28 @@ export default {
...
@@ -158,17 +212,28 @@ export default {
],
],
// 同 vue-ele-form
// 同 vue-ele-form
rules
:
{
rules
:
{
ExtSocialUnifiedCreditCode_SDK
:
{
required
:
true
,
message
:
'名称必填'
}
Name
:
{
required
:
true
,
message
:
'名称必填'
},
ExtSocialUnifiedCreditCode_SDK
:
{
required
:
true
,
message
:
'名称必填'
},
ExtSocialUnifiedCreditCode_SDK
:
{
required
:
true
,
message
:
'名称必填'
},
ExtRegisteredCapital_SDK
:
{
required
:
true
,
message
:
'名称必填'
},
ExtCorporateName_SDK
:
{
required
:
true
,
message
:
'名称必填'
},
}
}
}
}
},
},
methods
:
{
methods
:
{
handleSubmit
(
data
)
{
handleSubmit
(
data
)
{
console
.
log
(
data
)
console
.
log
(
data
)
this
.
addBtnStart
=
true
//
this.addBtnStart = true
customerCreate
(
this
.
paramsToFormData
(
data
)).
then
(
res
=>
{
customerCreate
(
this
.
paramsToFormData
(
data
)).
then
(
res
=>
{
console
.
log
(
res
)
//
console.log(res)
this
.
addBtnStart
=
true
this
.
addBtnStart
=
true
this
.
objectId
=
res
.
results
const
objectID
=
res
.
results
this
.
$router
.
push
({
path
:
'/customersAdd'
,
query
:
{
objectID
:
objectID
}
})
this
.
$message
.
success
(
'创建成功'
)
this
.
$message
.
success
(
'创建成功'
)
})
})
// return Promise.resolve()
// return Promise.resolve()
...
@@ -201,11 +266,13 @@ export default {
...
@@ -201,11 +266,13 @@ export default {
width
:
90%
;
width
:
90%
;
}
}
}
}
.basic-info
{
::v-deep
.ele-form-btns
{
::v-deep
.ele-form-btns
{
.el-form-item__content
{
.el-form-item__content
{
margin-left
:
45%
!
important
;
margin-left
:
45%
!
important
;
}
}
}
}
}
.btn
{
.btn
{
margin-left
:
45%
;
margin-left
:
45%
;
}
}
...
...
src/views/customers/customers-overview/constant.js
View file @
a11f5faf
...
@@ -31,7 +31,8 @@ const tableConfig = {
...
@@ -31,7 +31,8 @@ const tableConfig = {
},
},
Name
:
{
Name
:
{
label
:
'公司名称'
,
label
:
'公司名称'
,
type
:
'input'
type
:
'input'
,
showInSearch
:
true
,
},
},
ExtCorporateName_SDK
:
{
ExtCorporateName_SDK
:
{
label
:
'法定人代表'
,
label
:
'法定人代表'
,
...
...
src/views/public/file-info/index.vue
View file @
a11f5faf
...
@@ -111,7 +111,7 @@ export default {
...
@@ -111,7 +111,7 @@ export default {
created
()
{
created
()
{
this
.
tableConfig
.
columns
.
handle
.
vif
=
this
.
isShowEditBtn
this
.
tableConfig
.
columns
.
handle
.
vif
=
this
.
isShowEditBtn
constant
.
tableConfig
.
initialParams
=
{
constant
.
tableConfig
.
initialParams
=
{
Accoun
tID
:
this
.
objectID
||
this
.
$route
.
query
.
objectID
,
BusinessObjec
tID
:
this
.
objectID
||
this
.
$route
.
query
.
objectID
,
TypeCode
:
this
.
typeCode
TypeCode
:
this
.
typeCode
}
}
if
(
this
.
moduleType
)
{
if
(
this
.
moduleType
)
{
...
...
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