复审

src/main/vue/src/components/logoPatent/Review copy.vue

@@ -1,84 +0,0 @@
-<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="reHearPayment">
-                <el-input v-model="form.reHearPayment" placeholder="请输入" clearable></el-input>
-            </el-form-item>
-            <el-form-item label="缴费证明" prop="attachment1">
-                <attachment-upload
-                    v-model="form.attachment1"
-                    :fileSize.sync="form.attachment1.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: {
-                accept: true,
-                attachment1: { attachmentName: '缴费通知书', fileName: '', url: '', remark: '', size: '' },
-                attachment2: { attachmentName: '不予受理通知书', fileName: '', url: '', remark: '', size: '' }
-            },
-            show: false,
-            rules: {
-                reHearPayment: { required: true, message: '请输入缴费信息', trigger: 'blur' },
-                attachment1: {
-                    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 };
-
-            info.reHearPayment = this.form.reHearPayment;
-
-            this.$emit('uploadAttement', this.form.attachment1);
-            info.logoWorkflow = 'PENDING_REVIEW';
-
-            this.$emit('submit', info);
-            this.show = false;
-        }
-    }
-};
-</script>
-
-<style></style>

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

@@ -110,7 +110,7 @@ export default {
             this.$emit('uploadAttement', this.form.attachment1);
             this.$emit('uploadAttement', this.form.attachment2);
             this.$emit('uploadAttement', this.form.attachment3);
-            info.logoWorkflow = 'DISMISS';
+            info.logoWorkflow = 'REVIEW_PAYMENT';
 
             this.$emit('submit', info);
             this.show = false;

src/main/vue/src/components/logoPatent/ReviewSeS.vue

@@ -36,9 +36,7 @@ export default {
     data() {
         return {
             form: {
-                accept: true,
-                attachment1: { attachmentName: '缴费通知书', fileName: '', url: '', remark: '', size: '' },
-                attachment2: { attachmentName: '不予受理通知书', fileName: '', url: '', remark: '', size: '' }
+                attachment1: { attachmentName: '复审缴费证明', fileName: '', url: '', remark: '', size: '' }
             },
             show: false,
             rules: {
@@ -46,7 +44,7 @@ export default {
                 attachment1: {
                     validator: (rule, value, callback) => {
                         if (!value.url) {
-                            callback(new Error('请上传缴费通知书'));
+                            callback(new Error('请上传缴费证明'));
                         } else {
                             callback();
                         }
@@ -72,7 +70,7 @@ export default {
             info.reHearPayment = this.form.reHearPayment;
 
             this.$emit('uploadAttement', this.form.attachment1);
-            info.logoWorkflow = 'PENDING_REVIEW';
+            info.logoWorkflow = 'REVIEW';
 
             this.$emit('submit', info);
             this.show = false;

src/main/vue/src/components/logoPatent/ReviewSeT.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="审查" :visible.sync="show" center width="600px">
+    <el-dialog title="复审" :visible.sync="show" center width="600px">
         <el-form
             hide-required-asterisk
             :model="form"
@@ -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="rehearResult">
+                <el-radio-group v-model="form.rehearResult">
                     <el-radio :label="true">
                         是
                     </el-radio>
@@ -18,7 +18,7 @@
                     </el-radio>
                 </el-radio-group>
             </el-form-item>
-            <el-form-item label="缴费通知书" prop="attachment1" v-if="form.reviewRequire">
+            <el-form-item label="缴费通知书" prop="attachment1" v-if="form.rehearResult">
                 <div slot="label" style="line-height: 22px;">
                     <div>初步审定公告</div>
                     <div>通知书</div>
@@ -28,37 +28,6 @@
                     :fileSize.sync="form.attachment1.size"
                 ></attachment-upload>
             </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">
-                    <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>
-                    <attachment-upload
-                        v-model="form.attachment3"
-                        :fileSize.sync="form.attachment3.size"
-                    ></attachment-upload>
-                </el-form-item>
-            </template>
             <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>
@@ -77,11 +46,8 @@ export default {
     data() {
         return {
             form: {
-                reviewRequire: true,
-                attachment1: { attachmentName: '初步审定公告通知书', fileName: '', url: '', remark: '', size: '' },
-                attachment2: { attachmentName: '商标驳回通知书', fileName: '', url: '', remark: '', size: '' },
-                attachment3: { attachmentName: '商标部分驳回通知书', fileName: '', url: '', remark: '', size: '' },
-                rejectAll: true
+                rehearResult: true,
+                attachment1: { attachmentName: '初步审定公告通知书', fileName: '', url: '', remark: '', size: '' }
             },
             show: false,
             rules: {
@@ -94,27 +60,6 @@ export default {
                         }
                     },
                     trigger: 'change'
-                },
-                attachment2: {
-                    validator: (rule, value, callback) => {
-                        if (!value.url) {
-                            callback(new Error('请上传商标驳回通知书'));
-                        } else {
-                            callback();
-                        }
-                    },
-                    trigger: 'change'
-                },
-                rejectContent: { required: true, message: '请输入驳回建议', trigger: 'blur' },
-                attachment3: {
-                    validator: (rule, value, callback) => {
-                        if (!value.url) {
-                            callback(new Error('请上传商标部分驳回通知书'));
-                        } else {
-                            callback();
-                        }
-                    },
-                    trigger: 'change'
                 }
             }
         };

src/main/vue/src/mixins/logoPatent.js

@@ -18,6 +18,8 @@ export default {
                 { label: '驳回处理', value: 'DISMISS' },
                 { label: '待上传复审材料', value: 'REVIEW_MATERIALS' },
                 { label: '不复审终止', value: 'NO_REVIEW' },
+                { label: '复审缴费', value: 'REVIEW_PAYMENT' },
+                { label: '复审审查', value: 'REVIEW' },
                 { label: '公告初审', value: 'ANNOUNCEMENTS' },
                 { label: '证件办理', value: 'HANDLE' }
             ],

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

@@ -59,8 +59,9 @@
         <handle ref="handle" :info="formData" @submit="submit" @uploadAttement="uploadAttement"> </handle>
 
         <dismiss ref="dismiss" :info="formData" @submit="submit" @uploadAttement="uploadAttement"></dismiss>
-    
-    
+        <review-se-f ref="reviewSeF" :info="formData" @submit="submit" @uploadAttement="uploadAttement"></review-se-f>
+
+        <review-se-s ref="reviewSeS" :info="formData" @submit="submit" @uploadAttement="uploadAttement"></review-se-s>
     </div>
 </template>
 <script>
@@ -77,6 +78,8 @@ 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';
+import ReviewSeF from '../components/logoPatent/ReviewSeF.vue';
+import ReviewSeS from '../components/logoPatent/ReviewSeS.vue';
 export default {
     name: 'LogoPatentEdit',
     mixins: [logoPatent],
@@ -209,6 +212,10 @@ export default {
                 this.$refs.handle.show = true;
             } else if (this.formData.logoWorkflow === 'DISMISS') {
                 this.$refs.dismiss.show = true;
+            } else if (this.formData.logoWorkflow === 'REVIEW_MATERIALS') {
+                this.$refs.reviewSeF.show = true;
+            } else if (this.formData.logoWorkflow === 'REVIEW_PAYMENT') {
+                this.$refs.reviewSeS.show = true;
             }
         }
     },
@@ -224,7 +231,9 @@ export default {
         Correction,
         Announcement,
         Handle,
-        Dismiss
+        Dismiss,
+        ReviewSeF,
+        ReviewSeS
     }
 };
 </script>