办登

src/main/vue/src/components/AttachmentUpload.vue

@@ -46,7 +46,7 @@
                     class="upload-progress"
                 ></el-progress>
             </div>
-            <el-image style="width: 0; height: 0;" :src="previewUrl" :preview-src-list="[previewUrl]" ref="preview">
+            <el-image style="width: 0; height: 0" :src="previewUrl" :preview-src-list="[previewUrl]" ref="preview">
             </el-image>
         </el-upload>
         <el-input
@@ -250,14 +250,17 @@ export default {
 .file-upload {
     line-height: 28px;
     padding-top: 5px;
+
+    .el-button {
+        min-width: 80px;
+    }
 }
 .file-remark {
     margin-top: 14px;
     line-height: 28px;
 }
-</style>
-<style lang="less">
-.file-remark {
+
+/deep/ .file-remark {
     input {
         padding: 0 30px 0 8px;
 
@@ -265,7 +268,7 @@ export default {
         border-width: 0;
     }
 }
-.file-upload {
+/deep/ .file-upload {
     .el-upload {
         line-height: 28px;
     }

src/main/vue/src/components/domesticPatent/BaseInfo.vue

@@ -17,8 +17,8 @@
                     <el-form-item prop="name" label="专利名称">
                         <el-input v-model="formData.name" style="width: 600px" @change="submit"></el-input>
                     </el-form-item>
-                    <el-form-item prop="status" label="案件状态">
-                        <el-select v-model="formData.status" disabled clearable filterable placeholder="请选择">
+                    <el-form-item prop="applyStatus" label="案件状态">
+                        <el-select v-model="formData.applyStatus" disabled clearable filterable placeholder="请选择">
                             <el-option
                                 v-for="item in statusOptions"
                                 :key="item.value"

src/main/vue/src/components/domesticPatent/MaintainCase.vue

@@ -57,7 +57,7 @@ export default {
             info.applyNo = this.form.applyNo;
             info.applyDate = this.form.applyDate;
 
-            info.workflow = 'PENDING_REVIEW';
+            info.workflow = 'REPLY_TO_NOTICE';
 
             this.$emit('submit', info);
             this.show = false;

src/main/vue/src/components/domesticPatent/Reply.vue

@@ -86,7 +86,7 @@ export default {
             this.$emit('uploadAttement', this.form.attachment1);
             info.officialPeriod = this.form.officialPeriod;
             info.submitPeriod = this.form.submitPeriod;
-            info.workflow = 'MAINTAIN_CASE';
+            info.workflow = 'PENDING_REVIEW';
             this.$emit('submit', info);
             this.show = false;
         }

src/main/vue/src/components/domesticPatent/ReplyBack.vue

@@ -1,42 +1,30 @@
 <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"
             :rules="rules"
             ref="form"
             label-width="140px"
-            style="padding-right: 130px;"
+            style="padding-right: 130px"
         >
-            <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-form-item label="是否决定答复" prop="decideReply">
+                <el-radio-group v-model="form.decideReply">
+                    <el-radio :label="true"> 是 </el-radio>
+                    <el-radio :label="false"> 否 </el-radio>
                 </el-radio-group>
+                <div class="el-form-tips" v-if="!form.decideReply">注：放弃答复后，案件立即终止，请谨慎操作</div>
             </el-form-item>
-            <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 label="准备答复意见" prop="isClientReady" v-if="form.decideReply">
+                <el-radio-group v-model="form.isClientReady">
+                    <el-radio :label="true"> 客户准备 </el-radio>
+                    <el-radio :label="false"> 律师准备 </el-radio>
+                </el-radio-group>
             </el-form-item>
-            <template v-else>
-                <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>
-                <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-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>
@@ -52,33 +40,11 @@ export default {
     data() {
         return {
             form: {
-                payment: true,
-                attachment1: { attachmentName: '受理通知书', fileName: '', url: '', remark: '', size: '' },
-                attachment2: { attachmentName: '无款不予受理通知书', fileName: '', url: '', remark: '', size: '' }
+                decideReply: true
             },
             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'
-                }
+                isClientReady: { required: true, message: '请选择准备答复意见', trigger: 'change' }
             }
         };
     },
@@ -95,14 +61,13 @@ export default {
         submit() {
             let info = { ...this.info };
 
-            info.payment = this.form.payment;
+            info.decideReply = this.form.decideReply;
 
-            if (info.payment) {
-                this.$emit('uploadAttement', this.form.attachment1);
-                info.logoWorkflow = 'PENDING_REVIEW';
+            if (info.decideReply) {
+                info.isClientReady = this.form.isClientReady;
+                info.workflow = 'REPLY_SUBMISSIONS';
             } else {
-                this.$emit('uploadAttement', this.form.attachment2);
-                info.logoWorkflow = 'UNPAID';
+                info.workflow = 'NO_REPLY';
             }
 
             this.$emit('submit', info);
@@ -111,5 +76,11 @@ export default {
     }
 };
 </script>
-
-<style></style>
+<style lang="less" scoped>
+.el-form-tips {
+    font-size: 12px;
+    color: #d75e41;
+    line-height: 17px;
+    margin-top: 18px;
+}
+</style>

src/main/vue/src/components/logoPatent/Payment.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"

src/main/vue/src/mixins/domesticPatent.js

@@ -10,7 +10,7 @@ export default {
                         { label: '待添加供应商', value: 'ADD_SUPPLIERS' },
                         { label: '待提交供应商材料', value: 'SUPPLIER_MATERIALS' },
                         { label: '待维护案件', value: 'MAINTAIN_CASE' },
-                        { label: '待上传答复通知', value: 'PENDING_REVIEW' }
+                        { label: '待上传答复通知', value: 'REPLY_TO_NOTICE' }
                     ]
                 },
                 {
@@ -20,15 +20,14 @@ export default {
                     workflows: [
                         { label: '待审查', value: 'PENDING_REVIEW' },
                         { label: '不答复终止', value: 'NO_REPLY' },
-                        { label: '上传答复意见书', value: 'REPLY_SUBMISSIONS' },
-                        { label: '上传答复结果', value: 'REPLY_RESULT' }
+                        { label: '上传答复意见书', value: 'REPLY_SUBMISSIONS' }
                     ]
                 },
                 {
                     label: '复审阶段',
                     value: 'REVIEW_STAGE',
                     type: 'warning',
-                    workflows: []
+                    workflows: [{ label: '上传答复结果', value: 'REPLY_RESULT' }]
                 },
                 {
                     label: '授权阶段',
@@ -52,11 +51,15 @@ export default {
                 { label: '待添加供应商', value: 'ADD_SUPPLIERS' },
                 { label: '待提交供应商材料', value: 'SUPPLIER_MATERIALS' },
                 { label: '待维护案件', value: 'MAINTAIN_CASE' },
+                { label: '待上传答复通知', value: 'REPLY_TO_NOTICE' },
                 { label: '待审查', value: 'PENDING_REVIEW' },
+                { label: '不答复终止', value: 'NO_REPLY' },
+                { label: '上传答复意见书', value: 'REPLY_SUBMISSIONS' },
+                { label: '上传答复结果', value: 'REPLY_RESULT' },
                 { label: '待办登', value: 'PENDING_REGISTER' },
+                { label: '补充办登信息', value: 'PENDING_REGISTER' },
                 { label: '办理登记', value: 'REGISTER' },
-                { label: '待维护年费信息', value: 'ANNUAL_FEE' },
-                { label: '已完成', value: 'COMPLETED' }
+                { label: '待维护年费信息', value: 'ANNUAL_FEE' }
             ],
             typeOptions: [
                 { label: '发明专利', value: 'INVENTION' },

src/main/vue/src/views/DomesticPatentEdit.vue

@@ -57,6 +57,20 @@
             @uploadAttement="uploadAttement"
         ></maintain-case>
         <reply ref="reply" :info="formData" @submit="submit" @uploadAttement="uploadAttement"></reply>
+        <reply-back ref="replyBack" :info="formData" @submit="submit" @uploadAttement="uploadAttement"></reply-back>
+        <reply-submissions
+            ref="replySubmissions"
+            :info="formData"
+            @submit="submit"
+            @uploadAttement="uploadAttement"
+        ></reply-submissions>
+
+        <reply-result
+            ref="replyResult"
+            :info="formData"
+            @submit="submit"
+            @uploadAttement="uploadAttement"
+        ></reply-result>
     </div>
 </template>
 <script>
@@ -70,6 +84,9 @@ import AddSupplierNo from '../components/domesticPatent/AddSupplierNo.vue';
 import BackSupplier from '../components/domesticPatent/BackSupplier.vue';
 import MaintainCase from '../components/domesticPatent/MaintainCase.vue';
 import Reply from '../components/domesticPatent/Reply.vue';
+import ReplyBack from '../components/domesticPatent/ReplyBack.vue';
+import ReplySubmissions from '../components/domesticPatent/replySubmissions.vue';
+import ReplyResult from '../components/domesticPatent/ReplyResult.vue';
 export default {
     name: 'DomesticPatentEdit',
     mixins: [domesticPatent],
@@ -93,8 +110,14 @@ export default {
             return this.workflowFormatter('', '', this.formData.workflow);
         },
         user() {
-            if (this.formData.workflow === 'IS_CONTRACT') {
+            if (this.formData.workflow === 'PENDING_REVIEW') {
                 return '客户经理';
+            } else if (this.formData.workflow === 'REPLY_SUBMISSIONS') {
+                if (this.formData.isClientReady) {
+                    return '客户经理';
+                } else {
+                    return '项目经理';
+                }
             } else if (this.formData.workflow) {
                 return '项目经理';
             } else {
@@ -192,8 +215,14 @@ export default {
                 this.$refs.backSupplier.show = true;
             } else if (this.formData.workflow === 'MAINTAIN_CASE') {
                 this.$refs.maintainCase.show = true;
-            } else if (this.formData.workflow === 'PENDING_REVIEW') {
+            } else if (this.formData.workflow === 'REPLY_TO_NOTICE') {
                 this.$refs.reply.show = true;
+            } else if (this.formData.workflow === 'PENDING_REVIEW') {
+                this.$refs.replyBack.show = true;
+            } else if (this.formData.workflow === 'REPLY_SUBMISSIONS') {
+                this.$refs.replySubmissions.show = true;
+            } else if (this.formData.workflow === 'REPLY_RESULT') {
+                this.$refs.replyResult.show = true;
             }
         }
     },
@@ -206,7 +235,10 @@ export default {
         AddSupplierNo,
         BackSupplier,
         MaintainCase,
-        Reply
+        Reply,
+        ReplyBack,
+        ReplySubmissions,
+        ReplyResult
     }
 };
 </script>

src/main/vue/src/views/DomesticPatentList.vue

@@ -68,7 +68,7 @@
             <el-table-column prop="patent.name" min-width="160" label="专利名称"> </el-table-column>
             <el-table-column prop="workflow" min-width="120" label="当前流程" :formatter="workflowFormatter">
             </el-table-column>
-            <el-table-column prop="patent.createdAt" min-width="100" label="申请日" :formatter="dateFormatter">
+            <el-table-column prop="patent.applyDate" min-width="100" label="申请日" :formatter="dateFormatter">
             </el-table-column>
             <el-table-column prop="patent.type" min-width="100" label="专利类型" :formatter="typeFormatter">
             </el-table-column>