商标注册

src/main/vue/src/main.js

@@ -19,6 +19,7 @@ import Divider from '@/components/Divider';
 import 'normalize.css/normalize.css';
 import './styles/element_theme/index.css';
 import theme from '!less-vars-loader!./styles/common/theme.less';
+import AttachmentUpload from '@/components/AttachmentUpload';
 // import VueAMap from "vue-amap";
 // Vue.use(VueAMap);
 // VueAMap.initAMapApiLoader({
@@ -44,6 +45,7 @@ Vue.config.productionTip = false;
 Vue.use(ElementUI, { size: 'small' });
 Vue.use(http);
 Vue.use(dataExport);
+Vue.component('attachment-upload', AttachmentUpload);
 Vue.component('sortable-header', SortableHeader);
 Vue.component('multi-upload', MultiUpload);
 Vue.component('single-upload', SingleUpload);

src/main/vue/src/styles/element_theme/index.css

@@ -7864,8 +7864,9 @@
 }
 .el-upload__tip {
     font-size: 12px;
-    color: #606266;
-    margin-top: 7px;
+    color: #C8C9CC;
+    margin-top: 8px;
+    line-height: 22px;
 }
 .el-upload iframe {
     position: absolute;

src/main/vue/src/views/LogoPatentAdd.vue

@@ -33,7 +33,11 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="商标查询报告书"> </el-form-item>
+                    <el-form-item label="商标查询报告书">
+                        <attachment-upload v-model="attachment">
+                            格式要求jpg/png/pdf/word，文件大小不超过5M
+                        </attachment-upload>
+                    </el-form-item>
                     <el-form-item class="form-submit">
                         <el-button @click="onSave" :loading="saving" size="default" type="primary">保存 </el-button>
                         <el-button @click="$router.go(-1)" size="default">取消</el-button>
@@ -59,7 +63,7 @@ export default {
                 });
         }
         this.$http
-            .post('/partner/all', { size: 1000, query: { del: false } }, { body: 'json' })
+            .post('/partner/all', { size: 1000, query: { del: false, type: 'CLIENT' } }, { body: 'json' })
             .then(res => {
                 if (res.content.length > 0) {
                     res.content.forEach(item => {
@@ -74,27 +78,17 @@ export default {
                 console.log(e);
                 this.$message.error(e.error);
             });
-        this.$http
-            .post('/partner/all', { size: 1000, query: { del: false } }, { body: 'json' })
-            .then(res => {
-                if (res.content.length > 0) {
-                    res.content.forEach(item => {
-                        this.supplierPartnerIdOptions.push({
-                            label: item.name,
-                            value: item.id
-                        });
-                    });
-                }
-            })
-            .catch(e => {
-                console.log(e);
-                this.$message.error(e.error);
-            });
     },
     data() {
         return {
             saving: false,
             formData: {},
+            attachment: {
+                attachmentName: '商标查询报告书',
+                fileName: '',
+                url: '',
+                remark: ''
+            },
             rules: {
                 name: { required: true, message: '请输入注册的商标名', trigger: 'blur' }
             },
@@ -139,6 +133,7 @@ export default {
 
             data.userId = this.$store.state.userInfo.id;
             data.applyStatus = 'APPLY_STAGE';
+            data.attachments = [{ ...this.attachment }];
 
             this.saving = true;
             this.$http