受理

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

@@ -1,21 +1,40 @@
 <template>
     <el-dialog title="受理信息" :visible.sync="show" center width="600px">
         <el-form :model="form" :rules="rules" ref="form" label-width="120px" style="padding-right: 120px;">
-            <el-form-item label="是否受理" prop="attachmentName">
-                <!-- <el-input v-model="form.attachmentName" placeholder="请输入附件名"></el-input> -->
-                <el-select readonly v-model="form.attachmentName" clearable filterable placeholder="请输入或者选择附件">
-                    <el-option
-                        v-for="item in attachmentOptions"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                    >
-                    </el-option>
-                </el-select>
+            <el-form-item label="是否受理" prop="accept">
+                <el-radio-group v-model="form.accept">
+                    <el-radio :label="true">
+                        是
+                    </el-radio>
+                    <el-radio :label="false">
+                        否
+                    </el-radio>
+                </el-radio-group>
             </el-form-item>
-            <el-form-item label="缴费通知书" prop="url">
-                <attachment-upload v-model="form" :fileSize.sync="fileSize"></attachment-upload>
+            <el-form-item label="缴费通知书" prop="attachment1" v-if="form.accept">
+                <attachment-upload
+                    v-model="form.attachment1"
+                    :fileSize.sync="form.attachment1.size"
+                ></attachment-upload>
             </el-form-item>
+            <template v-else>
+                <el-form-item label="不予受理通知书" prop="attachment2">
+                    <attachment-upload
+                        v-model="form.attachment2"
+                        :fileSize.sync="form.attachment2.size"
+                    ></attachment-upload>
+                </el-form-item>
+                <el-form-item prop="correctionPeriod" label="上传回文补正期限">
+                    <el-date-picker
+                        v-model="form.correctionPeriod"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择日期"
+                        readonly
+                    >
+                    </el-date-picker>
+                </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>
@@ -34,17 +53,35 @@ export default {
     data() {
         return {
             form: {
-                attachmentName: '缴费通知书',
-                fileName: '',
-                url: '',
-                remark: ''
+                accept: true,
+                attachment1: { attachmentName: '缴费通知书', fileName: '', url: '', remark: '', size: '' },
+                attachment2: { attachmentName: '不予受理通知书', fileName: '', url: '', remark: '', size: '' }
             },
             show: true,
             rules: {
-                attachmentName: { required: true, message: '请输入附件名称', trigger: 'blur' },
-                url: { required: true, message: '请输入附件名称', trigger: 'change' }
-            },
-            fileSize: 0
+                accept: { 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'
+                },
+                correctionPeriod: { required: true, message: '请输入上传回文补正期限', trigger: 'change' }
+            }
         };
     },
     methods: {
@@ -61,26 +98,19 @@ export default {
             this.$emit('cancel');
         },
         submit() {
-            let data = { ...this.form };
-            data.userId = this.$store.state.userInfo.id;
-            data.patentId = this.info.id;
-            data.version = 1;
-            if (this.fileSize) {
-                data.size = this.fileSize + 'KB';
+            let info = { ...this.info };
+
+            info.accept = this.form.accept;
+
+            if (info.accept) {
+                this.$emit('uploadAttement', this.form.attachment1);
+                info.logoWorkflow = 'PENDING_REVIEW';
+            } else {
+                this.$emit('uploadAttement', this.form.attachment1);
+                info.logoWorkflow = 'DISMISS';
             }
-            this.saving = true;
-            this.$http
-                .post('/attachment/save', 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', info);
         }
     }
 };

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

@@ -130,6 +130,7 @@ export default {
             let info = { ...this.info };
 
             info.supplierPartnerId = this.form.supplierPartnerId;
+            info.contract = true;
 
             this.$emit('uploadAttement', this.form.attachment1);
             this.$emit('uploadAttement', this.form.attachment2);

src/main/vue/src/views/LogoPatentEdit.vue

@@ -41,6 +41,7 @@
         <attachment-add ref="attachmentAdd" :info="formData"></attachment-add>
 
         <maintenance ref="maintenance" :info="formData" @submit="submit" @uploadAttement="uploadAttement"></maintenance>
+        <accept ref="accept" :info="formData" @submit="submit" @uploadAttement="uploadAttement"></accept>
     </div>
 </template>
 <script>
@@ -50,6 +51,7 @@ import attachmentList from '../components/logoPatent/AttachmentList.vue';
 import logoPatent from '@/mixins/logoPatent';
 import AttachmentAdd from '../components/logoPatent/AttachmentAdd.vue';
 import Maintenance from '../components/logoPatent/Maintenance.vue';
+import Accept from '../components/logoPatent/Accept.vue';
 export default {
     name: 'LogoPatentEdit',
     mixins: [logoPatent],
@@ -86,7 +88,7 @@ export default {
         user() {
             if (this.formData.logoWorkflow === 'IS_CONTRACT') {
                 return '客户经理';
-            } else if (this.formData.logoWorkflow === 'TO_BE_MAINTAINED') {
+            } else if (this.formData.logoWorkflow) {
                 return '项目经理';
             } else {
                 return '';
@@ -117,14 +119,13 @@ export default {
         },
         submit(info) {
             let data = { ...info };
-
             this.saving = true;
             this.$http
                 .post('/logoPatent/save', data, { body: 'json' })
                 .then(res => {
                     this.saving = false;
                     this.$message.success('成功');
-                    this.$router.go(-1);
+                    this.init();
                 })
                 .catch(e => {
                     console.log(e);
@@ -153,8 +154,8 @@ export default {
             if (!data.url) {
                 return;
             }
-            data.parentId = this.formData.id;
-            data.userId = this.$store.userInfo.id;
+            data.patentId = this.formData.id;
+            data.userId = this.$store.state.userInfo.id;
             this.$http.post('/attachment/save', data, { body: 'json' });
         },
         action() {
@@ -162,6 +163,8 @@ export default {
                 this.$refs.sign.show = true;
             } else if (this.formData.logoWorkflow === 'TO_BE_MAINTAINED') {
                 this.$refs.maintenance.show = true;
+            } else if (this.formData.logoWorkflow === 'PENDING') {
+                this.$refs.accept.show = true;
             }
         }
     },
@@ -170,7 +173,8 @@ export default {
         Signed,
         attachmentList,
         AttachmentAdd,
-        Maintenance
+        Maintenance,
+        Accept
     }
 };
 </script>