12/30

src/app.less

@@ -13,8 +13,6 @@ html, body {
         height: 100%;
         .app-content-main {
           width: calc(100vw - 70px);
-          display: flex;
-          flex-direction: column;
           overflow-y: auto;
           -webkit-overflow-scrolling: touch;
           background: #F6F8F9;

src/components/upload.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <div class="flex">
-      <div v-if="acceptType =='.jpg, .jpeg, .png'" class="flex">
+    <div class="uploaddiv">
+      <div v-if="acceptType =='.jpg, .jpeg, .png'" class="filelistdiv">
         <div v-for="(item, index) in fileList" :key="index" class="file-list">
           <img :src="item.url" />
           <div class="mask">
@@ -9,15 +9,16 @@
             <i class="el-icon-delete" v-if="!disabled" @click="del(index)"></i>
           </div>
         </div>
+        <el-upload v-if="fileList.length<limitNum&&(!disabled)" class="avatar-uploader" list-type="picture-card" :action="action" :on-remove="handleRemove"
+          :accept="acceptType" :headers="myHeaders" :multiple="limitNum == 1?false:true" :limit='limitNum'
+          :on-exceed="handleExceed" :on-change='handleChangeUpload' :on-success="handleSuccess" :before-upload="beforeUpload"
+          :on-preview="handlePictureCardPreview" :file-list="fileList"
+          :show-file-list="false" :disabled="disabled" :auto-upload="autoUpload">
+          <i class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
+
       </div>
 
-      <el-upload v-if="!disabled" class="avatar-uploader" list-type="picture-card" :action="action" :on-remove="handleRemove"
-        :accept="acceptType" :headers="myHeaders" :multiple="limitNum == 1?false:true" :limit='limitNum'
-        :on-exceed="handleExceed" :on-change='handleChangeUpload' :on-success="handleSuccess"
-        :on-preview="handlePictureCardPreview" :file-list="fileList"
-        :show-file-list="acceptType =='.jpg, .jpeg, .png'?false:true" :disabled="disabled" :auto-upload="autoUpload">
-        <i class="el-icon-plus avatar-uploader-icon"></i>
-      </el-upload>
     </div>
     <span class="tip" v-if="warning">{{warning}}</span>
     <el-dialog title="查看" :visible.sync="dialogVisible" width="500px" :close-on-click-modal="false">
@@ -113,6 +114,21 @@
       handleRemove(file, fileList) {
         this.fileList = fileList;
       },
+      beforeUpload(file){
+        let isAllow;
+        console.log(file.size / 1024 / 1024);
+        if(!(file.type == 'image/jpeg' || file.type == 'image/png') && this.acceptType =='.jpg, .jpeg, .png') {
+          this.$message.closeAll();
+          this.$message.error('只能上传jpg/png文件!');
+          isAllow = false;
+        }
+        if ((file.size / 1024 / 1024) > 2) {
+          this.$message.closeAll();
+          this.$message.warning('上传的文件大小不能超过2M！');
+          isAllow = false;
+        }
+        return isAllow;
+      },
       // 上传超过限制
       handleExceed(files, fileList) {
         if (fileList.length >= this.limitNum) {
@@ -135,8 +151,21 @@
   };
 </script>
 <style lang="less" scoped>
+  .uploaddiv{
+    display: flex;
+    width: 100%;
+    flex-wrap: wrap;
+    .filelistdiv{
+      display: flex;
+      flex-wrap: wrap;
+      .avatar-uploader{
+        margin-top: 5px;
+      }
+    }
+  }
   .file-list {
     margin-right: 5px;
+    margin-top: 5px;
     position: relative;
     width: 150px;
     height: 150px;
@@ -171,7 +200,6 @@
         margin: 0 10px;
       }
     }
-
     img {
       max-width: 150px;
       max-height: 150px;

src/pages/brand/addBrand/index.vue

@@ -31,14 +31,14 @@
                         <el-option label="否" value="2"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="商标/品牌词:" prop="trademark_registrant">
-                    <el-input placeholder="请输入" v-model="form.trademark_registrant" maxlength="25">
+                <el-form-item label="商标/品牌词:" prop="brand_wording">
+                    <el-input placeholder="请输入" v-model="form.brand_wording" 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-form-item label="商标注册人姓名:" label-width="140px">
+                    <el-input placeholder="请输入" v-model="form.trademark_registrant" maxlength="25">
                     </el-input>
-                </el-form-item> -->
+                </el-form-item>
                 <el-form-item label="商标注册号/申请号:" prop="trademark_registrant_nu">
                     <el-input placeholder="请输入" v-model="form.trademark_registrant_nu" maxlength="25">
                     </el-input>
@@ -127,7 +127,8 @@
                     trademark_authorization_period: '',
                     trademark_applicant: '',
                     trademark_application_time: '',
-                    remark: ''
+                    remark: '',
+                    brand_wording:'',
                 },
                 loading: false,
                 rules: {
@@ -161,6 +162,12 @@
                         message: '请输入必填项',
                         trigger: 'blur'
                     }],
+                    brand_wording: [{
+                        required: true,
+                        message: '请输入必填项',
+                        trigger: 'blur'
+                    }],
+
                 },
             };
         },
@@ -222,7 +229,8 @@
                             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
+                            trademark_type: this.form.trademark_type,
+                            brand_wording:this.form.brand_wording
                         }
                         this.loading = true
                         add(params).then(() => {
@@ -232,7 +240,6 @@
                         }).catch(() => {
                             this.loading = false
                         });
-
                     }
                 })
             },
@@ -250,7 +257,8 @@
                         trademark_authorization_period: '',
                         trademark_applicant: '',
                         trademark_application_time: '',
-                        remark: ''
+                        remark: '',
+                        brand_wording:''
                     }
                     this.org_code_certificateList = []
                     this.authorizationList = [],

src/pages/brand/brandDetail/index.vue

@@ -40,15 +40,15 @@
                         <el-option label="否" value="2"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="商标/品牌词:" prop="trademark_registrant">
-                    <el-input placeholder="请输入" v-model="form.trademark_registrant" :disabled="isdisable"
+                <el-form-item label="商标/品牌词:" prop="brand_wording">
+                    <el-input placeholder="请输入" v-model="form.brand_wording" :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-form-item label="商标注册人姓名:" label-width="140px">
+                    <el-input placeholder="请输入" :disabled="isdisable" v-model="form.trademark_registrant" maxlength="25">
                     </el-input>
-                </el-form-item> -->
+                </el-form-item>
                 <el-form-item label="商标注册号/申请号:" prop="trademark_registrant_nu">
                     <el-input placeholder="请输入" v-model="form.trademark_registrant_nu" :disabled="isdisable"
                         maxlength="25">
@@ -112,7 +112,7 @@
     import upload from '@/components/upload'
     import showtable from '../components/showtable.vue'
     import {
-        add,
+        edit,
         detail
     } from '@/api/brand'
     export default {
@@ -145,7 +145,8 @@
                     trademark_authorization_period: '',
                     trademark_applicant: '',
                     trademark_application_time: '',
-                    remark: ''
+                    remark: '',
+                    brand_wording:''
                 },
                 loading: false,
                 rules: {
@@ -179,6 +180,11 @@
                         message: '请输入必填项',
                         trigger: 'blur'
                     }],
+                    brand_wording: [{
+                        required: true,
+                        message: '请输入必填项',
+                        trigger: 'blur'
+                    }],
                 },
             };
         },
@@ -240,10 +246,11 @@
                             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
+                            trademark_type: this.form.trademark_type,
+                            brand_wording:this.form.brand_wording
                         }
                         this.loading = true
-                        add(params).then(() => {
+                        edit(params).then(() => {
                             this.$message.success('申请成功');
                             store.commit('REMOVETAB', '品牌申请')
                             this.$router.go(-1)
@@ -254,6 +261,7 @@
                 })
             },
             getDetail() {
+                this.isdisable = false
                 detail({
                     brandInfoId: this.brand_info_id
                 }).then(res => {
@@ -274,6 +282,7 @@
                     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.form.brand_wording=res.data.brand_wording
                     this.authorizationList = res.data.imgMap.authorization
                     this.registration_certificateList = res.data.imgMap.registration_certificate
                     this.change_certificateList = res.data.imgMap.change_certificate
@@ -288,7 +297,6 @@
             },
             initPage() {
                 this.loading = false
-                this.isDisable = false
                 this.$refs.form.clearValidate()
                 if (this.$route.params.brand_info_id) {
                     this.brand_info_id = this.$route.params.brand_info_id

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" type='number' v-model="form.out_product_id" oninput="if(value.length>10)value=value.slice(0,10)">
+                <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>
             </el-form-item>
             <el-form-item label="品牌:" label-width="120px" prop="brand_id">
@@ -32,12 +32,12 @@
                 </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>8)value=value.slice(0,8)"
+                <el-input placeholder="请输入" :disabled="isdisable" type='number' oninput="if(value.length>9)value=value.slice(0,9)"
                     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>8)value=value.slice(0,8)"
+                <el-input placeholder="请输入" :disabled="isdisable" type='number' oninput="if(value.length>9)value=value.slice(0,9)"
                     v-model="form.market_price">
                 </el-input>
             </el-form-item>
@@ -94,6 +94,7 @@
         data() {
             return {
                 title:'新增商品',
+                outproductidDisable:false,
                 categoryList: [],
                 brandList: [],
                 goodsList: [],
@@ -144,12 +145,12 @@
                     }],
                     sale_price: [{
                         required: true,
-                        validator: validnumber,
+                        validator: validPrice,
                         trigger: 'blur'
                     }],
                     market_price: [{
                         required: true,
-                        validator: validnumber,
+                        validator: validPrice,
                         trigger: 'blur'
                     }],
                     path: [{
@@ -260,7 +261,6 @@
             },
             initPage() {
                 this.loading = false
-                this.isdisable = false
                 this.$refs.form.clearValidate()
                 if (this.$route.params.outProductId) { //新增获取详情
                     this.outProductId = this.$route.params.outProductId
@@ -273,7 +273,11 @@
                 }
                 if (this.$route.params.isNew) { //新增清空
                     this.title='新增商品'
+                    this.isdisable = false
+                    this.outproductidDisable=false
                     if(this.$route.params.data){
+                        this.title='新的审核内容'
+                        this.outproductidDisable=true
                         let data=JSON.parse(this.$route.params.data)
                         this.outProductId=data.out_product_id
                         this.form.title=data.title

src/pages/goods/index.vue

@@ -110,8 +110,12 @@
         if (pageRequest) {
           this.searchForm.page = pageRequest.pageIndex;
           this.searchForm.pageSize = pageRequest.pageSize;
-          this.searchForm.sortField = pageRequest.sort;
-          this.searchForm.sortOrder = pageRequest.order
+          this.searchForm.sortField=''
+          this.searchForm.sortOrder =''
+          if(pageRequest.order){
+              this.searchForm.sortField = pageRequest.sort;
+              this.searchForm.sortOrder = pageRequest.order
+          }
         }
         list(this.searchForm).then(res => {
           this.searchForm.total = res.data.totalCount

src/pages/qualification/categoryDetail/index.vue

@@ -164,6 +164,8 @@
                 }
             },
             getDetail() {
+                this.isDisable = false
+                this.isSuccessEdit = true
                 detail({
                     categoryInfoId: this.category_info_id
                 }).then(res => {
@@ -224,8 +226,6 @@
             },
             initPage() {
                 this.loading = false
-                this.isDisable = false
-                this.isSuccessEdit = true
                 this.$refs.form.clearValidate()
                 if (this.$route.params.category_info_id) {
                     this.category_info_id = this.$route.params.category_info_id

src/utils/validate.js

@@ -28,10 +28,10 @@ export function validnumber(rule, value, callback) {
   } else {
     const reg = (/^[+]{0,1}(\d+)$/)
     if ((!reg.test(value)) && value !== '') {
-      callback(new Error('只能是正整数'))
+      callback(new Error('请输入正整数'))
     } else {
       if(Number.parseInt(value)==0){
-        callback(new Error('请输入大于0整数'))
+        callback(new Error('请输入正整数，0不是正整数'))
       }else{
         callback()
       }