Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
OKR
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hanfeng zhang
OKR
Commits
3388bd18
Commit
3388bd18
authored
Oct 28, 2021
by
sixiaofeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
审批失败报错提示调整
parent
927a6133
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
11 deletions
+18
-11
.env
.env
+3
-2
.env.people
.env.people
+3
-2
.env.police
.env.police
+3
-2
main.ts
src/main.ts
+2
-2
apply-list.vue
src/views/team/apply-list.vue
+7
-3
No files found.
.env
View file @
3388bd18
VUE_APP_OSS_TEMPLATE=https://ccccchy-test.obs.cn-east-3.myhuaweicloud.com/oa/员工导入模板.xlsx
VUE_APP_OSS_TEMPLATE=https://ccccchy-test.obs.cn-east-3.myhuaweicloud.com/oa/员工导入模板.xlsx
VUE_APP_DOWNLOADPAGE=https://3syxin.com/
VUE_APP_DOWNLOADPAGE=https://3syxin.com/
VUE_APP_QRCODE_URL=http://121.40.18.70:8886
VUE_APP_QRCODE_URL=http://121.40.18.70:8886
VUE_APP_ENV=test
VUE_APP_ENV=test
\ No newline at end of file
VUE_APP_SHOWCONSOLE=show
\ No newline at end of file
.env.people
View file @
3388bd18
NODE_ENV=production
NODE_ENV=production
VUE_APP_QRCODE_URL=http://81.68.145.183:8886
VUE_APP_QRCODE_URL=http://81.68.145.183:8886
VUE_APP_ENV=people
VUE_APP_ENV=people
\ No newline at end of file
VUE_APP_SHOWCONSOLE=hide
\ No newline at end of file
.env.police
View file @
3388bd18
NODE_ENV=production
NODE_ENV=production
VUE_APP_QRCODE_URL=http://81.68.145.183:8887
VUE_APP_QRCODE_URL=http://81.68.145.183:8887
VUE_APP_ENV=police
VUE_APP_ENV=police
\ No newline at end of file
VUE_APP_SHOWCONSOLE=hide
\ No newline at end of file
src/main.ts
View file @
3388bd18
...
@@ -23,9 +23,9 @@ Vue.prototype.$global = global
...
@@ -23,9 +23,9 @@ Vue.prototype.$global = global
Vue
.
mixin
(
mixins
)
Vue
.
mixin
(
mixins
)
console
.
log
(
process
.
env
.
NODE_ENV
,
process
.
env
.
VUE_APP_ENV
,
'env'
)
console
.
log
(
process
.
env
.
NODE_ENV
,
process
.
env
.
VUE_APP_ENV
,
process
.
env
.
VUE_APP_SHOWCONSOLE
,
'env'
)
if
(
process
.
env
.
VUE_APP_
ENV
===
'test
'
)
{
if
(
process
.
env
.
VUE_APP_
SHOWCONSOLE
===
'show
'
)
{
new
VConsole
()
new
VConsole
()
}
}
...
...
src/views/team/apply-list.vue
View file @
3388bd18
...
@@ -284,15 +284,19 @@ export default Vue.extend({
...
@@ -284,15 +284,19 @@ export default Vue.extend({
this
.
$service
.
apply
.
approvalJoin
(
data
).
then
((
res
:
any
)
=>
{
this
.
$service
.
apply
.
approvalJoin
(
data
).
then
((
res
:
any
)
=>
{
const
{
data
}
=
res
const
{
data
}
=
res
this
.
loading
=
false
this
.
loading
=
false
if
(
data
.
code
===
this
.
$global
.
success
)
{
if
(
data
.
code
===
this
.
$global
.
success
||
[
12011
,
12012
].
indexOf
(
data
.
code
)
>
-
1
)
{
this
.
$toast
(
'操作成功'
)
if
(
data
.
code
===
this
.
$global
.
success
)
{
this
.
$toast
(
'操作成功'
)
}
else
{
this
.
$toast
(
data
.
msg
)
}
this
.
selectedDepId
=
this
.
rootDepId
this
.
selectedDepId
=
this
.
rootDepId
this
.
isEdit
=
false
this
.
isEdit
=
false
this
.
offset
=
1
this
.
offset
=
1
this
.
counts
=
0
this
.
counts
=
0
this
.
getApplyList
()
this
.
getApplyList
()
}
else
{
}
else
{
this
.
$toast
(
data
.
msg
)
this
.
$toast
(
data
.
msg
)
;
}
}
}).
catch
(()
=>
this
.
loading
=
false
)
}).
catch
(()
=>
this
.
loading
=
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