Skip to content

T
techbook
Commit 39d77a1d authored by zhangyanni's avatar zhangyanni
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 7435ec31 7670855b
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 45 deletions
src/views/innovatecompany/lreleaseproject/viewproject.vue
View file @ 39d77a1d
......@@ -731,6 +731,9 @@
}else{
this.isbtn = false;
}
if(!this.diven_zh){
this.translate();
}
} else {
this.$message.error(response.msgCode);
}
......@@ -1245,9 +1248,6 @@
console.log("提交出错");
return false;
});
if(!this.diven_zh){
this.translate();
}
},
}
</script>
......
src/views/mobile/projectment/projectdetails.vue
View file @ 39d77a1d
......@@ -2,21 +2,23 @@
<div class="overfolowWrapper">
<breadTop :title="title" :isSearch="false" :isColor="true" :isReturn="true" :isTranslate="true"></breadTop>
<div style="margin-top: 1rem;background: #5d78ff;text-align: center;color: #FFFFFF;padding-bottom: 0.2rem">
<p style="padding: 0.7rem 0 0.4rem;">
<img :src="companyInfo.companyLogoUrl?companyInfo.companyLogoUrl:require('../../../assets/img/bigBusiness@2x.png')"
alt="" style="width: 1.8rem;height: 1.8rem;border-radius: 3px">
</p>
<p style="margin-bottom: 0.3rem">{{companyInfo.companyName}}</p>
<p style="margin-bottom: 0.3rem"><span v-if="companyInfo.isTechcodeProject==1" style="padding: 2px 10px;font-size: 12px; border-radius: 10px;background:#FF9E29;"><i style="font-size: 12px" class="iconfont icon-v"></i> {{$t("listproject.techcertification")}}</span></p>
<p style="margin-bottom: 0.3rem">
<div style="margin: 0 auto;width: 90%">
<p style="padding: 0.7rem 0 0.4rem;">
<img :src="companyInfo.companyLogoUrl?companyInfo.companyLogoUrl:require('../../../assets/img/bigBusiness@2x.png')"
alt="" style="width: 1.8rem;height: 1.8rem;border-radius: 3px">
</p>
<p style="margin-bottom: 0.3rem">{{companyInfo.companyName}}</p>
<p style="margin-bottom: 0.3rem"><span v-if="companyInfo.isTechcodeProject==1" style="padding: 2px 10px;font-size: 12px; border-radius: 10px;background:#FF9E29;"><i style="font-size: 12px" class="iconfont icon-v"></i> {{$t("listproject.techcertification")}}</span></p>
<p style="margin-bottom: 0.3rem">
<span style="display: inline-block;">
<i v-if="companyInfo.companyNation">{{companyInfo.companyNation}}</i>
<i v-if="companyInfo.companyProvince">-{{companyInfo.companyProvince}}</i>
<i v-if="companyInfo.companyCity">-{{companyInfo.companyCity}}</i>
</span>
</p>
<p style="margin-bottom: 0.3rem">{{companyInfo.companyIntroduction}}</p>
<p><span v-for="(itemed,index) in companyInfo.companyLabelList" :key="index" style="display: inline-block;"><i style="background:#4C65E3;padding: 4px 8px;margin-right: 5px;border-radius: 3px;font-size: 12px;line-height: 0.6rem">{{itemed}}</i></span></p>
</p>
<p style="margin-bottom: 0.3rem">{{companyInfo.companyIntroduction}}</p>
<p><span v-for="(itemed,index) in companyInfo.companyLabelList" :key="index" style="display: inline-block;"><i style="background:#4C65E3;padding: 4px 8px;margin-right: 5px;border-radius: 3px;font-size: 12px;line-height: 0.6rem">{{itemed}}</i></span></p>
</div>
</div>
<div class="contentclassed">
<div v-if="companyInfo.projectSource!=1">
......@@ -127,7 +129,8 @@
title: this.$t("Otherjson.projectdetails"),
companyInfo: {},
tableData:[],
isbtntype:true
isbtntype:true,
isshow:false
}
},
......@@ -138,6 +141,9 @@
api.selectProjectById(id).then((res) => {
if (res.code == 0) {
this.companyInfo = res.result;
if(this.isshow){
this.gettransAxios();
}
} else {
this.$toast(res.msg);
}
......@@ -146,6 +152,14 @@
})
},
gettransAxios(){
let companyLabelList = [];
if(this.companyInfo.companyLabelList){
if(this.companyInfo.companyLabelList.length !=0){
for(let i in this.companyInfo.companyLabelList){
companyLabelList.push({keyId:i,value:this.companyInfo.companyLabelList[i]})
}
}
}
let params = {
transType:'BaiDu',
cacheType:'projectDetails',
......@@ -154,16 +168,22 @@
pageType:'mobilePhone',
companyName:this.companyInfo.companyName,
companyIntroduction:this.companyInfo.companyIntroduction,
companyLabelList:this.companyInfo.companyLabelList,
companyLabelList:companyLabelList,
companyWebsite:this.companyInfo.companyWebsite,
officialAccount:this.companyInfo.officialAccount,
projectInstroduction:this.companyInfo.projectInstroduction,
};
api.transAxios(params).then((response)=>{
if(response.code==0){
let companyLabelListed = [];
if(response.result.companyLabelList){
for(let i in response.result.companyLabelList){
companyLabelListed.push(response.result.companyLabelList[i].value)
}
}
this.companyInfo.companyName = response.result.companyName;
this.companyInfo.companyIntroduction = response.result.companyIntroduction;
this.companyInfo.companyLabelList = response.result.companyLabelList;
this.companyInfo.companyLabelList = companyLabelListed;
this.companyInfo.companyWebsite = response.result.companyWebsite;
this.companyInfo.officialAccount = response.result.officialAccount;
this.companyInfo.projectInstroduction = response.result.projectInstroduction;
......@@ -196,11 +216,7 @@
globalMsg.$on("translateFunc",(data)=>{
this.handleTransSBusinessList(data);
})
let isshow = this.$i18n.locale=="zh-CN"?false:true;
console.log(isshow)
if(isshow){
this.gettransAxios();
}
this.isshow = this.$i18n.locale=="zh-CN"?false:true;
}
}
</script>
......
src/views/mobile/servicerecord/addproject.vue
View file @ 39d77a1d
......@@ -230,6 +230,7 @@
font-size: 0.28rem;
color: #9197B4;
overflow: hidden;
line-height: 0.38rem;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp:2;
......
src/views/mobile/servicerecord/addservicetype.vue
View file @ 39d77a1d
......@@ -40,7 +40,7 @@
for(let i in this.typedata){
this.typedata[i].checkbox = false;
}
val.checkbox = !checkbox;
val.checkbox = checkbox;
},
getchangeServiceType(dictKey){
if(this.$route.query.state == dictKey){
......
src/views/mobile/servicerecord/editplanmentaion.vue
View file @ 39d77a1d
......@@ -196,7 +196,7 @@
<el-input @input="inputchange()" v-model="projectjson.projectDescription" maxlength="300" placeholder="请输入产品简要描述" type="textarea" :rows="6"></el-input>
</el-form-item>
<el-form-item v-if="subprojectjson.projectPhase===null" label="产品阶段">
<el-select style="width:100%;" v-model="projectjson.projectPhase" @change="inputchange()" :placeholder="$t('releasejson.plprojectModel')">
<el-select style="width:100%;" v-model="projectjson.projectPhase" @change="inputchange()" placeholder="请选择产品阶段')">
<el-option v-for="item in projectphaseData" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
......@@ -254,19 +254,19 @@
</div>
</div>
<el-form-item v-if="subprojectjson.customerCase===null" label="现有客户举例">
<el-input @input="inputchange()" v-model="projectjson.customerCase" maxlength="36" placeholder="请输入行业通俗标签"></el-input>
<el-input @input="inputchange()" v-model="projectjson.customerCase" maxlength="36" placeholder="请输入现有客户举例"></el-input>
</el-form-item>
<el-form-item v-if="subprojectjson.cooperationWay===null" label="合作方式">
<el-input @input="inputchange()" v-model="projectjson.cooperationWay" maxlength="36" placeholder="请输入行业通俗标签"></el-input>
<el-input @input="inputchange()" v-model="projectjson.cooperationWay" maxlength="36" placeholder="请输入合作方式"></el-input>
</el-form-item>
<el-form-item v-if="subprojectjson.companyScale===null" label="目前公司规模">
<el-input @input="inputchange()" v-model="projectjson.companyScale" maxlength="36" placeholder="请输入行业通俗标签"></el-input>
<el-input @input="inputchange()" v-model="projectjson.companyScale" maxlength="36" placeholder="请输入目前公司规模"></el-input>
</el-form-item>
<el-form-item v-if="subprojectjson.contactEmpName===null" label="项目联系人">
<el-input @input="inputchange()" v-model="projectjson.contactEmpName" maxlength="36" placeholder="请输入行业通俗标签"></el-input>
<el-input @input="inputchange()" v-model="projectjson.contactEmpName" maxlength="36" placeholder="请输入项目联系人"></el-input>
</el-form-item>
<el-form-item v-if="subprojectjson.contactEmpPhone===null" label="项目联系人手机">
<el-input @input="inputchange()" v-model="projectjson.contactEmpPhone" maxlength="36" placeholder="请输入行业通俗标签"></el-input>
<el-input @input="inputchange()" v-model="projectjson.contactEmpPhone" maxlength="36" placeholder="请输入项目联系人手机"></el-input>
</el-form-item>
<div class="editproject" ><span>备注</span></div>
<el-form-item label=" ">
......@@ -326,7 +326,7 @@
customerLabel:[{customerLabel:''}],
projectLightspot:[{projectLightspot:''}],
companyLabel:[{companyLabel:''}],
projectPatentList:[{patentName:'',patentNumber:''}],
projectPatent:[{patentName:'',patentNumber:''}],
manageTeam:[{
empName:'',
empPosition:'',
......@@ -424,7 +424,16 @@
this.projectjson.companyCity = undefined;
}
if(this.projectjson.companyIndustry){
this.projectjson.companyIndustry = this.projectjson.companyIndustry.join(',');
if(this.projectjson.companyIndustry[0].industryId){
let companyIndustryId = [];
for(let s in this.projectjson.companyIndustry){
companyIndustryId.push(this.projectjson.companyIndustry[s].industryId)
}
this.projectjson.companyIndustry = companyIndustryId;
this.projectjson.companyIndustry = this.projectjson.companyIndustry.join(',');
}else{
this.projectjson.companyIndustry = this.projectjson.companyIndustry.join(',');
}
}
if(this.projectjson.customerIndustry){
this.projectjson.customerIndustry = this.projectjson.customerIndustry.join(',');
......@@ -655,7 +664,7 @@
});
},
addprojectPatent(){
this.projectPatentList.push({
this.projectPatent.push({
patentName:'',
patentNumber:''
})
......@@ -748,7 +757,7 @@
this.$forceUpdate()
}
}
this.projectjson.explication = response.result.explication;
// this.projectjson.explication = response.result.explication;
} else {
this.$message.error(response.msg);
}
......@@ -823,11 +832,26 @@
response.result.fieldList[i].fieldValue = null;
}
}
if(response.result.fieldList[i].fieldCode == 'companyAddress'){
if(response.result.fieldList[i].fieldValue){
if(response.result.fieldList[i].fieldValue.companyNation){
this.projectjson.companyNation = response.result.fieldList[i].fieldValue.companyNation;
this.countryChang(response.result.fieldList[i].fieldValue.companyNation);
}
if(response.result.fieldList[i].fieldValue.companyProvince){
this.projectjson.companyProvince = response.result.fieldList[i].fieldValue.companyProvince;
this.provinceChang(response.result.fieldList[i].fieldValue.companyProvince);
}
if(response.result.fieldList[i].fieldValue.companyCity){
this.projectjson.companyCity = response.result.fieldList[i].fieldValue.companyCity;
}
}
}
this.projectjson[response.result.fieldList[i].fieldCode] = response.result.fieldList[i].fieldValue;
this.$forceUpdate()
}
}
this.projectjson.explication = response.result.explication;
// this.projectjson.explication = response.result.explication;
} else {
this.$message.error(response.msg);
}
......
src/views/mobile/servicerecord/fielddisplaydetails.vue
View file @ 39d77a1d
......@@ -129,17 +129,21 @@
return false;
})
}else{
api.getRecordFieldDetail({fieldCode:this.$route.query.fieldjson.fieldCode,serviceId:this.$route.query.fieldjson.serviceId}).then(response => {
if(response.code == 0) {
this.fieldData = response.result;
} else {
this.$message.error(response.msg);
}
})
.catch(error => {
console.log("提交出错");
return false;
if(this.$route.query.fieldjson.fieldCode){
api.getRecordFieldDetail({fieldCode:this.$route.query.fieldjson.fieldCode,serviceId:this.$route.query.fieldjson.serviceId}).then(response => {
if(response.code == 0) {
this.fieldData = response.result;
} else {
this.$message.error(response.msg);
}
})
.catch(error => {
console.log("提交出错");
return false;
})
}else{
this.$router.go(-1)
}
}
}
......
src/views/mobile/servicerecord/projecttypeFa.vue
View file @ 39d77a1d
......@@ -140,7 +140,7 @@
<div><span>技术与研发</span></div>
<p>
<span>是否拥有专利：</span>
<span>{{projectjson.isPatent}}</span>
<span>{{projectjson.isPatent==1?'是':'否'}}</span>
</p>
<p>
<span>专利数量：</span>
......
src/views/mobile/servicerecord/serviceenterprise.vue
View file @ 39d77a1d
......@@ -171,9 +171,9 @@
>p:nth-child(2){
font-size: 0.28rem;
color: #9197B4;
padding-bottom: 0.2rem;
border-bottom: 1px solid #E9EAF3;
overflow: hidden;
line-height: 0.38rem;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp:2;
......
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