zhaolf 3 years ago
parent
commit
959260dbc3

+ 5 - 0
src/app.less

@@ -95,6 +95,11 @@ html, body {
         padding-right: 50px;
     }
 }
+.pr-30{
+  .el-input__inner{
+      padding-right: 30px;
+  }
+}
 .el-dialog{
     margin-top: 0!important;
     position: absolute!important;

+ 11 - 11
src/pages/brand/addBrand/index.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="wrapper">
         <div class="left">
-            <div class="title">资质申请</div>
+            <div class="title">品牌申请</div>
             <el-form size="small" class="form" ref="form" :model="form" label-width="140px" :rules="rules">
                 <el-form-item label="认证审核类型:" prop="brand_audit_type">
                     <el-select v-model="form.brand_audit_type" placeholder="请选择" :disabled="isdisable" clearable
@@ -13,7 +13,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="商标分类:" label-width="100px" prop="trademark_type">
-                    <el-input placeholder="请输入" v-model="form.trademark_type" type='number' maxlength="25">
+                    <el-input class="pr-50" placeholder="请输入" v-model="form.trademark_type" maxlength="9" show-word-limit>
                     </el-input>
                 </el-form-item>
                 <el-form-item label="选择品牌经营类型:" prop="brand_management_type">
@@ -32,15 +32,15 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="商标/品牌词:" prop="brand_wording">
-                    <el-input placeholder="请输入" v-model="form.brand_wording" maxlength="25">
+                    <el-input placeholder="请输入" class="pr-50"  v-model="form.brand_wording" maxlength="15" show-word-limit>
                     </el-input>
                 </el-form-item>
                 <el-form-item label="商标注册人姓名:" label-width="140px">
-                    <el-input placeholder="请输入" v-model="form.trademark_registrant" maxlength="25">
+                    <el-input placeholder="请输入" class="pr-50"  v-model="form.trademark_registrant" maxlength="10" show-word-limit>
                     </el-input>
                 </el-form-item>
                 <el-form-item label="商标注册号/申请号:" prop="trademark_registrant_nu">
-                    <el-input placeholder="请输入" v-model="form.trademark_registrant_nu" maxlength="25">
+                    <el-input placeholder="请输入" class="pr-50"  v-model="form.trademark_registrant_nu" maxlength="35" show-word-limit>
                     </el-input>
                 </el-form-item>
                 <el-form-item label="商标有效期:">
@@ -48,7 +48,7 @@
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item label="商标申请人姓名:">
-                    <el-input placeholder="请输入" v-model="form.trademark_applicant" maxlength="25">
+                    <el-input placeholder="请输入" class="pr-50"  v-model="form.trademark_applicant" maxlength="10" show-word-limit>
                     </el-input>
                 </el-form-item>
                 <el-form-item label="商标申请时间:">
@@ -74,7 +74,7 @@
                     <upload v-if="updatePic" acceptType='.jpg, .jpeg, .png' :file="goods_formList" limitNum="10"></upload>
                 </el-form-item>
                 <el-form-item class="single" label="备注:">
-                    <el-input placeholder="请输入" v-model="form.remark" maxlength="25">
+                    <el-input placeholder="请输入" class="pr-50" v-model="form.remark" maxlength="25" show-word-limit>
                     </el-input>
                 </el-form-item>
                 <el-form-item class="commit">
@@ -84,7 +84,7 @@
             </el-form>
         </div>
         <div class="table">
-            <div class="title">资质申请</div>
+            <div class="title">品牌申请要求</div>
             <showtable class="showtable"></showtable>
         </div>
     </div>
@@ -222,9 +222,9 @@
                             })
                         });
                         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,
+                            brand_audit_type:Number.parseInt(this.form.brand_audit_type),
+                            brand_management_type: Number.parseInt(this.form.brand_management_type),
+                            commodity_origin_type: Number.parseInt(this.form.commodity_origin_type),
                             imgDtoList: imgDtoList,
                             remark: this.form.remark,
                             trademark_applicant: this.form.trademark_applicant,

+ 19 - 18
src/pages/brand/brandDetail/index.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="wrapper">
         <div class="left">
-            <div class="title">资质申请</div>
+            <div class="title">品牌申请</div>
             <div class="status">
                 <div class="line">
                     <div class="label">申请状态:</div><span :class="status==9?'statustext':''">{{statusName}}</span>
@@ -22,7 +22,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="商标分类:" label-width="100px" prop="trademark_type">
-                    <el-input placeholder="请输入" v-model="form.trademark_type" :disabled="isdisable" maxlength="25">
+                    <el-input placeholder="请输入" class="pr-50" v-model="form.trademark_type" :disabled="isdisable" maxlength="9">
                     </el-input>
                 </el-form-item>
                 <el-form-item label="选择品牌经营类型:" prop="brand_management_type">
@@ -41,17 +41,17 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="商标/品牌词:" prop="brand_wording">
-                    <el-input placeholder="请输入" v-model="form.brand_wording" :disabled="isdisable"
-                        maxlength="25">
+                    <el-input placeholder="请输入" class="pr-50" v-model="form.brand_wording" :disabled="isdisable"
+                        maxlength="15" show-word-limit>
                     </el-input>
                 </el-form-item>
                 <el-form-item label="商标注册人姓名:" label-width="140px">
-                    <el-input placeholder="请输入" :disabled="isdisable" v-model="form.trademark_registrant" maxlength="25">
+                    <el-input placeholder="请输入" class="pr-50" :disabled="isdisable" v-model="form.trademark_registrant" maxlength="10" show-word-limit>
                     </el-input>
                 </el-form-item>
                 <el-form-item label="商标注册号/申请号:" prop="trademark_registrant_nu">
-                    <el-input placeholder="请输入" v-model="form.trademark_registrant_nu" :disabled="isdisable"
-                        maxlength="25">
+                    <el-input placeholder="请输入" class="pr-50" v-model="form.trademark_registrant_nu" :disabled="isdisable"
+                        maxlength="35" show-word-limit>
                     </el-input>
                 </el-form-item>
                 <el-form-item label="商标有效期:">
@@ -60,7 +60,7 @@
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item label="商标申请人姓名:">
-                    <el-input placeholder="请输入" v-model="form.trademark_applicant" :disabled="isdisable" maxlength="25">
+                    <el-input placeholder="请输入" class="pr-50" v-model="form.trademark_applicant" :disabled="isdisable" maxlength="10" show-word-limit>
                     </el-input>
                 </el-form-item>
                 <el-form-item label="商标申请时间:">
@@ -68,11 +68,11 @@
                         placeholder="选择日期">
                     </el-date-picker>
                 </el-form-item>
-                <el-form-item class="single" label="营业执照或组织机构代码证:">
+                <el-form-item class="single" label="营业执照或组织机构代码证:" required>
                     <upload v-if="updatePic" acceptType='.jpg, .jpeg, .png' :file="org_code_certificateList" :disabled="isdisable" limitNum="10">
                     </upload>
                 </el-form-item>
-                <el-form-item class="single" label="销售授权书(如商持人为自然人,还需提供:">
+                <el-form-item class="single" label="销售授权书(如商持人为自然人,还需提供有其签名的身份证正反面扫描件:">
                     <upload v-if="updatePic" acceptType='.jpg, .jpeg, .png' :file="authorizationList" :disabled="isdisable" limitNum="10"></upload>
                 </el-form-item>
                 <el-form-item class="single" label="商标注册证书:">
@@ -91,7 +91,7 @@
                     <upload v-if="updatePic" acceptType='.jpg, .jpeg, .png' :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 placeholder="请输入" class="pr-50" :disabled="isdisable" v-model="form.remark" maxlength="25" show-word-limit>
                     </el-input>
                 </el-form-item>
                 <el-form-item class="commit" v-if="status!=0&&status!=1">
@@ -101,7 +101,7 @@
             </el-form>
         </div>
         <div class="table">
-            <div class="title">资质申请</div>
+            <div class="title">品牌申请要求</div>
             <showtable class="showtable"></showtable>
         </div>
     </div>
@@ -236,10 +236,10 @@
                             })
                         });
                         let params = {
-                            brand_audit_type: this.form.brand_audit_type,
+                            brand_audit_type: Number.parseInt(this.form.brand_audit_type),
                             brand_info_id:this.brand_info_id,
-                            brand_management_type: this.form.brand_management_type,
-                            commodity_origin_type: this.form.commodity_origin_type,
+                            brand_management_type: Number.parseInt(this.form.brand_management_type),
+                            commodity_origin_type: Number.parseInt(this.form.commodity_origin_type),
                             imgDtoList: imgDtoList,
                             remark: this.form.remark,
                             trademark_applicant: this.form.trademark_applicant,
@@ -272,9 +272,9 @@
                     }
                     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.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
@@ -379,6 +379,7 @@
 
                 .reason {
                     width: 80%;
+                    word-wrap: break-word;
                 }
 
                 .statustext {

+ 2 - 2
src/pages/brand/index.vue

@@ -35,11 +35,11 @@
         },
         tableHeadConfig: [{
             label: '申请品牌',
-            prop: 'trademark_registrant',
+            prop: 'brand_wording',
             isShow: true,
           },
           {
-            label: '商标类',
+            label: '商标类',
             prop: 'trademark_type',
             isShow: true,
           },

+ 6 - 5
src/pages/goods/addGoods/index.vue

@@ -16,7 +16,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="商品ID:" label-width="100px" prop="out_product_id">
-                <el-input placeholder="请输入" :disabled="isdisable||outproductidDisable" type='number' v-model="form.out_product_id" oninput="if(value.length>10)value=value.slice(0,10)">
+                <el-input placeholder="请输入" :disabled="isdisable||outproductidDisable" v-model="form.out_product_id" maxlength="9" show-word-limit>
                 </el-input>
             </el-form-item>
             <el-form-item label="品牌:" label-width="120px" prop="brand_id">
@@ -28,21 +28,21 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="商品库存:" label-width="100px" prop="stock_num">
-                <el-input placeholder="请输入" :disabled="isdisable" type='number' oninput="if(value.length>6)value=value.slice(0,6)" v-model="form.stock_num">
+                <el-input placeholder="请输入" :disabled="isdisable" v-model="form.stock_num" maxlength="6" show-word-limit>
                 </el-input>
             </el-form-item>
             <el-form-item label="售卖价格:" label-width="120px" prop="sale_price">
-                <el-input placeholder="请输入" :disabled="isdisable" type='number' oninput="if(value.length>9)value=value.slice(0,9)"
+                <el-input placeholder="请输入" :disabled="isdisable" maxlength="9" show-word-limit
                     v-model="form.sale_price">
                 </el-input>
             </el-form-item>
             <el-form-item label="市场价格:" label-width="120px" prop="market_price">
-                <el-input placeholder="请输入" :disabled="isdisable" type='number' oninput="if(value.length>9)value=value.slice(0,9)"
+                <el-input placeholder="请输入" :disabled="isdisable" maxlength="9" show-word-limit
                     v-model="form.market_price">
                 </el-input>
             </el-form-item>
             <el-form-item class="single" label="小程序链接:" label-width="120px" prop="path">
-                <el-input class="pr-50" :disabled="isdisable" placeholder="请输入" v-model="form.path" maxlength="100">
+                <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"
@@ -265,6 +265,7 @@
                 if (this.$route.params.outProductId) { //新增获取详情
                     this.outProductId = this.$route.params.outProductId
                     this.title='修改商品'
+                    this.isdisable = false
                     this.getDetail()
                     if (this.$route.params.isDisable) {
                         this.title='商品详情'

+ 6 - 13
src/pages/goods/goodsDetail/index.vue

@@ -35,7 +35,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="商品ID:" label-width="100px">
-                <el-input placeholder="请输入" v-model="form.out_product_id" disabled maxlength="25">
+                <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">
@@ -47,27 +47,19 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="商品库存:" label-width="100px">
-                <el-input placeholder="请输入" type='number' maxlength="25" disabled v-model="form.stock_num">
+                <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-input placeholder="请输入" type='number' maxlength="25" disabled v-model="form.sale_price">
+                <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-input placeholder="请输入" type='number' maxlength="25" disabled v-model="form.market_price">
+                <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-input class="pr-50" placeholder="请输入" v-model="form.path" disabled maxlength="100">
-                </el-input>
-            </el-form-item>
-            <el-form-item label="一级类目:" v-if="false" label-width="100px">
-                <el-input placeholder="请输入" disabled maxlength="25">
-                </el-input>
-            </el-form-item>
-            <el-form-item label="二级类目:" v-if="false" label-width="100px">
-                <el-input placeholder="请输入" disabled maxlength="25">
+                <el-input class="pr-50" placeholder="请输入" v-model="form.path" disabled maxlength="100" show-word-limit>
                 </el-input>
             </el-form-item>
             <el-form-item label="三级类目:" v-if="form.third_cat_id=='-1'" label-width="100px">
@@ -260,6 +252,7 @@
 
             .reason {
                 width: 80%;
+                word-wrap: break-word;
             }
 
             .statustext {

+ 5 - 5
src/pages/qualification/addCategory/index.vue

@@ -3,19 +3,19 @@
         <div class="title">资质申请</div>
         <el-form class="form" ref="form" :model="form" label-width="200px" :rules="rules">
             <el-form-item label="一级类目:" prop="level1">
-                <el-input placeholder="请输入" type='number' oninput="if(value.length>9)value=value.slice(0,9)" v-model="form.level1" maxlength="15">
+                <el-input placeholder="请输入" v-model="form.level1" maxlength="9" show-word-limit>
                 </el-input>
             </el-form-item>
             <el-form-item label="二级类目:" label-width="100px" prop="level2">
-                <el-input placeholder="请输入" type='number' oninput="if(value.length>9)value=value.slice(0,9)" v-model="form.level2" maxlength="15">
+                <el-input placeholder="请输入" maxlength="9" show-word-limit v-model="form.level2">
                 </el-input>
             </el-form-item>
             <el-form-item label="三级类目:" prop="level3">
-                <el-input placeholder="请输入" type='number' oninput="if(value.length>9)value=value.slice(0,9)" v-model="form.level3" maxlength="15">
+                <el-input placeholder="请输入" v-model="form.level3" maxlength="9" show-word-limit>
                 </el-input>
             </el-form-item>
             <el-form-item label="三级类目名称:" label-width="120px" prop="level3_name">
-                <el-input placeholder="请输入" v-model="form.level3_name" maxlength="15">
+                <el-input placeholder="请输入" v-model="form.level3_name" maxlength="15" show-word-limit>
                 </el-input>
             </el-form-item>
             <el-form-item class="single" label="营业执照或组织机构代码证:" required>
@@ -25,7 +25,7 @@
                 <upload v-if="updatePic" acceptType='.jpg, .jpeg, .png' ref="upload_zizhi" :file="certificateImgs" limitNum="10"></upload>
             </el-form-item>
             <el-form-item class="single" label="备注:">
-                <el-input placeholder="请输入" v-model="form.remark" maxlength="25">
+                <el-input placeholder="请输入" v-model="form.remark" maxlength="25" show-word-limit>
                 </el-input>
             </el-form-item>
             <el-form-item class="commit">

+ 6 - 5
src/pages/qualification/categoryDetail/index.vue

@@ -12,20 +12,20 @@
         <el-divider></el-divider>
         <el-form class="form" ref="form" :model="form" label-width="200px" :rules="rules">
             <el-form-item label="一级类目:" prop="level1">
-                <el-input placeholder="请输入" type='number' :disabled="isDisable" v-model="form.level1" maxlength="25">
+                <el-input placeholder="请输入"  :disabled="isDisable" v-model="form.level1" maxlength="9" show-word-limit>
                 </el-input>
             </el-form-item>
             <el-form-item label="二级类目:" label-width="100px" prop="level2">
-                <el-input placeholder="请输入" type='number' :disabled="isDisable" v-model="form.level2" maxlength="25">
+                <el-input placeholder="请输入"  :disabled="isDisable" v-model="form.level2" maxlength="9" show-word-limit>
                 </el-input>
             </el-form-item>
             <el-form-item label="三级类目:" prop="level3">
-                <el-input placeholder="请输入" type='number' :disabled="isDisable" v-model="form.level3" maxlength="25">
+                <el-input placeholder="请输入" :disabled="isDisable" v-model="form.level3" maxlength="9" show-word-limit>
                 </el-input>
             </el-form-item>
             <el-form-item label="三级类目名称:" label-width="100px">
                 <el-input placeholder="请输入" :disabled="isDisable&&isSuccessEdit" v-model="form.level3_name"
-                    maxlength="25">
+                    maxlength="25" show-word-limit>
                 </el-input>
             </el-form-item>
             <el-form-item class="single" label="营业执照或组织机构代码证:" required>
@@ -37,7 +37,7 @@
                 </upload>
             </el-form-item>
             <el-form-item class="single" label="备注:">
-                <el-input placeholder="请输入" :disabled="isDisable&&isSuccessEdit" v-model="form.remark" maxlength="25">
+                <el-input placeholder="请输入" :disabled="isDisable&&isSuccessEdit" v-model="form.remark" maxlength="25" show-word-limit>
                 </el-input>
             </el-form-item>
             <el-form-item class="commit" v-if="status!=0">
@@ -282,6 +282,7 @@
 
             .reason {
                 width: 80%;
+                word-wrap: break-word;
             }
 
             .statustext {