Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform-ui
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
youjj
cloud-platform-ui
Commits
4f4d6366
Commit
4f4d6366
authored
Aug 28, 2019
by
jiaorz
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'base-modify' of
http://113.105.137.151:22280/youjj/cloud-platform-ui
into base-modify
parents
340fd6e1
ff61836e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
45 additions
and
65 deletions
+45
-65
companyInfoModal.vue
src/views/baseInfo/branchCompany/companyInfoModal.vue
+44
-65
stockRightModal.vue
src/views/baseInfo/branchCompany/stockRightModal.vue
+1
-0
No files found.
src/views/baseInfo/branchCompany/companyInfoModal.vue
View file @
4f4d6366
...
...
@@ -7,7 +7,7 @@
<el-input
v-model=
"form.name"
placeholder=
"输入公司全称"
></el-input>
</el-form-item>
<el-form-item
label=
"公司简称"
prop=
"
n
ame"
>
<el-form-item
label=
"公司简称"
prop=
"
companyN
ame"
>
<el-input
v-model=
"form.companyName"
placeholder=
"输入公司简称"
></el-input>
</el-form-item>
...
...
@@ -42,18 +42,18 @@
</el-select>
</el-form-item>
<el-form-item
label=
"详细地址"
prop=
"leader"
>
<el-form-item
label=
"详细地址"
>
<el-input
v-model=
"form.addrDetail"
placeholder=
"请输入详细地址"
></el-input>
</el-form-item>
<el-form-item
label=
"经度"
prop=
"longitude"
>
<el-form-item
label=
"经度"
>
<el-input
v-model
.
number=
"form.longitude"
placeholder=
"请输入经度"
></el-input>
</el-form-item>
<el-form-item
label=
"纬度"
prop=
"latitude"
>
<el-form-item
label=
"纬度"
>
<el-input
v-model
.
number=
"form.latitude"
placeholder=
"请输入纬度"
></el-input>
</el-form-item>
<el-form-item
label=
"负责人"
prop=
"leader"
>
<el-form-item
label=
"负责人"
>
<el-input
v-model=
"form.leader"
placeholder=
"请输入负责人"
></el-input>
</el-form-item>
...
...
@@ -61,11 +61,11 @@
<el-input
v-model=
"form.leaderContactInfo"
placeholder=
"请输入负责人电话"
></el-input>
</el-form-item>
<el-form-item
label=
"租车客服电话"
prop=
"vehiceServicePhone"
>
<el-form-item
label=
"租车客服电话"
>
<el-input
v-model=
"form.vehiceServicePhone"
placeholder=
"请输入租车客服电话"
></el-input>
</el-form-item>
<el-form-item
label=
"旅游客服电话"
prop=
"tourServicePhone"
>
<el-form-item
label=
"旅游客服电话"
>
<el-input
v-model=
"form.tourServicePhone"
placeholder=
"请输入旅游客服电话"
></el-input>
</el-form-item>
<el-form-item
label=
"app展示"
>
...
...
@@ -188,22 +188,6 @@
isShow
:
"2"
,
//1:是, 2:否
},
rules
:
{
// latitude: [
// {
// type: 'number',
// required: true,
// message: '请输入数字',
// trigger: 'blur'
// }
// ],
// longitude: [
// {
// type: 'number',
// required: true,
// message: '请输入数字',
// trigger: 'blur'
// }
// ],
status
:
[
{
type
:
'integer'
,
...
...
@@ -220,10 +204,10 @@
trigger
:
'blur'
}
],
n
ame
:
[
companyN
ame
:
[
{
required
:
true
,
message
:
'请输
名
称'
,
message
:
'请输
简
称'
,
trigger
:
'blur'
},
{
...
...
@@ -233,10 +217,10 @@
trigger
:
'blur'
}
],
addrDetail
:
[
name
:
[
{
required
:
true
,
message
:
'请输
入详细地址
'
,
message
:
'请输
名称
'
,
trigger
:
'blur'
},
{
...
...
@@ -246,29 +230,42 @@
trigger
:
'blur'
}
],
leaderContactInfo
:
[
addrDetail
:
[
{
required
:
fals
e
,
message
:
'请输入
联系人电话
'
,
required
:
tru
e
,
message
:
'请输入
详细地址
'
,
trigger
:
'blur'
},
{
validator
:
(
rule
,
value
,
callback
)
=>
{
if
(
!
value
)
{
return
true
;
}
else
{
const
reg
=
/^
[
1
](([
3
][
0-9
])
|
([
4
][
5,7,9
])
|
([
5
][
0-9
])
|
([
6
][
6
])
|
([
7
][
1,2,3,5,6,7,8
])
|
([
8
][
0-9
])
|
([
9
][
1,8,9
]))[
0-9
]{8}
$/
console
.
log
(
reg
.
test
(
value
));
if
(
reg
.
test
(
value
))
{
callback
();
}
else
{
return
callback
(
new
Error
(
'请输入正确的手机号'
));
}
}
},
min
:
0
,
max
:
200
,
message
:
'长度小于 200 个字符'
,
trigger
:
'blur'
}
],
// leaderContactInfo: [
// {
// required: false,
// message: '请输入联系人电话',
// trigger: 'blur'
// },
// {
// validator: (rule, value, callback) => {
// if (!value) {
// return true;
// } else {
// const reg = /^[1](([3][0-9])|([4][5,7,9])|([5][0-9])|([6][6])|([7][1,2,3,5,6,7,8])|([8][0-9])|([9][1,8,9]))[0-9]{8}$/
// console.log(reg.test(value));
// if (reg.test(value)) {
// callback();
// } else {
// return callback(new Error('请输入正确的手机号'));
// }
// }
// },
// trigger: 'blur'
// }
// ],
addrProvince
:
[
{
required
:
true
,
...
...
@@ -294,24 +291,6 @@
},
trigger
:
'blur'
}
],
addrTown
:
[
{
required
:
true
,
type
:
'number'
,
message
:
'请选择镇(县)'
,
trigger
:
'blur'
},
{
validator
:
(
rule
,
value
,
callback
)
=>
{
if
(
this
.
$utils
.
isInteger
(
this
.
form
.
addrCity
)
&&
value
.
toString
().
substr
(
0
,
4
)
!=
this
.
form
.
addrCity
.
toString
().
substr
(
0
,
4
))
{
return
callback
(
new
Error
(
'请选择城市下相应镇(县)'
));
}
callback
();
},
trigger
:
'blur'
}
]
},
tabName
:
"first"
,
...
...
@@ -422,7 +401,7 @@
t
.
form
.
companyName
=
info
.
companyName
;
//简称
t
.
form
.
zoneId
=
info
.
zoneId
;
//简称
t
.
form
.
describes
=
info
.
describes
;
//公司简介
t
.
form
.
content
=
info
.
content
;
//公司详情
t
.
form
.
content
=
info
.
content
?
info
.
content
:
""
;
//公司详情
t
.
form
.
addrProvince
=
info
.
addrProvince
;
//省-编码
t
.
form
.
addrCity
=
info
.
addrCity
;
//市-编码
t
.
form
.
addrTown
=
info
.
addrTown
;
//县-编码
...
...
@@ -515,7 +494,7 @@
});
let
provinceObj
=
this
.
form
.
addrProvince
?
getRegionByCodes
([
this
.
form
.
addrProvince
]):
[{
name
:
""
}];
let
cityObj
=
this
.
form
.
addrCity
?
getRegionByCodes
([
this
.
form
.
addrCity
]):[{
name
:
""
}];
let
addrTownObj
=
this
.
form
.
addr
City
?
getRegionByCodes
([
this
.
form
.
addrTown
]):[{
name
:
""
}];
let
addrTownObj
=
this
.
form
.
addr
Town
?
getRegionByCodes
([
this
.
form
.
addrTown
]):[{
name
:
""
}];
params
.
state
=
this
.
state
==
1
?
2
:
1
;
//("上下架:1-上架;2-下架")
params
.
images
=
arr
.
join
(
","
);
params
.
id
=
this
.
form
.
id
;
...
...
@@ -580,7 +559,7 @@
});
let
provinceObj
=
this
.
form
.
addrProvince
?
getRegionByCodes
([
this
.
form
.
addrProvince
]):
[{
name
:
""
}];
let
cityObj
=
this
.
form
.
addrCity
?
getRegionByCodes
([
this
.
form
.
addrCity
]):[{
name
:
""
}];
let
addrTownObj
=
this
.
form
.
addr
City
?
getRegionByCodes
([
this
.
form
.
addrTown
]):[{
name
:
""
}];
let
addrTownObj
=
this
.
form
.
addr
Town
?
getRegionByCodes
([
this
.
form
.
addrTown
]):[{
name
:
""
}];
params
.
images
=
arr
.
join
(
","
);
params
.
id
=
this
.
form
.
id
;
params
.
companyId
=
this
.
form
.
companyId
;
...
...
@@ -689,7 +668,7 @@
});
let
provinceObj
=
this
.
form
.
addrProvince
?
getRegionByCodes
([
this
.
form
.
addrProvince
]):
[{
name
:
""
}];
let
cityObj
=
this
.
form
.
addrCity
?
getRegionByCodes
([
this
.
form
.
addrCity
]):[{
name
:
""
}];
let
addrTownObj
=
this
.
form
.
addr
City
?
getRegionByCodes
([
this
.
form
.
addrTown
]):[{
name
:
""
}];
let
addrTownObj
=
this
.
form
.
addr
Town
?
getRegionByCodes
([
this
.
form
.
addrTown
]):[{
name
:
""
}];
params
.
images
=
arr
.
join
(
","
);
params
.
name
=
this
.
form
.
name
;
//全称
params
.
companyName
=
this
.
form
.
companyName
;
//简称
...
...
src/views/baseInfo/branchCompany/stockRightModal.vue
View file @
4f4d6366
...
...
@@ -188,6 +188,7 @@
});
this
.
$emit
(
"stockRightDialogEvent"
,
true
);
}
else
{
this
.
form
.
price
=
this
.
form
.
price
/
10000
;
this
.
$notify
({
title
:
'失败'
,
message
:
res
.
message
,
...
...
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