Skip to content

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

更新

parent faf4b7c8
Show whitespace changes
Inline Side-by-side
Showing with 79 additions and 108 deletions
src/pages/purchaser/buyOut/buyoutList.vue
View file @ 720690bb
......@@ -93,9 +93,9 @@
}
})
},
contractSee(id) {
contractSee(row) {
this.$router.push({
name:"/purchaser/buyOut/contractSign",
name:"/purchaser/buyOut/contractSee",
params:{
id:row.projectId,
url:row.contractUrl
......
src/pages/purchaser/buyOut/contractSee.vue
View file @ 720690bb
......@@ -6,76 +6,61 @@
<h5>查看合同</h5>
</div>
<div class="content">
<div class="flex">
<div>下载合同：</div>
<ul>
<li class="flex">
<div>合同名字.pdf</div>
<el-button size="mini">下载</el-button>
</li>
</ul>
</div>
<div class="contractContent flex-center">
<h1>合同内容</h1>
</div>
</div>
<div class="bottomButton">
<el-button @click="back">返回</el-button>
<iframe :src="url" frameborder="0" style="width: 100%; height: 600px"></iframe>
</div>
</div>
</template>
<script>
import {contract} from '@api/purchaser/buyOut'
import dataBreadcrumb from '@components/dataBreadcrumb.vue'
import { contract } from '@api/purchaser/buyOut';
import dataBreadcrumb from '@components/dataBreadcrumb.vue';
export default {
components: {
dataBreadcrumb
},
data() {
return {
projectId:4,
projectId: 4,
breads: ['应收账款买断管理', '应收账款买断列表'],
id:""
}
id: '',
url: ''
};
},
created() {
this.contract();
this.id=this.$route.query.id
this.id = this.$route.params.id;
this.url = this.$route.params.url;
},
methods: {
async contract() {
try {
let projectId=this.id;
const {
data,
code
} = await contract(projectId)
if (code === 200) {
this.tableData = data
}
} catch (e) {
console.log(e)
}
}
// async contract() {
// try {
// let projectId=this.id;
// const {
// data,
// code
// } = await contract(projectId)
// if (code === 200) {
// this.tableData = data
// }
// } catch (e) {
// console.log(e)
// }
// }
}
}
};
</script>
<style scoped>
.contractContent{
.contractContent {
width: 100%;
height: 500px;
border:1px solid #000000;
border: 1px solid #000000;
margin-top: 30px;
}
.button{
}
.button {
margin-top: 30px;
height: 50px;
width: 100%;
}
ul>li>div{
}
ul > li > div {
margin-right: 10px;
}
}
</style>
src/pages/supply/buyOut/buyoutList.vue
View file @ 720690bb
......@@ -19,8 +19,8 @@
<template slot-scope="scope">
<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" @click="contractSign(scope.row)" v-if="scope.row.constractOperation==1">合同签署</el-button>
<el-button type="text" size="small" @click="contractSign(scope.row)" v-else-if="scope.row.constractOperation==2">合同查看</el-button>
<el-button type="text" size="small" v-else disabled>合同查看</el-button>
</div>
<div>
......@@ -84,11 +84,23 @@
this.sendData.bidCompanyId = localStorage.getItem("companyId")
},
methods: {
contractSign(id) {
this.$router.push(`/purchaser/buyOut/contractSign?id=${id}`)
contractSign(row) {
this.$router.push({
name:"/supply/buyOut/contractSign",
params:{
id:row.projectId,
url:row.bidderIframeUrl
}
})
},
contractSee(id) {
this.$router.push(`/purchaser/buyOut/contractSee?id=${id}`)
contractSee(row) {
this.$router.push({
name:"/supply/buyOut/contractSee",
params:{
id:row.projectId,
url:row.contractUrl
}
})
},
voucherSee(id) {
this.$router.push(`/purchaser/buyOut/voucherSee?id=${id}`)
......
src/pages/supply/buyOut/contractSee.vue
View file @ 720690bb
......@@ -6,76 +6,45 @@
<h5>查看合同</h5>
</div>
<div class="content">
<div class="flex">
<div>下载合同：</div>
<ul>
<li class="flex">
<div>合同名字.pdf</div>
<el-button size="mini">下载</el-button>
</li>
</ul>
</div>
<div class="contractContent flex-center">
<h1>合同内容</h1>
</div>
</div>
<div class="bottomButton">
<el-button @click="back">返回</el-button>
<iframe :src="url" frameborder="0" style="width: 100%; height: 600px"></iframe>
</div>
</div>
</template>
<script>
import {contract} from '@api/purchaser/buyOut'
import dataBreadcrumb from '@components/dataBreadcrumb.vue'
import dataBreadcrumb from '@components/dataBreadcrumb.vue';
export default {
components: {
dataBreadcrumb
},
data() {
return {
projectId:4,
projectId: 4,
breads: ['应收账款买断管理', '应收账款买断列表'],
id:""
}
id: '',
url:""
};
},
created() {
this.contract();
this.id=this.$route.query.id
this.id = this.$route.params.id;
this.url = this.$route.params.url;
},
methods: {
async contract() {
try {
let projectId=this.id;
const {
data,
code
} = await contract(projectId)
if (code === 200) {
this.tableData = data
}
} catch (e) {
console.log(e)
}
}
}
}
methods: {}
};
</script>
<style scoped>
.contractContent{
.contractContent {
width: 100%;
height: 500px;
border:1px solid #000000;
border: 1px solid #000000;
margin-top: 30px;
}
.button{
}
.button {
margin-top: 30px;
height: 50px;
width: 100%;
}
ul>li>div{
}
ul > li > div {
margin-right: 10px;
}
}
</style>
src/pages/supply/buyOut/contractSign.vue
View file @ 720690bb
......@@ -6,7 +6,8 @@
<h5>签署合同</h5>
</div>
<div class="content">
<div class="flex">
<iframe :src="url" frameborder="0" style="width:100%;height:600px"></iframe>
<!-- <div class="flex">
<div>下载合同：</div>
<ul>
<li class="flex-item">
......@@ -21,12 +22,12 @@
<div class="button flex-center">
<el-button @click="revoke">撤销签章</el-button>
<el-button>电子签章</el-button>
</div> -->
</div>
</div>
<div class="bottomButton">
<!-- <div class="bottomButton">
<el-button @click="back">取消</el-button>
<el-button type="primary" @click="submitData">提交</el-button>
</div>
</div> -->
</div>
</template>
......@@ -42,6 +43,7 @@
},
data() {
return {
url:"",
breads: ['应收账款买断管理', '应收账款买断列表'],
detail:"",
id:""
......
src/router/index.js
View file @ 720690bb
......@@ -520,16 +520,19 @@ export default new Router({
},
{
path: '/purchaser/buyOut/contractSee',
name:"/purchaser/buyOut/contractSee",
show: true,
component: () => import('../pages/purchaser/buyOut/contractSee.vue')
},
{
path: '/purchaser/buyOut/voucherSee',
name:"/purchaser/buyOut/voucherSee",
show: true,
component: () => import('../pages/purchaser/buyOut/voucherSee.vue')
},
{
path: '/purchaser/buyOut/voucherSign',
name:"/purchaser/buyOut/voucherSign",
show: true,
component: () => import('../pages/purchaser/buyOut/voucherSign.vue')
},
......
src/utils/common.js
View file @ 720690bb
......@@ -15,8 +15,8 @@
}
return obj[key];
}
export let requestUrl = 'http://192.168.3.35:8085';
// export let requestUrl = 'http://60.205.251.80:8082';
// export let requestUrl = 'http://192.168.3.35:8085';
export let requestUrl = 'http://60.205.251.80:8082';
// export let homeUrl = 'http://localhost:3000';
......
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