Skip to content

T
techbook
Commit eb348994 authored by anxixi's avatar anxixi
Browse files
Options

静态页面相关科创企业部分bug修改

parent 22117ce2
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 42 deletions
src/assets/img/index/Group 5@2x.png
View replaced file @ 22117ce2 View file @ eb348994
src/assets/img/index/Group 5@2x.png

90.5 KB | W: | H:

src/assets/img/index/Group 5@2x.png

236 KB | W: | H:

src/assets/img/index/Group 5@2x.png
src/assets/img/index/Group 5@2x.png
src/assets/img/index/Group 5@2x.png
src/assets/img/index/Group 5@2x.png
  • 2-up
  • Swipe
  • Onion skin
src/common/lang/en.js
View file @ eb348994
......@@ -1060,7 +1060,7 @@ module.exports = {
harder:'Submitted successfully, thank you for your advice! We will work harder.',
mailbox:'Email',
address:'Address',
addresstext:'3F, Tower A, Dinghao Building, Haidian District, Beijing, China',
addresstext:'Room 901, Building A, Dongsheng Building, No. 8 Zhongguancun East Road, Haidian District, Beijing',
domestic:'China',
overseas:'International',
cooperation:'Cooperation Case Details',
......
src/common/lang/zh.js
View file @ eb348994
......@@ -1009,7 +1009,7 @@ module.exports = {
personneltracked:'该项目合作还未有业务人员进行跟踪',
assignimmediately:"马上分配",
assignpeople:'分配业务人员',
region:'区域：',
region:'区域',
keywordsearch:'关键词搜索：',
plkeywordsearch:'请输入关键词搜索',
plbind:'请选择业务人员进行绑定',
......@@ -1062,7 +1062,7 @@ module.exports = {
harder:'提交成功，感谢您的建议！我们会更加努力',
mailbox:'合作邮箱',
address:'联系地址',
addresstext:'北京市海淀区鼎好大厦A座3层',
addresstext:'北京市海淀区中关村东路8号东升大厦A座901室',
domestic:'中国',
overseas:'海外',
cooperation:'合作案例详情',
......
src/views/innovatecompany/demandaudit/demandinside.vue
View file @ eb348994
......@@ -80,7 +80,7 @@
<span>{{addData.requirementEndTime}}</span>
</el-form-item>
<el-form-item :label="$t('workPlace.sendRequireForm.origin')+':'" style="width: 40%;">
<span>{{addData.sourceNationStr}}{{addData.sourceProvinceStr}}{{addData.sourceCityStr}}</span>
<span style="margin-right: 5px" v-for="(item,index) in addData.sourceNationsStr" :key="index">{{item}}</span>
</el-form-item>
<el-form-item :label="$t('releasejson.cooperationWay')" style="width: 40%;">
<span>{{addData.cooperationWay}}</span>
......@@ -88,16 +88,16 @@
<el-form-item :label="$t('requireInfo.targetIndustry')+':'" style="width: 40%;">
<span v-for="(item,index) in addData.targetIndustrys" style="margin-right: 10px">{{item}}</span>
</el-form-item>
<el-form-item :label="$t('operationjson.Cooperation')" style="width: 100%;">
<el-form-item :label="$t('operationjson.Cooperation')+'：'" style="width: 100%;">
<div style="display: flex;flex-wrap:wrap;" v-if="addData.targetLabel">
<p class="company" v-for="(item,index) in addData.targetLabel" :key="index"> {{item}}</p>
</div>
</el-form-item>
<el-form-item label=" " style="width: 30%;"></el-form-item>
<el-form-item :label="$t('requireInfo.requireDetail')+':'" style="width: 100%;">
<el-form-item :label="$t('requireInfo.requireDetail')+'：'" style="width: 100%;">
<span>{{addData.requirementContent}}</span>
</el-form-item>
<el-form-item :label="$t('requireInfo.requireAccessory')+':'" style="width: 100%;">
<el-form-item :label="$t('requireInfo.requireAccessory')+'：'" style="width: 100%;">
<el-button type="text" @click="annexfile(addData.annexFile)" class="iconfont icon-download-fill">{{$t('operationjson.clickdownload')}}</el-button>
</el-form-item>
</el-form>
......
src/views/innovatecompany/lreleaseproject/viewproject.vue
View file @ eb348994
......@@ -39,10 +39,10 @@
<el-tab-pane :label="$t('listproject.projectbasic')" name="first"></el-tab-pane>
<el-tab-pane v-if="addData.showCompanyInfoAndCooperation" :label="$t('listproject.market')" name="second"></el-tab-pane>
<el-tab-pane v-if="addData.showCompanyInfoAndCooperation" :label="$t('listproject.overview')" name="third"></el-tab-pane>
<el-tab-pane v-if="isempinfo&&addData.projectCreatedBy" :label="$t('releasejson.projecttitle')" name="six"></el-tab-pane>
<el-tab-pane v-if="!isempinfo&&addData.projectCreatedBy" :label="$t('releasejson.projecttitle')" name="six"></el-tab-pane>
<el-tab-pane v-if="addData.showProgress" :label="$t('listproject.strategic')" name="fourth"></el-tab-pane>
<el-tab-pane v-if="addData.showProgress" :label="$t('listproject.service')" name="five"></el-tab-pane>
<el-tab-pane :label="$t('intentionlist.intention')" name="intention">
<el-tab-pane v-if="!isempinfo&&addData.projectCreatedBy" :label="$t('intentionlist.intention')" name="intention">
<intention-bar></intention-bar>
</el-tab-pane>
</el-tabs>
......@@ -52,10 +52,10 @@
<el-tab-pane :label="$t('listproject.projectbasic')" name="first"></el-tab-pane>
<el-tab-pane v-if="addData.showCompanyInfoAndCooperation" :label="$t('listproject.market')" name="second"></el-tab-pane>
<el-tab-pane v-if="addData.showCompanyInfoAndCooperation" :label="$t('listproject.overview')" name="third"></el-tab-pane>
<el-tab-pane v-if="isempinfo&&addData.projectCreatedBy" :label="$t('releasejson.projecttitle')" name="six"></el-tab-pane>
<el-tab-pane v-if="!isempinfo&&addData.projectCreatedBy" :label="$t('releasejson.projecttitle')" name="six"></el-tab-pane>
<el-tab-pane v-if="addData.showProgress" :label="$t('listproject.strategic')" name="fourth"></el-tab-pane>
<el-tab-pane v-if="addData.showProgress" :label="$t('listproject.service')" name="five"></el-tab-pane>
<el-tab-pane :label="$t('intentionlist.intention')" name="intention">
<el-tab-pane v-if="!isempinfo&&addData.projectCreatedBy" :label="$t('intentionlist.intention')" name="intention">
<intention-bar></intention-bar>
</el-tab-pane>
</el-tabs>
......@@ -264,7 +264,7 @@
<span>{{addData.companyEmail}}</span>
</el-form-item>
<el-form-item :label="$t('saleManage.contactForm.businessCard')+'：'" style="width: 100%;">
<img :src="addData.empCardUrl" alt="图片" style="border-radius: 3px; border:1px solid #DCDFF1; width:476px;height:305px;">
<img v-if="addData.empCardUrl" :src="addData.empCardUrl" alt="图片" style="border-radius: 3px; border:1px solid #DCDFF1; width:476px;height:305px;">
</el-form-item>
</el-form>
</div>
......
src/views/innovatecompany/projectprocess/projectinside.vue
View file @ eb348994
......@@ -167,15 +167,19 @@
<el-row style="margin: 20px">
<el-row>
<el-form :inline="true">
<el-form-item :label="$t('projectdynamics.region')">
<el-form-item :label="$t('projectdynamics.region')" prop="companyNation" style="width: 150px;">
<el-select style="width:100px;margin-left: 5px;" v-model="search.areaNation" :placeholder="$t('workPlace.nation')" @change="countryChang(search.areaNation)">
<el-option v-for="item in countryData" :key="item.geoId" :label="item.name" :value="item.geoId">
</el-option>
</el-select>
</el-form-item>
<el-form-item v-if="countryIf" prop="companyProvince" style="width: 110px;">
<el-select style="width:100px;margin-left: 5px;" v-model="search.areaProvince" :placeholder="$t('workPlace.province')" @change="provinceChang(search.areaProvince)">
<el-option v-for="item in provinceData" :key="item.geoId" :label="item.name" :value="item.geoId">
</el-option>
</el-select>
</el-form-item>
<el-form-item v-if="provinceIf" prop="companyCity" style="width: 110px;">
<el-select style="width:100px;margin-left: 5px;" v-model="search.areaCity" :placeholder="$t('workPlace.city')">
<el-option v-for="item in cityData" :key="item.geoId" :label="item.name" :value="item.geoId">
</el-option>
......@@ -280,6 +284,8 @@
},
processstatus:'',
diven_zh:true,
countryIf:false,
provinceIf:false,
}
},
components:{
......@@ -297,6 +303,8 @@
this.$router.push({path:"/viewproject",query:{projectId:val.projectId}});
},
orgcloseSensor(){
this.countryIf = false;
this.provinceIf = false;
this.visible=false;
this.searchSalesList = [];
this.empId = null;
......@@ -357,6 +365,12 @@
},
//国家select触发
countryChang(val){
if(val != 1){
this.countryIf = false;
this.provinceIf = false;
}else{
this.countryIf = true;
}
this.search.areaProvince = null;
this.search.areaCity = null;
this.provinceData = [];
......@@ -365,6 +379,7 @@
},
//省份select触发
provinceChang(val){
this.provinceIf = true;
this.search.areaCity = null;
this.cityData = [];
this.getProvinceList(val);
......
src/views/innovatecompany/submitprojects/submitfive.vue
View file @ eb348994
......@@ -11,8 +11,8 @@
<el-input @blur="accountblur" v-model="formData.account" autocomplete style="width: 450px;" :placeholder="$t('saleManage.contactForm.placeholderPhone')"
maxlength="11"></el-input>
</el-form-item>
<el-form-item v-if="!isphone" :label="$t('oneself.email')+'：'" prop="companyEmailed">
<el-input @blur="accountblur" v-model="formData.account" style="width: 450px;" :placeholder="$t('commonTips.placeholderEmail')"></el-input>
<el-form-item v-if="!isphone" :label="$t('oneself.email')+'：'" prop="accounted">
<el-input @blur="accountblur" v-model="formData.accounted" style="width: 450px;" :placeholder="$t('commonTips.placeholderEmail')"></el-input>
</el-form-item>
<el-form-item :label="$t('personalAuth.name')+'：'" prop="empName">
<el-input v-model="formData.empName" style="width: 450px;" :placeholder="$t('saleManage.placeholderName')" maxlength="36"></el-input>
......@@ -95,8 +95,9 @@
companyName: [
{required: true, validator:validate.checkRequireCompany, trigger: 'blur'},
],
companyEmailed: [
{required: true, validator:validate.checkEmail, trigger: 'blur'}
accounted: [
{required: true, validator:validate.checkEmail, trigger: 'blur'},
{validator: valuespace, trigger: 'change'}
],
companyEmail: [
{required: true, validator:validate.checkRequireCompanyEmail, trigger: 'blur'}
......@@ -141,7 +142,8 @@
this.$refs.formimg.clearValidate();
},
radioClk(val){
console.log(val)
this.formData.account = '';
this.$refs['formData'].resetFields();
if(val == 0){
this.isphone = true;
}else{
......@@ -149,31 +151,36 @@
}
},
accountblur(){
let phoneType = this.isphone==true?0:1;
api.checkAccount({accountType:phoneType,account:this.formData.account}).then(response => {
if(response.code == 0) {
this.ispone = response.result;
this.$refs.formData.validateField('account');
if(response.result == 1){
this.$confirm('系统检测到您输入的联系方式已存在，是否将此项目关联到该账号下?', {
cancelButtonText: '重新输入',
confirmButtonText: '关联',
type: '',
customClass: 'deleteConfirm'
}).then(() => {
this.submitformgo();
}).catch(() => {
// this.$refs.formData.validateField('account');
// if(this.$refs.formData.validateField('account')){
let phoneType = this.isphone==true?0:1;
if(phoneType == 1){
this.formData.account = this.formData.accounted;
}
api.checkAccount({accountType:phoneType,account:this.formData.account}).then(response => {
if(response.code == 0) {
this.ispone = response.result;
if(response.result == 1){
this.$confirm('系统检测到您输入的联系方式已存在，是否将此项目关联到该账号下?', {
cancelButtonText: '重新输入',
confirmButtonText: '关联',
type: '',
customClass: 'deleteConfirm'
}).then(() => {
this.submitformgo();
}).catch(() => {
});
});
}
} else {
// this.$message.error(response.msg);
}
} else {
this.$message.error(response.msg);
}
})
.catch(error => {
console.log("提交出错");
return false;
});
})
.catch(error => {
console.log("提交出错");
return false;
});
// }
},
submitformgo(){
this.formData.projectId = this.formId;
......
src/views/innovatecompany/submitprojects/submitfour.vue
View file @ eb348994
......@@ -2,7 +2,7 @@
<div class="contentPadding">
<el-form label-position="right" :model="formData" :rules="rules" ref="formData" :label-width="diven_zh?'180px':'300px'" :class="diven_zh?'contnetform180':'contnetform300s'" >
<el-form-item :label="$t('releasejson.companyCreateDate')" prop="companyCreateDate">
<el-date-picker style="width:250px;height: 40px;" :placeholder="$t('releasejson.plcompanyCreateDate')" :picker-options="pickerDisabled" v-model="formData.companyCreateDate" type="date" value-format="yyyy-MM-dd"></el-date-picker>
<el-date-picker style="width:250px;height: 40px;" :placeholder="$t('releasejson.plcompanyCreateDate')" :picker-options="pickerDisabled" v-model="formData.companyCreateDate" type="year" value-format="yyyy"></el-date-picker>
</el-form-item>
<el-form-item :label="$t('releasejson.companyScale')" prop="companyScale">
<el-select style="width:250px;height: 40px;" v-model="formData.companyScale" :placeholder="$t('releasejson.plcompanyScale')">
......
src/views/seeprojects/seeprojectlist.vue
View file @ eb348994
......@@ -101,6 +101,7 @@
},
groupdata(val){
this.stateData = val;
this.cur_page = 1;
this.add();
},
handleRowClick(row){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment