Skip to content

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

Merge remote-tracking branch 'origin/master'

parents 9c9da259 c78bb5dd
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 24 deletions
src/views/mobile/servicerecord/editplanmentaion.vue
View file @ ec79f359
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
<div v-if="subprojectjson.companyLabel===null"> <div v-if="subprojectjson.companyLabel===null">
<el-form-item label="行业通俗标签"> <el-form-item label="行业通俗标签">
</el-form-item> </el-form-item>
<div v-for="item in companyLabelList" style="margin-top: -0.2rem;"> <div v-for="item in companyLabel" style="margin-top: -0.2rem;">
<el-form-item label=""> <el-form-item label="">
<el-input v-model="item.companyLabel" maxlength="36" placeholder="请输入行业通俗标签" style="width: 100%;margin-top: 0.2rem;"></el-input> <el-input v-model="item.companyLabel" maxlength="36" placeholder="请输入行业通俗标签" style="width: 100%;margin-top: 0.2rem;"></el-input>
</el-form-item> </el-form-item>
...@@ -216,7 +216,7 @@ ...@@ -216,7 +216,7 @@
<div v-if="subprojectjson.projectPatent===null"> <div v-if="subprojectjson.projectPatent===null">
<el-form-item label="专利"> <el-form-item label="专利">
</el-form-item> </el-form-item>
<div v-for="item in projectPatentList" style="margin-top: -0.2rem;"> <div v-for="item in projectPatent" style="margin-top: -0.2rem;">
<el-form-item label=""> <el-form-item label="">
<el-input v-model="item.patentNumber" maxlength="36" placeholder="请输入专利号" style="width: 100%;margin-top: 0.2rem;"></el-input> <el-input v-model="item.patentNumber" maxlength="36" placeholder="请输入专利号" style="width: 100%;margin-top: 0.2rem;"></el-input>
<el-input v-model="item.patentName" maxlength="300" placeholder="请输入专利名称" style="width: 100%;margin-top: 0.2rem;"></el-input> <el-input v-model="item.patentName" maxlength="300" placeholder="请输入专利名称" style="width: 100%;margin-top: 0.2rem;"></el-input>
...@@ -229,7 +229,7 @@ ...@@ -229,7 +229,7 @@
<div v-if="subprojectjson.projectLightspot===null"> <div v-if="subprojectjson.projectLightspot===null">
<el-form-item label="产品亮点"> <el-form-item label="产品亮点">
</el-form-item> </el-form-item>
<div v-for="item in projectLightspotList" style="margin-top: -0.2rem;"> <div v-for="item in projectLightspot" style="margin-top: -0.2rem;">
<el-form-item label=""> <el-form-item label="">
<el-input v-model="item.projectLightspot" maxlength="300" placeholder="请输入产品亮点" style="width: 100%;margin-top: 0.2rem;"></el-input> <el-input v-model="item.projectLightspot" maxlength="300" placeholder="请输入产品亮点" style="width: 100%;margin-top: 0.2rem;"></el-input>
</el-form-item> </el-form-item>
...@@ -244,7 +244,7 @@ ...@@ -244,7 +244,7 @@
<div v-if="subprojectjson.customerLabel===null"> <div v-if="subprojectjson.customerLabel===null">
<el-form-item label="目标客户行业通俗标签"> <el-form-item label="目标客户行业通俗标签">
</el-form-item> </el-form-item>
<div v-for="item in customerLabelList" style="margin-top: -0.2rem;"> <div v-for="item in customerLabel" style="margin-top: -0.2rem;">
<el-form-item label=""> <el-form-item label="">
<el-input v-model="item.customerLabel" maxlength="36" placeholder="请输入目标客户行业通俗标签" style="width: 100%;margin-top: 0.2rem;"></el-input> <el-input v-model="item.customerLabel" maxlength="36" placeholder="请输入目标客户行业通俗标签" style="width: 100%;margin-top: 0.2rem;"></el-input>
</el-form-item> </el-form-item>
...@@ -322,9 +322,9 @@ ...@@ -322,9 +322,9 @@
}, },
istable:{}, istable:{},
customerLabelList:[{customerLabel:''}], customerLabel:[{customerLabel:''}],
projectLightspotList:[{projectLightspot:''}], projectLightspot:[{projectLightspot:''}],
companyLabelList:[{companyLabel:''}], companyLabel:[{companyLabel:''}],
projectPatentList:[{patentName:'',patentNumber:''}], projectPatentList:[{patentName:'',patentNumber:''}],
manageTeam:[{ manageTeam:[{
empName:'', empName:'',
...@@ -385,28 +385,28 @@ ...@@ -385,28 +385,28 @@
} }
} }
} else if(this.statechange == 'SRT02'){ } else if(this.statechange == 'SRT02'){
for(let i in this.companyLabelList){ for(let i in this.companyLabel){
if(this.companyLabelList[i].companyLabel!=''){ if(this.companyLabel[i].companyLabel!=''){
if(this.projectjson.companyLabel==null){ if(this.projectjson.companyLabel==null){
this.projectjson.companyLabel = ''; this.projectjson.companyLabel = '';
} }
this.projectjson.companyLabel+=this.companyLabelList[i].companyLabel+','; this.projectjson.companyLabel+=this.companyLabel[i].companyLabel+',';
} }
} }
for(let i in this.projectLightspotList){ for(let i in this.projectLightspot){
if(this.projectLightspotList[i].projectLightspot!=''){ if(this.projectLightspot[i].projectLightspot!=''){
if(this.projectjson.projectLightspot==null){ if(this.projectjson.projectLightspot==null){
this.projectjson.projectLightspot = ''; this.projectjson.projectLightspot = '';
} }
this.projectjson.projectLightspot+=this.projectLightspotList[i].projectLightspot+','; this.projectjson.projectLightspot+=this.projectLightspot[i].projectLightspot+',';
} }
} }
for(let i in this.customerLabelList){ for(let i in this.customerLabel){
if(this.customerLabelList[i].customerLabel!=''){ if(this.customerLabel[i].customerLabel!=''){
if(this.projectjson.customerLabel==null){ if(this.projectjson.customerLabel==null){
this.projectjson.customerLabel = ''; this.projectjson.customerLabel = '';
}else }else
this.projectjson.customerLabel+=this.customerLabelList[i].customerLabel+','; this.projectjson.customerLabel+=this.customerLabel[i].customerLabel+',';
} }
} }
if(this.projectjson.companyNation){ if(this.projectjson.companyNation){
...@@ -648,17 +648,17 @@ ...@@ -648,17 +648,17 @@
}) })
}, },
addcustomerLabel(){ addcustomerLabel(){
this.customerLabelList.push({ this.customerLabel.push({
customerLabel:'' customerLabel:''
}) })
}, },
addprojectLightspot(){ addprojectLightspot(){
this.projectLightspotList.push({ this.projectLightspot.push({
projectLightspot:'' projectLightspot:''
}) })
}, },
addcompanyLabel(){ addcompanyLabel(){
this.companyLabelList.push({ this.companyLabel.push({
companyLabel:'' companyLabel:''
}) })
}, },
...@@ -711,8 +711,19 @@ ...@@ -711,8 +711,19 @@
if(response.code == 0) { if(response.code == 0) {
if(response.result.fieldList){ if(response.result.fieldList){
for(let i in response.result.fieldList){ for(let i in response.result.fieldList){
if(response.result.fieldList[i].fieldCode == 'coreTeam'){
this.coreTeam = response.result.fieldList[i].fieldValue;
}
if(response.result.fieldList[i].fieldCode == 'manageTeam'){
this.manageTeam = response.result.fieldList[i].fieldValue;
}
if(response.result.fieldList[i].fieldCode == 'stockRight'){
this.stockRight = response.result.fieldList[i].fieldValue;
}
if(response.result.fieldList[i].fieldCode == 'technologyTeam'){
this.technologyTeam = response.result.fieldList[i].fieldValue;
}
this.projectjson[response.result.fieldList[i].fieldCode] = response.result.fieldList[i].fieldValue; this.projectjson[response.result.fieldList[i].fieldCode] = response.result.fieldList[i].fieldValue;
console.log(this.projectjson)
this.$forceUpdate() this.$forceUpdate()
} }
} }
...@@ -757,7 +768,16 @@ ...@@ -757,7 +768,16 @@
} }
} }
if(response.result.fieldList[i].fieldCode == 'projectPatent'){ if(response.result.fieldList[i].fieldCode == 'projectPatent'){
this.projectPatentList = response.result.fieldList[i].fieldValue; this.projectPatent = response.result.fieldList[i].fieldValue;
}
if(response.result.fieldList[i].fieldCode == 'companyLabel'){
this.companyLabel = response.result.fieldList[i].fieldValue;
}
if(response.result.fieldList[i].fieldCode == 'projectLightspot'){
this.projectLightspot = response.result.fieldList[i].fieldValue;
}
if(response.result.fieldList[i].fieldCode == 'customerLabel'){
this.customerLabel = response.result.fieldList[i].fieldValue;
} }
this.projectjson[response.result.fieldList[i].fieldCode] = response.result.fieldList[i].fieldValue; this.projectjson[response.result.fieldList[i].fieldCode] = response.result.fieldList[i].fieldValue;
this.$forceUpdate() this.$forceUpdate()
......
src/views/mobile/servicerecord/historicalrecord.vue
View file @ ec79f359
...@@ -46,7 +46,8 @@ ...@@ -46,7 +46,8 @@
recordcli(val){ recordcli(val){
if(val.recordType=='SRM01'){ if(val.recordType=='SRM01'){
this.$router.push({path:"/recorddetails",query:{editstate:true,recordId:val.recordId}}); this.$router.push({path:"/recorddetails",query:{editstate:true,recordId:val.recordId}});
}else{ }
if(val.recordType=='SRM02'){
this.$router.push({path:"/workplandetails",query:{editstate:true,recordId:val.recordId}}); this.$router.push({path:"/workplandetails",query:{editstate:true,recordId:val.recordId}});
} }
if(val.recordType=='SRM03'){ if(val.recordType=='SRM03'){
......
src/views/mobile/servicerecord/serviceenterprise.vue
View file @ ec79f359
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<li v-for="(item,index) in tableData" :key="index"> <li v-for="(item,index) in tableData" :key="index">
<img :src="item.companyLogoUrl"> <img :src="item.companyLogoUrl">
<div> <div>
<p>{{item.companyName}}</p> <span>{{item.companyName}}</span>
<p>{{item.companyIntroduction}}</p> <p>{{item.companyIntroduction}}</p>
<p> <p>
<span @click="seeproject(item)">查看</span> <span @click="seeproject(item)">查看</span>
...@@ -155,17 +155,27 @@ ...@@ -155,17 +155,27 @@
} }
>div:nth-child(2){ >div:nth-child(2){
margin:0 0.3rem; margin:0 0.3rem;
>p:nth-child(1){ >span:nth-child(1){
font-size: 0.32rem; font-size: 0.32rem;
font-weight: bold; font-weight: bold;
color: #3F3F53; color: #3F3F53;
margin-bottom: 0.1rem; margin-bottom: 0.1rem;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp:1;
-webkit-box-orient: vertical;
} }
>p:nth-child(2){ >p:nth-child(2){
font-size: 0.28rem; font-size: 0.28rem;
color: #9197B4; color: #9197B4;
padding-bottom: 0.2rem; padding-bottom: 0.2rem;
border-bottom: 1px solid #E9EAF3; border-bottom: 1px solid #E9EAF3;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp:2;
-webkit-box-orient: vertical;
} }
>p:nth-child(3){ >p:nth-child(3){
padding-top: 0.2rem; padding-top: 0.2rem;
......
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