Skip to content

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

项目验收等功能修改

parent 24088b09
Show whitespace changes
Inline Side-by-side
Showing with 34 additions and 23 deletions
src/views/categorypage/category.vue
View file @ d724c31a
......@@ -183,10 +183,10 @@
</el-select>
</el-form-item>
<el-form-item label=" " prop="otherContent" v-if="isotherContent">
<el-input @input="$forceUpdate()" style="width: 300px;" maxlangth="36" v-model="formData.otherContent" placeholder="请输入内容"></el-input>
<el-input @input="$forceUpdate()" style="width: 300px;" maxlength="50" v-model="formData.otherContent" placeholder="请输入内容"></el-input>
</el-form-item>
<el-form-item label="重要信息补充：" prop="supplementInfo">
<el-input @input="$forceUpdate()" type="textarea" :rows="4" maxlangth="500" style="width: 300px;" placeholder="例如：联系方式/联系人/大赛名称/履约名称等信息补充" v-model="formData.supplementInfo"></el-input>
<el-input @input="$forceUpdate()" type="textarea" :rows="4" maxlength="500" style="width: 300px;" placeholder="例如：联系方式/联系人/大赛名称/履约名称等信息补充" v-model="formData.supplementInfo"></el-input>
</el-form-item>
</el-form>
<el-row style="padding-top: 20px;text-align: center">
......
src/views/findeventpage/newEventdetail.vue
View file @ d724c31a
......@@ -81,7 +81,7 @@
{{item.empTitle}}
</i>
</p>
<div v-if="$i18n.locale=='zh-CN'">
<div v-if="item.empId != userInfo.empId&&$i18n.locale=='zh-CN'">
<popoverBardbar :iseventlive="true" v-if="item.isFriend == 2" :row="item"></popoverBardbar>
<btnbar v-else @loginState="loginState" @successState="successState" :row="item" :index="index" :btnType="1" :eventId="$route.query.id"></btnbar>
</div>
......@@ -105,7 +105,7 @@
<i class="iconfont" :class="isIntroduction?'icon-xiala-copy':'icon-xiala'" style="font-size: 12px;transform: scale(0.6);display: inline-block;"></i>
</p>
</div>
<div id="htmldetail" :style="isIntroduction&&guestList.length == 0?'':'height: 400px;overflow: hidden;'" v-html="eventdata.channelIntroduction"></div>
<div id="htmldetail" :style="isIntroduction||guestList.length == 0?'':'height: 400px;overflow: hidden;'" v-html="eventdata.channelIntroduction"></div>
</div>
<div class="p_tabs" v-if="participateList.length != 0">
<div class="gendisplay p_tabs_title">
......@@ -129,7 +129,7 @@
</div>
</div>
</div>
<div class="p_tabs" v-if="resourcesList.length != 0&&eventdata.channelType != 2&&$i18n.locale=='zh-CN'">
<div class="p_tabs" v-if="recommendList.length != 0&&eventdata.channelType != 2&&$i18n.locale=='zh-CN'">
<div class="gendisplay p_tabs_title">
<p>
<span>{{$t('activityInfo.recommendFor')}}<i></i></span>
......@@ -188,7 +188,7 @@
<span>分享此活动给朋友/朋友圈</span>
</div>
</div>
<div class="right_tabs" v-if="(resourcesList.length != 0||recommendList.length != 0)&&eventdata.channelType != 2&&$i18n.locale=='zh-CN'">
<div class="right_tabs" v-if="((resourcesList.length != 0||recommendList.length != 0)&&eventdata.channelType != 2&&$i18n.locale=='zh-CN')||(recommendList.length != 0&&eventdata.channelType == 2)">
<div class="gendisplay right_tabs_title">
<p>
<span style="font-size: 16px;">{{resourcesList.length == 0?$t('activityInfo.recommendFor'):$t('activityInfo.relatedInformation')}}<i></i></span>
......@@ -782,11 +782,13 @@
}
>p:nth-child(2){
color: #1A1A1E;
width: 70px;
height: 22px;
line-height: 22px;
overflow: hidden;
}
>p:nth-child(3){
width: 70px;
height: 22px;
line-height: 22px;
font-size: 12px;
......
src/views/publishactivity/proactivity.vue
View file @ d724c31a
......@@ -206,7 +206,7 @@
</el-table-column>
<el-table-column prop="guestContact" :label="$t('pubactivities.ContactDetails')" align="center">
</el-table-column>
<el-table-column prop="guestName" :label="$t('pubactivities.pubactivities')" align="center">
<el-table-column prop="guestName" :label="$t('pubactivities.guestname')" align="center">
</el-table-column>
<el-table-column prop="guestTitle" :label="$t('pubactivities.guesttitle')" align="center">
</el-table-column>
......@@ -542,21 +542,21 @@
<el-dialog :title="$t('pubactivities.addguests')" :visible.sync="guestVisible" :append-to-body="true" :close-on-click-modal="false" @close="closeSensorguest" class="dialogWrap">
<el-form :inline="true" label-width="210px" :model="guestform" :rules="guestrules" ref="guestform" class="contnetform300s">
<el-form-item :label="$t('pubactivities.ContactDetails')+'：'" prop="guestContact">
<el-input style="width:370px;" maxlength="36" @blur="isempAccountblur" v-model="guestform.guestContact" :placeholder="$t('pubactivities.plguestname')"></el-input>
<el-input style="width:370px;" maxlength="36" @blur="isempAccountblur" v-model="guestform.guestContact" :placeholder="$t('partner.otherReason')+$t('pubactivities.ContactDetails')"></el-input>
</el-form-item>
<el-form-item :label="$t('pubactivities.guestname')+'：'" prop="guestName">
<el-input :disabled="guestform.guestName&&guestform.empId?true:false" style="width:370px;" maxlength="36" v-model="guestform.guestName" :placeholder="$t('pubactivities.plguestname')"></el-input>
<el-form-item :label="$t('pubactivities.guestname')+'：'" prop="linguestName">
<el-input :disabled="guestform.guestName&&guestform.empId?true:false" style="width:370px;" maxlength="36" v-model="guestform.linguestName" :placeholder="$t('pubactivities.plguestname')"></el-input>
</el-form-item>
<el-form-item :label="$t('pubactivities.guestTitle')+'：'" prop="guestTitle">
<el-input :disabled="guestform.editTitle == true?false:guestform.editTitle == false?true:false" style="width:370px;" maxlength="36" v-model="guestform.guestTitle" :placeholder="$t('pubactivities.plguestTitle')"></el-input>
</el-form-item>
<el-form-item :label="$t('pubactivities.guestDesc')+'：'" prop="guestDesc">
<el-input @input="$forceUpdate()" :disabled="guestform.guestDesc&&guestform.empId?true:false" style="width:370px;"type="textarea" maxlength="200" :rows="2" v-model="guestform.linguestDesc" :placeholder="$t('pubactivities.plguestname')"></el-input>
<el-input @input="$forceUpdate()" :disabled="guestform.guestDesc&&guestform.empId?true:false" style="width:370px;"type="textarea" maxlength="200" :rows="2" v-model="guestform.linguestDesc" :placeholder="$t('partner.otherReason')+$t('pubactivities.guestDesc')"></el-input>
</el-form-item>
<el-form-item :label="$t('pubactivities.guestPhotos')+'：'" ref="guestimg" prop="guestPic">
<el-input v-show="false" v-model="guestform.guestPic"></el-input>
<p class="imgTitle">{{$t('pubactivities.guesttext')}}</p>
<div class="uploadImg">
<el-input v-if="false" v-model="guestform.guestPic"></el-input>
<img v-if="guestform.guestPic&&guestform.empId?true:false" :src="guestform.guestPic" style="width: 120px;height: 120px;" alt="">
<up-img v-else :actionUrl="'/base/upload/uploadLogo'" :channelPic="guestform.guestPic" @dataEvent="guestimg" :upmax="0.2"></up-img>
</div>
......@@ -691,7 +691,7 @@
},
guestrules:{
guestContact: [{required: true, validator:validate.checkMobileAndEmail, trigger: 'blur'}],
guestName: [{required: true,message: this.$t('pubactivities.plguestname'),trigger: 'blur'}],
linguestName: [{required: true,message: this.$t('pubactivities.plguestname'),trigger: 'blur'}],
guestTitle: [{required: true,message: this.$t('pubactivities.plguestTitle'),trigger: 'blur'}],
guestPic: [{required: true,message: this.$t('pubactivities.pluploadimg'),trigger: 'blur'}],
},
......@@ -789,7 +789,9 @@
fielditem:null,
editVisible:false,
editindex:null,
guestform:{},
guestform:{
guestPic:'',
},
guestlist:[],
urltext:'',
timeZoneData:[],//时区
......@@ -934,8 +936,11 @@
if(response.result){
this.guestform = response.result;
this.guestform.linguestDesc = this.guestform.guestDesc;
this.guestform.linguestName = this.guestform.guestName;
}else{
this.guestform = {};
this.guestform = {
guestPic:'',
};
this.guestform.guestContact = guestContact;
}
this.$refs['guestform'].resetFields();
......@@ -986,7 +991,9 @@
},
//新增嘉宾弹框关闭
closeSensorguest(){
this.guestform = {};
this.guestform = {
guestPic:'',
};
// this.$refs['guestform'].resetFields();
},
//邀请嘉宾
......@@ -1030,6 +1037,7 @@
if(response.code == 0) {
this.guestform = response.result;
this.guestform.linguestDesc = this.guestform.guestDesc;
this.guestform.linguestName = this.guestform.guestName;
this.guestVisible = true;
} else {
this.$message.error(response.msg);
......@@ -1053,6 +1061,7 @@
}
}
this.guestform.guestDesc = this.guestform.linguestDesc;
this.guestform.guestName = this.guestform.linguestName;
let urls = this.guestform.guestId?'/base/guests/editGuestsInfo':'/base/guests/addGuestsInfo';
api.addGuestsInfo(urls,this.guestform).then(response => {
if(response.code == 0) {
......
src/views/topicpage/commentdetail.vue
View file @ d724c31a
......@@ -44,7 +44,7 @@
:src="commentdataimg"
:preview-src-list="getSrcList(commentdata.discussUrl.split(','),index)">
</el-image>
来自：<i @click="totopic" style="color: red;cursor: pointer;">{{contentdata.topicTitle}}</i>
来自：<i @click="totopic" style="color: #5D78FF;cursor: pointer;">#{{contentdata.topicTitle}}#</i>
<!-- 讨论分享、评论、点赞操作-->
<div class="gendisplay operating">
<p>
......
src/views/topicpage/discussall.vue
View file @ d724c31a
<template>
<div class="foutdivdiscuss">
<div class="divclasschild">
<div class="descContentcal gendisplay" v-if="moderatorSetting.descContent&&moderatorSetting.showDesc==1">
<div class="descContentcal gendisplay" v-if="moderatorSetting.showDesc==0">
<img src="../../assets/img/mobile/laba@2x.png" alt="" style="width: 23px;position: absolute;left: 15px;bottom: 9px;">
<p @click="moderatorSetting.descUrl?descUrletail():''" :style="moderatorSetting.descUrl?'cursor: pointer;':''" style="width: 100%;height: 40px;overflow: hidden;line-height: 40px;" class="ellipsisFont1">{{moderatorSetting.descContent}}</p>
<p @click="descUrletail()" style="width: 100%;height: 40px;overflow: hidden;line-height: 40px;cursor: pointer;" class="ellipsisFont1">{{moderatorSetting.descContent}}</p>
</div>
<div class="gendisplay">
<div style="background: #FFFFFF;border-radius: 3px;">
......
src/views/topicpage/topicall.vue
View file @ d724c31a
......@@ -161,9 +161,9 @@
</el-form-item>
<el-form-item label="配置公告的话题：">
<div class="gendisplay">
<el-date-picker style="width: 200px;" @change="" v-model="searchAnnounce.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('operationjson.authBegin')"></el-date-picker>
<el-date-picker style="width: 200px;" @change="searchTopic" v-model="searchAnnounce.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">{{$t('operationjson.tos')}}</p>
<el-date-picker style="width: 200px;" v-model="searchAnnounce.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('operationjson.authEnd')"></el-date-picker>
<el-date-picker style="width: 200px;" @change="searchTopic" v-model="searchAnnounce.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('operationjson.authEnd')"></el-date-picker>
</div>
</el-form-item>
<el-row :gutter="20" style="margin: 20px 0">
......
src/views/topicpage/topicdetail.vue
View file @ d724c31a
......@@ -178,8 +178,8 @@
</div>
<div>
<div style="margin: 15px 0;color:#1A1A1E;line-height: 24px;overflow: hidden;" @click="eventtopiccontent($event)">
<span v-if="item.alltext" v-html="item.pcState==1?(item.simpleContent+(item.simpleContent.length>140?'...':'')):publicFun.analyzeEmoji((item.discussContentlin+(item.discussContentlin.length>140?'...':'')))"></span>
<span v-else v-html="item.pcState==1?item.simpleContent:publicFun.analyzeEmoji(item.discussContentconst)"></span>
<span v-if="item.alltext" v-html="item.pcState==1?(item.simpleContent.slice(0,140)+(item.simpleContent.length>140?'...':'')):publicFun.analyzeEmoji((item.discussContentlin+(item.discussContentlin.length>140?'...':'')))"></span>
<span v-else v-html="item.pcState==1?item.discussContent:publicFun.analyzeEmoji(item.discussContentconst)"></span>
<i
v-if="publicFun.getTextInRichtext(item.discussContentconst).length>140"
@click="item.alltext = !item.alltext"
......
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