Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
store-system
Project
Project
Details
Activity
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
luoyangfei
store-system
Commits
ab0a29cf
Commit
ab0a29cf
authored
Nov 25, 2018
by
liuqian_mac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改跳转
parent
7f09aa37
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
43 additions
and
36 deletions
+43
-36
storeList.vue
2code/web/mgt_pro/src/views/store/storeList.vue
+29
-15
workerList.vue
2code/web/mgt_pro/src/views/worker/workerList.vue
+14
-21
No files found.
2code/web/mgt_pro/src/views/store/storeList.vue
View file @
ab0a29cf
...
@@ -89,7 +89,7 @@
...
@@ -89,7 +89,7 @@
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"操作"
width=
"2
00
"
>
<el-table-column
label=
"操作"
width=
"2
40"
fixed=
"right
"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-button
type=
"primary"
circle
class=
"table-icon"
@
click=
"check(scope.row)"
>
<el-button
type=
"primary"
circle
class=
"table-icon"
@
click=
"check(scope.row)"
>
<i
class=
"iconfont icon-chakan"
></i>
<i
class=
"iconfont icon-chakan"
></i>
...
@@ -122,7 +122,18 @@
...
@@ -122,7 +122,18 @@
<el-button
slot=
"reference"
type=
"warning"
circle
icon=
"el-icon-setting"
class=
"table-icon popver-btn"
></el-button>
<el-button
slot=
"reference"
type=
"warning"
circle
icon=
"el-icon-setting"
class=
"table-icon popver-btn"
></el-button>
</el-popover>
</el-popover>
</
template
>
<!-- 跳转到添加员工-->
<el-popover
v-if=
"scope.row.isAuditing==1"
placement=
"top"
width=
"160"
v-model=
"scope.row.delState1"
>
<p
style=
"margin-bottom:10px;font-weight:700;"
>
将要跳转页面,去添加去添加员工
</p>
<div
style=
"text-align: right; margin: 0"
>
<el-button
size=
"mini"
type=
"text"
@
click=
"scope.row.delState2 = false"
>
取消
</el-button>
<el-button
type=
"primary"
size=
"mini"
@
click=
"handleToAddPeople(scope.row)"
通过
</el-button>
</div>
<el-button
slot=
"reference"
type=
"primary"
icon=
"el-icon-setting"
style=
"margin-left:10px;"
circle
class=
"table-icon"
></el-button>
</el-popover>
</
template
>
""
</el-table-column>
</el-table-column>
</el-table>
</el-table>
...
@@ -533,7 +544,7 @@ export default {
...
@@ -533,7 +544,7 @@ export default {
},
},
add
()
{
add
()
{
// 强制处理详情回显问题
// 强制处理详情回显问题
this
.
dialogBindData
.
storeDetails
=
""
this
.
dialogBindData
.
storeDetails
=
""
;
this
.
dialogType
=
1
;
this
.
dialogType
=
1
;
axios
axios
...
@@ -608,8 +619,6 @@ export default {
...
@@ -608,8 +619,6 @@ export default {
}
}
},
},
submmitFun
()
{
submmitFun
()
{
const
param
=
Utils
.
deepClone
(
this
.
dialogBindData
);
const
param
=
Utils
.
deepClone
(
this
.
dialogBindData
);
param
.
consumeInterval
=
`
${
this
.
minPrice
}
-
${
this
.
maxPrice
}
`
;
param
.
consumeInterval
=
`
${
this
.
minPrice
}
-
${
this
.
maxPrice
}
`
;
...
@@ -672,15 +681,10 @@ export default {
...
@@ -672,15 +681,10 @@ export default {
type
:
"success"
type
:
"success"
});
});
if
(
this
.
dialogType
==
1
){
if
(
this
.
dialogType
==
1
)
{
// const host = window.location.origin
// const url = `${host}/?type=1#/worker/workerList`
// setTimeout(()=>{
// window.location.href = url
// },200)
this
.
submmitSuccess
=
false
;
this
.
submmitSuccess
=
false
;
this
.
handleClose
();
this
.
handleClose
();
}
else
{
}
else
{
this
.
submmitSuccess
=
false
;
this
.
submmitSuccess
=
false
;
this
.
handleClose
();
this
.
handleClose
();
}
}
...
@@ -730,7 +734,6 @@ export default {
...
@@ -730,7 +734,6 @@ export default {
this
.
$refs
.
imgComponent6
?
this
.
$refs
.
imgComponent6
.
clearImg
()
:
""
;
this
.
$refs
.
imgComponent6
?
this
.
$refs
.
imgComponent6
.
clearImg
()
:
""
;
this
.
$refs
.
imgComponent7
?
this
.
$refs
.
imgComponent7
.
clearImg
()
:
""
;
this
.
$refs
.
imgComponent7
?
this
.
$refs
.
imgComponent7
.
clearImg
()
:
""
;
// 销毁富文本编辑器的dom对象
// 销毁富文本编辑器的dom对象
setTimeout
(()
=>
{
setTimeout
(()
=>
{
...
@@ -817,7 +820,7 @@ export default {
...
@@ -817,7 +820,7 @@ export default {
},
},
handleRecommendFun
(
data
)
{
handleRecommendFun
(
data
)
{
this
.
$prompt
(
"只能输入1~2位正整数"
,
"请输入推荐
码
"
,
{
this
.
$prompt
(
"只能输入1~2位正整数"
,
"请输入推荐
序号
"
,
{
confirmButtonText
:
"确定"
,
confirmButtonText
:
"确定"
,
cancelButtonText
:
"取消"
,
cancelButtonText
:
"取消"
,
inputPattern
:
/^
\d{1,2}
$/
,
inputPattern
:
/^
\d{1,2}
$/
,
...
@@ -992,10 +995,21 @@ export default {
...
@@ -992,10 +995,21 @@ export default {
const
param
=
{
const
param
=
{
storeIds
:
this
.
tableItemIDS
storeIds
:
this
.
tableItemIDS
};
};
debugger
;
store
.
batchStoreShop
(
param
).
then
(
res
=>
{
store
.
batchStoreShop
(
param
).
then
(
res
=>
{
this
.
getList
();
this
.
getList
();
});
});
},
// 审核完成之后 跳转到添加员工
handleToAddPeople
(
data
)
{
const
host
=
window
.
location
.
origin
;
const
url
=
`
${
host
}
/#/worker/workerList`
;
sessionStorage
.
setItem
(
'_storeId_'
,
data
.
storeId
)
setTimeout
(()
=>
{
window
.
location
.
href
=
url
;
},
200
);
}
}
},
},
computed
:
{
computed
:
{
...
...
2code/web/mgt_pro/src/views/worker/workerList.vue
View file @
ab0a29cf
...
@@ -442,19 +442,21 @@ export default {
...
@@ -442,19 +442,21 @@ export default {
dImg2
:
""
,
dImg2
:
""
,
dImg3
:
""
,
dImg3
:
""
,
dImg4
:
""
,
dImg4
:
""
,
dImg5
:
""
dImg5
:
""
,
};
};
},
},
beforeMount
()
{
beforeMount
()
{
let
pageOrigin
=
window
.
location
.
search
let
_storeId_
=
sessionStorage
.
getItem
(
'_storeId_'
)
?
window
.
location
.
search
.
split
(
"="
)[
1
]
if
(
!!
_storeId_
)
{
:
""
;
this
.
dialogBindData
.
storeId
=
_storeId_
if
(
!!
pageOrigin
)
{
this
.
getStoreData
(()
=>
{
this
.
getStoreData
(()
=>
{
this
.
dialogType
=
1
;
this
.
dialogType
=
1
;
this
.
dialogState
=
true
;
this
.
dialogState
=
true
;
});
this
.
$message
({
name
:
"添加员工信息"
})
});
}
}
this
.
isAdmin
=
this
.
getCookAdminType
();
this
.
isAdmin
=
this
.
getCookAdminType
();
...
@@ -600,20 +602,9 @@ export default {
...
@@ -600,20 +602,9 @@ export default {
type
:
"success"
type
:
"success"
});
});
let
pageOrigin
=
window
.
location
.
search
// let _storeId_ = sessionStorage.getItem('_storeId_')
?
window
.
location
.
search
.
split
(
"="
)[
1
]
this
.
submmitSuccess
=
false
;
:
""
;
this
.
handleClose
();
if
(
this
.
dialogType
==
1
&&
(
!!
pageOrigin
)){
const
host
=
window
.
location
.
origin
const
url
=
`
${
host
}
/#/worker/workerList`
setTimeout
(()
=>
{
window
.
location
.
href
=
url
},
100
)
}
else
{
this
.
submmitSuccess
=
false
this
.
handleClose
()
}
});
});
});
});
}
else
{
}
else
{
...
@@ -667,7 +658,9 @@ export default {
...
@@ -667,7 +658,9 @@ export default {
this
.
$refs
.
imgComponent3
?
this
.
$refs
.
imgComponent3
.
clearImg
()
:
""
;
this
.
$refs
.
imgComponent3
?
this
.
$refs
.
imgComponent3
.
clearImg
()
:
""
;
this
.
$refs
.
imgComponent4
?
this
.
$refs
.
imgComponent4
.
clearImg
()
:
""
;
this
.
$refs
.
imgComponent4
?
this
.
$refs
.
imgComponent4
.
clearImg
()
:
""
;
this
.
$refs
.
imgComponent5
?
this
.
$refs
.
imgComponent5
.
clearImg
()
:
""
;
this
.
$refs
.
imgComponent5
?
this
.
$refs
.
imgComponent5
.
clearImg
()
:
""
;
sessionStorage
.
clear
()
// 销毁富文本编辑器的dom对象
// 销毁富文本编辑器的dom对象
setTimeout
(()
=>
{
setTimeout
(()
=>
{
this
.
dialogType
=
0
;
this
.
dialogType
=
0
;
...
@@ -713,7 +706,7 @@ export default {
...
@@ -713,7 +706,7 @@ export default {
},
},
handleRecommendFun
(
data
)
{
handleRecommendFun
(
data
)
{
this
.
$prompt
(
"只能输入1~2位正整数"
,
"请输入推荐
码
"
,
{
this
.
$prompt
(
"只能输入1~2位正整数"
,
"请输入推荐
序号
"
,
{
confirmButtonText
:
"确定"
,
confirmButtonText
:
"确定"
,
cancelButtonText
:
"取消"
,
cancelButtonText
:
"取消"
,
inputPattern
:
/^
\d{1,2}
$/
,
inputPattern
:
/^
\d{1,2}
$/
,
...
...
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