12/28

src/api/brand.js

@@ -29,11 +29,10 @@ export function detail(params) {
 }
 
 // 获取审核通过的品牌
-export function getBrandList(params) {
+export function getBrandList() {
   return request({
     url: '/brand/getBrandList',
     method: 'get',
-    params
   })
 }
 

src/api/category.js

@@ -29,11 +29,10 @@ export function detail(params) {
 }
 
 // 获取审核通过的类目
-export function getCategoryList(params) {
+export function getCategoryList() {
   return request({
     url: '/category/getCategoryList',
     method: 'get',
-    params
   })
 }
 

src/pages/brand/addBrand/index.vue

@@ -4,71 +4,74 @@
             <div class="title">资质申请</div>
             <el-form size="small" class="form" ref="form" :model="form" label-width="140px">
                 <el-form-item label="认证审核类型:">
-                    <el-select v-model="form.third_cat_audit" placeholder="请选择" :disabled="isdisable" clearable
+                    <el-select v-model="form.brand_audit_type" placeholder="请选择" :disabled="isdisable" clearable
                         filterable>
-                        <el-option label="申请通过的类目" value="1"></el-option>
-                        <el-option label="无需审核类目" value="0"></el-option>
+                        <el-option label="国内品牌申请-R标" value="1"></el-option>
+                        <el-option label="国内品牌申请-TM标" value="2"></el-option>
+                        <el-option label="海外品牌申请-R标" value="3"></el-option>
+                        <el-option label="海外品牌申请-TM标" value="4"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="商标分类:" label-width="100px">
-                    <el-input placeholder="请输入" v-model="form.level2" maxlength="25">
+                    <el-input placeholder="请输入" v-model="form.trademark_type" maxlength="25">
                     </el-input>
                 </el-form-item>
                 <el-form-item label="选择品牌经营类型:">
-                    <el-select v-model="form.third_cat_audit" placeholder="请选择" :disabled="isdisable" clearable
+                    <el-select v-model="form.brand_management_type" placeholder="请选择" :disabled="isdisable" clearable
                         filterable>
-                        <el-option label="申请通过的类目" value="1"></el-option>
-                        <el-option label="无需审核类目" value="0"></el-option>
+                        <el-option label="自有品牌" value="1"></el-option>
+                        <el-option label="代理品牌" value="2"></el-option>
+                        <el-option label="无品牌" value="3"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="商品产地是否进口:" label-width="140px">
-                    <el-select v-model="form.third_cat_audit" placeholder="请选择" :disabled="isdisable" clearable
+                    <el-select v-model="form.commodity_origin_type" placeholder="请选择" :disabled="isdisable" clearable
                         filterable>
-                        <el-option label="申请通过的类目" value="1"></el-option>
-                        <el-option label="无需审核类目" value="0"></el-option>
+                        <el-option label="是" value="1"></el-option>
+                        <el-option label="否" value="2"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="商标/品牌词:" >
-                    <el-input placeholder="请输入" v-model="form.level2" maxlength="25">
+                <el-form-item label="商标/品牌词:">
+                    <el-input placeholder="请输入" v-model="form.trademark_registrant" maxlength="25">
                     </el-input>
                 </el-form-item>
-                <el-form-item label="商标注册人姓名:" label-width="140px">
-                    <el-input placeholder="请输入" v-model="form.level2" maxlength="25">
+                <!-- <el-form-item label="商标注册人姓名:" label-width="140px">
+                    <el-input placeholder="请输入" v-model="form.trademark_applicant" maxlength="25">
                     </el-input>
-                </el-form-item>
-                <el-form-item label="商标注册号/申请号:" >
-                    <el-input placeholder="请输入" v-model="form.level2" maxlength="25">
+                </el-form-item> -->
+                <el-form-item label="商标注册号/申请号:">
+                    <el-input placeholder="请输入" v-model="form.trademark_registrant_nu" maxlength="25">
                     </el-input>
                 </el-form-item>
-                <el-form-item label="商标有效期:" label-width="100px">
-                    <el-date-picker v-model="value1" type="date" placeholder="选择日期">
+                <el-form-item label="商标有效期:">
+                    <el-date-picker v-model="form.trademark_authorization_period" type="date" placeholder="选择日期">
                     </el-date-picker>
                 </el-form-item>
-                 <el-form-item label="商标申请人姓名:">
-                    <el-input placeholder="请输入" v-model="form.level2" maxlength="25">
+                <el-form-item label="商标申请人姓名:">
+                    <el-input placeholder="请输入" v-model="form.trademark_applicant" maxlength="25">
                     </el-input>
                 </el-form-item>
-                <el-form-item label="商标申请时间:" label-width="100px">
-                    <el-date-picker v-model="value1" type="date" placeholder="选择日期">
+                <el-form-item label="商标申请时间:">
+                    <el-date-picker v-model="form.trademark_application_time" type="date" placeholder="选择日期">
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item class="single" label="营业执照或组织机构代码证:">
-                    <upload v-if="updatePic" ref="upload_goods" :file="licenseImgs" limitNum="10"></upload>
+                    <upload v-if="updatePic" :file="org_code_certificateList" limitNum="10"></upload>
                 </el-form-item>
                 <el-form-item class="single" label="销售授权书（如商持人为自然人，还需提供:">
-                    <upload v-if="updatePic" ref="upload_zizhi" :file="certificateImgs" limitNum="10"></upload>
+                    <upload v-if="updatePic" :file="authorizationList" limitNum="10"></upload>
                 </el-form-item>
                 <el-form-item class="single" label="商标注册证书:">
-                    <upload v-if="updatePic" ref="upload_zizhi" :file="certificateImgs" limitNum="10"></upload>
+                    <upload v-if="updatePic" :file="registration_certificateList" limitNum="10"></upload>
                 </el-form-item>
                 <el-form-item class="single" label="商标变更证明:">
-                    <upload v-if="updatePic" ref="upload_zizhi" :file="certificateImgs" limitNum="10"></upload>
+                    <upload v-if="updatePic" :file="change_certificateList" limitNum="10"></upload>
                 </el-form-item>
                 <el-form-item class="single" label="商标注册申请受理通知书:">
-                    <upload v-if="updatePic" ref="upload_zizhi" :file="certificateImgs" limitNum="10"></upload>
+                    <upload v-if="updatePic" :file="registration_applicationList" limitNum="10"></upload>
                 </el-form-item>
                 <el-form-item class="single" label="中华人民共和国海关进口货物报关单:">
-                    <upload v-if="updatePic" ref="upload_zizhi" :file="certificateImgs" limitNum="10"></upload>
+                    <upload v-if="updatePic" :file="goods_formList" limitNum="10"></upload>
                 </el-form-item>
                 <el-form-item class="single" label="备注:">
                     <el-input placeholder="请输入" v-model="form.remark" maxlength="25">
@@ -78,10 +81,8 @@
                     <el-button class="blackbtn" :loading="loading" @click.native.prevent="commit">提交
                     </el-button>
                 </el-form-item>
-
             </el-form>
         </div>
-
         <div class="table">
             <div class="title">资质申请</div>
             <showtable class="showtable"></showtable>
@@ -94,26 +95,38 @@
     import upload from '@/components/upload'
     import showtable from '../components/showtable.vue'
     import {
-        add,
-    } from "@/api/category";
+        add
+    } from '@/api/brand'
     export default {
         name: 'addCategory',
         components: {
-            upload,showtable
+            upload,
+            showtable
         },
         props: {},
         data() {
             return {
-                licenseImgs: [],
-                certificateImgs: [],
+                categoryList: [],
+                brandList: [],
+                org_code_certificateList: [],
+                authorizationList: [],
+                registration_certificateList: [],
+                change_certificateList: [],
+                registration_applicationList: [],
+                goods_formList: [],
                 outProductId: 0,
                 commodity_id: 0,
                 updatePic: true,
                 form: {
-                    level1: '',
-                    level3: '',
-                    level2: '',
-                    level3_name: '',
+                    brand_audit_type: '',
+                    trademark_type: '',
+                    brand_management_type: '',
+                    commodity_origin_type: '',
+                    trademark_registrant: '',
+                    trademark_registrant_nu: '',
+                    trademark_authorization_period: '',
+                    trademark_applicant: '',
+                    trademark_application_time: '',
                     remark: ''
                 },
                 loading: false
@@ -123,35 +136,84 @@
         computed: {},
         methods: {
             commit() {
-                if (this.licenseImgs.length == 0) {
+                if (this.org_code_certificateList.length == 0) {
                     this.$message.error('请选择营业执照或组织机构代码证');
                     return
                 }
-                if (this.certificateImgs.length == 0) {
-                    this.$message.error('请选择资质材料');
+                if (this.authorizationList.length == 0) {
+                    this.$message.error('请选择销售授权书');
+                    return
+                }
+                if (this.registration_certificateList.length == 0) {
+                    this.$message.error('请选择商标注册证书');
+                    return
+                }
+                if (this.change_certificateList.length == 0) {
+                    this.$message.error('请选择商标变更证明');
                     return
                 }
-                let licenseImgs_temp = []
-                this.licenseImgs.forEach(element => {
-                    licenseImgs_temp.push(element.url)
+                if (this.registration_applicationList.length == 0) {
+                    this.$message.error('请选择商标注册申请受理通知书');
+                    return
+                }
+                if (this.goods_formList.length == 0) {
+                    this.$message.error('请选择中华人民共和国海关进口货物报关单');
+                    return
+                }
+                let imgDtoList = []
+                this.org_code_certificateList.forEach(element => {
+                    imgDtoList.push({
+                        type: "org_code_certificate",
+                        url: element.url
+                    })
+                });
+                this.authorizationList.forEach(element => {
+                    imgDtoList.push({
+                        type: "authorization",
+                        url: element.url
+                    })
                 });
-                let certificateImgs_temp = []
-                this.certificateImgs.forEach(element => {
-                    certificateImgs_temp.push(element.url)
+                this.registration_certificateList.forEach(element => {
+                    imgDtoList.push({
+                        type: "registration_certificate",
+                        url: element.url
+                    })
+                });
+                this.change_certificateList.forEach(element => {
+                    imgDtoList.push({
+                        type: "change_certificate",
+                        url: element.url
+                    })
+                });
+                this.registration_applicationList.forEach(element => {
+                    imgDtoList.push({
+                        type: "registration_application",
+                        url: element.url
+                    })
+                });
+                this.goods_formList.forEach(element => {
+                    imgDtoList.push({
+                        type: "goods_form",
+                        url: element.url
+                    })
                 });
                 let params = {
-                    certificateImgs: certificateImgs_temp.join(","),
-                    level1: this.form.level1,
-                    level2: this.form.level2,
-                    level3: this.form.level3,
-                    licenseImgs: licenseImgs_temp.join(","),
-                    level3_name: this.form.level3_name,
+                    brand_audit_type: this.form.brand_audit_type,
+                    brand_management_type: this.form.brand_management_type,
+                    commodity_origin_type: this.form.commodity_origin_type,
+                    imgDtoList: imgDtoList,
                     remark: this.form.remark,
+                    trademark_applicant: this.form.trademark_applicant,
+                    trademark_application_time: this.form.trademark_application_time,
+                    trademark_authorization_period: this.form.trademark_authorization_period,
+                    trademark_registrant: this.form.trademark_registrant,
+                    trademark_registrant_nu: this.form.trademark_registrant_nu,
+                    trademark_type: this.form.trademark_type
                 }
                 this.loading = true
                 add(params).then(() => {
-                    this.$message.success('添加成功');
-                    store.commit('REMOVETAB', '资质申请')
+                    this.$message.success('申请成功');
+                    store.commit('REMOVETAB', '品牌申请')
                     this.$router.go(-1)
                 }).catch(() => {
                     this.loading = false
@@ -161,21 +223,30 @@
                 this.loading = false
                 if (this.$route.params.isNew) {
                     this.form = {
-                        level1: '',
-                        level3: '',
-                        level2: '',
-                        level3_name: '',
+                        brand_audit_type: '',
+                        trademark_type: '',
+                        brand_management_type: '',
+                        commodity_origin_type: '',
+                        trademark_registrant: '',
+                        trademark_registrant_nu: '',
+                        trademark_authorization_period: '',
+                        trademark_applicant: '',
+                        trademark_application_time: '',
                         remark: ''
                     }
-                    this.licenseImgs = []
-                    this.certificateImgs = []
+                    this.org_code_certificateList = []
+                    this.authorizationList = [],
+                    this.registration_certificateList = [],
+                    this.change_certificateList = [],
+                    this.registration_applicationList = [],
+                    this.goods_formList = [],
                     //刷新子组件
                     this.updatePic = false
                     this.$nextTick(() => {
                         this.updatePic = true
                     })
                 }
-            }
+            },
         },
         created() {},
         activated() {
@@ -190,14 +261,16 @@
         flex-direction: row;
         background: #F6F8F9 !important;
         padding: 0px !important;
-        .table{
+
+        .table {
             display: flex;
             flex-direction: column;
             align-items: center;
             background: white !important;
             border-radius: 5px;
-            width: 37%;
+            width: 36%;
             margin-left: 10px;
+
             .title {
                 font-weight: bold;
                 width: 100%;
@@ -205,7 +278,8 @@
                 margin-left: 50px;
                 margin-top: 20px;
             }
-            .showtable{
+
+            .showtable {
                 width: 99%;
                 margin-top: 20px;
             }
@@ -218,7 +292,7 @@
             background: white;
             border-radius: 5px;
             padding: 10px;
-            width: 60%;
+            width: 61%;
 
             .title {
                 font-weight: bold;
@@ -250,6 +324,7 @@
 
                 .single {
                     width: 100%;
+
                     .el-input {
                         width: 575px;
                     }
@@ -258,6 +333,7 @@
                         width: 575px;
                     }
                 }
+
                 .commit {
                     width: 100%;
                     text-align: center;

src/pages/brand/brandDetail/index.vue

@@ -0,0 +1,399 @@
+<template>
+    <div class="wrapper">
+        <div class="left">
+            <div class="title">资质申请</div>
+            <div class="status">
+                <div class="line">
+                    <div class="label">申请状态:</div><span :class="status==9?'statustext':''">{{statusName}}</span>
+                </div>
+                <div class="line" v-if="status==9">
+                    <div class="label">原因:</div><span class="reason">{{reject_reason}}</span>
+                </div>
+            </div>
+            <el-divider></el-divider>
+            <el-form size="small" class="form" ref="form" :model="form" label-width="140px">
+                <el-form-item label="认证审核类型:">
+                    <el-select v-model="form.brand_audit_type" placeholder="请选择" :disabled="isdisable" clearable
+                        filterable>
+                        <el-option label="国内品牌申请-R标" value="1"></el-option>
+                        <el-option label="国内品牌申请-TM标" value="2"></el-option>
+                        <el-option label="海外品牌申请-R标" value="3"></el-option>
+                        <el-option label="海外品牌申请-TM标" value="4"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="商标分类:" label-width="100px">
+                    <el-input placeholder="请输入" v-model="form.trademark_type" :disabled="isdisable" maxlength="25">
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="选择品牌经营类型:">
+                    <el-select v-model="form.brand_management_type" placeholder="请选择" :disabled="isdisable" clearable
+                        filterable>
+                        <el-option label="自有品牌" value="1"></el-option>
+                        <el-option label="代理品牌" value="2"></el-option>
+                        <el-option label="无品牌" value="3"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="商品产地是否进口:" label-width="140px">
+                    <el-select v-model="form.commodity_origin_type" placeholder="请选择" :disabled="isdisable" clearable
+                        filterable>
+                        <el-option label="是" value="1"></el-option>
+                        <el-option label="否" value="2"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="商标/品牌词:">
+                    <el-input placeholder="请输入" v-model="form.trademark_registrant" :disabled="isdisable" maxlength="25">
+                    </el-input>
+                </el-form-item>
+                <!-- <el-form-item label="商标注册人姓名:" label-width="140px">
+                    <el-input placeholder="请输入" v-model="form.trademark_applicant" maxlength="25">
+                    </el-input>
+                </el-form-item> -->
+                <el-form-item label="商标注册号/申请号:">
+                    <el-input placeholder="请输入" v-model="form.trademark_registrant_nu" :disabled="isdisable" maxlength="25">
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="商标有效期:">
+                    <el-date-picker v-model="form.trademark_authorization_period" type="date" :disabled="isdisable" placeholder="选择日期">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="商标申请人姓名:">
+                    <el-input placeholder="请输入" v-model="form.trademark_applicant" :disabled="isdisable" maxlength="25">
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="商标申请时间:">
+                    <el-date-picker v-model="form.trademark_application_time" type="date" :disabled="isdisable" placeholder="选择日期">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item class="single" label="营业执照或组织机构代码证:">
+                    <upload v-if="updatePic" :file="org_code_certificateList" :disabled="isdisable" limitNum="10"></upload>
+                </el-form-item>
+                <el-form-item class="single" label="销售授权书（如商持人为自然人，还需提供:">
+                    <upload v-if="updatePic" :file="authorizationList" :disabled="isdisable" limitNum="10"></upload>
+                </el-form-item>
+                <el-form-item class="single" label="商标注册证书:">
+                    <upload v-if="updatePic" :file="registration_certificateList" :disabled="isdisable" limitNum="10"></upload>
+                </el-form-item>
+                <el-form-item class="single" label="商标变更证明:">
+                    <upload v-if="updatePic" :file="change_certificateList" :disabled="isdisable" limitNum="10"></upload>
+                </el-form-item>
+                <el-form-item class="single" label="商标注册申请受理通知书:">
+                    <upload v-if="updatePic" :file="registration_applicationList" :disabled="isdisable" limitNum="10"></upload>
+                </el-form-item>
+                <el-form-item class="single" label="中华人民共和国海关进口货物报关单:">
+                    <upload v-if="updatePic" :file="goods_formList" limitNum="10" :disabled="isdisable"></upload>
+                </el-form-item>
+                <el-form-item class="single" label="备注:">
+                    <el-input placeholder="请输入" :disabled="isdisable" v-model="form.remark" maxlength="25">
+                    </el-input>
+                </el-form-item>
+                <el-form-item class="commit" v-if="status!=0&&status!=1">
+                    <el-button class="blackbtn" :loading="loading" @click.native.prevent="commit">提交
+                    </el-button>
+                </el-form-item>
+            </el-form>
+        </div>
+        <div class="table">
+            <div class="title">资质申请</div>
+            <showtable class="showtable"></showtable>
+        </div>
+    </div>
+</template>
+
+<script>
+    import store from '@/store/index'
+    import upload from '@/components/upload'
+    import showtable from '../components/showtable.vue'
+    import {
+        add,detail
+    } from '@/api/brand'
+    export default {
+        name: 'brandDetail',
+        components: {
+            upload,
+            showtable
+        },
+        props: {},
+        data() {
+            return {
+                isdisable:false,
+                categoryList: [],
+                brandList: [],
+                org_code_certificateList: [],
+                authorizationList: [],
+                registration_certificateList: [],
+                change_certificateList: [],
+                registration_applicationList: [],
+                goods_formList: [],
+                brand_info_id: 0,
+                updatePic: true,
+                form: {
+                    brand_audit_type: '',
+                    trademark_type: '',
+                    brand_management_type: '',
+                    commodity_origin_type: '',
+                    trademark_registrant: '',
+                    trademark_registrant_nu: '',
+                    trademark_authorization_period: '',
+                    trademark_applicant: '',
+                    trademark_application_time: '',
+                    remark: ''
+                },
+                loading: false
+            };
+        },
+        watch: {},
+        computed: {},
+        methods: {
+            commit() {
+                if (this.org_code_certificateList.length == 0) {
+                    this.$message.error('请选择营业执照或组织机构代码证');
+                    return
+                }
+                if (this.authorizationList.length == 0) {
+                    this.$message.error('请选择销售授权书');
+                    return
+                }
+                if (this.registration_certificateList.length == 0) {
+                    this.$message.error('请选择商标注册证书');
+                    return
+                }
+                if (this.change_certificateList.length == 0) {
+                    this.$message.error('请选择商标变更证明');
+                    return
+                }
+                if (this.registration_applicationList.length == 0) {
+                    this.$message.error('请选择商标注册申请受理通知书');
+                    return
+                }
+                if (this.goods_formList.length == 0) {
+                    this.$message.error('请选择中华人民共和国海关进口货物报关单');
+                    return
+                }
+                let imgDtoList = []
+                this.org_code_certificateList.forEach(element => {
+                    imgDtoList.push({
+                        type: "org_code_certificate",
+                        url: element.url
+                    })
+                });
+                this.authorizationList.forEach(element => {
+                    imgDtoList.push({
+                        type: "authorization",
+                        url: element.url
+                    })
+                });
+                this.registration_certificateList.forEach(element => {
+                    imgDtoList.push({
+                        type: "registration_certificate",
+                        url: element.url
+                    })
+                });
+                this.change_certificateList.forEach(element => {
+                    imgDtoList.push({
+                        type: "change_certificate",
+                        url: element.url
+                    })
+                });
+                this.registration_applicationList.forEach(element => {
+                    imgDtoList.push({
+                        type: "registration_application",
+                        url: element.url
+                    })
+                });
+                this.goods_formList.forEach(element => {
+                    imgDtoList.push({
+                        type: "goods_form",
+                        url: element.url
+                    })
+                });
+                let params = {
+                    brand_audit_type: this.form.brand_audit_type,
+                    brand_management_type: this.form.brand_management_type,
+                    commodity_origin_type: this.form.commodity_origin_type,
+                    imgDtoList: imgDtoList,
+                    remark: this.form.remark,
+                    trademark_applicant: this.form.trademark_applicant,
+                    trademark_application_time: this.form.trademark_application_time,
+                    trademark_authorization_period: this.form.trademark_authorization_period,
+                    trademark_registrant: this.form.trademark_registrant,
+                    trademark_registrant_nu: this.form.trademark_registrant_nu,
+                    trademark_type: this.form.trademark_type
+                }
+                this.loading = true
+                add(params).then(() => {
+                    this.$message.success('申请成功');
+                    store.commit('REMOVETAB', '品牌申请')
+                    this.$router.go(-1)
+                }).catch(() => {
+                    this.loading = false
+                });
+            },
+            getDetail() {
+                detail({brandInfoId:this.brand_info_id}).then(res=>{
+                    this.status = res.data.status
+                    if (this.status == 0||this.status==1) { //审核中 通过全不可编辑
+                        this.isdisable = true
+                    }
+                    this.reject_reason = res.data.reject_reason
+                    this.statusName = res.data.statusName
+                    this.form.brand_audit_type=res.data.brand_audit_type
+                    this.form.brand_management_type=res.data.brand_management_type
+                    this.form.commodity_origin_type=res.data.commodity_origin_type
+                    this.form.remark=res.data.remark
+                    this.form.trademark_applicant=res.data.trademark_applicant
+                    this.form.trademark_application_time=res.data.trademark_application_time
+                    this.form.trademark_authorization_period=res.data.trademark_authorization_period
+                    this.form.trademark_registrant=res.data.trademark_registrant
+                    this.form.trademark_registrant_nu=res.data.trademark_registrant_nu
+                    this.form.trademark_type=res.data.trademark_type
+                    this.org_code_certificateList=res.data.imgMap.org_code_certificate
+                    this.authorizationList= res.data.imgMap.authorization
+                    this.registration_certificateList=res.data.imgMap.registration_certificate
+                    this.change_certificateList=res.data.imgMap.change_certificate
+                    this.registration_applicationList=res.data.imgMap.registration_application
+                    this.goods_formList=res.data.imgMap.goods_form
+                    //刷新子组件
+                    this.updatePic = false
+                    this.$nextTick(() => {
+                        this.updatePic = true
+                    })
+                })
+            },
+            initPage() {
+                this.loading = false
+                this.isDisable = false
+                if (this.$route.params.brand_info_id) {
+                    this.brand_info_id = this.$route.params.brand_info_id
+                    this.getDetail()
+                }
+            },
+        },
+        created() {},
+        activated() {
+            this.initPage()
+        },
+        mounted() {}
+    };
+</script>
+<style lang="less" scoped>
+    .wrapper {
+        display: flex;
+        flex-direction: row;
+        background: #F6F8F9 !important;
+        padding: 0px !important;
+
+        .table {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            background: white !important;
+            border-radius: 5px;
+            width: 36%;
+            margin-left: 10px;
+
+            .title {
+                font-weight: bold;
+                width: 100%;
+                text-align: left;
+                margin-left: 50px;
+                margin-top: 20px;
+            }
+
+            .showtable {
+                width: 99%;
+                margin-top: 20px;
+            }
+        }
+
+        .left {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            background: white;
+            border-radius: 5px;
+            padding: 10px;
+            width: 61%;
+
+            .status {
+                width: 100%;
+                display: flex;
+                margin-top: 20px;
+                flex-direction: column;
+                font-size: 14px;
+                color: #232323;
+                font-weight: bolder;
+                font-family: PingFangSC-Regular, PingFang SC;
+
+                .line {
+                    display: flex;
+                    margin-top: 20px;
+                    align-items: center;
+                }
+                .commitnew {
+                    margin-left: 40px;
+                }
+                .label {
+                    width: 100px;
+                    text-align: right;
+                    margin-right: 30px;
+                }
+
+                .reason {
+                    width: 80%;
+                }
+
+                .statustext {
+                    color: #E02020;
+                }
+            }
+
+            .title {
+                font-weight: bold;
+                width: 100%;
+                text-align: left;
+                margin-left: 50px;
+                margin-top: 10px;
+            }
+
+            .form {
+                margin-top: 20px;
+                width: 100%;
+                display: flex;
+                justify-content: space-between;
+                flex-wrap: wrap;
+
+                .el-form-item {
+                    color: #232323;
+                    font-weight: bold;
+                }
+
+                .el-select {
+                    width: 200px;
+                }
+
+                .el-input {
+                    width: 200px;
+                }
+
+                .single {
+                    width: 100%;
+
+                    .el-input {
+                        width: 575px;
+                    }
+
+                    .el-select {
+                        width: 575px;
+                    }
+                }
+
+                .commit {
+                    width: 100%;
+                    text-align: center;
+                }
+            }
+
+        }
+
+    }
+</style>

src/pages/brand/index.vue

@@ -91,9 +91,9 @@
       },
       toView(row) {
         this.$router.push({
-          name: "categoryDetail",
+          name: "brandDetail",
           params: {
-            category_info_id: row.category_info_id
+            brand_info_id: row.brand_info_id
           }
         });
       },
@@ -102,7 +102,6 @@
        this.getPageList()
     },
     mounted() {
-      this.getPageList()
     }
   };
 </script>

src/pages/goods/addGoods/index.vue

@@ -8,9 +8,11 @@
                 </el-input>
             </el-form-item>
             <el-form-item label="类目:" label-width="100px">
-                <el-select v-model="form.third_cat_audit" placeholder="请选择" :disabled="isdisable" clearable filterable>
-                    <el-option label="申请通过的类目" value="1"></el-option>
-                    <el-option label="无需审核类目" value="0"></el-option>
+                <el-select v-model="form.third_cat_id" placeholder="请选择" :disabled="isdisable" clearable filterable>
+                    <el-option v-for="item in categoryList" :key="item.level3" :label="item.level3_name"
+                        :value="item.level3">
+                    </el-option>
+                    <el-option label="无需审核类目" value="-1"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="商品ID:" label-width="100px">
@@ -18,9 +20,11 @@
                 </el-input>
             </el-form-item>
             <el-form-item label="品牌:" label-width="100px">
-                <el-select v-model="form.has_brand" :disabled="isdisable" placeholder="请选择" clearable filterable>
-                    <el-option label="申请通过的品牌" value="1"></el-option>
-                    <el-option label="无品牌" value="0"></el-option>
+                <el-select v-model="form.brand_id" :disabled="isdisable" placeholder="请选择" clearable filterable>
+                    <el-option v-for="item in brandList" :key="item.brand_info_id" :label="item.trademark_registrant"
+                        :value="item.brand_info_id">
+                        </el-option>
+                    <el-option label="无品牌" value="-1"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="商品库存:" label-width="100px">
@@ -49,8 +53,8 @@
                 <el-input placeholder="请输入" :disabled="isdisable" maxlength="25">
                 </el-input>
             </el-form-item>
-            <el-form-item label="三级类目:" v-if="form.third_cat_audit=='0'" label-width="100px">
-                <el-input placeholder="请输入" :disabled="isdisable" maxlength="25" v-model="form.third_cat_id">
+            <el-form-item label="三级类目:" v-if="form.third_cat_id=='-1'" label-width="100px">
+                <el-input placeholder="请输入" :disabled="isdisable" maxlength="25" v-model="form.third">
                 </el-input>
             </el-form-item>
             <el-form-item class="single" label="商品图片:" label-width="100px">
@@ -79,6 +83,12 @@
         edit,
         authDetail
     } from "@/api/goods";
+    import {
+        getCategoryList
+    } from '@/api/category'
+    import {
+        getBrandList
+    } from '@/api/brand'
     export default {
         name: 'addGoods',
         components: {
@@ -87,6 +97,8 @@
         props: {},
         data() {
             return {
+                categoryList: [],
+                brandList:[],
                 goodsList: [],
                 goodszizhiList: [],
                 outProductId: 0,
@@ -103,6 +115,8 @@
                     market_price: '',
                     path: '',
                     third_cat_id: '',
+                    third: '',
+                    brand_id:'',
                 },
                 loading: false
             };
@@ -120,16 +134,16 @@
                     zizhiarray.push(element.url)
                 });
                 let params = {
-                    brand_id: '2100000000',
-                    has_brand: this.form.has_brand,
+                    brand_id: this.form.brand_id==-1?2100000000:this.form.brand_id,
+                    has_brand: this.form.brand_id==-1?0:1,
                     market_price: this.form.market_price,
                     out_product_id: this.form.out_product_id,
                     path: this.form.path,
                     qualificationImgs: zizhiarray.join(","),
                     sale_price: this.form.sale_price,
                     stock_num: this.form.stock_num,
-                    third_cat_audit: this.form.third_cat_audit,
-                    third_cat_id: this.form.third_cat_id,
+                    third_cat_audit: this.form.third_cat_id == -1 ? 0 : 1,
+                    third_cat_id: this.form.third_cat_id == -1 ? this.form.third : this.form.third_cat_id,
                     thumb_img: this.goodsList[0].url,
                     title: this.form.title
                 }
@@ -154,10 +168,6 @@
                 }
 
             },
-            handlePictureCardPreview(file) {
-                this.dialogImageUrl = file.url;
-                this.dialogVisible = true
-            },
             getDetail() {
                 if (this.outProductId != 0) {
                     authDetail({
@@ -193,6 +203,16 @@
                     })
                 }
             },
+            getCategoryList() { //获取类目列表
+                getCategoryList().then(res => {
+                    this.categoryList = res.data
+                })
+            },
+            getBrandList(){ //获取品牌列表
+                getBrandList().then(res=>{
+                    this.brandList=res.data
+                })
+            },
             initPage() {
                 this.loading = false
                 this.isdisable = false
@@ -215,6 +235,8 @@
                         market_price: '',
                         path: '',
                         third_cat_id: '',
+                        third: '',
+                        brand_id:'',
                     }
                     this.goodsList = []
                     this.goodszizhiList = []
@@ -229,9 +251,10 @@
         created() {},
         activated() {
             this.initPage()
+            this.getCategoryList()
+            this.getBrandList()
         },
-        mounted() {
-        }
+        mounted() {}
     };
 </script>
 <style lang="less" scoped>

src/pages/goods/index.vue

@@ -177,7 +177,7 @@
 
           });
         })
-      }
+      },
     },
     activated() {
       this.getPageList()

src/router/routes.js

@@ -68,4 +68,10 @@ export const otherRouter = [
     meta: { title: '品牌申请' ,keepAlive:true},
     component: () => import('@/pages/brand/addBrand/index.vue'),
   },
+  {
+    name: 'brandDetail',
+    path: '/brand/brandDetail',
+    meta: { title: '品牌详情' ,keepAlive:true},
+    component: () => import('@/pages/brand/brandDetail/index.vue'),
+  },
 ]