Skip to content

D
dsk-cr20g
Commit db6ae9dd authored by danfuman's avatar danfuman
Browse files
Options

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

parents 19ff8a8f 262d548b
Show whitespace changes
Inline Side-by-side
Showing with 161 additions and 48 deletions
dsk-operate-ui/src/api/detail/party-a/dealings.js
View file @ db6ae9dd
......@@ -88,7 +88,7 @@ export function getSelect(data) {
data: data
})
}
// 数据来源链接
// 中标公示来源链接
export function bidWinMergeDetail(data) {
return request({
url: '/enterpriseBussiness/bidWinMergeDetail',
......@@ -96,3 +96,19 @@ export function bidWinMergeDetail(data) {
data: data
})
}
// 四库业绩来源链接
export function skyProjectDetail(data) {
return request({
url: '/enterpriseBussiness/skyProjectDetail',
method: 'post',
data: data
})
}
// 荣誉奖项来源链接
export function awardDetail(data) {
return request({
url: '/enterpriseBussiness/awardDetail',
method: 'post',
data: data
})
}
dsk-operate-ui/src/views/detail/party-a/component/HeadDetailForm.vue
View file @ db6ae9dd
<template>
<div class="headForm">
<div class="flex-box query-box">
<div class="flex-box query-params">
<div class="flex-box query-params" :class="flag?'box1':''">
<div class="flex-box headForm-text">
<!-- <img v-if="title" src="@/assets/images/detail/ico_title.png" /> -->
<!-- <span class="drawer-title" v-if="title">{{ title }}</span> -->
<template v-if="flag">
<img v-if="title" src="@/assets/images/detail/ico_title.png" />
<span class="drawer-title" v-if="title">{{ title }}</span>
</template>
<template v-if="slots">
<slot name="slot"></slot>
</template>
<!-- <div v-else>
<div v-if="flag">
<span class="ability-total" v-if="isTotal">{{ total }}条数据</span>
<span class="ability-total" v-if="amountTotal">，共计合作总金额：<i>{{ amountTotal }}</i>万元</span>
</div> -->
</div>
</div>
<div class="headForm-from">
<div class="from-item" :key="i" v-for="(form, i) in formData">
......@@ -96,6 +98,10 @@ export default {
type: String,
default: ''
},
flag: {
type: Boolean,
default: false
},
queryParams: {
type: Object,
default: {}
......@@ -143,6 +149,11 @@ export default {
width: 100%;
padding: 8px 17px 8px 0;
}
.box1{
padding: 8px 17px 8px 13px;
justify-content: space-between;
border-bottom: 1px solid #E1E1E1;
}
::v-deep .el-input__inner{
border: 0;
height: 32px;
......@@ -171,6 +182,12 @@ export default {
line-height: 32px;
}
.headForm-text{
.drawer-title{
font-size: 16px;
color: #232323;
font-weight: bold;
margin-right: 4px;
}
img{
width: 17px;
height: 17px;
......
dsk-operate-ui/src/views/detail/party-a/dealings/bidagency.vue
View file @ db6ae9dd
......@@ -82,7 +82,6 @@ export default {
},
methods: {
async handleQuery(params) {
this.isSkeleton = true;
this.tableLoading = true
let param = params?params:this.queryParams
let res = await oftenAgencyPage(param)
......
dsk-operate-ui/src/views/detail/party-a/dealings/bidrecords.vue
View file @ db6ae9dd
......@@ -71,7 +71,6 @@ export default {
},
methods: {
async handleQuery(params) {
this.isSkeleton = true;
this.tableLoading = true
let param = params?params:this.queryParams
let res = await tenderPage(param)
......
dsk-operate-ui/src/views/detail/party-a/dealings/component/bidagencyDetail.vue
View file @ db6ae9dd
......@@ -8,13 +8,16 @@
@closed="cancel">
<head-detail-form
:title="title"
:flag="true"
:form-data="formData"
:query-params="queryParams"
:total="tableDataTotal"
:amountTotal="amountTotal"
@handle-search="handleSearch"
/>
<skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
<tables
v-else
:indexFixed="true"
:tableLoading="tableLoading"
:tableData="tableData"
......@@ -27,7 +30,7 @@
<template slot="dealTitle" slot-scope="scope">
<div class="flex-box">
<img class="tip-img" src="@/assets/images/detail/ico_pdf.png" v-if="scope.row.fileUrlL" @click="handlePic(scope.row.fileUrlL)"/>
<router-link :to="`/radar/Notice/details/${scope.row.bid}`" tag="a" class="a-link" v-if="scope.row.bid&&scope.row.dealTitle" v-html="scope.row.dealTitle"></router-link>
<div class="a-link" @click="linkTo(scope.row.bid)" v-if="scope.row.bid&&scope.row.dealTitle" v-html="scope.row.dealTitle" style="cursor: pointer"></div>
<span v-else v-html="scope.row.dealTitle || '--'"></span>
</div>
</template>
......@@ -43,18 +46,19 @@
import mixin from '../../mixins/mixin'
import {bidCooperatePage} from '@/api/detail/party-a/dealings'
import HeadDetailForm from "../../component/HeadDetailForm"
import skeleton from '@/views/project/projectList/component/skeleton'
export default {
props: [
'data',
'title'
],
components: {
HeadDetailForm
HeadDetailForm,skeleton
},
mixins: [mixin],
data() {
return {
isSkeleton:true,
drawer: false,
queryParams: {
tendereeId: this.data.tendereeId,
......@@ -84,6 +88,10 @@ export default {
this.handleQuery()
},
methods: {
linkTo(id){
this.drawer = false
this.$router.push(`/radar/Notice/details/${id}`)
},
async handleQuery(params) {
this.tableLoading = true
let param = params?params:this.queryParams
......@@ -92,6 +100,7 @@ export default {
if(res.code==200){
this.tableData = res.rows
}
this.isSkeleton = false;
this.tableDataTotal = res.total
this.amountTotal = res.totalAmount
},
......
dsk-operate-ui/src/views/detail/party-a/dealings/component/customDetail.vue
View file @ db6ae9dd
......@@ -22,13 +22,14 @@
:tableData="tableData"
:forData="forData"
:tableDataTotal="tableDataTotal"
@sort-change="sortChange"
:queryParams="queryParams"
@handle-current-change="handleCurrentChange"
>
<template slot="sourceType" slot-scope="scope">
<div class="flex-box">
<div class="a-link" @click="linkTo(scope)" v-if="scope.row.sourceId&&scope.row.sourceType=='中标业绩'" v-html="scope.row.sourceType" style="cursor: pointer"></div>
<span v-else-if="scope.row.sourceId" @click="linkTo1(scope)" class="a-link" style="cursor: pointer" v-html="scope.row.sourceType"></span>
<span v-else-if="scope.row.sourceId&&(scope.row.sourceType=='中标公示'||scope.row.sourceType=='四库业绩'||scope.row.sourceType=='荣誉奖项')" @click="linkTo1(scope)" class="a-link" style="cursor: pointer" v-html="scope.row.sourceType"></span>
<span v-else v-html="scope.row.sourceType || '--'"></span>
</div>
</template>
......@@ -39,7 +40,7 @@
<script>
import mixin from '../../mixins/mixin'
import {clientProjectPage,getSelect,bidWinMergeDetail} from '@/api/detail/party-a/dealings'
import {clientProjectPage,getSelect,bidWinMergeDetail,skyProjectDetail,awardDetail} from '@/api/detail/party-a/dealings'
import HeadDetailForm from "../../component/HeadDetailForm"
import skeleton from '@/views/project/projectList/component/skeleton'
......@@ -60,7 +61,7 @@ export default {
queryParams: {
cid: this.companyId,
companyId: this.data.companyId,
companyName: this.data.companyName,
companyName: this.data.companyName.replace(/<font color='red'>/g,'').replace(/<\/font>/g,''),
pageNum: 1,
pageSize: 20
},
......@@ -72,8 +73,8 @@ export default {
],
forData: [
{label: '项目名称', prop: 'projectName', fixed: true},
{label: '公布时间', prop: 'time', width: '120',sortable:true},
{label: '本次合同金额（万元）', prop: 'amount', width: '180',sortable:true},
{label: '公布时间', prop: 'time', width: '120',sortable:'custom',descending: '3', ascending: '4'},
{label: '本次合同金额（万元）', prop: 'amount', width: '180',sortable:'custom',descending: '1', ascending: '2'},
{label: '项目类型', prop: 'projectTtype', width: '130'},
{label: '数据来源', prop: 'sourceType', width: '90', slot: true}
],
......@@ -132,11 +133,35 @@ export default {
this.$router.push(`/biddetail/${scope.row.sourceId}`)
},
linkTo1(scope){
let url = ""
switch (scope.row.sourceType) {
case '中标公示':
bidWinMergeDetail({sourceId:scope.row.sourceId}).then(res=>{
if(res.data&&res.data.sourceUrl){
window.open(res.data.sourceUrl, "_blank")
url = res.data.sourceUrl
window.open(url, "_blank")
}
})
break;
case '荣誉奖项':
awardDetail({sourceId:scope.row.sourceId}).then(res=>{
if(res.data&&res.data.sourceUrl){
url = res.data.sourceUrl
window.open(url, "_blank")
}
})
break;
case '四库业绩':
skyProjectDetail({sourceId:scope.row.sourceId}).then(res=>{
if(res.data&&res.data.sourceUrl){
url = res.data.sourceUrl
window.open(url, "_blank")
}
})
break;
default:
break;
}
},
cancel() {
this.$emit('cancel')
......
dsk-operate-ui/src/views/detail/party-a/dealings/component/supplierDetail.vue
View file @ db6ae9dd
......@@ -23,12 +23,13 @@
:forData="forData"
:tableDataTotal="tableDataTotal"
:queryParams="queryParams"
@sort-change="sortChange"
@handle-current-change="handleCurrentChange"
>
<template slot="sourceType" slot-scope="scope">
<div class="flex-box">
<div class="a-link" @click="linkTo(scope)" v-if="scope.row.sourceId&&scope.row.sourceType=='中标业绩'" v-html="scope.row.sourceType" style="cursor: pointer"></div>
<span v-else-if="scope.row.sourceId" @click="linkTo1(scope)" class="a-link" style="cursor: pointer" v-html="scope.row.sourceType"></span>
<span v-else-if="scope.row.sourceId&&(scope.row.sourceType=='中标公示'||scope.row.sourceType=='四库业绩'||scope.row.sourceType=='荣誉奖项')" @click="linkTo1(scope)" class="a-link" style="cursor: pointer" v-html="scope.row.sourceType"></span>
<span v-else v-html="scope.row.sourceType || '--'"></span>
</div>
</template>
......@@ -39,7 +40,7 @@
<script>
import mixin from '../../mixins/mixin'
import { supplierProjectPage,getSelect,bidWinMergeDetail } from '@/api/detail/party-a/dealings'
import { supplierProjectPage,getSelect,bidWinMergeDetail,skyProjectDetail,awardDetail } from '@/api/detail/party-a/dealings'
import HeadDetailForm from "../../component/HeadDetailForm"
import skeleton from '@/views/project/projectList/component/skeleton'
......@@ -59,7 +60,7 @@ export default {
drawer: false,
queryParams: {
companyId: this.data.companyId,
companyName: this.data.companyName,
companyName: this.data.companyName.replace(/<font color='red'>/g,'').replace(/<\/font>/g,''),
cid: this.companyId,
pageNum: 1,
pageSize: 20
......@@ -72,8 +73,8 @@ export default {
],
forData: [
{label: '项目名称', prop: 'projectName', fixed: true},
{label: '公布时间', prop: 'time', width: '120',sortable:true},
{label: '本次合同金额（万元）', prop: 'amount', width: '180',sortable:true},
{label: '公布时间', prop: 'time', width: '120',sortable:'custom',descending: '3', ascending: '4'},
{label: '本次合同金额（万元）', prop: 'amount', width: '180',sortable:'custom',descending: '1', ascending: '2'},
{label: '项目类型', prop: 'projectType', width: '130'},
{label: '数据来源', prop: 'sourceType', width: '90', slot: true}
],
......@@ -132,11 +133,35 @@ export default {
this.$router.push(`/biddetail/${scope.row.sourceId}`)
},
linkTo1(scope){
let url = ""
switch (scope.row.sourceType) {
case '中标公示':
bidWinMergeDetail({sourceId:scope.row.sourceId}).then(res=>{
if(res.data&&res.data.sourceUrl){
window.open(res.data.sourceUrl, "_blank")
url = res.data.sourceUrl
window.open(url, "_blank")
}
})
break;
case '荣誉奖项':
awardDetail({sourceId:scope.row.sourceId}).then(res=>{
if(res.data&&res.data.sourceUrl){
url = res.data.sourceUrl
window.open(url, "_blank")
}
})
break;
case '四库业绩':
skyProjectDetail({sourceId:scope.row.sourceId}).then(res=>{
if(res.data&&res.data.sourceUrl){
url = res.data.sourceUrl
window.open(url, "_blank")
}
})
break;
default:
break;
}
},
cancel() {
this.$emit('cancel')
......
dsk-operate-ui/src/views/detail/party-a/dealings/custom.vue
View file @ db6ae9dd
......@@ -59,11 +59,11 @@ export default {
title:'',
queryParams: {
cid: this.companyId,
sort: 3,
sort: 5,
pageNum: 1,
pageSize: 20
},
defaultSort: {},
defaultSort: {prop: 'count', order: 'descending'},
forData: [
{label: '客户名称', prop: 'companyName', minWidth: '350', slot: true},
// {label: '合作项目/工程名称', prop: 'projectAllName', minWidth: '400', slot: true, sortable: 'custom', descending: '5', ascending: '6'},
......
dsk-operate-ui/src/views/detail/party-a/dealings/hiscontract.vue
View file @ db6ae9dd
......@@ -94,7 +94,6 @@ export default {
},
async handleQuery(params) {
this.tableLoading = true
let param = params?params:this.queryParams
let res = await historySendPage(param)
this.tableLoading = false
......
dsk-operate-ui/src/views/project/overview/index.vue
View file @ db6ae9dd
......@@ -52,7 +52,7 @@
<div>水利项目</div>
</div>
</div> -->
<!-- <div class="cardtitles i">储备项目类型</div>
<!-- <div class="cardtitles i">储备项目类别</div>
<div class="gzlist">
<div>
<img src="@/assets/images/project/EPC.png">
......@@ -130,7 +130,7 @@
>
<el-table-column
prop="projectCategory"
label="项目类型"></el-table-column>
label="项目类别"></el-table-column>
<el-table-column
prop="businessCount"
label="储备数量">
......@@ -184,7 +184,7 @@
>
<el-table-column
prop="projectCategory"
label="项目类型"></el-table-column>
label="项目类别"></el-table-column>
<el-table-column
prop="businessCount"
label="中标数量">
......@@ -425,7 +425,13 @@ export default {
getCount(0).then(res=>{
if(res.code==200){
this.viewData1 = res.data;
if(res.data.length>0){
if(this.viewData1.length>0){
for(var i=0;i< this.viewData1.length;i++){
if(!this.viewData1[i].projectCategory){
this.viewData1.splice(i,1)
i--
}
}
this.$nextTick(()=>{
let chartDom1 = document.getElementById("echarts1")
this.myChart1 = echarts.init(chartDom1)
......@@ -454,6 +460,12 @@ export default {
if(res.code==200){
this.viewData2 = res.data;
if(res.data.length>0){
for(var i=0;i< this.viewData2.length;i++){
if(!this.viewData2[i].amountSource){
this.viewData2.splice(i,1)
i--
}
}
this.$nextTick(()=>{
let chartDom2 = document.getElementById("echarts2")
this.myChart2 = echarts.init(chartDom2)
......
dsk-operate-ui/src/views/project/projectList/component/jsnr.vue
View file @ db6ae9dd
......@@ -20,13 +20,16 @@
</div>
<div class="con i">
<span>资金来源 ：</span>
<div class="inputxt" id="inputxt2">
<div class="inputxt22" id="inputxt2">
<div class="flex" v-if="nowedit == 2 && isDisableds == false">
<el-input placeholder="待添加" v-model="amountSource"></el-input>
<div class="flex">
<!-- <el-input placeholder="待添加" v-model="amountSource"></el-input> -->
<el-select placeholder="请选择" v-model="amountSource" @change="changes({'amountSource':amountSource})">
<el-option v-for="(item,index) in amountSourceList" :key="index" :label="item" :value="item"></el-option>
</el-select>
<!-- <div class="flex">
<div class="btnsmall btn_primary h28" @click="changes({'amountSource':amountSource})" style="width: 56px">确定</div>
<div class="cancels h28" @click="nowedit = -1" style="">取消</div>
</div>
</div> -->
</div>
<span :class="{'txt':!amountSource}" v-else @click="nowedit = 2">{{amountSource||'待添加'}}</span>
</div>
......@@ -214,6 +217,7 @@
},
data(){
return{
amountSourceList:['财政资金','自筹资金','债券资金','投资资金','贷款资金','其他'],
nowedit:-1,//当前正在编辑的文本
id:this.detailId ? this.detailId : parseInt(this.$route.query.id),
investmentAmount: '',//总投资额
......@@ -337,5 +341,13 @@
</script>
<style scoped>
.baseinfo .row .con .inputxt22{
line-height: 36px;
margin-top: -5px;
display: inline-block;
width: 184px;
height: 28px;
border-radius: 2px;
cursor: pointer;
}
</style>
dsk-operate-ui/src/views/radar/Land/details.vue
View file @ db6ae9dd
......@@ -19,7 +19,7 @@
</p>
<p class="list-content-text">
<span>成交金额：</span>
<span v-if="textList.transactionPrice">{{textList.transactionPrice}}万元</span>
<span v-if="textList.transactionPrice">{{textList.transactionPrice>0?textList.transactionPrice+'万元':'--'}}</span>
<span v-else>--</span>
</p>
<p class="list-content-text">
......@@ -169,9 +169,9 @@
</p>
<p>
<label class="label">起始价（万元）</label>
<span>{{textList.moneyBegin||"--"}}</span>
<span>{{textList.moneyBegin>0?textList.moneyBegin:'--'}}</span>
<label class="label">竞买保证金（万元）</label>
<span>{{textList.bondmoney||"--"}}</span>
<span>{{textList.bondmoney>0?textList.bondmoney:'--'}}</span>
</p>
<p>
<label class="label">加价幅度</label>
......@@ -181,7 +181,7 @@
</p>
<p>
<label class="label">成交价（万元）</label>
<span>{{textList.transactionPrice||"--"}}</span>
<span>{{textList.transactionPrice>0?textList.transactionPrice:'--'}}</span>
<label class="label">受让人</label>
<span>{{textList.company||"--"}}</span>
</p>
......
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