转移转换

src/main/java/com/izouma/zhirongip/domain/demand/CopyrightDemand.java

@@ -53,10 +53,11 @@ public class CopyrightDemand extends BaseEntity {
     /*
     服务没有
      */
-    @ExcelProperty(value = "转移转化方式", converter = EnumExcelConverter.class)
-    @Enumerated(EnumType.STRING)
+
+    @ApiModelProperty(value = "转移转化方式")
+    private String mode;
     @ApiModelProperty(value = "转移转化方式")
-    private TradingMethod mode;
+    private Long modeId;
 
     /*
     （万元）

src/main/java/com/izouma/zhirongip/domain/demand/LogoDemand.java

@@ -51,10 +51,11 @@ public class LogoDemand extends BaseEntity {
     @ApiModelProperty(value = "需求描述")
     private String description;
 
-    @ExcelProperty(value = "转移转化方式", converter = EnumExcelConverter.class)
-    @Enumerated(EnumType.STRING)
+
+    @ApiModelProperty(value = "转移转化方式")
+    private String mode;
     @ApiModelProperty(value = "转移转化方式")
-    private TradingMethod mode;
+    private Long modeId;
 
     /**
      *（万元）

src/main/java/com/izouma/zhirongip/domain/demand/PatentDemand.java

@@ -69,13 +69,11 @@ public class PatentDemand extends BaseEntity {
     @ApiModelProperty(value = "需求描述")
     private String description;
 
-    @EnumFormat(value = TradingMethod.class,
-            fromExcel = {"转让", "普通许可", "独占许可", "排他许可", "入股"},
-            toJavaEnum = {"TRANSFER", "GENERAL_PERMIT", "EXCLUSIVE_PERMIT", "EXCLUSIVITY_PERMIT", "INVEST"})
-    @ExcelProperty(value = "转移转化方式", converter = EnumExcelConverter.class)
-    @Enumerated(EnumType.STRING)
+
+    @ApiModelProperty(value = "转移转化方式")
+    private String mode;
     @ApiModelProperty(value = "转移转化方式")
-    private TradingMethod mode;
+    private Long modeId;
 
     /*
     （万元）

src/main/java/com/izouma/zhirongip/domain/demand/TechProductDemand.java

@@ -60,9 +60,11 @@ public class TechProductDemand extends BaseEntity {
     @ApiModelProperty(value = "所属阶段")
     private Stage stage;
 
-    @Enumerated(EnumType.STRING)
+
+    @ApiModelProperty(value = "转移转化方式")
+    private String mode;
     @ApiModelProperty(value = "转移转化方式")
-    private TechTradingMethod mode;
+    private Long modeId;
 
     /*
     （万元）

src/main/java/com/izouma/zhirongip/service/demand/CopyrightDemandService.java

@@ -27,11 +27,14 @@ public class CopyrightDemandService {
     private final InformationRepo     informationRepo;
 
     public Page<CopyrightDemand> all(PageQuery pageQuery) {
-        Map<Long, String> settingMap = settingRepo.findAllByFlagIn(CollUtil.list(false, 3, 4, 6))
+        Map<Long, String> settingMap = settingRepo.findAllByFlagIn(CollUtil.list(false, 3, 4, 6,24))
                 .stream()
                 .collect(Collectors.toMap(Setting::getId, Setting::getName));
         return copyrightDemandRepo.findAll(JpaUtils.toSpecification(pageQuery, CopyrightDemand.class), JpaUtils.toPageRequest(pageQuery))
                 .map(cd -> {
+                    if(cd.getModeId()!=null){
+                        cd.setMode(settingMap.get(cd.getModeId()));
+                    }
                     cd.setWorkName(settingMap.get(cd.getWorkType()));
                     return cd;
                 });

src/main/java/com/izouma/zhirongip/service/demand/LogoDemandService.java

@@ -1,5 +1,6 @@
 package com.izouma.zhirongip.service.demand;
 
+import cn.hutool.core.collection.CollUtil;
 import com.izouma.zhirongip.domain.Information;
 import com.izouma.zhirongip.domain.Setting;
 import com.izouma.zhirongip.domain.demand.LogoDemand;
@@ -26,10 +27,13 @@ public class LogoDemandService {
     private final InformationRepo informationRepo;
 
     public Page<LogoDemand> all(PageQuery pageQuery) {
-        Map<Long, String> settingMap = settingRepo.findAllByFlag(2).stream()
+        Map<Long, String> settingMap = settingRepo.findAllByFlagIn(CollUtil.list(false, 2 ,24)).stream()
                 .collect(Collectors.toMap(Setting::getId, Setting::getName));
         return logoDemandRepo.findAll(JpaUtils.toSpecification(pageQuery, LogoDemand.class), JpaUtils.toPageRequest(pageQuery))
                 .map(cd -> {
+                    if(cd.getModeId()!=null){
+                        cd.setMode(settingMap.get(cd.getModeId()));
+                    }
                     cd.setCategoryName(settingMap.get(cd.getCategory()));
                     return cd;
                 });

src/main/java/com/izouma/zhirongip/service/demand/PatentDemandService.java

@@ -27,10 +27,13 @@ public class PatentDemandService {
     private final InformationRepo  informationRepo;
 
     public Page<PatentDemand> all(PageQuery pageQuery) {
-        Map<Long, String> settingMap = settingRepo.findAllByFlagIn(CollUtil.list(false, 1, 13)).stream()
+        Map<Long, String> settingMap = settingRepo.findAllByFlagIn(CollUtil.list(false, 1, 13,24)).stream()
                 .collect(Collectors.toMap(Setting::getId, Setting::getName));
         return patentDemandRepo.findAll(JpaUtils.toSpecification(pageQuery, PatentDemand.class), JpaUtils.toPageRequest(pageQuery))
                 .map(cd -> {
+                    if(cd.getModeId()!=null){
+                        cd.setMode(settingMap.get(cd.getModeId()));
+                    }
                     cd.setIndustryName(settingMap.get(cd.getIndustryClass()));
                     return cd;
                 });

src/main/java/com/izouma/zhirongip/service/demand/TechProductDemandService.java

@@ -1,5 +1,6 @@
 package com.izouma.zhirongip.service.demand;
 
+import cn.hutool.core.collection.CollUtil;
 import com.izouma.zhirongip.domain.Information;
 import com.izouma.zhirongip.domain.Setting;
 import com.izouma.zhirongip.domain.demand.TechProductDemand;
@@ -26,10 +27,14 @@ public class TechProductDemandService {
     private final InformationRepo       informationRepo;
 
     public Page<TechProductDemand> all(PageQuery pageQuery) {
-        Map<Long, String> settingMap = settingRepo.findAllByFlag(1).stream()
+        Map<Long, String> settingMap = settingRepo.findAllByFlagIn(CollUtil.list(false, 1,29,30))
+                .stream()
                 .collect(Collectors.toMap(Setting::getId, Setting::getName));
         return techProductDemandRepo.findAll(JpaUtils.toSpecification(pageQuery, TechProductDemand.class), JpaUtils.toPageRequest(pageQuery))
                 .map(cd -> {
+                    if(cd.getModeId()!=null){
+                        cd.setMode(settingMap.get(cd.getModeId()));
+                    }
                     cd.setIndustryName(settingMap.get(cd.getIndustry()));
                     return cd;
                 });

src/main/java/com/izouma/zhirongip/service/supply/TechnologyProductService.java

@@ -35,7 +35,7 @@ public class TechnologyProductService {
     }
 
     public Page<TechnologyProduct> all(PageQuery pageQuery, String money) {
-        Map<Long, String> settingMap = settingRepo.findAllByFlagIn(CollUtil.list(false, 1,29))
+        Map<Long, String> settingMap = settingRepo.findAllByFlagIn(CollUtil.list(false, 1,29,30))
                 .stream()
                 .collect(Collectors.toMap(Setting::getId, Setting::getName));
         return technologyProductRepo.findAll(((root, criteriaQuery, criteriaBuilder) -> {

src/main/java/com/izouma/zhirongip/web/demand/CopyrightDemandController.java

@@ -54,6 +54,10 @@ public class CopyrightDemandController extends BaseController {
         CopyrightDemand record = copyrightDemandRepo.findById(id).orElseThrow(new BusinessException("无记录"));
         settingRepo.findById(record.getWorkType())
                 .ifPresent(setting -> record.setWorkName(setting.getName()));
+        if(record.getModeId()!=null){
+            settingRepo.findById(record.getModeId())
+                    .ifPresent(setting -> record.setMode(setting.getName()));
+        }
         return record;
     }
 

src/main/java/com/izouma/zhirongip/web/demand/LogoDemandController.java

@@ -53,6 +53,10 @@ public class LogoDemandController extends BaseController {
         LogoDemand record = logoDemandRepo.findById(id).orElseThrow(new BusinessException("无记录"));
         settingRepo.findById(record.getCategory())
                 .ifPresent(setting -> record.setCategoryName(setting.getName()));
+        if(record.getModeId()!=null){
+            settingRepo.findById(record.getModeId())
+                    .ifPresent(setting -> record.setMode(setting.getName()));
+        }
         return record;
     }
 

src/main/java/com/izouma/zhirongip/web/demand/PatentDemandController.java

@@ -53,6 +53,10 @@ public class PatentDemandController extends BaseController {
         PatentDemand record = patentDemandRepo.findById(id).orElseThrow(new BusinessException("无记录"));
         settingRepo.findById(record.getIndustryClass())
                 .ifPresent(setting -> record.setIndustryName(setting.getName()));
+        if(record.getModeId()!=null){
+            settingRepo.findById(record.getModeId())
+                    .ifPresent(setting -> record.setMode(setting.getName()));
+        }
         return record;
     }
 

src/main/java/com/izouma/zhirongip/web/demand/TechProductDemandController.java

@@ -53,6 +53,10 @@ public class TechProductDemandController extends BaseController {
         TechProductDemand record = techProductDemandRepo.findById(id).orElseThrow(new BusinessException("无记录"));
         settingRepo.findById(record.getIndustry())
                 .ifPresent(setting -> record.setIndustryName(setting.getName()));
+        if(record.getModeId()!=null){
+            settingRepo.findById(record.getModeId())
+                    .ifPresent(setting -> record.setMode(setting.getName()));
+        }
         return record;
     }
 

src/main/vue/src/components/select/ModeSelect.vue

@@ -31,7 +31,22 @@ export default {
             ]
         };
     },
-
+    created() {
+        this.$http
+            .post('/setting/byFlag', { flag: 24 })
+            .then(res => {
+                this.options = res.map(item => {
+                    return {
+                        label: item.name,
+                        value: item.id
+                    };
+                });
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+    },
     methods: {
         changeSelect(val) {
             this.$emit('input', val);

src/main/vue/src/components/select/ModeSelect2.vue

@@ -29,7 +29,6 @@ export default {
             ]
         };
     },
-
     methods: {
         changeSelect(val) {
             this.$emit('input', val);

src/main/vue/src/mixins/tradingMethod.js

@@ -2,10 +2,12 @@ import { add } from 'date-fns';
 
 export default {
     created() {
-        this.getSetting(24, 'tradingMethodOptions');
+        this.getSetting(this.flag, this.isMode ? 'modeOptions' : 'tradingMethodOptions');
     },
     data() {
         return {
+            flag: 24,
+            isMode: false,
             tradingMethodOptions: [
                 { label: '转让', value: 'TRANSFER' },
                 { label: '普通许可', value: 'GENERAL_PERMIT' },

src/main/vue/src/views/demand/CopyrightDemandEdit.vue

@@ -41,9 +41,9 @@
                     <el-form-item prop="description" label="需求描述">
                         <el-input type="textarea" :rows="4" v-model="formData.description"></el-input>
                     </el-form-item>
-                    <el-form-item prop="mode" label="交易方式" v-if="formData.type != 'SERVICE'">
+                    <el-form-item prop="modeId" label="交易方式" v-if="formData.type != 'SERVICE'">
                         <el-select
-                            v-model="formData.mode"
+                            v-model="formData.modeId"
                             clearable
                             filterable
                             placeholder="请选择"
@@ -154,7 +154,7 @@ export default {
                 ],
                 workType: [{ required: true, message: `请选择需求${this.type === 'COPY' ? '作品' : '软著'}类型` }],
                 description: [{ required: true, message: '请填写需求描述' }],
-                mode: [{ required: true, message: '请选择交易方式' }],
+                modeId: [{ required: true, message: '请选择交易方式' }],
                 expectedPrice: [
                     {
                         required: true,

src/main/vue/src/views/demand/CopyrightDemandList.vue

@@ -31,7 +31,7 @@
                 <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
             </el-input>
             <setting-select name="作品类型" :flag="3" v-model="workType" @input="getData"></setting-select>
-            <mode-select v-model="mode" @input="getData"></mode-select>
+            <mode-select v-model="modeId" @input="getData"></mode-select>
         </div>
         <el-table
             :data="tableData"
@@ -49,7 +49,7 @@
             <el-table-column prop="name" label="作品名称"> </el-table-column>
             <el-table-column prop="workName" label="作品类型"> </el-table-column>
             <el-table-column prop="description" label="需求描述"> </el-table-column>
-            <el-table-column prop="mode" label="交易方式" :formatter="tradingMethodFormatter"> </el-table-column>
+            <el-table-column prop="mode" label="交易方式"> </el-table-column>
             <el-table-column prop="expectedPrice" label="预算（万元）">
                 <template slot-scope="{ row }">
                     <span v-if="row.negotiateDirectly">面议</span>
@@ -130,7 +130,7 @@ export default {
             url: '/copyrightDemand/all',
             downloading: false,
             workType: '',
-            mode: ''
+            modeId: ''
         };
     },
     computed: {
@@ -146,7 +146,7 @@ export default {
                 query: {
                     type: 'COPY',
                     workType: this.workType,
-                    mode: this.mode
+                    modeId: this.modeId
                 }
             };
         },
@@ -183,7 +183,7 @@ export default {
                         query: {
                             type: 'COPY',
                             workType: this.workType,
-                            mode: this.mode
+                            modeId: this.modeId
                         }
                     }
                 })

src/main/vue/src/views/demand/GeneralPatentDemandList.vue

@@ -31,7 +31,7 @@
                 <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
             </el-input>
             <setting-select name="所属领域" :flag="1" v-model="industry" @input="getData"></setting-select>
-            <el-select v-model="mode" placeholder="请选择交易方式" clearable class="filter-item" @change="getData">
+            <el-select v-model="modeId" placeholder="请选择交易方式" clearable class="filter-item" @change="getData">
                 <el-option
                     v-for="item in tradingMethodOptions"
                     :key="item.value"
@@ -87,7 +87,7 @@
             <el-table-column prop="patentStatus" label="专利状态" :formatter="patentStatusFormatter"> </el-table-column>
             <el-table-column prop="industryName" label="所属领域"> </el-table-column>
             <!-- <el-table-column prop="description" label="需求描述"> </el-table-column> -->
-            <el-table-column prop="mode" label="交易方式" :formatter="tradingMethodFormatter"> </el-table-column>
+            <el-table-column prop="mode" label="交易方式"> </el-table-column>
             <el-table-column prop="expectedPrice" label="预算（万元）">
                 <template slot-scope="{ row }">
                     <span v-if="row.negotiateDirectly">面议</span>
@@ -180,7 +180,7 @@ export default {
                 { label: 'GENERAL', value: 'GENERAL' }
             ],
             industry: '',
-            mode: '',
+            modeId: '',
             patentType: '',
             patentStatus: ''
         };
@@ -219,7 +219,7 @@ export default {
                 query: {
                     caseType: 'GENERAL',
                     industryClass: this.industry,
-                    mode: this.mode,
+                    modeId: this.modeId,
                     patentType: this.patentType,
                     patentStatus: this.patentStatus
                 }
@@ -258,7 +258,7 @@ export default {
                         query: {
                             caseType: 'GENERAL',
                             industryClass: this.industry,
-                            mode: this.mode,
+                            modeId: this.modeId,
                             patentType: this.patentType,
                             patentStatus: this.patentStatus
                         }

src/main/vue/src/views/demand/LogoDemandEdit.vue

@@ -47,9 +47,9 @@
                     <el-form-item prop="description" label="需求描述">
                         <el-input type="textarea" :rows="4" v-model="formData.description"></el-input>
                     </el-form-item>
-                    <el-form-item prop="mode" label="交易方式">
+                    <el-form-item prop="modeId" label="交易方式">
                         <el-select
-                            v-model="formData.mode"
+                            v-model="formData.modeId"
                             clearable
                             filterable
                             placeholder="请选择"
@@ -158,7 +158,7 @@ export default {
                 containGraphic: [{ required: true, message: '请输入需求商标包含图形元素' }],
                 category: [{ required: true, message: '请选择商标所属分类' }],
                 description: [{ required: true, message: '请填写需求描述' }],
-                mode: [{ required: true, message: '请选择交易方式' }],
+                modeId: [{ required: true, message: '请选择交易方式' }],
                 expectedPrice: [{ required: true, validator: validatePrice, message: '请选择预算方式' }],
                 contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
                 phone: [{ required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' }],

src/main/vue/src/views/demand/LogoDemandList.vue

@@ -31,7 +31,7 @@
                 <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
             </el-input>
             <setting-select name="所属分类" :flag="2" v-model="category" @input="getData"></setting-select>
-            <mode-select v-model="mode" @input="getData"></mode-select>
+            <mode-select v-model="modeId" @input="getData"></mode-select>
         </div>
         <el-table
             :data="tableData"
@@ -51,7 +51,7 @@
             <el-table-column prop="containGraphic" label="包含图形"> </el-table-column>
             <el-table-column prop="categoryName" label="所属分类"> </el-table-column>
             <el-table-column prop="description" label="需求描述"> </el-table-column>
-            <el-table-column prop="mode" label="交易方式" :formatter="tradingMethodFormatter"> </el-table-column>
+            <el-table-column prop="mode" label="交易方式"> </el-table-column>
             <el-table-column prop="expectedPrice" label="预算（万元）">
                 <template slot-scope="{ row }">
                     <span v-if="row.negotiateDirectly">面议</span>
@@ -146,7 +146,7 @@ export default {
                 sort: 'createdAt,desc',
                 search: this.search,
                 query: {
-                    mode: this.mode,
+                    modeId: this.modeId,
                     category: this.category
                 }
             };
@@ -181,7 +181,7 @@ export default {
                     params: {
                         size: 10000,
                         query: {
-                            mode: this.mode,
+                            modeId: this.modeId,
                             category: this.category
                         }
                     }

src/main/vue/src/views/demand/PatentDemandEdit.vue

@@ -58,9 +58,9 @@
                     <el-form-item prop="description" label="需求描述">
                         <el-input type="textarea" :rows="4" v-model="formData.description"></el-input>
                     </el-form-item>
-                    <el-form-item prop="mode" label="交易方式">
+                    <el-form-item prop="modeId" label="交易方式">
                         <el-select
-                            v-model="formData.mode"
+                            v-model="formData.modeId"
                             clearable
                             filterable
                             placeholder="请选择"
@@ -188,7 +188,7 @@ export default {
                 patentStatus: [{ required: true, message: '请选择法律状态' }],
                 industryClass: [{ required: true, message: '请选择所属领域' }],
                 description: [{ required: true, message: '请填写需求描述' }],
-                mode: [{ required: true, message: '请选择交易方式' }],
+                modeId: [{ required: true, message: '请选择交易方式' }],
                 expectedPrice: [
                     {
                         required: true,

src/main/vue/src/views/demand/PatentDemandList.vue

@@ -31,7 +31,7 @@
                 <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
             </el-input>
             <setting-select name="所属领域" :flag="13" v-model="industry" @input="getData"></setting-select>
-            <el-select v-model="mode" placeholder="请选择交易方式" clearable class="filter-item" @change="getData">
+            <el-select v-model="modeId" placeholder="请选择交易方式" clearable class="filter-item" @change="getData">
                 <el-option
                     v-for="item in tradingMethodOptions"
                     :key="item.value"
@@ -59,7 +59,7 @@
             <!-- <el-table-column prop="patentStatus" label="专利状态" :formatter="patentStatusFormatter"> </el-table-column> -->
             <el-table-column prop="industryName" label="所属领域"> </el-table-column>
             <!-- <el-table-column prop="description" label="需求描述"> </el-table-column> -->
-            <el-table-column prop="mode" label="交易方式" :formatter="tradingMethodFormatter"> </el-table-column>
+            <el-table-column prop="mode" label="交易方式"> </el-table-column>
             <el-table-column prop="expectedPrice" label="预算（万元）">
                 <template slot-scope="{ row }">
                     <span v-if="row.negotiateDirectly">面议</span>
@@ -152,7 +152,7 @@ export default {
                 { label: 'GENERAL', value: 'GENERAL' }
             ],
             industry: '',
-            mode: ''
+            modeId: ''
         };
     },
     computed: {
@@ -189,7 +189,7 @@ export default {
                 query: {
                     caseType: 'DECLASSIFICATION',
                     industryClass: this.industry,
-                    mode: this.mode
+                    modeId: this.modeId
                 }
             };
         },

src/main/vue/src/views/demand/ProductDemandList.vue

@@ -31,7 +31,7 @@
                 <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
             </el-input>
             <setting-select name="所属领域" :flag="1" v-model="industry" @input="getData"></setting-select>
-            <el-select v-model="mode" placeholder="请选择交易方式" class="filter-item" clearable @change="getData">
+            <el-select v-model="modeId" placeholder="请选择交易方式" class="filter-item" clearable @change="getData">
                 <el-option
                     v-for="item in modeOptions"
                     :key="item.value"
@@ -69,7 +69,7 @@
             <!-- <el-table-column prop="patentType" label="专利类型" :formatter="patentTypeFormatter"> </el-table-column> -->
             <el-table-column prop="description" label="需求描述"> </el-table-column>
             <el-table-column prop="stage" label="所处阶段" :formatter="stageFormatter"> </el-table-column>
-            <el-table-column prop="mode" label="交易方式" :formatter="modeFormatter"> </el-table-column>
+            <el-table-column prop="mode" label="交易方式"> </el-table-column>
             <el-table-column prop="expectedPrice" label="预算（万元）">
                 <template slot-scope="{ row }">
                     <span v-if="row.negotiateDirectly">面议</span>
@@ -149,6 +149,8 @@ export default {
     components: { SettingSelect },
     data() {
         return {
+            isMode: true,
+            flag: 29,
             multipleMode: false,
             search: '',
             url: '/techProductDemand/all',
@@ -177,7 +179,7 @@ export default {
                 { label: '产品', value: 'PRODUCT' }
             ],
             industry: '',
-            mode: '',
+            modeId: '',
             patent: ''
         };
     },
@@ -222,7 +224,7 @@ export default {
                 query: {
                     tpType: 'PRODUCT',
                     industry: this.industry,
-                    mode: this.mode,
+                    modeId: this.modeId,
                     isPatented: this.patent
                 }
             };
@@ -260,7 +262,7 @@ export default {
                         query: {
                             tpType: 'PRODUCT',
                             industry: this.industry,
-                            mode: this.mode,
+                            modeId: this.modeId,
                             isPatented: this.patent
                         }
                     }

src/main/vue/src/views/demand/SoftCopyrightDemandList.vue

@@ -31,7 +31,7 @@
                 <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
             </el-input>
             <setting-select name="软著类型" :flag="4" v-model="workType" @input="getData"></setting-select>
-            <mode-select v-model="mode" @input="getData"></mode-select>
+            <mode-select v-model="modeId" @input="getData"></mode-select>
         </div>
         <el-table
             :data="tableData"
@@ -49,7 +49,7 @@
             <el-table-column prop="name" label="软著名称"> </el-table-column>
             <el-table-column prop="workName" label="软著类型"> </el-table-column>
             <el-table-column prop="description" label="需求描述"> </el-table-column>
-            <el-table-column prop="mode" label="交易方式" :formatter="tradingMethodFormatter"> </el-table-column>
+            <el-table-column prop="mode" label="交易方式"> </el-table-column>
             <el-table-column prop="expectedPrice" label="预算（万元）">
                 <template slot-scope="{ row }">
                     <span v-if="row.negotiateDirectly">面议</span>
@@ -130,7 +130,7 @@ export default {
             url: '/copyrightDemand/all',
             downloading: false,
             workType: '',
-            mode: ''
+            modeId: ''
         };
     },
     computed: {
@@ -146,7 +146,7 @@ export default {
                 query: {
                     type: 'SOFT',
                     workType: this.workType,
-                    mode: this.mode
+                    modeId: this.modeId
                 }
             };
         },
@@ -183,7 +183,7 @@ export default {
                         query: {
                             type: 'SOFT',
                             workType: this.workType,
-                            mode: this.mode
+                            modeId: this.modeId
                         }
                     }
                 })

src/main/vue/src/views/demand/TechProductDemandEdit.vue

@@ -74,9 +74,9 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item prop="mode" label="交易方式">
+                    <el-form-item prop="modeId" label="交易方式">
                         <!-- <el-select
-                            v-model="formData.mode"
+                            v-model="formData.modeId"
                             clearable
                             filterable
                             placeholder="请选择"
@@ -90,12 +90,12 @@
                             >
                             </el-option>
                         </el-select> -->
-                        <el-radio-group v-model="formData.mode" v-if="formData.tpType == 'TECHNOLOGY'">
+                        <el-radio-group v-model="formData.modeId" v-if="formData.tpType == 'TECHNOLOGY'">
                             <el-radio v-for="item in modeOptions" :key="item.value" :label="item.value">
                                 {{ item.label }}
                             </el-radio>
                         </el-radio-group>
-                        <el-radio-group v-model="formData.mode" v-else>
+                        <el-radio-group v-model="formData.modeId" v-else>
                             <el-radio v-for="item in modeOptions1" :key="item.value" :label="item.value">
                                 {{ item.label }}
                             </el-radio>
@@ -141,8 +141,10 @@
 </template>
 <script>
 import { phonePattern } from '../../utils/variables';
+import tradingMethod from '@/mixins/tradingMethod';
 export default {
     name: 'TechProductDemandEdit',
+    mixins: [tradingMethod],
     created() {
         if (this.$route.query.id) {
             this.$http
@@ -174,9 +176,12 @@ export default {
                 console.log(e);
                 this.$message.error(e.error);
             });
+        this.getSetting(29, 'modeOptions1');
     },
     data() {
         return {
+            isMode: true,
+            flag: 30,
             saving: false,
             formData: {},
             industryOptions: [],
@@ -235,7 +240,7 @@ export default {
                         trigger: 'blur'
                     }
                 ],
-                mode: [{ required: true, message: '请选择交易方式' }],
+                modeId: [{ required: true, message: '请选择交易方式' }],
                 expectedPrice: [
                     {
                         required: true,
@@ -272,13 +277,14 @@ export default {
             this.$forceUpdate();
         },
         onSave() {
-            this.$refs.form.validate(valid => {
-                if (valid) {
-                    this.submit();
-                } else {
-                    return false;
-                }
-            });
+            this.submit();
+            // this.$refs.form.validate(valid => {
+            //     if (valid) {
+            //         this.submit();
+            //     } else {
+            //         return false;
+            //     }
+            // });
         },
         submit() {
             let data = { ...this.formData };

src/main/vue/src/views/demand/TechnologyDemandList.vue

@@ -31,7 +31,7 @@
                 <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
             </el-input>
             <setting-select name="所属领域" :flag="1" v-model="industry" @input="getData"></setting-select>
-            <el-select v-model="mode" placeholder="请选择交易方式" class="filter-item" clearable @change="getData">
+            <el-select v-model="modeId" placeholder="请选择交易方式" class="filter-item" clearable @change="getData">
                 <el-option
                     v-for="item in modeOptions"
                     :key="item.value"
@@ -69,7 +69,7 @@
             <!-- <el-table-column prop="patentType" label="专利类型" :formatter="patentTypeFormatter"> </el-table-column> -->
             <el-table-column prop="description" label="需求描述"> </el-table-column>
             <el-table-column prop="stage" label="所处阶段" :formatter="stageFormatter"> </el-table-column>
-            <el-table-column prop="mode" label="交易方式" :formatter="modeFormatter"> </el-table-column>
+            <el-table-column prop="mode" label="交易方式"> </el-table-column>
             <el-table-column prop="expectedPrice" label="预算（万元）">
                 <template slot-scope="{ row }">
                     <span v-if="row.negotiateDirectly">面议</span>
@@ -144,6 +144,8 @@ export default {
     components: { SettingSelect },
     data() {
         return {
+            flag: 30,
+            isMode: true,
             multipleMode: false,
             search: '',
             url: '/techProductDemand/all',
@@ -165,7 +167,7 @@ export default {
                 { label: '产品', value: 'PRODUCT' }
             ],
             industry: '',
-            mode: '',
+            modeId: '',
             patent: ''
         };
     },
@@ -203,7 +205,7 @@ export default {
                 query: {
                     tpType: 'TECHNOLOGY',
                     industry: this.industry,
-                    mode: this.mode,
+                    modeId: this.modeId,
                     isPatented: this.patent
                 }
             };
@@ -241,7 +243,7 @@ export default {
                         query: {
                             tpType: 'TECHNOLOGY',
                             industry: this.industry,
-                            mode: this.mode,
+                            modeId: this.modeId,
                             isPatented: this.patent
                         }
                     }

src/main/vue/src/views/supply/CopyrightEdit.vue

@@ -74,9 +74,9 @@
                         >
                         </el-select>
                     </el-form-item>
-                    <el-form-item prop="tradingMethod" label="交易方式">
+                    <el-form-item prop="tradingMethodId" label="交易方式">
                         <el-select
-                            v-model="formData.tradingMethod"
+                            v-model="formData.tradingMethodId"
                             clearable
                             filterable
                             placeholder="请选择"
@@ -220,7 +220,7 @@ export default {
                         message: `请上传${this.types === 'COPY' ? '作品' : '软著'}附图`
                     }
                 ],
-                tradingMethod: [{ required: true, message: '请选择交易方式' }],
+                tradingMethodId: [{ required: true, message: '请选择交易方式' }],
                 expectedPrice: [
                     {
                         required: true,

src/main/vue/src/views/supply/CopyrightList.vue

@@ -33,7 +33,7 @@
 
             <setting-select name="作品类型" :flag="3" v-model="workType" @input="getData"></setting-select>
             <el-select
-                v-model="tradingMethod"
+                v-model="tradingMethodId"
                 placeholder="请选择交易方式"
                 clearable
                 class="filter-item"
@@ -75,8 +75,7 @@
                         :preview-src-list="row.img"
                     ></el-image> </template
             ></el-table-column>
-            <el-table-column prop="tradingMethod" label="交易方式" :formatter="tradingMethodFormatter">
-            </el-table-column>
+            <el-table-column prop="tradingMethod" label="交易方式"> </el-table-column>
             <el-table-column prop="expectedPrice" label="期望价">
                 <template slot-scope="{ row }">
                     <span v-if="row.negotiateDirectly">面议</span>
@@ -179,7 +178,7 @@ export default {
                 { label: '百分比', value: 'PERCENTAGE' }
             ],
             workType: '',
-            tradingMethod: ''
+            tradingMethodId: ''
         };
     },
     computed: {
@@ -209,7 +208,7 @@ export default {
                 query: {
                     type: 'COPY',
                     workType: this.workType,
-                    tradingMethod: this.tradingMethod
+                    tradingMethodId: this.tradingMethodId
                 }
             };
         },
@@ -246,7 +245,7 @@ export default {
                         query: {
                             type: 'COPY',
                             workType: this.workType,
-                            tradingMethod: this.tradingMethod
+                            tradingMethodId: this.tradingMethodId
                         }
                     }
                 })

src/main/vue/src/views/supply/LogoEdit.vue

@@ -77,9 +77,9 @@
                     <el-form-item prop="img" label="商标图样">
                         <multi-upload v-model="formData.img"></multi-upload>
                     </el-form-item>
-                    <el-form-item prop="tradingMethod" label="交易方式">
+                    <el-form-item prop="tradingMethodId" label="交易方式">
                         <el-select
-                            v-model="formData.tradingMethod"
+                            v-model="formData.tradingMethodId"
                             clearable
                             filterable
                             placeholder="请选择"

src/main/vue/src/views/supply/LogoList.vue

@@ -31,7 +31,7 @@
                 ></el-option>
             </el-select>
             <el-select
-                v-model="tradingMethod"
+                v-model="tradingMethodId"
                 placeholder="请选择交易方式"
                 clearable
                 class="filter-item"
@@ -84,8 +84,7 @@
                     ></el-image>
                 </template>
             </el-table-column>
-            <el-table-column prop="tradingMethod" label="交易方式" :formatter="tradingMethodFormatter">
-            </el-table-column>
+            <el-table-column prop="tradingMethod" label="交易方式"> </el-table-column>
             <el-table-column prop="expectedPrice" label="期望价">
                 <template slot-scope="{ row }">
                     <span v-if="row.negotiateDirectly">面议</span>
@@ -189,7 +188,7 @@ export default {
             ],
             category: '',
             logoType: '',
-            tradingMethod: ''
+            tradingMethodId: ''
         };
     },
     computed: {
@@ -218,7 +217,7 @@ export default {
                 search: this.search,
                 query: {
                     logoType: this.logoType,
-                    tradingMethod: this.tradingMethod,
+                    tradingMethodId: this.tradingMethodId,
                     category: this.category
                 }
             };
@@ -254,7 +253,7 @@ export default {
                         size: 10000,
                         query: {
                             logoType: this.logoType,
-                            tradingMethod: this.tradingMethod,
+                            tradingMethodId: this.tradingMethodId,
                             category: this.category
                         }
                     }

src/main/vue/src/views/supply/ProductList.vue

@@ -32,7 +32,7 @@
             </el-input>
             <setting-select name="所属领域" :flag="1" v-model="field" @input="getData"></setting-select>
             <el-select
-                v-model="tradingMethod"
+                v-model="tradingMethodId"
                 placeholder="请选择交易方式"
                 class="filter-item"
                 clearable
@@ -94,8 +94,7 @@
                     ></el-image>
                 </template>
             </el-table-column>
-            <el-table-column prop="tradingMethod" label="交易方式" :formatter="tradingMethodFormatter">
-            </el-table-column>
+            <el-table-column prop="tradingMethod" label="交易方式"> </el-table-column>
             <el-table-column prop="expectedPrice" label="期望价">
                 <template slot-scope="{ row }">
                     <span v-if="row.negotiateDirectly">面议</span>
@@ -184,6 +183,7 @@ export default {
     mixins: [pageableTable, tradingMethod],
     data() {
         return {
+            flag: 29,
             multipleMode: false,
             search: '',
             url: '/technologyProduct/all',
@@ -210,7 +210,7 @@ export default {
                 { label: '技术', value: 'TECHNOLOGY' },
                 { label: '产品', value: 'PRODUCT' }
             ],
-            tradingMethod: '',
+            tradingMethodId: '',
             stage: '',
             patent: '',
             field: ''
@@ -256,7 +256,7 @@ export default {
                 search: this.search,
                 query: {
                     tpType: 'PRODUCT',
-                    tradingMethod: this.tradingMethod,
+                    tradingMethodId: this.tradingMethodId,
                     stage: this.stage,
                     isPatented: this.patent,
                     field: this.field
@@ -295,7 +295,7 @@ export default {
                         size: 10000,
                         query: {
                             tpType: 'PRODUCT',
-                            tradingMethod: this.tradingMethod,
+                            tradingMethodId: this.tradingMethodId,
                             stage: this.stage,
                             isPatented: this.patent,
                             field: this.field

src/main/vue/src/views/supply/TechnologyList.vue

@@ -32,7 +32,7 @@
             </el-input>
             <setting-select name="所属领域" :flag="1" v-model="field" @input="getData"></setting-select>
             <el-select
-                v-model="tradingMethod"
+                v-model="tradingMethodId"
                 placeholder="请选择交易方式"
                 class="filter-item"
                 clearable
@@ -94,8 +94,7 @@
                     ></el-image>
                 </template>
             </el-table-column>
-            <el-table-column prop="tradingMethod" label="交易方式" :formatter="tradingMethodFormatter">
-            </el-table-column>
+            <el-table-column prop="tradingMethod" label="交易方式"> </el-table-column>
             <el-table-column prop="expectedPrice" label="期望价">
                 <template slot-scope="{ row }">
                     <span v-if="row.negotiateDirectly">面议</span>
@@ -184,6 +183,7 @@ export default {
     mixins: [pageableTable, tradingMethod],
     data() {
         return {
+            flag: 30,
             multipleMode: false,
             search: '',
             url: '/technologyProduct/all',
@@ -210,7 +210,7 @@ export default {
                 { label: '技术', value: 'TECHNOLOGY' },
                 { label: '产品', value: 'PRODUCT' }
             ],
-            tradingMethod: '',
+            tradingMethodId: '',
             stage: '',
             patent: '',
             field: ''
@@ -256,7 +256,7 @@ export default {
                 search: this.search,
                 query: {
                     tpType: 'TECHNOLOGY',
-                    tradingMethod: this.tradingMethod,
+                    tradingMethodId: this.tradingMethodId,
                     stage: this.stage,
                     isPatented: this.patent,
                     field: this.field
@@ -295,7 +295,7 @@ export default {
                         size: 10000,
                         query: {
                             tpType: 'TECHNOLOGY',
-                            tradingMethod: this.tradingMethod,
+                            tradingMethodId: this.tradingMethodId,
                             stage: this.stage,
                             isPatented: this.patent,
                             field: this.field

src/main/vue/src/views/supply/TechnologyProductEdit.vue

@@ -85,13 +85,13 @@
                     <el-form-item prop="img" label="附图">
                         <multi-upload v-model="formData.img"></multi-upload>
                     </el-form-item>
-                    <el-form-item prop="tradingMethod" label="交易方式">
-                        <el-radio-group v-model="formData.tradingMethod" v-if="formData.tpType == 'TECHNOLOGY'">
+                    <el-form-item prop="tradingMethodId" label="交易方式">
+                        <el-radio-group v-model="formData.tradingMethodId" v-if="formData.tpType == 'TECHNOLOGY'">
                             <el-radio v-for="item in tradingMethodOptions" :key="item.value" :label="item.value">
                                 {{ item.label }}
                             </el-radio>
                         </el-radio-group>
-                        <el-radio-group v-model="formData.tradingMethod" v-else>
+                        <el-radio-group v-model="formData.tradingMethodId" v-else>
                             <el-radio v-for="item in tradingMethodOptions1" :key="item.value" :label="item.value">
                                 {{ item.label }}
                             </el-radio>
@@ -160,6 +160,7 @@
 </template>
 <script>
 import { phonePattern } from '../../utils/variables';
+import tradingMethod from '@/mixins/tradingMethod';
 export default {
     name: 'TechnologyProductEdit',
     created() {
@@ -195,13 +196,15 @@ export default {
                 console.log(e);
                 this.$message.error(e.error);
             });
+        this.getSetting(29, 'tradingMethodOptions1');
     },
+    mixins: [tradingMethod],
     data() {
         return {
             saving: false,
             formData: {},
-
             fieldOptions: [],
+            flag: 30,
             stageOptions: [
                 { label: '研发阶段', value: 'RESEARCH_AND_DEVELOPMENT' },
                 { label: '样品阶段', value: 'SAMPLE' },
@@ -209,13 +212,7 @@ export default {
                 { label: '中试阶段', value: 'PILOT_TEST' },
                 { label: '量产阶段', value: 'MASS_PRODUCTION' }
             ],
-            tradingMethodOptions: [
-                { label: '技术转让', value: 'TRANSFER' },
-                { label: '技术许可', value: 'PERMIT' },
-                { label: '技术入股', value: 'INVEST' },
-                { label: '合作生产', value: 'CO_PRODUCTION' },
-                { label: '其他', value: 'OTHER' }
-            ],
+            tradingMethodOptions: [],
             tradingMethodOptions1: [
                 { label: '转让', value: 'TRANSFER' },
                 { label: '许可', value: 'PERMIT' },
@@ -259,7 +256,7 @@ export default {
                     }
                 ],
                 patentNo: [{ required: true, message: '请输入包含专利号' }],
-                tradingMethod: [{ required: true, message: '请选择交易方式' }],
+                tradingMethodId: [{ required: true, message: '请选择交易方式' }],
                 expectedPrice: [
                     {
                         required: true,

src/main/zhi-rong-web/src/components/list/TechProductDemandRow.vue

@@ -30,7 +30,7 @@
                 <div class="info-item">
                     <span class="text1">交易方式：</span>
                     <span v-if="info.tpType === 'PRODUCT'" class="text2">{{ modes }}</span>
-                    <span v-else class="text2">{{ mode }}</span>
+                    <span v-else class="text2">{{ info.mode }}</span>
                 </div>
                 <!-- <div class="info-item" v-if="info.isPatented">
                     <span class="text1">专利类型：</span>
@@ -115,13 +115,6 @@ export default {
 
             return info ? info.label : '';
         },
-        modes() {
-            let info = tradingMethodOptionsDemands.find(item => {
-                return item.value === this.info.mode;
-            });
-
-            return info ? info.label : '';
-        },
         patentType() {
             let info = patentTypeOptions.find(item => {
                 return item.value === this.info.patentType;

src/main/zhi-rong-web/src/components/popup/CopyrightDemandAdd.vue

@@ -40,8 +40,8 @@
                     resize="none"
                 ></el-input>
             </el-form-item>
-            <el-form-item label="交易方式" prop="mode">
-                <el-radio-group v-model="formData.mode">
+            <el-form-item label="交易方式" prop="modeId">
+                <el-radio-group v-model="formData.modeId">
                     <el-radio v-for="item in tradingMethodOption" :key="item.value" :label="item.value">
                         {{ item.label }}
                     </el-radio>
@@ -49,7 +49,7 @@
             </el-form-item>
             <el-form-item prop="expectedPrice" label="预算(万元)">
                 <el-input-number
-                    v-model="formData.expectedPrice"
+                    v-modeIdl="formData.expectedPrice"
                     :disabled="formData.negotiateDirectly"
                     @change="Price"
                     :precision="1"
@@ -117,7 +117,7 @@ export default {
                 ],
                 workType: [{ required: true, message: `请选择需求${this.type === 'COPY' ? '作品' : '软著'}类型` }],
                 description: [{ required: true, message: '请填写需求描述' }],
-                mode: [{ required: true, message: '请选择交易方式' }],
+                modeId: [{ required: true, message: '请选择交易方式' }],
                 expectedPrice: [
                     {
                         required: true,

src/main/zhi-rong-web/src/components/popup/LogoDemandAdd.vue

@@ -40,8 +40,8 @@
                     resize="none"
                 ></el-input>
             </el-form-item>
-            <el-form-item label="交易方式" prop="mode">
-                <el-radio-group v-model="formData.mode">
+            <el-form-item label="交易方式" prop="modeId">
+                <el-radio-group v-model="formData.modeId">
                     <el-radio v-for="item in tradingMethodOption" :key="item.value" :label="item.value">
                         {{ item.label }}
                     </el-radio>
@@ -130,7 +130,7 @@ export default {
                 containGraphic: [{ required: true, message: '请输入需求商标包含图形元素' }],
                 category: [{ required: true, message: '请选择商标所属分类' }],
                 description: [{ required: true, message: '请填写需求描述' }],
-                mode: [{ required: true, message: '请选择交易方式' }],
+                modeId: [{ required: true, message: '请选择交易方式' }],
                 expectedPrice: [{ required: true, validator: validatePrice, message: '请选择预算方式' }],
                 contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
                 phone: [{ required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' }],

src/main/zhi-rong-web/src/components/popup/PatentDemandAdd.vue

@@ -93,8 +93,8 @@
                     resize="none"
                 ></el-input>
             </el-form-item>
-            <el-form-item label="交易方式" prop="mode">
-                <el-radio-group v-model="formData.mode">
+            <el-form-item label="交易方式" prop="modeId">
+                <el-radio-group v-model="formData.modeId">
                     <el-radio v-for="item in tradingMethodOption" :key="item.value" :label="item.value">
                         {{ item.label }}
                     </el-radio>
@@ -211,7 +211,7 @@ export default {
                 patentStatus: [{ required: true, message: '请选择法律状态' }],
                 industryClass: [{ required: true, message: '请选择所属领域' }],
                 description: [{ required: true, message: '请填写需求描述' }],
-                mode: [{ required: true, message: '请选择交易方式' }],
+                modeId: [{ required: true, message: '请选择交易方式' }],
                 expectedPrice: [
                     {
                         required: true,
@@ -250,7 +250,6 @@ export default {
         init(types) {
             this.show = true;
             this.$nextTick(() => {
-                this.$refs.form.resetFields();
                 this.formData = {
                     userId: this.userInfo.id,
                     caseType: types,
@@ -260,6 +259,7 @@ export default {
                     phone: this.userInfo.phone,
                     email: this.userInfo.email
                 };
+                this.$refs.form.resetFields();
             });
         },
         onSave() {

src/main/zhi-rong-web/src/components/popup/TechProductDemandAdd.vue

@@ -70,15 +70,15 @@
                     </el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="交易方式" prop="mode" v-if="formData.tpType === 'TECHNOLOGY'">
-                <el-radio-group v-model="formData.mode">
+            <el-form-item label="交易方式" prop="modeId" v-if="formData.tpType === 'TECHNOLOGY'">
+                <el-radio-group v-model="formData.modeId">
                     <el-radio v-for="item in tradingMethodOptionsDemand" :key="item.value" :label="item.value">
                         {{ item.label }}
                     </el-radio>
                 </el-radio-group>
             </el-form-item>
-            <el-form-item label="交易方式" prop="mode" v-else>
-                <el-radio-group v-model="formData.mode">
+            <el-form-item label="交易方式" prop="modeId" v-else>
+                <el-radio-group v-model="formData.modeId">
                     <el-radio v-for="item in tradingMethodOptionsDemands" :key="item.value" :label="item.value">
                         {{ item.label }}
                     </el-radio>
@@ -191,7 +191,7 @@ export default {
                         trigger: 'blur'
                     }
                 ],
-                mode: [{ required: true, message: '请选择交易方式' }],
+                modeId: [{ required: true, message: '请选择交易方式' }],
                 expectedPrice: [
                     {
                         required: true,

src/main/zhi-rong-web/src/utils/getVariables.js

@@ -5,7 +5,7 @@ const flags = new Map([
     ['patentTypeOptions', 25],
     ['patentStatusOptions', 26],
     ['tradingMethodOptionsDemands',29],
-    ['tradingMethodOptionsDemand',29]
+    ['tradingMethodOptionsDemand',30]
 ])
 
 var checkList = [];

src/main/zhi-rong-web/src/views/market/CopyrightDemand.vue

@@ -61,7 +61,7 @@ export default {
                 },
                 {
                     name: '交易方式',
-                    key: 'mode',
+                    key: 'modeId',
                     list: [...this.tradingMethodOption]
                 },
                 {

src/main/zhi-rong-web/src/views/market/LogoDemand.vue

@@ -59,7 +59,7 @@ export default {
                 },
                 {
                     name: '交易方式',
-                    key: 'mode',
+                    key: 'modeId',
                     list: [...this.tradingMethodOption]
                 },
                 {

src/main/zhi-rong-web/src/views/market/PatentDemand.vue

@@ -107,7 +107,7 @@ export default {
 
                 {
                     name: '交易方式',
-                    key: 'mode',
+                    key: 'modeId',
                     list: [...this.tradingMethodOption]
                 },
                 {

src/main/zhi-rong-web/src/views/market/TechProductDemand.vue

@@ -78,7 +78,7 @@ export default {
                 },
                 {
                     name: '交易方式',
-                    key: 'mode',
+                    key: 'modeId',
                     list: [...this.tradingMethodOptionsDemand]
                 },
                 {
@@ -107,7 +107,7 @@ export default {
                 },
                 {
                     name: '交易方式',
-                    key: 'mode',
+                    key: 'modeId',
                     list: [...this.tradingMethodOptionsDemands]
                 },
                 {

src/main/zhi-rong-web/src/views/user/Demandpatent.vue

@@ -40,8 +40,8 @@
                         resize="none"
                     ></el-input>
                 </el-form-item>
-                <el-form-item label="转化类型" prop="mode">
-                    <el-radio-group v-model="formData.mode">
+                <el-form-item label="转化类型" prop="modeId">
+                    <el-radio-group v-model="formData.modeId">
                         <el-radio v-for="item in tradingMethodOptions" :key="item.value" :label="item.value">
                             {{ item.label }}
                         </el-radio>
@@ -119,7 +119,7 @@ export default {
                 keyword: [{ required: true, message: '请输入专利关键字' }],
                 industryClass: [{ required: true, message: '请选择行业分类' }],
                 description: [{ required: true, message: '请输入专利摘要' }],
-                mode: [{ required: true, message: '请选择转化类型' }],
+                modeId: [{ required: true, message: '请选择转化类型' }],
                 expectedPrice: [{ required: true, message: '请输入期望价', trigger: 'blur' }],
                 contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
                 phone: [{ required: true, message: '请输入联系电话', trigger: 'blur' }],

src/main/zhi-rong-web/src/views/user/publish/CopyrightDemandEdit.vue

@@ -43,8 +43,8 @@
                         resize="none"
                     ></el-input>
                 </el-form-item>
-                <el-form-item label="交易方式" prop="mode">
-                    <el-radio-group v-model="formData.mode">
+                <el-form-item label="交易方式" prop="modeId">
+                    <el-radio-group v-model="formData.modeId">
                         <el-radio v-for="item in tradingMethodOption" :key="item.value" :label="item.value">
                             {{ item.label }}
                         </el-radio>
@@ -167,7 +167,7 @@ export default {
                     }
                 ],
                 description: [{ required: true, message: '请填写需求描述', trigger: 'blur' }],
-                mode: [{ required: true, message: '请选择交易方式', trigger: 'blur' }],
+                modeId: [{ required: true, message: '请选择交易方式', trigger: 'blur' }],
                 expectedPrice: [
                     {
                         required: true,

src/main/zhi-rong-web/src/views/user/publish/TechProductDemandEdit.vue

@@ -79,15 +79,15 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="交易方式" prop="mode" v-if="tpType === 'TECHNOLOGY'">
-                    <el-radio-group v-model="formData.mode">
+                <el-form-item label="交易方式" prop="modeId" v-if="tpType === 'TECHNOLOGY'">
+                    <el-radio-group v-model="formData.modeId">
                         <el-radio v-for="item in tradingMethodOptionsDemand" :key="item.value" :label="item.value">
                             {{ item.label }}
                         </el-radio>
                     </el-radio-group>
                 </el-form-item>
-                <el-form-item label="交易方式" prop="mode" v-else>
-                    <el-radio-group v-model="formData.mode">
+                <el-form-item label="交易方式" prop="modeId" v-else>
+                    <el-radio-group v-model="formData.modeId">
                         <el-radio v-for="item in tradingMethodOptionsDemands" :key="item.value" :label="item.value">
                             {{ item.label }}
                         </el-radio>
@@ -220,7 +220,7 @@ export default {
                         trigger: 'blur'
                     }
                 ],
-                mode: [{ required: true, message: '请选择交易方式', trigger: 'blur' }],
+                modeId: [{ required: true, message: '请选择交易方式', trigger: 'blur' }],
                 expectedPrice: [
                     {
                         required: true,

src/main/zhi-rong-web/src/views/user/publish/logoDemandEdit.vue

@@ -41,8 +41,8 @@
                         resize="none"
                     ></el-input>
                 </el-form-item>
-                <el-form-item label="交易方式" prop="mode">
-                    <el-radio-group v-model="formData.mode">
+                <el-form-item label="交易方式" prop="modeId">
+                    <el-radio-group v-model="formData.modeId">
                         <el-radio v-for="item in tradingMethodOption" :key="item.value" :label="item.value">
                             {{ item.label }}
                         </el-radio>
@@ -150,7 +150,7 @@ export default {
                 containGraphic: [{ required: true, message: '请输入需求商标包含图形元素', trigger: 'blur' }],
                 category: [{ required: true, message: '请选择商标所属分类', trigger: 'blur' }],
                 description: [{ required: true, message: '请填写需求描述', trigger: 'blur' }],
-                mode: [{ required: true, message: '请选择交易方式', trigger: 'blur' }],
+                modeId: [{ required: true, message: '请选择交易方式', trigger: 'blur' }],
                 expectedPrice: [{ required: true, validator: validatePrice, message: '请选择预算方式' }],
                 contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
                 phone: [{ required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' }],

src/main/zhi-rong-web/src/views/user/publish/patentDemandEdit.vue

@@ -88,8 +88,8 @@
                         resize="none"
                     ></el-input>
                 </el-form-item>
-                <el-form-item label="交易方式" prop="mode">
-                    <el-radio-group v-model="formData.mode">
+                <el-form-item label="交易方式" prop="modeId">
+                    <el-radio-group v-model="formData.modeId">
                         <el-radio v-for="item in tradingMethodOption" :key="item.value" :label="item.value">
                             {{ item.label }}
                         </el-radio>
@@ -232,7 +232,7 @@ export default {
                 patentStatus: [{ required: true, message: '请选择法律状态', trigger: 'blur' }],
                 industryClass: [{ required: true, message: '请选择所属领域', trigger: 'blur' }],
                 description: [{ required: true, message: '请填写需求描述', trigger: 'blur' }],
-                mode: [{ required: true, message: '请选择交易方式', trigger: 'blur' }],
+                modeId: [{ required: true, message: '请选择交易方式', trigger: 'blur' }],
                 expectedPrice: [
                     {
                         required: true,

src/test/java/com/izouma/zhirongip/service/AllServiceTest.java

@@ -1,11 +1,19 @@
 package com.izouma.zhirongip.service;
 
 import com.izouma.zhirongip.ApplicationTests;
+import com.izouma.zhirongip.domain.demand.CopyrightDemand;
+import com.izouma.zhirongip.domain.demand.LogoDemand;
+import com.izouma.zhirongip.domain.demand.PatentDemand;
+import com.izouma.zhirongip.domain.demand.TechProductDemand;
 import com.izouma.zhirongip.domain.supply.Copyright;
 import com.izouma.zhirongip.domain.supply.Logo;
 import com.izouma.zhirongip.domain.supply.Patent;
 import com.izouma.zhirongip.domain.supply.TechnologyProduct;
 import com.izouma.zhirongip.dto.SearchDTO;
+import com.izouma.zhirongip.repo.demand.CopyrightDemandRepo;
+import com.izouma.zhirongip.repo.demand.LogoDemandRepo;
+import com.izouma.zhirongip.repo.demand.PatentDemandRepo;
+import com.izouma.zhirongip.repo.demand.TechProductDemandRepo;
 import com.izouma.zhirongip.repo.supply.CopyrightRepo;
 import com.izouma.zhirongip.repo.supply.LogoRepo;
 import com.izouma.zhirongip.repo.supply.PatentRepo;
@@ -25,13 +33,13 @@ public class AllServiceTest extends ApplicationTests {
     private ApplicationContext applicationContext;
 
     @Autowired
-    private  PatentRepo patentRepo;
+    private PatentDemandRepo patentDemandRepo;
     @Autowired
-    private LogoRepo logoRepo;
+    private LogoDemandRepo logoDemandRepo;
     @Autowired
-    private CopyrightRepo copyrightRepo;
+    private CopyrightDemandRepo copyrightDemandRepo;
     @Autowired
-    private TechnologyProductRepo technologyProductRepo;
+    private TechProductDemandRepo techProductDemandRepo;
 
     @Test
     public void search() {
@@ -48,25 +56,32 @@ public class AllServiceTest extends ApplicationTests {
 
 //    @Test
 //    public void test2() {
-//       List<Logo> logos= logoRepo.findAll();
-//        logos.forEach(item ->{
-//           if(item.getTradingMethod()!=null){
-//               item.setTradingMethodId(item.getTradingMethod().getId());
-//               logoRepo.save(item);
+//       List<PatentDemand> patents= patentDemandRepo.findAll();
+//        patents.forEach(item ->{
+//           if(item.getMode()!=null){
+//               item.setModeId(item.getMode().getId());
+//               patentDemandRepo.save(item);
 //           }
 //       });
-//        List<Copyright> copys= copyrightRepo.findAll();
+//        List<LogoDemand> logos= logoDemandRepo.findAll();
+//        logos.forEach(item ->{
+//            if(item.getMode()!=null){
+//                item.setModeId(item.getMode().getId());
+//                logoDemandRepo.save(item);
+//            }
+//        });
+//        List<CopyrightDemand> copys= copyrightDemandRepo.findAll();
 //        copys.forEach(item ->{
-//            if(item.getTradingMethod()!=null){
-//                item.setTradingMethodId(item.getTradingMethod().getId());
-//                copyrightRepo.save(item);
+//            if(item.getMode()!=null){
+//                item.setModeId(item.getMode().getId());
+//                copyrightDemandRepo.save(item);
 //            }
 //        });
-//        List<TechnologyProduct> tecs= technologyProductRepo.findAll();
-//        tecs.forEach(item ->{
-//            if(item.getTradingMethod()!=null){
-//                item.setTradingMethodId(item.getTradingMethod().getId());
-//                technologyProductRepo.save(item);
+//        List<TechProductDemand> techs= techProductDemandRepo.findAll();
+//        techs.forEach(item ->{
+//            if(item.getMode()!=null){
+//                item.setModeId(item.getMode().getId());
+//                techProductDemandRepo.save(item);
 //            }
 //        });
 //    }