费用

src/main/java/com/izouma/uwip/domain/Fee.java

@@ -22,8 +22,11 @@ public class Fee extends BaseEntity {
     @ApiModelProperty(value = "专利id")
     private Long patentId;
 
-    @ApiModelProperty(value = "官费类型名称id")
-    private Long feeMaintenanceId;
+    @ApiModelProperty(value = "官费类型")
+    private String feeType;
+
+    @ApiModelProperty(value = "费用名称")
+    private String feeName;
 
     private PayStatus status;
 

src/main/vue/src/views/FeeEdit.vue

@@ -22,8 +22,19 @@
                     <el-form-item prop="patentId" label="专利id">
                         <el-input-number type="number" v-model="formData.patentId"></el-input-number>
                     </el-form-item>
-                    <el-form-item prop="feeMaintenanceId" label="官费类型名称id">
-                        <el-select v-model="formData.feeMaintenanceId" clearable filterable placeholder="请选择">
+                    <el-form-item prop="feeType" label="费用类型">
+                        <el-select v-model="formData.feeType" clearable filterable placeholder="请选择">
+                            <el-option
+                                v-for="item in feeMaintenanceIdOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="feeName" label="费用名称">
+                        <el-select v-model="formData.feeType" clearable filterable placeholder="请选择">
                             <el-option
                                 v-for="item in feeMaintenanceIdOptions"
                                 :key="item.value"
@@ -58,7 +69,7 @@
                     <el-form-item prop="payPartnerId" label="支付对象">
                         <el-select v-model="formData.payPartnerId" clearable filterable placeholder="请选择">
                             <el-option
-                                v-for="item in payPartnerIdOptions"
+                                v-for="item in patentPartnerIdOptions"
                                 :key="item.value"
                                 :label="item.label"
                                 :value="item.value"
@@ -135,7 +146,7 @@ export default {
                 });
         }
         this.$http
-            .get('/maintenance/byDesc', { size: 1000, query: { del: false } })
+            .post('/maintenance/byDesc', { description: 'FeeType' })
             .then(res => {
                 if (res.content.length > 0) {
                     res.content.forEach(item => {
@@ -151,7 +162,7 @@ export default {
                 this.$message.error(e.error);
             });
         this.$http
-            .get('/partner/all', { size: 1000, query: { del: false } })
+            .post('/partner/all', { size: 1000, query: { del: false } }, { body: 'json' })
             .then(res => {
                 if (res.content.length > 0) {
                     res.content.forEach(item => {
@@ -166,24 +177,24 @@ export default {
                 console.log(e);
                 this.$message.error(e.error);
             });
+        // this.$http
+        //     .get('/partner/all', { size: 1000, query: { del: false } })
+        //     .then(res => {
+        //         if (res.content.length > 0) {
+        //             res.content.forEach(item => {
+        //                 this.payPartnerIdOptions.push({
+        //                     label: item.name,
+        //                     value: item.id
+        //                 });
+        //             });
+        //         }
+        //     })
+        //     .catch(e => {
+        //         console.log(e);
+        //         this.$message.error(e.error);
+        //     });
         this.$http
-            .get('/partner/all', { size: 1000, query: { del: false } })
-            .then(res => {
-                if (res.content.length > 0) {
-                    res.content.forEach(item => {
-                        this.payPartnerIdOptions.push({
-                            label: item.name,
-                            value: item.id
-                        });
-                    });
-                }
-            })
-            .catch(e => {
-                console.log(e);
-                this.$message.error(e.error);
-            });
-        this.$http
-            .get('/maintenance/getTree', { size: 1000, query: { del: false } })
+            .post('/maintenance/getTree')
             .then(res => {
                 if (res.content.length > 0) {
                     res.content.forEach(item => {