panhui 5 years ago
parent
commit
82663c125d

+ 2 - 2
src/main/vue/src/components/logoPatent/Review.vue

@@ -136,7 +136,7 @@ export default {
 
             if (info.reviewRequire) {
                 this.$emit('uploadAttement', this.form.attachment1);
-                info.logoWorkflow = 'PENDING_PAYMENT'; //待缴费
+                info.logoWorkflow = 'ANNOUNCEMENTS'; //待缴费
             } else {
                 info.rejectAll = this.form.rejectAll;
                 if (info.rejectAll) {
@@ -145,7 +145,7 @@ export default {
                     this.$emit('uploadAttement', this.form.attachment3);
                 }
 
-                info.logoWorkflow = 'PALINDROME_CORRECTION';
+                info.logoWorkflow = 'DISMISS';
                 info.rejectContent = this.form.rejectContent;
             }
 

+ 1 - 0
src/main/vue/src/mixins/logoPatent.js

@@ -46,6 +46,7 @@ export default {
                 { label: '商标撤销委托书', value: '商标撤销委托书' },
                 { label: '缴费证明', value: '缴费证明' },
                 { label: '复审公告通知书', value: '复审公告通知书' },
+                { label: '公告通知书', value: '公告通知书' },
                 { label: '商标注册证', value: '商标注册证' }
             ]
         };

+ 18 - 1
src/main/vue/src/views/LogoPatentEdit.vue

@@ -48,6 +48,15 @@
         <payment ref="payment" :info="formData" @submit="submit" @uploadAttement="uploadAttement"></payment>
 
         <correction ref="correction" :info="formData" @submit="submit" @uploadAttement="uploadAttement"></correction>
+
+        <announcement
+            ref="announcement"
+            :info="formData"
+            @submit="submit"
+            @uploadAttement="uploadAttement"
+        ></announcement>
+
+        <handle ref="handle" :info="formData" @submit="submit" @uploadAttement="uploadAttement"> </handle>
     </div>
 </template>
 <script>
@@ -61,6 +70,8 @@ import Accept from '../components/logoPatent/Accept.vue';
 import Review from '../components/logoPatent/Review.vue';
 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';
 export default {
     name: 'LogoPatentEdit',
     mixins: [logoPatent],
@@ -187,6 +198,10 @@ export default {
                 this.$refs.correction.show = true;
             } else if (this.formData.logoWorkflow === 'PENDING_REVIEW') {
                 this.$refs.review.show = true;
+            } else if (this.formData.logoWorkflow === 'ANNOUNCEMENTS') {
+                this.$refs.announcement.show = true;
+            } else if (this.formData.logoWorkflow === 'HANDLE') {
+                this.$refs.handle.show = true;
             }
         }
     },
@@ -199,7 +214,9 @@ export default {
         Accept,
         Review,
         Payment,
-        Correction
+        Correction,
+        Announcement,
+        Handle
     }
 };
 </script>