合并冲突

config/index.js

@@ -46,8 +46,7 @@ module.exports = {
       }
     },
     // Various Dev Server settingsss
-    host: "192.168.31.193", // can be overwritten by process.env.HOST
+    host: "192.168.31.194", // can be overwritten by process.env.HOST
-    // host: "192.168.31.35", // can be overwritten by process.env.HOST
     port: 3000, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,

src/api/eashier.js

@@ -1,6 +1,14 @@
 import { service } from "../utils/service";
 import { localPath } from "./api.js";
 
+export function succsee() {
+  return service({
+    url: "/api" + "/demay/ssm/cash/success",
+    method: "get",
+   
+  });
+}
+
 // 门店明细查询 平台端-门店管理-门店审核-门店明细查询
 export function storeOne(params) {
   return service({

src/components/recharge/type/index.vue

@@ -1,42 +1,133 @@
 <template>
-  <el-dialog :close-on-click-modal="false" v-dialogDrag :title="title" :visible.sync="dialogVisible" width="1000px" append-to-body>
+  <el-dialog
-    <el-table @row-dblclick="confirms" :data="list" @row-click="rowClick" max-height="600" v-loading="listLoading" :element-loading-text="elementLoadingText" class="margin-top-xs" :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)' ,color:'#eeeeee'}">
+    :close-on-click-modal="false"
+    v-dialogDrag
+    :title="title"
+    :visible.sync="dialogVisible"
+    width="1000px"
+    append-to-body
+  >
+    <el-table
+      @row-dblclick="confirms"
+      :data="list"
+      @row-click="rowClick"
+      max-height="600"
+      v-loading="listLoading"
+      :element-loading-text="elementLoadingText"
+      class="margin-top-xs"
+      :header-cell-style="{
+        background: 'linear-gradient(#6cb3ff, #1873d4)',
+        color: '#eeeeee'
+      }"
+    >
       <el-table-column label="选择" width="60">
         <template slot-scope="scope">
-          <el-radio v-model="radio" :label="scope.row.id" @change.native="scope.row;">
+          <el-radio
+            v-model="radio"
+            :label="scope.row.id"
+            @change.native="scope.row;"
+          >
             {{ "" }}
           </el-radio>
         </template>
       </el-table-column>
-      <el-table-column align="center" show-overflow-tooltip min-width="100" prop="rechargeTypeNum" label="编码"></el-table-column>
+      <el-table-column
-      <el-table-column align="center" show-overflow-tooltip min-width="120" prop="rechargeTypeName" label="名称"></el-table-column>
+        align="center"
-      <el-table-column show-overflow-tooltip min-width="75" align="left" prop="type" label="类别">
+        show-overflow-tooltip
+        min-width="100"
+        prop="rechargeTypeNum"
+        label="编码"
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        show-overflow-tooltip
+        min-width="120"
+        prop="rechargeTypeName"
+        label="名称"
+      ></el-table-column>
+      <el-table-column
+        show-overflow-tooltip
+        min-width="75"
+        align="left"
+        prop="type"
+        label="类别"
+      >
         <template slot-scope="scope">
-          {{scope.row.type==0?'赠送卡':scope.row.type==1?'折扣卡':'活动卡'}}
+          {{
+            scope.row.type == 0
+              ? "赠送卡"
+              : scope.row.type == 1
+              ? "折扣卡"
+              : "活动卡"
+          }}
         </template>
       </el-table-column>
-      <el-table-column align="center" min-width="75" prop="firstAmount" label="首充金额">
+      <el-table-column
-        <template slot-scope="scope">{{scope.row.firstAmount?scope.row.firstAmount:'无首充'}}</template>
+        align="center"
+        min-width="75"
+        prop="firstAmount"
+        label="首充金额"
+      >
+        <template slot-scope="scope">{{
+          scope.row.firstAmount ? scope.row.firstAmount : "无首充"
+        }}</template>
       </el-table-column>
-      <el-table-column align="center" min-width="75" prop="rechargeMoney" label="续充金额"></el-table-column>
+      <el-table-column
-      <el-table-column align="center" min-width="80" prop="discount" label="享受折扣(%)"></el-table-column>
+        align="center"
-      <el-table-column align="center" min-width="75" prop="giftMoney" label="赠送金额">
+        min-width="75"
+        prop="rechargeMoney"
+        label="续充金额"
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        min-width="80"
+        prop="discount"
+        label="享受折扣(%)"
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        min-width="75"
+        prop="giftMoney"
+        label="赠送金额"
+      >
         <template slot-scope="scope">
-          <span v-if="scope.row.donateType==0">固</span>
+          <span v-if="scope.row.donateType == 0">固</span>
-          <span v-if="scope.row.donateType==1">比</span>
+          <span v-if="scope.row.donateType == 1">比</span>
-          <span>{{scope.row.giftMoney}}</span>
+          <span>{{ scope.row.giftMoney }}</span>
-          <span v-if="scope.row.donateType==1">%</span>
+          <span v-if="scope.row.donateType == 1">%</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" min-width="80" prop="discountFreeAmount" label="赠送折扣(%)">
+      <el-table-column
-        <template slot-scope="scope">{{scope.row.discountFreeAmount?scope.row.discountFreeAmount:'无折扣'}}</template>
+        align="center"
+        min-width="80"
+        prop="discountFreeAmount"
+        label="赠送折扣(%)"
+      >
+        <template slot-scope="scope">{{
+          scope.row.discountFreeAmount ? scope.row.discountFreeAmount : "无折扣"
+        }}</template>
       </el-table-column>
-      <el-table-column align="center" min-width="80" prop="validTime" label="有效期限(月)"></el-table-column>
+      <el-table-column
-      <el-table-column align="center" show-overflow-tooltip min-width="115" prop="stopDates" label="到期日期"></el-table-column>
+        align="center"
+        min-width="80"
+        prop="validTime"
+        label="有效期限(月)"
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        show-overflow-tooltip
+        min-width="115"
+        prop="unifiedDue"
+        label="到期日期"
+      ></el-table-column>
     </el-table>
     <span slot="footer" class="dialog-footer">
-      <el-button size="mini" type="primary" plain @click="dialogVisible = false">取 消</el-button>
+      <el-button size="mini" type="primary" plain @click="dialogVisible = false"
-      <el-button size="mini" type="primary" @click="confirms()">确 定 </el-button>
+        >取 消</el-button
+      >
+      <el-button size="mini" type="primary" @click="confirms()"
+        >确 定
+      </el-button>
     </span>
   </el-dialog>
 </template>
@@ -55,6 +146,7 @@ export default {
       listLoading: false, //list加载提示开启动画
       selectNumber: null, //充值类别类型0 赠送卡 1 折扣卡 2活动卡
       selcetList: [], //已经选择的充值类别列表
+      format: "YYYY-MM-DD hh:mm:ss"
     };
   },
   methods: {
@@ -84,26 +176,60 @@ export default {
       this.listLoading = true;
       let form = {
         id: "",
-        storeId: sessionStorage.getItem("parentId"),
+        storeId: sessionStorage.getItem("parentId")
       };
       if (this.selectNumber != null) {
         form.type = this.selectNumber;
       }
-      recTypeList(form).then((res) => {
+      recTypeList(form).then(res => {
         this.listLoading = false;
         if (res.code === "000000") {
           if (this.selcetList.length == 0) {
             this.list = res.rows;
+            console.log(
+              "🚀 ~ file: index.vue ~ line 108 ~ recTypeList ~ this.list",
+              this.list
+            );
+
+            var date = new Date();
+            var obj = {
+              YYYY: date.getFullYear(),
+              MM: date.getMonth() + 1,
+              DD: date.getDate(),
+              hh: date.getHours(),
+              mm: date.getMinutes(),
+              ss: date.getSeconds()
+            };
+
+            // 定义改变后的格式
+            for (var x in obj) {
+              // 遍历对象 x为key
+              if (obj[x] < 10) {
+                // 当获取的值小于10 加一个0在前面
+                obj[x] = "0" + obj[x];
+              }
+              this.format = this.format.replace([x], obj[x]);
+              // x 为键 replace[x]值，replace[x]替换成obj[x]
+            }
+
+            console.log(this.format);
+
+            this.list.forEach((item, index) => {
+              if (item.unifiedDue < this.format) {
+                this.list.splice(index, 1);
+              }
+            });
           } else {
             var list = [];
-            this.selcetList.forEach((item) => {
+            this.selcetList.forEach(item => {
-              res.rows.forEach((items) => {
+              res.rows.forEach(items => {
                 if (item.newRechargeTypeId == items.id) {
                   list.push(items);
                 }
               });
             });
             this.list = list;
+            
           }
         } else {
           this.$alert("查询充值列表 : " + res.message, "提示", {
@@ -111,7 +237,7 @@ export default {
             confirmButtonClass: "confirmbtnFalses",
             type: "warning",
             center: true,
-            callback: (action) => {},
+            callback: action => {}
           });
         }
       });
@@ -120,10 +246,9 @@ export default {
     confirms() {
       this.$emit("recTypeData", this.radioForm);
       this.dialogVisible = false;
-    },
+    }
-  },
+  }
 };
 </script>
 
-<style>
+<style></style>
-</style>

src/pages/eashier/collectionList/collectionList.vue

@@ -36,8 +36,8 @@
           <div class="form-width-ms flex align-center text-cyan">
             <el-radio-group v-model="liftType" size="mini" style="padding-top:3px;" @change="radioChange">
               <el-radio-button :label="0" title="标准充值">标准</el-radio-button>
-              <el-radio-button :label="1" title="升卡">升</el-radio-button>
+              <el-radio-button :label="1" title="升卡" >升</el-radio-button>
-              <el-radio-button :label="2" title="降卡">降</el-radio-button>
+              <el-radio-button :label="2" title="降卡" >降</el-radio-button>
             </el-radio-group>
           </div>
         </el-form-item>
@@ -379,6 +379,7 @@ import {
   recAccountList,
   recTypeOne,
   selectOne,
+  succsee,
 } from "@/api/eashier.js";
 import addmember from "@/components/member/edit/index";
 import admin from "@/components/staffList/admin/index";
@@ -387,6 +388,7 @@ import staffsles from "@/components/staffList/staff/index";
 import member from "@/components/member/index";
 import selec from "@/components/store/select/index";
 import Template from "../../discount-coupon/issue/components/template.vue";
+
 export default {
   components: {
     member,
@@ -491,6 +493,8 @@ export default {
     };
   },
   methods: {
+
+    
     close() {
       this.listDialogVisible = false;
     },
@@ -564,6 +568,22 @@ export default {
       if (v != 0) {
         this.getRecList();
       }
+      if(this.form.rechargeTypeName){
+        this.form.rechargeTypeName=""
+      }
+    
+      if(this.sessionStorageData.recDebt&&this.debtMoneys){
+        this.$alert("存在欠款不允许升降级", "提示", {
+              confirmButtonText: "确定",
+              confirmButtonClass: "confirmbtnFalses",
+              type: "warning",
+              center: true,
+              callback: (action) => {},
+            });
+            this.liftType=0
+      }
+            
+
     },
     openRec(number) {
       console.log(number);
@@ -724,12 +744,29 @@ export default {
         let form = { ...this.form };
         this.form = {};
         this.form = form;
+        // console.log("🚀 ~ file: collectionList.vue ~ line 747 ~ recAccountOne ~ this.form", this.form)
+      
       });
     },
     //打开选择会员弹窗
     openMember() {
       this.$refs.member.show(this.vip);
+      succsee().then((res) => {
+        if (res.code == "000000") {
+          this.$alert(res.message, "提示", {
+              confirmButtonText: "确定",
+              confirmButtonClass: "confirmbtnFalses",
+              type: "info",
+              center: true,
+              callback: (action) => {},
+            });
+        } else {
+          
+        }
+      });
     },
+      
+    
     //选中会员返回方法
     memberData(v) {
       this.form.mobilePhone = v.mobilePhone;
@@ -910,6 +947,7 @@ export default {
     },
     openAddMember() {
       this.$refs.addmember.show("添加");
+      console.log("a")
     },
     memberAdd(v) {
       this.form.mobilePhone = v.mobilePhone;
@@ -1154,6 +1192,7 @@ export default {
           }
         });
       } else {
+       
         upgrade(this.form).then((res) => {
           this.saveloading = false;
           if (res.code == "000000") {
@@ -1333,6 +1372,7 @@ export default {
       if (this.form.memberId) {
         recAccountList({
           memberId: this.form.memberId,
+
         }).then((res) => {
           if (res.code == "000000") {
             this.recList = res.rows;

src/pages/eashier/service/service.vue

@@ -504,9 +504,8 @@ export default {
         } else {
           if (this.recForm.noDiscount == 0) {
             // 可以打折
-            
             form.discoutMoney =
-              ((form.spendMoney * form.discount) / 100).toFixed(2) * 1;
+              (form.spendMoney /( form.discount / 100)).toFixed(2) * 1;
           } else {
             不可以打折
            form.discoutMoney = form.spendMoney;

src/pages/statistics/storeDaily/storeDaily.vue

@@ -18,23 +18,23 @@
       <el-table-column align="center" label="客单数">
         <el-table-column align="center" min-width="80" prop="rechargeNum" label="充值">
           <template slot-scope="scope">
-            {{scope.row.rechargeNum?scope.row.rechargeNum:'--'}}
+            {{scope.row.rechargeNum?scope.row.rechargeNum:'0'}}
           </template>
         </el-table-column>
         <el-table-column align="center" min-width="80" prop="courseOrderNum" label="疗程">
           <template slot-scope="scope">
-            {{scope.row.courseOrderNum?scope.row.courseOrderNum:'--'}}
+            {{scope.row.courseOrderNum?scope.row.courseOrderNum:'0'}}
           </template>
         </el-table-column>
         <el-table-column align="center" min-width="80" prop="cashPeopleNum" label="服务">
           <template slot-scope="scope">
-            {{scope.row.cashPeopleNum?scope.row.cashPeopleNum:'--'}}
+            {{scope.row.cashPeopleNum?scope.row.cashPeopleNum:'0'}}
           </template>
         </el-table-column>
       </el-table-column>
       <el-table-column align="center" min-width="80" prop="rechargeMoney" label="充值金额">
         <template slot-scope="scope">
-          {{scope.row.rechargeMoney?scope.row.rechargeMoney:'--'}}
+          {{scope.row.rechargeMoney?scope.row.rechargeMoney:'0'}}
         </template>
       </el-table-column>
       <!-- <el-table-column align="center" min-width="80" prop="rechargeOrderNum" label="充值人数">
@@ -44,7 +44,7 @@
       </el-table-column> -->
       <el-table-column align="center" min-width="80" prop="courseMoney" label="疗程金额">
         <template slot-scope="scope">
-          {{scope.row.courseMoney?scope.row.courseMoney:'--'}}
+          {{scope.row.courseMoney?scope.row.courseMoney:'0'}}
         </template>
       </el-table-column>
       <!-- <el-table-column align="center" min-width="80" prop="courseOrderNum" label="疗程人数">
@@ -55,53 +55,53 @@
       <el-table-column align="center" label="服务">
         <el-table-column align="center" min-width="80" prop="cashMoney" label="总金额">
           <template slot-scope="scope">
-            {{scope.row.cashMoney?scope.row.cashMoney:'--'}}
+            {{scope.row.cashMoney?scope.row.cashMoney:'0'}}
           </template>
         </el-table-column>
         <el-table-column align="center" min-width="80" prop="cashierCashMoney" label="现付金额">
           <template slot-scope="scope">
-            {{scope.row.cashierCashMoney?scope.row.cashierCashMoney:'--'}}
+            {{scope.row.cashierCashMoney?scope.row.cashierCashMoney:'0'}}
           </template>
         </el-table-column>
         <el-table-column align="center" min-width="80" prop="cashierCardMoney" label="卡付金额">
           <template slot-scope="scope">
-            {{scope.row.cashierCardMoney?scope.row.cashierCardMoney:'--'}}
+            {{scope.row.cashierCardMoney?scope.row.cashierCardMoney:'0'}}
           </template>
         </el-table-column>
       </el-table-column>
       <el-table-column align="center" min-width="80" prop="man" label="男客">
         <template slot-scope="scope">
-          {{scope.row.man?scope.row.man:'--'}}
+          {{scope.row.man?scope.row.man:'0'}}
         </template>
       </el-table-column>
       <el-table-column align="center" min-width="80" prop="woman" label="女客">
         <template slot-scope="scope">
-          {{scope.row.woman?scope.row.woman:'--'}}
+          {{scope.row.woman?scope.row.woman:'0'}}
         </template>
       </el-table-column>
       <el-table-column align="center" min-width="80" prop="repayMoney" label="还款金额">
         <template slot-scope="scope">
-          {{scope.row.repayMoney?scope.row.repayMoney:'--'}}
+          {{scope.row.repayMoney?scope.row.repayMoney:'0'}}
         </template>
       </el-table-column>
       <el-table-column align="center" min-width="80" prop="refundMoney" label="退款金额">
         <template slot-scope="scope">
-          {{scope.row.refundMoney?scope.row.refundMoney:'--'}}
+          {{scope.row.refundMoney?scope.row.refundMoney:'0'}}
         </template>
       </el-table-column>
       <el-table-column align="center" min-width="80" prop="newMemberNum" label="新增会员">
         <template slot-scope="scope">
-          {{scope.row.newMemberNum?scope.row.newMemberNum:'--'}}
+          {{scope.row.newMemberNum?scope.row.newMemberNum:'0'}}
         </template>
       </el-table-column>
       <el-table-column align="center" min-width="80" label="启用会员" v-if="headOffice==1">
         <template slot-scope="scope">
-          {{scope.row.startMemberNum?scope.row.startMemberNum:'--'}}
+          {{scope.row.startMemberNum?scope.row.startMemberNum:'0'}}
         </template>
       </el-table-column>
       <el-table-column align="center" min-width="80" label="会员总数" v-if="headOffice==1">
         <template slot-scope="scope">
-          {{scope.row.memberNum?scope.row.memberNum:'--'}}
+          {{scope.row.memberNum?scope.row.memberNum:'0'}}
         </template>
       </el-table-column>
     </el-table>

src/pages/storeManage/rechargeType/rechargeType.vue

@@ -2,134 +2,412 @@
   <div class="displsy-mod">
     <div class="header_flex">
       <div>
-        <el-button size="mini" type="primary" :disabled="!headOffice" @click="edit('添加')" v-role="4006002">添加
+        <el-button
+          size="mini"
+          type="primary"
+          :disabled="!headOffice"
+          @click="edit('添加')"
+          v-role="4006002"
+          >添加
         </el-button>
         <small v-show="!headOffice">分店只能查看充值类别不能操作</small>
       </div>
       <div>
-        <el-input size="medium" style="width: 180px" placeholder="当前页搜索" v-model="input">
+        <el-input
+          size="medium"
+          style="width: 180px"
+          placeholder="当前页搜索"
+          v-model="input"
+        >
           <i slot="prefix" class="el-input__icon el-icon-search"></i>
         </el-input>
-        <el-button size="mini" type="primary" @click="searchDialog = true">条件搜索</el-button>
+        <el-button size="mini" type="primary" @click="searchDialog = true"
-        <el-button size="mini" type="info" plain @click="getData((refreshtext = true))">刷新</el-button>
+          >条件搜索</el-button
-        <el-button size="mini" type="primary" v-if="headOffice" @click="download()">下载模板</el-button>
+        >
-        <el-button size="mini" type="warning" v-if="headOffice" @click="infoDialog = true">导入</el-button>
+        <el-button
-        <el-button size="mini" type="success" v-if="headOffice" @click="exit()">导出</el-button>
+          size="mini"
+          type="info"
+          plain
+          @click="getData((refreshtext = true))"
+          >刷新</el-button
+        >
+        <el-button
+          size="mini"
+          type="primary"
+          v-if="headOffice"
+          @click="download()"
+          >下载模板</el-button
+        >
+        <el-button
+          size="mini"
+          type="warning"
+          v-if="headOffice"
+          @click="infoDialog = true"
+          >导入</el-button
+        >
+        <el-button size="mini" type="success" v-if="headOffice" @click="exit()"
+          >导出</el-button
+        >
       </div>
     </div>
     <hr />
-    <el-table :data="tableData" stripe style="width: 100%" :header-cell-style=" {background: 'linear-gradient(#6cb3ff, #1873d4)' , color: '#eeeeee' , }">
+    <el-table
-      <el-table-column align="center" prop="rechargeTypeNum" label="充值编码" min-width="100" show-overflow-tooltip> </el-table-column>
+      :data="tableData"
-      <el-table-column align="center" prop="rechargeTypeName" label="充值类别" min-width="80">
+      stripe
+      style="width: 100%"
+      :header-cell-style="{
+        background: 'linear-gradient(#6cb3ff, #1873d4)',
+        color: '#eeeeee'
+      }"
+    >
+      <el-table-column
+        align="center"
+        prop="rechargeTypeNum"
+        label="充值编码"
+        min-width="100"
+        show-overflow-tooltip
+      >
+      </el-table-column>
+      <el-table-column
+        align="center"
+        prop="rechargeTypeName"
+        label="充值类别"
+        min-width="80"
+      >
         <template slot-scope="scope">{{
-          scope.row.type == 1 ? "折扣卡" :scope.row.type == 2 ?"活动卡":'赠送卡'
+          scope.row.type == 1
+            ? "折扣卡"
+            : scope.row.type == 2
+            ? "活动卡"
+            : "赠送卡"
         }}</template>
       </el-table-column>
-      <el-table-column align="center" prop="rechargeTypeName" label="充值名称" min-width="120" :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column
-      <el-table-column align="center" prop="discount" label="享受折扣(%)" min-width="80" sortable></el-table-column>
+        align="center"
-      <el-table-column align="center" label="状态" min-width="75" v-role="4006006">
+        prop="rechargeTypeName"
+        label="充值名称"
+        min-width="120"
+        :show-overflow-tooltip="true"
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        prop="discount"
+        label="享受折扣(%)"
+        min-width="80"
+        sortable
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        label="状态"
+        min-width="75"
+        v-role="4006006"
+      >
         <template slot-scope="scope">
-          <el-switch v-model="scope.row.state" :disabled="!headOffice" active-text="启用 " inactive-text="停用" :active-value="1" :inactive-value="0" inactive-color="#cccccc" class="demo" @change="state(scope.row)" />
+          <el-switch
+            v-model="scope.row.state"
+            :disabled="!headOffice"
+            active-text="启用 "
+            inactive-text="停用"
+            :active-value="1"
+            :inactive-value="0"
+            inactive-color="#cccccc"
+            class="demo"
+            @change="state(scope.row)"
+          />
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="typeRatio" label="充值提成" min-width="80" sortable></el-table-column>
+      <el-table-column
-      <el-table-column align="center" prop="firstAmount" label="首充金额" min-width="80" sortable></el-table-column>
+        align="center"
-      <el-table-column align="center" prop="rechargeMoney" label="充值金额" min-width="80" sortable></el-table-column>
+        prop="typeRatio"
-      <el-table-column align="center" prop="giftMoney" label="赠送金额" min-width="80" sortable>
+        label="充值提成"
+        min-width="80"
+        sortable
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        prop="firstAmount"
+        label="首充金额"
+        min-width="80"
+        sortable
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        prop="rechargeMoney"
+        label="充值金额"
+        min-width="80"
+        sortable
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        prop="giftMoney"
+        label="赠送金额"
+        min-width="80"
+        sortable
+      >
         <template slot-scope="scope">
-          <span v-if="scope.row.donateType==0">固</span>
+          <span v-if="scope.row.donateType == 0">固</span>
-          <span v-if="scope.row.donateType==1">比</span>
+          <span v-if="scope.row.donateType == 1">比</span>
-          <span>{{scope.row.giftMoney}}</span>
+          <span>{{ scope.row.giftMoney }}</span>
-          <span v-if="scope.row.donateType==1">%</span>
+          <span v-if="scope.row.donateType == 1">%</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="validTime" label="有效期(月)" min-width="100" sortable></el-table-column>
+      <el-table-column
-      <el-table-column align="center" prop="founderStaff" label="创建人" min-width="80" sortable></el-table-column>
+        align="center"
-      <el-table-column align="center" prop="storeName" label="所属门店" min-width="120" :show-overflow-tooltip="true" sortable></el-table-column>
+        prop="validTime"
-      <el-table-column align="center" prop="founderDatetime" label="创建时间" :show-overflow-tooltip="true" min-width="105" sortable></el-table-column>
+        label="有效期(月)"
-      <el-table-column align="center" prop="modifyBy" label="最近操作人" min-width="100"></el-table-column>
+        min-width="100"
-      <el-table-column align="center" prop="modifyDatetime" label="操作时间" :show-overflow-tooltip="true" min-width="105" sortable></el-table-column>
+        sortable
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        prop="founderStaff"
+        label="创建人"
+        min-width="80"
+        sortable
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        prop="storeName"
+        label="所属门店"
+        min-width="120"
+        :show-overflow-tooltip="true"
+        sortable
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        prop="founderDatetime"
+        label="创建时间"
+        :show-overflow-tooltip="true"
+        min-width="105"
+        sortable
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        prop="modifyBy"
+        label="最近操作人"
+        min-width="100"
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        prop="modifyDatetime"
+        label="操作时间"
+        :show-overflow-tooltip="true"
+        min-width="105"
+        sortable
+      ></el-table-column>
       <el-table-column align="center" fixed="right" label="升降级" width="86">
         <template slot-scope="scope" fixed="right">
-          <el-button :disabled="!headOffice" @click="upDown(scope.row)" size="mini" type="primary" v-role="4006005">升降级</el-button>
+          <el-button
+            :disabled="!headOffice"
+            @click="upDown(scope.row)"
+            size="mini"
+            type="primary"
+            v-role="4006005"
+            >升降级</el-button
+          >
         </template>
       </el-table-column>
       <el-table-column align="center" fixed="right" label="修改" width="76">
         <template slot-scope="scope" fixed="right">
-          <el-button :disabled="!headOffice" @click="edit(scope.row)" size="mini" type="primary" v-role="4006003">修改</el-button>
+          <el-button
+            :disabled="!headOffice"
+            @click="edit(scope.row)"
+            size="mini"
+            type="primary"
+            v-role="4006003"
+            >修改</el-button
+          >
         </template>
       </el-table-column>
       <el-table-column align="center" fixed="right" label="删除" width="76">
         <template slot-scope="scope" fixed="right">
-          <el-button :disabled="!headOffice" size="mini" type="primary" @click="del(scope.row)" plain v-role="4006004">删除</el-button>
+          <el-button
+            :disabled="!headOffice"
+            size="mini"
+            type="primary"
+            @click="del(scope.row)"
+            plain
+            v-role="4006004"
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
     <div class="block" style="margin-top: 10px">
       <!-- 分页组件 -->
-      <el-pagination align="left" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="pageNum" :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="pageInfo.total"></el-pagination>
+      <el-pagination
+        align="left"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="pageNum"
+        :page-sizes="[10, 20, 30, 40, 50]"
+        :page-size="pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="pageInfo.total"
+      ></el-pagination>
     </div>
 
     <el-dialog title="搜索" :visible.sync="searchDialog">
       <el-form :model="searchForm">
         <el-form-item label="充值名称搜索:" label-width="120px">
           <div class="searchDiv">
-            <el-input size="medium" v-model="searchForm.rechargeTypeName" placeholder="输入要查询的用充值类别名称" clearable></el-input>
+            <el-input
+              size="medium"
+              v-model="searchForm.rechargeTypeName"
+              placeholder="输入要查询的用充值类别名称"
+              clearable
+            ></el-input>
           </div>
         </el-form-item>
         <el-form-item label="根据状态搜索:" label-width="120px">
           <div class="searchDiv">
             <el-radio-group v-model="searchForm.state" fill="#f78989">
-              <el-radio :label="1" @click.native.prevent="clickitem(1)" size="medium" type="primary">启用中</el-radio>
+              <el-radio
-              <el-radio :label="0" @click.native.prevent="clickitem(0)" size="medium" type="primary">已停用</el-radio>
+                :label="1"
+                @click.native.prevent="clickitem(1)"
+                size="medium"
+                type="primary"
+                >启用中</el-radio
+              >
+              <el-radio
+                :label="0"
+                @click.native.prevent="clickitem(0)"
+                size="medium"
+                type="primary"
+                >已停用</el-radio
+              >
             </el-radio-group>
           </div>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button size="mini" type="primary" plain @click="searchDialog = false">取 消</el-button>
+        <el-button
-        <el-button type="primary" size="mini" @click="search((searchDialog = false))">确 定</el-button>
+          size="mini"
+          type="primary"
+          plain
+          @click="searchDialog = false"
+          >取 消</el-button
+        >
+        <el-button
+          type="primary"
+          size="mini"
+          @click="search((searchDialog = false))"
+          >确 定</el-button
+        >
       </span>
     </el-dialog>
-    <el-dialog title="导入表格" :visible.sync="infoDialog" :close-on-click-modal="false">
+    <el-dialog
+      title="导入表格"
+      :visible.sync="infoDialog"
+      :close-on-click-modal="false"
+    >
       <excel @fileData="fileData" @infoDialogV="infoDialogV"></excel>
     </el-dialog>
     <el-dialog title="导入提示" :visible.sync="infoErrorDialog">
       <span>以下导入 充值名称 存在重复 , 请检查修改后重新导入</span>
       <el-table :data="infoList">
-        <el-table-column align="center" prop="rechargeTypeNum" label="充值编码" min-width="120" sortable>
+        <el-table-column
+          align="center"
+          prop="rechargeTypeNum"
+          label="充值编码"
+          min-width="120"
+          sortable
+        >
         </el-table-column>
-        <el-table-column align="center" prop="rechargeTypeName" label="充值类别" min-width="120" :show-overflow-tooltip="true" sortable>
+        <el-table-column
+          align="center"
+          prop="rechargeTypeName"
+          label="充值类别"
+          min-width="120"
+          :show-overflow-tooltip="true"
+          sortable
+        >
           <template slot-scope="scope">{{
             scope.row.type == 1 ? "折扣卡" : "赠送卡"
           }}</template>
         </el-table-column>
 
-        <el-table-column align="center" prop="rechargeTypeName" label="充值名称" min-width="120" :show-overflow-tooltip="true" sortable></el-table-column>
+        <el-table-column
-        <el-table-column align="center" prop="discount" label="享受折扣( % )" min-width="150" sortable>
+          align="center"
+          prop="rechargeTypeName"
+          label="充值名称"
+          min-width="120"
+          :show-overflow-tooltip="true"
+          sortable
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          prop="discount"
+          label="享受折扣( % )"
+          min-width="150"
+          sortable
+        >
         </el-table-column>
-        <el-table-column align="center" label="状态" min-width="100" v-role="4006005">
+        <el-table-column
+          align="center"
+          label="状态"
+          min-width="100"
+          v-role="4006005"
+        >
           <template slot-scope="scope">
-            <el-switch v-model="scope.row.state" active-text="启用 " inactive-text="停用" :active-value="1" :inactive-value="0" inactive-color="#cccccc" class="demo" @change="state(scope.row)" />
+            <el-switch
+              v-model="scope.row.state"
+              active-text="启用 "
+              inactive-text="停用"
+              :active-value="1"
+              :inactive-value="0"
+              inactive-color="#cccccc"
+              class="demo"
+              @change="state(scope.row)"
+            />
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="typeRatio" label="充值提成" min-width="110" sortable>
+        <el-table-column
+          align="center"
+          prop="typeRatio"
+          label="充值提成"
+          min-width="110"
+          sortable
+        >
         </el-table-column>
 
-        <el-table-column align="center" prop="rechargeMoney" label="充值金额" min-width="110" sortable>
+        <el-table-column
+          align="center"
+          prop="rechargeMoney"
+          label="充值金额"
+          min-width="110"
+          sortable
+        >
         </el-table-column>
-        <el-table-column align="center" prop="giftMoney" label="赠送金额" min-width="110" sortable>
+        <el-table-column
+          align="center"
+          prop="giftMoney"
+          label="赠送金额"
+          min-width="110"
+          sortable
+        >
         </el-table-column>
-        <el-table-column align="center" prop="validTime" label="有效期(月)" min-width="130" sortable>
+        <el-table-column
+          align="center"
+          prop="validTime"
+          label="有效期(月)"
+          min-width="130"
+          sortable
+        >
         </el-table-column>
       </el-table>
       <span slot="footer" class="dialog-footer">
-        <el-button size="mini" type="primary" plain @click="infoErrorDialog = false">关 闭</el-button>
+        <el-button
+          size="mini"
+          type="primary"
+          plain
+          @click="infoErrorDialog = false"
+          >关 闭</el-button
+        >
       </span>
     </el-dialog>
     <edit ref="edit" @editData="editData"></edit>
     <detail ref="detail" @detailData="detailData"></detail>
-
   </div>
 </template>
 
@@ -143,13 +421,14 @@ import {
   recTypeStates,
   recTypeDownload,
   recTypeImport,
-  recTypeExport,
+  recTypeExport
 } from "@/api/storeManage.js";
+import { date } from "../../../../partten/partten";
 export default {
   components: {
     excel,
     edit,
-    detail,
+    detail
   },
   data() {
     return {
@@ -161,7 +440,7 @@ export default {
       searchForm: {
         //搜索表单
         rechargeTypeName: "",
-        state: 1,
+        state: 1
       },
       sessionStorageData: {}, //门店参数集合
       input: "", //当前页面搜索输入值
@@ -169,9 +448,10 @@ export default {
       pageNum: 1,
       pageInfo: {
         total: 0, //分页总条数
-        tableList: [],
+        tableList: []
       },
       infoDialog: false, //上传文件弹窗开关
+      format: "YYYY-MM-DD hh:mm:ss"
     };
   },
   methods: {
@@ -183,7 +463,7 @@ export default {
     detailData(v) {},
     //下载模板方法
     download() {
-      recTypeDownload().then((res) => {
+      recTypeDownload().then(res => {
         let blob = new Blob([res]);
         console.log(blob);
         var a = document.createElement("a");
@@ -201,7 +481,7 @@ export default {
       if (this.searchForm.rechargeTypeName == "") {
         delete this.searchForm.rechargeTypeName;
       }
-      recTypeExport(this.searchForm).then((res) => {
+      recTypeExport(this.searchForm).then(res => {
         let blob = new Blob([res]);
         var a = document.createElement("a");
         var url = window.URL.createObjectURL(blob);
@@ -221,18 +501,18 @@ export default {
           confirmButtonClass: "confirmbtnFalses",
           type: "warning",
           center: true,
-          callback: (action) => {},
+          callback: action => {}
         });
       } else {
         fileData.append("multipartFile", v);
-        recTypeImport(fileData).then((res) => {
+        recTypeImport(fileData).then(res => {
           if (res.rows != undefined) {
             this.infoList = res.rows;
             this.infoErrorDialog = true;
           } else {
             if (res.code == "000000") {
               this.$message.success({
-                message: res.message,
+                message: res.message
               });
               this.getData();
             } else {
@@ -241,7 +521,7 @@ export default {
                 confirmButtonClass: "confirmbtnFalses",
                 type: "warning",
                 center: true,
-                callback: (action) => {},
+                callback: action => {}
               });
             }
           }
@@ -256,14 +536,14 @@ export default {
     search() {
       //条件搜索
       this.searchForm.storeId = sessionStorage.getItem("parentId");
-      recTypePage(this.searchForm).then((res) => {
+      recTypePage(this.searchForm).then(res => {
         if (res.code == "000000") {
           this.searchTrue = true;
           res.pageInfo.tableList = res.pageInfo.list;
           this.pageInfo = res.pageInfo;
           if (res.pageInfo.total == 0) {
             this.$message.warning({
-              message: "没有找到符合条件的充值类别",
+              message: "没有找到符合条件的充值类别"
             });
           }
         } else {
@@ -272,7 +552,7 @@ export default {
             confirmButtonClass: "confirmbtnFalses",
             type: "warning",
             center: true,
-            callback: (action) => {},
+            callback: action => {}
           });
         }
       });
@@ -290,13 +570,13 @@ export default {
         cancelButtonText: "取消",
         type: "warning",
         cancelButtonClass: "cancelbtnFalses",
-        confirmButtonClass: "confirmbtnFalses",
+        confirmButtonClass: "confirmbtnFalses"
       })
         .then(() => {
           var id = {
-            id: row.id,
+            id: row.id
           };
-          delrecType(id).then((res) => {
+          delrecType(id).then(res => {
             //console.log(res);
             if (res.code == "000000") {
               if (this.pageInfo.total % this.pageSize == 1) {
@@ -304,7 +584,7 @@ export default {
               }
               this.getData();
               this.$message.success({
-                message: "删除成功!",
+                message: "删除成功!"
               });
             } else {
               this.$alert(res.message, "提示", {
@@ -312,18 +592,18 @@ export default {
                 confirmButtonClass: "confirmbtnFalses",
                 type: "warning",
                 center: true,
-                callback: (action) => {},
+                callback: action => {}
               });
             }
           });
         })
         .catch(() => {
           this.$message.info({
-            message: "已取消操作！",
+            message: "已取消操作！"
           });
         });
     },
-    //添加/修改
+    //添加/修改this.getData
     edit(form) {
       if (form == "添加") {
         this.$refs.edit.show("添加");
@@ -343,27 +623,43 @@ export default {
     state(row) {
       var state = {
         id: row.id,
-        state: row.state,
+        state: row.state
       };
-      recTypeStates(state)
+
-        .then((res) => {
+      if (row.unifiedDue < this.format) {
-          //console.log(res);
+        this.$alert(
-          this.getData();
+          "过期时间小于当前时间，请修改过期时间，再进行启用操作",
-          if (res.code == "000000") {
+          "提示",
-            if (row.state == 1) {
+          {
-              this.$message.success({
+            confirmButtonText: "确定",
-                message: "状态启用!",
+            confirmButtonClass: "confirmbtnFalses",
-              });
+            type: "warning",
-            } else {
+            center: true,
-              this.$message.success({
+            callback: action => {}
-                message: "状态停用!",
-              });
-            }
           }
-        })
+        );
-        .catch((err) => {
+        row.state = 0;
-          //console.log(err);
+      } else {
-        });
+        recTypeStates(state)
+          .then(res => {
+            //console.log(res);
+            this.getData();
+            if (res.code == "000000") {
+              if (row.state == 1) {
+                this.$message.success({
+                  message: "状态启用!"
+                });
+              } else {
+                this.$message.success({
+                  message: "状态停用!"
+                });
+              }
+            }
+          })
+          .catch(err => {
+            //console.log(err);
+          });
+      }
     },
     //分页方法
     handleSizeChange(val) {
@@ -387,24 +683,49 @@ export default {
       var page = {
         pageSize: this.pageSize,
         pageNum: this.pageNum,
-        storeId: sessionStorage.getItem("parentId"),
+        storeId: sessionStorage.getItem("parentId")
       };
-      recTypePage(page)
+      recTypePage(page).then(res => {
-        .then((res) => {
+        if (this.refreshtext == true) {
-          if (this.refreshtext == true) {
+          this.$message.success({
-            this.$message.success({
+            message: "已刷新最新数据"
-              message: "已刷新最新数据",
+          });
-            });
+          this.refreshtext = false;
-            this.refreshtext = false;
+          this.searchTrue = false;
-            this.searchTrue = false;
+        }
+        var date = new Date();
+        var obj = {
+          YYYY: date.getFullYear(),
+          MM: date.getMonth() + 1,
+          DD: date.getDate(),
+          hh: date.getHours(),
+          mm: date.getMinutes(),
+          ss: date.getSeconds()
+        };
+
+        // 定义改变后的格式
+        for (var x in obj) {
+          // 遍历对象 x为key
+          if (obj[x] < 10) {
+            // 当获取的值小于10 加一个0在前面
+            obj[x] = "0" + obj[x];
+          }
+          this.format = this.format.replace([x], obj[x]);
+          // x 为键 replace[x]值，replace[x]替换成obj[x]
+        }
+
+        console.log(this.format);
+
+        res.pageInfo.list.forEach(item => {
+          if (item.unifiedDue < this.format) {
+            item.state = 0;
           }
-          res.pageInfo.tableList = res.pageInfo.list;
-          this.pageInfo = res.pageInfo;
-        })
-        .catch((err) => {
-          //console.log(err);
         });
-    },
+
+        res.pageInfo.tableList = res.pageInfo.list;
+        this.pageInfo = res.pageInfo;
+      });
+    }
   },
   created() {
     this.headOffice =
@@ -414,7 +735,7 @@ export default {
     this.sessionStorageData = JSON.parse(
       sessionStorage.getItem("sessionStorageData")
     );
-    list.forEach((item) => {
+    list.forEach(item => {
       if (item.id == 4006001) {
         this.getData();
       }
@@ -425,15 +746,19 @@ export default {
     tableData() {
       var search = this.input.toString().toLowerCase(); //将用户输入的值变字符串并小写
       if (search) {
-        return this.pageInfo.tableList.filter(function (dataNews) {
+        return this.pageInfo.tableList.filter(function(dataNews) {
-          return Object.keys(dataNews).some(function (key) {
+          return Object.keys(dataNews).some(function(key) {
-            return String(dataNews[key]).toLowerCase().indexOf(search) > -1;
+            return (
+              String(dataNews[key])
+                .toLowerCase()
+                .indexOf(search) > -1
+            );
           });
         });
       }
       return this.pageInfo.tableList;
-    },
+    }
-  },
+  }
 };
 </script>
 <style scoped>