添加清空

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

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="新增附件" :visible.sync="show" center width="600px">
+    <el-dialog title="新增附件" destroy-on-close :visible.sync="show" center width="600px">
         <el-form
             hide-required-asterisk
             :model="form"

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

@@ -86,7 +86,7 @@ export default {
         fileSize: {},
         size: {
             type: Number,
-            default: 1 //单位MB
+            default: 5 //单位MB
         }
     },
     data() {

src/main/vue/src/components/domesticPatent/AddSupplierNo.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="添加供应商" :visible.sync="show" center width="600px">
+    <el-dialog title="添加供应商" :visible.sync="show" destroy-on-close center width="600px">
         <el-form
             hide-required-asterisk
             :model="form"

src/main/vue/src/components/domesticPatent/AnnualFee.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="维护年费费用" :visible.sync="show" center width="600px">
+    <el-dialog title="维护年费费用" :visible.sync="show" destroy-on-close center width="600px">
         <el-form
             hide-required-asterisk
             :model="form"

src/main/vue/src/components/domesticPatent/BackSupplier.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="上传供应商反馈文件" :visible.sync="show" center width="600px">
+    <el-dialog title="上传供应商反馈文件" :visible.sync="show" destroy-on-close center width="600px">
         <el-form
             hide-required-asterisk
             :model="form"

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

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="维护案件信息" :visible.sync="show" center width="600px">
+    <el-dialog title="维护案件信息" :visible.sync="show" destroy-on-close center width="600px">
         <el-form
             hide-required-asterisk
             :model="form"

src/main/vue/src/components/domesticPatent/Register.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="补充办登信息" :visible.sync="show" center width="600px">
+    <el-dialog title="补充办登信息" :visible.sync="show" destroy-on-close center width="600px">
         <el-form
             hide-required-asterisk
             :model="form"

src/main/vue/src/components/domesticPatent/RegisterComplate.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="办理登记" :visible.sync="show" center width="600px">
+    <el-dialog title="办理登记" :visible.sync="show" destroy-on-close center width="600px">
         <el-form
             hide-required-asterisk
             :model="form"

src/main/vue/src/components/domesticPatent/RegisterPayment.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="补充办登信息" :visible.sync="show" center width="600px">
+    <el-dialog title="补充办登信息" :visible.sync="show" destroy-on-close center width="600px">
         <el-form
             hide-required-asterisk
             :model="form"

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

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="上传答复通知" :visible.sync="show" center width="600px">
+    <el-dialog title="上传答复通知" :visible.sync="show" destroy-on-close center width="600px">
         <el-form
             hide-required-asterisk
             :model="form"

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

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="确定答复意向" :visible.sync="show" center width="600px">
+    <el-dialog title="确定答复意向" :visible.sync="show" destroy-on-close center width="600px">
         <el-form
             hide-required-asterisk
             :model="form"

src/main/vue/src/components/domesticPatent/ReplyResult.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="确定答复结果" :visible.sync="show" center width="600px">
+    <el-dialog title="确定答复结果" :visible.sync="show" destroy-on-close center width="600px">
         <el-form
             hide-required-asterisk
             :model="form"
@@ -38,7 +38,8 @@ export default {
             form: {
                 replyPassed: true
             },
-            show: false
+            show: false,
+            rules: {}
         };
     },
     methods: {

src/main/vue/src/components/domesticPatent/replySubmissions.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="上传答复意见书" :visible.sync="show" center width="600px">
+    <el-dialog title="上传答复意见书" :visible.sync="show" destroy-on-close center width="600px">
         <el-form
             hide-required-asterisk
             :model="form"

src/main/vue/src/components/fee/BackBill.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="发票回传" :visible.sync="show" center width="600px">
+    <el-dialog title="发票回传" destroy-on-close :visible.sync="show" center width="600px">
         <el-form
             hide-required-asterisk
             :model="form"

src/main/vue/src/components/fee/FeeAdd.vue

@@ -1,16 +1,16 @@
 <template>
-    <el-dialog title="新增费用" :visible.sync="show" center width="600px">
+    <el-dialog title="新增费用" destroy-on-close :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"
             class="fee"
         >
             <el-form-item prop="feeName" label="费用名称">
-                <el-select v-model="form.feeType" filterable placeholder="请选择" style="width: 100px;">
+                <el-select v-model="form.feeType" filterable placeholder="请选择" style="width: 100px">
                     <el-option
                         v-for="item in feeMaintenanceIdOptions"
                         :key="item.value"
@@ -26,7 +26,7 @@
                     allow-create
                     default-first-option
                     placeholder="请输入或选择"
-                    style="width: 170px; margin-left: 10px;"
+                    style="width: 170px; margin-left: 10px"
                 >
                     <el-option v-for="item in feeList" :key="item.value" :label="item.label" :value="item.value">
                     </el-option>
@@ -61,9 +61,9 @@
                 </el-select>
             </el-form-item>
             <el-form-item prop="amount" label="金额">
-                <el-input-number style="width: 170px;" type="number" v-model="form.amount"></el-input-number>
+                <el-input-number style="width: 170px" type="number" v-model="form.amount"></el-input-number>
                 <el-select
-                    style="width: 100px; margin-left: 10px;"
+                    style="width: 100px; margin-left: 10px"
                     v-model="form.currencyMaintenanceId"
                     filterable
                     placeholder="请选择"
@@ -83,7 +83,7 @@
                     type="date"
                     value-format="yyyy-MM-dd"
                     placeholder="选择日期"
-                    style="width: 100%;"
+                    style="width: 100%"
                 >
                 </el-date-picker>
             </el-form-item>
@@ -95,8 +95,8 @@
             </el-form-item>
 
             <el-form-item>
-                <el-button style="width: 150px;" size="normal" type="primary" @click="onSave">提交</el-button>
-                <el-button style="width: 120px;" size="normal" @click="show = false">取消</el-button>
+                <el-button style="width: 150px" size="normal" type="primary" @click="onSave">提交</el-button>
+                <el-button style="width: 120px" size="normal" @click="show = false">取消</el-button>
             </el-form-item>
         </el-form>
     </el-dialog>

src/main/vue/src/components/fee/Pay.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="支付费用" :visible.sync="show" center width="600px">
+    <el-dialog title="支付费用" destroy-on-close :visible.sync="show" center width="600px">
         <el-form
             hide-required-asterisk
             :model="form"

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

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="受理信息" :visible.sync="show" center width="600px">
+    <el-dialog title="受理信息" destroy-on-close :visible.sync="show" center width="600px">
         <el-form
             hide-required-asterisk
             :model="form"

src/main/vue/src/components/logoPatent/Announcement.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="公告初审" :visible.sync="show" center width="600px">
+    <el-dialog title="公告初审" destroy-on-close :visible.sync="show" center width="600px">
         <el-form
             hide-required-asterisk
             :model="form"

src/main/vue/src/components/logoPatent/Correction.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="受理信息" :visible.sync="show" center width="600px">
+    <el-dialog title="受理信息" destroy-on-close :visible.sync="show" center width="600px">
         <el-form
             hide-required-asterisk
             :model="form"

src/main/vue/src/components/logoPatent/Dismiss.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="驳回处理" :visible.sync="show" center width="600px">
+    <el-dialog title="驳回处理" destroy-on-close :visible.sync="show" center width="600px">
         <el-form
             hide-required-asterisk
             :model="form"

src/main/vue/src/components/logoPatent/Handle.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="证件办理" :visible.sync="show" center width="600px">
+    <el-dialog title="证件办理" destroy-on-close :visible.sync="show" center width="600px">
         <el-form
             hide-required-asterisk
             :model="form"

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

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="维护案件信息" :visible.sync="show" center width="600px">
+    <el-dialog title="维护案件信息" destroy-on-close :visible.sync="show" center width="600px">
         <el-form
             hide-required-asterisk
             :model="form"

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="确定答复意向" destroy-on-close :visible.sync="show" center width="600px">
         <el-form
             hide-required-asterisk
             :model="form"

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="审查" destroy-on-close :visible.sync="show" center width="600px">
         <el-form
             hide-required-asterisk
             :model="form"

src/main/vue/src/components/logoPatent/ReviewSeF.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="复审" :visible.sync="show" center width="600px">
+    <el-dialog title="复审" destroy-on-close :visible.sync="show" center width="600px">
         <el-form
             hide-required-asterisk
             :model="form"

src/main/vue/src/components/logoPatent/ReviewSeS.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="复审" :visible.sync="show" center width="600px">
+    <el-dialog title="复审" destroy-on-close :visible.sync="show" center width="600px">
         <el-form
             hide-required-asterisk
             :model="form"

src/main/vue/src/components/logoPatent/ReviewSeT.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="复审" :visible.sync="show" center width="600px">
+    <el-dialog title="复审" destroy-on-close :visible.sync="show" center width="600px">
         <el-form
             hide-required-asterisk
             :model="form"

src/main/vue/src/components/logoPatent/Signed.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="是否决定签约" center :visible.sync="show" width="600px">
+    <el-dialog title="是否决定签约" destroy-on-close center :visible.sync="show" width="600px">
         <el-form
             hide-required-asterisk
             :model="form"

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

@@ -18,7 +18,7 @@ export default {
                     value: 'SUBSTANTIVE_STAGE',
                     type: 'warning',
                     workflows: [
-                        { label: '待审查', value: 'PENDING_REVIEW' },
+                        { label: '待确定答复意向', value: 'PENDING_REVIEW' },
                         { label: '不答复终止', value: 'NO_REPLY' },
                         { label: '上传答复意见书', value: 'REPLY_SUBMISSIONS' }
                     ]
@@ -27,7 +27,7 @@ export default {
                     label: '复审阶段',
                     value: 'REVIEW_STAGE',
                     type: 'warning',
-                    workflows: [{ label: '上传答复结果', value: 'REPLY_RESULT' }]
+                    workflows: [{ label: '待确定答复结果', value: 'REPLY_RESULT' }]
                 },
                 {
                     label: '授权阶段',
@@ -35,7 +35,7 @@ export default {
                     type: 'info',
                     workflows: [
                         { label: '待办登', value: 'PENDING_REGISTER' },
-                        { label: '补充办登信息', value: 'PAYMENT_REGISTER' },
+                        { label: '待办登', value: 'PAYMENT_REGISTER' },
                         { label: '办理登记', value: 'REGISTER' },
                         { label: '待维护年费信息', value: 'ANNUAL_FEE' }
                     ]
@@ -47,21 +47,6 @@ export default {
                     workflows: [{ label: '已完成', value: 'COMPLETED' }]
                 }
             ],
-            workflowOptions: [
-                { 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: 'PAYMENT_REGISTER' },
-                { label: '办理登记', value: 'REGISTER' },
-                { label: '待维护年费信息', value: 'ANNUAL_FEE' },
-                { label: '已完成', value: 'COMPLETED' }
-            ],
             typeOptions: [
                 { label: '发明专利', value: 'INVENTION' },
                 { label: '实用新型专利', value: 'UTILITY_MODEL' },
@@ -69,6 +54,15 @@ export default {
             ]
         };
     },
+    computed: {
+        workflowOptions() {
+            return [...this.statusOptions]
+                .map(item => {
+                    return item.workflows;
+                })
+                .flat();
+        }
+    },
     methods: {
         applyStatusFormatter(row, column, cellValue, index) {
             let selectedOption = this.statusOptions.find(i => i.value === cellValue);

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

@@ -1,7 +1,12 @@
 <template>
     <div class="edit-view">
         <page-title>
-            <template slot="title"> 专利详情：{{ formData.name }} </template>
+            <template slot="title">
+                专利详情：{{ formData.name }}
+                <el-tag :type="statusInfo.type" style="margin-left: 10px">
+                    {{ statusInfo.label }}
+                </el-tag>
+            </template>
         </page-title>
         <el-tabs class="edit-tabs" v-model="activeName" @tab-click="tabClick">
             <div class="right-btns">
@@ -23,7 +28,7 @@
 
                 <div class="tips-text">
                     <span class="name">处理截止日期</span>
-                    <span class="val">无</span>
+                    <span class="val">{{ date }}</span>
                 </div>
 
                 <el-button @click="action" type="text" size="small">立即处理</el-button>
@@ -146,9 +151,36 @@ export default {
             } else {
                 return '';
             }
+        },
+        date() {
+            if (this.formData.workflow === 'SUPPLIER_MATERIALS') {
+                return this.formData.supplierSubmitPeriod;
+            } else {
+                return '无';
+            }
+        },
+        statusInfo() {
+            let info = [...this.statusOptions].find(item => {
+                return item.value === this.formData.applyStatus;
+            });
+
+            return (
+                info || {
+                    type: '',
+                    label: ''
+                }
+            );
         }
     },
     methods: {
+        applyStatusFormatter(status) {
+            let selectedOption = this.statusOptions.find(i => i.value === status);
+            if (selectedOption) {
+                return selectedOption;
+            } else {
+                return null;
+            }
+        },
         getInfo() {
             this.$http
                 .get('domesticPatent/getDTO/' + this.$route.query.id)