Skip to content

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

Merge remote-tracking branch 'origin/master'

parents 6113a087 b291f93b
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 30 deletions
src/components/index/Pagescreen.vue
View file @ 114a65c5
<template>
<div style="padding: 6px 0">
<div style="display: flex;padding-left: 10px">
<div>
<div :style="titleType?'width: 0;overflow: hidden;':''">
<p class="titleNameP" :class="labelWidth?'labelWidth':''">{{titleName}}:</p>
</div>
<div style="display: flex;font-weight: normal">
......@@ -9,7 +9,7 @@
<el-checkbox-group v-model="wholecheck" size="small">
<el-checkbox-button class="applyCheckbox" v-for="item in wholeList"
:label="item" :key="item" @change="wholeClik">
{{item}}
{{titleType?'全部':item}}
</el-checkbox-button>
</el-checkbox-group>
</div>
......@@ -76,7 +76,7 @@
<script>
export default {
props:[
'screenlist','titleName','screenchildListIf','checkboxGroupstate','checkboxGroupchildstate','states','childSingle','thirdChildren','requireStatus','labelWidth'
'screenlist','titleName','screenchildListIf','checkboxGroupstate','checkboxGroupchildstate','states','childSingle','thirdChildren','requireStatus','labelWidth','titleType'
],
name : "Pagescreen",
data() {
......
src/views/findeventpage/eventlive.vue
View file @ 114a65c5
......@@ -6,10 +6,10 @@
<img class="event_iconchange_img" src="../../assets/img/changeImg.png" alt="">
</el-tooltip>
</div>
<div v-if="isVisible&&userClick" class="gendisplay event_all">
<div @click="userClick = false" class="event_l"></div>
<div :class="userClicks?'':'event_lshow'" class="gendisplay event_all">
<div @click="getuserClicks" class="event_l"></div>
<div class="event_r" :class="userClick?'event_rshow':''">
<img @click="userClick = false" src="../../assets/img/pull.png" :style="userClick?'':'display: none;'">
<img @click="getuserClicks" src="../../assets/img/pull.png" :style="userClick?'':'display: none;'">
<div class="gendisplay event_title">
<div>
<span @click="titleHover = 0" :class="titleHover == 0?'title_hover':''">交换名片</span>
......@@ -53,6 +53,7 @@
data() {
return {
userClick:false,
userClicks:false,
titleHover:0,
newstotalResult:0,
isVisible:false,
......@@ -82,8 +83,16 @@
},
isuserClick(){
this.userClick = true;
this.userClicks = true;
this.$refs.total.getMyMessageList();
},
getuserClicks(){
let _this = this;
this.userClick = false;
setTimeout(function () {
_this.userClicks = false;
},1000)
},
userHistory(state){
let params = {
activityId: this.activityId,
......@@ -163,7 +172,7 @@
}
}
.event_lshow{
width: 0px!important;
width: 0!important;
height: 0!important;
}
.event_all{
......
src/views/indexAccepting/exportFieldBar.vue
View file @ 114a65c5
......@@ -5,8 +5,9 @@
ref="popover"
trigger="click">
<div class="popover_export">
<page-screen :screenlist="screenlist" ref="screenchild" titleName="请选择导出字段" @changecheck="screenData"></page-screen>
<div style="text-align: center;">
<p style="margin: 15px 20px;font-weight: bold;">请选择导出字段：</p>
<page-screen :screenlist="screenlist" ref="screenchild" titleType="全部" titleName="请选择导出字段" @changecheck="screenData"></page-screen>
<div style="text-align: center;border-top: 1px solid #F2F2F2;padding-top: 20px;">
<el-button slot="reference" type="primary" style="width: 140px;" @click="exportexcel">确定导出</el-button>
</div>
</div>
......
src/views/indexAccepting/kolProfessorsManage.vue
View file @ 114a65c5
......@@ -2,11 +2,11 @@
<div style="margin-top: 10px;">
<el-row class="tabPdding">
<el-row class="statebottm">
<page-screen :screenlist="screenlist" :checkboxGroupstate="checkStateIds" :checkboxGroupchildstate="search.cindustryIds" :screenchildListIf="true" ref="screenchild" titleName="验收状态" @changecheck="screenData"></page-screen>
<page-screen :labelWidth="90" :screenlist="screenlist" :checkboxGroupstate="checkStateIds" :checkboxGroupchildstate="search.cindustryIds" :screenchildListIf="true" ref="screenchild" titleName="验收状态" @changecheck="screenData"></page-screen>
</el-row>
<el-row class="statebottm" style="padding: 20px 10px;line-height: 40px;">
<el-col :span="12">
<span style="font-weight: bold;margin: 0 22px 0 25px;">区域：</span>
<span style="font-weight: bold;margin-right: 57px;">区域：</span>
<el-select v-model="search.orgList" multiple placeholder="请选择区域" style="width: 280px;">
<el-option
v-for="item in areaList"
......@@ -23,7 +23,7 @@
</el-row>
<el-row class="statebottm" style="padding: 20px 10px;line-height: 40px;">
<div style="display:flex;">
<span style="font-weight: bold;margin-right: 20px;">审核时间：</span>
<span style="font-weight: bold;margin-right: 30px;">审核时间：</span>
<el-date-picker style="width: 200px;" v-model="search.checkStartTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('operationjson.authBegin')"></el-date-picker>
<p style="width: 50px;text-align: center">{{$t('operationjson.tos')}}</p>
<el-date-picker style="width: 200px;" v-model="search.checkEndTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('operationjson.authEnd')"></el-date-picker>
......@@ -31,16 +31,16 @@
</el-row>
<el-row class="contnetform" style="padding:0 10px;">
<div style="display:flex;flex-wrap: wrap;">
<p style="font-weight: bold;margin-right: 20px;margin-top:20px;line-height: 40px;">创建时间：</p>
<p style="font-weight: bold;margin-right: 30px;margin-top:20px;line-height: 40px;">创建时间：</p>
<el-date-picker style="width: 200px;margin-top:20px;" v-model="search.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('operationjson.authBegin')"></el-date-picker>
<p style="width: 50px;text-align: center;line-height: 40px;margin-top:20px;">{{$t('operationjson.tos')}}</p>
<el-date-picker style="width: 200px;margin-top:20px;" v-model="search.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('operationjson.authEnd')"></el-date-picker>
<el-input style="width: 180px;margin:20px 20px 0 20px;" v-model="search.content"
@keyup.enter.native="searchCik"
placeholder="请输入关键词查询"></el-input>
<el-button type="primary" style="width: 140px;margin:20px 20px 0 0;" @click="searchCik">{{$t('operationjson.search')}}</el-button>
<el-button type="primary" plain style="width: 140px;margin:20px 20px 0 0;" @click="resetCik">重置</el-button>
<exportFieldBar style="margin:20px 20px 0 0;" :screenlist="exportFieldlist" @exportSuccess="exportSuccess"></exportFieldBar>
<el-button type="primary" style="width: 140px;margin:20px 10px 0 0;" @click="searchCik">{{$t('operationjson.search')}}</el-button>
<el-button type="primary" plain style="width: 140px;margin:20px 10px 0 0;" @click="resetCik">重置</el-button>
<exportFieldBar style="margin:20px 10px 0 0;" :screenlist="exportFieldlist" @exportSuccess="exportSuccess"></exportFieldBar>
</div>
</el-row>
</el-row>
......@@ -110,7 +110,7 @@
<p class="datap">{{$t('listjson.notfoundyet')}}</p>
</template>
</el-table>
<div class="pagination">
<div class="pagination" v-if="totalListResult !=0">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
......@@ -150,7 +150,7 @@
},
areaList:[],
auditlist:[],
cur_page: 1, //页数
cur_page: this.publicFun.getCookie("projectSearch")?JSON.parse(this.publicFun.getCookie("projectSearch")).cur_page:1, //页数
totalListResult: 0,
numberData: 10, //设置个数
exportFieldlist:[],
......@@ -166,9 +166,12 @@
if(vm.search.checkState !=''||vm.search.checkState !=null){
vm.checkStateIds.push(vm.search.checkState)
}
vm.cur_page = vm.search.cur_page;
vm.getAcceptanceAxios();
}else{
vm.publicFun.removeCookie("kolProfessorsSearch")
vm.cur_page = 1;
vm.getAcceptanceAxios();
}
})
},
......
src/views/indexAccepting/projectManage.vue
View file @ 114a65c5
......@@ -2,11 +2,11 @@
<div style="margin-top: 10px;">
<el-row class="tabPdding">
<el-row class="statebottm">
<page-screen :screenlist="screenlist" :checkboxGroupstate="checkStateIds" :checkboxGroupchildstate="search.authenticationState" :screenchildListIf="true" ref="screenchild" titleName="验收状态" @changecheck="screenData"></page-screen>
<page-screen :labelWidth="90" :screenlist="screenlist" :checkboxGroupstate="checkStateIds" :checkboxGroupchildstate="search.authenticationState" :screenchildListIf="true" ref="screenchild" titleName="验收状态" @changecheck="screenData"></page-screen>
</el-row>
<el-row class="statebottm" style="padding: 20px 10px;line-height: 40px;">
<el-col :span="12">
<span style="font-weight: bold;margin: 0 22px 0 25px;">区域：</span>
<span style="font-weight: bold;margin-right: 57px;">区域：</span>
<el-select v-model="search.selectOrgIdList" multiple placeholder="请选择区域" style="width: 280px;">
<el-option
v-for="item in areaList"
......@@ -23,7 +23,7 @@
</el-row>
<el-row class="statebottm" style="padding: 20px 10px;line-height: 40px;">
<div style="display:flex;">
<span style="font-weight: bold;margin-right: 20px;">审核时间：</span>
<span style="font-weight: bold;margin-right: 30px;">审核时间：</span>
<el-date-picker style="width: 200px;" v-model="search.authBegin" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('operationjson.authBegin')"></el-date-picker>
<p style="width: 50px;text-align: center">{{$t('operationjson.tos')}}</p>
<el-date-picker style="width: 200px;" v-model="search.authEnd" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('operationjson.authEnd')"></el-date-picker>
......@@ -31,16 +31,16 @@
</el-row>
<el-row class="contnetform" style="padding:0 10px;">
<div style="display:flex;flex-wrap: wrap;">
<p style="font-weight: bold;margin-right: 20px;margin-top:20px;line-height: 40px;">创建时间：</p>
<p style="font-weight: bold;margin-right: 30px;margin-top:20px;line-height: 40px;">创建时间：</p>
<el-date-picker style="width: 200px;margin-top:20px;" v-model="search.createdBegin" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('operationjson.authBegin')"></el-date-picker>
<p style="width: 50px;text-align: center;line-height: 40px;margin-top:20px;">{{$t('operationjson.tos')}}</p>
<el-date-picker style="width: 200px;margin-top:20px;" v-model="search.createdEnd" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('operationjson.authEnd')"></el-date-picker>
<el-input style="width: 180px;margin:20px 20px 0 20px;" v-model="search.keyName"
@keyup.enter.native="searchCik"
placeholder="请输入关键词查询"></el-input>
<el-button type="primary" style="width: 140px;margin:20px 20px 0 0;" @click="searchCik">{{$t('operationjson.search')}}</el-button>
<el-button type="primary" plain style="width: 140px;margin:20px 20px 0 0;" @click="resetCik">重置</el-button>
<exportFieldBar style="margin:20px 20px 0 0;" :screenlist="exportFieldlist" @exportSuccess="exportSuccess"></exportFieldBar>
<el-button type="primary" style="width: 140px;margin:20px 10px 0 0;" @click="searchCik">{{$t('operationjson.search')}}</el-button>
<el-button type="primary" plain style="width: 140px;margin:20px 10px 0 0;" @click="resetCik">重置</el-button>
<exportFieldBar style="margin:20px 10px 0 0;" :screenlist="exportFieldlist" @exportSuccess="exportSuccess"></exportFieldBar>
</div>
</el-row>
</el-row>
......@@ -82,7 +82,7 @@
<p class="datap">{{$t('listjson.notfoundyet')}}</p>
</template>
</el-table>
<div class="pagination">
<div class="pagination" v-if="totalListResult !=0">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
......@@ -122,7 +122,7 @@
},
areaList:[],
auditlist:[],
cur_page: 1, //页数
cur_page: this.publicFun.getCookie("projectSearch")?JSON.parse(this.publicFun.getCookie("projectSearch")).cur_page:1, //页数
totalListResult: 0,
numberData: 10, //设置个数
exportFieldlist:[],
......@@ -132,14 +132,18 @@
beforeRouteEnter(to, from, next) {
next(vm=>{ // 这里的vm指的就是vue实例，可以用来当做this使用
vm.pathfrom = from.path;
if(vm.pathfrom == '/auditinside'){
vm.search = vm.publicFun.getCookie("projectSearch")?JSON.parse(vm.publicFun.getCookie("projectSearch")):{};
if(vm.search.authenticationState !=''||vm.search.authenticationState !=null){
vm.checkStateIds.push(vm.search.authenticationState)
}
vm.cur_page = vm.search.cur_page;
vm.getAcceptanceAxios();
}else{
vm.publicFun.removeCookie("projectSearch")
vm.cur_page = 1;
vm.getAcceptanceAxios();
}
})
},
......@@ -197,6 +201,7 @@
});
},
handdetail(val){
this.search.cur_page = this.cur_page;
this.publicFun.setUserInfoCookie("projectSearch",JSON.stringify(this.search))
this.$router.push({path:"/auditinside",query:{projectId:val.projectId,state:val.authenticationState,type:true,}});
},
......
src/views/innovatecompany/submitprojects/submittwo.vue
View file @ 114a65c5
......@@ -399,7 +399,7 @@
}else{
this.isShowErrorText = false;
}
if(!this.formData.projectBpUrl||this.formData.projectBpUrl.length==0){
if((!this.formData.projectBpUrl||this.formData.projectBpUrl.length==0)&&this.publicFun.isgetUserRoleFunc(5)){
this.$message.error('请上传项目BP');
return
}
......
src/views/kolExpert/addkolExpert.vue
View file @ 114a65c5
......@@ -12,7 +12,7 @@
<div style="margin-top: 20px;">
<el-form label-position="right" :model="expertData" :rules="rules" ref="expertData" label-width="200px" class="contnetform180" >
<el-form-item label="绑定账号：" prop="empAccount">
<el-input :disabled="$route.query.id&&!expertData.canUpdateAccount?true:false" style="width: 500px;" @blur="isempAccountblur" placeholder="请输入账号" v-model="expertData.empAccount"></el-input>
<el-input :disabled="expertData.canUpdateAccount?true:false" style="width: 500px;" @blur="isempAccountblur" placeholder="请输入账号" v-model="expertData.empAccount"></el-input>
</el-form-item>
<el-form-item label="专家姓名：" prop="empName">
<el-input style="width: 500px;" maxlength="36" placeholder="请输入专家姓名" v-model="expertData.empName"></el-input>
......
src/views/kolExpert/kolExpertManage.vue
View file @ 114a65c5
......@@ -23,10 +23,10 @@
</template>
</el-form-item>
<el-form-item class="formcontentnk">
<el-button type="primary" @click="exportSuccess" style="margin-right: 20px;">导出</el-button>
<el-input placeholder="请输入关键字" @keyup.enter.native="searchCik" v-model="searchs.content" class="input-with-select" style="width: 290px">
<el-button slot="append" icon="el-icon-search" @click="searchCik"></el-button>
</el-input>
<el-button type="primary" @click="exportSuccess" style="margin-left: 20px;">导出</el-button>
</el-form-item>
</el-form>
<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