Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
柳 佳乐
finance
Commits
f57bd13c
Commit
f57bd13c
authored
Nov 15, 2022
by
cx49085
Browse files
fix conflict
parent
a64ffdaf
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/utils/myValidate.js
View file @
f57bd13c
...
...
@@ -89,7 +89,7 @@ export function bankAccountValid(rule, value, callback) {
// 电话号码验证
export
function
checkPhone
(
rule
,
value
,
callback
)
{
if
(
!
value
)
{
console
.
log
(
1
)
//
console.log(1)
return
callback
(
new
Error
(
'
手机号不能为空
'
));
}
else
{
const
reg
=
/
(
^1
\d{10}
$
)
|
(
^
[
0-9
]\d{7}
$
)
/
...
...
src/views/pettyMoney/addPettyMoneyRecord.vue
View file @
f57bd13c
...
...
@@ -95,7 +95,7 @@ export default {
}
else
{
this
.
$router
.
back
()
}
console
.
log
(
1
)
//
console.log(1)
},
methods
:
{
back
(){
...
...
src/views/pettyMoney/components/examinePetty.vue
View file @
f57bd13c
...
...
@@ -181,6 +181,7 @@ export default {
this
.
checkedRow
=
{
...
data
}
}
else
{
this
.
checkedRow
=
{}
this
.
$refs
.
dialogForm
.
resetFields
()
}
if
(
dialogVisible
===
'
drawerVisible
'
)
{
this
.
drawerVisible
=
true
...
...
@@ -188,7 +189,6 @@ export default {
return
}
this
.
dialogVisible
=
dialogVisible
this
.
$refs
.
dialogForm
.
resetFields
()
},
getRepayDetailList
()
{
...
...
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