用户水费充值 生成订单

@@ -30,31 +30,25 @@
                 style="width: 100%">
             <el-table-column prop="ordernumber" label="订单号" width="180">
             </el-table-column>
-            <el-table-column
-                    prop="payuserid"
-                    label="用户编号"
-                    width="100">
+
+            <el-table-column prop="payuserid" label="用户编号" width="100">
             </el-table-column>
-            <el-table-column
-                    prop="payusername"
-                    label="用户名称"
-                    width="90">
+
+            <el-table-column prop="payusername" label="缴费用户" width="100">
             </el-table-column>
-            <el-table-column
-                    prop="paylocationname"
-                    label="房间号码"
-                    width="100">
+
+            <el-table-column prop="paylocationname" label="房间号码" width="150">
             </el-table-column>
-            <el-table-column
-                    prop="paytime"
-                    label="充值日期"
-                    width="160">
+
+            <el-table-column prop="paytypeaddress" label="房间号码" width="200">
             </el-table-column>
-            <el-table-column
-                    prop="payfees"
-                    label="充值金额"
-                    width="100">
+
+            <el-table-column prop="paytime" label="充值日期" width="160">
+            </el-table-column>
+
+            <el-table-column prop="payfees" label="充值金额" width="100">
             </el-table-column>
+
             <el-table-column prop="paytype" label="充值类型" width="100">
                 <template slot-scope="scope">
                     <div v-if="scope.row.paytype === false" style="color:#20a0ff">水</div>
@@ -62,12 +56,6 @@
                 </template>
             </el-table-column>
 
-            <el-table-column prop="payfesstype" label="支付方式" width="100">
-                <template slot-scope="scope">
-                    <div v-if="scope.row.payfesstype === false" style="color:#42d885">微信</div>
-                    <div v-else="scope.row.payfesstype === true" style="color: #20a0ff">支付宝</div>
-                </template>
-            </el-table-column>
             <el-table-column prop="paystatus" label="支付状态" width="100">
                 <template slot-scope="scope">
                     <div v-if="scope.row.payfesstype === false" style="color:#ff4d51">未完成</div>
@@ -76,10 +64,9 @@
             </el-table-column>
             <el-table-column
                     fixed="right"
-                    label="操作"
-                    >
+                    label="操作">
                 <template slot-scope="scope"  align="center" class-name="small-padding fixed-width" >
-                    <el-button @click="Pay(scope.row)" type="primary" size="mini">去完成</el-button>
+                    <!--<el-button @click="Pay(scope.row)" type="primary" size="mini">去完成</el-button>-->
                     <el-button type="primary" @click="payDelete(scope.$index,scope.row)" size="small">移除订单</el-button>
                 </template>
             </el-table-column>

@@ -43,6 +43,7 @@
                         </el-col>
                     </el-form>
 
+
                     <el-form :model="waterForm" :rules="rules"   ref="waterForm"  label-width="180px" :label-position="labelPosition">
                         <input type="hidden" v-model="waterForm.wmId" />
                         <el-col :span="24">
@@ -87,7 +88,6 @@
     import loginUserInfo from '@/api/base'
     import {getList, add} from '../../api/empt/userPayOrder';
     import ElCol from "element-ui/packages/col/src/col";
-
     export default {
         components: {ElCol},
         data() {
@@ -106,7 +106,9 @@
                     payTime:'',
                     subtraction:'',
                     wmId:'',
-                    payFees:''
+                    payFees:'',
+                    realName:'',
+                    userId:''
                 },
                 rules:{
                     payType: [
@@ -144,6 +146,8 @@
                             } else {
                                 this.waterForm = resData[i];
                                 this.waterForm.payTime = new Date();
+                                this.waterForm.realName = JSON.parse(sessionStorage.getItem('user')).realname;
+                                this.waterForm.userId = JSON.parse(sessionStorage.getItem('user')).userId;
                             }
                         }
                     } else {
@@ -182,8 +186,6 @@
                         this.$confirm('确认充值吗？', '提示', {}).then(() => {
                             let para = Object.assign({}, this.waterForm);
                             add(para).then((res) => {
-                                console.log(res.data.code)
-                                console.log(res)
                                 this.addLoading = false;
                                 if (res.data.code == 200) {
                                     this.$message({