Commit 1012267d authored by zhangyanni's avatar zhangyanni

Merge remote-tracking branch 'origin/master'

parents e2c06445 b70c5ec9
......@@ -103,7 +103,7 @@
<p v-if="authenticationState=='AS02'&&addData.projectCreatedBy" style="margin: 20px 30px 0 30px;height: 40px;line-height: 40px;text-align: center;background:#FFF8EF;border-radius:3px;border:1px solid #FF9E29;color: #FF9E29">{{$t("listproject.statereview")}}</p>
<!--<p v-if="!isbtntype&&!addData.projectCreatedBy&&!isempinfo" style="margin: 20px 30px 0 30px;height: 40px;line-height: 40px;text-align: center;background:#FFF8EF;border-radius:3px;border:1px solid #FF9E29;color: #FF9E29">{{$t("Otherjson.Customer")}}</p>-->
<p v-if="authenticationState=='AS04'&&addData.projectCreatedBy" style="margin: 20px 30px 0 30px;padding: 0 20px; line-height: 30px;text-align: left;background:#FFEFEF;border-radius:3px;border:1px solid #FF5D5D;color: #FF5D5D">{{$t("listproject.staterefuse")}}<span>{{authContent}}</span></p>
<p v-if="auditgo&&addData.projectCreatedBy" style="margin: 20px 30px 0 30px;height: 40px;line-height: 40px;text-align: center;background:#FFEFEF;border-radius:3px;border:1px solid #FF5D5D;color: #FF5D5D">{{$t("listproject.statenotcertified")}}<span @click="$router.push('/editAuth')" style="text-decoration:underline;cursor:pointer">{{$t("listproject.gocertified")}}</span></p>
<!-- <p v-if="auditgo&&addData.projectCreatedBy" style="margin: 20px 30px 0 30px;height: 40px;line-height: 40px;text-align: center;background:#FFEFEF;border-radius:3px;border:1px solid #FF5D5D;color: #FF5D5D">{{$t("listproject.statenotcertified")}}<span @click="$router.push('/editAuth')" style="text-decoration:underline;cursor:pointer">{{$t("listproject.gocertified")}}</span></p>-->
</el-row>
<div class="contentsy" id="anchor-0">
<div>
......
......@@ -37,7 +37,7 @@
<el-row style="margin-top: 28px">
<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-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