专利申请

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

@@ -60,8 +60,22 @@ export default {
         };
     },
     methods: {
+        applyStatusFormatter(row, column, cellValue, index) {
+            let selectedOption = this.statusOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
+        typeFormatter(row, column, cellValue, index) {
+            let selectedOption = this.typeOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
         statusFormatter(row, column, cellValue, index) {
-            let selectedOption = this.applyStatusOptions.find(i => i.value === cellValue);
+            let selectedOption = this.statusOptions.find(i => i.value === cellValue);
             if (selectedOption) {
                 return selectedOption.label;
             }

src/main/vue/src/mixins/pageableTable.js

@@ -7,7 +7,7 @@ export default {
             totalElements: 0,
             tableData: [],
             sort: {},
-            sortStr: '',
+            sortStr: 'id,desc',
             tableHeight: 200,
             tableLoading: false
         };

src/main/vue/src/views/DomesticPatentAdd.vue

@@ -12,6 +12,7 @@
                     label-position="right"
                     size="small"
                     style="width: 578px;"
+                    hide-required-asterisk
                 >
                     <el-form-item prop="name" label="专利名称">
                         <el-input style="width: 300px;" v-model="formData.name" placeholder="请输入"></el-input>
@@ -101,10 +102,8 @@
                     </el-form-item>
 
                     <el-form-item class="form-submit">
-                        <el-button @click="onSave" :loading="saving" size="default" type="primary">保存 </el-button>
-                        <el-button @click="onDelete" :loading="saving" size="default" type="danger" v-if="formData.id"
-                            >删除
-                        </el-button>
+                        <el-button @click="onSave" :loading="saving" size="default" type="primary">确认 </el-button>
+
                         <el-button @click="$router.go(-1)" size="default">取消</el-button>
                     </el-form-item>
                 </el-form>
@@ -114,6 +113,7 @@
 </template>
 <script>
 import domesticPatent from '@/mixins/domesticPatent';
+import { format } from 'date-fns';
 export default {
     name: 'DomesticPatentEdit',
     mixins: [domesticPatent],
@@ -138,20 +138,22 @@ export default {
     data() {
         return {
             saving: false,
-            formData: {},
+            formData: {
+                deduction: false,
+                essentialReview: false,
+                publicInAdvance: false,
+                chapterAcceptanceNotice: false,
+                chapterPaymentNotice: false
+            },
             rules: {
                 name: { required: true, message: '请输入专利名称', trigger: 'blur' },
-                name: { required: true, message: '请输入专利名称', trigger: 'blur' },
-                attachment3: {
-                    validator: (rule, value, callback) => {
-                        if (!value.url) {
-                            callback(new Error('请上传商标部分驳回通知书'));
-                        } else {
-                            callback();
-                        }
-                    },
-                    trigger: 'change'
-                }
+                type: { required: true, message: '请选择专利类型', trigger: 'change' },
+                clientPartnerId: { required: true, message: '请选择选择客户', trigger: 'change' },
+                applicantName: { required: true, message: '请输入申请人名称', trigger: 'blur' },
+                applicantAddress: { required: true, message: '请输入申请人地址', trigger: 'blur' },
+                applicantUscc: { required: true, message: '请输入申请人统一社会信用代码', trigger: 'blur' },
+                inventorName: { required: true, message: '请输入发明人姓名', trigger: 'blur' },
+                inventorIdno: { required: true, message: '请输入第一发明人身份证号码', trigger: 'blur' }
             },
             clientPartnerIdOptions: [],
             workflowOptions: [
@@ -189,7 +191,8 @@ export default {
         },
         submit() {
             let data = { ...this.formData };
-
+            data.applyDate = format(new Date(), 'yyyy-MM-dd');
+            data.workflow = 'ADD_SUPPLIERS';
             this.saving = true;
             this.$http
                 .post('/domesticPatent/saveDTO', data, { body: 'json' })

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

@@ -54,46 +54,32 @@
             cell-class-name="table-cell"
             :height="tableHeight"
         >
-            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
-            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
-            <el-table-column prop="workflow" label="流程" :formatter="workflowFormatter"> </el-table-column>
-            <el-table-column prop="applicantUscc" label="申请人统一社会信用代码"> </el-table-column>
-            <el-table-column prop="inventorIdno" label="第一发明人身份证"> </el-table-column>
-            <el-table-column prop="deduction" label="是否请求费减"> </el-table-column>
-            <el-table-column prop="essentialReview" label="是否请求实质审查"> </el-table-column>
-            <el-table-column prop="publicInAdvance" label="是否申请提前公开"> </el-table-column>
-            <el-table-column prop="chapterAcceptanceNotice" label="是否申请红章受理通知书"> </el-table-column>
-            <el-table-column prop="chapterPaymentNotice" label="是否申请红章缴费通知书"> </el-table-column>
-            <el-table-column prop="decideReply" label="是否决定答复">
+            <el-table-column align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="patent" label="案件状态">
                 <template slot-scope="{ row }">
-                    <el-tag :type="row.decideReply ? '' : 'info'">{{ row.decideReply }}</el-tag>
+                    <el-tag
+                        v-if="row.patent && row.patent.applyStatus"
+                        :type="applyStatusFormatter(row.patent.applyStatus).type"
+                        >{{ applyStatusFormatter(row.patent.applyStatus).label }}</el-tag
+                    >
                 </template>
             </el-table-column>
-            <el-table-column prop="isClientReady" label="准备答复意见">
-                <template slot-scope="{ row }">
-                    <el-tag :type="row.isClientReady ? '' : 'info'">{{ row.isClientReady }}</el-tag>
-                </template>
+            <el-table-column prop="patent.uwNo" min-width="140" label="寰球案号"> </el-table-column>
+            <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="replyPassed" label="是否通过答复">
-                <template slot-scope="{ row }">
-                    <el-tag :type="row.replyPassed ? '' : 'info'">{{ row.replyPassed }}</el-tag>
-                </template>
+            <el-table-column prop="patent.createdAt" min-width="100" label="申请日" :formatter="dateFormatter">
             </el-table-column>
-            <el-table-column prop="registerNotice" label="办登通知日"> </el-table-column>
-            <el-table-column prop="registerEndDate" label="办登截止日"> </el-table-column>
-            <el-table-column prop="feeRemark" label="费用备注"> </el-table-column>
-            <el-table-column prop="payment" label="是否已缴费">
-                <template slot-scope="{ row }">
-                    <el-tag :type="row.payment ? '' : 'info'">{{ row.payment }}</el-tag>
-                </template>
+            <el-table-column prop="patent.type" min-width="100" label="专利类型" :formatter="typeFormatter">
             </el-table-column>
-            <el-table-column prop="annualFee" label="年费"> </el-table-column>
-            <el-table-column prop="feePaymentPeriod" label="年费支付期限"> </el-table-column>
-            <el-table-column prop="bill" label="账单"> </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" min-width="150">
+            <el-table-column prop="patent.applyNo" min-width="120" label="国内申请号"> </el-table-column>
+            <el-table-column prop="patent.applicantName" min-width="140" label="申请人"> </el-table-column>
+            <el-table-column prop="applicantUscc" min-width="160" label="申请人统一社会信用代码"> </el-table-column>
+            <el-table-column prop="patent.inventorName" min-width="120" label="发明人姓名"> </el-table-column>
+            <el-table-column prop="inventorIdno" min-width="120" label="第一发明人身份证"> </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="80">
                 <template slot-scope="{ row }">
-                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
-                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>查看详情</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -132,7 +118,7 @@ export default {
         return {
             multipleMode: false,
             search: '',
-            url: '/domesticPatent/all',
+            url: '/domesticPatent/allDTO',
             downloading: false,
             applyStatus: 'APPLY_STAGE',
             logoWorkflow: ''
@@ -153,6 +139,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) {
@@ -165,7 +159,7 @@ export default {
                 search: this.search,
                 query: {
                     applyStatus: this.applyStatus,
-                    logoWorkflow: this.logoWorkflow
+                    workflow: this.logoWorkflow
                 }
             };
         },