no message

src/views/mallManagement/tenancyManagement/tenancyOrder/detail.vue

@@ -194,7 +194,7 @@
 							</template>
 						</el-table-column>
 						<el-table-column prop="depositPrice" align="center" label="订金"></el-table-column>
-						<el-table-column prop="leaseAmount" align="center" label="租价"></el-table-column>
+						<el-table-column prop="leasePrice" align="center" label="租价"></el-table-column>
 						<el-table-column prop="qty" align="center" label="数量"></el-table-column>
 						<el-table-column prop="startDate" align="center" label="*起租日期">
 							<template slot-scope="scope">
@@ -246,7 +246,7 @@
 				</el-form>
 			</div>
 		</el-card>
-		<el-card class="box-card" v-if="formData.records.length > 0">
+		<el-card class="box-card" v-if="formType != 0">
 			<div slot="header" class="clearfix">
 				<span>租赁记录</span>
 			</div>
@@ -613,7 +613,7 @@
 					pageSize: -1
 				}).then(res => {
 					if(res.code == 200){
-						res.data.forEach(item=>{
+						res.data.records.forEach(item=>{
 							if(item.orderType == 'REPAIR'){
 								this.typeId = item.id
 							}

src/views/mallManagement/tenancyManagement/tenancyOrder/index.vue

@@ -5,8 +5,8 @@
 				<el-form ref="screenForm" :model="screenForm" label-width="70px" size="small" label-position="left">
 					<el-row :gutter="20">
 						<el-col :xs="24" :sm="12" :lg="6">
-							<el-form-item label="订单号" prop="orderId">
-								<el-input v-model="screenForm.orderId" placeholder="请输入订单号"></el-input>
+							<el-form-item label="订单号" prop="id">
+								<el-input v-model="screenForm.id" placeholder="请输入订单号"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :xs="24" :sm="12" :lg="6">
@@ -15,13 +15,13 @@
 							</el-form-item>
 						</el-col>
 						<el-col :xs="24" :sm="12" :lg="6">
-							<el-form-item label="会员昵称" prop="memberName">
-								<el-input v-model="screenForm.memberName" placeholder="请输入会员昵称"></el-input>
+							<el-form-item label="会员昵称" prop="userName">
+								<el-input v-model="screenForm.userName" placeholder="请输入会员昵称"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :xs="24" :sm="12" :lg="6">
-							<el-form-item label="手机号" prop="phone">
-								<el-input v-model="screenForm.phone" placeholder="请输入手机号"></el-input>
+							<el-form-item label="手机号" prop="userMobile">
+								<el-input v-model="screenForm.userMobile" placeholder="请输入手机号"></el-input>
 							</el-form-item>
 						</el-col>
 
@@ -64,7 +64,7 @@
 					<el-tab-pane label="已到期-已回收" name="RECOVER"></el-tab-pane>
 					<el-tab-pane label="已取消" name="CANCEL"></el-tab-pane>
 				</el-tabs>
-				<el-button @click="isShowDetail = true;formType = 0">新增租赁单</el-button>
+				<el-button type="primary" @click="isShowDetail = true;formType = 0">新增租赁单</el-button>
 			</div>
 			<div class="order-main-container">
 				<div class="table-top">
@@ -86,9 +86,8 @@
 						<span><b>下单时间</b>：{{ order.createTime }}</span>
 						<span><b>起租时间</b>：{{ order.startDate }}</span>
 						<span><b>结束时间</b>：{{ order.endDate }}</span>
+						<el-tag effect="dark" :type="order.payType=='LINE'?'':'success'">{{order.payType=="LINE"?'线下支付':'微信支付'}}</el-tag>
 						<div class="fr">
-							<el-link type="primary" v-if="$restrict('orderNote')" :underline="false"
-								@click="showRemark(order)">订单备注</el-link>
 							<el-link type="primary" v-if="$restrict('detail')" :underline="false"
 								 @click="confirmOrder(order.id)">查看详情</el-link>
 							<!-- <el-link type="primary" :underline="false" @click="queryWorkOrder(order.orderId)">订单工单</el-link> -->
@@ -186,10 +185,10 @@
 		data() {
 			return {
 				screenForm: { // 筛选表单数据
-					orderId: '', // 订单号
+					id: '', // 订单号
 					goodsName: '', // 商品名称
-					memberName: '', // 会员昵称
-					phone: '', // 手机号
+					userName: '', // 会员昵称
+					userMobile: '', // 手机号
 					status: '', // 状态
 					createDate: '', // 创建时间
 					payDate: '', // 支付时间
@@ -237,6 +236,11 @@
 							name: '已回收',
 							color: '#817f7f'
 						} [type]
+					} else if (item.status == 'CANCEL') {
+						return {
+							name: '已取消',
+							color: '#817f7f'
+						} [type]
 					}
 				}
 			}
@@ -248,9 +252,10 @@
 			backList() {
 				this.id = ''
 				this.isShowDetail = false;
-				this.$refs?.pageRef?.refreshList()
+				this.resetScreenForm()
 			},
 			changeTabs(tab, event) {
+				this.screenForm.status = tab.$options.propsData.name
 				this.getList();
 			},
 			// 获取数据列表
@@ -258,25 +263,23 @@
 				// this.listLoading = true;
 
 				let params = {
-					orderId: this.screenForm.orderId, // 订单号
-					productName: this.screenForm.goodsName, // 商品名称
-					userName: this.screenForm.memberName, // 会员昵称
-					phone: this.screenForm.phone, // 手机号
-					orderStatus: this.screenForm.orderStatus, // 状态
-					startCreateTime: this.screenForm.createDate[0] ? this.screenForm.createDate[0] : null, // 创建时间
-					endCreateTime: this.screenForm.createDate[1] ? this.screenForm.createDate[1] : null, // 创建时间
-					startPayTime: this.screenForm.payDate[0] ? this.screenForm.payDate[0] : null, // 支付时间
-					endPayTime: this.screenForm.payDate[1] ? this.screenForm.payDate[1] : null, // 支付时间
-					isNegative: this.screenForm.evaluateStatus, // 评价状态
-					abnormalDispatch: this.screenForm.sendStatus, // 派单异常
-					workerOrderNo: this.screenForm.workerOrderNo, // 信息编号
+					id: this.screenForm.id, // 订单号
+					goodsName: this.screenForm.goodsName, // 商品名称
+					userName: this.screenForm.userName, // 会员昵称
+					userMobile: this.screenForm.userMobile, // 手机号
+					status: this.screenForm.status?this.screenForm.status:'', // 状态
+					startDate: this.screenForm.createDate[0] ? this.screenForm.createDate[0] : null, // 创建时间
+					endDate: this.screenForm.createDate[1] ? this.screenForm.createDate[1] : null, // 创建时间
+					startPayDate: this.screenForm.payDate[0] ? this.screenForm.payDate[0] : null, // 支付时间
+					endPayDate: this.screenForm.payDate[1] ? this.screenForm.payDate[1] : null, // 支付时间
 					pageNum: this.currentPage,
 					pageSize: this.pageSize
 				};
 
 				getList(params).then(res => {
 					res.data.records.forEach(item => {
-						item.selected = false;
+						item.startDate = item.startDate?.substring(0,10)
+						item.endDate = item.endDate?.substring(0,10)
 						// item.websitName = this.handleText(item.websitName);
 					});
 					this.dataList = res.data.records;