审核

src/main/vue/src/components/logoPatent/Accept.vue

@@ -37,7 +37,6 @@
                         type="date"
                         value-format="yyyy-MM-dd"
                         placeholder="选择日期"
-                        readonly
                     >
                     </el-date-picker>
                 </el-form-item>
@@ -108,13 +107,11 @@ export default {
 
             if (info.accept) {
                 this.$emit('uploadAttement', this.form.attachment1);
-                info.logoWorkflow = 'PENDING_REVIEW';
-                info.applyStatus = 'FIRST_REVIEW_STAGE';
+                info.logoWorkflow = 'PENDING_PAYMENT'; //待缴费
             } else {
                 this.$emit('uploadAttement', this.form.attachment2);
-                info.logoWorkflow = 'DISMISS';
+                info.logoWorkflow = 'PALINDROME_CORRECTION';
                 info.correctionPeriod = this.form.correctionPeriod;
-                info.applyStatus = 'COMPLETED';
             }
 
             this.$emit('submit', info);

src/main/vue/src/components/logoPatent/BaseInfo.vue

@@ -89,8 +89,10 @@
     </div>
 </template>
 <script>
+import logoPatent from '@/mixins/logoPatent';
 export default {
     name: 'LogoPatentEdit',
+    mixins: [logoPatent],
     props: {
         info: {
             type: Object,
@@ -137,29 +139,7 @@ export default {
             formData: {},
             rules: {},
             clientPartnerIdOptions: [],
-            applyStatusOptions: [
-                { label: '申请阶段', value: 'APPLY_STAGE' },
-                { label: '初审阶段', value: 'FIRST_REVIEW_STAGE' },
-                { label: '实审阶段', value: 'SUBSTANTIVE_STAGE' },
-                { label: '复审阶段', value: 'REVIEW_STAGE' },
-                { label: '授权阶段', value: 'GRANT_STAGE' },
-                { label: '已完成', value: 'COMPLETED' }
-            ],
-            logoWorkflowOptions: [
-                { label: '是否决定签约', value: 'IS_CONTRACT' },
-                { label: '待维护案件', value: 'TO_BE_MAINTAINED' },
-                { label: '待受理', value: 'PENDING' },
-                { label: '待审查', value: 'PENDING_REVIEW' },
-                { label: '驳回处理', value: 'DISMISS' },
-                { label: '公告初审', value: 'ANNOUNCEMENTS' },
-                { label: '证件办理', value: 'HANDLE' }
-            ],
-            supplierPartnerIdOptions: [],
-            payRatioOptions: [
-                { label: '全款', value: 'FULL_AMOUNT' },
-                { label: '首付80%', value: 'DOWN_PAYMENT_80' },
-                { label: '首付50%', value: 'DOWN_PAYMENT_50' }
-            ]
+            supplierPartnerIdOptions: []
         };
     },
     methods: {

src/main/vue/src/components/logoPatent/Payment.vue

@@ -18,18 +18,20 @@
                     </el-radio>
                 </el-radio-group>
             </el-form-item>
-            <el-form-item label="受理通知书" prop="attachment1" v-if="form.accept">
+            <el-form-item label="受理通知书" prop="attachment1" v-if="form.payment">
                 <attachment-upload
                     v-model="form.attachment1"
                     :fileSize.sync="form.attachment1.size"
                 ></attachment-upload>
             </el-form-item>
             <template v-else>
-                <el-form-item label="无款不予受理通知书" prop="attachment2">
-                    <attachment-upload
-                        v-model="form.attachment2"
-                        :fileSize.sync="form.attachment2.size"
-                    ></attachment-upload>
+                <el-form-item prop="attachment2">
+                    <div slot="label" style="line-height: 22px;">
+                        <div>无款不予受理</div>
+                        <div>通知书</div>
+                    </div>
+                    <attachment-upload v-model="form.attachment2" :fileSize.sync="form.attachment2.size">
+                    </attachment-upload>
                 </el-form-item>
             </template>
             <el-form-item>
@@ -93,16 +95,14 @@ export default {
         submit() {
             let info = { ...this.info };
 
-            info.accept = this.form.accept;
+            info.payment = this.form.payment;
 
-            if (info.accept) {
+            if (info.payment) {
                 this.$emit('uploadAttement', this.form.attachment1);
                 info.logoWorkflow = 'PENDING_REVIEW';
-                info.applyStatus = 'FIRST_REVIEW_STAGE';
             } else {
                 this.$emit('uploadAttement', this.form.attachment2);
-                info.logoWorkflow = 'PENDING';
-                info.applyStatus = 'APPLY_STAGE';
+                info.logoWorkflow = 'UNPAID';
             }
 
             this.$emit('submit', info);

src/main/vue/src/components/logoPatent/Review.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,16 +8,57 @@
             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 label="是否符合审查要求" prop="reviewRequire">
+                <el-radio-group v-model="form.reviewRequire">
+                    <el-radio :label="true">
+                        是
+                    </el-radio>
+                    <el-radio :label="false">
+                        否
+                    </el-radio>
+                </el-radio-group>
             </el-form-item>
-            <el-form-item label="缴费证明" prop="attachment1">
+            <el-form-item label="缴费通知书" prop="attachment1" v-if="form.reviewRequire">
+                <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>
-
+            <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>
@@ -36,17 +77,39 @@ export default {
     data() {
         return {
             form: {
-                accept: true,
-                attachment1: { attachmentName: '缴费通知书', fileName: '', url: '', remark: '', size: '' },
-                attachment2: { attachmentName: '不予受理通知书', fileName: '', url: '', remark: '', size: '' }
+                reviewRequire: true,
+                attachment1: { attachmentName: '初步审定公告通知书', fileName: '', url: '', remark: '', size: '' },
+                attachment2: { attachmentName: '商标驳回通知书', fileName: '', url: '', remark: '', size: '' },
+                attachment3: { attachmentName: '商标部分驳回通知书', fileName: '', url: '', remark: '', size: '' },
+                rejectAll: true
             },
             show: false,
             rules: {
-                reHearPayment: { required: true, message: '请输入缴费信息', trigger: 'blur' },
                 attachment1: {
                     validator: (rule, value, callback) => {
                         if (!value.url) {
-                            callback(new Error('请上传缴费通知书'));
+                            callback(new Error('请上传初步审定公告通知书'));
+                        } else {
+                            callback();
+                        }
+                    },
+                    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();
                         }
@@ -69,10 +132,22 @@ export default {
         submit() {
             let info = { ...this.info };
 
-            info.reHearPayment = this.form.reHearPayment;
+            info.reviewRequire = this.form.reviewRequire;
 
-            this.$emit('uploadAttement', this.form.attachment1);
-            info.logoWorkflow = 'PENDING_REVIEW';
+            if (info.reviewRequire) {
+                this.$emit('uploadAttement', this.form.attachment1);
+                info.logoWorkflow = 'PENDING_PAYMENT'; //待缴费
+            } else {
+                info.rejectAll = this.form.rejectAll;
+                if (info.rejectAll) {
+                    this.$emit('uploadAttement', this.form.attachment2);
+                } else {
+                    this.$emit('uploadAttement', this.form.attachment3);
+                }
+
+                info.logoWorkflow = 'PALINDROME_CORRECTION';
+                info.rejectContent = this.form.rejectContent;
+            }
 
             this.$emit('submit', info);
             this.show = false;

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

@@ -3,9 +3,7 @@ export default {
         return {
             applyStatusOptions: [
                 { label: '申请阶段', value: 'APPLY_STAGE' },
-                { label: '初审阶段', value: 'FIRST_REVIEW_STAGE' },
-                { label: '实审阶段', value: 'SUBSTANTIVE_STAGE' },
-                { label: '复审阶段', value: 'REVIEW_STAGE' },
+                { label: '审查阶段', value: 'REVIEW_STAGE' },
                 { label: '授权阶段', value: 'GRANT_STAGE' },
                 { label: '已完成', value: 'COMPLETED' }
             ],
@@ -13,8 +11,13 @@ export default {
                 { label: '是否决定签约', value: 'IS_CONTRACT' },
                 { label: '待维护案件', value: 'TO_BE_MAINTAINED' },
                 { label: '待受理', value: 'PENDING' },
+                { label: '待缴费', value: 'PENDING_PAYMENT' },
+                { label: '回文补正', value: 'PALINDROME_CORRECTION' },
+                { label: '未缴费终止', value: 'UNPAID' },
                 { label: '待审查', value: 'PENDING_REVIEW' },
                 { label: '驳回处理', value: 'DISMISS' },
+                { label: '待上传复审材料', value: 'REVIEW_MATERIALS' },
+                { label: '不复审终止', value: 'NO_REVIEW' },
                 { label: '公告初审', value: 'ANNOUNCEMENTS' },
                 { label: '证件办理', value: 'HANDLE' }
             ],

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

@@ -44,6 +44,10 @@
         <accept ref="accept" :info="formData" @submit="submit" @uploadAttement="uploadAttement"></accept>
 
         <review ref="review" :info="formData" @submit="submit" @uploadAttement="uploadAttement"></review>
+
+        <payment ref="payment" :info="formData" @submit="submit" @uploadAttement="uploadAttement"></payment>
+
+        <correction ref="correction" :info="formData" @submit="submit" @uploadAttement="uploadAttement"></correction>
     </div>
 </template>
 <script>
@@ -55,6 +59,8 @@ import AttachmentAdd from '../components/logoPatent/AttachmentAdd.vue';
 import Maintenance from '../components/logoPatent/Maintenance.vue';
 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';
 export default {
     name: 'LogoPatentEdit',
     mixins: [logoPatent],
@@ -175,6 +181,10 @@ export default {
                 this.$refs.maintenance.show = true;
             } else if (this.formData.logoWorkflow === 'PENDING') {
                 this.$refs.accept.show = true;
+            } else if (this.formData.logoWorkflow === 'PENDING_PAYMENT') {
+                this.$refs.payment.show = true;
+            } else if (this.formData.logoWorkflow === 'PALINDROME_CORRECTION') {
+                this.$refs.correction.show = true;
             } else if (this.formData.logoWorkflow === 'PENDING_REVIEW') {
                 this.$refs.review.show = true;
             }
@@ -187,7 +197,9 @@ export default {
         AttachmentAdd,
         Maintenance,
         Accept,
-        Review
+        Review,
+        Payment,
+        Correction
     }
 };
 </script>