1/6

src/pages/brand/addBrand/index.vue

@@ -238,8 +238,9 @@
                         this.loading = true
                         add(params).then(() => {
                             this.$message.success('申请成功');
-                            store.commit('REMOVETAB', '品牌申请')
+                            store.commit('SET_TABINDEX', 0)
                             this.$router.push('/brand')
+                            store.commit('REMOVETAB', '品牌申请')
                         }).catch(() => {
                             this.loading = false
                         });

src/pages/goods/addGoods/index.vue

@@ -8,7 +8,7 @@
                 </el-input>
             </el-form-item>
             <el-form-item label="类目:" label-width="120px" prop="third_cat_id">
-                <el-select v-model="form.third_cat_id" placeholder="请选择" :disabled="isdisable" clearable filterable>
+                <el-select v-model="form.third_cat_id" placeholder="请选择" :disabled="isdisable" clearable filterable @change="thirdcatchangge">
                     <el-option v-for="item in categoryList" :key="item.level3" :label="item.level3_name"
                         :value="item.level3">
                     </el-option>
@@ -45,9 +45,9 @@
                 <el-input class="pr-50" :disabled="isdisable" placeholder="请输入" v-model="form.path" maxlength="100" show-word-limit>
                 </el-input>
             </el-form-item>
-            <el-form-item label="三级类目:" v-if="form.third_cat_id=='-1'" label-width="120px"
-                :rules="[{ required: form.third_cat_id=='-1', message: '请输入必填项', trigger: 'blur' }]">
-                <el-input placeholder="请输入" :disabled="isdisable" type='number' oninput="if(value.length>8)value=value.slice(0,8)" v-model="form.third">
+            <el-form-item label="三级类目:" v-if="form.third_cat_id=='-1'" label-width="120px" prop="third"
+                 >
+                <el-input placeholder="请输入" :disabled="isdisable" maxlength="9" show-word-limit  v-model="form.third">
                 </el-input>
             </el-form-item>
             <el-form-item class="single" label="商品图片:" label-width="120px" required>
@@ -158,12 +158,26 @@
                         message: '请输入必填项',
                         trigger: 'blur'
                     }],
+                    third: [{
+                        required: false,
+                        validator: validnumber,
+                        trigger: 'blur'
+                    }],
                 },
             };
         },
-        watch: {},
-        computed: {},
+        watch: {
+        },
+        computed: {
+        },
         methods: {
+            thirdcatchangge(){
+                if(this.form.third_cat_id=='-1'){
+                    this.rules.third[0].required=true
+                }else{
+                    this.rules.third[0].required=false
+                }
+            },
             commit() {
                 this.$refs.form.validate(valid => {
                     if (valid) {
@@ -171,6 +185,10 @@
                             this.$message.error('请选择至少一张商品图片');
                             return
                         }
+                        if((this.form.third_cat_id=='-1')&&(!this.form.third)){
+                            this.$message.error('请填写三级类目');
+                            return
+                        }
                         let zizhiarray = []
                         this.goodszizhiList.forEach(element => {
                             zizhiarray.push(element.url)
@@ -194,8 +212,9 @@
                         if (this.outProductId == 0) { //新增
                             add(params).then(() => {
                                 this.$message.success('添加成功');
-                                store.commit('REMOVETAB', '商品信息')
+                                store.commit('SET_TABINDEX', 0)
                                 this.$router.push('/goods')
+                                store.commit('REMOVETAB', '商品信息')
                             }).catch(() => {
                                 this.loading = false
                             });
@@ -203,9 +222,10 @@
                             params.commodity_id = this.commodity_id
                             edit(params).then(() => {
                                 this.$message.success('修改成功');
+                                store.commit('SET_TABINDEX', 0)
+                                this.$router.push('/goods')
                                 store.commit('REMOVETAB', '商品信息')
                                 store.commit('REMOVETAB', '商品详情')
-                                this.$router.push('/goods')
                             }).catch(() => {
                                 this.loading = false
                             });

src/pages/goods/goodsDetail/index.vue

@@ -22,11 +22,11 @@
             <img class="emptyimg" src="../../../../static/images/empty.png" />
         </div>
         <el-form class="form" ref="form" :model="form" label-width="80px" v-if="form.commodity_id">
-            <el-form-item class="single" label="商品名:" label-width="100px">
+            <el-form-item class="single" label="商品名:" label-width="100px" required>
                 <el-input class="pr-50" placeholder="请输入" v-model="form.title" maxlength="60" disabled show-word-limit>
                 </el-input>
             </el-form-item>
-            <el-form-item label="类目:" label-width="100px">
+            <el-form-item label="类目:" label-width="100px" required>
                 <el-select v-model="form.third_cat_id" placeholder="请选择" clearable disabled filterable>
                     <el-option v-for="item in categoryList" :key="item.level3" :label="item.level3_name"
                         :value="item.level3">
@@ -34,11 +34,11 @@
                     <el-option label="无需审核类目" value="-1"></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="商品ID:" label-width="100px">
+            <el-form-item label="商品ID:" label-width="100px" required>
                 <el-input placeholder="请输入" v-model="form.out_product_id" disabled maxlength="9" show-word-limit>
                 </el-input>
             </el-form-item>
-            <el-form-item label="品牌:" label-width="100px">
+            <el-form-item label="品牌:" label-width="100px" required>
                 <el-select v-model="form.brand_id" placeholder="请选择" clearable disabled filterable>
                      <el-option v-for="item in brandList" :key="item.brand_info_id" :label="item.brand_wording"
                         :value="item.brand_info_id">
@@ -46,19 +46,19 @@
                     <el-option label="无品牌" value="-1"></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="商品库存:" label-width="100px">
+            <el-form-item label="商品库存:" label-width="100px" required>
                 <el-input placeholder="请输入" maxlength="6" show-word-limit disabled v-model="form.stock_num">
                 </el-input>
             </el-form-item>
-            <el-form-item label="售卖价格:" label-width="100px">
+            <el-form-item label="售卖价格:" label-width="100px" required>
                 <el-input placeholder="请输入" maxlength="9" show-word-limit disabled v-model="form.sale_price">
                 </el-input>
             </el-form-item>
-            <el-form-item label="市场价格:" label-width="100px">
+            <el-form-item label="市场价格:" label-width="100px" required>
                 <el-input placeholder="请输入" maxlength="9" show-word-limit disabled v-model="form.market_price">
                 </el-input>
             </el-form-item>
-            <el-form-item class="single" label="小程序链接:" label-width="100px">
+            <el-form-item class="single" label="小程序链接:" label-width="100px" required>
                 <el-input class="pr-50" placeholder="请输入" v-model="form.path" disabled maxlength="100" show-word-limit>
                 </el-input>
             </el-form-item>
@@ -66,7 +66,7 @@
                 <el-input placeholder="请输入" disabled maxlength="25" v-model="form.third">
                 </el-input>
             </el-form-item>
-            <el-form-item class="single" label="商品图片:" label-width="100px">
+            <el-form-item class="single" label="商品图片:" label-width="100px" required>
                 <upload v-if="updatePic" acceptType='.jpg, .jpeg, .png' ref="upload_goods" :file="goodsList" limitNum="1" :disabled="true"></upload>
             </el-form-item>
             <el-form-item class="single" label="商品类目图片:" label-width="100px">

src/pages/qualification/addCategory/index.vue

@@ -125,8 +125,9 @@
                         this.loading = true
                         add(params).then(() => {
                             this.$message.success('添加成功');
-                            store.commit('REMOVETAB', '类目申请')
+                            store.commit('SET_TABINDEX', 0)
                             this.$router.push('/qualification')
+                            store.commit('REMOVETAB', '类目申请')
                         }).catch(() => {
                             this.loading = false
                         });

src/pages/qualification/categoryDetail/index.vue

@@ -193,6 +193,7 @@
                     this.form.level3 = res.data.level3
                     this.form.level3_name = res.data.level3_name
                     this.category_info_id = res.data.category_info_id
+                    this.form.remark=res.data.remark
                     this.licenseImgs = []
                     if (res.data.licenseImgs ?.length > 0) {
                         res.data.licenseImgs.forEach(element => {

src/store/modules/user.js

@@ -52,7 +52,9 @@ const mutations = {
   REMOVETAB(state,tabname){
     state.tabList.forEach((element,index) => {
       if(element.name==tabname){
-        state.tabIndex--
+        if(state.tabIndex!=0){
+          state.tabIndex--
+        }
         state.tabList.splice(index,1)
       }
     });