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