xuhaifeng 10 tháng trước cách đây
mục cha
commit
d6e11b46eb

+ 1 - 1
src/assets/styles/ruoyi.scss

@@ -103,7 +103,7 @@
 }
 
  .el-form--inline .el-form-item__label {
-   display: none;
+
  }
 
  .el-dialog {

+ 1 - 2
src/views/activity/discountInfo/index.vue

@@ -43,8 +43,7 @@
             </el-table-column>
             <el-table-column label="折扣" align="center" prop="discount" width="120">
                 <template slot-scope="scope">
-                    <span v-if="scope.row.clothScope == 0">{{ scope.row.discount }}折</span>
-                    <span v-if="scope.row.clothScope == 1">--</span>
+                    {{ scope.row.discount }}
                 </template>
             </el-table-column>
             <el-table-column label="适用门店" align="center" prop="storeNum" width="120">

+ 4 - 4
src/views/activity/rechargeItem/index.vue

@@ -33,8 +33,8 @@
             <el-table-column label="序号" align="center" prop="id" width="80" />
             <el-table-column label="充值选项" align="center" prop="rechargeTypeTitle" />
             <el-table-column label="充值金额(元)" align="center" prop="rechargeAmount" width="150" />
-            <el-table-column label="赠送金额(元)" align="center" prop="giveAmount" width="150" />
-            <el-table-column label="额外加送金额(元)" align="center" prop="activityGiveAmount" width="150" />
+            <el-table-column label="赠送金额(元)" align="center" prop="giveAmount" width="150" />
+            <el-table-column label="活动增送金额(元)" align="center" prop="activityGiveAmount" width="150" />
             <el-table-column label="创建人" align="center" prop="createBy" />
             <el-table-column label="创建时间" align="center" prop="createTime" />
             <el-table-column label="修改人" align="center" prop="updateBy" />
@@ -59,8 +59,8 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="24">
-                        <el-form-item label="送金额(元)" prop="activityGiveAmount">
-                            <el-input-number v-model="form.activityGiveAmount" placeholder="请输入额外加送金额" :precision="2" :min="0" :max="999999" />
+                        <el-form-item label="活动赠送金额(元)" prop="activityGiveAmount">
+                            <el-input-number v-model="form.activityGiveAmount" placeholder="请输入活动赠送金额" :precision="2" :min="0" :max="999999" />
                         </el-form-item>
                     </el-col>
                 </el-form>

+ 0 - 6
src/views/app/notify/index.vue

@@ -249,9 +249,3 @@ export default {
     }
 }
 </script>
-
-<style>
-textarea {
-    min-height: 200px;
-}
-</style>

+ 2 - 2
src/views/coupon/item/storeSendCoupon.vue

@@ -1,12 +1,12 @@
 <template>
     <div class="app-container">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
-            <el-form-item label="优惠券类型" prop="discountWay">
+            <el-form-item prop="discountWay">
                 <el-select v-model="queryParams.discountWay" placeholder="请选择优惠券类型" clearable>
                     <el-option v-for="dict in dict.type.coupon_type" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
             </el-form-item>
-            <el-form-item label="活动名称" prop="activityName">
+            <el-form-item prop="activityName">
                 <el-input v-model="queryParams.activityName" placeholder="请输入活动名称" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
             <el-form-item>

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 430 - 610
src/views/order/cloth/collectCloth.vue


+ 6 - 6
src/views/order/cloth/sendCloth.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="app-container">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item label="订单状态" prop="orderStatus">
+            <el-form-item prop="orderStatus">
                 <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" clearable>
                     <el-option key="6" label="清洗中" value="6" />
                     <el-option key="7" label="已上挂" value="7" />
@@ -9,22 +9,22 @@
                     <el-option key="9" label="送衣中" value="9" />
                 </el-select>
             </el-form-item>
-            <el-form-item label="订单来源" prop="orderSource">
+            <el-form-item prop="orderSource">
                 <el-select v-model="queryParams.flowStatus" placeholder="请选择订单来源" clearable>
                     <el-option key="0" label="线上" value="0" />
                     <el-option key="1" label="线下" value="1" />
                 </el-select>
             </el-form-item>
-            <el-form-item label="订单条码" prop="orderNo">
+            <el-form-item prop="orderNo">
                 <el-input v-model="queryParams.orderNo" placeholder="请输入订单条码" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
-            <el-form-item label="创建时间">
+            <el-form-item>
                 <el-date-picker v-model="createTimeRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
-            <el-form-item label="会员手机" prop="appUserPhoneNumber">
+            <el-form-item prop="appUserPhoneNumber">
                 <el-input v-model="queryParams.appUserPhoneNumber" placeholder="请输入会员手机" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
-            <el-form-item label="会员条码" prop="userId">
+            <el-form-item prop="userId">
                 <el-input v-model="queryParams.userId" placeholder="会员条码" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
 

+ 19 - 10
src/views/recharge/card/index.vue

@@ -68,12 +68,25 @@
             <!--      </el-table-column>-->
             <el-table-column label="归属门店" align="center" prop="rechargeStoreName" width="150" />
             <el-table-column label="充值金额(元)" align="center" prop="rechargeAmount" width="150" />
-            <el-table-column label="赠送金额(元)" align="center" prop="giveAmount" width="150" />
-            <el-table-column label="赠送积分" align="center" prop="givePointAmount" width="150" >
+            <el-table-column label="卡内金额(元)" align="center" prop="rechargeAmount" width="120">
+                <template slot-scope="scope">
+                    <span style="display: block; text-align: left">现金金额: {{ scope.row.rechargeAmount }}</span>
+                    <span style="display: block; text-align: left">赠送金额: {{ scope.row.giveAmount }}</span>
+                    <span style="display: block; text-align: left">福利金额: {{ scope.row.welfareAmount }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="卡内余额(元)" align="center" prop="rechargeAmount" width="120">
+                <template slot-scope="scope">
+                    <span style="display: block; text-align: left">现金金额: {{ scope.row.rechargeBalance }}</span>
+                    <span style="display: block; text-align: left">赠送金额: {{ scope.row.giveBalance }}</span>
+                    <span style="display: block; text-align: left">福利金额: {{ scope.row.welfareBalance }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="赠送积分" align="center" prop="givePointAmount" width="150">
                 <template slot-scope="scope">
                     {{ scope.row.givePointAmount == null || scope.row.givePointAmount == '' ? '0' : scope.row.givePointAmount }}
                 </template>
-                </el-table-column>
+            </el-table-column>
             <el-table-column label="使用状态" align="center" prop="rechargeStatus">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.recharge_use_status" :value="scope.row.rechargeStatus" />
@@ -89,7 +102,7 @@
                     {{ scope.row.rechargeTime == null ? '--' : scope.row.rechargeTime }}
                 </template>
             </el-table-column>
-            <el-table-column label="发放门店" align="center" prop="rechargeStoreName" width="150">
+            <el-table-column label="储值门店" align="center" prop="rechargeStoreName" width="150">
                 <template slot-scope="scope">
                     {{ scope.row.useBindStoreName == null ? '--' : scope.row.useBindStoreName }}
                 </template>
@@ -101,7 +114,7 @@
             <!--            </el-table-column>-->
             <el-table-column label="赠送金额激活时间" align="center" prop="giveActiveTime" width="150">
                 <template slot-scope="scope">
-                    {{ scope.row.giveActiveTime == null ? '--' : scope.row.giveActiveTime }}
+                    {{ scope.row.giveActiveTime == null ? '未激活' : scope.row.giveActiveTime }}
                 </template>
             </el-table-column>
             <el-table-column label="制卡人" align="center" prop="createBy" />
@@ -136,11 +149,7 @@
                 :limit="1"
                 accept=".xlsx, .xls"
                 :headers="upload.headers"
-                :action="
-                    num == 1
-                        ? upload.url + '?batchName=' + importForm.batchName + '&expireTime=' + importForm.expireTime + '&remark=' + importForm.remark 
-                        : upload.url2 + '?batchName=' + importForm.batchName + '&expireTime=' + importForm.expireTime+ '&remark=' + importForm.remark 
-                "
+                :action="num == 1 ? upload.url + '?batchName=' + importForm.batchName + '&expireTime=' + importForm.expireTime + '&remark=' + importForm.remark : upload.url2 + '?batchName=' + importForm.batchName + '&expireTime=' + importForm.expireTime + '&remark=' + importForm.remark"
                 :disabled="upload.isUploading"
                 :on-progress="handleFileUploadProgress"
                 :on-success="handleFileSuccess"

+ 300 - 297
src/views/recharge/order/index.vue

@@ -1,112 +1,115 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item prop="orderNo" v-if="userInfoVO.userType == '00'">
-        <el-input v-model="queryParams.orderNo" placeholder="请输入订单编号" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item prop="realName">
-        <el-input v-model="queryParams.realName" placeholder="请输入客户姓名" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item prop="phoneNumber">
-        <el-input v-model="queryParams.phoneNumber" placeholder="请输入手机号" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item prop="orderStatus">
-        <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" clearable>
-          <el-option v-for="dict in dict.type.recharge_order_status" :key="dict.code" :label="dict.label" :value="dict.value" />
-        </el-select>
-      </el-form-item>
-      <el-form-item prop="orgId" v-if="userInfoVO.userType == '00'">
-        <el-select v-model="queryParams.orgId" placeholder="请选择" filterable clearable>
-          <el-option v-for="store in storeList" :key="store.id + store.sourceType" :label="store.name" :value="store.id"> </el-option>
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
+            <el-form-item prop="orderNo" v-if="userInfoVO.userType == '00'">
+                <el-input v-model="queryParams.orderNo" placeholder="请输入订单编号" clearable @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item prop="realName">
+                <el-input v-model="queryParams.realName" placeholder="请输入客户姓名" clearable @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item prop="phoneNumber">
+                <el-input v-model="queryParams.phoneNumber" placeholder="请输入手机号" clearable @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item prop="orderStatus">
+                <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" clearable>
+                    <el-option v-for="dict in dict.type.recharge_order_status" :key="dict.code" :label="dict.label" :value="dict.value" />
+                </el-select>
+            </el-form-item>
+            <el-form-item prop="orgId" v-if="userInfoVO.userType == '00'">
+                <el-select v-model="queryParams.orgId" placeholder="请选择门店" filterable clearable>
+                    <el-option v-for="store in storeList" :key="store.id + store.sourceType" :label="store.name" :value="store.id"> </el-option>
+                </el-select>
+            </el-form-item>
+            <div></div>
+            <el-form-item>
+                <el-date-picker clearable v-model="queryCreateTime" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="下单时间" end-placeholder="结束日期" @change="getCreateTime"> </el-date-picker>
+            </el-form-item>
+            <el-form-item>
+                <el-date-picker clearable v-model="queryPayTime" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="付款时间" end-placeholder="结束日期" @change="getPayTime"> </el-date-picker>
+            </el-form-item>
 
-        </el-select>
-      </el-form-item>
-      <div></div>
-      <el-form-item>
-        <el-date-picker clearable v-model="queryCreateTime" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="下单时间"
-          end-placeholder="结束日期" @change="getCreateTime"> </el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-date-picker clearable v-model="queryPayTime" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="付款时间"
-          end-placeholder="结束日期" @change="getPayTime"> </el-date-picker>
-      </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
 
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button type="warning" plain icon="el-icon-download" @click="handleExport" v-hasPermi="['recharge:order:export']" v-if="userInfoVO.userType == '00'">导出</el-button>
+            </el-col>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" @click="handleExport" v-hasPermi="['recharge:order:export']"
-          v-if="userInfoVO.userType == '00'">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+        <Page uri="/mapi/recharge/order/list" :request-params="queryParams" ref="pagination">
+            <el-table-column label="订单编号" align="center" width="130" prop="orderNo" />
+            <el-table-column label="下单门店" align="center" v-if="userInfoVO.userType == '00'">
+                <template slot-scope="scope">
+                    {{ scope.row.storeName }}
+                </template>
+            </el-table-column>
+            <el-table-column label="客户姓名" align="center" prop="realName" />
+            <el-table-column label="客户手机号" align="center" prop="phoneNumber" width="110" />
+            <el-table-column label="支付方式" align="center" prop="payType">
+                <template slot-scope="scope">
+                    <div v-if="scope.row.payType != ''">
+                        <dict-tag :options="dict.type.recharge_pay_type" :value="scope.row.payType" />
+                    </div>
+                </template>
+            </el-table-column>
+            <el-table-column label="支付金额(元)" align="center" prop="payAmount" width="120">
+                <template slot-scope="scope">
+                    <span style="display: block; text-align: left">现金付款: {{ scope.row.cashPayAmount }}</span>
+                    <span style="display: block; text-align: left">微信付款: {{ scope.row.wxPayAmount }}</span>
+                    <span style="display: block; text-align: left">支付宝付款: {{ scope.row.aliPayAmount }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="充值金额(元)" align="center" prop="rechargeAmount" width="120">
+                <template slot-scope="scope">
+                    <span style="display: block; text-align: left">现金金额: {{ scope.row.rechargeAmount }}</span>
+                    <span style="display: block; text-align: left">赠送金额: {{ scope.row.giveAmount }}</span>
+                    <span style="display: block; text-align: left">福利金额: {{ scope.row.welfareAmount }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="赠送积分" align="center" prop="givePointAmount" v-if="userInfoVO.userType == '02'" />
 
-    <Page uri="/mapi/recharge/order/list" :request-params="queryParams" ref="pagination">
-      <el-table-column label="订单编号" align="center" width="190" prop="orderNo" />
-      <el-table-column label="下单门店" align="center" v-if="userInfoVO.userType == '00'">
-        <template slot-scope="scope">
-          {{ scope.row.storeName }}
-        </template>
-      </el-table-column>
-      <el-table-column label="客户姓名" align="center" prop="realName" />
-      <el-table-column label="客户手机号" align="center" prop="phoneNumber" width="110" />
-      <el-table-column label="支付金额(元)" align="center" prop="payAmount" width="120" />
-      <!-- <el-table-column label="总金额(元)" align="center" width="100">
+            <el-table-column label="订单状态" align="center" prop="orderStatus" width="120">
+                <template slot-scope="scope">
+                    <dict-tag :options="dict.type.recharge_order_status" :value="scope.row.orderStatus" />
+                </template>
+            </el-table-column>
+            <el-table-column label="退款状态" align="center" prop="orderStatus" width="120">
+                <template slot-scope="scope">
+                    <dict-tag :options="dict.type.recharge_refund_status" :value="scope.row.refundStatus" />
+                </template>
+            </el-table-column>
+            <el-table-column label="下单时间" align="center" prop="createTime" />
+            <el-table-column label="支付时间" align="center" prop="payTime">
+                <template slot-scope="scope">
+                    {{ scope.row.payTime == null ? '--' : scope.row.payTime }}
+                </template>
+            </el-table-column>
+            <el-table-column label="退款时间" align="center" prop="refundTime">
                 <template slot-scope="scope">
-                    {{ scope.row.rechargeAmount + scope.row.giveAmount + scope.row.welfareAmount }}
+                    {{ scope.row.refundTime == null ? '--' : scope.row.refundTime }}
                 </template>
-            </el-table-column> -->
-      <el-table-column label="充值金额(元)" align="center" prop="rechargeAmount" width="120">
-        <template slot-scope="scope">
-          <span style="display: block; text-align: left;">现金金额: {{ scope.row.rechargeAmount}}</span>
-          <span style="display: block; text-align: left;">赠送金额: {{ scope.row.giveAmount}}</span>
-          <span style="display: block; text-align: left;">福利金额: {{ scope.row.welfareAmount}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="赠送积分" align="center" prop="givePointAmount" v-if="userInfoVO.userType == '02'" />
-      <el-table-column label="支付方式" align="center" prop="payType">
-        <template slot-scope="scope">
-          <div v-if="scope.row.payType != ''">
-            <dict-tag :options="dict.type.recharge_pay_type" :value="scope.row.payType" />
-          </div>
-          <div v-if="scope.row.payType == null">
-            <span>分段支付</span>
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="订单状态" align="center" prop="orderStatus">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.recharge_order_status" :value="scope.row.orderStatus" />
-        </template>
-      </el-table-column>
-      <el-table-column label="下单时间" align="center" prop="createTime" width="180" />
-      <el-table-column label="支付时间" align="center" prop="payTime" width="180">
-        <template slot-scope="scope">
-          {{ scope.row.payTime == null  ? '--' : scope.row.payTime }}
-        </template>
-      </el-table-column>
-      <el-table-column label="退款时间" align="center" prop="refundTime" width="180">
-        <template slot-scope="scope">
-          {{ scope.row.refundTime == null  ? '--' : scope.row.refundTime }}
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150">
-        <template slot-scope="scope">
-          <el-button type="text" @click="handleDetail(scope.row)">明细</el-button>
-          <el-button type="text" @click="refundOrder(scope.row)"
-            v-if="userInfoVO.userType == '00' && scope.row.refundStatus != '1' && scope.row.refundStatus != '2' && scope.row.orderStatus != '0' && scope.row.orderStatus != '100'">
-            撤单</el-button>
-        </template>
-      </el-table-column>
-    </Page>
+            </el-table-column>
+            <el-table-column label="备注" align="center" prop="remark">
+                <template slot-scope="scope">
+                    {{ scope.row.remark == null ? '--' : scope.row.remark }}
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150">
+                <template slot-scope="scope">
+                    <el-button type="text" @click="handleDetail(scope.row)">明细</el-button>
+                    <el-button type="text" @click="refundOrder(scope.row)" v-if="userInfoVO.userType == '00' && scope.row.refundStatus != '1' && scope.row.refundStatus != '5' && scope.row.refundStatus != '2' && scope.row.orderStatus != '0' && scope.row.orderStatus != '100'"> 撤单</el-button>
+                </template>
+            </el-table-column>
+        </Page>
 
-    <el-dialog :title="title" :visible.sync="open" size="70%" append-to-body>
+        <el-dialog :title="title" :visible.sync="open" size="70%" append-to-body>
             <el-row :gutter="15" style="margin-bottom: 80px; margin-left: 20px; width: calc(100% - 20px)">
-                <el-col :span="24" style="margin-bottom: 10px;">订单明细:</el-col>
+                <el-col :span="24" style="margin-bottom: 10px">订单明细:</el-col>
                 <el-col :span="24">
                     <el-descriptions class="margin-top" :column="2" border>
                         <el-descriptions-item>
@@ -133,14 +136,14 @@
                             <template slot="label"> 付款金额(元) </template>
                             {{ orderDetail.payAmount }}
                         </el-descriptions-item>
-                        <el-descriptions-item label="储值金额" v-if="orderDetail.orderStatus=='2'">{{ orderDetail.rechargeAmount }} 元</el-descriptions-item>
-                        <el-descriptions-item label="储值赠送金额" v-if="orderDetail.orderStatus=='2'">{{ orderDetail.giveAmount }} 元</el-descriptions-item>
-                        <el-descriptions-item label="储值福利金额" v-if="orderDetail.orderStatus=='2'">{{ orderDetail.welfareAmount }} 元</el-descriptions-item>
+                        <el-descriptions-item label="储值金额" v-if="orderDetail.orderStatus == '2'">{{ orderDetail.rechargeAmount }} 元</el-descriptions-item>
+                        <el-descriptions-item label="储值赠送金额" v-if="orderDetail.orderStatus == '2'">{{ orderDetail.giveAmount }} 元</el-descriptions-item>
+                        <el-descriptions-item label="储值福利金额" v-if="orderDetail.orderStatus == '2'">{{ orderDetail.welfareAmount }} 元</el-descriptions-item>
                         <el-descriptions-item>
                             <template slot="label"> 下单时间 </template>
                             {{ orderDetail.createTime }}
                         </el-descriptions-item>
-                        <el-descriptions-item :span="2" >
+                        <el-descriptions-item :span="2">
                             <template slot="label"> 充值门店 </template>
                             {{ orderDetail.storeName ? orderDetail.storeName : '' }}
                         </el-descriptions-item>
@@ -150,8 +153,8 @@
                         </el-descriptions-item>
                     </el-descriptions>
                 </el-col>
-                <el-col :span="24" style="margin-top: 20px;margin-bottom: 10px;" v-if="orderDetail.rechargePasswordCard">储值卡明细:</el-col>
-                <el-col :span="24"  v-if="orderDetail.rechargePasswordCard">
+                <el-col :span="24" style="margin-top: 20px; margin-bottom: 10px" v-if="orderDetail.rechargePasswordCard">储值卡明细:</el-col>
+                <el-col :span="24" v-if="orderDetail.rechargePasswordCard">
                     <el-descriptions class="margin-top" :column="2" border>
                         <el-descriptions-item>
                             <template slot="label"> 卡号 </template>
@@ -179,7 +182,7 @@
                             {{ orderDetail.rechargePasswordCard.givePointAmount }}
                         </el-descriptions-item>
 
-                        <el-descriptions-item :span="2" >
+                        <el-descriptions-item :span="2">
                             <template slot="label"> 储值卡状态 </template>
                             <dict-tag :options="dict.type.recharge_use_status" :value="orderDetail.rechargePasswordCard.rechargeStatus" />
                         </el-descriptions-item>
@@ -193,20 +196,20 @@
             </div>
         </el-dialog>
 
-    <!--    撤单页面-->
-    <el-dialog :visible.sync="openRefundPage" width="400px" append-to-body>
-      <el-form ref="refundVO" :model="refundVO">
-        <el-form-item label="撤单原因" label-width="80px" prop="refundDescribe">
-          <el-input v-model="refundVO.refundDescribe" type="textarea" placeholder="请输入撤单原因" maxlength="500" :rows="5" show-word-limit></el-input>
-        </el-form-item>
-      </el-form>
-      <el-row :gutter="10">
-        <div>
-          <el-button type="primary" @click="submitRefund" style="margin-left: 3%; margin-top: 20px">提交</el-button>
-        </div>
-      </el-row>
-    </el-dialog>
-  </div>
+        <!--    撤单页面-->
+        <el-dialog :visible.sync="openRefundPage" width="400px" append-to-body>
+            <el-form ref="refundVO" :model="refundVO">
+                <el-form-item label="撤单原因" label-width="80px" prop="refundDescribe">
+                    <el-input v-model="refundVO.refundDescribe" type="textarea" placeholder="请输入撤单原因" maxlength="500" :rows="5" show-word-limit></el-input>
+                </el-form-item>
+            </el-form>
+            <el-row :gutter="10">
+                <div>
+                    <el-button type="primary" @click="submitRefund" style="margin-left: 3%; margin-top: 20px">提交</el-button>
+                </div>
+            </el-row>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
@@ -216,187 +219,187 @@ import { refundOrderGoods } from '@/api/order/goods'
 import { refundRecharge } from '@/api/recharge/refund'
 
 export default {
-  name: 'OrderRechargeRecord',
-  dicts: ['recharge_use_status','recharge_pay_type', 'recharge_order_status'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 充值订单表格数据
-      orderList: [],
-      // 弹出层标题
-      title: '',
-      // 是否显示弹出层
-      open: false,
-      openRefundPage: false,
-      // 查询参数
-      queryParams: {
-        orderNo: null,
-        sourceType: null,
-        orgId: null,
-        storeName: null,
-        phoneNumber: null,
-        realName: null,
-        orderStatus: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {},
-      queryCreateTime: null,
-      queryPayTime: null,
-      userInfoVO: null,
-      orderDetail: {},
-      storeList: [],
-      payDetailList: [],
-      refundVO: {
-        orderId: null,
-        refundDescribe: null
-      }
-    }
-  },
-  created() {
-    allOrg().then((res) => {
-      res.data.forEach((org) => {
-        if (org.sourceType == '02') {
-          this.storeList.push(org)
+    name: 'OrderRechargeRecord',
+    dicts: ['recharge_use_status', 'recharge_refund_status', 'recharge_pay_type', 'recharge_order_status'],
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 充值订单表格数据
+            orderList: [],
+            // 弹出层标题
+            title: '',
+            // 是否显示弹出层
+            open: false,
+            openRefundPage: false,
+            // 查询参数
+            queryParams: {
+                orderNo: null,
+                sourceType: null,
+                orgId: null,
+                storeName: null,
+                phoneNumber: null,
+                realName: null,
+                orderStatus: null
+            },
+            // 表单参数
+            form: {},
+            // 表单校验
+            rules: {},
+            queryCreateTime: null,
+            queryPayTime: null,
+            userInfoVO: null,
+            orderDetail: {},
+            storeList: [],
+            payDetailList: [],
+            refundVO: {
+                orderId: null,
+                refundDescribe: null
+            }
         }
-      })
-    })
-    this.handleUser()
-    this.getList()
-  },
-  methods: {
-    getCreateTime() {
-      if (this.queryCreateTime != null) {
-        this.queryParams.createTimeFrom = this.queryCreateTime[0]
-        this.queryParams.createTimeTo = this.queryCreateTime[1]
-      }
-    },
-    getPayTime() {
-      if (this.queryPayTime != null) {
-        this.queryParams.beginPayTime = this.queryPayTime[0]
-        this.queryParams.endPayTime = this.queryPayTime[1]
-      }
-    },
-    handleUser() {
-      this.userInfoVO = this.getUserInfo()
-    },
-    /** 查询充值订单列表 */
-    getList() {
-      this.$nextTick(() => {
-        this.$refs.pagination.handleSearch(true)
-      })
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    // 表单重置
-    reset() {
-      this.form = {}
-      this.resetForm('form')
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.getList()
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.queryCreateTime = null
-      this.queryParams.createTimeFrom = null
-      this.queryParams.createTimeTo = null
-
-      this.queryPayTime = null
-      this.queryParams.beginPayTime = null
-      this.queryParams.endPayTime = null
-      this.resetForm('queryForm')
-      this.handleQuery()
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset()
-      this.open = true
-      this.title = '添加充值订单'
-    },
-    /** 支付明细详情 */
-    handleDetail(row) {
-      this.reset()
-      const id = row.id
-      getOrder(id).then((response) => {
-        this.orderDetail = response.data
-        this.open = true
-        this.title = '支付明细详情'
-      })
-    },
-    // 撤单
-    refundOrder(row) {
-      this.refundVO = {}
-      this.openRefundPage = true
-      this.refundVO.orderId = row.id
-    },
-    submitRefund() {
-      this.$confirm('是否确认撤回该订单?')
-        .then(() => {
-          refundRecharge(this.refundVO).then((response2) => {
-            this.$message.success('操作成功')
-            this.getList()
-            this.openRefundPage = false
-            this.refundVO.orderId = null
-            this.refundVO.refundReason = null
-          })
-        })
-        .catch(() => { })
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids
-      this.$modal
-        .confirm('是否确认删除充值订单编号为"' + ids + '"的数据项?')
-        .then(function () {
-          return delOrder(ids)
-        })
-        .then(() => {
-          this.getList()
-          this.$modal.msgSuccess('删除成功')
+    created() {
+        allOrg().then((res) => {
+            res.data.forEach((org) => {
+                if (org.sourceType == '02') {
+                    this.storeList.push(org)
+                }
+            })
         })
-        .catch(() => { })
+        this.handleUser()
+        this.getList()
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download(
-        'mapi/recharge/order/export',
-        {
-          ...this.queryParams
+    methods: {
+        getCreateTime() {
+            if (this.queryCreateTime != null) {
+                this.queryParams.createTimeFrom = this.queryCreateTime[0]
+                this.queryParams.createTimeTo = this.queryCreateTime[1]
+            }
         },
-        `recharge_order_${new Date().getTime()}.xlsx`
-      )
-    },
-    checkClose(done) {
-      this.$confirm('是否关闭表单,关闭后数据将丢失?')
-        .then(function () {
-          done()
-        })
-        .then(() => { })
-        .catch(() => { })
+        getPayTime() {
+            if (this.queryPayTime != null) {
+                this.queryParams.beginPayTime = this.queryPayTime[0]
+                this.queryParams.endPayTime = this.queryPayTime[1]
+            }
+        },
+        handleUser() {
+            this.userInfoVO = this.getUserInfo()
+        },
+        /** 查询充值订单列表 */
+        getList() {
+            this.$nextTick(() => {
+                this.$refs.pagination.handleSearch(true)
+            })
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false
+            this.reset()
+        },
+        // 表单重置
+        reset() {
+            this.form = {}
+            this.resetForm('form')
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.queryCreateTime = null
+            this.queryParams.createTimeFrom = null
+            this.queryParams.createTimeTo = null
+
+            this.queryPayTime = null
+            this.queryParams.beginPayTime = null
+            this.queryParams.endPayTime = null
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map((item) => item.id)
+            this.single = selection.length !== 1
+            this.multiple = !selection.length
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset()
+            this.open = true
+            this.title = '添加充值订单'
+        },
+        /** 支付明细详情 */
+        handleDetail(row) {
+            this.reset()
+            const id = row.id
+            getOrder(id).then((response) => {
+                this.orderDetail = response.data
+                this.open = true
+                this.title = '支付明细详情'
+            })
+        },
+        // 撤单
+        refundOrder(row) {
+            this.refundVO = {}
+            this.openRefundPage = true
+            this.refundVO.orderId = row.id
+        },
+        submitRefund() {
+            this.$confirm('是否确认撤回该订单?')
+                .then(() => {
+                    refundRecharge(this.refundVO).then((response2) => {
+                        this.$message.success('操作成功')
+                        this.getList()
+                        this.openRefundPage = false
+                        this.refundVO.orderId = null
+                        this.refundVO.refundReason = null
+                    })
+                })
+                .catch(() => {})
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const ids = row.id || this.ids
+            this.$modal
+                .confirm('是否确认删除充值订单编号为"' + ids + '"的数据项?')
+                .then(function () {
+                    return delOrder(ids)
+                })
+                .then(() => {
+                    this.getList()
+                    this.$modal.msgSuccess('删除成功')
+                })
+                .catch(() => {})
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            this.download(
+                'mapi/recharge/order/export',
+                {
+                    ...this.queryParams
+                },
+                `recharge_order_${new Date().getTime()}.xlsx`
+            )
+        },
+        checkClose(done) {
+            this.$confirm('是否关闭表单,关闭后数据将丢失?')
+                .then(function () {
+                    done()
+                })
+                .then(() => {})
+                .catch(() => {})
+        }
     }
-  }
 }
 </script>

+ 35 - 23
src/views/recharge/refund/index.vue

@@ -68,41 +68,52 @@
             <!--      <el-table-column type="selection" width="55" align="center" fixed="left"/>-->
             <!--      <el-table-column label="主键ID" align="center" prop="id" />-->
             <el-table-column label="订单编号" align="center" prop="orderNo" />
-            <el-table-column label="客户姓名" align="center" prop="realName" />
-            <el-table-column label="客户手机号" align="center" prop="phoneNumber" />
-            <el-table-column label="退款申请时间" align="center" prop="refundApplyTime" width="180">
+            <el-table-column label="储值卡号" align="center" prop="cardNo" />
+            <el-table-column label="储值门店" align="center">
                 <template slot-scope="scope">
-                    <span>{{ parseTime(scope.row.refundApplyTime, '{y}-{m}-{d}') }}</span>
+                    {{ scope.row.storeName }}
                 </template>
             </el-table-column>
-            <el-table-column label="退款时间" align="center" prop="refundTime" width="180">
+            <el-table-column label="客户姓名" align="center" prop="appUserName" />
+            <el-table-column label="客户手机号" align="center" prop="appUserPhone" />
+            <el-table-column label="退款金额" align="center" prop="refundAmount" />
+            <el-table-column label="退款方式" align="center" prop="refundType">
                 <template slot-scope="scope">
-                    <span>{{ parseTime(scope.row.refundTime, '{y}-{m}-{d}') }}</span>
+                    <dict-tag :options="dict.type.recharge_pay_type" :value="scope.row.refundType" />
                 </template>
             </el-table-column>
-            <el-table-column label="退款金额" align="center" prop="refundAmount" />
-            <el-table-column label="退款描述" align="center" prop="refundDescribe" />
-            <el-table-column label="订单状态" align="center" prop="orderStatus">
+            <el-table-column label="退款金额(元)" align="center" prop="payAmount" width="120">
+                <template slot-scope="scope">
+                    <span style="display: block; text-align: left">现金退款: {{ scope.row.cashRefundAmount }}</span>
+                    <span style="display: block; text-align: left">微信退款: {{ scope.row.wxRefundAmount }}</span>
+                    <span style="display: block; text-align: left">支付宝退款: {{ scope.row.aliRefundAmount }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="卡内余额(元)" align="center" prop="rechargeAmount" width="120">
+                <template slot-scope="scope">
+                    <span style="display: block; text-align: left">现金余额: {{ scope.row.rechargeBalance }}</span>
+                    <span style="display: block; text-align: left">赠送余额: {{ scope.row.giveBalance }}</span>
+                    <span style="display: block; text-align: left">福利余额: {{ scope.row.welfareBalance }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="退款描述" align="center" prop="refundReason" />
+            <el-table-column label="退款申请时间" align="center" prop="refundApplyTime" width="180">
+                <template slot-scope="scope">
+                    <span>{{ scope.row.refundApplyTime }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="退款时间" align="center" prop="refundTime" width="180">
                 <template slot-scope="scope">
-                    <el-tag v-if="scope.row.orderStatus == '4'">退款申请中</el-tag>
-                    <el-tag v-if="scope.row.orderStatus == '5'" type="danger">退款失败</el-tag>
-                    <el-tag v-if="scope.row.orderStatus == '6'" type="success">已退款</el-tag>
+                    <span>{{ scope.row.refundTime }}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="门店名称" align="center">
+            <el-table-column label="退卡状态" align="center" prop="refundStatus" width="120">
                 <template slot-scope="scope">
-                    <span v-if="scope.row.sourceType === '01'">
-                        {{ scope.row.factoryName }}
-                    </span>
-                    <span v-if="scope.row.sourceType === '02'">
-                        {{ scope.row.storeName }}
-                    </span>
-                    <span v-if="scope.row.sourceType === '00'"> </span>
+                    <dict-tag :options="dict.type.recharge_refund_status" :value="scope.row.refundStatus" />
                 </template>
             </el-table-column>
-            <el-table-column label="备注" align="center" prop="remark" />
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200">
-                <template slot-scope="scope" v-if="scope.row.orderStatus == '4'">
+                <template slot-scope="scope" v-if="scope.row.refundStatus == '1'">
                     <el-button type="text" icon="el-icon-close" @click="handleApprovalNo(scope.row)" v-hasPermi="['recharge:order:edit']">拒绝退卡</el-button>
                     <el-button type="text" icon="el-icon-check" @click="handleApprovalYes(scope.row)" v-hasPermi="['recharge:order:edit']">同意退卡</el-button>
                 </template>
@@ -188,6 +199,7 @@ import { listRefund, refundApprovalNo, refundApprovalYes } from '@/api/recharge/
 
 export default {
     name: 'Refund',
+    dicts: ['recharge_use_status', 'recharge_refund_status', 'recharge_pay_type', 'recharge_order_status'],
     data() {
         return {
             // 遮罩层
@@ -321,7 +333,7 @@ export default {
         handleApprovalYes(row) {
             const id = row.id
             this.$modal
-                .confirm('该卡剩余余额' + row.rechargeAmount + '元,赠送金额' + row.giveAmount + '元,可退金额' + row.rechargeAmount + '元,请确定同意该客户的退卡申请,同意后,金额将退回支付账户”')
+                .confirm('该卡剩余余额' + row.rechargeBalance + '元,赠送金额' + row.giveBalance + '元,可退金额' + row.rechargeBalance + '元,请确定同意该客户的退卡申请,同意后,金额将退回支付账户”')
                 .then(function () {
                     return refundApprovalYes(id)
                 })

+ 0 - 5
src/views/system/user/index.vue

@@ -795,8 +795,3 @@ export default {
     }
 }
 </script>
-<style>
-textarea {
-    min-height: 200px;
-}
-</style>

+ 946 - 904
src/views/workbench/workRecharge/index.vue

@@ -1,939 +1,981 @@
 <template>
-  <div class="app-container">
-    <el-row :gutter="20">
-      <el-col :span="6">
-          <el-card class="box-card custom-card">
-            <div slot="header" class="clearfix">
-              <span>选择客户</span>
-              <el-button type="primary"
-                         style="float: right;"
-                          
-                         plain
-                         icon="el-icon-plus"
-                         @click="handleAdd"
-                         v-if="userInfoVO.userType == '02'"
-              >新建客户</el-button>
-            </div>
-            <el-form :model="queryParams" ref="queryForm" size="small"  :inline="true" label-width="68px" @submit.native.prevent>
-              <el-form-item label="手机号" prop="phoneNumber" >
-                <el-input
-                  v-model="queryParams.phoneNumber"
-                  placeholder="请输入手机号"
-                  clearable
-                  maxlength="11"
-                  @change="searchUser"
-                />
-              </el-form-item>
-              <el-form-item>
-                <el-button type="primary" icon="el-icon-full-screen"   @click="qrcodeSearchUser">扫码</el-button>
-                <el-button type="primary" icon="el-icon-search"   @click="searchUser">查询</el-button>
-              </el-form-item>
-            </el-form>
+    <div class="app-container">
+        <el-row :gutter="20">
+            <el-col :span="12">
+                <el-card class="box-card custom-card">
+                    <div slot="header" class="clearfix">
+                        <span>选择客户</span>
+                        <el-button type="primary" style="float: right" plain icon="el-icon-plus" @click="handleAdd" v-if="userInfoVO.userType == '02'">新建客户 </el-button>
+                    </div>
+                    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px" @submit.native.prevent>
+                        <el-form-item label="手机号" prop="phoneNumber">
+                            <el-input v-model="queryParams.phoneNumber" placeholder="请输入手机号" clearable maxlength="11" @change="searchUser" @keyup.enter.native="searchUser" />
+                        </el-form-item>
+                        <el-form-item>
+                            <!--                            <el-button type="primary" icon="el-icon-full-screen" @click="qrcodeSearchUser">扫码</el-button>-->
+                            <el-button type="primary" icon="el-icon-search" @click="searchUser">查询</el-button>
+                        </el-form-item>
+                    </el-form>
 
-            <el-descriptions title="用户信息" v-if="appUserInfo" :column="2">
-              <el-descriptions-item label="用户名" span="2">{{appUserInfo.realName}}</el-descriptions-item>
-              <el-descriptions-item label="手机号" span="2">{{appUserInfo.phoneNumber}}</el-descriptions-item>
-              <el-descriptions-item label="等级">{{appUserInfo.level}}</el-descriptions-item>
-              <el-descriptions-item label="余额">
-                {{(appUserInfo.rechargeBalance*100 + appUserInfo.giveBalance*100)/100}}
-              </el-descriptions-item>
-              <el-descriptions-item label="现金">
-                {{(appUserInfo.rechargeBalance*100)/100}}
-              </el-descriptions-item>
-              <el-descriptions-item label="赠送余额">
-                {{(appUserInfo.giveBalance*100)/100}}
-              </el-descriptions-item>
-              <el-descriptions-item label="积分">
-                {{appUserInfo.pointBalance}}
-              </el-descriptions-item>
-            </el-descriptions>
-          </el-card>
-      </el-col>
+                    <el-descriptions title="用户信息" v-if="appUserInfo" :column="2">
+                        <el-descriptions-item label="用户名" span="2">{{ appUserInfo.realName }}</el-descriptions-item>
+                        <el-descriptions-item label="手机号" span="2">{{ appUserInfo.phoneNumber }} </el-descriptions-item>
+                        <el-descriptions-item label="现金余额">
+                            {{ (appUserInfo.rechargeBalance * 100) / 100 }}
+                        </el-descriptions-item>
+                        <el-descriptions-item label="赠送余额">
+                            {{ (appUserInfo.giveBalance * 100) / 100 }}
+                        </el-descriptions-item>
+                        <el-descriptions-item label="福利金">
+                            {{ (appUserInfo.welfareBalance * 100) / 100 }}
+                        </el-descriptions-item>
 
-      <!-- 充值类型 -->
-      <el-col :span="18">
-        <el-card class="box-card">
-          <div slot="header" class="clearfix">
-            <span>充值信息</span>
-          </div>
-          <el-form ref="rechargeFrom" :model="rechargeFrom" :rules="rules" label-width="160px" @submit.native.prevent>
-            <el-col :span="24">
-              <el-form-item label="请选择充值类型" label-width="120px" prop="rechargeType">
-                <el-col :span="18">
-                  <el-radio-group  v-model="rechargeFrom.rechargeType" style="width: 500px" @input="clearData">
-                    <el-radio-button  label="3">自定义充值</el-radio-button>
-                    <el-radio-button  label="0">套餐充值</el-radio-button>
-                    <el-radio-button  label="1">福利金额充值</el-radio-button>
-                    <el-radio-button  label="2">卡密充值</el-radio-button>
-                  </el-radio-group>
-                </el-col>
-              </el-form-item>
+                        <el-descriptions-item label="积分">
+                            {{ appUserInfo.pointBalance }}
+                        </el-descriptions-item>
+                        <el-descriptions-item label="等级">{{ appUserInfo.level }}</el-descriptions-item>
+                    </el-descriptions>
 
-              <el-form-item label="请选择充值套餐" label-width="120px" prop="rechargeMealId" v-if="rechargeFrom.rechargeType == 0">
-                <el-col :span="18">
-                  <el-select v-model="rechargeFrom.rechargeMealId" placeholder="请选择充值套餐"  style="width: 200px"
-                             clearable
-                             @input="getActivityInfo(rechargeFrom.rechargeMealId)">
-                    <el-option
-                      v-for="recharge in rechargeList"
-                      :key="recharge.id"
-                      :label="recharge.title"
-                      :value="recharge.id"
-                    />
-                  </el-select>
-                </el-col>
-              </el-form-item>
-              <el-form-item label="自定义充值金额(元)" label-width="160px" prop="customAmount" v-if="rechargeFrom.rechargeType == 3">
-                <el-input-number v-model="rechargeFrom.customAmount" :controls="false" :min="0" :max="1000" ></el-input-number>
-              </el-form-item>
-              <el-form-item label="福利金额(元)" label-width="120px" prop="welfareAmount" v-if="rechargeFrom.rechargeType == 1">
-                <el-col :span="18">
-                  <el-input-number v-model="rechargeFrom.welfareAmount"  :controls="false" :min="0" :max="999999"></el-input-number>
-                </el-col>
-              </el-form-item>
-              <el-form-item label="卡号" label-width="50px"  v-if="rechargeFrom.rechargeType == 2" required>
-                <el-col :span="12">
-                <el-input v-model="rechargeFrom.rechargeCardNo" ></el-input>
-                </el-col>
-              </el-form-item>
-              <el-form-item label="密码" label-width="50px"  v-if="rechargeFrom.rechargeType == 2" required>
-                <el-col :span="12">
-                <el-input v-model="rechargeFrom.rechargeCardPassword" ></el-input>
-                </el-col>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-card style="width: 550px" v-if="rechargeFrom.rechargeType == 0 ">
-              <el-descriptions title="套餐活动信息" :column="1"
-                               :label-style="{'text-align': 'center'}" :contentStyle="{'text-align': 'center'}" >
-                <el-descriptions-item label="本次充值金额" style="width: 100px" v-if="activityAmount != null && activityAmount != '' ">{{getRechargeTypeInfo == '' ? '--' : getRechargeTypeInfo.rechargeAmount}}</el-descriptions-item>
-                <el-descriptions-item label="原赠送金额" v-if="activityAmount != null && activityAmount != '' ">{{getRechargeTypeInfo  == '' ? '--' : getRechargeTypeInfo.giveAmount}}</el-descriptions-item>
-                <el-descriptions-item label="现活动赠送金额" v-if="activityAmount != null && activityAmount != '' ">{{activityAmount}}</el-descriptions-item>
-                <el-descriptions-item label="此套餐未参与活动" v-if="activityAmount == null || activityAmount == '' "></el-descriptions-item>
-              </el-descriptions>
-              </el-card>
+                    <Page uri="/mapi/recharge/card/list" :request-params="cardParams" ref="pagination" v-if="appUserInfo" :page-size="5">
+                        <el-table-column label="卡号" align="center" prop="cardNo" width="100" />
+                        <el-table-column label="储值门店" align="center" prop="rechargeStoreName" width="100">
+                            <template slot-scope="scope">
+                                {{ scope.row.useBindStoreName == null ? '--' : scope.row.useBindStoreName }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="充值金额(元)" align="center" prop="rechargeAmount" width="120" />
+                        <el-table-column label="卡内余额(元)" align="center" prop="rechargeAmount" width="120">
+                            <template slot-scope="scope">
+                                <span style="display: block; text-align: left">现金金额: {{ scope.row.rechargeBalance }}</span>
+                                <span style="display: block; text-align: left">赠送金额: {{ scope.row.giveBalance }}</span>
+                                <span style="display: block; text-align: left">福利金额: {{ scope.row.welfareBalance }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="充值时间" align="center" prop="rechargeTime" width="100">
+                            <template slot-scope="scope">
+                                {{ scope.row.rechargeTime == null ? '--' : scope.row.rechargeTime }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="状态" align="center" prop="rechargeStatus">
+                            <template slot-scope="scope">
+                                <dict-tag :options="dict.type.recharge_use_status" :value="scope.row.rechargeStatus" />
+                            </template>
+                        </el-table-column>
+                    </Page>
+                </el-card>
             </el-col>
-<!--            <el-col :span="24">-->
-<!--              <el-card class="box-card" shadow="hover" style="width: 150px" @click.native="clickRecharge">-->
-<!--                <div slot="header" class="clearfix">-->
-<!--                  <span></span>-->
-<!--                  <span style="float: right">赠送500元</span>-->
-<!--                </div>-->
-<!--                <div class="text item">-->
-<!--                  <span>{{'充值金额 ' + "1" }}</span>-->
-<!--                  <span>{{'充值金额 ' + "1" }}</span>-->
-<!--                </div>-->
-<!--              </el-card>-->
-<!--            </el-col>-->
-          </el-form>
-          <div>
-            <el-button type="primary" @click="submitCash" style="margin-left: 3%;margin-top: 20px">收银</el-button>
-          </div>
-        </el-card>
-      </el-col>
-    </el-row>
-    <!-- 支付方式 -->
-    <el-dialog :title="rechargeTitle" :visible.sync="openRecharge" width="75%" :before-close="checkClosePay">
 
-      <el-descriptions title="核对信息" v-if="rechargeInfo && appUserInfo" :column="4" border :contentStyle="{'text-align': 'center'}">
-        <el-descriptions-item label="本次充值金额" :labelStyle="{width: '14%'}" >{{rechargeInfo.rechargeAmount}}</el-descriptions-item>
-        <el-descriptions-item label="本次赠送金额" :labelStyle="{width: '14%'}" >{{activityAmount != null && activityAmount != '' ? activityAmount : rechargeInfo.giveAmount}}</el-descriptions-item>
-        <el-descriptions-item label="本次赠送积分" :labelStyle="{width: '14%'}">{{rechargeInfo.givePointAmount}}</el-descriptions-item>
-        <el-descriptions-item label="本次福利金额" :labelStyle="{width: '14%'}">{{rechargeInfo.welfareAmount}}</el-descriptions-item>
+            <!-- 充值类型 -->
+            <el-col :span="12">
+                <el-card class="box-card">
+                    <div slot="header" class="clearfix">
+                        <span>充值信息</span>
+                    </div>
+                    <el-form ref="rechargeFrom" :model="rechargeFrom" :rules="rules" label-width="160px" @submit.native.prevent>
+                        <el-col :span="24">
+                            <el-form-item label="请选择充值类型" label-width="120px" prop="rechargeType">
+                                <el-col :span="18">
+                                    <el-radio-group v-model="rechargeFrom.rechargeType" style="width: 500px" @input="clearData">
+                                        <el-radio-button label="3">自定义充值</el-radio-button>
+                                        <el-radio-button label="0">套餐充值</el-radio-button>
+                                        <el-radio-button label="1">福利金额充值</el-radio-button>
+                                        <!--                                        <el-radio-button label="2">卡密充值</el-radio-button>-->
+                                    </el-radio-group>
+                                </el-col>
+                            </el-form-item>
 
-        <el-descriptions-item label="充值余额">{{appUserInfo.rechargeBalance}}</el-descriptions-item>
-        <el-descriptions-item label="赠送余额">{{appUserInfo.giveBalance}}</el-descriptions-item>
-        <el-descriptions-item label="现有积分">{{appUserInfo.pointBalance}}</el-descriptions-item>
-        <el-descriptions-item label="福利余额">{{appUserInfo.welfareBalance}}</el-descriptions-item>
+                            <el-form-item label="请选择充值套餐" label-width="120px" prop="rechargeMealId" v-if="rechargeFrom.rechargeType == 0">
+                                <el-col :span="18">
+                                    <el-select v-model="rechargeFrom.rechargeMealId" placeholder="请选择充值套餐" style="width: 300px" clearable @input="getActivityInfo(rechargeFrom.rechargeMealId)">
+                                        <el-option v-for="recharge in rechargeList" :key="recharge.id" :label="recharge.title" :value="recharge.id" />
+                                    </el-select>
+                                </el-col>
+                            </el-form-item>
+                            <el-form-item label="自定义金额" label-width="120px" prop="customAmount" v-if="rechargeFrom.rechargeType == 3">
+                                <el-col :span="18">
+                                    <el-input-number v-model="rechargeFrom.customAmount" :controls="false" :min="0" :max="10000" style="width: 300px"></el-input-number>
+                                </el-col>
+                            </el-form-item>
+                            <el-form-item label="福利金额(元)" label-width="120px" prop="welfareAmount" v-if="rechargeFrom.rechargeType == 1">
+                                <el-col :span="18">
+                                    <el-input-number v-model="rechargeFrom.welfareAmount" :controls="false" :min="0" :max="999999" style="width: 300px"></el-input-number>
+                                </el-col>
+                            </el-form-item>
+                            <el-form-item label="卡号" label-width="120px" v-if="rechargeFrom.rechargeType == 2" required>
+                                <el-col :span="18">
+                                    <el-input v-model="rechargeFrom.rechargeCardNo" style="width: 300px"></el-input>
+                                </el-col>
+                            </el-form-item>
+                            <el-form-item label="密码" label-width="120px" v-if="rechargeFrom.rechargeType == 2" required>
+                                <el-col :span="18">
+                                    <el-input v-model="rechargeFrom.rechargeCardPassword" style="width: 300px"></el-input>
+                                </el-col>
+                            </el-form-item>
+                            <el-form-item label="充值备注" label-width="120px" prop="remark">
+                                <el-col :span="18">
+                                    <el-input type="textarea" placeholder="请输入充值备注" v-model="rechargeFrom.remark" style="width: 300px"></el-input>
+                                </el-col>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <el-card style="width: 430px" v-if="rechargeFrom.rechargeType == 0">
+                                <el-descriptions title="充值活动信息" :column="1" :label-style="{ 'text-align': 'center' }" :contentStyle="{ 'text-align': 'center' }">
+                                    <el-descriptions-item label="本次充值金额" style="width: 100px" v-if="activityAmount != null && activityAmount != ''">
+                                        {{ getRechargeTypeInfo == '' ? '--' : getRechargeTypeInfo.rechargeAmount }}
+                                    </el-descriptions-item>
+                                    <el-descriptions-item label="原赠送金额" v-if="activityAmount != null && activityAmount != ''">
+                                        {{ getRechargeTypeInfo == '' ? '--' : getRechargeTypeInfo.giveAmount }}
+                                    </el-descriptions-item>
+                                    <el-descriptions-item label="活动赠送金额" v-if="activityAmount != null && activityAmount != ''">
+                                        {{ activityAmount }}
+                                    </el-descriptions-item>
+                                    <el-descriptions-item label="参与活动" v-if="activityAmount == null || activityAmount == ''"> 此套餐暂未参与活动 </el-descriptions-item>
+                                </el-descriptions>
+                            </el-card>
+                        </el-col>
+                        <!--            <el-col :span="24">-->
+                        <!--              <el-card class="box-card" shadow="hover" style="width: 150px" @click.native="clickRecharge">-->
+                        <!--                <div slot="header" class="clearfix">-->
+                        <!--                  <span></span>-->
+                        <!--                  <span style="float: right">赠送500元</span>-->
+                        <!--                </div>-->
+                        <!--                <div class="text item">-->
+                        <!--                  <span>{{'充值金额 ' + "1" }}</span>-->
+                        <!--                  <span>{{'充值金额 ' + "1" }}</span>-->
+                        <!--                </div>-->
+                        <!--              </el-card>-->
+                        <!--            </el-col>-->
+                    </el-form>
+                    <div>
+                        <el-button type="primary" @click="submitCash" style="margin-left: 3%; margin-top: 20px">收银 </el-button>
+                    </div>
+                </el-card>
+            </el-col>
+        </el-row>
+        <!-- 支付方式 -->
+        <el-dialog :title="rechargeTitle" :visible.sync="openRecharge" width="75%" :before-close="checkClosePay">
+            <el-descriptions title="核对信息" v-if="rechargeInfo && appUserInfo" :column="4" border :contentStyle="{ 'text-align': 'center' }">
+                <el-descriptions-item label="本次充值金额" :labelStyle="{ width: '14%' }">{{ rechargeInfo.rechargeAmount }} </el-descriptions-item>
+                <el-descriptions-item label="本次赠送金额" :labelStyle="{ width: '14%' }">
+                    {{ activityAmount != null && activityAmount != '' ? activityAmount : rechargeInfo.giveAmount }}
+                </el-descriptions-item>
+                <el-descriptions-item label="本次赠送积分" :labelStyle="{ width: '14%' }">
+                    {{ rechargeInfo.givePointAmount }}
+                </el-descriptions-item>
+                <el-descriptions-item label="本次福利金额" :labelStyle="{ width: '14%' }">{{ rechargeInfo.welfareAmount }} </el-descriptions-item>
 
-        <el-descriptions-item label="充值后余额">{{(rechargeInfo.rechargeAmount*100 + appUserInfo.rechargeBalance*100)/100}}</el-descriptions-item>
-        <el-descriptions-item label="充值后赠送余额">{{activityAmount != null && activityAmount != '' ? (activityAmount*100 + appUserInfo.giveBalance*100)/100 : (rechargeInfo.giveAmount*100 + appUserInfo.giveBalance*100)/100}}</el-descriptions-item>
-        <el-descriptions-item label="充值后积分">{{(rechargeInfo.givePointAmount*100 + appUserInfo.pointBalance*100)/100}}</el-descriptions-item>
-        <el-descriptions-item label="充值后福利余额">{{(rechargeInfo.welfareAmount*100 + appUserInfo.welfareBalance*100)/100}}</el-descriptions-item>
-      </el-descriptions>
+                <el-descriptions-item label="充值余额">{{ appUserInfo.rechargeBalance }}</el-descriptions-item>
+                <el-descriptions-item label="赠送余额">{{ appUserInfo.giveBalance }}</el-descriptions-item>
+                <el-descriptions-item label="现有积分">{{ appUserInfo.pointBalance }}</el-descriptions-item>
+                <el-descriptions-item label="福利余额">{{ appUserInfo.welfareBalance }}</el-descriptions-item>
 
-      <template  v-if="rechargeInfo" >
-        <el-form ref="payFrom" :model="payFrom"  label-width="80px" style="margin-top: 20px" @submit.native.prevent>
-          <el-card >
-            <el-row :gutter="10" style="margin-top: 10px">
-              <el-col :span="24">
-                <el-checkbox v-model="payFrom.isUsedCoupon">是否使用优惠券</el-checkbox>
-                <el-button style="margin-left: 10px" v-if="payFrom.isUsedCoupon" type="primary" @click="openCouponList">选择优惠券列表</el-button>
-              </el-col>
-            </el-row>
-            <el-row :gutter="10" style="margin-top: 10px">
-              <el-col :span="12" style="margin-top: 10px">
-                <el-form-item label="支付方式" prop="payType">
-                  <el-radio-group  v-model="payFrom.payType" @input="changePayType">
-                    <el-radio-button  label="2">现金</el-radio-button>
-                    <el-radio-button  label="0">微信</el-radio-button>
-                    <el-radio-button  label="1">支付宝</el-radio-button>
-                  </el-radio-group>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="是否分段支付" label-width="100px" prop="isInstalment">
-                  <el-radio-group v-model="payFrom.isInstalment" :disabled="alreadyPayTotal>0">
-                    <el-radio-button label="Y">是</el-radio-button>
-                    <el-radio-button label="N">否</el-radio-button>
-                  </el-radio-group>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="10" style="margin-top: 10px">
-              <el-col :span="8">
-              <el-form-item label="已经支付:" label-width="90px" v-if="payFrom.isInstalment == 'Y'">
-                <span>{{  alreadyPayTotal }} 元</span>
-              </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="本次收取金额(元)"  label-width="140px" prop="thisPayMoney"  v-if="payFrom.isInstalment == 'Y'">
-                  <el-input style="width: 120px" v-model="payFrom.thisPayMoney"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                  <el-button type="primary" @click="submitConfirm"
-                             v-if="( payFrom.payType == '0' || payFrom.payType == '1')
-                             && payFrom.isInstalment == 'Y'
-                             && payConfirm == false">确认</el-button>
-              </el-col>
-            </el-row>
-            <el-row :gutter="10" style="margin-top: 10px">
-              <el-col :span="8">
-                <el-form-item label="实收现金(元)"  label-width="120px" prop="thisPayMoney"  v-if="payFrom.payType=='2' && payFrom.isInstalment == 'N'">
-                  <el-input-number style="width: 200px" :controls="false" v-model="payFrom.thisPayMoney"></el-input-number>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="微信付款条形码" label-width="120px" prop="wxBarcode"
-                              v-if="(payFrom.payType=='0' && payFrom.isInstalment == 'N')
-                              || (payFrom.payType=='0' && payFrom.isInstalment == 'Y' && payConfirm == true)">
-                  <el-input style="width: 250px" v-model="payFrom.wxBarcode" clearable placeholder="请输入付款码"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="支付宝付款条形码" label-width="130px" prop="aliPayBarcode"
-                              v-if="(payFrom.payType=='1' && payFrom.isInstalment == 'N')
-                              || (payFrom.payType=='1' && payFrom.isInstalment == 'Y' && payConfirm == true)">
-                  <el-input style="width: 250px" v-model="payFrom.aliPayBarcode" clearable placeholder="请输入付款码"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="10" style="margin-top: 10px">
-              <el-card>
-                <el-table  :data="alreadySelectCouponList" >
-                  <!--      <el-table-column label="编号" align="center" prop="id" />-->
-                  <el-table-column label="优惠券" align="center" prop="couponTypeTitle" />
-                  <el-table-column label="优惠内容" align="center" prop="clothItemTypeName" >
-                    <template slot-scope="scope">
-                      <span>抵扣充值金额:{{scope.row.deductRechargeAmount}}元</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="操作" align="center" class-name="small-padding fixed-width"  >
-                    <template slot-scope="scope">
-                      <el-button
-                         
-                        type="text"
-                        icon="el-icon-delete"
-                        @click="handleDelete(scope.row)"
-                      >删除</el-button>
-                    </template>
-                  </el-table-column>
-                </el-table>
-              </el-card>
-            </el-row>
-            <el-row style="margin-top: 10px">
-                <div class="clearfix" >
-                  <div v-if="payFrom.isInstalment == 'Y'" >
-                    <el-col :span="8">
-                    <span style="text-align: center" >已支付<span style="color: #ff4949" >{{parseFloat(alreadyPayTotal)}}</span>元</span>
-                    </el-col>
-                    <el-col :span="8">
-                    <span >已优惠<span style="color: #ff4949" >{{getCouponAmount}}</span>元</span>
-                    </el-col>
-                    <el-col :span="8">
-                    <span style="text-align: center">还需支付<span style="color: #ff4949" >{{(getOrderNeedAmount*100 - parseFloat(alreadyPayTotal*100))/100}}</span>元</span>
-                    </el-col>
-                  </div>
-                  <div v-if="payFrom.isInstalment == 'N'" >
-                    <el-col :span="8">
-                      <span >已优惠<span style="color: #ff4949" >{{getCouponAmount}}</span>元</span>
-                    </el-col>
-                    <el-col :span="8">
-                      <span style="text-align: center">还需支付<span style="color: #ff4949" >{{(getOrderNeedAmount*100 - parseFloat(alreadyPayTotal*100))/100}}</span>元</span>
-                    </el-col>
-                  </div>
-                </div>
+                <el-descriptions-item label="充值后余额">
+                    {{ (rechargeInfo.rechargeAmount * 100 + appUserInfo.rechargeBalance * 100) / 100 }}
+                </el-descriptions-item>
+                <el-descriptions-item label="充值后赠送余额">
+                    {{ activityAmount != null && activityAmount != '' ? (activityAmount * 100 + appUserInfo.giveBalance * 100) / 100 : (rechargeInfo.giveAmount * 100 + appUserInfo.giveBalance * 100) / 100 }}
+                </el-descriptions-item>
+                <el-descriptions-item label="充值后积分">
+                    {{ (rechargeInfo.givePointAmount * 100 + appUserInfo.pointBalance * 100) / 100 }}
+                </el-descriptions-item>
+                <el-descriptions-item label="充值后福利余额">
+                    {{ (rechargeInfo.welfareAmount * 100 + appUserInfo.welfareBalance * 100) / 100 }}
+                </el-descriptions-item>
+            </el-descriptions>
 
-            </el-row>
-          </el-card>
-          <el-row :gutter="10">
-            <div>
-              <el-button type="primary" @click="submitSettlement" style="margin-left: 3%;margin-top: 20px">结算</el-button>
-            </div>
-          </el-row>
-        </el-form>
-      </template>
-    </el-dialog>
+            <template v-if="rechargeInfo">
+                <el-form ref="payFrom" :model="payFrom" label-width="80px" style="margin-top: 20px" @submit.native.prevent>
+                    <el-card>
+                        <!--                        <el-row :gutter="10" style="margin-top: 10px">-->
+                        <!--                            <el-col :span="24">-->
+                        <!--                                <el-checkbox v-model="payFrom.isUsedCoupon">是否使用优惠券</el-checkbox>-->
+                        <!--                                <el-button style="margin-left: 10px" v-if="payFrom.isUsedCoupon" type="primary" @click="openCouponList">选择优惠券列表</el-button>-->
+                        <!--                            </el-col>-->
+                        <!--                        </el-row>-->
+                        <el-row :gutter="10" style="margin-top: 10px">
+                            <el-col :span="12" style="margin-top: 10px">
+                                <el-form-item label="支付方式" label-width="150px" prop="payType">
+                                    <el-radio-group v-model="payFrom.payType" @input="changePayType">
+                                        <el-radio-button label="2">现金</el-radio-button>
+                                        <el-radio-button label="0">微信</el-radio-button>
+                                        <el-radio-button label="1">支付宝</el-radio-button>
+                                    </el-radio-group>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="是否分段支付" label-width="150px" prop="isInstalment">
+                                    <el-radio-group v-model="payFrom.isInstalment" :disabled="alreadyPayTotal > 0">
+                                        <el-radio-button label="Y">是</el-radio-button>
+                                        <el-radio-button label="N">否</el-radio-button>
+                                    </el-radio-group>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row :gutter="10" style="margin-top: 10px">
+                            <!--                            <el-col :span="8">-->
+                            <!--                                <el-form-item label="已经支付:" label-width="90px" v-if="payFrom.isInstalment == 'Y'">-->
+                            <!--                                    <span>{{ alreadyPayTotal }} 元</span>-->
+                            <!--                                </el-form-item>-->
+                            <!--                            </el-col>-->
+                            <el-col :span="8">
+                                <el-form-item label="本次收取金额(元)" label-width="150px" prop="thisPayMoney" v-if="payFrom.isInstalment == 'Y'">
+                                    <el-input style="width: 250px" v-model="payFrom.thisPayMoney"></el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-button type="primary" @click="submitConfirm" v-if="(payFrom.payType == '0' || payFrom.payType == '1') && payFrom.isInstalment == 'Y' && payConfirm == false"> 确认 </el-button>
+                            </el-col>
+                        </el-row>
+                        <el-row :gutter="10" style="margin-top: 10px">
+                            <el-col :span="8">
+                                <el-form-item label="实收现金(元)" label-width="150px" prop="thisPayMoney" v-if="payFrom.payType == '2' && payFrom.isInstalment == 'N'">
+                                    <el-input-number style="width: 250px" :controls="false" v-model="payFrom.thisPayMoney"></el-input-number>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="微信付款条形码" label-width="150px" prop="wxBarcode" v-if="(payFrom.payType == '0' && payFrom.isInstalment == 'N') || (payFrom.payType == '0' && payFrom.isInstalment == 'Y' && payConfirm == true)">
+                                    <el-input style="width: 250px" v-model="payFrom.wxBarcode" clearable placeholder="请输入付款码"></el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="支付宝付款条形码" label-width="150px" prop="aliPayBarcode" v-if="(payFrom.payType == '1' && payFrom.isInstalment == 'N') || (payFrom.payType == '1' && payFrom.isInstalment == 'Y' && payConfirm == true)">
+                                    <el-input style="width: 250px" v-model="payFrom.aliPayBarcode" clearable placeholder="请输入付款码"></el-input>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <!--                        <el-row :gutter="10" style="margin-top: 10px">-->
+                        <!--                            <el-card>-->
+                        <!--                                <el-table :data="alreadySelectCouponList">-->
+                        <!--                                    &lt;!&ndash;      <el-table-column label="编号" align="center" prop="id" />&ndash;&gt;-->
+                        <!--                                    <el-table-column label="优惠券" align="center" prop="couponTypeTitle" />-->
+                        <!--                                    <el-table-column label="优惠内容" align="center" prop="clothItemTypeName">-->
+                        <!--                                        <template slot-scope="scope">-->
+                        <!--                                            <span>抵扣充值金额:{{ scope.row.deductRechargeAmount }}元</span>-->
+                        <!--                                        </template>-->
+                        <!--                                    </el-table-column>-->
+                        <!--                                    <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+                        <!--                                        <template slot-scope="scope">-->
+                        <!--                                            <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>-->
+                        <!--                                        </template>-->
+                        <!--                                    </el-table-column>-->
+                        <!--                                </el-table>-->
+                        <!--                            </el-card>-->
+                        <!--                        </el-row>-->
+                        <el-row style="margin-top: 10px">
+                            <div class="clearfix">
+                                <div v-if="payFrom.isInstalment == 'Y'">
+                                    <el-col :span="8">
+                                        <span style="text-align: center"
+                                            >已支付<span style="color: #ff4949">{{ parseFloat(alreadyPayTotal) }}</span
+                                            >元</span
+                                        >
+                                    </el-col>
+                                    <el-col :span="8">
+                                        <span
+                                            >已优惠<span style="color: #ff4949">{{ getCouponAmount }}</span
+                                            >元</span
+                                        >
+                                    </el-col>
+                                    <el-col :span="8">
+                                        <span style="text-align: center"
+                                            >还需支付<span style="color: #ff4949">{{ (getOrderNeedAmount * 100 - parseFloat(alreadyPayTotal * 100)) / 100 }}</span
+                                            >元</span
+                                        >
+                                    </el-col>
+                                </div>
+                                <div v-if="payFrom.isInstalment == 'N'">
+                                    <el-col :span="8">
+                                        <span
+                                            >已优惠<span style="color: #ff4949">{{ getCouponAmount }}</span
+                                            >元</span
+                                        >
+                                    </el-col>
+                                    <el-col :span="8">
+                                        <span style="text-align: center"
+                                            >还需支付<span style="color: #ff4949">{{ (getOrderNeedAmount * 100 - parseFloat(alreadyPayTotal * 100)) / 100 }}</span
+                                            >元</span
+                                        >
+                                    </el-col>
+                                </div>
+                            </div>
+                        </el-row>
+                    </el-card>
+                    <el-row :gutter="10">
+                        <div>
+                            <el-button type="primary" @click="submitSettlement" style="margin-left: 5px; margin-top: 20px">结算 </el-button>
+                        </div>
+                    </el-row>
+                </el-form>
+            </template>
+        </el-dialog>
 
-    <el-dialog
-      title="选择优惠券"
-      :visible.sync="openCoupon"
-      width="60%">
-      <template>
-        <el-table :data="couponList" style="width: 100%" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" align="center" fixed="left"/>
-          <el-table-column label="优惠券" align="center" prop="couponTypeTitle"/>
-          <el-table-column label="优惠内容" align="center">
-            <template slot-scope="scope">
-              <span>抵扣充值金额:{{scope.row.deductRechargeAmount}}元</span>
+        <el-dialog title="选择优惠券" :visible.sync="openCoupon" width="60%">
+            <template>
+                <el-table :data="couponList" style="width: 100%" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" align="center" fixed="left" />
+                    <el-table-column label="优惠券" align="center" prop="couponTypeTitle" />
+                    <el-table-column label="优惠内容" align="center">
+                        <template slot-scope="scope">
+                            <span>抵扣充值金额:{{ scope.row.deductRechargeAmount }}元</span>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <el-row>
+                    <div style="margin-top: 30px">
+                        <el-button @click="submitAlreadySelectCouponList" size="small" type="primary" style="float: right"> 确定 </el-button>
+                    </div>
+                </el-row>
             </template>
-          </el-table-column>
-        </el-table>
-        <el-row>
-          <div style="margin-top: 30px">
-            <el-button @click="submitAlreadySelectCouponList" size="small" type="primary" style="float: right"> 确定 </el-button>
-          </div>
-        </el-row>
-      </template>
-    </el-dialog>
+        </el-dialog>
 
-    <!-- 添加用户对话框 -->
-    <el-dialog :title="title" :visible.sync="open" size="30%" append-to-body :before-close="checkCloseUserPage">
-      <el-row :gutter="15" >
-        <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-          <el-col :span="24">
-            <el-form-item label="昵称" prop="nickName">
-              <el-input v-model="form.nickName" placeholder="请输入昵称" maxlength="50" show-word-limit clearable />
-            </el-form-item>
-            <el-form-item label="真实姓名" prop="realName">
-              <el-input v-model="form.realName" placeholder="请输入真实姓名" maxlength="5" show-word-limit clearable />
-            </el-form-item>
-            <el-form-item label="手机号" prop="phoneNumber">
-              <el-input v-model="form.phoneNumber" placeholder="请输入手机号" maxlength="11" show-word-limit clearable />
-            </el-form-item>
-            <el-form-item label="性别" prop="sex">
-              <el-select v-model="form.sex" placeholder="请选择性别" clearable >
-                <el-option
-                  v-for="dict in dict.type.sys_user_sex"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="生日" prop="birthday" clearable >
-              <el-date-picker clearable
-                              v-model="form.birthday"
-                              type="date"
-                              value-format="yyyy-MM-dd"
-                              placeholder="请选择生日">
-              </el-date-picker>
-            </el-form-item>
-            <el-form-item label="头像地址" prop="avatarUrl" >
-              <image-upload v-model="form.avatarUrl" :limit="1" />
-            </el-form-item>
-            <el-form-item label="客户等级" prop="level">
-              <el-input-number v-model="form.level"  :min="1" :max="50" label="请输入客户等级" ></el-input-number>
-            </el-form-item>
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" placeholder="请输入备注" maxlength="50" show-word-limit />
-            </el-form-item>
-          </el-col>
-        </el-form>
-      </el-row>
+        <!-- 添加用户对话框 -->
+        <el-dialog :title="title" :visible.sync="open" size="30%" append-to-body :before-close="checkCloseUserPage">
+            <el-row :gutter="15">
+                <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+                    <el-col :span="24">
+                        <el-form-item label="昵称" prop="nickName">
+                            <el-input v-model="form.nickName" placeholder="请输入昵称" maxlength="50" show-word-limit clearable />
+                        </el-form-item>
+                        <el-form-item label="真实姓名" prop="realName">
+                            <el-input v-model="form.realName" placeholder="请输入真实姓名" maxlength="5" show-word-limit clearable />
+                        </el-form-item>
+                        <el-form-item label="手机号" prop="phoneNumber">
+                            <el-input v-model="form.phoneNumber" placeholder="请输入手机号" maxlength="11" show-word-limit clearable />
+                        </el-form-item>
+                        <el-form-item label="性别" prop="sex">
+                            <el-select v-model="form.sex" placeholder="请选择性别" clearable>
+                                <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="生日" prop="birthday" clearable>
+                            <el-date-picker clearable v-model="form.birthday" type="date" value-format="yyyy-MM-dd" placeholder="请选择生日"></el-date-picker>
+                        </el-form-item>
+                        <el-form-item label="头像地址" prop="avatarUrl">
+                            <image-upload v-model="form.avatarUrl" :limit="1" />
+                        </el-form-item>
+                        <el-form-item label="客户等级" prop="level">
+                            <el-input-number v-model="form.level" :min="1" :max="50" label="请输入客户等级"></el-input-number>
+                        </el-form-item>
+                        <el-form-item label="备注" prop="remark">
+                            <el-input v-model="form.remark" placeholder="请输入备注" maxlength="50" show-word-limit />
+                        </el-form-item>
+                    </el-col>
+                </el-form>
+            </el-row>
 
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" style="margin-left: 5%">提交</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitForm" style="margin-left: 5%">提交</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
-import { listType } from "@/api/recharge/type";
-import {
-  addUser,
-  findUserByPhoneNumber,
-  getMemberCouponInfoByRecharge,
-  updateUser
-} from '@/api/app/user'
+import { listType } from '@/api/recharge/type'
+import { addUser, findUserByPhoneNumber, getMemberCouponInfoByRecharge, updateUser } from '@/api/app/user'
 import { addOrder, getOrderIsAllPayByOrderNo, getOrderStatusByOrderNo, morePay } from '@/api/recharge/order'
 import { getRechargeTypeRelationActivityInfo } from '@/api/activity/rechargeItem'
 
-
 export default {
-  name: "workRecharge",
-  dicts: ['sys_user_sex'],
-  data() {
-    return {
-      alreadyPayTotal: 0 ,
-      orderNeedPayAmount: 0 ,
-      couponAmount:0,
-      alreadyPayInfo:{},
-      payConfirm:false,
-      payFrom: {},
-      userInfoVO:null,
-      orderNo:null,
-      // 优惠卷
-      // couponInfo:null,
-      couponList:[],
-      // 客户信息
-      appUserInfo:null,
-      rechargeList:null,
-      rechargeInfo:null,
-      // 充值类型参数
-      rechargeFrom:{
-        rechargeType:'3',
-        // 充值套餐id
-        rechargeMealId:null,
-        // 自定义金额
-        customAmount:null,
-        // 福利金额
-        welfareAmount:null,
-        // 卡号
-        rechargeCardNo:null,
-        // 密码
-        rechargeCardPassword:null,
-      },
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 表格数据
-      // 弹出层标题
-      title: "",
-      rechargeTitle:"",
-      // 是否显示弹出层
-      open: false,
-      openRecharge:false,
-      openCoupon: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-      },
-      couponParams: {
-        pageNum: 1,
-        pageSize: 999,
-        appUserId:null,
-      },
-      // 表单参数
-      form: {
-      },
-      // 表单校验
-      rules: {
-        rechargeCardNo: [{
-          pattern: /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/,
-          required: true,
-          message: '请输入正整数类型',
-          trigger: 'blur'
-        }],
-        rechargeCardPassword: [{
-          pattern: /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/,
-          required: true,
-          message: '请输入正整数类型',
-          trigger: 'blur'
-        }, ],
-        nickName:[{
-          required: true,
-          message: "昵称不能为空",
-          trigger: "blur"
-        }],
-        realName:[{
-          required: true,
-          message: "真实姓名不能为空",
-          trigger: "blur"
-        }],
-        phoneNumber:[{
-          required: true,
-          message: "手机号不能为空",
-          trigger: "blur"
-        },{
-          pattern: /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/,
-          required: true,
-          message: '请输入数量,且为正整数类型',
-          trigger: 'blur'
-        },{ min: 11, max: 11, message: '手机号至少11位', trigger: 'blur' }],
-        sex:[{
-          required: true,
-          message: "性别不能为空",
-          trigger: "blur"
-        }],
-        birthday:[{
-          required: true,
-          message: "生日不能为空",
-          trigger: "blur"
-        }],
-      },
-      authCode:null,
-      activityAmount:null,
-      alreadySelectCouponList:[],
-      //支付检测
-      isPaying: false,
-    };
-  },
-  created() {
-    this.handleUser();
-    this.getRechargeList();
-  },
-  computed:{
-    getRechargeTypeInfo(){
-      if (this.rechargeFrom.rechargeMealId != null){
-        return this.rechargeList.find(item => item.id == this.rechargeFrom.rechargeMealId);
-      }else {
-        return "";
-      }
-    },
-    getCouponAmount(){
-      this.couponAmount  = 0;
-      if (this.alreadySelectCouponList.length == 0 ){
-        return this.couponAmount;
-      }
-      if (this.alreadySelectCouponList.length > 0 ){
-        this.alreadySelectCouponList.forEach(coupon => {
-          this.couponAmount = this.couponAmount + parseFloat(coupon.deductRechargeAmount)
-        })
-      }
-      return this.couponAmount;
-    },
-    getOrderNeedAmount(){
-      this.orderNeedPayAmount = (parseFloat(this.rechargeInfo.rechargeAmount) - parseFloat(this.couponAmount)) > 0
-                                    ? parseFloat(this.rechargeInfo.rechargeAmount) - parseFloat(this.couponAmount) : 0;
-      return this.orderNeedPayAmount;
-    },
-  },
-  methods: {
-    clickRecharge(done){
-      this.$confirm('是否关闭表单,关闭后数据将丢失?').then(function() {
-        done()
-      }).then(() => {}).catch(() => {});
-    },
-    getActivityInfo(rechargeTypeId){
-      if (rechargeTypeId != null && rechargeTypeId != ''){
-        getRechargeTypeRelationActivityInfo(rechargeTypeId, this.userInfoVO.storeId).then(response =>{
-          this.activityAmount = response.data;
-        })
-      }else {
-        this.activityAmount = null;
-      }
-    },
-    clearData(){
-      this.rechargeFrom.rechargeMealId = null;
-      this.rechargeFrom.customAmount = null;
-      this.rechargeFrom.welfareAmount = null;
-      this.rechargeFrom.rechargeCardNo = null;
-      this.rechargeFrom.rechargeCardPassword = null;
-      this.activityAmount = null;
-    },
-    openCouponList(){
-      this.getCouponList();
-      this.openCoupon = true;
-    },
-    // 获取优惠券集合
-    getCouponList(){
-      if (this.appUserInfo == null){
-        this.couponList = [];
-        return;
-      }
-      this.couponParams.appUserId = this.appUserInfo.id;
-      getMemberCouponInfoByRecharge(this.couponParams).then(response => {
-        this.couponList = response.data.records;
-      });
-    },
-    // 获取登录人信息
-    handleUser(){
-      this.userInfoVO = this.getUserInfo();
-    },
-    //搜索用户
-    searchUser(){
-      this.$refs["queryForm"].validate(valid => {
-        if (valid) {
-          findUserByPhoneNumber(this.queryParams).then(res => {
-            this.appUserInfo = res.data;
-          })
+    name: 'workRecharge',
+    dicts: ['recharge_use_status', 'sys_user_sex'],
+    data() {
+        return {
+            alreadyPayTotal: 0,
+            orderNeedPayAmount: 0,
+            couponAmount: 0,
+            alreadyPayInfo: {},
+            payConfirm: false,
+            payFrom: {},
+            userInfoVO: null,
+            orderNo: null,
+            // 优惠卷
+            // couponInfo:null,
+            couponList: [],
+            // 客户信息
+            appUserInfo: null,
+            rechargeList: null,
+            rechargeInfo: null,
+            // 充值类型参数
+            rechargeFrom: {
+                rechargeType: '3',
+                // 充值套餐id
+                rechargeMealId: null,
+                // 自定义金额
+                customAmount: null,
+                remark: '',
+                // 福利金额
+                welfareAmount: null,
+                // 卡号
+                rechargeCardNo: null,
+                // 密码
+                rechargeCardPassword: null
+            },
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 表格数据
+            // 弹出层标题
+            title: '',
+            rechargeTitle: '',
+            // 是否显示弹出层
+            open: false,
+            openRecharge: false,
+            openCoupon: false,
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10
+            },
+            cardParams: {
+                rechargeUserId: 0
+            },
+            couponParams: {
+                pageNum: 1,
+                pageSize: 999,
+                appUserId: null
+            },
+            // 表单参数
+            form: {},
+            // 表单校验
+            rules: {
+                rechargeCardNo: [
+                    {
+                        pattern: /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/,
+                        required: true,
+                        message: '请输入正整数类型',
+                        trigger: 'blur'
+                    }
+                ],
+                rechargeCardPassword: [
+                    {
+                        pattern: /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/,
+                        required: true,
+                        message: '请输入正整数类型',
+                        trigger: 'blur'
+                    }
+                ],
+                nickName: [
+                    {
+                        required: true,
+                        message: '昵称不能为空',
+                        trigger: 'blur'
+                    }
+                ],
+                realName: [
+                    {
+                        required: true,
+                        message: '真实姓名不能为空',
+                        trigger: 'blur'
+                    }
+                ],
+                phoneNumber: [
+                    {
+                        required: true,
+                        message: '手机号不能为空',
+                        trigger: 'blur'
+                    },
+                    {
+                        pattern: /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/,
+                        required: true,
+                        message: '请输入数量,且为正整数类型',
+                        trigger: 'blur'
+                    },
+                    { min: 11, max: 11, message: '手机号至少11位', trigger: 'blur' }
+                ],
+                sex: [
+                    {
+                        required: true,
+                        message: '性别不能为空',
+                        trigger: 'blur'
+                    }
+                ],
+                birthday: [
+                    {
+                        required: true,
+                        message: '生日不能为空',
+                        trigger: 'blur'
+                    }
+                ]
+            },
+            authCode: null,
+            activityAmount: null,
+            alreadySelectCouponList: [],
+            //支付检测
+            isPaying: false
         }
-      });
-    },
-    //条码搜索用户
-    qrcodeSearchUser(){
-    },
-    // 获取 充值套餐集合
-    getRechargeList(){
-      listType().then(response => {
-        this.rechargeList = response.rows;
-      });
-    },
-    // 关闭用户新建页面 二次确认
-    checkCloseUserPage(done) {
-      this.$confirm('是否关闭表单,关闭后数据将丢失?').then(function() {
-        done()
-      }).then(() => {}).catch(() => {});
     },
-    // 关闭支付页面 二次确认
-    checkClosePay(done) {
-      this.$confirm(
-        '退单金额如下:现金:'+ this.alreadyPayInfo.alreadyPayCash
-        +',微信:'+ this.alreadyPayInfo.alreadyPayWX
-        +',支付宝:'+ this.alreadyPayInfo.alreadyPayAli
-        +'  是否暂停支付?').then(function() {
-        done()
-      }).then(() => {}).catch(() => {});
+    created() {
+        this.handleUser()
+        this.getRechargeList()
     },
-    // 创建用户
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateUser(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-
-            });
-          } else {
-            addUser(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-
-            });
-          }
-        }
-      });
-    },
-    // 收银
-    submitCash(){
-      if(this.appUserInfo == null){
-        this.$message.error("请选择客户");
-        return;
-      }
-      // 重置
-      this.resetPayInfo();
-      // 自定义充值
-      if(this.rechargeFrom.rechargeType == '3'){
-        if(this.rechargeFrom.customAmount == '0' ){
-          this.$message.error("充值金额不能为0元");
-          return;
-        }
-        this.rechargeInfo.rechargeAmount = this.rechargeFrom.customAmount;
-        this.rechargeInfo.giveAmount = 0;
-        this.rechargeInfo.givePointAmount = 0;
-        this.rechargeInfo.welfareAmount = 0;
-        this.rechargeInfo.rechargeType = this.rechargeFrom.rechargeType;
-        this.rechargeInfo.rechargeTypeId = null;
-      }
-      // 套餐充值
-      if(this.rechargeFrom.rechargeType == '0'){
-        if(this.rechargeFrom.rechargeMealId == null ){
-          this.$message.error("充值套餐不能为空");
-          return;
-        }
-        let recharge;
-        recharge = this.rechargeList.find(item => item.id == this.rechargeFrom.rechargeMealId);
-        this.rechargeInfo.rechargeAmount = recharge.rechargeAmount;
-        this.rechargeInfo.giveAmount = recharge.giveAmount;
-        this.rechargeInfo.givePointAmount = recharge.givePointAmount;
-        this.rechargeInfo.welfareAmount = 0;
-        this.rechargeInfo.rechargeType = this.rechargeFrom.rechargeType;
-        this.rechargeInfo.rechargeTypeId = recharge.id;
-      }
-      // 福利金额充值
-      if(this.rechargeFrom.rechargeType == '1'){
-        if(this.rechargeFrom.welfareAmount == '0' ){
-          this.$message.error("充值金额不能为0元");
-          return;
-        }
-        this.rechargeInfo.rechargeAmount = 0;
-        this.rechargeInfo.giveAmount = 0;
-        this.rechargeInfo.givePointAmount = 0;
-        this.rechargeInfo.welfareAmount = this.rechargeFrom.welfareAmount;
-        this.rechargeInfo.rechargeType = this.rechargeFrom.rechargeType;
-        this.rechargeInfo.rechargeTypeId = null;
-      }
-      // 卡密充值
-      if(this.rechargeFrom.rechargeType == '2'){
-        if(this.rechargeFrom.rechargeCardNo == null  || this.rechargeFrom.rechargeCardPassword == null){
-          this.$message.error("卡号/密码,不能为空");
-          return;
-        }
-        const orderRechargePayDTO = {
-          appUserId: this.appUserInfo.id,
-          rechargeType: this.rechargeFrom.rechargeType,
-          cardNo : this.rechargeFrom.rechargeCardNo,
-          password : this.rechargeFrom.rechargeCardPassword,
+    computed: {
+        getRechargeTypeInfo() {
+            if (this.rechargeFrom.rechargeMealId != null) {
+                return this.rechargeList.find((item) => item.id == this.rechargeFrom.rechargeMealId)
+            } else {
+                return ''
+            }
+        },
+        getCouponAmount() {
+            this.couponAmount = 0
+            if (this.alreadySelectCouponList.length == 0) {
+                return this.couponAmount
+            }
+            if (this.alreadySelectCouponList.length > 0) {
+                this.alreadySelectCouponList.forEach((coupon) => {
+                    this.couponAmount = this.couponAmount + parseFloat(coupon.deductRechargeAmount)
+                })
+            }
+            return this.couponAmount
+        },
+        getOrderNeedAmount() {
+            this.orderNeedPayAmount = parseFloat(this.rechargeInfo.rechargeAmount) - parseFloat(this.couponAmount) > 0 ? parseFloat(this.rechargeInfo.rechargeAmount) - parseFloat(this.couponAmount) : 0
+            return this.orderNeedPayAmount
         }
-        addOrder(orderRechargePayDTO).then(response => {
-          if (response.data.isAllPayEnd == true) {
-            this.$modal.msgSuccess("充值成功");
-            this.searchUser();
-            this.clearData();
-          }
-        });
-        return;
-      }
-
-      this.rechargeTitle = '支付方式选择';
-      this.openRecharge = true;
-      this.orderNo = null;
     },
-    // 结算
-    submitSettlement(){
-      if(this.payFrom.payType == '2'
-        && this.payFrom.isInstalment == 'N'
-        && this.payFrom.thisPayMoney < this.orderNeedPayAmount)
-      {
-        this.$message.error("支付金额小于还需支付金额");
-        return;
-      }
-      if(this.payFrom.payType == '2'
-        && this.payFrom.isInstalment == 'N'
-        && this.payFrom.thisPayMoney > this.orderNeedPayAmount)
-      {
-        this.$message.error("支付金额大于还需支付金额");
-        return;
-      }
-      const orderRechargePayDTO = {
-        orderNo: this.orderNo,
-        appUserId: this.appUserInfo.id,
-        payType: this.payFrom.payType,
-        isInstalment: this.payFrom.isInstalment,
-        couponIds : [],
+    methods: {
+        clickRecharge(done) {
+            this.$confirm('是否关闭表单,关闭后数据将丢失?')
+                .then(function () {
+                    done()
+                })
+                .then(() => {})
+                .catch(() => {})
+        },
+        getActivityInfo(rechargeTypeId) {
+            if (rechargeTypeId != null && rechargeTypeId != '') {
+                getRechargeTypeRelationActivityInfo(rechargeTypeId, this.userInfoVO.storeId).then((response) => {
+                    this.activityAmount = response.data
+                })
+            } else {
+                this.activityAmount = null
+            }
+        },
+        clearData() {
+            this.rechargeFrom.rechargeMealId = null
+            this.rechargeFrom.customAmount = null
+            this.rechargeFrom.welfareAmount = null
+            this.rechargeFrom.rechargeCardNo = null
+            this.rechargeFrom.rechargeCardPassword = null
+            this.activityAmount = null
+        },
+        openCouponList() {
+            this.getCouponList()
+            this.openCoupon = true
+        },
+        // 获取优惠券集合
+        getCouponList() {
+            if (this.appUserInfo == null) {
+                this.couponList = []
+                return
+            }
+            this.couponParams.appUserId = this.appUserInfo.id
+            getMemberCouponInfoByRecharge(this.couponParams).then((response) => {
+                this.couponList = response.data.records
+            })
+        },
+        // 获取登录人信息
+        handleUser() {
+            this.userInfoVO = this.getUserInfo()
+        },
+        //搜索用户
+        searchUser() {
+            this.$refs['queryForm'].validate((valid) => {
+                if (valid) {
+                    findUserByPhoneNumber(this.queryParams).then((res) => {
+                        this.appUserInfo = res.data
+                        if (this.appUserInfo) {
+                            this.cardParams.rechargeUserId = this.appUserInfo.id
+                            this.$nextTick(() => {
+                                this.$refs.pagination.handleSearch(true)
+                            })
+                        }
+                    })
+                }
+            })
+        },
+        //条码搜索用户
+        qrcodeSearchUser() {},
+        // 获取 充值套餐集合
+        getRechargeList() {
+            listType().then((response) => {
+                this.rechargeList = response.rows
+            })
+        },
+        // 关闭用户新建页面 二次确认
+        checkCloseUserPage(done) {
+            this.$confirm('是否关闭表单,关闭后数据将丢失?')
+                .then(function () {
+                    done()
+                })
+                .then(() => {})
+                .catch(() => {})
+        },
+        // 关闭支付页面 二次确认
+        checkClosePay(done) {
+            this.$confirm('退单金额如下:现金:' + this.alreadyPayInfo.alreadyPayCash + ',微信:' + this.alreadyPayInfo.alreadyPayWX + ',支付宝:' + this.alreadyPayInfo.alreadyPayAli + '  是否暂停支付?')
+                .then(function () {
+                    done()
+                })
+                .then(() => {})
+                .catch(() => {})
+        },
+        // 创建用户
+        submitForm() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    if (this.form.id != null) {
+                        updateUser(this.form).then((response) => {
+                            this.$modal.msgSuccess('修改成功')
+                            this.open = false
+                        })
+                    } else {
+                        addUser(this.form).then((response) => {
+                            this.$modal.msgSuccess('新增成功')
+                            this.open = false
+                        })
+                    }
+                }
+            })
+        },
+        // 收银
+        submitCash() {
+            if (this.appUserInfo == null) {
+                this.$message.error('请选择客户')
+                return
+            }
+            // 重置
+            this.resetPayInfo()
+            this.rechargeInfo.remark = this.rechargeFrom.remark
+            // 自定义充值
+            if (this.rechargeFrom.rechargeType == '3') {
+                if (this.rechargeFrom.customAmount == '0') {
+                    this.$message.error('充值金额不能为0元')
+                    return
+                }
+                this.rechargeInfo.rechargeAmount = this.rechargeFrom.customAmount
+                this.rechargeInfo.giveAmount = 0
+                this.rechargeInfo.givePointAmount = 0
+                this.rechargeInfo.welfareAmount = 0
+                this.rechargeInfo.rechargeType = this.rechargeFrom.rechargeType
+                this.rechargeInfo.rechargeTypeId = null
+            }
+            // 套餐充值
+            if (this.rechargeFrom.rechargeType == '0') {
+                if (this.rechargeFrom.rechargeMealId == null) {
+                    this.$message.error('充值套餐不能为空')
+                    return
+                }
+                let recharge
+                recharge = this.rechargeList.find((item) => item.id == this.rechargeFrom.rechargeMealId)
+                this.rechargeInfo.rechargeAmount = recharge.rechargeAmount
+                this.rechargeInfo.giveAmount = recharge.giveAmount
+                this.rechargeInfo.givePointAmount = recharge.givePointAmount
+                this.rechargeInfo.welfareAmount = 0
+                this.rechargeInfo.rechargeType = this.rechargeFrom.rechargeType
+                this.rechargeInfo.rechargeTypeId = recharge.id
+            }
+            // 福利金额充值
+            if (this.rechargeFrom.rechargeType == '1') {
+                if (this.rechargeFrom.welfareAmount == '0') {
+                    this.$message.error('充值金额不能为0元')
+                    return
+                }
+                this.rechargeInfo.rechargeAmount = 0
+                this.rechargeInfo.giveAmount = 0
+                this.rechargeInfo.givePointAmount = 0
+                this.rechargeInfo.welfareAmount = this.rechargeFrom.welfareAmount
+                this.rechargeInfo.rechargeType = this.rechargeFrom.rechargeType
+                this.rechargeInfo.rechargeTypeId = null
+            }
+            // 卡密充值
+            if (this.rechargeFrom.rechargeType == '2') {
+                if (this.rechargeFrom.rechargeCardNo == null || this.rechargeFrom.rechargeCardPassword == null) {
+                    this.$message.error('卡号/密码,不能为空')
+                    return
+                }
+                const orderRechargePayDTO = {
+                    appUserId: this.appUserInfo.id,
+                    rechargeType: this.rechargeFrom.rechargeType,
+                    cardNo: this.rechargeFrom.rechargeCardNo,
+                    password: this.rechargeFrom.rechargeCardPassword,
+                    remark: this.rechargeFrom.remark
+                }
+                addOrder(orderRechargePayDTO).then((response) => {
+                    if (response.data.isAllPayEnd == true) {
+                        this.$modal.msgSuccess('充值成功')
+                        this.searchUser()
+                        this.clearData()
+                    }
+                })
+                return
+            }
 
-        rechargeAmount: this.rechargeInfo.rechargeAmount,
-        giveAmount: this.rechargeInfo.giveAmount,
-        givePointAmount: this.rechargeInfo.givePointAmount,
-        rechargeTypeId: this.rechargeInfo.rechargeTypeId,
-        welfareAmount: this.rechargeInfo.welfareAmount,
-        rechargeType: this.rechargeInfo.rechargeType,
-        payAmount: this.orderNeedPayAmount,
-      };
-      if (this.alreadySelectCouponList.length>0){
-        this.alreadySelectCouponList.forEach(vo =>{
-          orderRechargePayDTO.couponIds.push(vo.id);
-        })
-      }else {
-        orderRechargePayDTO.couponIds = [];
-      }
-      if (this.payFrom.isInstalment == 'N'){
-        orderRechargePayDTO.thisPayAmount = this.orderNeedPayAmount;
-      }
-      if (this.payFrom.isInstalment == 'Y'){
-        orderRechargePayDTO.thisPayAmount = this.payFrom.thisPayMoney;
-      }
-      // 现金支付
-      if (this.payFrom.payType == 2){
-        orderRechargePayDTO.thisPayAmount = this.payFrom.thisPayMoney;
-      }
-      // 微信支付
-      if (this.payFrom.payType == 0){
-        orderRechargePayDTO.authCode = this.payFrom.wxBarcode;
-      }
-      // 支付宝支付
-      if (this.payFrom.payType == 1){
-        orderRechargePayDTO.authCode = this.payFrom.aliPayBarcode;
-      }
+            this.rechargeTitle = '支付方式选择'
+            this.openRecharge = true
+            this.orderNo = null
+        },
+        // 结算
+        submitSettlement() {
+            if (this.payFrom.payType == '2' && this.payFrom.isInstalment == 'N' && this.payFrom.thisPayMoney < this.orderNeedPayAmount) {
+                this.$message.error('支付金额小于还需支付金额')
+                return
+            }
+            if (this.payFrom.payType == '2' && this.payFrom.isInstalment == 'N' && this.payFrom.thisPayMoney > this.orderNeedPayAmount) {
+                this.$message.error('支付金额大于还需支付金额')
+                return
+            }
+            const orderRechargePayDTO = {
+                orderNo: this.orderNo,
+                appUserId: this.appUserInfo.id,
+                payType: this.payFrom.payType,
+                isInstalment: this.payFrom.isInstalment,
+                couponIds: [],
+                remark: this.rechargeInfo.remark,
+                rechargeAmount: this.rechargeInfo.rechargeAmount,
+                giveAmount: this.rechargeInfo.giveAmount,
+                givePointAmount: this.rechargeInfo.givePointAmount,
+                rechargeTypeId: this.rechargeInfo.rechargeTypeId,
+                welfareAmount: this.rechargeInfo.welfareAmount,
+                rechargeType: this.rechargeInfo.rechargeType,
+                payAmount: this.orderNeedPayAmount
+            }
+            if (this.alreadySelectCouponList.length > 0) {
+                this.alreadySelectCouponList.forEach((vo) => {
+                    orderRechargePayDTO.couponIds.push(vo.id)
+                })
+            } else {
+                orderRechargePayDTO.couponIds = []
+            }
+            if (this.payFrom.isInstalment == 'N') {
+                orderRechargePayDTO.thisPayAmount = this.orderNeedPayAmount
+            }
+            if (this.payFrom.isInstalment == 'Y') {
+                orderRechargePayDTO.thisPayAmount = this.payFrom.thisPayMoney
+            }
+            // 现金支付
+            if (this.payFrom.payType == 2) {
+                orderRechargePayDTO.thisPayAmount = this.payFrom.thisPayMoney
+            }
+            // 微信支付
+            if (this.payFrom.payType == 0) {
+                orderRechargePayDTO.authCode = this.payFrom.wxBarcode
+            }
+            // 支付宝支付
+            if (this.payFrom.payType == 1) {
+                orderRechargePayDTO.authCode = this.payFrom.aliPayBarcode
+            }
 
-      this.$confirm('确定进行支付结算吗?').then(() => {
-        const loading = this.$loading({
-          lock: true,
-          text: 'Loading',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        });
-        if (this.orderNo == null ){
-          // 首次支付
-          addOrder(orderRechargePayDTO).then(response => {
-            this.$message('提交成功')
-            loading.close();
-            this.orderNo = response.data.orderNo;
-            // 第三方支付
-            if(this.payFrom.payType == '0' || this.payFrom.payType == '1'){
-              this.isPaying = true;
-              var intervalId = setInterval(() => {
-                this.intervalCheckOrderStatus(intervalId, this.orderNo)
-              },4000);
-            }else {
-              this.checkIsAllPay(this.orderNo);
+            this.$confirm('确定进行支付结算吗?')
+                .then(() => {
+                    const loading = this.$loading({
+                        lock: true,
+                        text: 'Loading',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(0, 0, 0, 0.7)'
+                    })
+                    if (this.orderNo == null) {
+                        // 首次支付
+                        addOrder(orderRechargePayDTO).then((response) => {
+                            loading.close()
+                            this.orderNo = response.data.orderNo
+                            // 第三方支付
+                            if (this.payFrom.payType == '0' || this.payFrom.payType == '1') {
+                                this.isPaying = true
+                                var intervalId = setInterval(() => {
+                                    this.intervalCheckOrderStatus(intervalId, this.orderNo)
+                                }, 4000)
+                            } else {
+                                this.checkIsAllPay(this.orderNo)
+                            }
+                            if (orderRechargePayDTO.isInstalment == 'Y') {
+                                this.$confirm('本次支付完成,是否继续支付')
+                                    .then(() => {
+                                        this.alreadyPayTotal = this.alreadyPayTotal + parseFloat(this.payFrom.thisPayMoney)
+                                        this.saveAlreadyPayAmount()
+                                    })
+                                    .catch(() => {
+                                        this.openRecharge = false
+                                        this.orderNo = null
+                                        this.$modal.msgWarning('确定关闭本次充值吗?关闭后如需完成支付请前往订单管理继续支付')
+                                    })
+                            }
+                        })
+                    } else {
+                        // 多次支付
+                        morePay(orderRechargePayDTO).then((response) => {
+                            loading.close()
+                            if (response.data.payResult != 200) {
+                                this.$message.error(response.data.payMsg)
+                                return
+                            }
+                            if (this.payFrom.payType == '0' || this.payFrom.payType == '1') {
+                                //第三方支付
+                                console.log('第三方支付')
+                                this.isPaying = true
+                                var intervalId = setInterval(() => {
+                                    this.intervalCheckOrderStatus(intervalId, response.data.orderNo)
+                                }, 4000)
+                            } else {
+                                this.checkIsAllPay(this.orderNo)
+                            }
+                            if (orderRechargePayDTO.isInstalment == 'Y') {
+                                this.$confirm('本次支付完成,是否继续支付')
+                                    .then(() => {
+                                        this.alreadyPayTotal = this.alreadyPayTotal + parseFloat(this.payFrom.thisPayMoney)
+                                        this.saveAlreadyPayAmount()
+                                    })
+                                    .catch(() => {
+                                        this.openRecharge = false
+                                        this.orderNo = null
+                                        this.$modal.msgWarning('确定关闭本次充值吗?关闭后如需完成支付请前往订单管理继续支付')
+                                    })
+                            }
+                        })
+                    }
+                })
+                .catch(() => {})
+        },
+        intervalCheckOrderStatus(intervalId, orderNo) {
+            getOrderStatusByOrderNo({ orderNo: orderNo }).then((response) => {
+                if (response.data == '0') {
+                    return
+                }
+                this.isPaying = false
+                if (response.data == '100') {
+                    //已取消
+                    this.$notify.error({
+                        title: '支付失败',
+                        message: '支付超时或客户已取消支付'
+                    })
+                    clearInterval(intervalId)
+                    return
+                }
+                this.$notify({
+                    title: '支付成功',
+                    message: '客户已成功支付订单',
+                    type: 'success'
+                })
+                this.openRecharge = false
+                this.searchUser()
+                clearInterval(intervalId)
+            })
+        },
+        checkIsAllPay(orderNo) {
+            getOrderIsAllPayByOrderNo({ orderNo: orderNo }).then((response) => {
+                if (response.data == true) {
+                    this.$modal.msgSuccess('支付成功')
+                    this.openRecharge = false
+                    this.searchUser()
+                }
+            })
+        },
+        // 保存临时的  支付金额 用于取消支付提示信息
+        saveAlreadyPayAmount() {
+            // 微信
+            if (this.payFrom.payType == '0') {
+                this.alreadyPayInfo.alreadyPayWX = this.alreadyPayInfo.alreadyPayWX + parseFloat(this.payFrom.thisPayMoney)
             }
-            if (orderRechargePayDTO.isInstalment == 'Y' ){
-              this.$confirm('本次支付完成,是否继续支付').then(()=> {
-                this.alreadyPayTotal = this.alreadyPayTotal + parseFloat(this.payFrom.thisPayMoney);
-                this.saveAlreadyPayAmount();
-              }).catch(() => {
-                this.openRecharge = false;
-                this.orderNo = null;
-                this.$modal.msgWarning("确定关闭本次充值吗?关闭后如需完成支付请前往订单管理继续支付");
-              });
+            // 支付宝
+            if (this.payFrom.payType == '1') {
+                this.alreadyPayInfo.alreadyPayAli = this.alreadyPayInfo.alreadyPayAli + parseFloat(this.payFrom.thisPayMoney)
             }
-          });
-        }else {
-          // 多次支付
-          morePay(orderRechargePayDTO).then(response => {
-            this.$message('提交成功')
-            loading.close();
-            if(this.payFrom.payType == '0' || this.payFrom.payType == '1'){//第三方支付
-              console.log('第三方支付')
-              this.isPaying = true;
-              var intervalId = setInterval(() => {
-                this.intervalCheckOrderStatus(intervalId, response.data.orderNo)
-              },4000);
-            }else {
-              this.checkIsAllPay(this.orderNo);
+            // 现金
+            if (this.payFrom.payType == '2') {
+                this.alreadyPayInfo.alreadyPayCash = this.alreadyPayInfo.alreadyPayCash + parseFloat(this.payFrom.thisPayMoney)
             }
-            if (orderRechargePayDTO.isInstalment == 'Y' ){
-              this.$confirm('本次支付完成,是否继续支付').then(()=> {
-                this.alreadyPayTotal = this.alreadyPayTotal + parseFloat(this.payFrom.thisPayMoney);
-                this.saveAlreadyPayAmount();
-              }).catch(() => {
-                this.openRecharge = false;
-                this.orderNo = null;
-                this.$modal.msgWarning("确定关闭本次充值吗?关闭后如需完成支付请前往订单管理继续支付");
-              });
+        },
+        // 支付页面 确认按钮
+        submitConfirm() {
+            this.payConfirm = true
+        },
+        // 切换支付方式
+        changePayType() {
+            this.payConfirm = false
+            this.payFrom.thisPayMoney = null
+            this.payFrom.aliPayBarcode = null
+            this.payFrom.wxBarcode = null
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false
+            this.reset()
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+                id: null,
+                phoneNumber: null,
+                nickName: null,
+                realName: null,
+                sex: null,
+                birthday: null,
+                avatarUrl: null,
+                unionId: null,
+                createTime: null,
+                payPassword: null,
+                isUsePayPassword: null,
+                status: '0',
+                level: null
             }
-          });
-        }
-      }).catch(() => {});
-    },
-    intervalCheckOrderStatus(intervalId, orderNo){
-      getOrderStatusByOrderNo({orderNo:orderNo}).then(response => {
-        if(response.data == '0'){
-          return
-        }
-        this.isPaying = false
-        if(response.data == '100'){//已取消
-          this.$notify.error({
-            title: '支付失败',
-            message: '支付超时或客户已取消支付'
-          });
-          clearInterval(intervalId)
-          return;
-        }
-        this.$notify({
-          title: '支付成功',
-          message: '客户已成功支付订单',
-          type: 'success'
-        });
-        this.openRecharge = false;
-        this.searchUser();
-        clearInterval(intervalId)
-      })
-    },
-    checkIsAllPay(orderNo){
-      getOrderIsAllPayByOrderNo({orderNo:orderNo}).then(response => {
-        if (response.data == true){
-          this.$modal.msgSuccess("支付成功");
-          this.openRecharge = false;
-          this.searchUser();
+            this.resetForm('form')
+        },
+        resetPayInfo() {
+            this.alreadyPayTotal = 0
+            this.couponAmount = 0
+            this.payConfirm = false
+            this.rechargeInfo = {}
+            this.alreadySelectCouponList = []
+            this.payFrom = {
+                payType: '2',
+                isInstalment: 'N',
+                wxBarcode: null,
+                aliPayBarcode: null,
+                thisPayMoney: 0,
+                isUsedCoupon: false
+            }
+            this.alreadyPayInfo = {
+                alreadyPayWX: 0,
+                alreadyPayCash: 0,
+                alreadyPayAli: 0
+            }
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset()
+            this.open = true
+            this.title = '添加用户'
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map((item) => item.id)
+            this.single = selection.length !== 1
+            this.multiple = !selection.length
+        },
+        submitAlreadySelectCouponList() {
+            this.alreadySelectCouponList = []
+            this.ids.forEach((id) => {
+                const vo = this.couponList.find((item) => item.id == id)
+                this.alreadySelectCouponList.push(vo)
+            })
+            this.openCoupon = false
+        },
+        handleDelete(row) {
+            this.alreadySelectCouponList = this.alreadySelectCouponList.filter((item) => item.id != row.id)
+            this.$forceUpdate()
         }
-      });
-
-    },
-    // 保存临时的  支付金额 用于取消支付提示信息
-    saveAlreadyPayAmount(){
-      // 微信
-      if (this.payFrom.payType == '0'){
-        this.alreadyPayInfo.alreadyPayWX = this.alreadyPayInfo.alreadyPayWX + parseFloat(this.payFrom.thisPayMoney);
-      }
-      // 支付宝
-      if (this.payFrom.payType == '1'){
-        this.alreadyPayInfo.alreadyPayAli = this.alreadyPayInfo.alreadyPayAli + parseFloat(this.payFrom.thisPayMoney);
-      }
-      // 现金
-      if (this.payFrom.payType == '2'){
-        this.alreadyPayInfo.alreadyPayCash = this.alreadyPayInfo.alreadyPayCash + parseFloat(this.payFrom.thisPayMoney);
-      }
-    },
-    // 支付页面 确认按钮
-    submitConfirm(){
-      this.payConfirm = true;
-    },
-    // 切换支付方式
-    changePayType(){
-      this.payConfirm = false;
-      this.payFrom.thisPayMoney = null;
-      this.payFrom.aliPayBarcode = null;
-      this.payFrom.wxBarcode = null;
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        phoneNumber: null,
-        nickName: null,
-        realName: null,
-        sex: null,
-        birthday: null,
-        avatarUrl: null,
-        unionId: null,
-        createTime: null,
-        payPassword: null,
-        isUsePayPassword: null,
-        status: "0",
-        level: null
-      };
-      this.resetForm("form");
-    },
-    resetPayInfo(){
-      this.alreadyPayTotal = 0 ;
-      this.couponAmount = 0;
-      this.payConfirm = false;
-      this.rechargeInfo = {};
-      this.alreadySelectCouponList=[];
-      this.payFrom = {
-        payType :'2',
-        isInstalment : 'N',
-        wxBarcode : null,
-        aliPayBarcode : null,
-        thisPayMoney : 0,
-        isUsedCoupon:false,
-      };
-      this.alreadyPayInfo = {
-          alreadyPayWX: 0,
-          alreadyPayCash: 0,
-          alreadyPayAli: 0,
-      };
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加用户";
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    submitAlreadySelectCouponList(){
-      this.alreadySelectCouponList = [];
-      this.ids.forEach(id =>{
-        const vo = this.couponList.find(item => item.id == id);
-        this.alreadySelectCouponList.push(vo);
-      })
-      this.openCoupon = false;
-    },
-    handleDelete(row){
-      this.alreadySelectCouponList = this.alreadySelectCouponList.filter(item => item.id != row.id);
-      this.$forceUpdate();
     }
-  }
-};
+}
 </script>
-<style>
-
-
-</style>
+<style></style>

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác