应收账款

src/pages/purchaser/bid/bidOpen/bidOpenhal.vue

@@ -48,7 +48,7 @@
 					</div>
 					<!-- 在线对话 -->
 					<div class="dialogue" style="margin-top: 30px;" v-show="dialogue">
-						<JwChat :taleList="dialogueList" scrollType @enter="bindEnter" v-model="content" :toolConfig="tool" >
+						<JwChat :taleList="dialogueList" scrollType="scroll" @enter="bindEnter" v-model="content" :toolConfig="tool" >
 						</JwChat>
 					</div>
 					<!-- 

src/pages/purchaser/buyOut/buyoutList.vue

@@ -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="contractSee(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.tenderCompanyId = localStorage.getItem("companyId")
 		},
 		methods: {
-			contractSign(id) {
-				this.$router.push(`/purchaser/buyOut/contractSign?id=${id}`)
+			contractSign(row) {
+				this.$router.push({
+					name:"/purchaser/buyOut/contractSign",
+					params:{
+						id:row.projectId,
+						url:row.tenderIframeUrl
+					}
+				})
 			},
 			contractSee(id) {
-				this.$router.push(`/purchaser/buyOut/contractSee?id=${id}`)
+					this.$router.push({
+					name:"/purchaser/buyOut/contractSign",
+					params:{
+						id:row.projectId,
+						url:row.contractUrl
+					}
+				})
 			},
 			voucherSee(id) {
 				this.$router.push(`/purchaser/buyOut/voucherSee?id=${id}`)

src/pages/purchaser/buyOut/contractSign.vue

@@ -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,13 +43,15 @@
 		},
 		data() {
 			return {
+				url:"",
 				breads: ['应收账款买断管理', '应收账款买断列表'],
 				detail:"",
 				id:""
 			}
 		},
 		created() {
-			this.id=this.$route.query.id
+			this.id=this.$route.params.id
+			this.url=this.$route.params.url
 			this.getcontract()
 		},
 		methods: {

src/pages/supply/bid/joinProject/bidOpen/bidOpenhal.vue

@@ -44,7 +44,7 @@
 					</div>
 					<!-- 在线对话 -->
 					<div class="dialogue" style="margin-top: 30px;" v-show="dialogue">
-						<JwChat :taleList="dialogueList" scrollType @enter="bindEnter" v-model="content" :toolConfig="tool" >
+						<JwChat :taleList="dialogueList" scrollType="scroll" @enter="bindEnter" v-model="content" :toolConfig="tool" >
 						</JwChat>
 					</div>
 					<!-- <div class="dialogue" style="margin-top: 30px;" v-show="dialogue">

src/pages/supply/bid/signupOnline/seePrice.vue

@@ -9,7 +9,7 @@
 				</div>
 				<div class="centerButton">
 					<el-button type="primary" @click="dialogFormVisible = true">我要报价</el-button>
-					<el-button type="primary" @click="see">查看报价供应商情况</el-button>
+					<el-button type="primary" @click="see">查看其它供应商报价</el-button>
 				</div>
 			</slot>
 		</priceDetail>
@@ -28,8 +28,8 @@
 			</div>
 		</el-dialog>
 		<!-- 报价供应商情况 -->
-		<el-dialog :visible.sync="offerBidder" title="报价供应商情况">
-			<dataTable :table-data="offerBidderlist" :columns="查看其它供应商报价" :is-index="true">
+		<el-dialog :visible.sync="offerBidder" title="查看其它供应商报价">
+			<dataTable :table-data="offerBidderlist" :columns="offerBiddercolumns" :is-index="true">
 			</dataTable>
 			<div slot="footer" class="dialog-footer">
 				<el-button @click="offerBidder = false">取 消</el-button>

src/pages/supply/buyOut/buyoutList.vue

@@ -81,7 +81,7 @@
 		},
 		created() {
 			this.getDropList();
-			this.sendData.tenderCompanyId = localStorage.getItem("companyId")
+			this.sendData.bidCompanyId = localStorage.getItem("companyId")
 		},
 		methods: {
 			contractSign(id) {

src/pages/supply/organization/jurisdictionSee.vue

@@ -130,7 +130,7 @@ export default {
                         }, 1500);
                     } else {
                         this.$message.error(msg);
-                    }
+                    }	
                 }
             } catch (e) {
                 console.log(e);

src/router/index.js

@@ -514,6 +514,7 @@ export default new Router({
                },
                {
                  path: '/purchaser/buyOut/contractSign',
+                 name:"/purchaser/buyOut/contractSign",
                  show: true,
                  component: () => import('../pages/purchaser/buyOut/contractSign.vue')
                },