Skip to content

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

Merge branch 'master' into dev-report

parents 3fa932ae c8bf3500
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 70 deletions
public/css/phone.scss
View file @ c74fa06d
......@@ -1343,23 +1343,23 @@ i, em {
.el-form-item__content{
word-wrap: break-word;
font-size: 0.28rem;
>div{
>input::-webkit-input-placeholder { /* WebKit browsers */
font-size: 0.22rem;
}
>input:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
font-size: 0.22rem;
}
>input::-moz-placeholder { /* Mozilla Firefox 19+ */
font-size: 0.22rem;
}
>input:-ms-input-placeholder { /* Internet Explorer 10+ */
font-size: 0.22rem;
}
}
//>div{
// >input::-webkit-input-placeholder { /* WebKit browsers */
// font-size: 0.22rem;
// }
//
// >input:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
// font-size: 0.22rem;
// }
//
// >input::-moz-placeholder { /* Mozilla Firefox 19+ */
// font-size: 0.22rem;
// }
//
// >input:-ms-input-placeholder { /* Internet Explorer 10+ */
// font-size: 0.22rem;
// }
//}
}
}
//上传图片达到限制隐藏
......
src/common/lang/en.js
View file @ c74fa06d
......@@ -9,6 +9,7 @@ module.exports = {
industryActive:"News",
aboutUs:"About Us",
useHelp:"Frequent Questions",
serviceRecord:'Service Record',
workPlace:"Console",
logoTitle:"Instant Matchmaking Platform",
login:"Login",
......
src/main.js
View file @ c74fa06d
......@@ -17,7 +17,8 @@ import VueI18n from 'vue-i18n'
import api from '../src/views/loginregister/api/api'
import axios from 'axios';
import imageClipper from '../src/components/mobile/imgCropIndex'
import promise from 'es6-promise';
promise.polyfill();
Vue.use(imageClipper);
Vue.prototype.$md5 = md5
Vue.prototype.Base64 = require('js-base64').Base64
......@@ -25,7 +26,6 @@ Vue.use(vueSwiper);
Vue.use(Element);
Vue.use(Mintui);
Vue.use(VueI18n);
window.Promise = Promise;
Vue.prototype.publicFun= publicFun;
var type = navigator.appName,language;
var ismobile = localStorage.getItem('ismobile');
......
src/views/innovatecompany/lreleaseproject/viewproject.vue
View file @ c74fa06d
......@@ -678,6 +678,7 @@
loadtext:this.$t('Otherjson.LoadMore'),
isloadtext:false,
pagenum:1,
translateNum:true,
userInfo:JSON.parse(this.Base64.decode(window.sessionStorage.getItem("userInfo"))),
}
},
......@@ -732,7 +733,10 @@
this.isbtn = false;
}
if(!this.diven_zh){
this.translate();
if(this.translateNum){
this.translateNum = false;
this.translate();
}
}
} else {
this.$message.error(response.msgCode);
......
src/views/mobile/projectment/projectdetails.vue
View file @ c74fa06d
......@@ -130,8 +130,8 @@
companyInfo: {},
tableData:[],
isbtntype:true,
isshow:false
isshow:false,
translateNum:true,
}
},
methods: {
......@@ -142,7 +142,10 @@
if (res.code == 0) {
this.companyInfo = res.result;
if(this.isshow){
this.gettransAxios();
if(this.translateNum){
this.translateNum = false;
this.gettransAxios();
}
}
} else {
this.$toast(res.msg);
......
src/views/mobile/servicerecord/editOnlyproject.vue
View file @ c74fa06d
......@@ -68,10 +68,10 @@
<div v-if="subprojectjson.competitorProduct===null">
<el-form-item label="竞争对手及主要产品">
</el-form-item>
<div v-for="item in competitorProduct" style="margin-top: -0.2rem;">
<div v-for="item in empIntroduction" style="margin-top: -0.2rem;">
<el-form-item label="">
<el-input v-model="item.competitorName" maxlength="36" placeholder="请输入竞争对手"></el-input>
<el-input v-model="item.competitorProduct" maxlength="300" placeholder="请输入历史投资方" type="textarea" :rows="6"></el-input>
<el-input v-model="item.empName" maxlength="36" placeholder="请输入竞争对手"></el-input>
<el-input v-model="item.empIntroduction" maxlength="300" placeholder="请输入主要产品" style="margin-top: 0.2rem" type="textarea" :rows="6"></el-input>
</el-form-item>
</div>
<div>
......@@ -82,7 +82,7 @@
<el-input @input="inputchange()" v-model="projectjson.companyAdvantage" maxlength="300" placeholder="请输入竞争优势" type="textarea" :rows="6"></el-input>
</el-form-item>
<el-form-item v-if="subprojectjson.lastSalesAmount===null" label="最近一年年销售额 (单位:万)">
<el-input @input="inputchange()" v-model="projectjson.lastSalesAmount" type="number" maxlength="36" placeholder="请输入最近一年年销售额"></el-input>
<el-input @input="inputchange(projectjson.lastSalesAmount,'lastSalesAmount')" v-model="projectjson.lastSalesAmount" type="number" maxlength="36" placeholder="请输入最近一年年销售额"></el-input>
</el-form-item>
</el-form>
</div>
......@@ -125,9 +125,9 @@
stockHolder:'',
stockProportion:'',
}],
competitorProduct:[{
competitorName:'',
competitorProduct:'',
empIntroduction:[{
empName:'',
empIntroduction:'',
}],
}
},
......@@ -157,29 +157,39 @@
this.projectjson.stockRight.push(this.stockRight[i])
}
}
for(let i in this.competitorProduct){
if(this.competitorProduct[i].competitorName!=''&&this.competitorProduct[i].competitorProduct!=''){
for(let i in this.empIntroduction){
if(this.empIntroduction[i].empName!=''&&this.empIntroduction[i].empIntroduction!=''){
if(this.projectjson.competitorProduct==null){
this.projectjson.competitorProduct = [];
}
this.projectjson.competitorProduct.push(this.competitorProduct[i])
this.projectjson.competitorProduct.push(this.empIntroduction[i])
}
}
api.fillDetail(this.projectjson).then(response => {
if(response.code == 0) {
this.$toast("完善成功");
this.$router.go(-1);
} else {
this.$message.error(response.msg);
}
})
.catch(error => {
console.log("提交出错");
return false;
})
this.$refs.projectjson.validate((valid) => {
if(valid) {
api.fillDetail(this.projectjson).then(response => {
if(response.code == 0) {
this.$toast("完善成功");
this.$router.go(-1);
} else {
this.$message.error(response.msg);
}
})
.catch(error => {
console.log("提交出错");
return false;
})
}
});
},
inputchange(){
inputchange(val,valtype){
this.$forceUpdate()
if(val.length > 36){
val = val.slice(0, 36);
if(valtype == 'lastSalesAmount'){
this.projectjson.lastSalesAmount = val;
}
}
},
//落地区域
projectarealist(){
......@@ -249,9 +259,9 @@
stockProportion:'',});
},
addcompetitor(){
this.competitorProduct.push({
competitorName:'',
competitorProduct:'',});
this.empIntroduction.push({
empName:'',
empIntroduction:'',});
},
},
mounted(){
......
src/views/mobile/servicerecord/editproject.vue
View file @ c74fa06d
......@@ -152,7 +152,7 @@
<el-form-item v-if="subprojectjson.investment===null" label="近三年研发投入 (单位:万)">
<el-input @input="inputchange()" v-model="projectjson.investment" type="number" maxlength="36" placeholder="请输入近三年研发投入"></el-input>
</el-form-item>
<div v-if="subprojectjson.technicalStaff===null">
<div v-if="subprojectjson.technologyTeam===null">
<el-form-item label="主要技术人员">
</el-form-item>
<div v-for="item in technicalStaff" style="margin-top: -0.2rem;">
......@@ -188,13 +188,13 @@
</el-form-item>
<div v-for="item in financingList" style="margin-top: -0.2rem;">
<el-form-item label="" style="position: relative;">
<el-input v-model="item.financingTime" maxlength="36" placeholder="请输入目前估值" style="margin-top: 0.2rem;"></el-input>
<el-select v-model="item.latestFinancingTurn" placeholder="请选择轮次" style="width: 100%;margin-top: 0.2rem;">
<el-input v-model="item.currentValuation" maxlength="36" placeholder="请输入目前估值" style="margin-top: 0.2rem;"></el-input>
<el-select v-model="item.financingTurn" placeholder="请选择轮次" style="width: 100%;margin-top: 0.2rem;">
<el-option v-for="item in latestFinancingTurnData" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
<el-input v-model="item.financingMoney" maxlength="36" type="number" placeholder="请输入金额 (单位:万)" style="margin-top: 0.2rem;"></el-input>
<el-input v-model="projectjson.financingInvestor" maxlength="300" placeholder="请输入投资机构" style="margin-top: 0.2rem" type="textarea" :rows="10"></el-input>
<el-input v-model="item.financingInvestor" maxlength="300" placeholder="请输入投资机构" style="margin-top: 0.2rem" type="textarea" :rows="10"></el-input>
</el-form-item>
</div>
<div>
......@@ -203,13 +203,16 @@
</div>
<el-form-item v-if="subprojectjson.currentFinancingTurn===null" label="本轮融资阶段">
<el-input @input="inputchange()" v-model="projectjson.financingInvestor" maxlength="36" placeholder="请输入本轮融资阶段"></el-input>
<el-select v-model="projectjson.currentFinancingTurn" @change="inputchange()" placeholder="请选择本轮融资阶段" style="width: 100%;margin-top: 0.2rem;">
<el-option v-for="item in latestFinancingTurnData" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
<el-form-item v-if="subprojectjson.preValuation===null" label="当前投前估值 (单位:万)">
<el-input @input="inputchange()" v-model="projectjson.preValuation" type="number" maxlength="36" placeholder="请输入当前投前估值"></el-input>
</el-form-item>
<el-form-item v-if="subprojectjson.currentFinancingMoney===null" label="融资金额 (单位:万)">
<el-input @input="inputchange()" v-model="projectjson.financingMoney" type="number" maxlength="36" placeholder="请输入融资金额"></el-input>
<el-input @input="inputchange()" v-model="projectjson.currentFinancingMoney" type="number" maxlength="36" placeholder="请输入融资金额"></el-input>
</el-form-item>
<el-form-item v-if="subprojectjson.valuationBasis===null" label="估值依据">
<el-input @input="inputchange()" v-model="projectjson.valuationBasis" maxlength="300" placeholder="请输入估值依据" type="textarea" :rows="6"></el-input>
......@@ -356,11 +359,11 @@
},
addedit(){
for(let i in this.financingList){
if(this.financingList[i].financingTime!=''&&this.financingList[i].financingTurn!=''&&this.financingList[i].financingMoney!=''&&this.financingList[i].financingInvestor!=''){
if(this.projectjson.financingList==null){
this.projectjson.financingList = [];
if(this.financingList[i].currentValuation!=''&&this.financingList[i].financingTurn!=''&&this.financingList[i].financingMoney!=''&&this.financingList[i].financingInvestor!=''){
if(this.projectjson.historicalFinancing==null){
this.projectjson.historicalFinancing = [];
}
this.projectjson.financingList.push(this.financingList[i])
this.projectjson.historicalFinancing.push(this.financingList[i])
}
}
for(let i in this.stockRight){
......@@ -381,10 +384,10 @@
}
for(let i in this.technicalStaff){
if(this.technicalStaff[i].empName!=''&&this.technicalStaff[i].empPosition!=''&&this.technicalStaff[i].empIntroduction!=''){
if(this.projectjson.technicalStaff==null){
this.projectjson.technicalStaff = [];
if(this.projectjson.technologyTeam==null){
this.projectjson.technologyTeam = [];
}
this.projectjson.technicalStaff.push(this.technicalStaff[i])
this.projectjson.technologyTeam.push(this.technicalStaff[i])
}
}
for(let i in this.coreTeam){
......
src/views/mobile/servicerecord/fielddisplaydetails.vue
View file @ c74fa06d
......@@ -16,7 +16,7 @@
<p v-if="$route.query.state">阶段：<span>{{$route.query.state?item.phaseName:item.fieldName}}</span></p>
<p :class="$route.query.state?'':'fieldName'">{{item.fieldName}}</p>
<p v-if="item.fieldCode!='projectPatent'&&item.fieldCode!='manageTeam'&&item.fieldCode!='coreTeam'&&item.fieldCode!='stockRight'&&item.fieldCode!='technologyTeam'">{{item.fieldValue===1?'是':item.fieldValue===0?'否':item.fieldValue}}</p>
<p v-if="item.fieldCode!='projectPatent'&&item.fieldCode!='manageTeam'&&item.fieldCode!='coreTeam'&&item.fieldCode!='stockRight'&&item.fieldCode!='technologyTeam'&&item.previousValue">历史：{{item.fieldValue===1?'是':item.fieldValue===0?'否':item.fieldValue}}</p>
<p style="color: #0ABB87" v-if="item.fieldCode!='projectPatent'&&item.fieldCode!='manageTeam'&&item.fieldCode!='coreTeam'&&item.fieldCode!='stockRight'&&item.fieldCode!='technologyTeam'&&item.previousValue">历史：{{item.previousValue===1?'是':item.previousValue===0?'否':item.previousValue}}</p>
<el-table v-if="item.fieldCode=='manageTeam'||item.fieldCode=='coreTeam'||item.fieldCode=='technologyTeam'" :data="item.fieldValue" tooltip-effect="dark" class="projectTable1" style="margin-top: 0.2rem;">
<el-table-column prop="empName" label="姓名" align="center" width="80">
</el-table-column>
......@@ -54,7 +54,7 @@
</el-table-column>
</el-table>
<span v-if="item.fieldCode=='projectPatent'&&item.previousValue">历史：</span>
<el-table v-if="item.fieldCode=='projectPatent'&&item.previousValue" :data="item.fieldValue" tooltip-effect="dark" class="projectTable1" style="margin-top: 0.2rem;">
<el-table v-if="item.fieldCode=='projectPatent'&&item.previousValue" :data="item.previousValue" tooltip-effect="dark" class="projectTable1" style="margin-top: 0.2rem;">
<el-table-column prop="patentNumber" label="专利号" align="center">
</el-table-column>
<el-table-column prop="patentName" label="专利名称" align="center">
......
src/views/mobile/servicerecord/projecttypeFa.vue
View file @ c74fa06d
......@@ -202,7 +202,7 @@
</p>
<p>
<span>本轮融资阶段：</span>
<span>{{projectjson.financingInvestor}}</span>
<span>{{projectjson.financingTurn}}</span>
</p>
<p>
<span>当前投前估值：</span>
......
src/views/mobile/servicerecord/recorddetails.vue
View file @ c74fa06d
......@@ -62,9 +62,9 @@
},
//校验
rules: {
title: [{required: true,message: 'sadasdas',trigger: 'blur'}],
content: [{required: true,message: 'sadasdas',trigger: 'blur'}],
explication: [{required: true,message: 'sadasdas',trigger: 'blur'}],
title: [{required: true,message: '请填写问题',trigger: 'blur'}],
content: [{required: true,message: '请填写回答',trigger: 'blur'}],
explication: [{required: true,message: '请填写解析',trigger: 'blur'}],
},
empinfo:JSON.parse(this.Base64.decode(window.sessionStorage.getItem("userInfo"))),
}
......
src/views/mobile/servicerecord/workplandetails.vue
View file @ c74fa06d
......@@ -82,8 +82,8 @@
uploadHostHeader: process.env.VUE_APP_UPLOAD_IMG,//图片上传地址
//校验
rules: {
title: [{required: true,message: 'sadasdas',trigger: 'blur'}],
content: [{required: true,message: 'sadasdas',trigger: 'blur'}],
title: [{required: true,message: '请填写标题',trigger: 'blur'}],
content: [{required: true,message: '请填写回答',trigger: 'blur'}],
},
imagesIf:false,
empinfo:JSON.parse(this.Base64.decode(window.sessionStorage.getItem("userInfo"))),
......
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