Merge remote-tracking branch 'origin/master'

src/views/innovatecompany/lreleaseproject/viewproject.vue

@@ -271,7 +271,7 @@
 
 
         <el-row style="padding: 15px 0; text-align: center; width:calc(100% - 210px);z-index: 99;position: fixed;bottom: 0px;right: 0px;background:rgba(255,255,255,1);box-shadow:0px -5px 10px 0px rgba(0,0,0,0.1);">
-            <el-button v-if="state" type="primary" style="width: 180px;height: 42px" @click="editData" >修改项目信息</el-button>
+            <el-button v-if="state" type="primary" style="width: 180px;height: 42px" @click="editData" :disabled="authenticationState=='AS02'">修改项目信息</el-button>
             <el-button v-if="isbtntype" type="warning" style="width: 180px;height: 42px" @click="communicate">{{communicatedName}}</el-button>
             <el-button type="primary" v-if="!isbtn&&isbtntype" style="width: 180px;height: 42px" @click="collection" plain>收藏</el-button>
             <el-button v-if="isbtn&&isbtntype" style="width: 180px;height: 42px" disabled>已收藏</el-button>

src/views/innovatecompany/mycollection/collectionlist.vue

@@ -12,7 +12,7 @@
                                 <el-col :span="20">
                                     <p class="namep" style="font-weight: bold">{{scope.row.projectName}}</p>
                                     <p style="color:#9197B4;overflow: hidden;text-overflow:ellipsis;white-space: nowrap;font-size: 12px">{{scope.row.companyIntroduction}}</p>
-                                    <span style="margin-right: 5px; padding: 2px 5px; border: 1px solid #FF9E29;color: #FF9E29;border-radius:3px;font-size: 12px;" v-if="scope.row.companyIndustryList">{{scope.row.companyIndustryList[0]}}</span>
+                                    <span style="margin-right: 5px; padding: 2px 5px; border: 1px solid #FF9E29;color: #FF9E29;border-radius:3px;font-size: 12px;" v-if="scope.row.projectIndustryList" v-for="(item,index) in scope.row.projectIndustryList" :key="index">{{item}}</span>
                                     <span style="margin-right: 5px;padding: 2px 5px; border: 1px solid #5D78FF;color: #5D78FF;border-radius:3px;font-size: 12px;" v-if="scope.row.projectPhase">{{scope.row.projectPhase}}</span>
                                     <span style="padding: 2px 5px; border: 1px solid #0ABB87;color: #0ABB87;border-radius:3px;font-size: 12px;" v-if="scope.row.projectModel">{{scope.row.projectModel}}</span>
                                 </el-col>

src/views/innovatecompany/submitprojects/submitfour.vue

@@ -269,7 +269,7 @@
                                 return
                             }
                         }
-                        const zzI = /^(([A-Za-z0-9-~]+)\\.)+([A-Za-z0-9-~\\/])+$/;
+                        const zzI = /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/|www\.)(([A-Za-z0-9-~]+)\.)+([A-Za-z0-9-~\/])+$/;
                         for(let i in this.formData.companyEventList){
                             if(this.formData.companyEventList[i].eventDate == '' || this.formData.companyEventList[i].eventUrl == '' || this.formData.companyEventList[i].eventDes == ''){
                                 this.$message.error('请将公司大事件信息填写完整');
@@ -297,7 +297,7 @@
                                 return
                             }
                         }
-                        const zzI = /^(([A-Za-z0-9-~]+)\\.)+([A-Za-z0-9-~\\/])+$/;
+                        const zzI = /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/|www\.)(([A-Za-z0-9-~]+)\.)+([A-Za-z0-9-~\/])+$/;
                         for(let i in this.formData.companyEventList){
                             if(this.formData.companyEventList[i].eventDate == '' || this.formData.companyEventList[i].eventUrl == '' || this.formData.companyEventList[i].eventDes == ''){
                                 this.$message.error('请将公司大事件信息填写完整');

src/views/innovatecompany/submitprojects/submitone.vue

@@ -122,7 +122,7 @@
                     companyIntroduction: [{required: true,message: '请输入一句话介绍',trigger: 'blur'},
                         {pattern: /^\S{1,36}$/,  message: '长度限制 36位', trigger: 'blur'}],
                     companyWebsite:[{required: false,message: '',trigger: 'blur'},
-                        {pattern:/^(([A-Za-z0-9-~]+)\.)+([A-Za-z0-9-~\/])+$/,  message: '公司网站填写错误', trigger: 'blur'},
+                        {pattern:/^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/|www\.)(([A-Za-z0-9-~]+)\.)+([A-Za-z0-9-~\/])+$/,  message: '公司网站填写错误', trigger: 'blur'},
                         {pattern: /^\S{1,50}$/,  message: '长度限制 50位', trigger: 'blur'}],
                     projectIndustryList: [{required: true,message: '请选择所属行业',trigger: 'change'},
                         {validator: validateAcquaintance, trigger: 'change'}],

src/views/innovatecompany/submitprojects/submitthree.vue

 <template>
     <div class="contentPadding">
         <el-form label-position="right" label-width="180px" :model="formData" :rules="rules" ref="formData">
-            <el-form-item label="目标行业：" prop="companyIndustryList">
-                <el-cascader :options="options" v-model="companyIndustryEditList" :props="propsd" placeholder="请选择目标行业" style="width: 600px;height: 40px" clearable @change="industry"></el-cascader>
+            <el-form-item label="目标客户行业：" prop="companyIndustryList">
+                <el-cascader :options="options" v-model="companyIndustryEditList" :props="propsd" placeholder="请选择目标客户行业" style="width: 600px;height: 40px" clearable @change="industry"></el-cascader>
             </el-form-item>
             <el-form-item label="首选合作方式：" prop="cooperationWay">
-                <el-select style="width: 250px;height: 40px" v-model="formData.cooperationWay" placeholder="请选择合作方式">
+                <el-select style="width: 250px;height: 40px" v-model="formData.cooperationWay" placeholder="请选择首选合作方式">
                     <el-option v-for="item in cooperationWaylist" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
                     </el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="客户标签："  prop="customerLabelList" style="width: 100%;">
+            <el-form-item label="客户通俗标签："  prop="customerLabelList" style="width: 100%;">
                 <el-row class="tagspan" v-if="formData.customerLabelList.length!=0">
                     <el-tag :key="tag" v-for="tag in formData.customerLabelList" closable :disable-transitions="false" @close="handleClose(tag)">
                         {{tag}}
@@ -68,7 +68,7 @@
                     customerCase: [{required: false,message: '请输入现有客户举例',trigger: 'blur'},
                         {pattern: /^\S{1,100}$/,  message: '长度限制 100位', trigger: 'blur'}],
                     cooperationWay: [{required: true,message: '请选择首选合作方式',trigger: 'change'}],
-                    companyIndustryList: [{required: true,message: '请选择所属行业',trigger: 'change'},
+                    companyIndustryList: [{required: true,message: '请选择目标客户行业',trigger: 'change'},
                         {validator: validateAcquaintance, trigger: 'change'}],
                 },
                 inputValue:'',

src/views/innovatecompany/submitprojects/submittwo.vue

@@ -209,13 +209,13 @@
             //附件上传之前判断文件格式
             handleFile(file){
                 var nameArr = file.name.split('.');
-                const num = ['docx','DOCX','xls','XLS','xlsx','XLSX','ppt','PPT','pdf','PDF','doc','DOC']
+                const num = ['docx','DOCX','xls','XLS','xlsx','XLSX','ppt','PPT','pdf','PDF','doc','DOC','pptx','PPTX']
                 const isfile = num.indexOf(nameArr[nameArr.length - 1]);
                 const isLt2M = file.size / 1024 / 1024 <= 2;
                 let db = true;
                 if (isfile == -1 ) {
                     db = false;
-                    this.$message.error('上传格式错误，仅支持WORD/EXCEL/PPT/PDF格式');
+                    this.$message.error('上传格式错误，仅支持WORD/EXCEL/PPT/PDF/PPTX格式');
                 }else if(!isLt2M){
                     this.$message.error('上传图片大小不能超过 50MB!');
                 }