Merge remote-tracking branch 'origin/master'

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/domain/PayOrder.java

@@ -9,7 +9,7 @@ import com.yijia.common.core.domain.BaseEntity;
 
 /**
  * 订单支付对象 pay_order
- * 
+ *
  * @author yijia
  * @date 2020-12-10
  */
@@ -65,8 +65,8 @@ public class PayOrder extends BaseEntity
     private String payWay;
 
     /** 支付时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date payDate;
 
     /** 加油员 */
@@ -74,155 +74,155 @@ public class PayOrder extends BaseEntity
     private String oilPersonnel;
 
     /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date createdDate;
 
     /** 订单类型（1.柴油，2.汽油，积分：3.现金+积分4.现金，5.积分） */
     @Excel(name = "订单类型", readConverterExp = "1=.柴油，2.汽油，积分：3.现金+积分4.现金，5.积分")
     private String orderType;
 
-    public void setOrderId(Long orderId) 
+    public void setOrderId(Long orderId)
     {
         this.orderId = orderId;
     }
 
-    public Long getOrderId() 
+    public Long getOrderId()
     {
         return orderId;
     }
-    public void setOrderNo(String orderNo) 
+    public void setOrderNo(String orderNo)
     {
         this.orderNo = orderNo;
     }
 
-    public String getOrderNo() 
+    public String getOrderNo()
     {
         return orderNo;
     }
-    public void setOilGun(String oilGun) 
+    public void setOilGun(String oilGun)
     {
         this.oilGun = oilGun;
     }
 
-    public String getOilGun() 
+    public String getOilGun()
     {
         return oilGun;
     }
-    public void setOilName(String oilName) 
+    public void setOilName(String oilName)
     {
         this.oilName = oilName;
     }
 
-    public String getOilName() 
+    public String getOilName()
     {
         return oilName;
     }
-    public void setConsumerId(Long consumerId) 
+    public void setConsumerId(Long consumerId)
     {
         this.consumerId = consumerId;
     }
 
-    public Long getConsumerId() 
+    public Long getConsumerId()
     {
         return consumerId;
     }
-    public void setConsumer(String consumer) 
+    public void setConsumer(String consumer)
     {
         this.consumer = consumer;
     }
 
-    public String getConsumer() 
+    public String getConsumer()
     {
         return consumer;
     }
-    public void setAmt(String amt) 
+    public void setAmt(String amt)
     {
         this.amt = amt;
     }
 
-    public String getAmt() 
+    public String getAmt()
     {
         return amt;
     }
-    public void setStationId(Long stationId) 
+    public void setStationId(Long stationId)
     {
         this.stationId = stationId;
     }
 
-    public Long getStationId() 
+    public Long getStationId()
     {
         return stationId;
     }
-    public void setStatus(String status) 
+    public void setStatus(String status)
     {
         this.status = status;
     }
 
-    public String getStatus() 
+    public String getStatus()
     {
         return status;
     }
-    public void setOrderLiters(String orderLiters) 
+    public void setOrderLiters(String orderLiters)
     {
         this.orderLiters = orderLiters;
     }
 
-    public String getOrderLiters() 
+    public String getOrderLiters()
     {
         return orderLiters;
     }
-    public void setPayType(String payType) 
+    public void setPayType(String payType)
     {
         this.payType = payType;
     }
 
-    public String getPayType() 
+    public String getPayType()
     {
         return payType;
     }
-    public void setPayWay(String payWay) 
+    public void setPayWay(String payWay)
     {
         this.payWay = payWay;
     }
 
-    public String getPayWay() 
+    public String getPayWay()
     {
         return payWay;
     }
-    public void setPayDate(Date payDate) 
+    public void setPayDate(Date payDate)
     {
         this.payDate = payDate;
     }
 
-    public Date getPayDate() 
+    public Date getPayDate()
     {
         return payDate;
     }
-    public void setOilPersonnel(String oilPersonnel) 
+    public void setOilPersonnel(String oilPersonnel)
     {
         this.oilPersonnel = oilPersonnel;
     }
 
-    public String getOilPersonnel() 
+    public String getOilPersonnel()
     {
         return oilPersonnel;
     }
-    public void setCreatedDate(Date createdDate) 
+    public void setCreatedDate(Date createdDate)
     {
         this.createdDate = createdDate;
     }
 
-    public Date getCreatedDate() 
+    public Date getCreatedDate()
     {
         return createdDate;
     }
-    public void setOrderType(String orderType) 
+    public void setOrderType(String orderType)
     {
         this.orderType = orderType;
     }
 
-    public String getOrderType() 
+    public String getOrderType()
     {
         return orderType;
     }

Yijia-SaaS/yijia-station/src/main/resources/mapper/station/PayOrderMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yijia.station.mapper.PayOrderMapper">
-    
+
     <resultMap type="PayOrder" id="PayOrderResult">
         <result property="orderId"    column="order_id"    />
         <result property="orderNo"    column="order_no"    />
@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectPayOrderList" parameterType="PayOrder" resultMap="PayOrderResult">
         <include refid="selectPayOrderVo"/>
-        <where>  
+        <where>
             <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</if>
             <if test="oilGun != null  and oilGun != ''"> and oil_gun = #{oilGun}</if>
             <if test="oilName != null  and oilName != ''"> and oil_name like concat('%', #{oilName}, '%')</if>
@@ -46,13 +46,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdDate != null "> and created_date = #{createdDate}</if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
         </where>
+        ORDER BY created_date DESC
     </select>
-    
+
     <select id="selectPayOrderById" parameterType="Long" resultMap="PayOrderResult">
         <include refid="selectPayOrderVo"/>
         where order_id = #{orderId}
     </select>
-        
+
     <insert id="insertPayOrder" parameterType="PayOrder" useGeneratedKeys="true" keyProperty="orderId">
         insert into pay_order
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -118,10 +119,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deletePayOrderByIds" parameterType="String">
-        delete from pay_order where order_id in 
+        delete from pay_order where order_id in
         <foreach item="orderId" collection="array" open="(" separator="," close=")">
             #{orderId}
         </foreach>
     </delete>
-    
-</mapper>
+
+</mapper>

Yijia-SaaS/yijia-ui/src/views/station/order/index.vue

@@ -28,15 +28,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="用户id(消费者)" prop="consumerId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.consumerId"-->
-<!--          placeholder="请输入用户id(消费者)"-->
-<!--          clearable-->
-<!--          size="small"-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <!--      <el-form-item label="用户id(消费者)" prop="consumerId">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.consumerId"-->
+      <!--          placeholder="请输入用户id(消费者)"-->
+      <!--          clearable-->
+      <!--          size="small"-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
       <el-form-item label="消费者" prop="consumer">
         <el-input
           v-model="queryParams.consumer"
@@ -105,10 +105,10 @@
       </el-form-item>
       <el-form-item label="支付时间" prop="payDate">
         <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.payDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择支付时间">
+                        v-model="queryParams.payDate"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择支付时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="加油员" prop="oilPersonnel">
@@ -122,10 +122,10 @@
       </el-form-item>
       <el-form-item label="创建时间" prop="createdDate">
         <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.createdDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择创建时间">
+                        v-model="queryParams.createdDate"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择创建时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="订单类型" prop="orderType">
@@ -140,25 +140,25 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['station:order:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['station:order:edit']"
-        >修改</el-button>
-      </el-col>
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="primary"-->
+      <!--          icon="el-icon-plus"-->
+      <!--          size="mini"-->
+      <!--          @click="handleAdd"-->
+      <!--          v-hasPermi="['station:order:add']"-->
+      <!--        >新增</el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="success"-->
+      <!--          icon="el-icon-edit"-->
+      <!--          size="mini"-->
+      <!--          :disabled="single"-->
+      <!--          @click="handleUpdate"-->
+      <!--          v-hasPermi="['station:order:edit']"-->
+      <!--        >修改</el-button>-->
+      <!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -178,44 +178,45 @@
           v-hasPermi="['station:order:export']"
         >导出</el-button>
       </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="订单类型" align="center" prop="orderId" />
-      <el-table-column label="订单号" align="center" prop="orderNo" />
+      <el-table-column v-if="false" label="订单id" align="center" prop="orderId" />
+      <el-table-column label="订单号"  width="200" align="center" prop="orderNo" />
       <el-table-column label="加油枪号" align="center" prop="oilGun" />
       <el-table-column label="油品名称" align="center" prop="oilName" />
       <el-table-column v-if="false" label="用户id(消费者)" align="center" prop="consumerId" />
-      <el-table-column label="消费者" align="center" prop="consumer" />
+      <el-table-column label="消费者" width="120" align="center" prop="consumer" />
       <el-table-column label="金额" align="center" prop="amt" />
-      <el-table-column v-if="false" label="油站id" align="center" prop="stationId" />
-      <el-table-column label="状态" align="center" prop="status" />
       <el-table-column label="加油升数" align="center" prop="orderLiters" />
-      <el-table-column label="支付类型" align="center" prop="payType" />
-      <el-table-column label="支付方式" align="center" prop="payWay" />
-      <el-table-column label="支付时间" align="center" prop="payDate" width="180">
+      <el-table-column v-if="false" label="油站id" align="center" prop="stationId" />
+      <el-table-column label="状态" align="center" prop="status" :formatter="statusFotmat"/>
+      <el-table-column label="支付类型" align="center" prop="payType" :formatter="payTypeFotmat"/>
+      <el-table-column label="支付方式" align="center" prop="payWay" :formatter="payWayFotmat"/>
+      <el-table-column label="订单类型" align="center" prop="orderType" />
+      <el-table-column label="加油员" align="center" prop="oilPersonnel" />
+      <el-table-column label="创建时间" align="center" prop="createdDate" width="150">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.payDate, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.createdDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="加油员" align="center" prop="oilPersonnel" />
-      <el-table-column label="创建时间" align="center" prop="createdDate" width="180">
+      <el-table-column label="支付时间" align="center" prop="payDate" width="150">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createdDate, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.payDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="订单类型" align="center" prop="orderType" v-if="false" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['station:order:edit']"
-          >修改</el-button>
+          <!--          <el-button-->
+          <!--            size="mini"-->
+          <!--            type="text"-->
+          <!--            icon="el-icon-edit"-->
+          <!--            @click="handleUpdate(scope.row)"-->
+          <!--            v-hasPermi="['station:order:edit']"-->
+          <!--          >修改</el-button>-->
           <el-button
             size="mini"
             type="text"
@@ -299,10 +300,10 @@
         </el-form-item>
         <el-form-item label="支付时间" prop="payDate">
           <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.payDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择支付时间">
+                          v-model="form.payDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择支付时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="加油员" prop="oilPersonnel">
@@ -310,10 +311,10 @@
         </el-form-item>
         <el-form-item label="创建时间" prop="createdDate">
           <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.createdDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择创建时间">
+                          v-model="form.createdDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择创建时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="订单类型" prop="orderType">
@@ -331,167 +332,196 @@
 </template>
 
 <script>
-import { listOrder, getOrder, delOrder, addOrder, updateOrder, exportOrder } from "@/api/station/order";
+  import { listOrder, getOrder, delOrder, addOrder, updateOrder, exportOrder } from "@/api/station/order";
 
-export default {
-  name: "Order",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 订单支付表格数据
-      orderList: [],
-      //字典
-      payTypeOptions:[],
-      payWayOptions:[],
-      payStatusOptions:[],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        orderNo: null,
-        oilGun: null,
-        oilName: null,
-        consumerId: null,
-        consumer: null,
-        amt: null,
-        stationId: null,
-        status: null,
-        orderLiters: null,
-        payType: null,
-        payWay: null,
-        payDate: null,
-        oilPersonnel: null,
-        createdDate: null,
-        orderType: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-    //字典
-    this.getDicts("pay_type").then(response => {
-      this.payTypeOptions = response.data;
-    });
-    this.getDicts("pay_way").then(response => {
-      this.payWayOptions = response.data;
-    });
-    this.getDicts("pay_status").then(response => {
-      this.payStatusOptions = response.data;
-    });
-  },
-  methods: {
-    /** 查询订单支付列表 */
-    getList() {
-      this.loading = true;
-      listOrder(this.queryParams).then(response => {
-        this.orderList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        orderId: null,
-        orderNo: null,
-        oilGun: null,
-        oilName: null,
-        consumerId: null,
-        consumer: null,
-        amt: null,
-        stationId: null,
-        status: "0",
-        orderLiters: null,
-        payType: null,
-        payWay: null,
-        payDate: null,
-        oilPersonnel: null,
-        createdDate: null,
-        orderType: null
+  export default {
+    name: "Order",
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 订单支付表格数据
+        orderList: [],
+        //字典
+        payTypeOptions:[],
+        payWayOptions:[],
+        payStatusOptions:[],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          orderNo: null,
+          oilGun: null,
+          oilName: null,
+          consumerId: null,
+          consumer: null,
+          amt: null,
+          stationId: null,
+          status: null,
+          orderLiters: null,
+          payType: null,
+          payWay: null,
+          payDate: null,
+          oilPersonnel: null,
+          createdDate: null,
+          orderType: null
+        },
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+        }
       };
-      this.resetForm("form");
     },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
+    created() {
       this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.orderId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加订单支付";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const orderId = row.orderId || this.ids
-      getOrder(orderId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改订单支付";
+      //字典
+      this.getDicts("pay_type").then(response => {
+        this.payTypeOptions = response.data;
       });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.orderId != null) {
-            updateOrder(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addOrder(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
+      this.getDicts("pay_way").then(response => {
+        this.payWayOptions = response.data;
+      });
+      this.getDicts("pay_status").then(response => {
+        this.payStatusOptions = response.data;
       });
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const orderIds = row.orderId || this.ids;
-      this.$confirm('是否确认删除订单支付编号为"' + orderIds + '"的数据项?', "警告", {
+    methods: {
+      payTypeFotmat(row, column){
+        if(row.payType === 'sxf'){
+          return '随行付'
+        }
+      },
+      payWayFotmat(row, column){
+        if(row.payWay === '02'){
+          return '公众号'
+        }else if(row.payWay === '03'){
+          return '小程序'
+        }
+      },
+      //statusFotmat
+      statusFotmat(row, column){
+        if(row.status === '0'){
+          return '未支付'
+        }else if(row.status === '1'){
+          return '已支付'
+        }
+      },
+      //orderTypeFotmat
+      // orderTypeFotmat(row, column){
+      //   if(row.orderType === '1'){
+      //     return '柴油'
+      //   }else if(row.orderType === '2'){
+      //     return '汽油'
+      //   }
+      // },
+
+      /** 查询订单支付列表 */
+      getList() {
+        this.loading = true;
+        listOrder(this.queryParams).then(response => {
+          this.orderList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          orderId: null,
+          orderNo: null,
+          oilGun: null,
+          oilName: null,
+          consumerId: null,
+          consumer: null,
+          amt: null,
+          stationId: null,
+          status: "0",
+          orderLiters: null,
+          payType: null,
+          payWay: null,
+          payDate: null,
+          oilPersonnel: null,
+          createdDate: null,
+          orderType: null
+        };
+        this.resetForm("form");
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.orderId)
+        this.single = selection.length!==1
+        this.multiple = !selection.length
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.reset();
+        this.open = true;
+        this.title = "添加订单支付";
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        this.reset();
+        const orderId = row.orderId || this.ids
+        getOrder(orderId).then(response => {
+          this.form = response.data;
+          this.open = true;
+          this.title = "修改订单支付";
+        });
+      },
+      /** 提交按钮 */
+      submitForm() {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            if (this.form.orderId != null) {
+              updateOrder(this.form).then(response => {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              addOrder(this.form).then(response => {
+                this.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
+          }
+        });
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const orderIds = row.orderId || this.ids;
+        this.$confirm('是否确认删除订单支付编号为"' + orderIds + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -501,11 +531,11 @@ export default {
           this.getList();
           this.msgSuccess("删除成功");
         })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有订单支付数据项?', "警告", {
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        const queryParams = this.queryParams;
+        this.$confirm('是否确认导出所有订单支付数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -514,7 +544,7 @@ export default {
         }).then(response => {
           this.download(response.msg);
         })
+      }
     }
-  }
-};
+  };
 </script>