缴费

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

@@ -1,6 +1,13 @@
 <template>
     <el-dialog title="受理信息" :visible.sync="show" center width="600px">
-        <el-form :model="form" :rules="rules" ref="form" label-width="120px" style="padding-right: 120px;">
+        <el-form
+            hide-required-asterisk
+            :model="form"
+            :rules="rules"
+            ref="form"
+            label-width="120px"
+            style="padding-right: 120px;"
+        >
             <el-form-item label="是否受理" prop="accept">
                 <el-radio-group v-model="form.accept">
                     <el-radio :label="true">
@@ -57,7 +64,7 @@ export default {
                 attachment1: { attachmentName: '缴费通知书', fileName: '', url: '', remark: '', size: '' },
                 attachment2: { attachmentName: '不予受理通知书', fileName: '', url: '', remark: '', size: '' }
             },
-            show: true,
+            show: false,
             rules: {
                 accept: { required: true, message: '请输入附件名称', trigger: 'blur' },
                 attachment1: {
@@ -94,9 +101,6 @@ export default {
                 }
             });
         },
-        cancel() {
-            this.$emit('cancel');
-        },
         submit() {
             let info = { ...this.info };
 
@@ -105,12 +109,16 @@ export default {
             if (info.accept) {
                 this.$emit('uploadAttement', this.form.attachment1);
                 info.logoWorkflow = 'PENDING_REVIEW';
+                info.applyStatus = 'FIRST_REVIEW_STAGE';
             } else {
-                this.$emit('uploadAttement', this.form.attachment1);
+                this.$emit('uploadAttement', this.form.attachment2);
                 info.logoWorkflow = 'DISMISS';
+                info.correctionPeriod = this.form.correctionPeriod;
+                info.applyStatus = 'COMPLETED';
             }
 
             this.$emit('submit', info);
+            this.show = false;
         }
     }
 };

src/main/vue/src/components/logoPatent/AttachmentAdd.vue

@@ -74,7 +74,7 @@ export default {
                 .then(res => {
                     this.saving = false;
                     this.$message.success('成功');
-                    this.$router.go(-1);
+                    this.show = false;
                 })
                 .catch(e => {
                     console.log(e);

src/main/vue/src/components/logoPatent/Maintenance.vue

@@ -144,6 +144,7 @@ export default {
             info.logoWorkflow = [...this.logoWorkflowOptions][index + 1].value;
 
             this.$emit('submit', info);
+            this.show = false;
         }
     }
 };

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

@@ -0,0 +1,115 @@
+<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="payment">
+                <el-radio-group v-model="form.payment">
+                    <el-radio :label="true">
+                        是
+                    </el-radio>
+                    <el-radio :label="false">
+                        否
+                    </el-radio>
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item label="受理通知书" prop="attachment1" v-if="form.accept">
+                <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>
+            </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>
+            </el-form-item>
+        </el-form>
+    </el-dialog>
+</template>
+
+<script>
+import logoPatent from '@/mixins/logoPatent';
+export default {
+    mixins: [logoPatent],
+    props: {
+        info: {}
+    },
+    data() {
+        return {
+            form: {
+                payment: true,
+                attachment1: { attachmentName: '受理通知书', fileName: '', url: '', remark: '', size: '' },
+                attachment2: { attachmentName: '无款不予受理通知书', fileName: '', url: '', remark: '', size: '' }
+            },
+            show: false,
+            rules: {
+                payment: { required: true, message: '请输入附件名称', trigger: 'blur' },
+                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'
+                }
+            }
+        };
+    },
+    methods: {
+        onSubmit() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let info = { ...this.info };
+
+            info.accept = this.form.accept;
+
+            if (info.accept) {
+                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';
+            }
+
+            this.$emit('submit', info);
+            this.show = false;
+        }
+    }
+};
+</script>
+
+<style></style>

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

@@ -0,0 +1,84 @@
+<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/Signed.vue

@@ -101,6 +101,7 @@ export default {
                     info.logoWorkflow = [...this.logoWorkflowOptions][index + 1].value;
 
                     this.$emit('submit', info);
+                    this.show = false;
                 } else {
                     return false;
                 }

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

@@ -42,6 +42,8 @@
 
         <maintenance ref="maintenance" :info="formData" @submit="submit" @uploadAttement="uploadAttement"></maintenance>
         <accept ref="accept" :info="formData" @submit="submit" @uploadAttement="uploadAttement"></accept>
+
+        <review ref="review" :info="formData" @submit="submit" @uploadAttement="uploadAttement"></review>
     </div>
 </template>
 <script>
@@ -52,23 +54,13 @@ import logoPatent from '@/mixins/logoPatent';
 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';
 export default {
     name: 'LogoPatentEdit',
     mixins: [logoPatent],
     created() {
         if (this.$route.query.id) {
-            this.$http
-                .get('logoPatent/get/' + this.$route.query.id)
-                .then(res => {
-                    this.formData = res;
-                    this.$nextTick(() => {
-                        this.init();
-                    });
-                })
-                .catch(e => {
-                    console.log(e);
-                    this.$message.error(e.error);
-                });
+            this.getInfo();
         }
     },
     data() {
@@ -96,6 +88,20 @@ export default {
         }
     },
     methods: {
+        getInfo() {
+            this.$http
+                .get('logoPatent/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                    this.$nextTick(() => {
+                        this.init();
+                    });
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        },
         init() {
             if (this.activeName === 'first') {
                 this.$refs.base.init();
@@ -125,7 +131,7 @@ export default {
                 .then(res => {
                     this.saving = false;
                     this.$message.success('成功');
-                    this.init();
+                    this.getInfo();
                 })
                 .catch(e => {
                     console.log(e);
@@ -156,6 +162,10 @@ export default {
             }
             data.patentId = this.formData.id;
             data.userId = this.$store.state.userInfo.id;
+            data.version = 1;
+            if (data.size) {
+                data.size += 'KB';
+            }
             this.$http.post('/attachment/save', data, { body: 'json' });
         },
         action() {
@@ -165,6 +175,8 @@ export default {
                 this.$refs.maintenance.show = true;
             } else if (this.formData.logoWorkflow === 'PENDING') {
                 this.$refs.accept.show = true;
+            } else if (this.formData.logoWorkflow === 'PENDING_REVIEW') {
+                this.$refs.review.show = true;
             }
         }
     },
@@ -174,7 +186,8 @@ export default {
         attachmentList,
         AttachmentAdd,
         Maintenance,
-        Accept
+        Accept,
+        Review
     }
 };
 </script>