Commit 720690bb authored by 张冬's avatar 张冬

更新

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