复审

src/main/vue/src/components/logoPatent/Dismiss.vue

@@ -8,8 +8,8 @@
             label-width="120px"
             style="padding-right: 120px;"
         >
-            <el-form-item label="是否复审" prop="reviewRequire">
-                <el-radio-group v-model="form.reviewRequire">
+            <el-form-item label="是否复审" prop="rehear">
+                <el-radio-group v-model="form.rehear">
                     <el-radio :label="true">
                         是
                     </el-radio>
@@ -17,8 +17,11 @@
                         否
                     </el-radio>
                 </el-radio-group>
+                <div class="el-form-tips" v-if="!form.rehear && info.rejectAll">
+                    注：商标全部驳回，选择不再复审，则此商标注册终止
+                </div>
             </el-form-item>
-            <el-form-item label="缴费通知书" prop="attachment1" v-if="form.reviewRequire">
+            <el-form-item label="缴费通知书" prop="attachment1" v-if="!form.rehear && !info.rejectAll">
                 <div slot="label" style="line-height: 22px;">
                     <div>初步审定公告</div>
                     <div>通知书</div>
@@ -27,32 +30,17 @@
                     v-model="form.attachment1"
                     :fileSize.sync="form.attachment1.size"
                 ></attachment-upload>
+
+                <div class="el-form-tips">注：商标部分驳回，选择不再复审，则驳回部分终止，其他部分生效</div>
             </el-form-item>
-            <template v-else>
-                <el-form-item label="是否全部驳回" prop="rejectAll">
-                    <el-radio-group v-model="form.rejectAll">
-                        <el-radio :label="true">
-                            全部驳回
-                        </el-radio>
-                        <el-radio :label="false">
-                            部分驳回
-                        </el-radio>
-                    </el-radio-group>
-                </el-form-item>
-                <el-form-item label="驳回建议" prop="rejectContent">
-                    <el-input v-model="form.rejectContent" placeholder="请输入" clearable></el-input>
-                </el-form-item>
-                <el-form-item label="商标驳回通知书" prop="attachment2" v-if="form.rejectAll">
+            <template v-else-if="form.rehear">
+                <el-form-item label="复审合同" prop="attachment2">
                     <attachment-upload
                         v-model="form.attachment2"
                         :fileSize.sync="form.attachment2.size"
                     ></attachment-upload>
                 </el-form-item>
-                <el-form-item prop="attachment3" v-else>
-                    <div slot="label" style="line-height: 22px;">
-                        <div>商标部分驳回</div>
-                        <div>通知书</div>
-                    </div>
+                <el-form-item prop="attachment3" label="收款回执">
                     <attachment-upload
                         v-model="form.attachment3"
                         :fileSize.sync="form.attachment3.size"
@@ -77,10 +65,10 @@ export default {
     data() {
         return {
             form: {
-                reviewRequire: true,
+                rehear: true,
                 attachment1: { attachmentName: '初步审定公告通知书', fileName: '', url: '', remark: '', size: '' },
-                attachment2: { attachmentName: '商标驳回通知书', fileName: '', url: '', remark: '', size: '' },
-                attachment3: { attachmentName: '商标部分驳回通知书', fileName: '', url: '', remark: '', size: '' },
+                attachment2: { attachmentName: '复审合同', fileName: '', url: '', remark: '', size: '' },
+                attachment3: { attachmentName: '收款回执', fileName: '', url: '', remark: '', size: '' },
                 rejectAll: true
             },
             show: false,
@@ -98,18 +86,17 @@ export default {
                 attachment2: {
                     validator: (rule, value, callback) => {
                         if (!value.url) {
-                            callback(new Error('请上传商标驳回通知书'));
+                            callback(new Error('请上传复审合同'));
                         } else {
                             callback();
                         }
                     },
                     trigger: 'change'
                 },
-                rejectContent: { required: true, message: '请输入驳回建议', trigger: 'blur' },
                 attachment3: {
                     validator: (rule, value, callback) => {
                         if (!value.url) {
-                            callback(new Error('请上传商标部分驳回通知书'));
+                            callback(new Error('请上传收款回执'));
                         } else {
                             callback();
                         }
@@ -132,11 +119,15 @@ export default {
         submit() {
             let info = { ...this.info };
 
-            info.reviewRequire = this.form.reviewRequire;
+            info.rehear = this.form.rehear;
 
-            if (info.reviewRequire) {
-                this.$emit('uploadAttement', this.form.attachment1);
-                info.logoWorkflow = 'ANNOUNCEMENTS'; //待缴费
+            if (!info.rehear) {
+                if (this.info.rejectAll) {
+                    info.logoWorkflow = 'NO_REVIEW';
+                } else {
+                    info.logoWorkflow = 'ANNOUNCEMENTS';
+                    this.$emit('uploadAttement', this.form.attachment1);
+                }
             } else {
                 info.rejectAll = this.form.rejectAll;
                 if (info.rejectAll) {
@@ -145,7 +136,7 @@ export default {
                     this.$emit('uploadAttement', this.form.attachment3);
                 }
 
-                info.logoWorkflow = 'DISMISS';
+                info.logoWorkflow = 'REVIEW_MATERIALS';
                 info.rejectContent = this.form.rejectContent;
             }
 
@@ -155,5 +146,11 @@ export default {
     }
 };
 </script>
-
-<style></style>
+<style lang="less" scoped>
+.el-form-tips {
+    font-size: 12px;
+    color: #d7ab41;
+    line-height: 17px;
+    margin-top: 18px;
+}
+</style>

src/main/vue/src/components/logoPatent/ReviewSeF.vue

@@ -0,0 +1,122 @@
+<template>
+    <el-dialog title="复审" :visible.sync="show" center width="600px">
+        <el-form
+            hide-required-asterisk
+            :model="form"
+            :rules="rules"
+            ref="form"
+            label-width="120px"
+            style="padding-right: 120px;"
+        >
+            <el-form-item label="缴费通知书" prop="attachment1">
+                <div slot="label" style="line-height: 22px;">
+                    <div>撤销连续三年不使</div>
+                    <div>用商标申请书</div>
+                </div>
+                <attachment-upload
+                    v-model="form.attachment1"
+                    :fileSize.sync="form.attachment1.size"
+                ></attachment-upload>
+            </el-form-item>
+
+            <el-form-item label="商标撤销委托书" prop="attachment2">
+                <attachment-upload
+                    v-model="form.attachment2"
+                    :fileSize.sync="form.attachment2.size"
+                ></attachment-upload>
+            </el-form-item>
+            <el-form-item prop="attachment3" label="营业执照复印件">
+                <attachment-upload
+                    v-model="form.attachment3"
+                    :fileSize.sync="form.attachment3.size"
+                ></attachment-upload>
+            </el-form-item>
+            <el-form-item>
+                <el-button style="width: 150px;" size="normal" type="primary" @click="onSubmit">提交</el-button>
+                <el-button style="width: 120px;" size="normal" @click="show = false">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </el-dialog>
+</template>
+
+<script>
+import logoPatent from '@/mixins/logoPatent';
+export default {
+    mixins: [logoPatent],
+    props: {
+        info: {}
+    },
+    data() {
+        return {
+            form: {
+                attachment1: {
+                    attachmentName: '撤销连续三年不使用商标申请书',
+                    fileName: '',
+                    url: '',
+                    remark: '',
+                    size: ''
+                },
+                attachment2: { attachmentName: '商标撤销委托书', fileName: '', url: '', remark: '', size: '' },
+                attachment3: { attachmentName: '营业执照复印件', fileName: '', url: '', remark: '', size: '' }
+            },
+            show: false,
+            rules: {
+                attachment1: {
+                    validator: (rule, value, callback) => {
+                        if (!value.url) {
+                            callback(new Error('请上传撤销连续三年不使用商标申请书'));
+                        } else {
+                            callback();
+                        }
+                    },
+                    trigger: 'change'
+                },
+                attachment2: {
+                    validator: (rule, value, callback) => {
+                        if (!value.url) {
+                            callback(new Error('请上传商标撤销委托书'));
+                        } else {
+                            callback();
+                        }
+                    },
+                    trigger: 'change'
+                },
+                attachment3: {
+                    validator: (rule, value, callback) => {
+                        if (!value.url) {
+                            callback(new Error('请上传营业执照复印件'));
+                        } else {
+                            callback();
+                        }
+                    },
+                    trigger: 'change'
+                }
+            }
+        };
+    },
+    methods: {
+        onSubmit() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let info = { ...this.info };
+
+            this.$emit('uploadAttement', this.form.attachment1);
+            this.$emit('uploadAttement', this.form.attachment2);
+            this.$emit('uploadAttement', this.form.attachment3);
+            info.logoWorkflow = 'DISMISS';
+
+            this.$emit('submit', info);
+            this.show = false;
+        }
+    }
+};
+</script>
+
+<style></style>

src/main/vue/src/views/LogoPatentEdit.vue

@@ -57,6 +57,10 @@
         ></announcement>
 
         <handle ref="handle" :info="formData" @submit="submit" @uploadAttement="uploadAttement"> </handle>
+
+        <dismiss ref="dismiss" :info="formData" @submit="submit" @uploadAttement="uploadAttement"></dismiss>
+    
+    
     </div>
 </template>
 <script>
@@ -72,6 +76,7 @@ import Payment from '../components/logoPatent/Payment.vue';
 import Correction from '../components/logoPatent/Correction.vue';
 import Announcement from '../components/logoPatent/Announcement.vue';
 import Handle from '../components/logoPatent/Handle.vue';
+import Dismiss from '../components/logoPatent/Dismiss.vue';
 export default {
     name: 'LogoPatentEdit',
     mixins: [logoPatent],
@@ -202,6 +207,8 @@ export default {
                 this.$refs.announcement.show = true;
             } else if (this.formData.logoWorkflow === 'HANDLE') {
                 this.$refs.handle.show = true;
+            } else if (this.formData.logoWorkflow === 'DISMISS') {
+                this.$refs.dismiss.show = true;
             }
         }
     },
@@ -216,7 +223,8 @@ export default {
         Payment,
         Correction,
         Announcement,
-        Handle
+        Handle,
+        Dismiss
     }
 };
 </script>