Skip to content

E
enterprise-serevice-platform-web
Commit 80c5980b authored by 高宇's avatar 高宇
Browse files
Options

关联企业 解决bug

parent 3eb22f14
Show whitespace changes
Inline Side-by-side
Showing with 155 additions and 118 deletions
src/views/personalCenter/components/AffiliatedEnterprises.vue
View file @ 80c5980b
<template>
<div class="AffiliatedEnterprises-module">
<div class="progress">
<div class="title">关联企业</div>
<el-button v-if="form.id!==undefined" type="text" class="updataBtn" @click="handleUpdate(form.id)">{{
title
}}
<div><span class="title">关联企业</span></div>
<el-button v-if="form.id!==undefined" type="text" @click="handleUpdate(form.id)">
<i class="el-icon-edit"></i>
<span class="editspan">{{title}}</span>
</el-button>
</div>
<el-divider class="dividerMoudule"/>
......@@ -33,27 +33,28 @@
class="switchEnterprises"
type="primary"
size="small"
round
@click="switchEnterprises"
>切换企业
</el-button>
</el-col>
<el-col :span="3">
<el-button v-if="this.form.status === '0'" class="certificationButton" type="primary" size="small"
<el-button round v-if="this.form.status === '0'" class="certificationButton" type="primary" size="small"
@click="certificationEnterpries">
认证企业
</el-button>
<el-button v-if="this.form.status === '3'" class="certificationButton" type="primary" size="small"
<el-button round v-if="this.form.status === '3'" class="certificationButton" type="primary" size="small"
@click="certificationEnterpries">
认证企业
</el-button>
</el-col>
<el-col :span="3">
<el-button v-if="this.form.status !==0" class="deleteButton" type="danger" size="small"
<el-button round v-if="this.form.status !==0" class="deleteButton" type="danger" size="small"
@click="deleteEnterPrises">移除企业
</el-button>
</el-col>
</el-row>
<div class="form-title">一: 企业基本信息</div>
<div> <span class="form-title">一: 企业基本信息</span></div>
<el-row>
<el-col :span="12" class="form-title-col">
<el-form-item class="unitItem" label="注册资本:" prop="registeredCapital" style="padding-left: 0px">
......@@ -147,7 +148,7 @@
</el-form-item>
</el-col>
</el-row>
<div class="form-title">二: 人事信息</div>
<div><span class="form-title">二: 人事信息</span></div>
<el-row class="peopleInfo" :gutter="20">
<el-col :span="8">
<el-form-item class="unitItem" label="企业总人数:" prop="totalPeople">
......@@ -224,14 +225,14 @@
</el-form-item>
</el-col>
</el-row>
<div class="form-title">三: 经营数据</div>
<div><span class="form-title">三: 经营数据</span></div>
<el-table
class="businessData"
border
style="padding-right: 10px"
:data="form.userEnterpriseOperateRelativeList"
>
<el-table-column align="center" label="年份" prop="year" width="89" :show-overflow-tooltip="true">
<el-table-column align="center" label="年份" prop="year" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span class="fromSpan" v-if="scope.row.year !==null && scope.row.year !== ''">{{ scope.row.year }}</span>
<span class="fromSpan" v-if="scope.row.year ===null || scope.row.year === ''">{{ content }}</span>
......@@ -247,7 +248,7 @@
}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="净利润(万元)" width="179" prop="netProfit" :show-overflow-tooltip="true">
<el-table-column align="center" label="净利润(万元)" width="170" prop="netProfit" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span class="fromSpan"
v-if="scope.row.netProfit !== null && scope.row.netProfit !== ''">{{ scope.row.netProfit }}</span>
......@@ -256,7 +257,7 @@
}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="营业收入(万元)" width="155" prop="operatingIncome"
<el-table-column align="center" label="营业收入(万元)" width="150" prop="operatingIncome"
:show-overflow-tooltip="true">
<template slot-scope="scope">
<span class="fromSpan" v-if="scope.row.operatingIncome !== null && scope.row.operatingIncome !== ''">{{
......@@ -266,7 +267,7 @@
v-if="scope.row.operatingIncome === null || scope.row.operatingIncome === ''">{{ content }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="主营业收入(万元)" width="177" prop="mainBusinessIncome"
<el-table-column align="center" label="主营业收入(万元)" width="167" prop="mainBusinessIncome"
:show-overflow-tooltip="true">
<template slot-scope="scope">
<span class="fromSpan"
......@@ -279,7 +280,7 @@
}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="税收(万元)" width="163" prop="tax" :show-overflow-tooltip="true">
<el-table-column align="center" label="税收(万元)" width="153" prop="tax" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span class="fromSpan" v-if="scope.row.tax !== null && scope.row.tax !== ''">{{ scope.row.tax }}</span>
<span class="fromSpan" v-if="scope.row.tax === null || scope.row.tax === ''">{{ content }}</span>
......@@ -299,7 +300,7 @@
</template>
</el-table-column>
</el-table>
<div class="form-title">四: 知识产权</div>
<div><span class="form-title">四: 知识产权</span></div>
<el-table
class="intellectualProperty"
border
......@@ -328,7 +329,7 @@
v-if="scope.row.patentsNumber === null || scope.row.patentsNumber === '' ">{{ content }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="注册商标总数(个)" width="267" prop="trademarksNumber"
<el-table-column align="center" label="注册商标总数(个)" width="257" prop="trademarksNumber"
:show-overflow-tooltip="true">
<template slot-scope="scope">
<span class="fromSpan" v-if="scope.row.trademarksNumber !== null && scope.row.trademarksNumber !== ''">{{
......@@ -351,7 +352,7 @@
</template>
</el-table-column>
</el-table>
<div class="form-title">五: 项目信息</div>
<div><span class="form-title">五: 项目信息</span></div>
<el-table
class="ProjectInformation"
border
......@@ -380,7 +381,7 @@
}}</span>
</template>
</el-table-column>
<el-table-column label="项目情况" width="355" prop="projectStatus">
<el-table-column label="项目情况" width="345" prop="projectStatus">
<template slot-scope="scope">
<span class="fromSpan" v-if="scope.row.projectStatus !== null && scope.row.projectStatus !== ''">{{
replaceProjectStatus(scope.row.projectStatus)
......@@ -390,7 +391,7 @@
</template>
</el-table-column>
</el-table>
<div class="form-title">六: 载体信息</div>
<div><span class="form-title">六: 载体信息</span></div>
<el-table
class="Carrierinformation"
border
......@@ -421,7 +422,7 @@
}}</span>
</template>
</el-table-column>
<el-table-column label="毕业企业数(个)" prop="graduateCompanies" width="355" :show-overflow-tooltip="true">
<el-table-column label="毕业企业数(个)" prop="graduateCompanies" width="345" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span class="fromSpan" v-if="scope.row.graduateCompanies !== null && scope.row.graduateCompanies !== ''">{{
scope.row.graduateCompanies
......@@ -615,6 +616,7 @@ export default {
name: 'AffiliatedEnterprises',
data() {
return {
type:'关联企业',
// 判断后端传来的数据是否为手机号 0:代表是，1代表不是
isPhone:'1',
// 数组之间连接
......@@ -842,6 +844,8 @@ export default {
}
},
computed: {},
created() {
},
watch: {
'certificationInfo.verificationCode': function (val) {
if (val !== '' && val !== undefined && this.taxFlag === '0') {
......@@ -873,8 +877,6 @@ export default {
mounted() {
this.getAffiliateInfo()
this.getAddressJson()
this.getEnterpriseAbility()
this.getEnterpriseQualifi()
// this.changTitle()
},
methods: {
......@@ -1638,21 +1640,23 @@ export default {
margin-bottom: 16px;
.title {
width: 68px;
height: 17px;
font-size: 17px;
width: 152px;
height: 19px;
font-size: 19px;
font-family: Source Han Sans CN-Bold, Source Han Sans CN;
margin-top: 20px;
font-weight: bold;
color: #333333;
line-height: 24px;
-webkit-background-clip: text;
}
.editspan{
margin-left: 2%;
}
.el-icon-edit {
width: 14px;
height: 14px;
color: #1A78E5;
margin-left: 710px;
margin-left: 31%;
}
.updataBtn {
......@@ -1687,6 +1691,7 @@ export default {
//width: 633px;
//height: 36px;
background: #EBEBEB;
border-style: none;
border-radius: 6px 6px 6px 6px;
}
......@@ -1695,12 +1700,12 @@ export default {
height: 36px;
font-size: 15px;
font-weight: 400;
color: #333333;
color: #707070;
}
.fromSpan1 {
font-size: 15px;
font-weight: 400;
color: #333333;
color: #707070;
}
.switchEnterprises {
......@@ -1709,20 +1714,25 @@ export default {
height: 36px;
border-color: #1A78E5 ;
background: #1A78E5;
border-radius: 6px;
}
.certificationButton {
margin-left: -14%;
width: 102px;
height: 36px;
border-color: #6EBB21 ;
background: #6EBB21;
border-radius: 6px;
}
.deleteButton {
margin-left: -28%;
width: 102px;
height: 36px;
border-color: #C24E3E ;
background: #C24E3E;
border-radius: 6px;
}
.footer {
......
src/views/personalCenter/components/AffiliatedEnterprisesUpdate.vue
View file @ 80c5980b
......@@ -6,13 +6,15 @@
<div class="AffiliatedEnterprisesUpdate-content">
<el-row>
<el-col :span="0.5">
<i class="el-icon-arrow-left" style="color: #1A78E5;font-weight: bold;padding-top: 40px;cursor: pointer" @click="handleBack"/>
<i class="el-icon-arrow-left" style="color: #1A78E5;font-weight: bold;padding-top: 40px;cursor: pointer"
@click="handleBack"/>
</el-col>
<el-col :span="22">
<div class="affiliatedBody">
<div class="info-top">
<div class="title">{{ title }}</div>
<el-button icon="el-icon-edit" type="text" class="addBtn" @click="addEnterpriseInfo">保存</el-button>
<div class="title"><span class="editEnterprises">{{ title }}</span></div>
<el-button icon="el-icon-edit" type="text" class="addBtn" @click="addEnterpriseInfo"><span
class="saveAdd">保存</span></el-button>
</div>
<el-divider class="affiliatedDivider"/>
<el-form
......@@ -27,7 +29,7 @@
<el-form-item label="企业名称" prop="name">
<el-input
class="enterprise-name"
style="width: 408px;height: 36px"
style="width: 408px;height: 36px;"
v-model.trim="affiliateFrom.name"
:maxlength="80"
placeholder="请输入企业名称"
......@@ -103,7 +105,7 @@
<el-col :span="7">
<el-form-item label="注册地址" prop="address">
<el-cascader
:popper-append-to-body="false"
:append-to-body="false"
class="first-input"
v-model="address"
placeholder="请选择注册地址"
......@@ -299,7 +301,8 @@
/>
</template>
</el-table-column>
<el-table-column width="178" align="center" label="总资产(万元)" prop="assetTotal" :show-overflow-tooltip="true">
<el-table-column width="178" align="center" label="总资产(万元)" prop="assetTotal"
:show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input
size="medium"
......@@ -315,7 +318,8 @@
</el-input>
</template>
</el-table-column>
<el-table-column width="178" align="center" label="净利润(万元)" prop="netProfit" :show-overflow-tooltip="true">
<el-table-column width="178" align="center" label="净利润(万元)" prop="netProfit"
:show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input
size="medium"
......@@ -329,7 +333,8 @@
</el-input>
</template>
</el-table-column>
<el-table-column width="178" align="center" label="营业收入(万元)" prop="operatingIncome" :show-overflow-tooltip="true">
<el-table-column width="178" align="center" label="营业收入(万元)" prop="operatingIncome"
:show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input
size="medium"
......@@ -343,7 +348,8 @@
</el-input>
</template>
</el-table-column>
<el-table-column width="178" align="center" label="主营业收入(万元)" prop="mainBusinessIncome" :show-overflow-tooltip="true">
<el-table-column width="178" align="center" label="主营业收入(万元)" prop="mainBusinessIncome"
:show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input
size="medium"
......@@ -371,7 +377,8 @@
</el-input>
</template>
</el-table-column>
<el-table-column width="178" align="center" label="研发投入(万元)" prop="researchInvestment" :show-overflow-tooltip="true">
<el-table-column width="178" align="center" label="研发投入(万元)" prop="researchInvestment"
:show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input
size="medium"
......@@ -391,7 +398,8 @@
style="padding-left: 43px"
:data="IntellectualProperty"
>
<el-table-column width="313" align="center" label="知识产权总数(个)" prop="intellectualProperty" :show-overflow-tooltip="true">
<el-table-column width="313" align="center" label="知识产权总数(个)" prop="intellectualProperty"
:show-overflow-tooltip="true">
<template slot-scope="scope">
<el-form-item label-width="auto">
<el-input
......@@ -404,7 +412,7 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column width="313" align="center" label="专利总数(个)" prop="patentsNumber" >
<el-table-column width="313" align="center" label="专利总数(个)" prop="patentsNumber">
<template slot-scope="scope">
<el-form-item label-width="auto">
<el-input
......@@ -418,7 +426,7 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column width="313" align="center" label="注册商标总数(个)" prop="trademarksNumber" >
<el-table-column width="313" align="center" label="注册商标总数(个)" prop="trademarksNumber">
<template slot-scope="scope">
<el-form-item label-width="auto">
<el-input
......@@ -446,6 +454,7 @@
</el-table>
<div class="form-title">五、项目信息</div>
<el-table
class="ProjectTable"
border
style="padding-left: 43px"
:data="ProjectInformation"
......@@ -473,9 +482,11 @@
/>
</template>
</el-table-column>
<el-table-column width="420" label="项目情况" prop="projectStatus">
<el-table-column width="420" label="项目情况" prop="projectStatus" :key="Math.random()">
<template slot-scope="scope">
<el-select v-model="scope.row.projectStatus" style="width: 100%" placeholder="请选择">
<!-- -->
<el-select v-model="scope.row.projectStatus" style="width: 100%" placeholder="请选择"
>
<el-option
v-for="item in option"
:key="item.value"
......@@ -488,6 +499,7 @@
</el-table>
<div class="form-title">六、载体信息</div>
<el-table
border
style="padding-left: 43px"
:data="VehicleInformation"
......@@ -556,23 +568,23 @@ export default {
}
],
// 知识产权
IntellectualProperty:[
IntellectualProperty: [
{
intellectualPropertyNumber:'',
patentsNumber:'',
trademarksNumber:'',
softwareWorksNumber:''
intellectualPropertyNumber: '',
patentsNumber: '',
trademarksNumber: '',
softwareWorksNumber: ''
}
],
// 项目信息
ProjectInformation: [
{
projectInvestment:'',
implementationTime:'',
projectStatus:''
projectInvestment: '',
implementationTime: '',
projectStatus: ''
}
],
nameCode:false,
nameCode: false,
// 开始时间范围限定
start_date: {
disabledDate: time => {
......@@ -862,7 +874,7 @@ export default {
},
methods: {
// 回显地址
showaddress(tempAddress){
showaddress(tempAddress) {
if (tempAddress !== '' && tempAddress !== null) {
// 转换地址
var province = tempAddress.slice(0, 4)
......@@ -874,11 +886,11 @@ export default {
address.push(area)
this.address = address
return address
}else {
} else {
return ''
}
},
InputNumberFoment(val,flag){
InputNumberFoment(val, flag) {
//flag=1 代表知识产权 flag = 2 代表 项目信息 flag = 3 代表 载体信息
if (flag === 1) {
// console.log("this.IntellectualProperty[0][val]",this.IntellectualProperty[0][val])
......@@ -895,23 +907,26 @@ export default {
this.ProjectInformation[0][val] = this.thousand.fmoney(this.ProjectInformation[0][val]); //千分位反格式化
}
} else if (flag === 3) {
console.log('this.VehicleInformation[0][val]>>>',this.VehicleInformation[0][val])
// let number = this.VehicleInformation[0][val].substring(0,1)
// console.log('this.VehicleInformation[0][val]>>>',this.VehicleInformation[0][val])
// console.log("number===",number)
// console.log("1111111111",this.VehicleInformation[0][val].substring(1))
if (this.VehicleInformation[0][val].indexOf('.') !== -1) {
//截取整数
const integer = this.VehicleInformation[0][val].substring(0, this.VehicleInformation[0][val].indexOf('.'))
//截取小数
const decimal = this.VehicleInformation[0][val].substring(this.VehicleInformation[0][val].indexOf('.'), this.VehicleInformation[0][val].length)
this.VehicleInformation[0][val] = this.thousand.fmoney(integer) + decimal.substring(0, 3); //千分位反格式化
this.VehicleInformation[0][val] = integer + decimal.substring(0, 3); //千分位反格式化
} else {
this.VehicleInformation[0][val] = this.thousand.fmoney(this.VehicleInformation[0][val]); //千分位反格式化
this.VehicleInformation[0][val] = this.VehicleInformation[0][val]
}
}
},
// 经营数据千分为转化
managementInputMoneyFoment(val,index){
console.log("val>>>",val)
console.log("index>>>",index)
console.log('this.affiliateFrom.userEnterpriseOperateRelativeList[index][val]>>>',this.affiliateFrom.userEnterpriseOperateRelativeList[index][val])
managementInputMoneyFoment(val, index) {
console.log("val>>>", val)
console.log("index>>>", index)
console.log('this.affiliateFrom.userEnterpriseOperateRelativeList[index][val]>>>', this.affiliateFrom.userEnterpriseOperateRelativeList[index][val])
if (this.affiliateFrom.userEnterpriseOperateRelativeList[index][val].indexOf('.') !== -1) {
//截取整数
const integer = this.affiliateFrom.userEnterpriseOperateRelativeList[index][val].substring(0, this.affiliateFrom.userEnterpriseOperateRelativeList[index][val].indexOf('.'))
......@@ -922,7 +937,7 @@ export default {
this.affiliateFrom.userEnterpriseOperateRelativeList[index][val] = this.thousand.fmoney(this.affiliateFrom.userEnterpriseOperateRelativeList[index][val]); //千分位反格式化
}
},
managementInputMoneyBack(val,index){
managementInputMoneyBack(val, index) {
this.affiliateFrom.userEnterpriseOperateRelativeList[index][val] = this.thousand.rmoney(this.affiliateFrom.userEnterpriseOperateRelativeList[index][val])
},
inputMoneyFometBack(val) {
......@@ -930,7 +945,7 @@ export default {
this.affiliateFrom[val] = this.thousand.rmoney(this.affiliateFrom[val]); //千分位反格式化
},
inputMoneyFomet(val) {
console.log('this.affiliateFrom[val]',this.affiliateFrom[val])
console.log('this.affiliateFrom[val]', this.affiliateFrom[val])
if (this.affiliateFrom[val].indexOf('.') !== -1) {
//截取整数
const integer = this.affiliateFrom[val].substring(0, this.affiliateFrom[val].indexOf('.'))
......@@ -975,8 +990,8 @@ export default {
this.object4.tabId = list4
this.object5.tabId = list5
this.showEnterpriseType = this.object1.tabId[0]
console.log("this.object1.tabId[0]",this.object1.tabId[0])
console.log("this.showEnterpriseType>>>>",this.showEnterpriseType)
console.log("this.object1.tabId[0]", this.object1.tabId[0])
console.log("this.showEnterpriseType>>>>", this.showEnterpriseType)
this.affiliateFrom = res.data[0]
this.affiliateFrom.address = res.data[0].address
this.affiliateFrom.registeredCapital = this.thousand.rmoney(res.data[0].registeredCapital)
......@@ -986,7 +1001,7 @@ export default {
this.IntellectualProperty[0].softwareWorksNumber = this.affiliateFrom.softwareWorksNumber
this.ProjectInformation[0].projectInvestment = this.affiliateFrom.projectInvestment
this.ProjectInformation[0].projectStatus = this.affiliateFrom.projectStatus
console.log("this.this.ProjectInformation[0].projectStatus",this.ProjectInformation[0].projectStatus)
console.log("this.this.ProjectInformation[0].projectStatus", this.ProjectInformation[0].projectStatus)
this.ProjectInformation[0].implementationTime = this.affiliateFrom.implementationTime
this.VehicleInformation[0].incubationCompanies = this.affiliateFrom.incubationCompanies
this.VehicleInformation[0].carrierDominanceArea = this.affiliateFrom.carrierDominanceArea
......@@ -1091,7 +1106,7 @@ export default {
address.push(area)
this.address = address
}
console.log("this.affiliateFrom.name",this.affiliateFrom.name)
console.log("this.affiliateFrom.name", this.affiliateFrom.name)
console.log(res.data[0].userEnterpriseTabRelativeList)
for (var i = 0; i < res.data[0].userEnterpriseTabRelativeList.length; i++) {
console.log(i)
......@@ -1114,7 +1129,7 @@ export default {
this.object4.tabId = list4
this.object5.tabId = list5
this.showEnterpriseType = this.object1.tabId[0]
console.log("res.data[0].fwEnterpriseOperateRelativeList>>>>>>",res.data[0].userEnterpriseOperateRelativeList)
console.log("res.data[0].fwEnterpriseOperateRelativeList>>>>>>", res.data[0].userEnterpriseOperateRelativeList)
if (res.data[0].userEnterpriseOperateRelativeList.length === 1) {
this.affiliateFrom.userEnterpriseOperateRelativeList[0] = res.data[0].userEnterpriseOperateRelativeList[0]
} else if (res.data[0].userEnterpriseOperateRelativeList.length === 2) {
......@@ -1343,18 +1358,18 @@ export default {
// sum = count1 * 4 + count2 * 3 + count3 * 2
// this.affiliateFrom.completeness = sum
console.log(this.address)
console.log('this.affiliateFrom.userEnterpriseTabRelativeList',this.affiliateFrom.userEnterpriseTabRelativeList)
console.log('this.affiliateFrom.userEnterpriseTabRelativeList', this.affiliateFrom.userEnterpriseTabRelativeList)
if (this.affiliateFrom.userEnterpriseTabRelativeList === undefined) {
this.affiliateFrom.userEnterpriseTabRelativeList = []
}
console.log(this.object1)
console.log()
if (this.affiliateFrom.userEnterpriseTabRelativeList.length === 0) {
console.log("this.object1.tabId",this.object1.tabId)
console.log("this.object1.tabId", this.object1.tabId)
if (this.object1.tabId.length === 0) {
this.object1.tabId.push(this.showEnterpriseType)
}else if (this.object1.tabId.length === 1) {
this.object1.tabId[0]=this.showEnterpriseType
} else if (this.object1.tabId.length === 1) {
this.object1.tabId[0] = this.showEnterpriseType
}
this.affiliateFrom.userEnterpriseTabRelativeList.push(this.object1)
console.log(this.affiliateFrom.userEnterpriseTabRelativeList)
......@@ -1369,14 +1384,14 @@ export default {
this.affiliateFrom.userEnterpriseTabRelativeList[3].tabId = this.object4.tabId
this.affiliateFrom.userEnterpriseTabRelativeList[4].tabId = this.object5.tabId
}
this.affiliateFrom.intellectualProperty =this.thousand.rmoney(this.IntellectualProperty[0].intellectualPropertyNumber)
this.affiliateFrom.intellectualProperty = this.thousand.rmoney(this.IntellectualProperty[0].intellectualPropertyNumber)
this.affiliateFrom.patentsNumber = this.thousand.rmoney(this.IntellectualProperty[0].patentsNumber)
this.affiliateFrom.softwareWorksNumber = this.thousand.rmoney(this.IntellectualProperty[0].softwareWorksNumber)
this.affiliateFrom.trademarksNumber = this.thousand.rmoney(this.IntellectualProperty[0].trademarksNumber)
this.affiliateFrom.projectInvestment = this.thousand.rmoney(this.ProjectInformation[0].projectInvestment)
this.affiliateFrom.projectStatus = this.ProjectInformation[0].projectStatus
this.affiliateFrom.implementationTime = this.ProjectInformation[0].implementationTime
this.affiliateFrom.carrierDominanceArea = this.thousand.rmoney(this.VehicleInformation[0].carrierDominanceArea)
this.affiliateFrom.carrierDominanceArea = this.VehicleInformation[0].carrierDominanceArea
this.affiliateFrom.incubationCompanies = this.VehicleInformation[0].incubationCompanies
this.affiliateFrom.graduateCompanies = this.VehicleInformation[0].graduateCompanies
this.affiliateFrom.userEnterpriseOperateRelativeList.forEach(item => {
......@@ -1404,7 +1419,7 @@ export default {
})
if (this.affiliateFrom.registeredCapital) {
this.affiliateFrom.registeredCapital = this.thousand.rmoney(this.affiliateFrom.registeredCapital)
console.log("this.affiliateFrom.registeredCapital=>",this.affiliateFrom.registeredCapital)
console.log("this.affiliateFrom.registeredCapital=>", this.affiliateFrom.registeredCapital)
}
console.log('this.affiliateFrom', this.affiliateFrom)
const id = this.$route.query.id
......@@ -1466,7 +1481,7 @@ export default {
getEnterpriseNatureByTab() {
policyTabGetByName('企业性质').then(res => {
if (res.code === 200) {
console.log("res.data[0].childrenList>>>",res.data[0].childrenList)
console.log("res.data[0].childrenList>>>", res.data[0].childrenList)
this.enterpriseNature = res.data[0].childrenList
}
})
......@@ -1488,7 +1503,7 @@ export default {
})
},
// 获取企业技术能力
getEnterpriseAbilityByTab(){
getEnterpriseAbilityByTab() {
policyTabGetByName('企业技术能力').then(res => {
if (res.code === 200) {
this.enterpriseAbility = res.data[0].childrenList
......@@ -1556,6 +1571,7 @@ export default {
font-weight: bold;
color: #333333;
line-height: 25px;
.peopleRow {
margin-top: 36px;
}
......@@ -1586,7 +1602,7 @@ export default {
background-color: #FFFFFF;
.el-divider--horizontal {
margin: 0.5% 0 24px 10px!important;
margin: 0.5% 0 24px 10px !important;
width: 97.5%;
//background-color: black !important;
}
......@@ -1594,8 +1610,9 @@ export default {
.affiliateAddFrom {
.first-input {
width: 266px;
::v-deep.el-popper{
z-index: 5!important;
::v-deep.el-popper {
z-index: 5 !important;
}
}
}
......@@ -1606,17 +1623,26 @@ export default {
justify-content: space-between;
align-items: center;
.title {
float: right;
.saveAdd {
font-size: 15px;
}
.editEnterprises {
font-size: 17px;
font-weight: bold;
}
.title {
float: right;
}
.addBtn {
font-size: 15px;
}
}
}
.affiliatedDivider {
color: #EBEBEB;
margin-top: 8px !important;
......
vue.config.js
View file @ 80c5980b
......@@ -53,7 +53,8 @@ module.exports = {
[process.env.VUE_APP_BASE_API]: {
// target: `http://192.168.1.17:10010/internal`,
// target: `http://10.5.87.231:10010/internal`,
// target: `http://116.205.136.218:8080/`,
target: `http://116.205.136.218:8080/`,
// target: `http://192.168.1.8:8080/`,
// target: `http://192.168.1.75:8080/`,
// target: `http://192.168.1.20:8080/`,
target: `http://192.168.1.55:8080/`,
......
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