国内

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

@@ -6,21 +6,35 @@
             :rules="rules"
             ref="form"
             label-width="140px"
-            style="padding-right: 130px;"
+            style="padding-right: 130px"
         >
-            <el-form-item label="缴费信息" prop="reHearPayment">
-                <el-input v-model="form.reHearPayment" placeholder="请输入" clearable></el-input>
+            <el-form-item prop="supplierPartnerId" label="供应商">
+                <el-select v-model="form.supplierPartnerId" clearable filterable placeholder="请选择">
+                    <el-option
+                        v-for="item in supplierPartnerIdOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
             </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 prop="supplierNo" label="供应商案号">
+                <el-input v-model="form.supplierNo" placeholder="请输入"></el-input>
+            </el-form-item>
+            <el-form-item prop="supplierSubmitPeriod" label="指定提交期限">
+                <el-date-picker
+                    v-model="form.supplierSubmitPeriod"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期"
+                >
+                </el-date-picker>
             </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-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>
@@ -35,25 +49,34 @@ export default {
     },
     data() {
         return {
-            form: {
-                attachment1: { attachmentName: '复审缴费证明', fileName: '', url: '', remark: '', size: '' }
-            },
+            form: {},
             show: false,
             rules: {
-                reHearPayment: { required: true, message: '请输入缴费信息', trigger: 'blur' },
-                attachment1: {
-                    validator: (rule, value, callback) => {
-                        if (!value.url) {
-                            callback(new Error('请上传缴费证明'));
-                        } else {
-                            callback();
-                        }
-                    },
-                    trigger: 'change'
-                }
-            }
+                supplierPartnerId: { required: true, message: '请选择供应商', trigger: 'change' },
+                supplierNo: { required: true, message: '请输入供应商案号', trigger: 'blur' },
+                supplierSubmitPeriod: { required: true, message: '请选择制定提交期限', trigger: 'change' }
+            },
+            supplierPartnerIdOptions: []
         };
     },
+    created() {
+        this.$http
+            .post('/partner/all', { size: 1000, query: { del: false, type: 'SUPPLIER' } }, { body: 'json' })
+            .then(res => {
+                if (res.content.length > 0) {
+                    this.supplierPartnerIdOptions = res.content.map(item => {
+                        return {
+                            label: item.name,
+                            value: item.id
+                        };
+                    });
+                }
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+    },
     methods: {
         onSubmit() {
             this.$refs.form.validate(valid => {
@@ -66,11 +89,11 @@ export default {
         },
         submit() {
             let info = { ...this.info };
+            info.supplierPartnerId = this.form.supplierPartnerId;
+            info.supplierNo = this.form.supplierNo;
+            info.supplierSubmitPeriod = this.form.supplierSubmitPeriod;
 
-            info.reHearPayment = this.form.reHearPayment;
-
-            this.$emit('uploadAttement', this.form.attachment1);
-            info.logoWorkflow = 'REVIEW';
+            info.workflow = 'SUPPLIER_MATERIALS';
 
             this.$emit('submit', info);
             this.show = false;
@@ -78,5 +101,11 @@ export default {
     }
 };
 </script>
-
-<style></style>
+<style lang="less" scoped>
+.el-select {
+    width: 100%;
+}
+.el-date-editor.el-input {
+    width: 100%;
+}
+</style>

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

@@ -9,13 +9,13 @@
                 label-width="200px"
                 label-position="right"
                 size="small"
-                style="width:100%"
+                style="width: 100%"
                 inline
                 center
             >
                 <div class="base-item" v-show="baseShow">
                     <el-form-item prop="name" label="专利名称">
-                        <el-input v-model="formData.name" style="width: 600px;" @change="submit"></el-input>
+                        <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="请选择">
@@ -44,7 +44,7 @@
                     </el-form-item>
                     <el-form-item prop="clientPartnerId" label="客户">
                         <el-select
-                            style="width: 200px;"
+                            style="width: 200px"
                             v-model="formData.clientPartnerId"
                             clearable
                             filterable
@@ -66,7 +66,7 @@
 
                     <el-form-item prop="supplierPartnerId" label="供应商">
                         <el-select
-                            style="width: 200px;"
+                            style="width: 200px"
                             v-model="formData.supplierPartnerId"
                             clearable
                             filterable
@@ -128,7 +128,7 @@
                     </el-form-item>
                     <el-form-item prop="applicantAddress" label="申请人地址">
                         <el-input
-                            style="width:600px;"
+                            style="width: 600px"
                             placeholder="请输入"
                             v-model="formData.applicantAddress"
                         ></el-input>
@@ -289,19 +289,7 @@ export default {
         submit() {
             let data = { ...this.formData };
 
-            this.saving = true;
-            this.$http
-                .post('/domesticPatent/saveDTO', data, { body: 'json' })
-                .then(res => {
-                    this.saving = false;
-                    this.$message.success('成功');
-                    this.$router.go(-1);
-                })
-                .catch(e => {
-                    console.log(e);
-                    this.saving = false;
-                    this.$message.error(e.error);
-                });
+            this.$emit('submit', data);
         },
         onDelete() {
             this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })

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

@@ -10,14 +10,19 @@ export default {
                         { label: '待添加供应商', value: 'ADD_SUPPLIERS' },
                         { label: '待提交供应商材料', value: 'SUPPLIER_MATERIALS' },
                         { label: '待维护案件', value: 'MAINTAIN_CASE' },
-                        { label: '待审查', value: 'PENDING_REVIEW' }
+                        { label: '待上传答复通知', value: 'PENDING_REVIEW' }
                     ]
                 },
                 {
                     label: '实审阶段',
                     value: 'SUBSTANTIVE_STAGE',
                     type: 'warning',
-                    workflows: []
+                    workflows: [
+                        { label: '待审查', value: 'PENDING_REVIEW' },
+                        { label: '不答复终止', value: 'NO_REPLY' },
+                        { label: '上传答复意见书', value: 'REPLY_SUBMISSIONS' },
+                        { label: '上传答复结果', value: 'REPLY_RESULT' }
+                    ]
                 },
                 {
                     label: '复审阶段',
@@ -31,6 +36,7 @@ export default {
                     type: 'info',
                     workflows: [
                         { label: '待办登', value: 'PENDING_REGISTER' },
+                        { label: '补充办登信息', value: 'PENDING_REGISTER' },
                         { label: '办理登记', value: 'REGISTER' },
                         { label: '待维护年费信息', value: 'ANNUAL_FEE' }
                     ]

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

@@ -39,10 +39,24 @@
             </el-tab-pane>
             <!-- <el-tab-pane label="流程信息" name="fourth"></el-tab-pane> -->
         </el-tabs>
-
         <attachment-add ref="attachmentAdd" :info="formData" @refreash="init"></attachment-add>
-
         <fee-add ref="feeAdd" isLogoPatent :info="formData" @refreash="init"></fee-add>
+
+        <add-supplier-no
+            ref="addSupplierNo"
+            :info="formData"
+            @submit="submit"
+            @uploadAttement="uploadAttement"
+        ></add-supplier-no>
+        <back-supplier ref="backSupplier" :info="formData" @submit="submit" @uploadAttement="uploadAttement">
+        </back-supplier>
+        <maintain-case
+            ref="maintainCase"
+            :info="formData"
+            @submit="submit"
+            @uploadAttement="uploadAttement"
+        ></maintain-case>
+        <reply ref="reply" :info="formData" @submit="submit" @uploadAttement="uploadAttement"></reply>
     </div>
 </template>
 <script>
@@ -52,6 +66,10 @@ import domesticPatent from '@/mixins/domesticPatent';
 import AttachmentAdd from '../components/AttachmentAdd.vue';
 import FeeList from '../components/fee/FeeList.vue';
 import FeeAdd from '../components/fee/FeeAdd.vue';
+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';
 export default {
     name: 'DomesticPatentEdit',
     mixins: [domesticPatent],
@@ -126,7 +144,7 @@ export default {
             let data = { ...info };
             this.saving = true;
             this.$http
-                .post('/domesticPatent/save', data, { body: 'json' })
+                .post('/domesticPatent/saveDTO', data, { body: 'json' })
                 .then(res => {
                     this.saving = false;
                     this.$message.success('成功');
@@ -159,7 +177,7 @@ export default {
             if (!data.url) {
                 return;
             }
-            data.patentId = this.formData.id;
+            data.patentId = this.formData.patentId;
             data.userId = this.$store.state.userInfo.id;
             data.version = 1;
             if (data.size) {
@@ -168,8 +186,14 @@ export default {
             this.$http.post('/attachment/save', data, { body: 'json' });
         },
         action() {
-            if (this.formData.logoWorkflow === 'IS_CONTRACT') {
-                this.$refs.sign.show = true;
+            if (this.formData.workflow === 'ADD_SUPPLIERS') {
+                this.$refs.addSupplierNo.show = true;
+            } else if (this.formData.workflow === 'SUPPLIER_MATERIALS') {
+                this.$refs.backSupplier.show = true;
+            } else if (this.formData.workflow === 'MAINTAIN_CASE') {
+                this.$refs.maintainCase.show = true;
+            } else if (this.formData.workflow === 'PENDING_REVIEW') {
+                this.$refs.reply.show = true;
             }
         }
     },
@@ -178,7 +202,11 @@ export default {
         attachmentList,
         AttachmentAdd,
         FeeList,
-        FeeAdd
+        FeeAdd,
+        AddSupplierNo,
+        BackSupplier,
+        MaintainCase,
+        Reply
     }
 };
 </script>