Commit f102c25c authored by anxixi's avatar anxixi

Merge remote-tracking branch 'origin/master'

parents bf453077 0499da1b
......@@ -26,6 +26,10 @@ module.exports = {
activityList:"活动区",
hasPublish:"Publish",
myComment:"我的评价",
match:"Match",
vote:"Vote",
activity:"Activity",
mine:"Mine",
},
......
......@@ -26,7 +26,12 @@ module.exports = {
activityJoin:"参与的活动",
activityList:"活动区",
hasPublish:"已发布",
myComment:"我的评价"
myComment:"我的评价",
match:"对接",
vote:"评选",
activity:"活动",
mine:"我的",
},
login: {//登录
......@@ -616,8 +621,8 @@ module.exports = {
success:"成功",
buttonSuccess:"您可以从“工作台-",
buttonEndTitle:"”中查看进度",
bBNoAuthTitle:"你还未进行个人认证,认证成功后可以查看更多客户信息",
sBNoAuthTitle:"你还未进行个人认证,认证成功后可以查看更多项目信息",
bBNoAuthTitle:"您还未发布任何项目,发布成功且审核通过后可查看更多需求!",//TODO:翻译
sBNoAuthTitle:"您还未发布任何需求,发布成功且审核通过后可查看更多项目!",//TODO:翻译
placeholderKey:"输入项目名称/企业名称/技术关键词",
auditSuccessAuth:"您的认证已通过审核!您可以",
sendProject:"发项目",
......
This diff is collapsed.
......@@ -142,8 +142,9 @@
<span class="errorText" v-if="isShowErrorText5">{{$t("workPlace.sendRequireForm.errorExceedAccessory")}}</span>
</el-form-item>
<el-form-item style="margin-top: 40px;">
<el-button type="primary" v-if="visible" :disabled="disabledFlag>0" @click="submitForm('ruleForm')" style="width: 180px;">
{{$t("workPlace.sendRequireForm.sendRequire")}}
{{auditState=='AS01'?$t('workPlace.basicForm.saveAndNextStep'):$t("workPlace.sendRequireForm.sendRequire")}}
</el-button>
</el-form-item>
......@@ -165,7 +166,7 @@
addSuccessCmpt,
loadingCmpt
},
props: ['visible','canLastStep'],
props: ['visible','canLastStep','auditState',"reqCount"],
data() {
return {
uploadHostHeader: process.env.VUE_APP_UPLOAD_FILE,//文件上传地址
......@@ -185,7 +186,7 @@
annexFile:"",
targetLabel:"",
sourceNations:[],
sourceNationsData:""
sourceNationsData:"",
},
rules: {
requirementName: [
......@@ -492,6 +493,7 @@
if (res.code == 0) {
if (flag == 1) {//初始化一级
that.sourceNationList = res.result;
that.getTargetIndustryList(0);
// that.sourceNationList.unshift({
// geoId:-100,
// name:that.$t("commonTitle.select")
......@@ -528,15 +530,18 @@
let that = this;
api.sendRequireAxios(this.ruleForm).then((res) => {
if (res.code == 0) {
this.$store.dispatch('currentDetailIdAction',{path:this.$route.path,pars:res.result});
setTimeout(function(){
that.disabledFlag=0;
return false;
},500)
setTimeout(function(){
that.fullscreenLoading = false;
that.successVisible = true;
that.detailId = res.result;
},2000)
if(this.auditState!="AS01"){
setTimeout(function(){
that.fullscreenLoading = false;
that.successVisible = true;
that.detailId = res.result;
},2000)
}else globalMsg.$emit("postActiveName","third");
} else {
that.$message.error(res.msg);
setTimeout(function(){
......@@ -615,10 +620,15 @@
}
},
mounted(){
this.getTargetIndustryList(0);
this.getCompanyWay();
this.getAddressDataFunc(-1,1);
if(this.visible){
this.getCompanyWay();
this.getAddressDataFunc(-1,1);
}
},
beforeDestroy(){
}
}
</script>
......
......@@ -13,7 +13,7 @@
<div class="successButton">
<el-button type="primary" @click="handleToIndex(4)" v-if="detailInfo&&detailInfo.authenticationState==2">{{$t("topNav.findProject")}}</el-button>
<el-button type="primary" @click="handleToIndex(2)">{{$t("workPlace.checkRequire")}}</el-button>
<el-button type="primary" @click="handleToIndex(3)" v-if="detailInfo&&detailInfo.authenticationState!=2">{{$t("register.auth")}}</el-button>
<!--<el-button type="primary" @click="handleToIndex(3)" v-if="detailInfo&&detailInfo.authenticationState!=2">{{$t("register.auth")}}</el-button>-->
<!--<el-button type="primary" plain @click="handleToIndex(1)" v-if="detailInfo.authenticationState==2">{{$t("workPlace.goreturn")}}</el-button>-->
</div>
......@@ -27,7 +27,7 @@
props:{
id:{
type:Number,
default:""
default:0
},
isSale:{
type:Boolean,
......@@ -36,18 +36,19 @@
},
data() {
return {
detailInfo:{}
detailInfo:{},
detailId:""
}
},
methods: {
handleToIndex(type) {
if(type==1){
if(this.isSale) this.$router.push({path:"/salerequire/detail",query:{id:this.id}});
else this.$router.push({path:"/require/detail",query:{id:this.id}});
else this.$router.push({path:"/require/detail",query:{id:this.id?this.id:this.detailId}});
}
if(type==2){
if(this.isSale) this.$router.push({path:"/salerequire/detail",query:{id:this.id}});
else this.$router.push({path:"/require/detail",query:{id:this.id}});
else this.$router.push({path:"/require/detail",query:{id:this.id?this.id:this.detailId}});
}
if(type==3) {
......@@ -61,6 +62,9 @@
//初始化获取个人认证信息
getInitData(){
var that = this;
if(this.$store.state.currentDetailId.has(this.$route.path)) {
this.detailId=this.$store.state.currentDetailId.get(this.$route.path);
}
api.getAuthInfoAxios().then((res)=>{
if(res.code==0){
that.detailInfo = res.result;
......@@ -71,8 +75,9 @@
},
},
mounted(){
var that =this;
this.getInitData();
}
},
}
</script>
......
......@@ -30,8 +30,11 @@
methods: {
handleToRoute() {
if (this.userInfo.empType == 0) this.$router.push("/totceldata");
else if (this.userInfo.empType == 1) this.$router.push("/bigBusiness/add");
if(this.$route.name&&this.$route.name=="bigBusinessDetail"){
this.$router.push("/bigBusiness/add");
}
// if (this.userInfo.empType == 0) this.$router.push("/totceldata");
// else if (this.userInfo.empType == 1) this.$router.push("/bigBusiness/add");
// else if(this.userInfo.empType == 2) {
// if (this.userInfo.roleList.length) {
// for (var i = 0; i < this.userInfo.roleList.length; i++) {
......@@ -45,8 +48,11 @@
getUserInfoFunc() {
this.userInfo = this.publicFun.getCookie("userInfo") ? JSON.parse(this.Base64.decode(this.publicFun.getCookie("userInfo"))) : "";
if (this.userInfo) {
if (this.userInfo.empType == 0) this.buttonName = this.$t("releasejson.release");
else if (this.userInfo.empType == 1) this.buttonName = this.$t("workPlace.addRequire");
if(this.$route.name&&this.$route.name=="bigBusinessDetail"){
this.buttonName = this.$t("workPlace.addRequire");
}
// if (this.userInfo.empType == 0) this.buttonName = this.$t("releasejson.release");
// else if (this.userInfo.empType == 1) this.buttonName = this.$t("workPlace.addRequire");
}
},
},
......
......@@ -19,10 +19,14 @@
<el-button type="primary" plain @click="handleEdit" style="width: 130px;">{{$t("commonTitle.goEdit")}}</el-button>
<el-button plain @click="handleCancel" style="width: 130px;" >{{$t("commonTips.cancel")}}</el-button>
</span>
<span slot="footer" class="dialog-footer" v-if="isCancel&&isListDialog">
<span slot="footer" class="dialog-footer" v-if="!toPublish&&isCancel&&isListDialog">
<el-button type="primary" @click="handleTo" style="width: 130px;">{{$t("commonTips.confirm")}}</el-button>
<el-button plain @click="handleCancel" style="width: 130px;" >{{$t("commonTips.cancel")}}</el-button>
</span>
<span slot="footer" class="dialog-footer" v-if="toPublish&&isCancel&&isListDialog">
<el-button type="primary" @click="handleToPublish" style="width: 130px;">{{buttonText}}</el-button>
<el-button plain @click="handleCancel" style="width: 130px;" >{{$t("commonTips.cancel")}}</el-button>
</span>
</el-dialog>
</div>
......@@ -55,7 +59,13 @@
isLogin:{
type:Boolean,
default:false
}
},
toPublish:{
type:Boolean,
default:false
},
buttonText:String,
publishFlag:0
},
data(){
return{
......@@ -65,7 +75,9 @@
}
},
methods:{
handleToAUth(){
handleToPublish(){
if(this.publishFlag==2) this.$router.push("/bigBusiness/add");
else this.$router.push("/totceldata");
},
handleEdit(){
......
......@@ -82,7 +82,7 @@
</div>
</div>
<dialogCmpt v-if="isShowNotAuth" :isCancel="true" :isListDialog="true" :isLogin="false" @isVisible="goAuth" :content="$t('commonTitle.bBNoAuthTitle')" :buttonText="$t('register.auth')">
<dialogCmpt v-if="isShowNotAuth" :publishFlag="1" :toPublish="true" :isCancel="true" :isListDialog="true" :isLogin="false" :buttonText="$t('commonTitle.sendProject')" @isVisible="goAuth" :content="$t('commonTitle.bBNoAuthTitle')">
</dialogCmpt>
......
......@@ -59,7 +59,7 @@
<!--<el-button type="primary" style="width: 180px;height: 42px" @click="$router.push('/editAuth')">{{$t("register.auth")}}</el-button>-->
<!--</el-row>-->
</el-row>
<dialogCmpt v-if="isShowNotAuth" :isCancel="true" :isListDialog="true" :isLogin="false" @isVisible="goAuth" :content="$t('commonTitle.bBNoAuthTitle')" :buttonText="$t('register.auth')">
<dialogCmpt v-if="isShowNotAuth" :toPublish="true" :publishFlag="2" :isCancel="true" :isListDialog="true" :isLogin="false" @isVisible="goAuth" :content="$t('commonTitle.sBNoAuthTitle')" :buttonText="$t('commonTitle.sendRequire')">
</dialogCmpt>
......
......@@ -262,7 +262,9 @@
this.$router.push({path:"/myjoin"})
}
else{
this.$router.go(-1)
if(this.$route.name=="activityMyJoin"){
this.$router.push({path:"/mine"})
}else this.$router.go(-1)
}
}
......
......@@ -253,7 +253,7 @@
} else {
if(res.code==499){
if(this.userInfo){
if(this.userInfo.empType!=null){
if(this.publicFun.getUserRoleFunc().indexOf(8)>-1||this.publicFun.getUserRoleFunc().indexOf(4)>-1||this.publicFun.getUserRoleFunc().indexOf(7)>-1){
if(this.userInfo.auditState=="AS01"){
MessageBox({
message:this.userInfo.empType==1?this.$t("commonTips.hasLoginAndNotAuthBigBusiness"):this.$t("commonTips.hasLoginAndNotAuthSmallBusiness"),
......@@ -371,7 +371,7 @@
}else{
if(res.code==499){
if(this.userInfo){
if(this.userInfo.empType!=null){
if(this.publicFun.getUserRoleFunc().indexOf(8)>-1||this.publicFun.getUserRoleFunc().indexOf(4)>-1||this.publicFun.getUserRoleFunc().indexOf(7)>-1){
if(this.userInfo.auditState=="AS01"){
MessageBox({
message:this.userInfo.empType==1?this.$t("commonTips.hasLoginAndNotAuthBigBusiness"):this.$t("commonTips.hasLoginAndNotAuthSmallBusiness"),
......
......@@ -193,14 +193,14 @@ router.beforeEach((to, from, next) => {
}
if(to.name){
if(to.name.indexOf("index")==-1&&to.name.indexOf("Index")==-1){
if(to.name=='subjectList'||to.name=='duijietabconnect'||to.name=='activitylist'||to.name=='mine') globalMsg.$emit("isReturnVal",false);
if(to.name=='subjectList'||to.name=='duijietabconnect'||to.name=='activitylist'||to.name=='mineIndex') globalMsg.$emit("isReturnVal",false);
else globalMsg.$emit("isReturnVal",true);
}else globalMsg.$emit("isReturnVal",false);
if(to.name.indexOf("index")!=-1||to.name.indexOf("Index")!=-1) globalMsg.$emit("sendSelected","index");
if(to.name.indexOf("duijie")!=-1) globalMsg.$emit("sendSelected","contact");
if(to.name.indexOf("subject")!=-1) globalMsg.$emit("sendSelected","voted");
if(to.name.indexOf("activity")!=-1) globalMsg.$emit("sendSelected","activity");
if(to.name.indexOf("mine")!=-1) globalMsg.$emit("sendSelected","mine");
if(to.name=='duijietabconnect') globalMsg.$emit("sendSelected","contact");
if(to.name=='subjectList') globalMsg.$emit("sendSelected","voted");
if(to.name=='activitylist') globalMsg.$emit("sendSelected","activity");
if(to.name=='mineIndex') globalMsg.$emit("sendSelected","mine");
}
......
......@@ -22,6 +22,7 @@ export default new Vuex.Store({
myJoinListPage:new Map(),//我参与的活动页码
selectSubjectProjectList:new Map(),//项目评审列表页码
subjectProjectDetailCommentList:new Map(),//项目评审详情评论页码
currentDetailId:new Map(),//发布需求成功之后获取需求id
},
mutations: {
SAVE_LIST_PAGE_PARS:(state,{path,pars})=>{
......@@ -88,6 +89,9 @@ export default new Vuex.Store({
subjectProjectDetailCommentList_Func:(state,{path,pars})=>{
state.subjectProjectDetailCommentList.set(path,pars);
},
currentDetailId_Func:(state,{path,pars})=>{
state.currentDetailId.set(path,pars);
},
},
actions: {
saveListPagePars: ({ commit },{path,pars}) => {
......@@ -160,6 +164,10 @@ export default new Vuex.Store({
commit('subjectProjectDetailCommentList_Func',{ path,pars });
},
currentDetailIdAction:({ commit },{path,pars})=>{
commit('currentDetailId_Func',{ path,pars });
},
},
getters:{
......
......@@ -13,10 +13,10 @@
<firstStepCmpt :isBtn="'add'" @nextStep="handleNext" :isSale="'2'"></firstStepCmpt>
</el-tab-pane>
<el-tab-pane :label="$t('workPlace.addRequire')" name="second" v-if="activeName=='second'">
<secondStepCmpt :visible="visible" :canLastStep="canLastStep"></secondStepCmpt>
<secondStepCmpt :visible="activeName=='second'?true:false" :reqCount="reqCount" :auditState="auditState" :canLastStep="canLastStep"></secondStepCmpt>
</el-tab-pane>
<el-tab-pane :label="$t('requireInfo.contactInfo')" name="third" v-if="activeName=='third'">
<thirdStepCmpt :companyName="companyName" :visible="activeName=='third'?true:false" :isSale="'2'"></thirdStepCmpt>
</el-tab-pane>
</el-tabs>
......@@ -29,6 +29,7 @@
<script>
import firstStepCmpt from '../../../components/bigbusiness/addFirstStep';
import secondStepCmpt from '../../../components/bigbusiness/addSecondStep';
import thirdStepCmpt from '../../../components/bigbusiness/addContactInfo';
import userKnow from '../../../components/common/userKnow';
import api from '../api/api';
export default {
......@@ -36,6 +37,7 @@
components:{
firstStepCmpt,
secondStepCmpt,
thirdStepCmpt,
userKnow
},
data(){
......@@ -43,7 +45,11 @@
activeName:"first",
visible:false,
canLastStep:false,
userKnow:false
userKnow:false,
userInfo: this.publicFun.getCookie("userInfo") ? JSON.parse(this.Base64.decode(this.publicFun.getCookie("userInfo"))) : null,
businessId:"",
reqCount:0,
auditState:""
}
},
methods:{
......@@ -52,9 +58,16 @@
api.checkAlreadyAddAxios().then((res)=>{
if(res.code==0){
if(res.result.result==1) {
that.visible = true
that.activeName = "second";
that.visible = true;
this.userKnow = false;
this.companyName = res.result.companyName;
this.auditState = res.result.auditState?res.result.auditState:"";
this.reqCount = res.result.detailCount?res.result.detailCount:0;
if(res.result.detailCount&&res.result.detailCount!=0&&res.result.auditState=="AS01"){
this.activeName = "third";
}else{
this.activeName = "second";
}
}
else {
that.visible = false;
......@@ -75,6 +88,9 @@
},
mounted(){
this.checkIsAlreadyAdd();
globalMsg.$on("postActiveName",(data)=>{
this.activeName = data;
})
}
}
</script>
......
......@@ -109,7 +109,7 @@
</div>
</div>
<dialogCmpt v-if="isShowNotAuth" :isCancel="true" :isListDialog="true" :isLogin="false" @isVisible="goAuth" :content="$t('commonTitle.bBNoAuthTitle')" :buttonText="$t('register.auth')">
<dialogCmpt v-if="isShowNotAuth" :isCancel="true" :publishFlag="1" :toPublish="true" :isListDialog="true" :isLogin="false" @isVisible="goAuth" :content="$t('commonTitle.bBNoAuthTitle')" :buttonText="$t('commonTitle.sendProject')">
</dialogCmpt>
......@@ -266,7 +266,7 @@
if(res.code==499){
this.pageShow = false;
if(this.userInfo){
this.isShowNotAuth = this.authStatus==2?false:true;
this.isShowNotAuth = true;
this.isShowNotLogin = false;
}else{
this.isShowNotLogin = true;
......
......@@ -7,7 +7,7 @@
<ul class="navWrap">
<li :key="index" @click="handleNav('#author-'+index,index)" v-for="(item,index) in navTitleList" :class="navIndex==index?'activeLi':''"><span>{{$t('requireInfo.'+item)}}</span></li>
</ul>
<div class="statusWrapper" v-if="operationVisible">
<div class="statusWrapper" v-if="false"> <!--v-if="operationVisible"-->
<!--//AS01待提交 AS02待审核 AS03已审核 AS04已驳回 RA05已过期 RA03生效中 RA04已下架 RA01未审核 RA02审核驳回-->
<el-tag type="warning" v-if="detailInfo.authenticationState=='AS02'">{{$t("requireInfo.statusAuditing")}}</el-tag>
<el-tag type="danger" v-if="detailInfo.authenticationState=='AS04'" style="display:inline-block;word-wrap:break-word;white-space:normal;height: auto;">{{$t("requireInfo.statusRefused")+detailInfo.authenticationRejectInfo}}</el-tag>
......
......@@ -415,7 +415,7 @@
display: none;
}
.content_data{
width: 90%;
width: 95%;
height: calc(100vh - 3.4rem);
-webkit-overflow-scrolling: touch;
overflow: auto;
......@@ -440,8 +440,8 @@
}
>div.leftInfo{
width: 3rem;
height: 1.8rem;
width: 2.5rem;
height: 1.5rem;
border-radius: .06rem;
position: relative;
margin-right: .25rem;
......@@ -459,7 +459,7 @@
border-bottom-right-radius: .06rem;
}
.applying{
background:#0ABB87;
background:#FE9F2C;
}
.applyend{
background:#FD387A;
......@@ -469,19 +469,19 @@
}
img{
width: 3rem;
height: 1.8rem;
width: 2.5rem;
height: 1.5rem;
border-radius: .06rem;
}
}
>div.rightInfo{
width: calc(100% - 3rem);
width: calc(100% - 2.5rem);
.activityTitle{
display: inline-block;
width: 100%;
font-size: .28rem;
line-height: .4rem;
color: #3F3F53;
color: #1A1A1E;
//height: 40px;
display: -webkit-box;
text-overflow: ellipsis;
......@@ -489,7 +489,7 @@
-webkit-line-clamp: 2;
word-break: break-all;
overflow: hidden;
font-weight: 500;
font-weight: bold;
}
.activityTime{
color: #3F3F53;
......@@ -505,6 +505,7 @@
justify-content: space-between;
align-items: center;
font-size: .24rem;
padding-right: .02rem;
>span:first-child{
color: #5d78ff;
}
......
......@@ -5,7 +5,7 @@
<companyInfo v-if="companyInfo" :business="1" :isTrans="isTrans" :isRequire="true" :infoData="companyInfo" :requireData="detailInfo"></companyInfo>
</div>
<div class="shareMain" style="margin-top: .4rem;padding-bottom: .4rem;" v-if="detailInfo">
<div class="statusWrapper" v-show="operationVisible">
<div class="statusWrapper" v-show="false"> <!--v-show="operationVisible"-->
<!--//AS01待提交 AS02待审核 AS03已审核 AS04已驳回 RA05已过期 RA03生效中 RA04已下架 RA01未审核 RA02审核驳回-->
<el-tag type="warning" v-if="detailInfo.authenticationState=='AS02'" style="display:inline-block;word-wrap:break-word;white-space:normal;height: auto;line-height: .45rem;">{{$t("requireInfo.statusAuditing")}}</el-tag>
<el-tag type="danger" v-if="detailInfo.authenticationState=='AS04'" style="display:inline-block;word-wrap:break-word;white-space:normal;height: auto;line-height: .45rem;">{{$t("requireInfo.statusRefused")+detailInfo.authenticationRejectInfo}}</el-tag>
......@@ -59,8 +59,8 @@
</p>
</div>
<div class="buttonWrap" v-if="!operationVisible">
<el-button type="primary" @click="handleToCom" v-if="userInfo&&userInfo.empType==0">{{$t("mobile.communicateTitle")}}</el-button>
<el-button type="primary" v-if="userInfo&&userInfo.empType!=0" @click="$router.go(-1)">{{$t("workPlace.goreturn")}}</el-button>
<el-button type="primary" @click="handleToCom" v-if="publicFun.getUserRoleFunc().indexOf(8)>-1||publicFun.getUserRoleFunc().indexOf(4)>-1||publicFun.getUserRoleFunc().indexOf(7)>-1">{{$t("mobile.communicateTitle")}}</el-button>
<el-button type="primary" v-else @click="$router.go(-1)">{{$t("workPlace.goreturn")}}</el-button>
</div>
<p style="color: #FF5D5D;margin-bottom: .4rem;" v-if="operationVisible">{{$t('mobile.requireReminder')}}</p>
......
......@@ -3,23 +3,23 @@
<mt-tabbar v-model="selected" fixed>
<mt-tab-item id="index">
<i class="iconfont icon-shouye"></i>
<p>首页</p>
<p>{{$t("topNav.index")}}</p>
</mt-tab-item>
<mt-tab-item id="contact">
<i class="iconfont icon-hezuo"></i>
<p>对接</p>
<p>{{$t("topNav.match")}}</p>
</mt-tab-item>
<mt-tab-item id="voted">
<i class="iconfont icon-pingxuan"></i>
<p>评选</p>
<p>{{$t("topNav.vote")}}</p>
</mt-tab-item>
<mt-tab-item id="activity">
<i class="iconfont icon-huodong"></i>
<p>活动</p>
<p>{{$t("topNav.activity")}}</p>
</mt-tab-item>
<mt-tab-item id="mine">
<i class="iconfont icon-tubiao-"></i>
<p>我的</p>
<p>{{$t("topNav.mine")}}</p>
</mt-tab-item>
</mt-tabbar>
</div>
......
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