费用

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

@@ -5,11 +5,12 @@
             :model="form"
             :rules="rules"
             ref="form"
-            label-width="120px"
-            style="padding-right: 120px;"
+            label-width="140px"
+            style="padding-right: 130px;"
+            class="fee"
         >
             <el-form-item prop="feeName" label="费用名称">
-                <el-select v-model="form.feeType" clearable filterable placeholder="请选择">
+                <el-select v-model="form.feeType" clearable filterable placeholder="请选择" style="width: 100px;">
                     <el-option
                         v-for="item in feeMaintenanceIdOptions"
                         :key="item.value"
@@ -18,6 +19,13 @@
                     >
                     </el-option>
                 </el-select>
+
+                <el-input
+                    v-model="form.feeName"
+                    placeholder="请输入"
+                    clearable
+                    style="width: 170px; margin-left: 10px;"
+                ></el-input>
             </el-form-item>
             <el-form-item prop="patentPartnerId" label="专利权人">
                 <el-select v-model="form.patentPartnerId" clearable filterable placeholder="请选择">
@@ -50,17 +58,15 @@
                     type="date"
                     value-format="yyyy-MM-dd"
                     placeholder="选择日期"
+                    style="width: 100%;"
                 >
                 </el-date-picker>
             </el-form-item>
             <el-form-item prop="remark" label="账单">
                 <el-input type="textarea" v-model="form.remark"></el-input>
             </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 label="账单图片" prop="bill">
+                <attachment-upload v-model="form.bill"></attachment-upload>
             </el-form-item>
 
             <el-form-item>
@@ -136,7 +142,9 @@ export default {
         return {
             show: false,
             saving: false,
-            form: {},
+            form: {
+                bill: { fileName: '', url: '', remark: '', size: '' }
+            },
             rules: {},
             feeMaintenanceIdOptions: [],
             statusOptions: [
@@ -178,4 +186,8 @@ export default {
     }
 };
 </script>
-<style lang="less" scoped></style>
+<style lang="less">
+.fee.el-form .el-select {
+    width: 100%;
+}
+</style>

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

@@ -1,6 +1,13 @@
 <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
+            hide-required-asterisk
+            :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="请输入或者选择附件">

src/main/vue/src/components/logoPatent/AttachmentList.vue

@@ -17,11 +17,19 @@
             </el-table-column>
             <el-table-column prop="fileName" min-width="120px" show-overflow-tooltip label="上传文件名称">
             </el-table-column>
-            <el-table-column prop="remark" show-overflow-tooltip label="备注"> </el-table-column>
+            <el-table-column prop="remark" show-overflow-tooltip label="备注">
+                <template slot-scope="{ row }">
+                    <span>{{ row.remark || '无' }}</span>
+                </template>
+            </el-table-column>
             <el-table-column prop="size" label="大小"> </el-table-column>
             <el-table-column prop="createdAt" show-overflow-tooltip label="上传时间"></el-table-column>
             <el-table-column prop="nickname" label="上传人" width="100px"> </el-table-column>
-            <el-table-column prop="version" label="版本" width="80px"> </el-table-column>
+            <el-table-column prop="version" label="版本" width="80px">
+                <template slot-scope="{ row }">
+                    <span>V {{ row.version }}</span>
+                </template>
+            </el-table-column>
             <el-table-column label="操作" align="center" fixed="right">
                 <template slot-scope="{ row }">
                     <el-button @click="downLoad(row)" type="primary" size="mini" plain>下载</el-button>
@@ -59,6 +67,14 @@ export default {
         }
     },
     methods: {
+        init() {
+            this.getData();
+            this.$nextTick(() => {
+                setTimeout(() => {
+                    this.tableHeight = document.querySelector('.el-table').getBoundingClientRect().height + 20;
+                }, 100);
+            });
+        },
         beforeGetData() {
             return {
                 query: {

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

@@ -1,6 +1,13 @@
 <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
+            hide-required-asterisk
+            :model="form"
+            :rules="rules"
+            ref="form"
+            label-width="120px"
+            style="padding-right: 120px;"
+        >
             <el-form-item label="选择供应商" prop="supplierPartnerId">
                 <!-- <el-input v-model="form.attachmentName" placeholder="请输入附件名"></el-input> -->
                 <el-select readonly v-model="form.supplierPartnerId" clearable filterable placeholder="请选择">

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

@@ -77,21 +77,13 @@ export default {
         submit() {
             let info = { ...this.info };
 
-            info.reviewRequire = this.form.reviewRequire;
+            info.rehearResult = this.form.rehearResult;
 
-            if (info.reviewRequire) {
+            if (info.rehearResult) {
                 this.$emit('uploadAttement', this.form.attachment1);
                 info.logoWorkflow = 'ANNOUNCEMENTS'; //待缴费
             } else {
-                info.rejectAll = this.form.rejectAll;
-                if (info.rejectAll) {
-                    this.$emit('uploadAttement', this.form.attachment2);
-                } else {
-                    this.$emit('uploadAttement', this.form.attachment3);
-                }
-
                 info.logoWorkflow = 'DISMISS';
-                info.rejectContent = this.form.rejectContent;
             }
 
             this.$emit('submit', info);

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

@@ -1,6 +1,14 @@
 <template>
     <el-dialog title="是否决定签约" center :visible.sync="show" width="600px">
-        <el-form :model="form" ref="form" :rules="rules" label-width="110px" :inline="false" size="normal">
+        <el-form
+            hide-required-asterisk
+            :model="form"
+            ref="form"
+            :rules="rules"
+            label-width="110px"
+            :inline="false"
+            size="normal"
+        >
             <el-form-item label="是否签约">
                 <el-radio-group v-model="form.check">
                     <el-radio :label="true">

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

@@ -8,7 +8,7 @@
                 <el-button type="primary" size="small" @click="$refs.attachmentAdd.show = true">新增附件</el-button>
                 <el-button type="primary" size="small">分案/接续流程</el-button>
             </div>
-            <div class="tips" v-if="nowStatus">
+            <div class="tips" v-if="nowStatus && formData.applyStatus !== 'COMPLETED'">
                 <div class="tips-text">
                     <span class="name">当前流程节点</span>
                     <span class="val">{{ nowStatus }}</span>
@@ -32,7 +32,9 @@
             <el-tab-pane label="附件列表" name="second">
                 <attachment-list ref="attachmentList" :logoPatentInfo="formData"></attachment-list>
             </el-tab-pane>
-            <el-tab-pane label="费用信息" name="third"></el-tab-pane>
+            <el-tab-pane label="费用信息" name="third">
+                <fee-list ref="feeList" :logoPatentInfo="formData"></fee-list>
+            </el-tab-pane>
             <el-tab-pane label="流程信息" name="fourth"></el-tab-pane>
         </el-tabs>
 
@@ -62,6 +64,9 @@
         <review-se-f ref="reviewSeF" :info="formData" @submit="submit" @uploadAttement="uploadAttement"></review-se-f>
 
         <review-se-s ref="reviewSeS" :info="formData" @submit="submit" @uploadAttement="uploadAttement"></review-se-s>
+
+        <review-se-t ref="reviewSeT" :info="formData" @submit="submit" @uploadAttement="uploadAttement"></review-se-t>
+        <fee-add ref="feeAdd" :logoPatentInfo="formData"></fee-add>
     </div>
 </template>
 <script>
@@ -80,6 +85,9 @@ import Handle from '../components/logoPatent/Handle.vue';
 import Dismiss from '../components/logoPatent/Dismiss.vue';
 import ReviewSeF from '../components/logoPatent/ReviewSeF.vue';
 import ReviewSeS from '../components/logoPatent/ReviewSeS.vue';
+import ReviewSeT from '../components/logoPatent/ReviewSeT.vue';
+import FeeList from '../components/fee/FeeList.vue';
+import FeeAdd from '../components/fee/FeeAdd.vue';
 export default {
     name: 'LogoPatentEdit',
     mixins: [logoPatent],
@@ -131,7 +139,9 @@ export default {
             if (this.activeName === 'first') {
                 this.$refs.base.init();
             } else if (this.activeName === 'second') {
-                this.$refs.attachmentList.getData();
+                this.$refs.attachmentList.init();
+            } else if (this.activeName === 'third') {
+                this.$refs.feeList.init();
             }
         },
         tabClick(tab) {
@@ -216,6 +226,8 @@ export default {
                 this.$refs.reviewSeF.show = true;
             } else if (this.formData.logoWorkflow === 'REVIEW_PAYMENT') {
                 this.$refs.reviewSeS.show = true;
+            } else if (this.formData.logoWorkflow === 'REVIEW') {
+                this.$refs.reviewSeT.show = true;
             }
         }
     },
@@ -233,7 +245,10 @@ export default {
         Handle,
         Dismiss,
         ReviewSeF,
-        ReviewSeS
+        ReviewSeS,
+        ReviewSeT,
+        FeeList,
+        FeeAdd
     }
 };
 </script>

src/main/vue/src/views/LogoPatentList.vue

@@ -41,8 +41,8 @@
             <el-table-column prop="applyNo" label="商标申请号"> </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" min-width="150">
                 <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>
+                    <!-- <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button> -->
                 </template>
             </el-table-column>
         </el-table>