占桩订单

jsowell-ui/src/api/pile/occupy.js

@@ -42,3 +42,12 @@ export function delOccupy(id) {
     method: 'delete'
   })
 }
+
+// 无需支付
+export function noNeedPay(data) {
+  return request({
+    url: '/pile/occupy/updateOrderAmount',
+    method: 'post',
+    data: data
+  })
+}

jsowell-ui/src/views/homeIndex/homeIndex.vue

@@ -1,13 +1,10 @@
 <template>
-
     <div class="app-container">
         <h1>概况 (自2023-01-01起)</h1>
         <hr />
         <div style="display: flex;justify-content: space-between;margin-top: 10px;flex-wrap: wrap;">
             <div class="box" style="background-color: #ffba00;">
-                 <el-image class="box-image"
+                <el-image class="box-image" :src="require('@/assets/images/lightning.png')" />
-                                  :src="require('@/assets/images/lightning.png')"
-                        />
                 <div class="flex1">
                     <div class="box-h1">{{ generalSituation.totalChargingDegree }}</div>
                     <div>总充电电量(度)</div>
@@ -15,26 +12,21 @@
 
             </div>
             <div class="box" style="background-color: #c74542;">
-                        <el-image class="box-image"
+                <el-image class="box-image" :src="require('@/assets/images/zongfeiyong.png')" />
-                                  :src="require('@/assets/images/zongfeiyong.png')"/>
                 <div class="flex1">
                     <div class="box-h1">{{ generalSituation.totalChargingAmount }}</div>
                     <div>总充电费用(元)</div>
                 </div>
             </div>
             <div class="box" style="background-color: #12ce65;">
-                        <el-image
+                <el-image class="box-image" :src="require('@/assets/images/dingdan.png')" />
-                            class="box-image"
-                            :src="require('@/assets/images/dingdan.png')"/>
                 <div class="flex1">
                     <div class="box-h1">{{ generalSituation.totalChargingQuantity }}</div>
                     <div>总充电订单数(笔)</div>
                 </div>
             </div>
             <div class="box" style="background-color: #909399;">
-                        <el-image
+                <el-image class="box-image" :src="require('@/assets/images/shebei.png')" />
-                            class="box-image"
-                            :src="require('@/assets/images/shebei.png')"/>
                 <div class="flex1">
                     <div class="box-h1">{{ generalSituation.totalPileQuantity }}</div>
                     <div>总充电设备数量(座)</div>
@@ -54,10 +46,8 @@
         </div>
         <h1>订单</h1>
         <hr />
-        <el-button style="background-color: #1ab394; color: #ffffff"
+        <el-button style="background-color: #1ab394; color: #ffffff">最近30天
-        >最近30天
+        </el-button>
-        </el-button
-        >
         <div ref="chart" :style="{ width: '100%', height: '500px' }"></div>
         <hr />
         <!-- <h1>启动充电渠道</h1> -->
@@ -66,7 +56,6 @@
         <!-- <hr /> -->
         <!-- <h1>设备</h1> -->
     </div>
-
 </template>
 <script>
 import Echarts from "echarts";
@@ -107,9 +96,11 @@ export default {
             this.generalSituation = obj;
         },
         async getOrder() {
-            const {obj} = await getOrderInfo({});
+            const { obj, resCode } = await getOrderInfo({});
+            console.log("订单信息", obj, resCode);
+            if (resCode === '00100000') {
                 this.orderInfo = obj;
-            console.log("订单信息", this.orderInfo);
+            } 
         },
         async init() {
             await this.getOrder();
@@ -361,6 +352,7 @@ export default {
     margin-right: 24px;
     margin-bottom: 20px;
     position: relative;
+
     .box-image {
         position: absolute;
         left: 0;
@@ -378,10 +370,12 @@ export default {
         margin-left: 48px;
     }
 }
+
 .box-h1 {
     /* margin-top: -14px; */
     font-size: 2rem;
 }
+
 .box-text {
     margin-top: 0px;
 }

jsowell-ui/src/views/order/order/index.vue

@@ -1,86 +1,38 @@
 <template>
   <div class="app-container">
-    <el-form
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="168px"
-      :model="queryParams"
+      @submit.native.prevent>
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="168px"
-      @submit.native.prevent
-    >
       <el-form-item label="站点" prop="stationId">
-        <el-select
+        <el-select v-model="queryParams.stationId" placeholder="请选择站点" clearable filterable style="width: 140px">
-          v-model="queryParams.stationId"
+          <el-option v-for="(station, index) in stationList" :key="index" :label="station.stationName"
-          placeholder="请选择站点"
+            :value="station.id" />
-          clearable
-          filterable
-          style="width: 140px"
-        >
-          <el-option
-            v-for="(station, index) in stationList"
-            :key="index"
-            :label="station.stationName"
-            :value="station.id"
-          />
         </el-select>
       </el-form-item>
 
       <el-form-item label="订单编号" prop="orderCode">
-        <el-input
+        <el-input v-model="queryParams.orderCode" placeholder="请输入订单编号" clearable @keyup.enter.native="handleQuery" />
-          v-model="queryParams.orderCode"
-          placeholder="请输入订单编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
 
       <el-form-item label="订单状态" prop="orderStatus">
-        <el-select
+        <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" clearable style="width: 140px">
-          v-model="queryParams.orderStatus"
+          <el-option v-for="item1 in dict.type.order_status" :key="item1.value" :label="item1.label"
-          placeholder="请选择订单状态"
+            :value="item1.value" />
-          clearable
-          style="width: 140px"
-        >
-          <el-option
-            v-for="item1 in dict.type.order_status"
-            :key="item1.value"
-            :label="item1.label"
-            :value="item1.value"
-          />
         </el-select>
       </el-form-item>
 
       <el-form-item label="手机号码" prop="mobileNumber">
-        <el-input
+        <el-input v-model="queryParams.mobileNumber" placeholder="请输入手机号码" clearable @keyup.enter.native="handleQuery" />
-          v-model="queryParams.mobileNumber"
-          placeholder="请输入手机号码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <div v-if="buttonBoolean">
         <el-form-item label="交易流水号" prop="transactionCode">
-          <el-input
+          <el-input v-model="queryParams.transactionCode" placeholder="请输入交易流水号" clearable
-            v-model="queryParams.transactionCode"
+            @keyup.enter.native="handleQuery" />
-            placeholder="请输入交易流水号"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
         </el-form-item>
 
         <el-form-item label="创建时间">
-          <el-date-picker
+          <el-date-picker v-model="createTimeRange" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
-            v-model="createTimeRange"
+            :default-time="['00:00:00', '23:59:59']" type="daterange" range-separator="-" start-placeholder="开始日期"
-            style="width: 240px"
+            end-placeholder="结束日期" :clearable="true"></el-date-picker>
-            value-format="yyyy-MM-dd HH:mm:ss"
-            :default-time="['00:00:00', '23:59:59']"
-            type="daterange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            :clearable="true"
-          ></el-date-picker>
         </el-form-item>
         <!-- <el-form-item label="结算时间">
           <el-date-picker
@@ -96,9 +48,7 @@
           ></el-date-picker>
         </el-form-item> -->
       </div>
-      <el-button
+      <el-button @click="showOrHide()" style="
-        @click="showOrHide()"
-        style="
           border-color: white;
           background-color: white;
           font-size: x-small;
@@ -107,35 +57,21 @@
           margin-left: 40%;
           margin-top: 0px;
           margin-bottom: 15px;
-        "
+        " :icon="icon">{{ showOrHideText }}
-        :icon="icon"
-        >{{ showOrHideText }}
       </el-button>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >搜索
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置
-          >重置
         </el-button>
       </el-col>
-      <el-button
+      <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-        type="warning"
+        v-hasPermi="['order:order:export']">导出
-        plain
-        icon="el-icon-download"
-        size="mini"
-        @click="handleExport"
-        v-hasPermi="['order:order:export']"
-        >导出
       </el-button>
       <div>
         {{ dateDescription }}期间，总用电量{{
@@ -145,20 +81,11 @@
 }}元
       </div>
       <el-popover placement="top-start" width="400" trigger="click">
-        <el-checkbox
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选
-          :indeterminate="isIndeterminate"
-          v-model="checkAll"
-          @change="handleCheckAllChange"
-          >全选
         </el-checkbox>
         <div style="margin: 15px 0"></div>
-        <el-checkbox-group
+        <el-checkbox-group style="display: grid" v-model="checkedCities" @change="handleCheckedCitiesChange">
-          style="display: grid"
+          <el-checkbox v-for="city in cities" :label="city" :key="city.id">{{ city }}
-          v-model="checkedCities"
-          @change="handleCheckedCitiesChange"
-        >
-          <el-checkbox v-for="city in cities" :label="city" :key="city.id"
-            >{{ city }}
           </el-checkbox>
         </el-checkbox-group>
       </el-popover>
@@ -168,15 +95,13 @@
         <el-skeleton-item variant="text" style="width: 100%; height: 100%" />
         <div style="padding: 14px">
           <el-skeleton-item variant="h3" style="width: 50%" />
-          <div
+          <div style="
-            style="
               display: flex;
               align-items: center;
               justify-items: space-between;
               margin-top: 16px;
               height: 16px;
-            "
+            ">
-          >
             <el-skeleton-item variant="text" style="margin-right: 16px" />
             <el-skeleton-item variant="text" style="width: 30%" />
           </div>
@@ -184,72 +109,47 @@
       </template>
       <template>
         <template v-if="orderList.length !== 0">
-          <div
+          <div class="cardview-box" v-for="(item, orderIndex) in orderList" :key="orderIndex"
-            class="cardview-box"
+            @change="handleSelectionChange">
-            v-for="(item, orderIndex) in orderList"
-            :key="orderIndex"
-            @change="handleSelectionChange"
-          >
             <div class="cardview-static">
               <div>
-                <router-link
+                <router-link :to="'/order/index/orderDetail/' + item.orderCode" class="link-type">订单编号：{{ item.orderCode
-                  :to="'/order/index/orderDetail/' + item.orderCode"
+                }}
-                  class="link-type"
-                  >订单编号：{{ item.orderCode }}
                 </router-link>
 
-                <el-tag
+                <el-tag :type="color(item.orderStatus)" style="margin-left: 10px">{{ item.orderStatusDescribe }}
-                  :type="color(item.orderStatus)"
-                  style="margin-left: 10px"
-                  >{{ item.orderStatusDescribe }}
                 </el-tag>
               </div>
               <div>开始时间：{{ item.chargeStartTime || "一" }}</div>
             </div>
             <div class="conter">
-              <el-descriptions
+              <el-descriptions class="title" :title="`${item.nickName || '---'}（${item.mobileNumber || '---'
-                class="title"
+                }）`" :column="7">
-                :title="`${item.nickName || '---'}（${
-                  item.mobileNumber || '---'
-                }）`"
-                :column="7"
-              >
                 <!-- @click.native="goMemberDetail(item)" -->
                 <el-descriptions-item label="站点名称">
                   <div style="color: #337ab7" @click="goStationDetail(item)">
                     {{ item.stationName }}
                   </div>
                 </el-descriptions-item>
-                <el-descriptions-item label="实时充电度数"
+                <el-descriptions-item label="实时充电度数">{{ item.realTimeChargingDegree }}
-                  >{{ item.realTimeChargingDegree }}
                 </el-descriptions-item>
-                <el-descriptions-item label="实时消费金额"
+                <el-descriptions-item label="实时消费金额">{{ item.realTimeAmount }}
-                  >{{ item.realTimeAmount }}
                 </el-descriptions-item>
-                <el-descriptions-item label="起始SOC"
+                <el-descriptions-item label="起始SOC">{{ item.startSoc }}
-                  >{{ item.startSoc }}
                 </el-descriptions-item>
-                <el-descriptions-item label="终止SOC"
+                <el-descriptions-item label="终止SOC">{{ item.endSoc }}
-                  >{{ item.endSoc }}
                 </el-descriptions-item>
-                <el-descriptions-item label="结束充电时间"
+                <el-descriptions-item label="结束充电时间">{{ item.chargeEndTime }}
-                  >{{ item.chargeEndTime }}
                 </el-descriptions-item>
-                <el-descriptions-item label="启动方式"
+                <el-descriptions-item label="启动方式">{{ startMode(item.startMode) }}
-                  >{{ startMode(item.startMode) }}
                 </el-descriptions-item>
               </el-descriptions>
               <div style="flex: 1; text-align: center; margin: auto"></div>
             </div>
           </div>
 
-          <pagination
+          <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-            v-show="total > 0"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
-            :total="total"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getList"
-          />
         </template>
         <el-empty description="暂无数据" v-else></el-empty>
       </template>
@@ -676,13 +576,16 @@ export default {
 .conter {
   padding: 10px;
 }
+
 ::v-deep .conter .el-descriptions__header {
   margin-bottom: 10px;
   // color:#337ab7
 }
+
 ::v-deep .conter .el-descriptions-item__cell {
   padding-bottom: 4px;
 }
+
 .cardview-box {
   width: 100%;
   margin-bottom: 12px;

jsowell-ui/src/views/pile/occupy/index.vue

@@ -1,95 +1,47 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="130px">
       <el-form-item label="占桩订单编号" prop="occupyCode">
-        <el-input
+        <el-input v-model="queryParams.occupyCode" placeholder="请输入占桩订单编号" clearable @keyup.enter.native="handleQuery" />
-          v-model="queryParams.occupyCode"
-          placeholder="请输入占桩订单编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <el-form-item label="会员id" prop="memberId">
-        <el-input
+        <el-input v-model="queryParams.memberId" placeholder="请输入会员id" clearable @keyup.enter.native="handleQuery" />
-          v-model="queryParams.memberId"
-          placeholder="请输入会员id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <el-form-item label="充电站id" prop="stationId">
-        <el-input
+        <el-input v-model="queryParams.stationId" placeholder="请输入充电站id" clearable @keyup.enter.native="handleQuery" />
-          v-model="queryParams.stationId"
-          placeholder="请输入充电站id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
-      <el-form-item label="订单号" prop="orderCode">
+      <!-- <el-form-item label="订单号" prop="orderCode">
-        <el-input
+        <el-input v-model="queryParams.orderCode" placeholder="请输入订单号" clearable @keyup.enter.native="handleQuery" />
-          v-model="queryParams.orderCode"
-          placeholder="请输入订单号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <el-form-item label="交易流水号" prop="transactionCode">
-        <el-input
+        <el-input v-model="queryParams.transactionCode" placeholder="请输入交易流水号" clearable
-          v-model="queryParams.transactionCode"
+          @keyup.enter.native="handleQuery" />
-          placeholder="请输入交易流水号"
+      </el-form-item> -->
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="占桩开始时间" prop="startTime">
-        <el-date-picker clearable
+        <el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
-                        v-model="queryParams.startTime"
-                        type="date"
-                        value-format="yyyy-MM-dd"
           placeholder="请选择占桩开始时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="占桩结束时间" prop="endTime">
-        <el-date-picker clearable
+        <el-date-picker class="stake-up" clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
-                        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
+        <el-input v-model="queryParams.orderAmount" placeholder="请输入占桩订单金额" clearable @keyup.enter.native="handleQuery" />
-          v-model="queryParams.orderAmount"
-          placeholder="请输入占桩订单金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <el-form-item label="充电桩编号" prop="pileSn">
-        <el-input
+        <el-input v-model="queryParams.pileSn" placeholder="请输入充电桩编号" clearable @keyup.enter.native="handleQuery" />
-          v-model="queryParams.pileSn"
-          placeholder="请输入充电桩编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <el-form-item label="充电桩枪口号" prop="connectorCode">
-        <el-input
+        <el-input v-model="queryParams.connectorCode" placeholder="请输入充电桩枪口号" clearable
-          v-model="queryParams.connectorCode"
+          @keyup.enter.native="handleQuery" />
-          placeholder="请输入充电桩枪口号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <el-form-item label="充电桩枪口编号" prop="pileConnectorCode">
-        <el-input
+        <el-input v-model="queryParams.pileConnectorCode" placeholder="请输入充电桩枪口编号" clearable
-          v-model="queryParams.pileConnectorCode"
+          @keyup.enter.native="handleQuery" />
-          placeholder="请输入充电桩枪口编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
-      <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>
       </el-form-item>
@@ -97,49 +49,23 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          type="primary"
+          v-hasPermi="['pile:occupy:add']">新增
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['pile:occupy:add']"
-        >新增
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-          type="success"
+          v-hasPermi="['pile:occupy:edit']">修改
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['pile:occupy:edit']"
-        >修改
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-          type="danger"
+          v-hasPermi="['pile:occupy:remove']">删除
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['pile:occupy:remove']"
-        >删除
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-          type="warning"
+          v-hasPermi="['pile:occupy:export']">导出
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['pile:occupy:export']"
-        >导出
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -147,13 +73,17 @@
 
     <el-table v-loading="loading" :data="occupyList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键" align="center" prop="id"/>
+      <!-- <el-table-column label="主键" align="center" prop="id" /> -->
       <el-table-column label="占桩订单编号" align="center" prop="occupyCode" />
-      <el-table-column label="状态" align="center" prop="status"/>
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.occupy_order_status" :value="scope.row.status" />
+        </template>
+      </el-table-column>
       <el-table-column label="会员id" align="center" prop="memberId" />
       <el-table-column label="充电站id" align="center" prop="stationId" />
-      <el-table-column label="订单号" align="center" prop="orderCode"/>
+      <!-- <el-table-column label="订单号" align="center" prop="orderCode" />
-      <el-table-column label="交易流水号" align="center" prop="transactionCode"/>
+      <el-table-column label="交易流水号" align="center" prop="transactionCode" /> -->
       <el-table-column label="占桩开始时间" align="center" prop="startTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
@@ -164,40 +94,32 @@
           <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="支付状态" align="center" prop="payStatus"/>
+      <el-table-column label="支付状态" align="center" prop="payStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.occupy_pay_status" :value="scope.row.payStatus" />
+        </template>
+      </el-table-column>
       <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" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
+          <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            size="mini"
+            v-hasPermi="['pile:occupy:edit']">修改
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['pile:occupy:edit']"
-          >修改
           </el-button>
-          <el-button
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            size="mini"
+            v-hasPermi="['pile:occupy:remove']">删除
-            type="text"
+          </el-button> -->
-            icon="el-icon-delete"
+          <el-button size="mini" type="text" v-hasPermi="['pile:occupy:remove']"
-            @click="handleDelete(scope.row)"
+            @click="getPay(scope.row.id, scope.row.occupyCode)">无需支付
-            v-hasPermi="['pile:occupy:remove']"
-          >删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      v-show="total>0"
+      @pagination="getList" />
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
 
     <!-- 添加或修改占桩订单对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -218,19 +140,12 @@
           <el-input v-model="form.transactionCode" placeholder="请输入交易流水号" />
         </el-form-item>
         <el-form-item label="占桩开始时间" prop="startTime">
-          <el-date-picker clearable
+          <el-date-picker clearable v-model="form.startTime" type="date" value-format="yyyy-MM-dd"
-                          v-model="form.startTime"
-                          type="date"
-                          value-format="yyyy-MM-dd"
             placeholder="请选择占桩开始时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="占桩结束时间" prop="endTime">
-          <el-date-picker clearable
+          <el-date-picker clearable v-model="form.endTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择占桩结束时间">
-                          v-model="form.endTime"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择占桩结束时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="占桩订单金额" prop="orderAmount">
@@ -254,14 +169,27 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <!-- 无需支付弹框 -->
+    <el-dialog title="提示" :visible.sync="dialogVisible" width="30%" @close="cancel">
+      <el-radio-group v-model="radio" @change="agreeChange">
+        <el-radio label="1" border>无需支付</el-radio>
+        <el-radio label="2" border>手动输入支付金额</el-radio>
+      </el-radio-group>
+      <el-input v-if="radio === '2'" class="stake" type="number" v-model="stakeUp" placeholder="请输入修改金额"></el-input>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="aresure">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import {listOccupy, getOccupy, delOccupy, addOccupy, updateOccupy} from "@/api/pile/occupy";
+import { listOccupy, getOccupy, delOccupy, addOccupy, updateOccupy, noNeedPay } from "@/api/pile/occupy";
 
 export default {
   name: "Occupy",
+  dicts: ["occupy_order_status", "occupy_pay_status"],
   data() {
     return {
       // 遮罩层
@@ -303,7 +231,19 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {}
+      rules: {},
+      // 无需支付弹框
+      dialogVisible: false,
+      // 无需支付单选框状态
+      radio: '1',
+      // 占桩支付金额
+      stakeUp: '',
+      // 修改占桩参数
+      amountPile: {},
+      // 占桩订单编号
+      numbering: '',
+      // 主键
+      dataId: ''
     };
   },
   created() {
@@ -349,6 +289,15 @@ export default {
       };
       this.resetForm("form");
     },
+    // 金额表单重置
+    recharge() {
+      this.amountPile = {
+        id: null,
+        type: null,
+        occupyCode: null,
+        orderAmount: null
+      }
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -417,7 +366,77 @@ export default {
       this.download('pile/occupy/export', {
         ...this.queryParams
       }, `occupy_${new Date().getTime()}.xlsx`)
+    },
+    //无需支付按钮操作 
+    async getPay(m, n) {
+      this.recharge();
+      this.dialogVisible = true;
+      console.log('占桩订单编号', m, n);
+      this.dataId = m
+      this.numbering = n
+    },
+    // type状态
+    agreeChange(value) {
+      this.radio = value
+      console.log('type状态', this.radio);
+    },
+    // 确定修改占桩金额
+    aresure() {
+      console.log('金额', this.stakeUp, this.radio, this.numbering);
+      if (this.radio === '1') {
+        this.amountPile = {
+          type: 1,
+          occupyCode: this.numbering,
+        }
+      } else if (this.radio === '2') {
+        this.amountPile = {
+          id: this.dataId,
+          type: 2,
+          occupyCode: this.numbering,
+          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');
+      }
+
+    },
+    //无需支付取消
+    cancel() {
+      this.dataReset()
+    },
+    // 无需支付重置
+    dataReset() {
+      this.dialogVisible = false
+      this.radio = '1'
+      this.stakeUp = ''
+      this.numbering = ''
+      this.dataId = ''
     }
   }
 };
 </script>
+<style lang="scss" scoped>
+.custom-item {
+  margin-left: 38px;
+}
+
+.stake-up {
+  width: 215px;
+}
+
+.stake {
+  display: block;
+  width: 300px;
+  margin-top: 30px;
+}
+</style>