Skip to content

W
web-purchase
Commit a01523fa authored by 张冬's avatar 张冬
Browse files
Options

修改

parent 4c76f009
Hide whitespace changes
Inline Side-by-side
Showing with 152 additions and 71 deletions
src/api/purchaser/buyOut.js
View file @ a01523fa
......@@ -15,6 +15,15 @@ export function contract(projectId) {
method: 'get',
})
}
// 签署合同
export function signContract(projectId) {
return request({
url: `tender-payment/sign-contract/${projectId}`,
method: 'put',
})
}
// 查看凭证接口
export function evidenceDetail(params) {
return request({
......@@ -23,15 +32,14 @@ export function evidenceDetail(params) {
params:params
})
}
// 签署合同
export function signContract(projectId) {
// 确认凭证接口
export function confirmvoucher(projectId) {
return request({
url: `tender-payment/sign-contract/${projectId}`,
method: 'put',
url: `tender-payment/confirm/voucher/${projectId}`,
method: 'get',
})
}
src/pages/purchaser/bid/bidOpen/bidOpenhal.vue
View file @ a01523fa
......@@ -176,6 +176,9 @@
</template>
<script>
import {
openUrl
} from '@utils/common'
import {
getTime
} from '@utils/time'
......@@ -255,7 +258,7 @@
},
], //
columns: [{
label: '投标人名称',
label: '投标公司',
prop: 'companyName'
},
{
......@@ -558,8 +561,9 @@
createWebSocket() {
let token = localStorage.getItem("token")
let projectId = localStorage.getItem("projectId")
this.websocket = new WebSocket(`ws:${openUrl}/webSocket/${projectId}/${token}`)
// this.websocket = new WebSocket('ws://192.168.3.35:8085/webSocket/' + projectId + "/" + token)
this.websocket = new WebSocket('ws://60.205.251.80:8085/webSocket/' + projectId +"/"+token )
// this.websocket = new WebSocket('ws://60.205.251.80:8085/webSocket/' + projectId +"/"+token )
// 连接成功时
this.websocket.onopen = () => {}
this.websocket.onmessage = event => {
......
src/pages/purchaser/bid/bidStage/clearManagement/reply.vue
View file @ a01523fa
......@@ -16,7 +16,7 @@
<div><span>*</span>澄清问题内容：</div>
<div>{{ detail.content }}</div>
</div>
<div v-if="detail.accessoryList" class="flex-between">
<div v-if="detail.accessoryList" class="flex">
<div><span>*</span>澄清问题附件：</div>
<ul>
<li v-for="(item,index) in detail.accessoryList" :key="index">
......@@ -53,7 +53,7 @@
<script>
import {
clarifiesDetail,
questionDetail,
forwardClarify
} from '@api/purchaser/bid'
......@@ -105,7 +105,7 @@
},
created() {
this.id = this.$route.query.questionId
this.getclarifiesDetail()
this.getquestionDetail()
},
methods: {
getfile(val) {
......@@ -120,13 +120,13 @@
cancle() {
this.$router.go(-1)
},
// 查看澄清详情
async getclarifiesDetail() {
// 查看问题详情
async getquestionDetail() {
try {
const {
code,
data
} = await clarifiesDetail(this.id)
} = await questionDetail(this.id)
if (code === 200) {
this.detail = data
}
......
src/pages/purchaser/buyOut/buyoutList.vue
View file @ a01523fa
......@@ -4,31 +4,30 @@
<dataBreadcrumb :breads="breads"></dataBreadcrumb>
<changeNav :navs="navs"></changeNav>
<dataTable :columns="columns" :checklist="checklist" :sendData="sendData" url="/tender-payment/list">
<el-table-column slot="operate" label="状态" align="center" fixed="right">
<el-table-column slot="operate" label="状态" align="center">
<template slot-scope="scope">
<div v-if="scope.row.status=='CONTRACT_COMPLETE'">合同已完成</div>
<div v-if="scope.row.status=='PRE_BIDDER_CONTRACT'">待供应商签署合同</div>
<div v-if="scope.row.status=='PRE_PLATFORM_TO_TENDER_CONTRACT'">待平台发起采购商合同签署</div>
<div v-if="scope.row.status=='PRE_TENDERER_CONTRACT'">待采购商签署合同</div>
<div v-if="scope.row.status=='PRE_PLATFORM_TO_BIDDER_CONTRACT'">等待与供应商签署合同</div>
<div v-if="scope.row.status=='PRE_PLATFORM_TO_TENDER_CONTRACT'">等待与采购商签署合同</div>
<div v-if="scope.row.status=='WAIT_CONTRACT_UPLOAD'">等待合同上传</div>
<div v-if="scope.row.status=='PRE_PLATFORM_TO_BIDDER_CONTRACT'">待平台发起供应商合同签署</div>
<div v-if="scope.row.status=='PRE_BIDDER_CONTRACT'">待供应商签署合同</div>
<div v-if="scope.row.status=='PRE_BIDDER_VOUCHER'">待供应商上传凭证</div>
<div v-if="scope.row.status=='PRE_TENDERER_AFFIRM'">待采购商确认</div>
<div v-if="scope.row.status=='TENDERER_AFFIRM'">采购商已确认</div>
</template>
</el-table-column>
<el-table-column slot="operate" label="操作" align="center" fixed="right" width="200">
</el-table-column>
<el-table-column slot="operate" label="操作" align="center" width="200">
<template slot-scope="scope">
<div v-if="scope.row.state==0||scope.row.state==1">
<el-button type="text" size="small" @click="contractSign(scope.row)">合同签署</el-button>
</div>
<div v-if="scope.row.state==2">
<el-button type="text" size="small" @click="contractSee(scope.row)">合同查看</el-button>
</div>
<div v-if="scope.row.state==3">
<el-button type="text" size="small" @click="contractSign(scope.row)">合同签署</el-button>
<el-button type="text" size="small" @click="voucherSign(scope.row)">确认凭证</el-button>
</div>
<div v-if="scope.row.state==4">
<el-button type="text" size="small" @click="contractSign(scope.row)">合同查看</el-button>
<el-button type="text" size="small" @click="voucherSee(scope.row)">查看凭证</el-button>
<div class="flex">
<div>
<el-button type="text" size="small" @click="contractSign(scope.row.projectId)" v-if="scope.row.constractOperation==1">合同签署</el-button>
<el-button type="text" size="small" @click="contractSign(scope.row.projectId)" v-else-if="scope.row.constractOperation==2">合同查看</el-button>
<el-button type="text" size="small" v-else disabled>合同查看</el-button>
</div>
<div>
<el-button type="text" size="small" @click="voucherSign(scope.row.projectId)" v-if="scope.row.voucherOperation==1">确认凭证</el-button>
<el-button type="text" size="small" @click="voucherSee(scope.row.projectId)" v-else-if="scope.row.voucherOperation==2">查看凭证</el-button>
<el-button type="text" size="small" v-else disabled>查看凭证</el-button>
</div>
</div>
</template>
</el-table-column>
......@@ -85,17 +84,17 @@
this.sendData.tenderCompanyId = localStorage.getItem("companyId")
},
methods: {
contractSign() {
this.$router.push('/purchaser/buyOut/contractSign')
contractSign(id) {
this.$router.push(`/purchaser/buyOut/contractSign?id=${id}`)
},
contractSee() {
this.$router.push('/purchaser/buyOut/contractSee')
contractSee(id) {
this.$router.push(`/purchaser/buyOut/contractSee?id=${id}`)
},
voucherSee() {
this.$router.push('/purchaser/buyOut/voucherSee')
voucherSee(id) {
this.$router.push(`/purchaser/buyOut/voucherSee?id=${id}`)
},
voucherSign() {
this.$router.push('/purchaser/buyOut/voucherSign')
voucherSign(id) {
this.$router.push(`/purchaser/buyOut/voucherSign?id=${id}`)
},
async getDropList() {
const {
......
src/pages/purchaser/buyOut/contractSee.vue
View file @ a01523fa
......@@ -36,16 +36,18 @@ export default {
data() {
return {
projectId:4,
breads: ['应收账款买断管理', '应收账款买断列表']
breads: ['应收账款买断管理', '应收账款买断列表'],
id:""
}
},
created() {
this.contract();
this.id=this.$route.query.id
},
methods: {
async contract() {
try {
let projectId=localStorage.getItem("projectId");
let projectId=this.id;
const {
data,
code
......
src/pages/purchaser/buyOut/contractSign.vue
View file @ a01523fa
......@@ -43,10 +43,12 @@
data() {
return {
breads: ['应收账款买断管理', '应收账款买断列表'],
detail:""
detail:"",
id:""
}
},
created() {
this.id=this.$route.query.id
this.getcontract()
},
methods: {
......@@ -68,7 +70,7 @@
},
// 查看详情
async getcontract(){
let projectId=localStorage.getItem("projectId")
let projectId=this.id
const {
data,
code
......@@ -80,7 +82,7 @@
// 提出
async submitData() {
try {
let projectId = localStorage.getItem("projectId")
let projectId = this.id
const {
msg,
code
......@@ -95,6 +97,8 @@
this.$router.go(-1)
}, 1500)
}else{
this.$message.error(msg)
}
} catch (e) {
console.log(e)
......
src/pages/purchaser/buyOut/voucherSee.vue
View file @ a01523fa
......@@ -32,6 +32,9 @@
</template>
<script>
import {
evidenceDetail
} from '@api/purchaser/buyOut'
import dataBreadcrumb from '@components/dataBreadcrumb.vue'
export default {
components: {
......@@ -44,15 +47,35 @@ export default {
srcList: [
'https://fuss10.elemecdn.com/8/27/f01c15bb73e1ef3793e64e6b7bbccjpeg.jpeg',
'https://fuss10.elemecdn.com/1/8e/aeffeb4de74e2fde4bd74fc7b4486jpeg.jpeg'
]
],
id:""
}
},
methods: {
back() {
this.$router.go(-1)
}
},
// 查看详情
async getevidenceDetail() {
let message={}
message.projectId = this.id
message.companyId =localStorage.getItem("companyId")
const {
data,
code,
msg
} = await evidenceDetail(message)
if (code == 200) {
this.detail = data
}else{
this.$message.error(msg)
}
},
},
created(){
this.id=this.$route.query.id
this.getevidenceDetail()
}
}
</script>
......
src/pages/purchaser/buyOut/voucherSign.vue
View file @ a01523fa
......@@ -27,7 +27,7 @@
</div>
<div class="backButton">
<el-button @click="back">返回</el-button>
<el-button @click="sure">确认</el-button>
<el-button @click="submitData()">确认</el-button>
</div>
</div>
</div>
......@@ -35,7 +35,7 @@
<script>
import {
signContract,
confirmvoucher,
evidenceDetail
} from '@api/purchaser/buyOut'
import dataBreadcrumb from '@components/dataBreadcrumb.vue'
......@@ -52,7 +52,9 @@
srcList: [
'https://fuss10.elemecdn.com/8/27/f01c15bb73e1ef3793e64e6b7bbccjpeg.jpeg',
'https://fuss10.elemecdn.com/1/8e/aeffeb4de74e2fde4bd74fc7b4486jpeg.jpeg'
]
],
id:"",
detail:""
}
},
created() {
......@@ -61,23 +63,50 @@
methods: {
back() {
this.$router.go(-1)
},
sure() {
},
// 查看详情
async getevidenceDetail() {
let projectId = localStorage.getItem("projectId")
let message={}
message.projectId = this.id
message.companyId =localStorage.getItem("companyId")
const {
data,
code
} = await evidenceDetail(projectId)
} = await evidenceDetail(message)
if (code == 200) {
this.detail = data
}
},
// 提出
async submitData() {
try {
let projectId = this.id
const {
msg,
code
} = await confirmvoucher(projectId)
if (code == 200) {
this.$message({
message: msg,
type: 'success',
duration: 1500
})
setTimeout(() => {
this.$router.go(-1)
}, 1500)
}else{
this.$message.error(msg)
}
} catch (e) {
console.log(e)
}
},
},
created() {
this.id=this.$route.query.id
this.getevidenceDetail();
}
}
</script>
......
src/pages/supply/bid/joinProject/bidOpen/bidOpenhal.vue
View file @ a01523fa
......@@ -95,6 +95,9 @@
import {
signdetail
} from '@api/purchaser/bid'
import {
openUrl
} from '@utils/common'
import {
openBidsign,
opentimeInfo,
......@@ -159,7 +162,7 @@
}
], //
nopagecolumns: [{
label: '投标人名称',
label: '投标公司',
prop: 'companyName'
},
{
......@@ -265,8 +268,7 @@
createWebSocket() {
let token = localStorage.getItem("token")
let projectId = localStorage.getItem("projectId")
// this.websocket = new WebSocket('ws://192.168.3.35:8085/webSocket/' + projectId + "/" + token)
this.websocket = new WebSocket('ws://60.205.251.80:8085/webSocket/' + projectId +"/"+token )
this.websocket = new WebSocket(`ws:${openUrl}/webSocket/${projectId}/${token}`)
// 连接成功时
this.websocket.onopen = () => {}
this.websocket.onmessage = event => {
......
src/pages/supply/bid/joinProject/bidStage/clearManagement/propose.vue
View file @ a01523fa
......@@ -74,6 +74,9 @@
methods: {
getfile(val) {
for(let item of val){
item.accessoryUrl=item.fileUrl
}
this.ruleForm.accessoryList = val
},
cancle() {
......
src/utils/common.js
View file @ a01523fa
......@@ -7,11 +7,21 @@
console.log(str)
// 以&分隔字符串，获得类似name=xiaoli这样的元素数组
var arr = str.split("&");
var obj = new Object();
var obj = new Object();
// 将每一个数组元素以=分隔并赋给obj对象
for(var i = 0; i < arr.length; i++) {
var tmp_arr = arr[i].split("=");
obj[decodeURIComponent(tmp_arr[0])] = decodeURIComponent(tmp_arr[1]);
}
return obj[key];
}
\ No newline at end of file
}
// export let requestUrl = 'http://192.168.3.35: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 openUrl = '//192.168.3.35:8085';
export let openUrl = '//60.205.251.80:8085';
src/utils/request.js
View file @ a01523fa
import axios from 'axios'
import { Message, MessageBox } from 'element-ui'
import {requestUrl,homeUrl} from "./common.js"
// import store from '../store'
// import { getToken,get } from '@/utils/auth'
// 创建axios实例
const service = axios.create({
// baseURL: 'http://hsz.free.qydev.com/apis',
baseURL: 'http://60.205.251.80:8082/apis',
// baseURL: 'http://192.168.3.35:8085/apis',
baseURL: `${requestUrl}/apis`,
timeout: 35000 // 请求超时时间
})
......@@ -43,8 +42,7 @@ service.interceptors.response.use(
Message.error("登陆失效,请重新登录!")
localStorage.removeItem('token');
setTimeout(function () {
location.href = 'http://60.205.251.80:8081/login/user/';
// location.href = 'http://localhost:3000/login/user/';
location.href = `${homeUrl}/login/user/`;
}, 2000);
}
}
......
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