fix

virgo.wzfrontend/console/src/components/common/listFilter.vue

@@ -60,6 +60,10 @@
 					</el-select>
 				</el-input>
 			</div>
+			<div class="filter-item">
+				<select-house ref="selectHouse" @change="changeHouse">
+				</select-house>
+			</div>
 		</div>
 		<div class="filter-box" v-if="type === 'order'">
 			<div class="filter-item">
@@ -100,6 +104,7 @@
 </template>
 
 <script>
+	import selectHouse from '@/components/common/selectHouse';
 	export default {
 		props: ['type'],
 		data() {
@@ -126,7 +131,8 @@
 				contract: {
 					code: '',
 					value: '',
-					select: '1'
+					select: '1',
+					projectItemTargetRoomIds: ''
 				},
 				contractData: {},
 				order: {
@@ -169,8 +175,14 @@
 					if (data[key]) obj[key] = data[key]
 				}
 				return obj;
+			},
+			changeHouse(data) {
+				this.contract['projectItemTargetRoomIds'] = data.map(node => node.roomId).join(',');
 			}
 		},
+		components: {
+			selectHouse
+		}
 	}
 </script>
 
@@ -201,6 +213,10 @@
 			.el-input__suffix {
 				right: 0;
 			}
+
+			.el-input--suffix .el-input__inner {
+				padding-right: 20px;
+			}
 		}
 
 		.el-input-group__append .el-select,

virgo.wzfrontend/console/src/components/common/selectHouse.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="select-house">
 		<el-cascader ref="cascader" v-model="selectValue" :options="options" :props="props" collapse-tags clearable
-			@change="change">
+			@change="change" placeholder="请选择房源">
 		</el-cascader>
 	</div>
 </template>
@@ -100,5 +100,10 @@
 	}
 </script>
 
-<style>
+<style lang="scss">
+	.select-house {
+		.el-input__inner {
+			height: 32px !important;
+		}
+	}
 </style>

virgo.wzfrontend/console/src/components/work/bill/common/invoiceForm.vue

@@ -21,6 +21,9 @@
 				<el-form-item label="货物名称" prop="cargoName" :rules="[{required: true, message: '请输入货物名称'}]">
 					<el-input type="text" v-model="form.cargoName" placeholder="请输入货物名称"></el-input>
 				</el-form-item>
+				<el-form-item label="发票金额" prop="invoiceAmount" :rules="[{required: true, message: '请输入发票金额'}]">
+					<el-input type="text" v-model="form.invoiceAmount" placeholder="请输入发票金额"></el-input>
+				</el-form-item>
 				<el-form-item label="开票日期" prop="date" :rules="[{required: true, message: '请输入开票日期'}]">
 					<el-date-picker v-model="form.date" value-format="yyyy-MM-dd" type="date" placeholder="请选择开票日期">
 					</el-date-picker>
@@ -59,7 +62,8 @@
 					number: '',
 					date: '',
 					cargoName: '',
-					data: '{}'
+					data: '{}',
+					invoiceAmount: ''
 				},
 				responsibility: [],
 				loading: false
@@ -69,7 +73,6 @@
 			this.form['organizationId'] = this.$store.getters.organization.id;
 			this.form[this.type + 'Id'] = this.itemId;
 			if (this.type === 'payment') {
-				this.form['cargoName'] = '房租';
 				this.form['type'] = 1;
 			} else {
 				this.form['type'] = 2;

virgo.wzfrontend/console/src/views/work/bill/contract/payment.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="hui-flex hui-content">
-		<div class="hui-flex">
+		<div class="hui-flex" v-if="type === 'list'">
 			<div class="hui-content-title">
 				<div class="hui-title-item active">收款账单</div>
 			</div>
@@ -52,12 +52,15 @@
 								</div>
 							</template>
 						</el-table-column>
-						<el-table-column label="操作" width="80">
+						<el-table-column label="操作" width="120">
 							<template slot-scope="scope">
 								<div class="hui-table-operation">
 									<span class="table-operation" @click="detailItem(scope.row)">
 										详情
 									</span>
+									<span class="table-operation" @click="detailContract(scope.row)">
+										查看合同
+									</span>
 								</div>
 							</template>
 						</el-table-column>
@@ -73,6 +76,12 @@
 				</div>
 			</div>
 		</div>
+		<div class="hui-flex" v-else>
+			<div class="hui-nav">
+				<el-page-header @back="type = 'list'" content="合同详情"></el-page-header>
+			</div>
+			<contract-detail class="hui-flex-box" :detailId="contractId"></contract-detail>
+		</div>
 		<el-drawer title="账单详情" :visible.sync="drawer" :size="400" :append-to-body="true">
 			<detail v-if="drawer" :detailId="detailId" @reload="init" :showType="1"></detail>
 		</el-drawer>
@@ -82,6 +91,7 @@
 <script>
 	import detail from '@/components/work/bill/contract/detail'
 	import listFilter from '@/components/common/listFilter'
+	import contractDetail from '@/components/work/contract/list/detail'
 	import {
 		getPaymentListByPage
 	} from '@/httpApi/contract'
@@ -95,6 +105,8 @@
 				detailId: '',
 				filterOption: {},
 				drawer: false,
+				contractId: '',
+				type: 'list'
 			}
 		},
 		created() {
@@ -129,13 +141,14 @@
 				this.detailId = item.id;
 				this.drawer = true;
 			},
-			callback(type) {
-				if (type === 'init') this.init();
-				this.type = 'list';
+			detailContract(item) {
+				this.contractId = item.contractId;
+				this.type = 'look';
 			}
 		},
 		components: {
 			detail,
+			contractDetail,
 			listFilter
 		},
 	}

virgo.wzfrontend/console/src/views/work/invoice/contract/payment.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="hui-flex hui-content">
-		<div class="hui-flex">
+		<div class="hui-flex" v-if="type === 'list'">
 			<div class="hui-content-title">
 				<div class="hui-title-item active">收款发票列表</div>
 			</div>
@@ -21,10 +21,14 @@
 							</template>
 						</el-table-column>
 						<el-table-column label="发票号码" prop="number"></el-table-column>
-						<el-table-column label="发票金额" prop="name"></el-table-column>
+						<el-table-column label="发票金额" prop="invoiceAmount"></el-table-column>
 						<el-table-column label="货物名称" prop="cargoName"></el-table-column>
-						<el-table-column label="采购方" prop="name"></el-table-column>
-						<el-table-column label="销售方" prop="name"></el-table-column>
+						<el-table-column label="采购方" prop="name">
+							<template slot-scope="scope">
+								<span>{{scope.row.payMerchantName || scope.row.payClientName}}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="销售方" prop="organizationName"></el-table-column>
 						<el-table-column label="状态" width="80">
 							<template slot-scope="scope">
 								<div class="hui-table-tag">
@@ -33,12 +37,15 @@
 								</div>
 							</template>
 						</el-table-column>
-						<el-table-column label="操作" width="80">
+						<el-table-column label="操作" width="120">
 							<template slot-scope="scope">
 								<div class="hui-table-operation">
 									<span class="table-operation" @click="detailItem(scope.row)">
 										详情
 									</span>
+									<span class="table-operation" @click="detailContract(scope.row)">
+										查看合同
+									</span>
 								</div>
 							</template>
 						</el-table-column>
@@ -54,6 +61,12 @@
 				</div>
 			</div>
 		</div>
+		<div class="hui-flex" v-else>
+			<div class="hui-nav">
+				<el-page-header @back="type = 'list'" content="合同详情"></el-page-header>
+			</div>
+			<contract-detail class="hui-flex-box" :detailId="contractId"></contract-detail>
+		</div>
 		<el-drawer title="发票详情" :visible.sync="drawer" :size="400" :append-to-body="true">
 			<detail v-if="drawer" :detailId="detailId" @reload="init"></detail>
 		</el-drawer>
@@ -63,6 +76,7 @@
 <script>
 	import detail from '@/components/work/invoice/detail'
 	import listFilter from '@/components/common/listFilter'
+	import contractDetail from '@/components/work/contract/list/detail'
 	import {
 		getInvoiceListByPage
 	} from '@/httpApi/invoice'
@@ -76,6 +90,8 @@
 				detailId: '',
 				filterOption: {},
 				drawer: false,
+				contractId: '',
+				type: 'list'
 			}
 		},
 		created() {
@@ -111,14 +127,15 @@
 				this.detailId = item.id;
 				this.drawer = true;
 			},
-			callback(type) {
-				if (type === 'init') this.init();
-				this.type = 'list';
+			detailContract(item) {
+				this.contractId = item.payment.contractId;
+				this.type = 'look';
 			}
 		},
 		components: {
 			detail,
-			listFilter
+			listFilter,
+			contractDetail
 		},
 	}
 </script>