Skip to content

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

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

parent 34f75f0d
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 35 deletions
src/views/innovatecompany/acceptintention/api/api.js
View file @ 09dad4c7
......@@ -3,15 +3,15 @@ import api from '../../../../api/api';
export default {
getPurposeRequirementList (params){
return api.fetchPost('/business/purpose/getPurposeRequirementList',params);
return api.fetchLoadingPost('/business/purpose/getPurposeRequirementList',params);
},
ignoreRequirement (params){
return api.fetchGet('/business/purpose/ignoreRequirement?purposeId='+params);
return api.fetchLoadingGet('/business/purpose/ignoreRequirement?purposeId='+params);
},
confirmRequirement (params){
return api.fetchGet('/business/purpose/confirmRequirement?purposeId='+params);
return api.fetchLoadingGet('/business/purpose/confirmRequirement?purposeId='+params);
},
getPurposeRequirementDetail (params){
return api.fetchGet('/business/purpose/getPurposeRequirementDetail?purposeId='+params);
return api.fetchLoadingGet('/business/purpose/getPurposeRequirementDetail?purposeId='+params);
},
}
\ No newline at end of file
src/views/innovatecompany/acceptintention/verticalshape.vue
View file @ 09dad4c7
......@@ -48,7 +48,8 @@
</el-row>
<el-row v-for="(item,index) in datalist[2].recordList" :key="index" v-if="contentIf" style="margin-top: 15px">
<p>
<span style="margin-right: 15px">{{$t('stepBarTitle.recordTime')}}</span>{{item.createTime}}
<span v-if="item.createTime" style="margin-right: 15px">{{$t('stepBarTitle.recordTime')}}</span>{{item.createTime}}
<span v-if="item.createdTime" style="margin-right: 15px">{{$t('stepBarTitle.recordTime')}}</span>{{item.createdTime}}
</p>
<div style="padding: 10px;border: 1px solid #E8EAF3;margin-top: 10px;background: #E8EAF3">
<el-form label-position="left" :inline="true" label-width="120px" :model="item" class="contnetform120">
......@@ -100,7 +101,8 @@
<div v-if="datalist[2].recordList" style="padding:0 15px 15px;border: 1px solid #E8EAF3;margin-bottom: 10px">
<el-row v-for="(item,index) in datalist[2].recordList" :key="index" v-if="item.projectFeedback&&!contentIf" style="margin-top: 15px">
<p>
<span style="margin-right: 15px">{{$t('stepBarTitle.recordTime')}}</span>{{item.createTime}}
<span v-if="item.createTime" style="margin-right: 15px">{{$t('stepBarTitle.recordTime')}}</span>{{item.createTime}}
<span v-if="item.createdTime" style="margin-right: 15px">{{$t('stepBarTitle.recordTime')}}</span>{{item.createdTime}}
</p>
<p v-if="!contentIf" style="padding: 10px;border: 1px solid #E8EAF3;margin-top: 10px;background: #E8EAF3">
{{item.projectFeedback}}
......@@ -108,7 +110,8 @@
</el-row>
<el-row v-for="(item,index) in datalist[2].recordList" :key="index" v-if="contentIf" style="margin-top: 15px">
<p>
<span style="margin-right: 15px">{{$t('stepBarTitle.recordTime')}}</span>{{item.createTime}}
<span v-if="item.createTime" style="margin-right: 15px">{{$t('stepBarTitle.recordTime')}}</span>{{item.createTime}}
<span v-if="item.createdTime" style="margin-right: 15px">{{$t('stepBarTitle.recordTime')}}</span>{{item.createdTime}}
</p>
<div style="padding: 10px;border: 1px solid #E8EAF3;margin-top: 10px;background: #E8EAF3">
<el-form label-position="left" :inline="true" label-width="120px" :model="item" class="contnetform120">
......@@ -165,7 +168,8 @@
<div v-if="datalist[3].recordList" style="padding:0 15px 15px;border: 1px solid #E8EAF3;margin-bottom: 10px">
<el-row v-for="(item,index) in datalist[3].recordList" v-if="!contentIf&&item.projectFeedback" :key="index" style="margin-top: 15px">
<p>
<span style="margin-right: 15px">{{$t('stepBarTitle.recordTime')}}</span>{{item.createTime}}
<span v-if="item.createTime" style="margin-right: 15px">{{$t('stepBarTitle.recordTime')}}</span>{{item.createTime}}
<span v-if="item.createdTime" style="margin-right: 15px">{{$t('stepBarTitle.recordTime')}}</span>{{item.createdTime}}
</p>
<p style="padding: 10px;border: 1px solid #E8EAF3;margin-top: 10px;background: #E8EAF3">
{{item.projectFeedback}}
......@@ -173,7 +177,8 @@
</el-row>
<el-row v-if="contentIf" v-for="(item,index) in datalist[3].recordList" :key="index" style="margin-top: 15px">
<p>
<span style="margin-right: 15px">{{$t('stepBarTitle.recordTime')}}</span>{{item.createTime}}
<span v-if="item.createTime" style="margin-right: 15px">{{$t('stepBarTitle.recordTime')}}</span>{{item.createTime}}
<span v-if="item.createdTime" style="margin-right: 15px">{{$t('stepBarTitle.recordTime')}}</span>{{item.createdTime}}
</p>
<div style="padding: 10px;border: 1px solid #E8EAF3;margin-top: 10px;background: #E8EAF3">
<el-form label-position="left" :inline="true" label-width="120px" :model="item" class="contnetform120">
......@@ -246,7 +251,8 @@
<div v-if="datalist[3].recordList" style="padding:0 15px 15px;border: 1px solid #E8EAF3;margin-bottom: 10px">
<el-row v-for="(item,index) in datalist[3].recordList" v-if="!contentIf&&item.projectFeedback" :key="index" style="margin-top: 15px">
<p>
<span style="margin-right: 15px">{{$t('stepBarTitle.recordTime')}}</span>{{item.createTime}}
<span v-if="item.createTime" style="margin-right: 15px">{{$t('stepBarTitle.recordTime')}}</span>{{item.createTime}}
<span v-if="item.createdTime" style="margin-right: 15px">{{$t('stepBarTitle.recordTime')}}</span>{{item.createdTime}}
</p>
<p style="padding: 10px;border: 1px solid #E8EAF3;margin-top: 10px;background: #E8EAF3">
{{item.projectFeedback}}
......@@ -254,7 +260,8 @@
</el-row>
<el-row v-if="contentIf" v-for="(item,index) in datalist[3].recordList" :key="index" style="margin-top: 15px">
<p>
<span style="margin-right: 15px">{{$t('stepBarTitle.recordTime')}}</span>{{item.createTime}}
<span v-if="item.createTime" style="margin-right: 15px">{{$t('stepBarTitle.recordTime')}}</span>{{item.createTime}}
<span v-if="item.createdTime" style="margin-right: 15px">{{$t('stepBarTitle.recordTime')}}</span>{{item.createdTime}}
</p>
<div style="padding: 10px;border: 1px solid #E8EAF3;margin-top: 10px;background: #E8EAF3">
<el-form label-position="left" :inline="true" label-width="120px" :model="item" class="contnetform120">
......@@ -343,7 +350,8 @@
<div style="padding:0 15px 15px;border: 1px solid #E8EAF3;margin-bottom: 50px">
<el-row v-for="(item,index) in datalist[datalist.length-1].recordList" :key="index" v-if="item.recordRemark || item.projectFeedback&&!contentIf" style="margin-top: 15px">
<p>
<span style="margin-right: 15px">{{$t('stepBarTitle.recordTime')}}</span>{{item.createTime}}
<span v-if="item.createTime" style="margin-right: 15px">{{$t('stepBarTitle.recordTime')}}</span>{{item.createTime}}
<span v-if="item.createdTime" style="margin-right: 15px">{{$t('stepBarTitle.recordTime')}}</span>{{item.createdTime}}
</p>
<p style="padding: 10px;border: 1px solid #E8EAF3;margin-top: 10px;background: #E8EAF3">
{{item.recordRemark}}{{item.projectFeedback}}
......
src/views/innovatecompany/demandaudit/api/api.js
View file @ 09dad4c7
......@@ -9,12 +9,12 @@ export default {
return api.fetchPost('/business/requirementDetail/authCount');
},
authList (params){
return api.fetchPost('/business/requirementDetail/authList',params);
return api.fetchLoadingPost('/business/requirementDetail/authList',params);
},
requirementDetail (params){
return api.fetchGet('/business/requirementDetail/detailAuth?detailId='+params);
return api.fetchLoadingPost('/business/requirementDetail/detailAuth?detailId='+params);
},
auth (params){
return api.fetchPost('/business/requirementDetail/auth',Qs.stringify(params));
return api.fetchLoadingPost('/business/requirementDetail/auth',Qs.stringify(params));
},
}
\ No newline at end of file
src/views/innovatecompany/mycollection/api/api.js
View file @ 09dad4c7
......@@ -3,6 +3,6 @@ import Qs from 'qs';
export default {
selectMyCollectionProjects (params){
return api.fetchPost('/business/project/selectMyCollectionProjects',params);
return api.fetchLoadingPost('/business/project/selectMyCollectionProjects',params);
},
}
\ No newline at end of file
src/views/innovatecompany/peopleaudit/api/api.js
View file @ 09dad4c7
......@@ -6,12 +6,12 @@ export default {
return api.fetchPost('/base/emp/authCount');
},
authList (params){
return api.fetchPost('/base/emp/authList',params);
return api.fetchLoadingPost('/base/emp/authList',params);
},
empAuthOther (params){
return api.fetchPost('/base/emp/empAuthOther',Qs.stringify(params));
return api.fetchLoadingPost('/base/emp/empAuthOther',Qs.stringify(params));
},
auth (params){
return api.fetchPost('/base/emp/auth',Qs.stringify(params));
return api.fetchLoadingPost('/base/emp/auth',Qs.stringify(params));
},
}
\ No newline at end of file
src/views/innovatecompany/projectaudit/api/api.js
View file @ 09dad4c7
......@@ -12,12 +12,12 @@ export default {
return api.fetchGet('/business/industry/selectSmallBusinessTree');
},
authCount (){
return api.fetchPost('/business/project/authCount');
return api.fetchLoadingPost('/business/project/authCount');
},
authList (params){
return api.fetchPost('/business/project/authList',params);
return api.fetchLoadingPost('/business/project/authList',params);
},
auth (params){
return api.fetchPost('/business/project/auth',Qs.stringify(params));
return api.fetchLoadingPost('/business/project/auth',Qs.stringify(params));
},
}
\ No newline at end of file
src/views/innovatecompany/projectprocess/projectinside.vue
View file @ 09dad4c7
......@@ -120,7 +120,7 @@
</el-row>
<el-row style="padding: 10px;background: #ffffff">
<el-row v-if="dataobj.empInfo" style="margin-left: 13px;line-height: 55px">
<el-form label-position="left" :inline="true" :label-width="diven_zh?'80px':'180px'" :model="addData" :class="diven_zh?'contnetform':'contnetform'">
<el-form label-position="left" :inline="true" :label-width="diven_zh?'80px':'180px'" :model="dataobj" :class="diven_zh?'contnetform':'contnetform'">
<el-form-item :label="$t('oneself.kf')" style="width: 26%;">
<span style="line-height: 55px">{{dataobj.empInfo.empName}}</span>
</el-form-item>
......
src/views/innovatecompany/projectrecommend/api/api.js
View file @ 09dad4c7
......@@ -6,9 +6,9 @@ export default {
return api.fetchGet('/business/industry/selectSmallBusinessTree');
},
getRecommendRequirementDetail (params){
return api.fetchGet('/business/purpose/getRecommendRequirementDetail?purposeId='+params);
return api.fetchLoadingGet('/business/purpose/getRecommendRequirementDetail?purposeId='+params);
},
getCreatRecommendList (params){
return api.fetchPost('/business/purpose/getCreatRecommendList',params);
return api.fetchLoadingPost('/business/purpose/getCreatRecommendList',params);
},
}
\ No newline at end of file
src/views/innovatecompany/submitprojects/submitfour.vue
View file @ 09dad4c7
......@@ -32,7 +32,7 @@
<el-input maxlength="36" v-model="scope.row.empName" v-if="!scope.row.editif"></el-input>
</template>
</el-table-column>
<el-table-column :label="$t('releasejson.empPosition')" width="180">
<el-table-column :label="$t('releasejson.empPosition')" width="150">
<template slot-scope="scope">
<span v-if="scope.row.editif">{{scope.row.empPosition}}</span>
<el-input maxlength="36" v-model="scope.row.empPosition" v-if="!scope.row.editif"></el-input>
......@@ -67,7 +67,7 @@
<el-date-picker v-if="!scope.row.editif" style="width:200px;" :picker-options="pickerDisabled" v-model="scope.row.eventDate" type="date" value-format="yyyy-MM-dd"></el-date-picker>
</template>
</el-table-column>
<el-table-column :label="$t('releasejson.eventUrl')" width="180">
<el-table-column :label="$t('releasejson.eventUrl')" width="150">
<template slot-scope="scope">
<span v-if="scope.row.editif">{{scope.row.eventUrl}}</span>
<el-input maxlength="36" v-model="scope.row.eventUrl" v-if="!scope.row.editif"></el-input>
......@@ -248,7 +248,7 @@
patentpush(){
let se = /^\s+$/g;
for(let i in this.formData.companyEventList){
if(this.formData.companyEventList[i].eventDate == undefined || this.formData.companyEventList[i].eventDate == null || this.formData.companyEventList[i].eventDate == '' || this.formData.companyEventList[i].eventUrl == '' || se.test(this.formData.companyEventList[i].eventUrl) || this.formData.companyEventList[i].eventDes == '' || se.test(this.formData.companyEventList[i].eventDes)){
if(this.formData.companyEventList[i].eventDate == undefined || this.formData.companyEventList[i].eventDate == null || this.formData.companyEventList[i].eventDate == '' || se.test(this.formData.companyEventList[i].eventUrl) || this.formData.companyEventList[i].eventDes == '' || se.test(this.formData.companyEventList[i].eventDes)){
this.$message.error( this.$t('releasejson.eventcomplete'));
return
}
......@@ -275,7 +275,7 @@
}
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 == undefined || this.formData.companyEventList[i].eventDate == null || this.formData.companyEventList[i].eventDate == '' || this.formData.companyEventList[i].eventUrl == '' || se.test(this.formData.companyEventList[i].eventUrl) || this.formData.companyEventList[i].eventDes == '' || se.test(this.formData.companyEventList[i].eventDes)){
if(this.formData.companyEventList[i].eventDate == undefined || this.formData.companyEventList[i].eventDate == null || this.formData.companyEventList[i].eventDate == '' || se.test(this.formData.companyEventList[i].eventUrl) || this.formData.companyEventList[i].eventDes == '' || se.test(this.formData.companyEventList[i].eventDes)){
this.$message.error( this.$t('releasejson.eventcomplete'));
return
}
......@@ -304,7 +304,7 @@
}
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 == undefined || this.formData.companyEventList[i].eventDate == null || this.formData.companyEventList[i].eventDate == '' || this.formData.companyEventList[i].eventUrl == '' || se.test(this.formData.companyEventList[i].eventUrl) || this.formData.companyEventList[i].eventDes == '' || se.test(this.formData.companyEventList[i].eventDes)){
if(this.formData.companyEventList[i].eventDate == undefined || this.formData.companyEventList[i].eventDate == null || this.formData.companyEventList[i].eventDate == '' || se.test(this.formData.companyEventList[i].eventUrl) || this.formData.companyEventList[i].eventDes == '' || se.test(this.formData.companyEventList[i].eventDes)){
this.$message.error( this.$t('releasejson.eventcomplete'));
return
}
......
src/views/innovatecompany/submitprojects/submittwo.vue
View file @ 09dad4c7
......@@ -152,8 +152,8 @@
projectphaseData:[],
projectformData:[],
ispatent:[
{label:0,value:'否'},
{label:1,value:'是'}
{label:0,value:this.$t('saleRecordTitle.no')},
{label:1,value:this.$t('saleRecordTitle.yes')}
],
ispatentval:'',
isprojcetTab:true,
......
src/views/innovatecompany/submitprojects/totceldata.vue
View file @ 09dad4c7
......@@ -32,9 +32,9 @@
<p style="font-weight:400;font-size: 22px;margin-top: 30px">{{$t("releasejson.subsuccess")}}</p>
<p style="font-weight:400;line-height: 28px;margin-top: 28px;">{{$t("releasejson.textsuccess")}}</p>
<el-row style="margin-top: 28px">
<el-button type="primary" @click="seecustomer" style="width: 140px;height: 42px">{{$t("releasejson.seepeople")}}</el-button>
<el-button type="primary" @click="seeproject" style="width: 140px;height: 42px">{{$t("releasejson.seeproject")}}</el-button>
<el-button v-if="empinfoIf" type="primary" plain style="width: 140px;height: 42px" @click="backd">{{$t("releasejson.goauth")}}</el-button>
<el-button type="primary" @click="seecustomer" style="width: 180px;height: 42px">{{$t("releasejson.seepeople")}}</el-button>
<el-button type="primary" @click="seeproject" style="width: 180px;height: 42px">{{$t("releasejson.seeproject")}}</el-button>
<el-button v-if="empinfoIf" type="primary" plain style="width: 180px;height: 42px" @click="backd">{{$t("releasejson.goauth")}}</el-button>
</el-row>
</el-col>
</el-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