From fdc6a874e74b566b85e560f799823053caecb062 Mon Sep 17 00:00:00 2001
From: "BOOL\\25024" <http://192.168.2.2:8099/jsowell/jsowell-uniapp.git>
Date: Sat, 23 Sep 2023 13:14:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A0=E9=9C=80=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-ui/src/views/pile/occupy/index.vue | 59 ++++++++++------------
 1 file changed, 27 insertions(+), 32 deletions(-)

diff --git a/jsowell-ui/src/views/pile/occupy/index.vue b/jsowell-ui/src/views/pile/occupy/index.vue
index c5eaf2adf..7abeecf62 100644
--- a/jsowell-ui/src/views/pile/occupy/index.vue
+++ b/jsowell-ui/src/views/pile/occupy/index.vue
@@ -7,9 +7,9 @@
       <el-form-item label="会员id" prop="memberId">
         <el-input v-model="queryParams.memberId" placeholder="请输入会员id" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-<!--      <el-form-item label="充电站id" prop="stationId">-->
-<!--        <el-input v-model="queryParams.stationId" placeholder="请输入充电站id" clearable @keyup.enter.native="handleQuery" />-->
-<!--      </el-form-item>-->
+      <!--      <el-form-item label="充电站id" prop="stationId">-->
+      <!--        <el-input v-model="queryParams.stationId" placeholder="请输入充电站id" clearable @keyup.enter.native="handleQuery" />-->
+      <!--      </el-form-item>-->
       <!-- <el-form-item label="订单号" prop="orderCode">
         <el-input v-model="queryParams.orderCode" placeholder="请输入订单号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
@@ -22,25 +22,25 @@
           placeholder="请选择占桩开始时间">
         </el-date-picker>
       </el-form-item>
-<!--      <el-form-item label="占桩结束时间" prop="endTime">-->
-<!--        <el-date-picker class="stake-up" clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"-->
-<!--          placeholder="请选择占桩结束时间">-->
-<!--        </el-date-picker>-->
-<!--      </el-form-item>-->
+      <!--      <el-form-item label="占桩结束时间" prop="endTime">-->
+      <!--        <el-date-picker class="stake-up" clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"-->
+      <!--          placeholder="请选择占桩结束时间">-->
+      <!--        </el-date-picker>-->
+      <!--      </el-form-item>-->
       <el-form-item label="占桩订单金额" prop="orderAmount">
         <el-input v-model="queryParams.orderAmount" placeholder="请输入占桩订单金额" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="充电桩编号" prop="pileSn">
         <el-input v-model="queryParams.pileSn" placeholder="请输入充电桩编号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-<!--      <el-form-item label="充电桩枪口号" prop="connectorCode">-->
-<!--        <el-input v-model="queryParams.connectorCode" placeholder="请输入充电桩枪口号" clearable-->
-<!--          @keyup.enter.native="handleQuery" />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="充电桩枪口编号" prop="pileConnectorCode">-->
-<!--        <el-input v-model="queryParams.pileConnectorCode" placeholder="请输入充电桩枪口编号" clearable-->
-<!--          @keyup.enter.native="handleQuery" />-->
-<!--      </el-form-item>-->
+      <!--      <el-form-item label="充电桩枪口号" prop="connectorCode">-->
+      <!--        <el-input v-model="queryParams.connectorCode" placeholder="请输入充电桩枪口号" clearable-->
+      <!--          @keyup.enter.native="handleQuery" />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="充电桩枪口编号" prop="pileConnectorCode">-->
+      <!--        <el-input v-model="queryParams.pileConnectorCode" placeholder="请输入充电桩枪口编号" clearable-->
+      <!--          @keyup.enter.native="handleQuery" />-->
+      <!--      </el-form-item>-->
       <el-form-item class="custom-item">
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -84,8 +84,8 @@
       <el-table-column label="充电站名称" align="center" prop="stationName" />
       <!-- <el-table-column label="订单号" align="center" prop="orderCode" />
       <el-table-column label="交易流水号" align="center" prop="transactionCode" /> -->
-      <el-table-column label="占桩开始时间" align="center" prop="startTime" width="180"/>
-      <el-table-column label="占桩结束时间" align="center" prop="endTime" width="180"/>
+      <el-table-column label="占桩开始时间" align="center" prop="startTime" width="180" />
+      <el-table-column label="占桩结束时间" align="center" prop="endTime" width="180" />
       <el-table-column label="支付状态" align="center" prop="payStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.occupy_pay_status" :value="scope.row.payStatus" />
@@ -94,7 +94,7 @@
       <el-table-column label="占桩订单金额" align="center" prop="orderAmount" />
       <el-table-column label="充电桩编号" align="center" prop="pileSn" />
       <el-table-column label="充电桩枪口号" align="center" prop="connectorCode" />
-<!--      <el-table-column label="充电桩枪口编号" align="center" prop="pileConnectorCode" />-->
+      <!--      <el-table-column label="充电桩枪口编号" align="center" prop="pileConnectorCode" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -388,19 +388,14 @@ export default {
           orderAmount: this.stakeUp
         }
       }
-      if (this.stakeUp > 0) {
-        noNeedPay(this.amountPile).then(res => {
-          console.log(res);
-          if (res.code === 200) {
-            this.$modal.msgSuccess("修改成功");
-            this.getList();
-          }
-        });
-        this.dataReset()
-      } else {
-        this.$message.error('修改金额不能为空或小于0');
-      }
-
+      noNeedPay(this.amountPile).then(res => {
+        console.log(res);
+        if (res.code === 200) {
+          this.$modal.msgSuccess("修改成功");
+          this.getList();
+        }
+      });
+      this.dataReset()
     },
     //无需支付取消
     cancel() {