展厅管理后台

src/main/java/com/izouma/nineth/domain/ShowCollection.java

@@ -32,5 +32,7 @@ public class ShowCollection extends BaseEntity {
 
     private String pic;
 
+    private String name;
+
     private int sort;
 }

src/main/java/com/izouma/nineth/service/ShowroomService.java

@@ -6,20 +6,16 @@ import com.izouma.nineth.domain.Collection;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.enums.AssetStatus;
 import com.izouma.nineth.enums.AuthStatus;
-import com.izouma.nineth.enums.CollectionStatus;
 import com.izouma.nineth.enums.CollectionType;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.*;
 import com.izouma.nineth.utils.JpaUtils;
 import com.izouma.nineth.utils.ObjUtils;
 import lombok.AllArgsConstructor;
-import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.ObjectUtils;
-import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 
-import javax.persistence.Id;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -225,6 +221,7 @@ public class ShowroomService {
                             coll.setShowroomId(recordRoom.getId());
                             // 可能没有
                             coll.setAssetId(collection.getAssetId());
+
                             showCollectionRepo.save(coll);
                         }
                     }

src/main/vue/src/components/RichText.vue

@@ -1,5 +1,5 @@
 <template>
-    <tinymce-editor :init="init" :value="value" @input="onInput"> </tinymce-editor>
+    <tinymce-editor :init="init" :value="value" @input="onInput" :disabled="disabled"> </tinymce-editor>
 </template>
 <script>
 import Editor from '@tinymce/tinymce-vue';

src/main/vue/src/views/CollectionRoomList.vue

@@ -188,7 +188,7 @@ export default {
         },
         addRow() {
             this.$router.push({
-                path: '/showroomEdit',
+                path: '/collectionRoomEdit',
                 query: {
                     ...this.$route.query
                 }
@@ -196,7 +196,7 @@ export default {
         },
         editRow(row) {
             this.$router.push({
-                path: 'showroomEdit',
+                path: 'collectionRoomEdit',
                 query: {
                     id: row.id
                 }

src/main/vue/src/views/ShowroomEdit.vue

@@ -2,8 +2,8 @@
     <div class="edit-view">
         <page-title>
             <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
-            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
-            <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+            <!-- <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button> -->
+            <!-- <el-button @click="onSave" :loading="saving" type="primary">保存</el-button> -->
         </page-title>
         <div class="edit-view__content-wrapper">
             <div class="edit-view__content-section">
@@ -16,7 +16,7 @@
                     size="small"
                     style="max-width: 750px"
                 >
-                    <el-form-item prop="reason" label="拒绝理由" v-if="formData.reason">
+                    <el-form-item prop="reason" label="拒绝理由" v-if="formData.reason && formData.status != 'SUCCESS'">
                         <el-input
                             type="textarea"
                             v-model="formData.reason"
@@ -75,21 +75,29 @@
                             <el-table-column type="index" label="#"></el-table-column>
                             <el-table-column prop="collectionId" label="ID" width="110">
                                 <template slot-scope="{ row }">
-                                    <el-link>{{ row.collectionId }}</el-link>
+                                    <el-link @click="$router.push('/companyCollectionShelf?id=' + row.collectionId)">{{
+                                        row.collectionId
+                                    }}</el-link>
                                 </template>
                             </el-table-column>
-                            <el-table-column prop="pic" label="图">
+                            <el-table-column prop="pic" label="图" width="110">
                                 <template slot-scope="{ row }">
-                                    <el-image style="width: 30px; height: 30px" :src="row.pic" fit="cover"></el-image>
+                                    <el-image
+                                        style="width: 30px; height: 30px"
+                                        :src="row.pic"
+                                        fit="cover"
+                                        :preview-src-list="[row.pic]"
+                                    ></el-image>
                                 </template>
                             </el-table-column>
+                            <el-table-column prop="name" label="名称"></el-table-column>
                         </el-table>
                     </el-form-item>
                     <el-form-item class="form-submit">
-                        <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
-                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
+                        <!-- <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button> -->
+                        <!-- <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
                             删除
-                        </el-button>
+                        </el-button> -->
                         <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
                     </el-form-item>
                 </el-form>

src/main/vue/src/views/ShowroomList.vue

@@ -30,6 +30,11 @@
             >
                 <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
             </el-input>
+            <el-radio-group v-model="status" @change="getData">
+                <el-radio-button v-for="item in statusOptions" :label="item.value" :key="item.value">{{
+                    item.label
+                }}</el-radio-button>
+            </el-radio-group>
         </div>
         <el-table
             :data="tableData"
@@ -147,16 +152,17 @@ export default {
             url: '/showroom/all',
             downloading: false,
             statusOptions: [
-                { label: '未审核', value: 'NOT_AUTH' },
-                { label: '认证中', value: 'PENDING' },
-                { label: '已认证', value: 'SUCCESS' },
-                { label: '失败', value: 'FAIL' }
+                { label: '审核中', value: 'PENDING' },
+                { label: '失败', value: 'FAIL' },
+                { label: '已成功', value: 'SUCCESS' },
+                { label: '未审核', value: 'NOT_AUTH' }
             ],
             showReasonDialog: false,
             denyForm: {},
             denyRules: {
                 reason: [{ required: true, message: '请填写理由' }]
-            }
+            },
+            status: 'PENDING'
         };
     },
     computed: {
@@ -173,7 +179,7 @@ export default {
             return '';
         },
         beforeGetData() {
-            return { search: this.search, query: { del: false, type: 'COMPANY' } };
+            return { search: this.search, query: { del: false, type: 'COMPANY', status: this.status } };
         },
         toggleMultipleMode(multipleMode) {
             this.multipleMode = multipleMode;

src/main/vue/src/views/company/CompanyCollectionShelf.vue

@@ -60,7 +60,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item prop="detail" label="详情" style="width: calc(100vw - 450px)">
-                        <rich-text v-model="formData.detail"></rich-text>
+                        <rich-text v-model="formData.detail" disabled></rich-text>
                     </el-form-item>
                     <el-form-item prop="properties" label="特性" style="width: calc(100vw - 450px)" size="mini">
                         <el-table :data="formData.properties">

src/main/vue/src/views/company/CompanyRoomEdit.vue

@@ -16,7 +16,7 @@
                     size="small"
                     style="max-width: 750px"
                 >
-                    <el-form-item prop="reason" label="拒绝理由" v-if="formData.reason">
+                    <el-form-item prop="reason" label="拒绝理由" v-if="formData.reason && formData.status!='SUCCESS'">
                         <el-input
                             type="textarea"
                             v-model="formData.reason"
@@ -69,11 +69,12 @@
                         <el-table :data="formData.collections">
                             <el-table-column type="index" label="#"></el-table-column>
                             <el-table-column prop="collectionId" label="ID" width="110"></el-table-column>
-                            <el-table-column prop="pic" label="图">
+                            <el-table-column prop="pic" label="图" width="110">
                                 <template slot-scope="{ row }">
                                     <el-image style="width: 30px; height: 30px" :src="row.pic" fit="cover"></el-image>
                                 </template>
                             </el-table-column>
+                            <el-table-column prop="name" label="名称"></el-table-column>
                             <el-table-column width="80" align="center">
                                 <template v-slot="{ $index }">
                                     <el-link type="danger" plain @click="delCollection($index)" size="mini">