diff --git a/src/components/Business/SmUser/UserLink.vue b/src/components/Business/SmUser/UserLink.vue index fddcab0..71e3658 100644 --- a/src/components/Business/SmUser/UserLink.vue +++ b/src/components/Business/SmUser/UserLink.vue @@ -17,6 +17,7 @@ export default { }, methods: { handleClick() { + this.$emit('click'); this.$router.push({path: `/smUser/user/${this.id}`}) } } diff --git a/src/components/Business/Store/StoreLink.vue b/src/components/Business/Store/StoreLink.vue index 304b53c..1974e02 100644 --- a/src/components/Business/Store/StoreLink.vue +++ b/src/components/Business/Store/StoreLink.vue @@ -19,6 +19,7 @@ export default { }, methods: { handleClick() { + this.$emit('click'); if (this.$store.getters.userType === UserType.APP) { this.$router.push(`/business/store/${this.id}`) } else { diff --git a/src/views/ss/storeApply/detail.vue b/src/views/ss/storeApply/detail.vue index 70cab31..a298c66 100644 --- a/src/views/ss/storeApply/detail.vue +++ b/src/views/ss/storeApply/detail.vue @@ -4,8 +4,12 @@ - {{detail.storeName | defaultValue}} - {{detail.userName | defaultValue}} + + + + + + {{detail.createTime | defaultValue}} @@ -13,9 +17,6 @@ - {{detail.verifyTime | defaultValue}} - {{detail.verifyName | defaultValue}} - {{detail.verifyRemark | defaultValue}} @@ -30,14 +31,6 @@ - - - - - - - - + + + + + + + + @@ -59,8 +60,8 @@ - - + + @@ -71,6 +72,13 @@ 驳回 + + + {{detail.verifyName | defaultValue}} + {{detail.verifyTime | defaultValue}} + {{detail.verifyRemark | defaultValue}} + + @@ -80,10 +88,12 @@ import { approvalStoreApply, getStoreApply } from '@/api/ss/storeApply' import { StoreApplyStatus } from '@/utils/constants' import ChangeField from '@/views/ss/storeApply/component/ChangeField.vue' +import StoreLink from '@/components/Business/Store/StoreLink.vue' +import UserLink from '@/components/Business/SmUser/UserLink.vue' export default { name: "StoreApplyDetail", - components: { ChangeField }, + components: { UserLink, StoreLink, ChangeField }, dicts: ['store_apply_type', 'store_apply_status', 'ss_store_type'], props: { id: { @@ -93,6 +103,7 @@ export default { }, data() { return { + span: 14, loading: false, detail: { oldData: {}, @@ -103,12 +114,9 @@ export default { } }, computed: { - span() { - if (this.detail.status === StoreApplyStatus.WAIT_AUDIT) { - return 14; - } - return 24; - } + StoreApplyStatus() { + return StoreApplyStatus + }, }, watch: { id(nv, ov) { diff --git a/src/views/ss/storeApply/index.vue b/src/views/ss/storeApply/index.vue index b76c1f3..a3610b7 100644 --- a/src/views/ss/storeApply/index.vue +++ b/src/views/ss/storeApply/index.vue @@ -149,7 +149,7 @@ icon="el-icon-view" @click="handleView(scope.row)" v-hasPermi="['ss:storeApply:query']" - >详情 + >详情/审核 @@ -184,10 +184,9 @@ size="1280px" destroy-on-close > - + -