Commit fe944733 authored by 张冬's avatar 张冬

11.5联调

parent 34224510
......@@ -496,6 +496,15 @@ export function winnerSave(data) {
data:data
})
}
// 中标候选人名单
export function winPersionInfoDetail(projectId) {
return request({
url: `/tender-decide/winPersionInfoDetail/${projectId}`,
method: 'get'
})
}
// 中标候选人名单
export function candidate(projectId) {
return request({
......
* {
padding: 0;
margin: 0;
padding: 0;
margin: 0;
}
body,
html {
min-width: 1200px;
min-width: 1200px;
}
a {
color:#FF5203 !important;
color: #ff5203 !important;
text-decoration: none;
text-decoration: none;
}
.link {
color: #ff5203 !important;
cursor: pointer;
}
.link :hover {
color: rgb(51, 218, 193) !important;
}
a:hover {
color: rgb(51, 218, 193) !important;
}
a:hover{color:rgb(51, 218, 193) !important}
button {
border: none
border: none;
}
ul {
list-style: none;
list-style: none;
}
body,
......@@ -49,175 +60,170 @@ p,
blockquote,
th,
td {
margin: 0;
padding: 0;
margin: 0;
padding: 0;
}
fieldset,
img {
border: 0;
border: 0;
}
.flex {
display: flex;
display: flex;
}
.flex-item {
display: flex;
align-items: center;
display: flex;
align-items: center;
}
.flex-between {
display: flex;
align-items: center;
justify-content: space-between;
display: flex;
align-items: center;
justify-content: space-between;
}
.flex-arround {
display: flex;
align-items: center;
justify-content: space-around;
display: flex;
align-items: center;
justify-content: space-around;
}
.flex-center {
display: flex;
align-items: center;
justify-content: center;
display: flex;
align-items: center;
justify-content: center;
}
.flex-colunm {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.t1 {
font-size: .14rem;
color: rgba(0, 0, 0, 1);
font-size: 0.14rem;
color: rgba(0, 0, 0, 1);
}
.t2 {
font-size: .16rem;
color: rgba(0, 0, 0, 1);
font-size: 0.16rem;
color: rgba(0, 0, 0, 1);
}
.t3 {
font-size: .18rem;
color: rgba(0, 0, 0, 1);
font-size: 0.18rem;
color: rgba(0, 0, 0, 1);
}
.t4 {
font-size: .25rem;
color: rgba(0, 0, 0, 1);
font-weight: bold;
font-size: 0.25rem;
color: rgba(0, 0, 0, 1);
font-weight: bold;
}
.detail {
background: #F0F2F5;
background: #f0f2f5;
}
.content {
background: #fff;
padding: 20px 30px;
position: relative;
background: #fff;
padding: 20px 30px;
position: relative;
}
.othercontent {
background: #F0F2F5;
background: #f0f2f5;
}
.pagination {
margin-top: 200px;
margin-bottom: 100px
margin-top: 200px;
margin-bottom: 100px;
}
.navs {
width: 100%;
margin-bottom: 20px;
margin-left: 10px;
border-bottom: 1px solid #ccc;
width: 100%;
margin-bottom: 20px;
margin-left: 10px;
border-bottom: 1px solid #ccc;
}
.navs>li {
padding: 10px;
margin: 0 20px;
.navs > li {
padding: 10px;
margin: 0 20px;
}
.navs>.active {
border-bottom: 2px solid #2288EE;
color: #2288EE
.navs > .active {
border-bottom: 2px solid #2288ee;
color: #2288ee;
}
.content-head {
background: #fff;
margin-bottom: 20px;
box-sizing: border-box;
padding: 10px;
position: relative;
background: #fff;
margin-bottom: 20px;
box-sizing: border-box;
padding: 10px;
position: relative;
}
.content-head>.abs{
position: absolute;
right: 10px;
bottom: 10px;
.content-head > .abs {
position: absolute;
right: 10px;
bottom: 10px;
}
.content-head>h3 {
font-weight: bold;
margin-bottom: 20px;
margin-top: 20px;
.content-head > h3 {
font-weight: bold;
margin-bottom: 20px;
margin-top: 20px;
}
.describe {
width: 100%;
height: 50px;
line-height: 50px;
box-sizing: border-box;
padding-left: 20px;
border-bottom: 1px solid #F0F2F5;
font-weight: bold;
margin-bottom: 20px;
font-size: 18px;
width: 100%;
height: 50px;
line-height: 50px;
box-sizing: border-box;
padding-left: 20px;
border-bottom: 1px solid #f0f2f5;
font-weight: bold;
margin-bottom: 20px;
font-size: 18px;
}
.back-white {
background: #fff;
background: #fff;
}
.adjustment {
margin-top: 5px;
margin-right: 10px;
margin-top: 5px;
margin-right: 10px;
}
.form {
padding: 10px 20px 20px 20px
padding: 10px 20px 20px 20px;
}
.bottomButton {
padding: 20px 20px;
display: flex;
justify-content: flex-end;
background: #fff;
padding: 20px 20px;
display: flex;
justify-content: flex-end;
background: #fff;
}
.centerButton {
padding: 20px 20px;
display: flex;
justify-content: center;
background: #fff;
padding: 20px 20px;
display: flex;
justify-content: center;
background: #fff;
}
.tips {
color: #FF0000
color: #ff0000;
}
.message .el-input {
width: 250px !important;
width: 250px !important;
}
.el-icon-circle-close {
color: white;
}
.el-icon-circle-close {
color: white;
}
\ No newline at end of file
<template>
<div class="hello">
<div v-loading="loading"></div>
<el-upload
v-loading.fullscreen.lock="loading"
:http-request="handleUpload"
......@@ -69,6 +70,7 @@ export default {
},
data() {
return {
loading:false
}
},
created(){
......@@ -76,6 +78,7 @@ export default {
},
methods: {
emitInput(fileList) {
this.loading=false
let value = []
for (let i = 0; i < fileList.length; i++) {
let message = {}
......@@ -89,6 +92,7 @@ export default {
this.$emit('input', value)
},
beforeUpload(file) {
this.loading=true
const max = this.max
const isLt2M = file.size / 1024 / 1024 < max
if (!isLt2M) {
......
......@@ -8,15 +8,15 @@
</div>
<!-- 标题 -->
<div class="title">
<div>{{title}}</div>
<h1>{{title}}</h1>
</div>
<div v-if="state">
<div v-html="detail.content"></div>
<div class="enclosure flex-item">
<div style="margin-right: 30px">相关附件</div>
<ul v-if="detail.fileList !== undefined && detail.fileList.length > 0">
<ul v-if="detail.accessoryVOList !== undefined && detail.accessoryVOList.length > 0">
<li v-for="(item, i) in detail.accessoryVOList" :key="i">
<a href="item.accessoryUrl">{{ item.fileName }}</a>
<a target="_blank" :href="item.accessoryUrl">{{ item.fileName }}</a>
</li>
</ul>
<div v-else></div>
......@@ -86,9 +86,10 @@ export default {
.enclosure {
margin: 20px 0;
}
.title>div{
.title>h1{
/* display: flex;
justify-content: center; */
text-align:center
text-align:center;
margin-bottom:20rpx
}
</style>
\ No newline at end of file
......@@ -108,7 +108,7 @@
<div class="detail-item">
<div>其他资料</div>
<div class="pdf">
<a :href="item.fileUrl" v-for="(item, index) in elseFile" :key="index">{{ item.fileName }}</a>
<a target="_blank" :href="item.fileUrl" v-for="(item, index) in elseFile" :key="index">{{ item.fileName }}</a>
</div>
</div>
</div>
......
......@@ -11,9 +11,9 @@
<div class="content_list">
<div class="flex-item">
<div>附件下载:</div>
<ul v-if="detail.accessoryVOList">
<ul v-if="detail.accessoryVOList!==undefined &&detail.accessoryVOList.length>0 ">
<li v-for="item in detail.accessoryVOList" :key="item.id">
<a :href="item.accessoryUrl">{{ item.fileName }}</a>
<a target="_blank" :href="item.accessoryUrl">{{ item.fileName }}</a>
</li>
</ul>
<ul v-else>
......@@ -45,7 +45,6 @@ export default {
const { data, code,msg } = await biddingProjectId(projectId);
if (code == 200) {
this.detail = data;
this.$emit("getstate",data.auditStatus)
} else if (code == 500) {
this.state = false;
this.msg = msg;
......
This diff is collapsed.
......@@ -3,30 +3,28 @@
<div class="content">
<changeNav :navs="navs"></changeNav>
<div class="message">
<div>
<div class="div1">
<div>项目编号:{{ projectCode }}</div>
<div>项目名称:{{ projectName }}</div>
</div>
<div>
<div>日期:{{ date}}</div>
<div class="div1">
<div>日期:{{ date }}</div>
<div>中标金额:{{ detail.money }}</div>
</div>
<div>
<div class="flex-item">
<div style="margin-right: 20px">附件:</div>
<ul v-if="detail.fileList">
<li v-for="(item, i) in detail.fileList" :key="i">
<a :href="item.fileUrl">{{ item.fileName }}</a>
</li>
</ul>
<div v-else></div>
</div>
<div>中标通知书编号:{{ detail.number }}</div>
<div class="div1">中标通知书编号:{{ detail.number }}</div>
<div class="flex-item">
<div style="margin-right: 20px">附件:</div>
<ul v-if="detail.fileList!==undefined &&detail.fileList.length>0">
<li v-for="(item, i) in detail.fileList" :key="i">
<div @click="open(item.fileUrl)" class="link">{{ item.fileName }}</div>
</li>
</ul>
<div v-else></div>
</div>
<div class="flex-colunm notice">
<h1>您已中标,请及时与平台签署应收账款买断合同。</h1>
<h3>咨询电话:400-4567457</h3>
<el-button type="primary">查看详情</el-button>
<h1>您已中标,若您选择了应收账款买断服务,请及时与平台签署相关合同。</h1>
<h3>咨询电话:{{phone}}</h3>
<el-button type="primary" @click="jump">查看详情</el-button>
</div>
<div class="centerButton">
<el-button @click="back">返回</el-button>
......@@ -37,11 +35,11 @@
</template>
<script>
import { getMessagephone} from '@api/common/list'
import { winBookdetail } from '@api/supply/bid';
import changeNav from '@components/changeNav.vue';
export default {
components: {
changeNav
},
data() {
......@@ -52,7 +50,9 @@ export default {
navs: ['中标通知书'],
projectCode: '',
projectName: '',
detail: ''
detail: '',
date:"",
phone:""
};
},
methods: {
......@@ -67,15 +67,24 @@ export default {
const { data, code } = await winBookdetail(projectId);
if (code == 200) {
this.detail = data;
this.date = data.winDate.substring(0,10)
this.date = data.winDate.substring(0, 10);
}
},
jump() {
this.$router.push('/supply/buyOut/buyoutList');
},
/* 获取客服电话 */
async getMessagephone(){
const {data} = await getMessagephone()
console.log(data)
this.phone = data.phone
}
},
created() {
this.projectCode = localStorage.getItem('projectCode');
this.projectName = localStorage.getItem('projectName');
this.getwinBookdetail();
this.getMessagephone()
}
};
</script>
......@@ -99,10 +108,10 @@ export default {
width: 60%;
margin: 0 auto;
}
.message > .centerButton{
justify-content: center;
.message > .centerButton {
justify-content: center;
}
.message > div {
.message > .div1 {
display: flex;
justify-content: space-between;
margin-bottom: 30px;
......@@ -116,7 +125,7 @@ export default {
}
.notice {
margin: 200px auto 30px;
padding: 20px 0;
padding: 20px;
}
.notice > h3 {
margin: 20px 0;
......
......@@ -8,15 +8,15 @@
</div>
<!-- 标题 -->
<div class="title">
<div class="flex-center">{{title}}</div>
<h1 class="flex-center">{{ title }}</h1>
</div>
<div class="detail1" v-if="state">
<div v-html="detail.content"></div>
<div class="enclosure flex-item">
<div style="margin-right: 30px">相关附件</div>
<ul v-if="detail.accessoryDOList.length>0">
<ul v-if="detail.accessoryVOList !== undefined && detail.accessoryDOList.length > 0">
<li v-for="(item, i) in detail.accessoryDOList" :key="i">
<a href="item.accessoryUrl">{{ item.fileName }}</a>
<div @click="open(item.accessoryUrl)" class="link">{{ item.fileName }}</div>
</li>
</ul>
<div v-else></div>
......@@ -33,18 +33,20 @@
<script>
import { noticeWin } from '@api/supply/bid';
export default {
components: {
},
components: {},
data() {
return {
projectCode: '',
projectName: '',
state: true,
detail: '',
title:''
title: ''
};
},
methods: {
open(url) {
window.open(url);
},
back() {
this.$router.go(-1);
},
......@@ -55,7 +57,7 @@ export default {
if (code == 200) {
console.log(data);
this.detail = data;
this.title = data.title
this.title = data.title;
} else {
this.state = false;
}
......@@ -95,7 +97,7 @@ export default {
.enclosure {
margin: 50px 0;
}
.title{
margin-top:50px;
.title {
margin-top: 50px;
}
</style>
\ No newline at end of file
......@@ -355,7 +355,9 @@ export default {
.bond span {
cursor: pointer;
}
.file{
flex-wrap: wrap;
}
.file > div {
margin-right: 10px;
color: #113dee;
......
......@@ -11,7 +11,7 @@
<div>项目名称:{{projectName}}</div>
</div>
<div class="form">
<el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="160px" class="demo-ruleForm">
<el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="170px" class="demo-ruleForm">
<el-form-item label="澄清质询标题" prop="title">
<el-input v-model.trim="ruleForm.title" maxlength="30"></el-input>
</el-form-item>
......
......@@ -619,6 +619,9 @@ export default {
.bond span {
cursor: pointer;
}
.file{
flex-wrap: wrap;
}
.file > div {
margin-right: 10px;
color: #113dee;
......
......@@ -81,7 +81,7 @@
<el-form-item label="上传缴费凭证:">
<ul >
<li v-for="(item, index) in ruleForm.voucherList" :key="index">
<a :href="item.fileUrl">{{ item.fileName }}</a>
<a target="_blank" :href="item.fileUrl">{{ item.fileName }}</a>
</li>
</ul>
</el-form-item>
......
......@@ -113,7 +113,7 @@
<el-form-item label="上传缴费凭证:" >
<ul>
<li v-for="(item, index) in ruleForm.voucherList" :key="index">
<a :href="item.fileUrl">{{ item.fileName }}</a>
<a target="_blank" :href="item.fileUrl">{{ item.fileName }}</a>
</li>
</ul>
</el-form-item>
......
......@@ -18,18 +18,17 @@
<div class="flex-between">
<div class="flex">
<div class="adjustment">上传附件:</div>
<singleUpload :limit="1" tip="支持上传1个附件,不超过20M" @input="getfile"></singleUpload>
<singleUpload :limit="1" tip="支持上传1个附件,不超过20M" @input="getfile" :fileList="ruleForm.accessoryPOList"></singleUpload>
</div>
<div>发布媒体:捷安采官网</div>
</div>
<div class="flex-item">
<div style="width: 50px">备注:</div>
<!-- <div class="flex-item">
<div style="width: 50px">备注:{{ remark}}</div>
<el-input :rows="4" v-model.trim="remark" type="remark" placeholder="请输入备注" maxlength="300"> </el-input>
</div>
</div> -->
</div>
<div class="form">
<h3>确定中标人</h3>
<h3>中标人列表</h3>
<dataTable :table-data="tableData" :columns="columns" :is-pageobj="false">
<el-table-column slot="operate" label="操作" align="center" fixed="right" width="200">
<template slot-scope="scope">
......@@ -52,7 +51,7 @@
<el-button type="primary" @click="submitData" v-if="type!== 2">提交审批</el-button>
</div>
</div>
<el-dialog :visible.sync="dialogFormVisible" title="收货地址" width="30%">
<el-dialog :visible.sync="dialogFormVisible" title="中标价格" width="30%">
<el-form :model="form">
<el-form-item label-width="120px" label="输入中标价">
<el-input-number v-model="form.price" :min="0" :controls="false" :precision="2" placeholder="输入"></el-input-number>
......@@ -193,7 +192,12 @@ export default {
let projectId = localStorage.getItem('projectId');
const { data, code } = await noticeWin(projectId);
if (code == 200) {
for (let item of data.accessoryVOList) {
item.name = item.fileName;
item.url = item.accessoryUrl;
}
this.ruleForm = data;
}
} catch (err) {
console.log(err);
......
......@@ -28,10 +28,10 @@
</div>
<div>发布媒体:捷安采官网</div>
</div>
<div class="flex-item">
<!-- <div class="flex-item">
<div style="width: 50px">备注:</div>
<el-input :rows="4" v-model.trim="remark" type="textarea" placeholder="请输入备注" maxlength="300"> </el-input>
</div>
</div> -->
</div>
<div class="form">
<h3 style="margin-top: 30px">中标候选人公示内容</h3>
......
......@@ -338,6 +338,10 @@ export default {
.bond span {
cursor: pointer;
}
.file{
flex-wrap: wrap;
}
.file > div {
margin-right: 10px;
color: #113dee;
......
......@@ -199,6 +199,7 @@ export default {
idx: ''
};
},
methods: {
// 删除操作
handleDelete(row, index) {
......
......@@ -514,6 +514,7 @@ export default {
this.industryList();
this.projectClassifyList();
this.getGenerateNumber();
this.$refs.ruleForm.clearValidate()
},
methods: {
// 删除操作
......
......@@ -163,7 +163,9 @@ export default {
}
};
},
created(){
this.$refs.ruleForm.clearValidate()
},
methods: {
releaseTime(val) {
this.ruleForm.releaseTime = new Date(val).getTime();
......
......@@ -13,7 +13,7 @@
</el-table-column>
<el-table-column slot="operate" label="价格" align="center" fixed="right" width="300">
<template slot-scope="scope">
<div>{{ scope.row.free ? scope.row.price : '无' }}</div>
<div>{{ !scope.row.free ? scope.row.price : '无' }}</div>
</template>
</el-table-column>
</dataTable>
......
......@@ -197,7 +197,7 @@
<el-form-item label="附件:" prop="file">
<ul v-if='ruleForm.accessoryDOList!==undefined && ruleForm.accessoryDOList.length>0'>
<li v-for="(item,i) in ruleForm.accessoryDOList" :key="i">
<a :href="item.accessoryUrl">{{item.fileName}}</a>
<a target="_blank" :href="item.accessoryUrl">{{item.fileName}}</a>
</li>
</ul>
<div v-else></div>
......
......@@ -177,12 +177,12 @@ export default {
url: '/purchaser/bid/bidSure/bidResult/list',
bright: false
},
{
id: 19,
label: '合同管理',
url: '/purchaser/bid/bidSure/contract',
bright: false
}
// {
// id: 19,
// label: '合同管理',
// url: '/purchaser/bid/bidSure/contract',
// bright: false
// }
]
},
{
......@@ -303,7 +303,10 @@ export default {
} else if (item2.buttonId == 12 && item2.status == 2) {
item1.url = '/purchaser/bid/bidSure/see';
item1.label = '查看评标';
} else {
} else if (item2.buttonId == 15 && item2.status == 2) {
item1.url = '/purchaser/bid/bidSure/determine?type=2';
item1.label = '查看中标人';
}else {
item1.url = this.geturl(item1.url, item2.status);
item1.label = this.getlabel(item1.label, item2.status);
}
......
......@@ -161,9 +161,7 @@ export default {
},
created() {
let token = getSearchString('token');
if (token !== 'undefined') {
localStorage.setItem('token', token);
}
localStorage.setItem('token', token);
this.gethome();
},
methods: {
......
......@@ -5,7 +5,7 @@
<div>中国标准时间:{{ currentTime }}</div>
<div class="hal">
<h3 style="text-align: center">{{ projectName }}项目开标大厅</h3>
<div class="time-message flex-center" style="border-top:1px solid gray;width:100%">
<div class="time-message flex-between">
<div class="flex">
<p>截标倒计时:</p>
<timeDown :remain-time="remaintime" @countDowmEnd="remaintimeEnd"></timeDown>
......
......@@ -78,7 +78,7 @@
<el-form-item label="上传缴费凭证:" prop="voucherList">
<ul>
<li v-for="(item, index) in ruleForm.voucherList" :key="index">
<a :href="item.fileUrl">{{ item.fileName }}</a>
<a target="_blank" :href="item.fileUrl">{{ item.fileName }}</a>
</li>
</ul>
</el-form-item>
......
......@@ -109,7 +109,7 @@
<el-form-item label="上传缴费凭证:" prop="voucherList">
<ul>
<li v-for="(item, index) in ruleForm.voucherList" :key="index">
<a :href="item.fileUrl">{{ item.fileName }}</a>
<a target="_blank" :href="item.fileUrl">{{ item.fileName }}</a>
</li>
</ul>
</el-form-item>
......
......@@ -17,7 +17,7 @@
<div style="margin-right: 20px;">附件:</div>
<ul>
<!-- <li v-for="(item, i) in detail" :key="i"> -->
<a :href=detail.resultBookUrl>{{ detail.resultBookName }}</a>
<a target="_blank" :href=detail.resultBookUrl>{{ detail.resultBookName }}</a>
</ul>
<!-- <div style="margin-right: 20px;">附件:中标通知书.pdf</div>
<el-button size="mini">下载</el-button> -->
......
......@@ -167,12 +167,12 @@ export default {
url: '/supply/bid/joinProject/bidSure/bidresultAdvice',
bright: false
},
{
id: 65,
label: '合同管理',
url: '/supply/bid/joinProject/bidSure/contractManagement',
bright: false
}
// {
// id: 65,
// label: '合同管理',
// url: '/supply/bid/joinProject/bidSure/contractManagement',
// bright: false
// }
]
},
{
......
......@@ -10,9 +10,9 @@
<div>下载合同:</div>
<ul>
<li class="flex-item">
<div>{{detail.fileName}}f</div>
<div>{{detail.fileName}}</div>
<!-- <el-button size="mini">下载</el-button> -->
<a :href="detail.fileUrl">下载</a>
<a target="_blank" :href="detail.fileUrl">下载</a>
</li>
</ul>
</div>
......
......@@ -18,12 +18,12 @@ export function getSearchString(key) {
export function down(url) {
window.open(url)
}
export let requestUrl = 'http://192.168.43.117:8085';
// export let requestUrl = 'http://60.205.251.80:8082';
// export let requestUrl = 'http://192.168.43.117:8085';
export let requestUrl = 'http://60.205.251.80:8082';
export let homeUrl = 'http://localhost:3000';
// export let homeUrl = 'http://60.205.251.80:8081';
// export let homeUrl = 'http://localhost:3000';
export let homeUrl = 'http://60.205.251.80:8081';
export let openUrl = '//192.168.43.117:8085';
// export let openUrl = '//60.205.251.80:8085';
// export let openUrl = '//192.168.43.117:8085';
export let openUrl = '//60.205.251.80:8085';
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