国家

src/main/vue/src/mixins/countryPatent.js

@@ -2,15 +2,37 @@ export default {
     data() {
         return {
             statusOptions: [
+                {
+                    label: '全部阶段',
+                    value: 'APPLY_STAGE,SUBSTANTIVE_STAGE,REVIEW_STAGE,GRANT_STAGE,COMPLETED',
+                    type: '',
+                    workflows: [
+                        { label: '待申请翻译文稿', value: 'APPLY_TRANSLATION' },
+                        { label: '待上传翻译文稿', value: 'TRANSLATION_DOCUMENTS' },
+                        { label: '待上传翻译定稿', value: 'FINALIZED_TRANSLATION' },
+                        { label: '待添加供应商', value: 'ADD_SUPPLIERS' },
+                        { label: '待提交供应商材料', value: 'SUPPLIER_MATERIALS' },
+                        { label: '待维护案件信息', value: 'REPLY_NOTIFICATION' },
+                        { label: '待确定答复意向', value: 'DETERMINED_REPLY' },
+                        { label: '不答复终止', value: 'NO_REPLY' },
+                        { label: '待上传答复意见书', value: 'REPLY_SUBMISSION' },
+                        { label: '待确定答复结果', value: 'RESPONSE_RESULT' },
+                        { label: '待办登', value: 'PENDING_REGISTER' },
+                        { label: '授权办登', value: 'AUTHORIZE_REGISTER' },
+                        { label: '已完成', value: 'COMPLETED' }
+                    ]
+                },
                 {
                     label: '申请阶段',
                     value: 'APPLY_STAGE',
                     type: '',
                     workflows: [
+                        { label: '待申请翻译文稿', value: 'APPLY_TRANSLATION' },
+                        { label: '待上传翻译文稿', value: 'TRANSLATION_DOCUMENTS' },
+                        { label: '待上传翻译定稿', value: 'FINALIZED_TRANSLATION' },
                         { label: '待添加供应商', value: 'ADD_SUPPLIERS' },
                         { label: '待提交供应商材料', value: 'SUPPLIER_MATERIALS' },
-                        { label: '维护案件信息', value: 'MAINTAIN_CASE' },
-                        { label: '待官文流转', value: 'OFFICIAL_CIRCULATION' }
+                        { label: '待维护案件信息', value: 'REPLY_NOTIFICATION' }
                     ]
                 },
                 {
@@ -18,7 +40,8 @@ export default {
                     value: 'SUBSTANTIVE_STAGE',
                     type: 'warning',
                     workflows: [
-                        { label: '待补正答复', value: 'SUPPLEMENTARY_REPLY' },
+                        { label: '待确定答复意向', value: 'DETERMINED_REPLY' },
+                        { label: '不答复终止', value: 'NO_REPLY' },
                         { label: '待上传答复意见书', value: 'REPLY_SUBMISSION' }
                     ]
                 },
@@ -26,7 +49,16 @@ export default {
                     label: '复审阶段',
                     value: 'REVIEW_STAGE',
                     type: 'warning',
-                    workflows: [{ label: '待确认答复状态', value: 'CONFIRM_REPLY' }]
+                    workflows: [{ label: '待确定答复结果', value: 'RESPONSE_RESULT' }]
+                },
+                {
+                    label: '授权阶段',
+                    value: 'GRANT_STAGE',
+                    type: 'warning',
+                    workflows: [
+                        { label: '待办登', value: 'PENDING_REGISTER' },
+                        { label: '授权办登', value: 'AUTHORIZE_REGISTER' }
+                    ]
                 },
                 {
                     label: '已完成',
@@ -39,16 +71,16 @@ export default {
                 { label: '发明专利', value: 'INVENTION' },
                 { label: '实用新型专利', value: 'UTILITY_MODEL' },
                 { label: '外观设计专利', value: 'APPEARANCE_DESIGN' }
+            ],
+            applyRouteOptions: [
+                { label: 'PCT国家阶段', value: 'COUNTRY' },
+                { label: '巴黎公约', value: 'SINGLE' }
             ]
         };
     },
     computed: {
         workflowOptions() {
-            return [...this.statusOptions]
-                .map(item => {
-                    return item.workflows;
-                })
-                .flat();
+            return this.statusOptions[0].workflows;
         }
     },
     methods: {

src/main/vue/src/router.js

@@ -285,6 +285,14 @@ const router = new Router({
                         title: '国际专利申请'
                     }
                 },
+                {
+                    path: '/countryPatentAdd',
+                    name: 'CountryPatentAdd',
+                    component: () => import(/* webpackChunkName: "countryPatentEdit" */ '@/views/CountryPatentAdd.vue'),
+                    meta: {
+                        title: '新增国家专利申请'
+                    }
+                },
                 {
                     path: '/countryPatentEdit',
                     name: 'CountryPatentEdit',

src/main/vue/src/views/CountryPatentList.vue

@@ -85,12 +85,13 @@
             <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="pctApplyDate" label="pct申请日"> </el-table-column>
-            <el-table-column prop="pctApplyNo" label="pct申请号"> </el-table-column>
-            <el-table-column prop="patent.applyDate" min-width="100" label="申请日" :formatter="dateFormatter">
+            <el-table-column prop="country" min-width="100" label="进入国家"> </el-table-column>
+            <el-table-column prop="pctApplyDate" min-width="100" label="国家申请日" :formatter="dateFormatter">
             </el-table-column>
-            <el-table-column prop="patent.priorityDate" min-width="100" label="优先权日" :formatter="dateFormatter">
+            <el-table-column prop="patent.type" min-width="100" label="专利类型" :formatter="typeFormatter">
             </el-table-column>
+            <el-table-column prop="applyRoute" label="申请途径" :formatter="applyRouteFormatter"> </el-table-column>
+            <el-table-column prop="patent.applicantName" label="申请人"> </el-table-column>
 
             <el-table-column label="操作" align="center" fixed="right" min-width="80">
                 <template slot-scope="{ row }">
@@ -133,10 +134,11 @@ export default {
         return {
             multipleMode: false,
             search: '',
-            url: '/countryPatent/all',
+            url: '/countryPatent/allDTO',
             downloading: false,
-            applyStatus: 'APPLY_STAGE',
-            logoWorkflow: ''
+            applyStatus: 'APPLY_STAGE,SUBSTANTIVE_STAGE,REVIEW_STAGE,GRANT_STAGE,COMPLETED',
+            logoWorkflow: '',
+            applyDate: []
         };
     },
     computed: {
@@ -154,6 +156,14 @@ export default {
         }
     },
     methods: {
+        applyStatusFormatter(status) {
+            let selectedOption = this.statusOptions.find(i => i.value === status);
+            if (selectedOption) {
+                return selectedOption;
+            } else {
+                return null;
+            }
+        },
         workflowFormatter(row, column, cellValue, index) {
             let selectedOption = this.workflowOptions.find(i => i.value === cellValue);
             if (selectedOption) {
@@ -173,7 +183,8 @@ export default {
                 search: this.search,
                 query: {
                     applyStatus: this.applyStatus,
-                    workflow: this.logoWorkflow
+                    workflow: this.logoWorkflow,
+                    applyDate: this.applyDate
                 }
             };
         },
@@ -185,7 +196,7 @@ export default {
         },
         addRow() {
             this.$router.push({
-                path: '/countryPatentEdit',
+                path: '/countryPatentAdd',
                 query: {
                     ...this.$route.query
                 }

src/main/vue/src/views/InternationalPatentList.vue

@@ -84,10 +84,10 @@
             <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="pctApplyDate" label="pct申请日"> </el-table-column>
+            <el-table-column prop="pctApplyDate" label="pct申请日" :formatter="dateFormatter"> </el-table-column>
             <el-table-column prop="pctApplyNo" label="pct申请号"> </el-table-column>
-            <el-table-column prop="patent.applyDate" min-width="100" label="申请日" :formatter="dateFormatter">
-            </el-table-column>
+            <!-- <el-table-column prop="patent.applyDate" min-width="100" label="申请日" :formatter="dateFormatter">
+            </el-table-column> -->
             <el-table-column prop="patent.priorityDate" min-width="100" label="优先权日" :formatter="dateFormatter">
             </el-table-column>