sz

src/views/base/electricClientInfo-list.vue

@@ -17,12 +17,6 @@
       <el-form-item label="户号" prop="customerNo">
         <el-input type="text" size="mini" v-model="queryModel.customerNo"></el-input>
       </el-form-item>
-      <el-form-item label="房间号ID" prop="roomId">
-        <el-input type="text" size="mini" v-model="queryModel.roomId"></el-input>
-      </el-form-item>
-      <el-form-item label="电表号ID" prop="meterId">
-        <el-input type="text" size="mini" v-model="queryModel.meterId"></el-input>
-      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -65,17 +59,34 @@
         sort-by="customer_no"
         label="户号"
         sortable="custom"
-        width="180"
+        width="120"
+      ></el-table-column>
+      <el-table-column
+        prop="area.name"
+        label="园区"
+        sortable="custom"
+        width="120"
+      ></el-table-column>
+      <el-table-column
+        prop="building.name"
+        label="楼栋"
+        sortable="custom"
+        width="120"
+      ></el-table-column>
+      <el-table-column
+        prop="room.name"
+        label="房间"
+        sortable="custom"
+        width="120"
       ></el-table-column>
-      <el-table-column prop="roomName" sort-by="room_name" label="房间名称" sortable="custom" width="180"></el-table-column>
       <el-table-column
         prop="meterName"
         sort-by="meter_name"
         label="电表名称"
         sortable="custom"
-        width="180"
+        width="120"
       ></el-table-column>
-      <el-table-column prop="roomUseTypeN" sort-by="use_type" label="用电类型" sortable="custom" width="180"></el-table-column>
+      <el-table-column prop="room.useTypeN" sort-by="use_type" label="用电类型" sortable="custom" width="120"></el-table-column>
       <el-table-column
         prop="electricityRemaining"
         sort-by="electricity_remaining"
@@ -83,13 +94,6 @@
         sortable="custom"
         width="180"
       ></el-table-column>
-      <el-table-column
-        prop="amountRemaining"
-        sort-by="amount_remaining"
-        label="剩余金额(元)"
-        sortable="custom"
-        width="180"
-      ></el-table-column>
       <el-table-column label="操作">
         <template slot-scope="{row}">
           <el-button size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>

src/views/base/rechange-list.vue

@@ -53,42 +53,46 @@
         sort-by="customer_no"
         label="户号"
         sortable="custom"
-        width="180"
+        width="120"
       ></el-table-column>
       <el-table-column
-        prop="roomName"
-        sort-by="room_name"
-        label="房间名称"
+        prop="area.name"
+        label="园区"
         sortable="custom"
-        width="180"
+        width="120"
+      ></el-table-column>
+      <el-table-column
+        prop="building.name"
+        label="楼栋"
+        sortable="custom"
+        width="120"
+      ></el-table-column>
+      <el-table-column
+        prop="room.name"
+        label="房间"
+        sortable="custom"
+        width="120"
       ></el-table-column>
       <el-table-column
         prop="meterName"
         sort-by="meter_name"
         label="电表名称"
         sortable="custom"
-        width="180"
+        width="120"
       ></el-table-column>
       <el-table-column
-        prop="roomUseTypeN"
+        prop="room.useTypeN"
         sort-by="use_type"
         label="用电类型"
         sortable="custom"
-        width="180"
+        width="120"
       ></el-table-column>
       <el-table-column
         prop="electricityRemaining"
         sort-by="electricity_remaining"
         label="剩余电量"
         sortable="custom"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="amountRemaining"
-        sort-by="amount_remaining"
-        label="剩余金额(元)"
-        sortable="custom"
-        width="180"
+        width="120"
       ></el-table-column>
       <el-table-column label="操作">
         <template slot-scope="{row}">

src/views/base/rechargeRecord-list.vue

@@ -6,7 +6,7 @@
         <a href="#">系统管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="/rechargeRecord">rechargeRecord管理</a>
+        <a href="/rechargeRecord">充值流水</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>
@@ -14,36 +14,9 @@
       要resetFields起作用，必须配置:model和prop
     -->
     <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
-      <el-form-item label prop="id">
-        <el-input type="text" size="mini" v-model="queryModel.id"></el-input>
-      </el-form-item>
-      <el-form-item label prop="createBy">
-        <el-input type="text" size="mini" v-model="queryModel.createBy"></el-input>
-      </el-form-item>
-      <el-form-item label prop="createTime">
-        <el-input type="text" size="mini" v-model="queryModel.createTime"></el-input>
-      </el-form-item>
-      <el-form-item label prop="updateBy">
-        <el-input type="text" size="mini" v-model="queryModel.updateBy"></el-input>
-      </el-form-item>
-      <el-form-item label prop="updateTime">
-        <el-input type="text" size="mini" v-model="queryModel.updateTime"></el-input>
-      </el-form-item>
-      <el-form-item label="是否删除" prop="delFlag">
-        <el-input type="text" size="mini" v-model="queryModel.delFlag"></el-input>
-      </el-form-item>
-      <el-form-item label="流水号" prop="serialNumber">
+      <el-form-item label="交易流水号" prop="serialNumber">
         <el-input type="text" size="mini" v-model="queryModel.serialNumber"></el-input>
       </el-form-item>
-      <el-form-item label="充值金额" prop="buyAmount">
-        <el-input type="text" size="mini" v-model="queryModel.buyAmount"></el-input>
-      </el-form-item>
-      <el-form-item label="充值度数" prop="buyElectricity">
-        <el-input type="text" size="mini" v-model="queryModel.buyElectricity"></el-input>
-      </el-form-item>
-      <el-form-item label="支付类型:微信,支付宝,现金等" prop="buyType">
-        <el-input type="text" size="mini" v-model="queryModel.buyType"></el-input>
-      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -80,13 +53,6 @@
       @sort-change="sortChange"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column prop="id" sort-by="id_" label sortable="custom" width="180"></el-table-column>
-      <el-table-column prop="createBy" sort-by="create_by" label sortable="custom" width="180"></el-table-column>
-      <el-table-column prop="createTime" sort-by="create_time" label sortable="custom" width="180"></el-table-column>
-      <el-table-column prop="updateBy" sort-by="update_by" label sortable="custom" width="180"></el-table-column>
-      <el-table-column prop="updateTime" sort-by="update_time" label sortable="custom" width="180"></el-table-column>
-      <el-table-column prop="delFlag" sort-by="del_flag" label="是否删除" sortable="custom" width="180"></el-table-column>
       <el-table-column
         prop="serialNumber"
         sort-by="serial_number"
@@ -94,13 +60,6 @@
         sortable="custom"
         width="180"
       ></el-table-column>
-      <el-table-column
-        prop="buyAmount"
-        sort-by="buy_amount"
-        label="充值金额"
-        sortable="custom"
-        width="180"
-      ></el-table-column>
       <el-table-column
         prop="buyElectricity"
         sort-by="buy_electricity"
@@ -111,7 +70,14 @@
       <el-table-column
         prop="buyType"
         sort-by="buy_type"
-        label="支付类型:微信,支付宝,现金等"
+        label="支付类型"
+        sortable="custom"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="paymentStatus"
+        sort-by="payment_status"
+        label="支付状态"
         sortable="custom"
         width="180"
       ></el-table-column>