Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-4
Overview
Overview
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
office
haoban-4
Commits
20688d88
Commit
20688d88
authored
Sep 10, 2020
by
无尘
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改会员分配和授权
parent
b53e3298
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
6 deletions
+28
-6
check-name-dialog.vue
src/components/company/check-name-dialog.vue
+4
-2
customer-assign.vue
src/views/apps/customer-app/customer-assign.vue
+2
-2
new-auth-merchant.vue
src/views/business/new-auth-merchant.vue
+22
-2
No files found.
src/components/company/check-name-dialog.vue
View file @
20688d88
...
...
@@ -4,10 +4,10 @@
* @Author: 无尘
* @Date: 2020-08-31 16:11:50
* @LastEditors: 无尘
* @LastEditTime: 2020-09-
08 15:07:46
* @LastEditTime: 2020-09-
10 13:49:14
-->
<!--
<check-name-dialog :sync-data="syncData"></check-name-dialog>
<check-name-dialog :sync-data="syncData"
@closeSet="closeSet"
></check-name-dialog>
import checkNameDialog from '@/components/company/check-name-dialog.vue';
-->
<
template
>
...
...
@@ -90,6 +90,8 @@ export default {
postCheck
()
{
const
that
=
this
;
let
params
=
{
enterpriseId
:
that
.
syncData
.
enterpriseId
,
auditorName
:
that
.
ruleForm
.
name
};
checkName
(
params
)
.
then
(
res
=>
{
...
...
src/views/apps/customer-app/customer-assign.vue
View file @
20688d88
...
...
@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-08-20 14:36:37
* @LastEditors: 无尘
* @LastEditTime: 2020-09-
09 17:53:48
* @LastEditTime: 2020-09-
10 17:23:52
-->
<
template
>
<div
class=
"customer-assign-wrap"
>
...
...
@@ -69,7 +69,7 @@
</div>
<div
class=
"common-table-text"
>
<div
class=
"font-14 color-606266 hide-ellipsis"
>
{{
scope
.
row
.
memberName
||
'--'
}}
</div>
<div
class=
"font-12 color-909399 hide-ellipsis"
>
{{
scope
.
row
.
memberPhone
||
'--'
}}
</div>
<div
class=
"font-12 color-909399 hide-ellipsis"
>
{{
scope
.
row
.
cardNo
||
'--'
}}
</div>
</div>
</div>
</
template
>
...
...
src/views/business/new-auth-merchant.vue
View file @
20688d88
...
...
@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-03-20 14:36:37
* @LastEditors: 无尘
* @LastEditTime: 2020-09-
09 16:05:58
* @LastEditTime: 2020-09-
10 15:54:53
-->
<
template
>
<div
class=
"my-customer-wrap common-set-wrap"
>
...
...
@@ -97,6 +97,7 @@
</div>
</div>
<store-auth-dialog
v-if=
"setVisible"
:enterprise-id=
"authForm.enterpriseId"
:is-select-all=
"isSelectAll"
:select-mode=
"selectMode"
:range-data=
"rangeData"
:bind-type=
"bindType"
@
closeSet=
"closeSet"
></store-auth-dialog>
<check-name-dialog
v-if=
"checkShow"
:sync-data=
"syncData"
@
closeSet=
"closeCheckSet"
></check-name-dialog>
<!-- <vue-gic-footer></vue-gic-footer> -->
</div>
</template>
...
...
@@ -107,6 +108,7 @@ import authTip from '@/components/company/auth-tip.vue';
import
authCommitSuccess
from
'@/components/company/auth-commit-success.vue'
;
import
authCommit
from
'@/components/company/auth-commit.vue'
;
import
storeAuthDialog
from
'@/components/company/store-auth-dialog.vue'
;
import
checkNameDialog
from
'@/components/company/check-name-dialog.vue'
;
import
api
from
'@/api/merchant-auth.js'
;
const
{
getAuthDetail
,
getEnterprise
,
getEnterpriseDetail
,
getGicAdmin
,
postEnterpriseAuth
}
=
api
;
import
{
emojiToStr
}
from
'@/common/js/public'
;
...
...
@@ -118,7 +120,8 @@ export default {
authTip
,
authCommitSuccess
,
authCommit
,
storeAuthDialog
storeAuthDialog
,
checkNameDialog
},
data
()
{
return
{
...
...
@@ -166,6 +169,8 @@ export default {
}
]
},
checkShow
:
false
,
// 是否显示姓名校验
syncData
:
{},
isSelectAll
:
0
,
// 用来判断禁用选择所有门店
changeFlag
:
false
,
// 用来判断编辑时候数据有没有变化
setVisible
:
false
,
...
...
@@ -187,6 +192,19 @@ export default {
},
methods
:
{
/**
* @description: 关闭姓名校验
* @param {String} res
* @return {Boolean}
* @author: 无尘
*/
closeCheckSet
(
res
)
{
const
that
=
this
;
that
.
checkShow
=
false
;
if
(
res
==
'close'
)
{
return
false
;
}
},
/**
* @description: closeSet
* @param {String} type
* @param {Array} arr
...
...
@@ -328,6 +346,8 @@ export default {
*/
getAdmin
(
item
)
{
const
that
=
this
;
that
.
syncData
=
item
;
// 显示检验姓名弹窗
// that.checkShow = true;
that
.
authForm
.
enterpriseId
=
item
.
enterpriseId
;
that
.
authForm
.
enterpriseName
=
item
.
enterpriseName
;
that
.
authForm
.
bindRange
=
[];
...
...
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