.

libs/masmgc/sms/maven-metadata-local.xml

@@ -7,6 +7,6 @@
     <versions>
       <version>1.0</version>
     </versions>
-    <lastUpdated>20231008080018</lastUpdated>
+    <lastUpdated>20231212075222</lastUpdated>
   </versioning>
 </metadata>

libs/org/libjpegturbo/mozjpeg4j/maven-metadata-local.xml

@@ -7,6 +7,6 @@
     <versions>
       <version>1.1</version>
     </versions>
-    <lastUpdated>20231008080016</lastUpdated>
+    <lastUpdated>20231212075215</lastUpdated>
   </versioning>
 </metadata>

libs/org/pngquant/pngquant4j/maven-metadata-local.xml

@@ -7,6 +7,6 @@
     <versions>
       <version>1.0</version>
     </versions>
-    <lastUpdated>20231008080017</lastUpdated>
+    <lastUpdated>20231212075221</lastUpdated>
   </versioning>
 </metadata>

pom.xml

@@ -127,6 +127,7 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <optional>true</optional>
+            <version>1.18.24</version>
         </dependency>
 
         <dependency>

src/main/java/com/izouma/zhirongip/domain/supply/Patent.java

@@ -108,9 +108,6 @@ public class Patent extends BaseEntity {
     @ApiModelProperty(value = "交易方式")
     private String tradingMethod;
 
-    @ApiModelProperty(value = "交易方式")
-    private Long tradingMethodId;
-
     /*
     （万元）
      */

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

@@ -54,9 +54,6 @@ public class PatentService {
                     if (cd.getLawStatusId() != null) {
                         cd.setLawStatus(settingMap.get(cd.getLawStatusId()));
                     }
-                    if (cd.getTradingMethodId() != null) {
-                        cd.setTradingMethod(settingMap.get(cd.getTradingMethodId()));
-                    }
                     cd.setView((long) (Math.random() * 10 + 10));
                     return cd;
                 });
@@ -78,11 +75,6 @@ public class PatentService {
                                            .orElseThrow(new BusinessException("无记录"))
                                            .getName());
         }
-        if (patent.getTradingMethodId() != null) {
-            patent.setTradingMethod(settingRepo.findById(patent.getTradingMethodId())
-                                               .orElseThrow(new BusinessException("无记录"))
-                                               .getName());
-        }
         return patent;
     }
 
@@ -156,7 +148,6 @@ public class PatentService {
                     patent.setDigest(patentExcel.getDetail());
                     patent.setManual(patentExcel.getDemand());
                     patent.setTradingMethod("转让");
-                    patent.setTradingMethodId(7232L);
                     patent.setNegotiateDirectly(true);
                 } catch (Exception e) {
                     throw new BusinessException("上传失败，请检查上传表格" + index + "行的内容");

src/main/vue/src/views/resource/CompanyEdit.vue

@@ -324,7 +324,7 @@ export default {
             .then(res => {
                 if (res.length > 0) {
                     this.settingOptions = res;
-                    this.fieldOptions = this.findChildren('行业分类');
+                    this.fieldOptions = this.findChildren('所属领域');
                     this.businessNature = this.findChildren('企业性质');
                     this.networks = this.findChildren('入网入库');
                     this.confidentialityLevels = this.findChildren('武器装备科研生产单位保密资格证');
@@ -338,7 +338,7 @@ export default {
                 }
             })
             .catch(e => {
-                console.log(e);
+                console.log(e.stack);
                 this.$message.error(e.error);
             });
     },
@@ -445,9 +445,9 @@ export default {
         },
         findChildren(name) {
             let data = this.settingOptions.find(item => {
-                if (item.name == name) return item;
+                return item.name == name;
             });
-            return data.children;
+            return data?.children || [];
         },
         addNumOfIps() {
             let list = [...this.checkedCompanyTypes].map(item => {

src/main/zhi-rong-web/src/components/PersonalInfos.vue

@@ -25,8 +25,6 @@
                         v-model="sizeForm.type"
                         @change="change(sizeForm)"
                         style="width: 300px"
-                        clearable
-                        filterable
                         :disabled="whether"
                     >
                         <el-option
@@ -38,7 +36,7 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="证件编号" prop="documentNumber">
+                <el-form-item label="证件编号" prop="documentNumber" v-if="sizeForm.type">
                     <el-input
                         style="width: 300px"
                         placeholder="请输入您的证件编号"
@@ -55,7 +53,12 @@
                     ></el-input>
                 </el-form-item>
                 <el-form-item label="邮箱" prop="email">
-                    <el-input style="width: 200px" placeholder="请输入" v-model="sizeForm.email" :disabled="whether"></el-input>
+                    <el-input
+                        style="width: 200px"
+                        placeholder="请输入"
+                        v-model="sizeForm.email"
+                        :disabled="whether"
+                    ></el-input>
                 </el-form-item>
                 <el-form-item :label="name" prop="photoFront">
                     <single-upload class="upload" v-model="sizeForm.photoFront" :disabled="whether"></single-upload>
@@ -79,7 +82,7 @@
                 </div>
             </div>
             <div class="btn">
-                <el-button type="primary" @click="individualReturn"  v-if="whether">返回</el-button>
+                <el-button type="primary" @click="individualReturn" v-if="whether">返回</el-button>
                 <el-button type="primary" @click="onSubmit" v-else>提交申请</el-button>
                 <!-- <el-button type="info" @click="$router.go(-1)">返回</el-button> -->
             </div>
@@ -107,6 +110,10 @@ export default {
                 documentNumber: [
                     {
                         required: true,
+                        message: '请输入您的证件编号',
+                        trigger: 'blur'
+                    },
+                    {
                         validator: (rule, value, callback) => {
                             if (this.sizeForm.type === 'ID_CARD') {
                                 const reg = /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/;
@@ -123,7 +130,8 @@ export default {
                                     callback();
                                 }
                             }
-                        }
+                        },
+                        trigger: 'blur'
                     }
                 ],
                 nickname: { required: true, message: '请输入您的真实姓名', trigger: 'blur' },
@@ -179,8 +187,8 @@ export default {
         });
     },
     methods: {
-        individualReturn(){
-            this.$emit('change-types', 1)
+        individualReturn() {
+            this.$emit('change-types', 1);
         },
         uploadFileFn() {
             document.getElementById('uploadFile').click();
@@ -190,7 +198,7 @@ export default {
         },
         change(e) {
             this.typeFl = e.type;
-            if(this.sizeForm.documentNumber){
+            if (this.sizeForm.documentNumber) {
                 this.sizeForm.documentNumber = '';
             }
             if (this.typeFl == 'ID_CARD') {
@@ -291,11 +299,11 @@ export default {
 /deep/ .el-button {
     width: 220px;
     height: 36px;
-    background: #405CFF;
+    background: #405cff;
     border-radius: 4px;
 }
 /deep/ .el-button--primary {
-    border-color: #405CFF;
+    border-color: #405cff;
 }
 .avatar {
     margin: 30px 0 -220px 550px;
@@ -326,3 +334,4 @@ export default {
     }
 }
 </style>
+

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

@@ -90,7 +90,7 @@
                             ></el-input>
                         </el-form-item>
                     </div>
-                    <!-- <el-form-item prop="pass">
+                    <el-form-item prop="pass">
                         <span class="el-icon-unlock"></span>
                         <el-input
                             style="width: 300px"
@@ -99,7 +99,7 @@
                             autocomplete="off"
                             placeholder="请再次输入密码"
                         ></el-input>
-                    </el-form-item> -->
+                    </el-form-item>
                 </el-form>
                 <div class="xieyi">
                     <el-checkbox v-model="checked">

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

@@ -144,11 +144,12 @@
                     filterable
                     allow-create
                     default-first-option
-                    placeholder="请输入专利权人，按回车分割"
+                    placeholder="请输入专利权人，每输入一个人名按回车确认"
                     clearable
                     popper-class="hideSelect"
                 >
                 </el-select>
+                <div style="font-size: 12px; color: #ff8700">每输入一个人名按回车确认</div>
             </el-form-item>
             <el-form-item prop="inventor" label="发明人" class="block">
                 <!-- <el-input v-model="formData.inventor"></el-input> -->
@@ -178,12 +179,13 @@
                     filterable
                     allow-create
                     default-first-option
-                    placeholder="请输入发明人，按回车分割"
+                    placeholder="请输入发明人，每输入一个人名按回车确认"
                     clearable
                     popper-class="hideSelect"
                 >
                     <div slot="empty"></div>
                 </el-select>
+                <div style="font-size: 12px; color: #ff8700">每输入一个人名按回车确认</div>
             </el-form-item>
             <el-form-item prop="img" label="专利附图" class="block">
                 <multi-upload class="imgBox" v-model="formData.img" :limit="6">
@@ -206,7 +208,7 @@
                 <rich-text v-model="formData.manual"></rich-text>
             </el-form-item>
 
-            <el-form-item prop="tradingMethodId" label="交易方式" class="block">
+            <el-form-item prop="tradingMethod" label="交易方式" class="block">
                 <!-- <el-select v-model="formData.tradingMethod" clearable filterable placeholder="请选择">
                     <el-option
                         v-for="item in tradingMethodOption"
@@ -216,12 +218,14 @@
                     >
                     </el-option>
                 </el-select> -->
-
-                <el-radio-group v-model="formData.tradingMethodId">
-                    <el-radio v-for="item in tradingMethodOption" :key="item.value" :label="item.value">
-                        {{ item.label }}
-                    </el-radio>
-                </el-radio-group>
+                <el-select v-model="formData.tradingMethod" multiple style="width: 400px !important">
+                    <el-option
+                        v-for="item in tradingMethodOption"
+                        :key="item.label"
+                        :label="item.label"
+                        :value="item.label"
+                    />
+                </el-select>
             </el-form-item>
             <div class="content" style="padding-left: 30px">
                 <el-form-item prop="expectedPrice" label="期望价（万元）">
@@ -387,7 +391,8 @@ export default {
                 inventor: [],
                 owner: [],
                 commissionType: 'COMMISSION',
-                caseType: 'GENERAL'
+                caseType: 'GENERAL',
+                tradingMethod: []
             },
             rules: {
                 name: [{ required: true, message: '请输入专利名称' }],
@@ -403,7 +408,7 @@ export default {
                 digest: [{ required: true, message: '请填写专利摘要' }],
                 manual: [{ required: true, message: '请输入权利要求书' }],
                 expectedPrice: [{ required: true, validator: validatePrice, message: '请选择期望价方式' }],
-                tradingMethodId: [{ required: true, message: '请选择交易方式' }],
+                tradingMethod: [{ required: true, message: '请选择交易方式' }],
                 contact: [{ required: true, message: '请输入联系人' }],
                 basePrice: [{ required: true, message: '请输入底价', trigger: 'blur' }],
                 phone: { required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' },
@@ -487,7 +492,7 @@ export default {
             });
         },
         submit() {
-            let data = { ...this.formData, status: 'PENDING' };
+            let data = { ...this.formData, status: 'PENDING', tradingMethod: this.formData.tradingMethod.join(',') };
             console.log(data);
             // data.owner = data.owner.join(',');
             this.saving = true;
@@ -601,3 +606,4 @@ export default {
     width: 800px !important;
 }
 </style>
+

src/main/zhi-rong-web/src/views/Register.vue

@@ -61,7 +61,7 @@
                                         <div
                                             v-if="form.phone"
                                             @click="send"
-                                            :class="time === 0 ?'code1':'code2'"
+                                            :class="time === 0 ? 'code1' : 'code2'"
                                             type="primary"
                                             :underline="false"
                                             slot="suffix"
@@ -91,16 +91,16 @@
                                 ></el-input>
                             </el-form-item>
                         </div>
-                        <!-- <el-form-item prop="pass">
-                        <span class="el-icon-unlock"></span>
-                        <el-input
-                            style="width: 300px"
-                            v-model="form.pass"
-                            type="password"
-                            autocomplete="off"
-                            placeholder="请再次输入密码"
-                        ></el-input>
-                    </el-form-item> -->
+                        <el-form-item prop="pass">
+                            <span class="el-icon-unlock"></span>
+                            <el-input
+                                style="width: 300px"
+                                v-model="form.pass"
+                                type="password"
+                                autocomplete="off"
+                                placeholder="请再次输入密码"
+                            ></el-input>
+                        </el-form-item>
                     </el-form>
                     <div class="xieyi">
                         <el-checkbox v-model="checked">
@@ -118,12 +118,15 @@
                     </div>
                     <div class="sub-btn" style="width: 300px" v-else-if="identification == 2">
                         <div class="btn-block" @click="password">确定</div>
-                        <div class="btn-blocks" @click="loginNumber">
-                            想起密码，立即登录
-                        </div>
+                        <div class="btn-blocks" @click="loginNumber">想起密码，立即登录</div>
                     </div>
                 </div>
-                <img src="../assets/icon／close@3x (1).png" alt="" @click="$router.replace('/')" class="container_login_con_return">
+                <img
+                    src="../assets/icon／close@3x (1).png"
+                    alt=""
+                    @click="$router.replace('/')"
+                    class="container_login_con_return"
+                />
             </div>
             <el-image
                 fit="cover"
@@ -176,7 +179,7 @@ export default {
             this.$router.push({
                 path: '/login',
                 query: {
-                    type: 0,
+                    type: 0
                 }
             });
         },
@@ -257,8 +260,7 @@ export default {
             });
         }
     },
-    components: {
-    }
+    components: {}
 };
 </script>
 <style lang="less" scoped>
@@ -285,7 +287,7 @@ export default {
             // top: 0;
             width: 450px;
             height: 600px;
-            background: rgba(255,255,255,0.8);
+            background: rgba(255, 255, 255, 0.8);
             border-radius: 8px 0px 0px 8px;
             backdrop-filter: blur(20px);
             z-index: 1;
@@ -353,11 +355,11 @@ export default {
 }
 /deep/ .el-form-item__content {
     display: flex;
-    border-bottom: solid 1px #DDDEE0;
+    border-bottom: solid 1px #dddee0;
 }
 /deep/ .el-input__inner {
     border: none;
-    background: rgba(255,255,255,0) !important;
+    background: rgba(255, 255, 255, 0) !important;
 }
 .el-icon-user {
     font-size: 24px;
@@ -386,7 +388,7 @@ export default {
 .code2 {
     width: 100px;
     height: 34px;
-    background: #405CFF;
+    background: #405cff;
     border-radius: 4px;
     font-size: 13px;
     font-weight: 400;
@@ -408,8 +410,8 @@ export default {
     margin-left: 60px;
     margin-bottom: 39px;
 }
-/deep/ .el-link.el-link--default{
-    color: #405CFF;
+/deep/ .el-link.el-link--default {
+    color: #405cff;
 }
 .sub-btn {
     margin-left: 60px;
@@ -418,7 +420,7 @@ export default {
     .btn-block {
         width: 330px;
         height: 40px;
-        background: #405CFF;
+        background: #405cff;
         border-radius: 4px;
         font-size: 12px;
         color: #ffffff;
@@ -454,3 +456,4 @@ export default {
     // align-items: center;
 }
 </style>
+

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

@@ -66,11 +66,12 @@
                         filterable
                         allow-create
                         default-first-option
-                        placeholder="请输入专利权人，按回车分割"
+                        placeholder="请输入专利权人，每输入一个人名按回车确认"
                         clearable
                         popper-class="hideSelect"
                     >
                     </el-select>
+                    <div style="font-size: 12px; color: #ff8700">每输入一个人名按回车确认</div>
                 </el-form-item>
 
                 <el-form-item prop="inventor" label="发明人" class="block" style="margin-right: 142px">
@@ -81,12 +82,13 @@
                         filterable
                         allow-create
                         default-first-option
-                        placeholder="请输入发明人，按回车分割"
+                        placeholder="请输入发明人，每输入一个人名按回车确认"
                         clearable
                         popper-class="hideSelect"
                     >
                         <div slot="empty"></div>
                     </el-select>
+                    <div style="font-size: 12px; color: #ff8700">每输入一个人名按回车确认</div>
                 </el-form-item>
                 <el-form-item prop="img" label="专利附图" class="block" style="margin-right: 240px">
                     <multi-upload v-model="formData.img"></multi-upload>

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

@@ -133,11 +133,12 @@
                         filterable
                         allow-create
                         default-first-option
-                        placeholder="请输入专利权人，按回车分割"
+                        placeholder="请输入专利权人，每输入一个人名按回车确认"
                         clearable
                         popper-class="hideSelect"
                     >
                     </el-select>
+                    <div style="font-size: 12px; color: #ff8700">每输入一个人名按回车确认</div>
                 </el-form-item>
 
                 <el-form-item prop="inventor" label="发明人" class="block" style="margin-right: 142px">
@@ -149,12 +150,13 @@
                         filterable
                         allow-create
                         default-first-option
-                        placeholder="请输入发明人，按回车分割"
+                        placeholder="请输入发明人，每输入一个人名按回车确认"
                         clearable
                         popper-class="hideSelect"
                     >
                         <div slot="empty"></div>
                     </el-select>
+                    <div style="font-size: 12px; color: #ff8700">每输入一个人名按回车确认</div>
                 </el-form-item>
                 <el-form-item prop="img" label="专利附图" class="block">
                     <multi-upload class="imgBox" v-model="formData.img" :limit="6">
@@ -178,12 +180,15 @@
                     <rich-text v-model="formData.manual"></rich-text>
                 </el-form-item>
 
-                <el-form-item prop="tradingMethodId" label="交易方式" class="block">
-                    <el-radio-group v-model="formData.tradingMethodId">
-                        <el-radio v-for="item in tradingMethodOption" :key="item.value" :label="item.value">
-                            {{ item.label }}
-                        </el-radio>
-                    </el-radio-group>
+                <el-form-item prop="tradingMethod" label="交易方式" class="block">
+                    <el-select v-model="formData.tradingMethod" multiple style="width: 400px !important">
+                        <el-option
+                            v-for="item in tradingMethodOption"
+                            :key="item.label"
+                            :label="item.label"
+                            :value="item.label"
+                        />
+                    </el-select>
                 </el-form-item>
 
                 <el-form-item prop="expectedPrice" label="期望价（万元）">
@@ -303,7 +308,7 @@ export default {
                 applicant: [{ required: true, message: '请输入申请人', trigger: 'blur' }],
                 digest: [{ required: true, message: '请填写专利摘要', trigger: 'blur' }],
                 manual: [{ required: true, message: '请输入专利说明', trigger: 'blur' }],
-                tradingMethodId: [{ required: true, message: '请选择交易方式', trigger: 'blur' }],
+                tradingMethod: [{ required: true, message: '请选择交易方式', trigger: 'blur' }],
                 expectedPrice: [{ required: true, validator: validatePrice, message: '请选择期望价方式' }],
                 contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
                 basePrice: [{ required: true, message: '请输入底价', trigger: 'blur' }],
@@ -338,8 +343,13 @@ export default {
             this.$http
                 .get('patent/get/' + this.$route.query.id)
                 .then(res => {
+                    if (res.owner) {
+                        res.owner = res.owner.split(',');
+                    }
+                    if (res.tradingMethod) {
+                        res.tradingMethod = res.tradingMethod.split(',');
+                    }
                     this.formData = res;
-                    this.formData.owner = res.owner.split(',');
                 })
                 .catch(e => {
                     console.log(e);
@@ -455,7 +465,8 @@ export default {
                 status: 'PENDING',
                 contact: this.userInfo.nickname,
                 phone: this.userInfo.phone,
-                email: this.userInfo.email
+                email: this.userInfo.email,
+                tradingMethod: this.formData.tradingMethod.join(','),
             };
             // data.owner = data.owner.join(',');
             this.saving = true;
@@ -560,3 +571,4 @@ export default {
     }
 }
 </style>
+