店铺申请

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}`})
     }
   }

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 {

src/views/ss/storeApply/detail.vue

@@ -4,8 +4,12 @@
       <el-col :span="span">
         <el-card class="box-card" header="申请信息">
           <el-descriptions :column="2">
-            <el-descriptions-item label="店铺">{{detail.storeName | defaultValue}}</el-descriptions-item>
+            <el-descriptions-item label="店铺">
-            <el-descriptions-item label="申请人">{{detail.userName | defaultValue}}</el-descriptions-item>
+              <store-link :id="detail.storeId" :name="detail.storeName" @click="$emit('click-link')"/>
+            </el-descriptions-item>
+            <el-descriptions-item label="申请人">
+              <user-link :id="detail.userId" :name="detail.userName" @click="$emit('click-link')"/>
+            </el-descriptions-item>
             <el-descriptions-item label="提交时间">{{detail.createTime | defaultValue}}</el-descriptions-item>
             <el-descriptions-item label="申请类型">
               <dict-tag :options="dict.type.store_apply_type" :value="detail.applyType" size="small"/>
@@ -13,9 +17,6 @@
             <el-descriptions-item label="申请状态">
               <dict-tag :options="dict.type.store_apply_status" :value="detail.status" size="small"/>
             </el-descriptions-item>
-            <el-descriptions-item label="审核时间">{{detail.verifyTime | defaultValue}}</el-descriptions-item>
-            <el-descriptions-item label="审核人">{{detail.verifyName | defaultValue}}</el-descriptions-item>
-            <el-descriptions-item label="审核意见">{{detail.verifyRemark | defaultValue}}</el-descriptions-item>
           </el-descriptions>
         </el-card>
 
@@ -30,14 +31,6 @@
                 <image-preview :width="24" :height="24" :src="value"/>
               </template>
             </change-field>
-            <change-field :new-data="detail.newData" :old-data="detail.oldData" label="地址" prop="address" />
-            <change-field :new-data="detail.newData" :old-data="detail.oldData" label="经度" prop="lng" />
-            <change-field :new-data="detail.newData" :old-data="detail.oldData" label="纬度" prop="lat" />
-            <change-field :new-data="detail.newData" :old-data="detail.oldData" label="营业时间（起始）" prop="businessTimeStart" />
-            <change-field :new-data="detail.newData" :old-data="detail.oldData" label="营业时间（结束）" prop="businessTimeEnd" />
-            <change-field :new-data="detail.newData" :old-data="detail.oldData" label="省" prop="province" />
-            <change-field :new-data="detail.newData" :old-data="detail.oldData" label="市" prop="city" />
-            <change-field :new-data="detail.newData" :old-data="detail.oldData" label="区" prop="county" />
             <change-field :new-data="detail.newData" :old-data="detail.oldData" label="店铺类型" prop="type" >
               <template #old="{value}">
                 <dict-tag :value="value" :options="dict.type.ss_store_type" size="small"/>
@@ -46,6 +39,14 @@
                 <dict-tag :value="value" :options="dict.type.ss_store_type" size="small"/>
               </template>
             </change-field>
+            <change-field :new-data="detail.newData" :old-data="detail.oldData" label="营业时间（起始）" prop="businessTimeStart" />
+            <change-field :new-data="detail.newData" :old-data="detail.oldData" label="营业时间（结束）" prop="businessTimeEnd" />
+            <change-field :new-data="detail.newData" :old-data="detail.oldData" label="经度" prop="lng" />
+            <change-field :new-data="detail.newData" :old-data="detail.oldData" label="纬度" prop="lat" />
+            <change-field :new-data="detail.newData" :old-data="detail.oldData" label="省" prop="province" />
+            <change-field :new-data="detail.newData" :old-data="detail.oldData" label="市" prop="city" />
+            <change-field :new-data="detail.newData" :old-data="detail.oldData" label="区" prop="county" />
+            <change-field :new-data="detail.newData" :old-data="detail.oldData" label="地址" prop="address" />
             <change-field :new-data="detail.newData" :old-data="detail.oldData" label="联系人" prop="contactName" />
             <change-field :new-data="detail.newData" :old-data="detail.oldData" label="联系电话" prop="contactMobile" />
             <change-field :new-data="detail.newData" :old-data="detail.oldData" label="是否展示" prop="show">
@@ -59,8 +60,8 @@
           </ul>
         </el-card>
       </el-col>
-      <el-col v-if="24 - span > 0" :span="24 - span">
+      <el-col :span="24 - span">
-        <el-card header="审核操作">
+        <el-card header="审核操作" v-if="detail.status === StoreApplyStatus.WAIT_AUDIT">
           <el-form :model="form" :rules="rules">
             <el-form-item label-width="0" prop="verifyRemark">
               <el-input v-model="form.verifyRemark" type="textarea" :rows="3" :maxlength="200" show-word-limit placeholder="请输入审核意见"/>
@@ -71,6 +72,13 @@
             <el-button type="danger" plain icon="el-icon-close" @click="handleApproval(false)">驳回</el-button>
           </el-row>
         </el-card>
+        <el-card header="审核信息" v-else>
+          <el-descriptions :column="2">
+            <el-descriptions-item label="审核人">{{detail.verifyName | defaultValue}}</el-descriptions-item>
+            <el-descriptions-item label="审核时间">{{detail.verifyTime | defaultValue}}</el-descriptions-item>
+            <el-descriptions-item label="审核意见" :span="2">{{detail.verifyRemark | defaultValue}}</el-descriptions-item>
+          </el-descriptions>
+        </el-card>
       </el-col>
     </el-row>
   </div>
@@ -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() {
+    StoreApplyStatus() {
-      if (this.detail.status === StoreApplyStatus.WAIT_AUDIT) {
+      return StoreApplyStatus
-        return 14;
+    },
-      }
-      return 24;
-    }
   },
   watch: {
     id(nv, ov) {

src/views/ss/storeApply/index.vue

@@ -149,7 +149,7 @@
             icon="el-icon-view"
             @click="handleView(scope.row)"
             v-hasPermi="['ss:storeApply:query']"
-          >详情</el-button>
+          >详情/审核</el-button>
 <!--          <el-button-->
 <!--            size="mini"-->
 <!--            type="text"-->
@@ -184,10 +184,9 @@
       size="1280px"
       destroy-on-close
     >
-      <store-apply-detail :id="row.id"/>
+      <store-apply-detail :id="row.id" @click-link="showDetail = false"/>
     </el-drawer>
 
-
   </div>
 </template>