Skip to content

严立 / cd-bid

Go to a project
Commit 2da8c6e0 by 严立
Options

投票结果公告显示 | 列表查看公告详情以新标签打开

parent b11c0c97
Inline Side-by-side
Showing with 72 additions and 47 deletions
src/common/frame/pagination/pagination.js
let output = function (funcValue, funcType, funcUpdateObject) {
switch (funcType) {
case 'size':
funcUpdateObject.size = funcValue
break
case 'total':
funcUpdateObject.total = funcValue
break
case 'current':
funcUpdateObject.current = funcValue
break
}
console.log('[frame pagination]: ', JSON.stringify(funcUpdateObject))
}
let output = function (funcValue, funcType, funcUpdateObject) {
switch (funcType) {
case 'size':
funcUpdateObject.size = funcValue
break
case 'total':
funcUpdateObject.total = funcValue
break
case 'current':
funcUpdateObject.current = funcValue
break
}
console.log('[frame pagination]: ', JSON.stringify(funcUpdateObject))
}
export default output
\ No newline at end of file
src/common/js/host.js
let output = {
// 测试环境
base: 'http://bid-server.meiqicloud.com/', // 开发路径
// base: '/Api/', // 部署路径
base: '/Api/', // 部署路径
// base: 'http://bid-server.meiqicloud.com/', // 开发路径
resources: 'http://bid-web.meiqicloud.com',
agentSignIn: 'http://bid-vue.meiqicloud.com/'
// -正式环境
// base: '/Api/',
// 正式环境
// base: 'https://www.fjbidding.com/Api/',
// resources: 'https://www.fjbidding.com',
// agentSignIn: 'https://www.fjbidding.com/admin/'
}
......
src/components/notice-agency.vue
......@@ -36,7 +36,6 @@
computed: {
componentAgency: function () {
console.log('this.$store.state.componentAgency', this.$store.state.componentAgency)
return this.$store.state.componentAgency
},
},
......
src/components/notice-progress.vue
......@@ -114,7 +114,6 @@
return this.$store.state.componentProject
},
componentProgress: function () {
console.log('this.$store.state.componentProgress', this.$store.state.componentProgress)
return this.$store.state.componentProgress
}
},
......
src/view/public/bid-list.vue
......@@ -335,11 +335,25 @@
},
onBidDetails: function (funcItem) {
console.log(funcItem)
if (funcItem.isHistoricalData) {
this.$router.push('/bid/history?id=' + funcItem.id)
// this.$router.push('/bid/history?id=' + funcItem.id)
const { href } = this.$router.resolve({
name: 'bidHistoricalNotice',
query: {
id: funcItem.id
}
})
window.open(href, '_blank')
} else {
this.$router.push('/bid/notice?type=' + funcItem.typeId + '&id=' + funcItem.id)
// this.$router.push('/bid/notice?type=' + funcItem.typeId + '&id=' + funcItem.id)
const { href } = this.$router.resolve({
name: 'bidNotice',
query: {
id: funcItem.id,
type: funcItem.typeId
}
})
window.open(href, '_blank')
}
},
}
......
src/view/public/bid-notice.js
......@@ -64,8 +64,6 @@ let output = function (thisVue, id, type, isPreview) {
}
thisVue.$store.commit('componentProject', funcProject)
// 竞价表格
let funcRawData = funcResponse.packageAll
funcRawData.sort(function(a, b) {
......@@ -116,8 +114,6 @@ let output = function (thisVue, id, type, isPreview) {
}
thisVue.$store.commit('componentContract', funcPackage)
// 进度组件
funcProgress = {
text: ['发布时间', '竞价时间', '公布结果'],
......@@ -133,8 +129,6 @@ let output = function (thisVue, id, type, isPreview) {
}
thisVue.$store.commit('componentProgress', funcProgress)
// 代理信息
if (funcResponse.agencyInfo) {
funcRawData = funcResponse.agencyInfo
......@@ -149,8 +143,6 @@ let output = function (thisVue, id, type, isPreview) {
thisVue.$store.commit('componentAgency', funcAgency)
}
// 附件组件
funcRawData = funcResponse.file
for (let i = 0, len = funcRawData.length; i < len; i++) {
......@@ -965,8 +957,6 @@ let output = function (thisVue, id, type, isPreview) {
}
thisVue.$store.commit('componentProject', funcProject)
let funcRawData
if (funcProject.isPackage) {
// 多个合同
......@@ -983,6 +973,7 @@ let output = function (thisVue, id, type, isPreview) {
'timedDeadLine': funcRawData[i].calibrateTime,
'resultName': [],
'resultPrice': [],
'resultState': funcRawData[i].packageState,
}
funcPackage.push(funcItem)
}
......@@ -999,9 +990,18 @@ let output = function (thisVue, id, type, isPreview) {
}
for (let i = 0, len = funcPackage.length; i < len; i++) {
if (funcPackage[i].resultName.length === 0) {
funcPackage[i].resultName.push('流标')
funcPackage[i].resultPrice.push('0')
switch (funcPackage[i].resultState) {
case '0':
funcPackage[i].resultName.push('流标')
break
case '1':
break
case '2':
funcPackage[i].resultName.push('详见招标公告')
break
}
}
} else {
......@@ -1018,6 +1018,7 @@ let output = function (thisVue, id, type, isPreview) {
'timedDeadLine': funcRawData.calibrateTime,
'resultName': [],
'resultPrice': [],
'resultState': funcRawData.packageState,
}]
// 是否有中标信息
......@@ -1028,10 +1029,20 @@ let output = function (thisVue, id, type, isPreview) {
funcPackage[i].resultPrice.push(funcRawData[j].amount)
}
}
for (let i = 0, len = funcPackage.length; i < len; i++) {
if (funcPackage[i].resultName.length === 0) {
funcPackage[i].resultName.push('流标')
funcPackage[i].resultPrice.push('0')
switch (funcPackage[i].resultState) {
case '0':
funcPackage[i].resultName.push('流标')
break
case '1':
break
case '2':
funcPackage[i].resultName.push('详见招标公告')
break
}
}
......@@ -1040,8 +1051,6 @@ let output = function (thisVue, id, type, isPreview) {
}
thisVue.$store.commit('componentContract', funcPackage)
funcRawData = funcResponse.agencyInfo
funcAgency = {
'id': funcRawData.agencyInfoId,
......
src/view/public/bid-notice.vue
......@@ -68,7 +68,7 @@
<div v-for="(item, index) in componentContract" :key="index">
<div v-for="(itemWin, indexWin) in item.resultName" :key="indexWin" class="row con-b bid-result-nopackage-item">
<span>中标（成交）供应商：<span :class="item.resultName[indexWin] === '流标' ? 'global-color-red' : ''">{{item.resultName[indexWin]}}</span></span>
<span>中标（成交）金额：<span>{{item.resultPrice[indexWin] + ' 元'}}</span></span>
<span v-if="item.resultState === '1'">中标（成交）金额：<span>{{item.resultPrice[indexWin] + ' 元'}}</span></span>
</div>
</div>
</div>
......@@ -86,7 +86,7 @@
<div class="bid-result col">
<div v-for="(itemResult, indexResult) in componentContract[index].resultName" :key="indexResult" class="row align-c">
<span>中标（成交）供应商：　<span :class="componentContract[index].resultName[indexResult] === '流标' ? 'global-color-red' : ''">{{componentContract[index].resultName[indexResult]}}</span></span>
<span>中标（成交）金额：　<span>{{componentContract[index].resultPrice[indexResult]}}</span></span>
<span v-if="componentContract[index].resultState === '1'">中标（成交）金额：　<span>{{componentContract[index].resultPrice[indexResult]}}</span></span>
</div>
</div>
</div>
......@@ -423,6 +423,9 @@
this.componentFile = funcFile
this.componentNotice = funcOther
console.log('this.componentContract')
console.log(this.componentContract)
// 竞价公告查询最新报价
if ([0].indexOf(funcProject.noticeType) >= 0) {
iRequest.request(iHost.base + 'bid/zBiddingProject/recentQuotation', { 'projectId': funcProject.projectId }, 'json', 'post')
......
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 sign in to comment