Skip to content

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

Merge remote-tracking branch 'origin/master'

parents 2fc8e464 60b5799a
Show whitespace changes
Inline Side-by-side
Showing with 87 additions and 25 deletions
src/components/mobile/mobileTop.vue
View file @ 744f9081
......@@ -82,9 +82,6 @@
}, {
id: 7,
name: "knowledge"
}, {
id: 8,
name: "serviceRecord"
}],
keyword:window.sessionStorage.getItem("keyword")?window.sessionStorage.getItem("keyword"):null,
currentIndex:window.sessionStorage.getItem("mobileIndex")?window.sessionStorage.getItem("mobileIndex"):-1,
......@@ -238,6 +235,12 @@
},
mounted(){
if(this.userInfo.roleList[0].roleType == 5){
this.activeList.push({
id: 8,
name: "serviceRecord"
});
}
this.getUserInfoFunc();
if(this.$route.name=="mobileLogin"||this.$route.name=="loginByPhone"||this.$route.name=="loginByEmail"||this.$route.name=="mobileSuccess"||this.$route.name=="mobileRegister"||this.$route.name=="registerComplete"){
window.sessionStorage.setItem("mobileIndex",-2)
......
src/views/mobile/servicerecord/addproject.vue
View file @ 744f9081
......@@ -39,7 +39,7 @@
<p>{{item.companyIntroduction}}</p>
</div>
<div>
<el-checkbox :disabled="item.existFlag" @click="item.existFlag?'':checkboxli(index)" v-model="item.checkbox" class="checkboxsize"></el-checkbox>
<el-checkbox :disabled="item.existFlag" @change="checkboxli(index)" v-model="item.checkbox" class="checkboxsize"></el-checkbox>
</div>
<p v-if="item.existFlag"><img src="../../../assets/img/existFlag.png"></p>
</li>
......@@ -102,7 +102,7 @@
for(let i in this.tableData){
this.tableData[i].checkbox = false;
}
this.tableData[val].checkbox = !checkbox;
this.tableData[val].checkbox = checkbox;
},
getsearchCorporates(size){
let params = {
......@@ -213,12 +213,18 @@
height: 1rem;
}
>div:nth-child(2){
width: 80%;
margin:0 0.3rem;
>p:nth-child(1){
font-size: 0.32rem;
font-weight: bold;
color: #3F3F53;
margin-bottom: 0.1rem;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp:1;
-webkit-box-orient: vertical;
}
>p:nth-child(2){
font-size: 0.28rem;
......
src/views/mobile/servicerecord/editOnlyproject.vue
View file @ 744f9081
......@@ -96,6 +96,7 @@
<script>
import serviceTop from './servicetop';
import api from './api/api'
import {Toast} from 'mint-ui';
export default {
name : "editOnlyproject",
components:{
......@@ -149,7 +150,8 @@
}
api.fillDetail(this.projectjson).then(response => {
if(response.code == 0) {
this.$toast("完善成功");
this.$router.go(-1);
} else {
this.$message.error(response.msg);
}
......@@ -238,6 +240,7 @@
mounted(){
api.getDetailFields(this.$route.query.projectjson.serviceId).then(response => {
if(response.code == 0) {
this.istitle = response.result;
response.result.forEach((item)=>{
this.projectjson[item.fieldCode] = null;
this.subprojectjson[item.fieldCode] = null;
......
src/views/mobile/servicerecord/editplanmentaion.vue
View file @ 744f9081
......@@ -283,6 +283,7 @@
<script>
import api from './api/api'
import {Toast} from 'mint-ui';
export default {
name : "editplanmentaion",
props: ['screenchildList','serviceId','ServicephasesId','labName','response','responseed'],
......@@ -430,6 +431,7 @@
}
}
if(this.response){
if(this.projectjson.explication){
let params = {
params:this.projectjson,
phaseId:this.ServicephasesId,
......@@ -439,6 +441,7 @@
api.updatePlanRecord(params).then(response => {
if(response.code == 0) {
this.$router.push({path:"/personalcenter",query:{serviceId:this.response.serviceId}});
this.$toast("添加成功");
} else {
this.$message.error(response.msg);
}
......@@ -448,6 +451,11 @@
return false;
})
}else{
this.$toast("请完善备注信息");
}
}else{
if(this.projectjson.explication){
let params = {
params:this.projectjson,
phaseId:this.ServicephasesId,
......@@ -456,6 +464,7 @@
api.addPlanData(params).then(response => {
if(response.code == 0) {
this.$router.push({path:"/personalcenter",query:{serviceId:this.serviceId}});
this.$toast("添加成功");
} else {
this.$message.error(response.msg);
}
......@@ -464,6 +473,10 @@
console.log("提交出错");
return false;
})
}else{
this.$toast("请完善备注信息");
}
}
},
......@@ -712,17 +725,25 @@
if(response.result.fieldList){
for(let i in response.result.fieldList){
if(response.result.fieldList[i].fieldCode == 'coreTeam'){
if(response.result.fieldList[i].fieldValue){
this.coreTeam = response.result.fieldList[i].fieldValue;
}
}
if(response.result.fieldList[i].fieldCode == 'manageTeam'){
if(response.result.fieldList[i].fieldValue){
this.manageTeam = response.result.fieldList[i].fieldValue;
}
}
if(response.result.fieldList[i].fieldCode == 'stockRight'){
if(response.result.fieldList[i].fieldValue){
this.stockRight = response.result.fieldList[i].fieldValue;
}
}
if(response.result.fieldList[i].fieldCode == 'technologyTeam'){
if(response.result.fieldList[i].fieldValue){
this.technologyTeam = response.result.fieldList[i].fieldValue;
}
}
this.projectjson[response.result.fieldList[i].fieldCode] = response.result.fieldList[i].fieldValue;
this.$forceUpdate()
}
......@@ -768,16 +789,39 @@
}
}
if(response.result.fieldList[i].fieldCode == 'projectPatent'){
if(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].fieldValue){
this.companyLabel = [];
let getdata = response.result.fieldList[i].fieldValue.substring(0,response.result.fieldList[i].fieldValue.length-1).split(',');
for(let t in getdata){
this.companyLabel.push({companyLabel:getdata[t]})
}
response.result.fieldList[i].fieldValue = null;
}
}
if(response.result.fieldList[i].fieldCode == 'projectLightspot'){
this.projectLightspot = response.result.fieldList[i].fieldValue;
if(response.result.fieldList[i].fieldValue){
this.projectLightspot = [];
let getdata = response.result.fieldList[i].fieldValue.substring(0,response.result.fieldList[i].fieldValue.length-1).split(',');
for(let t in getdata){
this.projectLightspot.push({projectLightspot:getdata[t]})
}
response.result.fieldList[i].fieldValue = null;
}
}
if(response.result.fieldList[i].fieldCode == 'customerLabel'){
this.customerLabel = response.result.fieldList[i].fieldValue;
if(response.result.fieldList[i].fieldValue){
this.customerLabel = [];
let getdata = response.result.fieldList[i].fieldValue.substring(0,response.result.fieldList[i].fieldValue.length-1).split(',');
for(let t in getdata){
this.customerLabel.push({customerLabel:getdata[t]})
}
response.result.fieldList[i].fieldValue = null;
}
}
this.projectjson[response.result.fieldList[i].fieldCode] = response.result.fieldList[i].fieldValue;
this.$forceUpdate()
......
src/views/mobile/servicerecord/editproject.vue
View file @ 744f9081
......@@ -7,7 +7,7 @@
<div class="project_content">
<el-form label-position="top" label-width="80px" :model="projectjson" class="contnetform">
<!--基本信息-->
<div class="editproject"><span>基本信息</span></div>
<div class="editproject" v-if="fieldscode.baseInfo===null"><span>基本信息</span></div>
<!--<el-form-item v-for="(item,index) in fieldscode1" :label="item.fieldName" :key="index">-->
<!--<el-date-picker @input="inputchange()" v-if="item.fieldCode=='companyCreateDate'" v-model="projectjson.companyCreateDate" style="width: 100%" placeholder="请选择成立时间" :picker-options="pickerDisabled" type="year" value-format="yyyy"></el-date-picker>-->
<!--<el-input @input="inputchange()" v-if="item.fieldCode=='registerAddress'" v-model="projectjson.registerAddress" maxlength="300" placeholder="请输入注册地" type="textarea" :rows="6"></el-input>-->
......@@ -54,7 +54,7 @@
<el-input @input="inputchange()" v-model="projectjson.contactEmpMail" maxlength="36" placeholder="请输入项目联系人邮箱"></el-input>
</el-form-item>
<!--团队信息-->
<div class="editproject"><span>团队信息</span></div>
<div class="editproject" v-if="fieldscode.teamInfo===null"><span>团队信息</span></div>
<div v-if="subprojectjson.coreTeam===null">
<el-form-item label="团队核心成员">
</el-form-item>
......@@ -101,7 +101,7 @@
</div>
</div>
<!--市场信息-->
<div class="editproject"><span>市场信息</span></div>
<div class="editproject" v-if="fieldscode.marketInfo===null"><span>市场信息</span></div>
<el-form-item v-if="subprojectjson.companyIndustry===null" label="所属行业">
<el-cascader popper-class="cascaderNocheck" :options="options" v-model="projectjson.companyIndustry" :props="propsd" :placeholder="$t('releasejson.plprojectIndustryList')" style="width: 100%;" clearable @change="industry"></el-cascader>
</el-form-item>
......@@ -139,7 +139,7 @@
</el-select>
</el-form-item>
<!--技术与研发-->
<div class="editproject"><span>技术与研发</span></div>
<div class="editproject" v-if="fieldscode.technologyResearch===null"><span>技术与研发</span></div>
<el-form-item v-if="subprojectjson.isPatent===null" label="是否拥有专利">
<el-select style="width:100%;" v-model="projectjson.isPatent" :placeholder="$t('releasejson.plchoose')">
<el-option v-for="item in ispatent" :key="item.label" :label="item.value" :value="item.label">
......@@ -171,7 +171,7 @@
<el-input @input="inputchange()" v-model="projectjson.coreTechnology" maxlength="300" placeholder="请输入核心技术" type="textarea" :rows="6"></el-input>
</el-form-item>
<!--财务数据-->
<div class="editproject"><span>财务数据</span></div>
<div class="editproject" v-if="fieldscode.financialData===null"><span>财务数据</span></div>
<el-form-item v-if="subprojectjson.income===null" label="主营收入">
<el-input @input="inputchange()" v-model="projectjson.income" maxlength="36" placeholder="请输入主营收入"></el-input>
</el-form-item>
......@@ -182,7 +182,7 @@
<el-input @input="inputchange()" v-model="projectjson.netProfits" maxlength="36" placeholder="请输入净利润"></el-input>
</el-form-item>
<!--融资信息-->
<div class="editproject"><span>融资信息</span></div>
<div class="editproject" v-if="fieldscode.financingInfo===null"><span>融资信息</span></div>
<div v-if="subprojectjson.financingList===null">
<el-form-item label="历史融资">
</el-form-item>
......@@ -218,7 +218,7 @@
<el-input @input="inputchange()" v-model="projectjson.investmentLights" maxlength="300" placeholder="请输入投资亮点" type="textarea" :rows="6"></el-input>
</el-form-item>
<!--融资信息-->
<div class="editproject"><span>其他信息</span></div>
<div class="editproject" v-if="fieldscode.otherInfo===null"><span>其他信息</span></div>
<el-form-item v-if="subprojectjson.projectProgressArea===null" label="项目潜在落地区域">
<el-select style="width:100%;" v-model="projectjson.projectProgressArea" @change="inputchange()" placeholder="请选择项目潜在落地区域">
<el-option v-for="item in projectareaData" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
......@@ -256,6 +256,7 @@
<script>
import serviceTop from './servicetop';
import api from './api/api'
import {Toast} from 'mint-ui';
export default {
name : "editproject",
components:{
......@@ -323,7 +324,7 @@
return time.getTime() > new Date(new Date().toLocaleDateString()).getTime();
}
},
fieldscode:[],
fieldscode:{},
}
},
......@@ -371,7 +372,8 @@
}
api.fillDetail(this.projectjson).then(response => {
if(response.code == 0) {
this.$router.go(-1)
this.$toast("完善成功");
this.$router.go(-1);
} else {
this.$message.error(response.msg);
}
......@@ -545,8 +547,8 @@
mounted(){
api.getDetailFields(this.$route.query.projectjson.serviceId).then(response => {
if(response.code == 0) {
this.fieldscode = response.result;
for(let i in response.result){
this.fieldscode[response.result[i].fieldCode] = null;
response.result[i].subFieldList.forEach((item)=>{
this.projectjson[item.fieldCode] = null;
this.subprojectjson[item.fieldCode] = null;
......
src/views/mobile/servicerecord/projecttypeOnly.vue
View file @ 744f9081
......@@ -51,7 +51,12 @@
</p>
<p>
<span>专利：</span>
<span>{{projectjson.projectPatent?projectjson.projectPatent:'--'}}</span>
<el-table :data="projectjson.projectPatent" tooltip-effect="dark" class="projectTable1" style="margin-top: 0.2rem;">
<el-table-column prop="patentNumber" label="专利号" align="center" width="120">
</el-table-column>
<el-table-column prop="patentName" label="专利信息" align="center">
</el-table-column>
</el-table>
</p>
<p>
<span>产品亮点：</span>
......@@ -103,8 +108,6 @@
</el-table-column>
<el-table-column prop="eventDes" label="描述" align="center" width="80">
</el-table-column>
<el-table-column prop="eventName" label="名称" align="center">
</el-table-column>
<el-table-column prop="eventUrl" label="链接" align="center">
</el-table-column>
</el-table>
......
src/views/mobile/servicerecord/releasetype.vue
View file @ 744f9081
......@@ -4,7 +4,7 @@
<serviceTop :isHistory="false" :isSearch="true" title="选择发布模块"></serviceTop>
</div>
<div>
<div v-for="item in typedata" class="check_div" :class="item.checkbox?'check_divyes':''" @click="addservice(item)">
<div v-for="item in typedata" class="check_div" :class="item.checkbox?'check_divyes':''">
<p><i class="iconfont icon-xinzeng"></i></p>
<span>{{item.name}}</span>
<el-checkbox v-model="item.checkbox" @change="addservice(item)" class="checkboxsize"></el-checkbox>
......@@ -45,7 +45,7 @@
for(let i in this.typedata){
this.typedata[i].checkbox = false;
}
val.checkbox = !checkbox;
val.checkbox = checkbox;
this.typeto = val.type;
},
add(){
......
src/views/mobile/servicerecord/serviceenterprise.vue
View file @ 744f9081
......@@ -154,6 +154,7 @@
height: 1rem;
}
>div:nth-child(2){
width: 80%;
margin:0 0.3rem;
>span:nth-child(1){
font-size: 0.32rem;
......@@ -180,7 +181,7 @@
>p:nth-child(3){
padding-top: 0.2rem;
>span:nth-child(1){
padding: 0.1rem 0.6rem;
padding: 0.1rem 0.3rem;
}
>span{
border-radius: 3px;
......
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