Merge branch 'dev' of licailing/uwip into master

src/main/vue/src/components/internationalPatent/AddSupplierNo.vue

@@ -0,0 +1,111 @@
+<template>
+    <el-dialog title="添加供应商" :visible.sync="show" destroy-on-close center width="600px">
+        <el-form
+            hide-required-asterisk
+            :model="form"
+            :rules="rules"
+            ref="form"
+            label-width="140px"
+            style="padding-right: 130px"
+        >
+            <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 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-form-item>
+        </el-form>
+    </el-dialog>
+</template>
+
+<script>
+import logoPatent from '@/mixins/logoPatent';
+export default {
+    mixins: [logoPatent],
+    props: {
+        info: {}
+    },
+    data() {
+        return {
+            form: {},
+            show: false,
+            rules: {
+                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 => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let info = { ...this.info };
+            info.supplierPartnerId = this.form.supplierPartnerId;
+            info.supplierNo = this.form.supplierNo;
+            info.supplierSubmitPeriod = this.form.supplierSubmitPeriod;
+
+            info.workflow = 'SUPPLIER_MATERIALS';
+
+            this.$emit('submit', info);
+            this.show = false;
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+.el-select {
+    width: 100%;
+}
+.el-date-editor.el-input {
+    width: 100%;
+}
+</style>

src/main/vue/src/components/internationalPatent/BackSupplier.vue

@@ -0,0 +1,110 @@
+<template>
+    <el-dialog title="上传供应商反馈文件" :visible.sync="show" destroy-on-close center width="600px">
+        <el-form
+            hide-required-asterisk
+            :model="form"
+            :rules="rules"
+            ref="form"
+            label-width="140px"
+            style="padding-right: 130px"
+        >
+            <el-form-item label="专利提交稿" prop="attachment1">
+                <attachment-upload
+                    v-model="form.attachment1"
+                    :fileSize.sync="form.attachment1.size"
+                ></attachment-upload>
+            </el-form-item>
+
+            <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="attachment3" label="供应商请款单">
+                <attachment-upload
+                    v-model="form.attachment3"
+                    :fileSize.sync="form.attachment3.size"
+                ></attachment-upload>
+            </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-form-item>
+        </el-form>
+    </el-dialog>
+</template>
+
+<script>
+import logoPatent from '@/mixins/logoPatent';
+export default {
+    mixins: [logoPatent],
+    props: {
+        info: {}
+    },
+    data() {
+        return {
+            form: {
+                attachment1: { attachmentName: '专利提交稿', fileName: '', url: '', remark: '', size: '' },
+                attachment2: { attachmentName: '电子申请回执', fileName: '', url: '', remark: '', size: '' },
+                attachment3: { attachmentName: '供应商请款单', fileName: '', url: '', remark: '', size: '' }
+            },
+            show: false,
+            rules: {
+                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'
+                },
+                attachment3: {
+                    validator: (rule, value, callback) => {
+                        if (!value.url) {
+                            callback(new Error('请上传供应商请款单'));
+                        } else {
+                            callback();
+                        }
+                    },
+                    trigger: 'change'
+                }
+            }
+        };
+    },
+    methods: {
+        onSubmit() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let info = { ...this.info };
+
+            this.$emit('uploadAttement', this.form.attachment1);
+            this.$emit('uploadAttement', this.form.attachment2);
+            this.$emit('uploadAttement', this.form.attachment3);
+            info.workflow = 'MAINTAIN_CASE';
+            this.$emit('submit', info);
+            this.show = false;
+        }
+    }
+};
+</script>

src/main/vue/src/components/internationalPatent/Reply.vue

@@ -86,7 +86,7 @@ export default {
             this.$emit('uploadAttement', this.form.attachment1);
             info.officialPeriod = this.form.officialPeriod;
             info.submitPeriod = this.form.submitPeriod;
-            info.workflow = 'REPLY_SUBMISSION';
+            info.workflow = 'REPLY_SUBMISSIONS';
             this.$emit('submit', info);
             this.show = false;
         }

src/main/vue/src/mixins/internationalPatent.js

@@ -12,7 +12,7 @@ export default {
                         { label: '维护案件信息', value: 'MAINTAIN_CASE' },
                         { label: '待官文流转', value: 'OFFICIAL_CIRCULATION' },
                         { label: '待补正答复', value: 'SUPPLEMENTARY_REPLY' },
-                        { label: '待上传答复意见书', value: 'REPLY_SUBMISSION' },
+                        { label: '待上传答复意见书', value: 'REPLY_SUBMISSIONS' },
                         { label: '待确认答复状态', value: 'CONFIRM_REPLY' },
                         { label: '已完成', value: 'COMPLETED' }
                     ]
@@ -34,7 +34,7 @@ export default {
                     type: 'warning',
                     workflows: [
                         { label: '待补正答复', value: 'SUPPLEMENTARY_REPLY' },
-                        { label: '待上传答复意见书', value: 'REPLY_SUBMISSION' }
+                        { label: '待上传答复意见书', value: 'REPLY_SUBMISSIONS' }
                     ]
                 },
                 {

src/main/vue/src/views/InternationalPatentEdit.vue

@@ -75,6 +75,18 @@
             @submit="submit"
             @uploadAttement="uploadAttement"
         ></reply-result>
+        <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>
     </div>
 </template>
 <script>
@@ -90,6 +102,8 @@ import ReplySubmissions from '../components/internationalPatent/replySubmissions
 import ReplyResult from '../components/internationalPatent/ReplyResult.vue';
 import Workflow from '../components/Workflow.vue';
 import OfficeAttachment from '../components/internationalPatent/OfficeAttachment.vue';
+import AddSupplierNo from '../components/internationalPatent/AddSupplierNo.vue';
+import BackSupplier from '../components/internationalPatent/BackSupplier.vue';
 export default {
     name: 'InternationalPatentEdit',
     mixins: [internationalPatent],
@@ -134,7 +148,7 @@ export default {
         date() {
             if (this.formData.workflow === 'SUPPLIER_MATERIALS') {
                 return this.formData.supplierSubmitPeriod;
-            } else if (this.formData.workflow === 'REPLY_SUBMISSION') {
+            } else if (this.formData.workflow === 'REPLY_SUBMISSIONS') {
                 return this.formData.submitPeriod;
             } else {
                 return '无';
@@ -255,7 +269,7 @@ export default {
                 this.$refs.officeAttachment.show = true;
             } else if (this.formData.workflow === 'SUPPLEMENTARY_REPLY') {
                 this.$refs.reply.show = true;
-            } else if (this.formData.workflow === 'REPLY_SUBMISSION') {
+            } else if (this.formData.workflow === 'REPLY_SUBMISSIONS') {
                 this.$refs.replySubmissions.show = true;
             } else if (this.formData.workflow === 'CONFIRM_REPLY') {
                 this.$refs.replyResult.show = true;
@@ -272,7 +286,9 @@ export default {
         Reply,
         ReplySubmissions,
         ReplyResult,
-        OfficeAttachment
+        OfficeAttachment,
+        AddSupplierNo,
+        BackSupplier
     }
 };
 </script>