Skip to content

D
dsk-cr20g
Commit ec15499a authored by huangjie's avatar huangjie
Browse files
Options

Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

parents c1d18c97 a810bbef
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 59 deletions
dsk-operate-ui/public/favicon.ico
View replaced file @ c1d18c97 View file @ ec15499a
dsk-operate-ui/public/favicon.ico

5.53 KB | W: | H:

dsk-operate-ui/public/favicon.ico

16.6 KB | W: | H:

dsk-operate-ui/public/favicon.ico
dsk-operate-ui/public/favicon.ico
dsk-operate-ui/public/favicon.ico
dsk-operate-ui/public/favicon.ico
  • 2-up
  • Swipe
  • Onion skin
dsk-operate-ui/src/assets/styles/public.css
View file @ ec15499a
......@@ -739,7 +739,7 @@ select {
.checkbox {
display: flex;
align-items: center;
align-items: flex-start;
}
.checkbox .checkbox-titel {
......@@ -751,7 +751,7 @@ select {
.checkbox .checkbox-content {
display: flex;
align-items: center;
align-items: flex-start;
}
.checkbox .el-checkbox__label {
......
dsk-operate-ui/src/layout/components/AppMain.vue
View file @ ec15499a
......@@ -43,6 +43,7 @@ export default {
.app-main {
/* 84 = navbar + tags-view = 50 + 34 */
min-height: calc(100vh - 56px);
min-width:1440px;
background: #F5F5F5;
}
......
dsk-operate-ui/src/views/detail/party-a/business/index.vue
View file @ ec15499a
......@@ -3,7 +3,7 @@
<template v-if="isInfo">
<!-- 企业信息 -->
<div class="view-content">
<Info :companyInfo="iscompanyInfo" />
<Info :companyInfo="companyInfo" />
</div>
<!-- 基本信息 -->
<div class="view-content">
......@@ -99,6 +99,13 @@ export default {
iscompanyInfo:{}
}
},
watch: {
"customerIds"(newVal, oldVal) {
if(newVal){
this.customerInfos()
}
}
},
created() {
this.infos = this.customerInfo
this.iscompanyInfo = this.companyInfo ? this.companyInfo : {}
......@@ -132,9 +139,12 @@ export default {
},
customerInfos(){
this.isInfo = false
customerInfo(this.customerIds).then(res=>{
this.infos = res.data
this.handleQuery()
this.$nextTick(()=>{
this.infos = res.data
this.handleQuery()
})
})
},
focusNowedits(e){
......
dsk-operate-ui/src/views/detail/party-a/index.vue
View file @ ec15499a
......@@ -167,9 +167,13 @@ export default {
},
beforeRouteEnter(to, from, next) {
next(vm => {
if(from.name == 'CustomList'){
if (to.query.path){
vm.currentPath.pathName = to.query.path
if(from.name){
if (to.query.customerId){
let customerId = to.query.customerId
if(to.query.path){
vm.currentPath.pathName = to.query.path
}
vm.association(customerId)
}
}
})
......@@ -230,9 +234,9 @@ export default {
customerInfo(id).then(res => {
if (res.code == 200) {
if (res.data.userId == this.$store.state.user.userId) {
this.customerInfo = res.data
this.customerId = res.data.customerId
this.$nextTick(() => {
this.customerInfo = res.data
this.customerId = res.data.customerId
this.isCustomer = true
this.isCompanyId = true
})
......@@ -277,6 +281,7 @@ export default {
<style lang="scss" scoped>
.part-container{
min-width: 1300px;
padding: 0;
}
.part-main{
......
dsk-operate-ui/src/views/detail/party-a/opport/bond.vue
View file @ ec15499a
......@@ -49,9 +49,9 @@ export default {
defaultSort: {prop: 'projectTotalInvestment', order: 'descending'},
forData: [
{label: '项目名称', prop: 'projectName', minWidth: '300', slot: true},
{label: '项目总投资（亿元）', prop: 'projectTotalInvestment', sortable: 'custom', descending: '1', ascending: '2', width: '160'},
{label: '项目资本金（亿元）', prop: 'projectCapital', sortable: 'custom', descending: '17', ascending: '18', width: '160'},
{label: '专项债用作资本金（亿元）', prop: 'specialBondCapital', sortable: 'custom', descending: '19', ascending: '20', width: '200'}
{label: '项目总投资（万元）', prop: 'projectTotalInvestment', sortable: 'custom', descending: '1', ascending: '2', width: '160'},
{label: '项目资本金（万元）', prop: 'projectCapital', sortable: 'custom', descending: '17', ascending: '18', width: '160'},
{label: '专项债用作资本金（万元）', prop: 'specialBondCapital', sortable: 'custom', descending: '19', ascending: '20', width: '200'}
],
formData: [
{ type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: [], width: 220},
......
dsk-operate-ui/src/views/detail/party-a/overview/component/busclue.vue
View file @ ec15499a
......@@ -28,7 +28,7 @@
<el-table-column
prop="percent"
align="right"
label="占比">
label="占比（%）">
</el-table-column>
<template slot="empty">
<div style="padding: 30px 0">
......@@ -81,7 +81,7 @@ export default {
if(res.code==200 && res.data){
let data = res.data, totalVal = data.map(item => item.value).reduce((prev, cur) => prev + cur)
this.viewData = data.map(item => {
let it = {name:item.name, value:item.value, percent:parseFloat(Number(Number(item.value)/Number(totalVal)*100).toFixed(2))+'%'}
let it = {name:item.name, value:item.value, percent:parseFloat(Number(Number(item.value)/Number(totalVal)*100).toFixed(2))}
return it
})
if(this.viewData.length>0){
......
dsk-operate-ui/src/views/detail/party-a/overview/component/infoheader.vue
View file @ ec15499a
......@@ -185,11 +185,11 @@ export default {
companyName:this.companyInfo.companyName,
creditLevel:this.companyInfo.bratingSubjectLevel || '',
legalPerson:this.companyInfo.corporatePerson || '',
registerCapital:this.companyInfo.regCapital || '',
registerCapital:this.companyInfo.registeredCapital || '',
provinceId:this.companyInfo.provinceId || '',
cityId:this.companyInfo.cityId || '',
districtId:this.companyInfo.districtCode || '',
registerAddress:this.companyInfo.provinceName+this.companyInfo.cityName?'-'+this.companyInfo.cityName:''+this.companyInfo.districtName?'-'+this.companyInfo.districtName:'',
registerAddress:this.companyInfo.provinceName+(this.companyInfo.cityName?'-'+this.companyInfo.cityName:'')+(this.companyInfo.districtName?'-'+this.companyInfo.districtName:''),
creditCode:this.companyInfo.creditCode
}
let res = await claim(param)
......
dsk-operate-ui/src/views/detail/party-a/overview/component/risk.vue
View file @ ec15499a
......@@ -23,7 +23,7 @@
<el-table-column
prop="bl"
align="right"
label="占比">
label="占比（%）">
<template slot-scope="scope">
<span>{{ scope.row.bl }}</span>
</template>
......@@ -139,7 +139,7 @@ export default {
this.viewData = this.viewData.map(item => {
let number = this.statistic[item.category]&&this.statistic[item.category][item.field]?this.statistic[item.category][item.field]:0
let bl = number ? parseFloat(Number(Number(number)/Number(totalVal)*100).toFixed(2)) : 0
let it = {name:item.name, value:number, tz: '', bl:bl+'%'}
let it = {name:item.name, value:number, tz: '', bl:bl}
return it
})
this.viewData.sort((a, b) => {
......@@ -161,7 +161,7 @@ export default {
if(params.data.tz){
result+='<p style="color: rgba(35,35,35,0.8);padding: 0;margin: 0;" >'+ params.data.tz +'亿元</p>'
}
result+='<p style="color: rgba(35,35,35,0.8);padding: 0;margin: 0;">'+ params.data.bl+'</p>'
result+='<p style="color: rgba(35,35,35,0.8);padding: 0;margin: 0;">'+ params.data.bl+'%</p>'
return result;
},
extraCssText:'width:150px!important;',
......
dsk-operate-ui/src/views/detail/party-a/riskInformation/openacourtsessionNotice.vue
View file @ ec15499a
......@@ -59,7 +59,7 @@ export default {
{label: '法院', prop: 'court', width: '280'},
{label: '法庭', prop: 'tribunal', width: '180'},
{label: '承办部门', prop: 'department', width: '280'},
{label: '审判长/主判人', prop: 'judge', width: '106'}
{label: '审判长/主判人', prop: 'judge', width: '110'}
],
formData: [
{ type: 1, fieldName: 'causeAction', value: '', placeholder: '案由', options: []},
......
dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue
View file @ ec15499a
......@@ -780,6 +780,9 @@ export default {
});
},
claimbtn(item){
if(item.claimStatus){
return ;
}
this.companyId=item.companyId;
var info={};
api.infoHeader({companyId:this.companyId}).then(res=>{
......@@ -791,11 +794,11 @@ export default {
companyName:item.companyName.replace(/<font color='red'>/g,'').replace(/<\/font>/g,''),
creditLevel:info.bratingSubjectLevel,
legalPerson:info.corporatePerson,
registerCapital:info.regCapital,
registerCapital:info.registeredCapital,
provinceId:info.provinceId,
cityId:info.cityId,
districtId:info.districtCode,
registerAddress:info.provinceName+info.cityName+info.districtName,
registerAddress:info.provinceName+'-'+info.cityName+'-'+info.districtName,
creditCode:info.creditCode,
}
api.claim(params).then(res1=>{
......@@ -958,7 +961,7 @@ export default {
.content_item{
padding-top:20px;
display: flex;
align-items: center;
align-items: flex-start;
.label{
width: 84px;
font-size: 14px;
......
dsk-operate-ui/src/views/macro/urban/index.vue
View file @ ec15499a
......@@ -615,7 +615,7 @@ export default {
companyId:item.companyId,
creditLevel:item.bratingSubjectLevel,
legalPerson:res.data.corporatePerson,
registerCapital:res.data.regCapital,
registerCapital:res.data.registeredCapital,
provinceId:res.data.provinceId || '',
cityId:res.data.cityId || '',
districtId:res.data.districtCode || '',
......
dsk-operate-ui/src/views/radar/Establishment/details.vue
View file @ ec15499a
......@@ -49,7 +49,7 @@
<p>
<label class="label">项目法人</label>
<span>
<router-link v-if="textList.companyName" :to="textList.uipId?'/enterprise/' + encodeStr(textList.uipId) :'/company/' + encodeStr(textList.companyId) " tag="a" class="list-titel-a blue" v-html="textList.companyName"></router-link>
<router-link v-if="textList.companyName" :to="textList.uipId?'/enterprise/' + encodeStr(textList.companyId) :'/company/' + encodeStr(textList.companyId) " tag="a" class="list-titel-a blue" v-html="textList.companyName"></router-link>
<span v-else>--</span>
</span>
<label class="label">总投资（万元）</label>
......
dsk-operate-ui/src/views/radar/Land/details.vue
View file @ ec15499a
......@@ -11,8 +11,9 @@
<p class="list-content-text">
<span>受让人：</span>
<span v-if="textList.company">
<router-link v-if="textList.uipId" :to="'/enterprise/' + encodeStr(textList.uipId) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="textList.company"></router-link>
<router-link v-else :to="'/company/' + encodeStr(textList.id) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="textList.company"></router-link>
<router-link v-if="textList.company" :to="textList.uipId?'/enterprise/' + encodeStr(textList.companyId) :'/company/' + encodeStr(textList.companyId) " tag="a" class="list-titel-a blue" v-html="textList.company"></router-link>
<span v-else>--</span>
</span>
<span v-else class="blue">{{textList.company||"--"}}</span>
</p>
......
dsk-operate-ui/src/views/radar/Tender/details.vue
View file @ ec15499a
......@@ -31,13 +31,15 @@
<div class="list-content">
<p class="list-content-text" v-if="textList.tenderee">
<span>招采单位：</span>
<router-link v-if="textList.projectUnitId" :to="'/company/' + encodeStr(textList.projectUnitId) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="textList.tenderee"></router-link>
<span v-else > {{textList.tenderee||'--'}}</span>
<router-link v-if="textList.tenderee" :to="textList.tendereeUipId?'/enterprise/' + encodeStr(textList.tendereeId) :'/company/' + encodeStr(textList.tendereeId) " tag="a" class="list-titel-a blue" v-html="textList.tenderee"></router-link>
<span v-else>--</span>
</p>
<p class="list-content-text" v-if="textList.agency">
<span>代理单位：</span>
<router-link v-if="textList.agencyId" :to="'/company/' + encodeStr(textList.agencyId) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="textList.agency"></router-link>
<span v-else > {{textList.agency||'--'}}</span>
<router-link v-if="textList.agency" :to="textList.agencyUipId?'/enterprise/' + encodeStr(textList.agencyId) :'/company/' + encodeStr(textList.agencyId) " tag="a" class="list-titel-a blue" v-html="textList.agency"></router-link>
<span v-else>--</span>
</p>
......
dsk-operate-ui/src/views/radar/bxprozbgg/details.vue
View file @ ec15499a
......@@ -185,9 +185,10 @@
<div class="main3-box">
<p>
<label class="label">招标人</label>
<router-link :to="textList.uipId?'/enterprise/' + encodeStr(textList.uipId) :'/company/' + encodeStr(textList.tendereeId) " tag="a" class="list-titel-a color2" v-html="textList.tenderee"></router-link>
<router-link v-if="textList.tendereeId" :to="textList.tendereeUipId?'/enterprise/' + encodeStr(textList.tendereeId) :'/company/' + encodeStr(textList.tendereeId) " tag="a" class="list-titel-a color2" v-html="textList.tenderee"></router-link>
<span v-else class="color2">{{textList.tenderee||'--'}}</span>
<label class="label">代理机构</label>
<router-link v-if="textList.agencyId" :to="'/company/' + encodeStr(textList.agencyId) + '/?index=true'" tag="a" class="list-titel-a color2" v-html="textList.agency"></router-link>
<router-link v-if="textList.agencyId" :to="textList.agencyUipId?'/enterprise/' + encodeStr(textList.agencyId) :'/company/' + encodeStr(textList.agencyId) " tag="a" class="list-titel-a color2" v-html="textList.agency"></router-link>
<span v-else class="color2">{{textList.agency||'--'}}</span>
</p>
......
dsk-operate-ui/src/views/radar/components/Bidding/index.vue
View file @ ec15499a
......@@ -211,7 +211,12 @@
<div class="list-content" v-if="item.tenderee||item.planTenderAmount||item.projectCapitalSource">
<p class="list-content-text" v-if="item.tenderee">
<span>招采单位：</span>
<span class="blue" @click="getUipIdByCid(item.tendereeId)" v-html="item.tenderee">
<span v-if="item.tendereeId">
<span class="blue" @click="getUipIdByCid(item.tendereeId)" v-html="item.tenderee"></span>
</span>
<span v-else v-html="item.tenderee">
</span>
</span>
</p>
<p class="list-content-text" v-if="item.planTenderAmount">
......@@ -823,9 +828,9 @@ export default {
api.getUipIdByCid(params).then(res=>{
if (res.code==200) {
if(res.data&&res.data.length>0&&res.data[0].uipId){
this.$router.push({path: '/enterprise/'+this.encodeStr(res.data[0].uipId)})
this.$router.push({path: '/enterprise/'+this.encodeStr(companyId)})
}else{
this.$router.push({path: '/company/'+this.encodeStr(res.data[0].companyId)})
this.$router.push({path: '/company/'+this.encodeStr(companyId)})
}
}
......
dsk-operate-ui/src/views/radar/components/Establishment/index.vue
View file @ ec15499a
......@@ -211,10 +211,11 @@
<div class="list-content">
<p class="list-content-text" v-if="item.companyName">
<span>项目业主：</span>
<span class="blue" @click="getUipIdByCid(item.companyId)" v-html="item.companyName">
<span v-if="item.companyId">
<span class="blue" @click="getUipIdByCid(item.companyId)" v-html="item.companyName"></span>
</span>
<span v-else v-html="item.companyName">
</span>
</p>
<p class="list-content-text"v-if="item.money">
......@@ -1078,9 +1079,9 @@
api.getUipIdByCid(params).then(res=>{
if (res.code==200) {
if(res.data&&res.data.length>0&&res.data[0].uipId){
this.$router.push({path: '/enterprise/'+this.encodeStr(res.data[0].uipId)})
this.$router.push({path: '/enterprise/'+this.encodeStr(companyId)})
}else{
this.$router.push({path: '/company/'+this.encodeStr(res.data[0].companyId)})
this.$router.push({path: '/company/'+this.encodeStr(companyId)})
}
}
......
dsk-operate-ui/src/views/radar/components/Land/index.vue
View file @ ec15499a
......@@ -239,8 +239,10 @@
<div class="list-content" v-if="item.companyName||item.transactionPrice||item.acreage||item.acreage">
<p class="list-content-text" v-if="item.companyName">
<span>受让人：</span>
<span class="blue" @click="getUipIdByCid(item.companyId)" v-html="item.companyName">
<span v-if="item.companyId">
<span class="blue" @click="getUipIdByCid(item.companyId)" v-html="item.companyName"></span>
</span>
<span v-else v-html="item.companyName">
</span>
</p>
......@@ -925,9 +927,9 @@
api.getUipIdByCid(params).then(res=>{
if (res.code==200) {
if(res.data&&res.data.length>0&&res.data[0].uipId){
this.$router.push({path: '/enterprise/'+this.encodeStr(res.data[0].uipId)})
this.$router.push({path: '/enterprise/'+this.encodeStr(companyId)})
}else{
this.$router.push({path: '/company/'+this.encodeStr(res.data[0].companyId)})
this.$router.push({path: '/company/'+this.encodeStr(companyId)})
}
}
......
dsk-operate-ui/src/views/radar/components/Tender/index.vue
View file @ ec15499a
......@@ -213,12 +213,18 @@
<div class="list-content list-content1" v-if="item.companyName||item.agency">
<p class="list-content-text" v-if="item.companyName">
<span>招采单位：</span>
<span class="blue" @click="getUipIdByCid(item.jskEid)" v-html="item.companyName">
<span v-if="item.jskEid">
<span class="blue" @click="getUipIdByCid(item.jskEid)" v-html="item.companyName"></span>
</span>
<span v-else v-html="item.companyName">
</span>
</p>
<p class="list-content-text" v-if="item.agency">
<span>代理单位：</span>
<span class="blue" @click="getUipIdByCid(item.agencyId)" v-html="item.agency">
<span v-if="item.agencyId">
<span class="blue" @click="getUipIdByCid(item.agencyId)" v-html="item.agency"></span>
</span>
<span v-else v-html="item.agency">
</span>
</p>
......@@ -1107,9 +1113,9 @@
api.getUipIdByCid(params).then(res=>{
if (res.code==200) {
if(res.data&&res.data.length>0&&res.data[0].uipId){
this.$router.push({path: '/enterprise/'+this.encodeStr(res.data[0].uipId)})
this.$router.push({path: '/enterprise/'+this.encodeStr(companyId)})
}else{
this.$router.push({path: '/company/'+this.encodeStr(res.data[0].companyId)})
this.$router.push({path: '/company/'+this.encodeStr(companyId)})
}
}
......
dsk-operate-ui/src/views/radar/components/bxprozbgg/index.vue
View file @ ec15499a
......@@ -448,8 +448,12 @@
</el-table-column>
<el-table-column prop="zj" label="招标人" width="280" >
<template slot-scope="scope">
<span class="list-titel-a" @click="getUipIdByCid(scope.row.tendereeId)" v-html="scope.row.tenderee">
<span v-if="scope.row.tendereeId">
<span class="list-titel-a" @click="getUipIdByCid(scope.row.tendereeId)" v-html="scope.row.tenderee"></span>
</span>
<span v-else v-html="scope.row.tenderee">
</span>
</template>
</el-table-column>
......@@ -1680,9 +1684,9 @@
api.getUipIdByCid(params).then(res=>{
if (res.code==200) {
if(res.data&&res.data.length>0&&res.data[0].uipId){
this.$router.push({path: '/enterprise/'+this.encodeStr(res.data[0].uipId)})
this.$router.push({path: '/enterprise/'+this.encodeStr(companyId)})
}else{
this.$router.push({path: '/company/'+this.encodeStr(res.data[0].companyId)})
this.$router.push({path: '/company/'+this.encodeStr(companyId)})
}
}
......
dsk-operate-ui/src/views/radar/components/debtProject/index.vue
View file @ ec15499a
......@@ -135,7 +135,11 @@
<div class="list-content">
<p class="list-content-text" v-if="item.projectEntity">
<span>项目主体：</span>
<span v-html="item.projectEntity" class="blue" @click="getUipIdByCid(item.projectEntityId)"></span>
<span v-if="item.projectEntityId">
<span class="blue" @click="getUipIdByCid(item.projectEntityId)" v-html="item.projectEntity"></span>
</span>
<span v-else v-html="item.projectEntity">
</span>
</p>
<p class="list-content-text" v-if="item.chargeDepartment">
<span>主管部门：</span>
......@@ -145,7 +149,11 @@
</p>
<p class="list-content-text" v-if="item.piu" >
<span>实施单位：</span>
<span v-html="item.piu" class="blue" @click="getUipIdByCid(item.piuId)"></span>
<span v-if="item.piuId">
<span class="blue" @click="getUipIdByCid(item.piuId)" v-html="item.piu"></span>
</span>
<span v-else v-html="item.piu">
</span>
</p>
</div>
</li>
......@@ -548,9 +556,9 @@
api.getUipIdByCid(params).then(res=>{
if (res.code==200) {
if(res.data&&res.data.length>0&&res.data[0].uipId){
this.$router.push({path: '/enterprise/'+this.encodeStr(res.data[0].uipId)})
this.$router.push({path: '/enterprise/'+this.encodeStr(companyId)})
}else{
this.$router.push({path: '/company/'+this.encodeStr(res.data[0].companyId)})
this.$router.push({path: '/company/'+this.encodeStr(companyId)})
}
}
......
dsk-operate-ui/src/views/radar/debtProject/details.vue
View file @ ec15499a
......@@ -136,14 +136,14 @@
<div class="main4-box">
<label class="label">项目主体</label>
<span>
<router-link v-if="textList.projectEntity" :to="textList.projectEntityUipId?'/enterprise/' + textList.projectEntityUipId :'/company/' + encodeStr(textList.projectEntityId) " tag="a" class="list-titel-a blue" v-html="textList.projectEntity"></router-link>
<router-link v-if="textList.projectEntity" :to="textList.projectEntityUipId?'/enterprise/' + encodeStr(textList.projectEntityId) :'/company/' + encodeStr(textList.projectEntityId) " tag="a" class="list-titel-a blue" v-html="textList.projectEntity"></router-link>
<template v-else>--</template>
</span>
<label class="label">主管部门</label>
<span>{{textList.chargeDepartment||'--'}}</span>
<label class="label">实施单位</label>
<span>
<router-link v-if="textList.piu" :to="textList.piuUipId?'/enterprise/' + textList.piuUipId :'/company/' + encodeStr(textList.piuId) " tag="a" class="list-titel-a blue" v-html="textList.piu"></router-link>
<router-link v-if="textList.piu" :to="textList.piuUipId?'/enterprise/' +encodeStr(textList.piuId):'/company/' + encodeStr(textList.piuId) " tag="a" class="list-titel-a blue" v-html="textList.piu"></router-link>
<template v-else>--</template>
</span>
</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